diff --git a/coverage.py b/coverage.py index 2f659e87c0..8ae0f8336e 100755 --- a/coverage.py +++ b/coverage.py @@ -76,6 +76,7 @@ def stuff(version): if not os.listdir(folder[0]): os.removedirs(folder[0]) -stuff("us") stuff("jp") +stuff("us") +stuff("pal") stuff("ique") diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c index 4f8c556a20..1dee73611a 100644 --- a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -196,7 +196,7 @@ API_CALLABLE(N(AwaitPlayerPressATimer)) { // unlike the common import, does not mask out 0xF0000 from itemID #if VERSION_PAL API_CALLABLE(N(GetItemNameRaw)); -INCLUDE_ASM(ApiResult, "world/area_kkj/kkj_19/kkj_19_5_baking", N(GetItemNameRaw)); +INCLUDE_ASM(ApiResult, "world/area_kkj/kkj_19/kkj_19_5_baking", kkj_19_GetItemNameRaw); #else API_CALLABLE(N(GetItemNameRaw)) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c index 2c62a4ec56..27f28c7a95 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c +++ b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c @@ -70,7 +70,7 @@ Gfx N(Gfx_RecordDisplay_Init)[] = { #if VERSION_PAL void N(draw_record_display)(RecordDisplayData* data, s32 alpha); -INCLUDE_ASM(void, "world/area_mgm/mgm_00/mgm_00_3_scoreboard", N(draw_record_display)); +INCLUDE_ASM(void, "world/area_mgm/mgm_00/mgm_00_3_scoreboard", mgm_00_draw_record_display); #else void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { if (alpha > 0) { diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 0de96d812e..a46e06de9a 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -658,7 +658,7 @@ API_CALLABLE(N(GetCoinCount)) { #if VERSION_PAL API_CALLABLE(N(SetMsgVars_BlocksRemaining)); -INCLUDE_ASM(ApiStatus, "world/area_mgm/mgm_01/mgm_01_2_npc", N(SetMsgVars_BlocksRemaining)) +INCLUDE_ASM(ApiStatus, "world/area_mgm/mgm_01/mgm_01_2_npc", mgm_01_SetMsgVars_BlocksRemaining) #else API_CALLABLE(N(SetMsgVars_BlocksRemaining)) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); diff --git a/src/world/area_mgm/mgm_02/mgm_02_0_header.c b/src/world/area_mgm/mgm_02/mgm_02_0_header.c index b42f39ae05..5d6976a6bd 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_0_header.c +++ b/src/world/area_mgm/mgm_02/mgm_02_0_header.c @@ -2,7 +2,7 @@ #if VERSION_PAL s32 N(get_tattle)(void); -INCLUDE_ASM(void, "world/area_mgm/mgm_02/mgm_02_0_header", N(get_tattle)); +INCLUDE_ASM(void, "world/area_mgm/mgm_02/mgm_02_0_header", mgm_02_get_tattle); #endif EntryList N(Entrances) = { diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index bb41ad2fc2..26e85cacc8 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -289,7 +289,7 @@ API_CALLABLE(N(OnHitBox)) { #if VERSION_PAL API_CALLABLE(N(SetBoxContents)); -INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", N(SetBoxContents)); +INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", mgm_02_SetBoxContents); #else API_CALLABLE(N(SetBoxContents)) { s32 initialConfiguration; @@ -417,7 +417,7 @@ API_CALLABLE(N(SetBoxContents)) { #if VERSION_PAL API_CALLABLE(N(RunMinigame)); -INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", N(RunMinigame)); +INCLUDE_ASM(ApiResult, "world/area_mgm/mgm_02/mgm_02_2_npc", mgm_02_RunMinigame); #else API_CALLABLE(N(RunMinigame)) { SmashGameData* data;