diff --git a/linker_scripts/eu/rev0/symbol_addrs.txt b/linker_scripts/eu/rev0/symbol_addrs.txt index 3e33b33d..70718375 100644 --- a/linker_scripts/eu/rev0/symbol_addrs.txt +++ b/linker_scripts/eu/rev0/symbol_addrs.txt @@ -1562,7 +1562,7 @@ func_800B99C8 = 0x800B99C8; func_800B99F8 = 0x800B99F8; func_800B9A28 = 0x800B9A28; func_800B9A58 = 0x800B9A58; -func_800B9A88 = 0x800B9A88; +RCP_SetupDL_36 = 0x800B9A88; func_800B9AB8 = 0x800B9AB8; func_800B9BD0 = 0x800B9BD0; func_800B9C00 = 0x800B9C00; @@ -1687,7 +1687,7 @@ func_800C34B4 = 0x800C34B4; func_800C34E8 = 0x800C34E8; func_800C367C = 0x800C367C; func_800C38C8 = 0x800C38C8; -func_800C3ABC = 0x800C3ABC; +Message_IsPrintingChar = 0x800C3ABC; func_800C3B40 = 0x800C3B40; Save_Write = 0x800C3C14; Save_Read = 0x800C3D24; @@ -2397,7 +2397,7 @@ D_800D608C = 0x800D608C; D_800D609C = 0x800D609C; D_800D60AC = 0x800D60AC; D_800D60BC = 0x800D60BC; -D_800D60D0 = 0x800D60D0; +gDefaultSave = 0x800D60D0; D_800DA910 = 0x800DA910; D_Gfx_800D94D0 = 0x800DA940; D_800DA958 = 0x800DA958; @@ -2519,7 +2519,7 @@ D_80138E14 = 0x80138E14; D_80138E18 = 0x80138E18; D_80138E1C = 0x80138E1C; D_80138E20 = 0x80138E20; -D_80138E24 = 0x80138E24; +gMasterDisp = 0x80138E24; D_80138E28 = 0x80138E28; D_80138E2C = 0x80138E2C; D_80138E30 = 0x80138E30; @@ -3289,7 +3289,7 @@ gPathProgress = 0x80179E88; D_80179E90 = 0x80179E90; D_80179EA0 = 0x80179EA0; D_80179EA8 = 0x80179EA8; -D_80179EB8 = 0x80179EB8; +gRadioTextBoxScaleY = 0x80179EB8; D_80179EC0 = 0x80179EC0; gRadioMsgRadioId = 0x80179ED0; D_80179ED8 = 0x80179ED8; @@ -3338,7 +3338,7 @@ D_8017A430 = 0x8017A430; D_8017A434 = 0x8017A434; D_8017A438 = 0x8017A438; D_8017A43C = 0x8017A43C; -D_8017A440 = 0x8017A440; +gRadioMsgCharIndex = 0x8017A440; D_8017A444 = 0x8017A444; D_8017A44C = 0x8017A44C; D_8017A450 = 0x8017A450; diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c index 5621c748..d41a5d7f 100644 --- a/src/engine/fox_radio.c +++ b/src/engine/fox_radio.c @@ -778,6 +778,7 @@ void Radio_Draw(void) { } } +// Unused in VERSION_US and absent in VERSION_EU, probably a leftover from VERSION_JP ? void func_radio_800BC040(void) { if (gPlayState != PLAY_PAUSE) { if (gRadioStateTimer > 0) { diff --git a/srceu/engine/fox_load.c b/srceu/engine/fox_load.c index fe68d54e..736f97c6 100644 --- a/srceu/engine/fox_load.c +++ b/srceu/engine/fox_load.c @@ -35,6 +35,7 @@ Scene D_800CCC44 = { // No difference #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_SceneSetup.s") +// It's a version of Load_InitDmaAndMsg, although Msg isn't here, but in Load_SetTextLanguage #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/func_80059428.s") // https://decomp.me/scratch/vQ0WZ (matching) /* diff --git a/srceu/engine/fox_message.c b/srceu/engine/fox_message.c index 8bab23a1..0ad3e3cb 100644 --- a/srceu/engine/fox_message.c +++ b/srceu/engine/fox_message.c @@ -14,4 +14,4 @@ #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_message/func_800C38C8.s") -#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_message/func_800C3ABC.s") +#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_message/Message_IsPrintingChar.s") diff --git a/srceu/engine/fox_radio.c b/srceu/engine/fox_radio.c index 5fdc76d3..aace8b3e 100644 --- a/srceu/engine/fox_radio.c +++ b/srceu/engine/fox_radio.c @@ -1,13 +1,19 @@ #include "common.h" +// No difference #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BAE90.s") +// No difference #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BAEEC.s") +// Different in EU +// https://decomp.me/scratch/kqrrH #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BAF38.s") +// No difference #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BB230.s") +// No difference #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BBAD0.s") #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_radio/func_800BBD18.s") diff --git a/srceu/engine/fox_rcp.c b/srceu/engine/fox_rcp.c index dda0580f..22369b1e 100644 --- a/srceu/engine/fox_rcp.c +++ b/srceu/engine/fox_rcp.c @@ -30,7 +30,7 @@ #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_rcp/func_800B9A58.s") -#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_rcp/func_800B9A88.s") +#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_rcp/RCP_SetupDL_36.s") #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_rcp/func_800B9AB8.s")