falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR comments

This commit is contained in:
Ethan Roseman 2020-10-20 10:22:51 -04:00
parent dfd9de4765
commit b49ecebd99
14 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/area_isk/isk_04.c
View File

@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04", func_802403D4);
INCLUDE_ASM(s32, "world/area_isk/isk_04", func_80240814); INCLUDE_ASM(s32, "world/area_isk/isk_04", func_80240814);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_isk/isk_04", func_802408B4_97B630); INCLUDE_ASM(s32, "world/area_isk/isk_04", func_802408B4_97B630);

2
src/world/area_isk/isk_08.c
View File

@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_08", func_80240394);
INCLUDE_ASM(s32, "world/area_isk/isk_08", func_802407D4); INCLUDE_ASM(s32, "world/area_isk/isk_08", func_802407D4);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_isk/isk_08", func_80240874); INCLUDE_ASM(s32, "world/area_isk/isk_08", func_80240874);

2
src/world/area_isk/isk_18.c
View File

@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_18", func_80240394_997F70);
INCLUDE_ASM(s32, "world/area_isk/isk_18", func_802407D4_997F70); INCLUDE_ASM(s32, "world/area_isk/isk_18", func_802407D4_997F70);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_isk/isk_18", func_80240874_997F70); INCLUDE_ASM(s32, "world/area_isk/isk_18", func_80240874_997F70);

2
src/world/area_kpa/kpa_01.c
View File

@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_802404F4);
INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_80240934); INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_80240934);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_802409D4_A46F60); INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_802409D4_A46F60);

2
src/world/area_kpa/kpa_03.c
View File

@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_802404F4_A485C0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_80240934_A485C0); INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_80240934_A485C0);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_802409D4_A485C0); INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_802409D4_A485C0);

2
src/world/area_kpa/kpa_113.c
View File

@ -18,6 +18,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240544_A9CC30);
INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240984_A9CC30); INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240984_A9CC30);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240A24_A9CC30); INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240A24_A9CC30);

2
src/world/area_kzn/kzn_03.c
View File

@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_802406A4_C60D10);
INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240AE4_C60D10); INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240AE4_C60D10);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240B84_C60D10); INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240B84_C60D10);

2
src/world/area_kzn/kzn_09.c
View File

@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80242D58);
INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243198_C76CE0); INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243198_C76CE0);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243238_C76CE0); INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243238_C76CE0);

2
src/world/area_kzn/kzn_17.c
View File

@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242048);
INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242488_C85AB0); INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242488_C85AB0);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242528_C85AB0); INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242528_C85AB0);

2
src/world/area_sbk/sbk_00/sbk_00.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
#include "world/common/SpawnSunEffect.c" #include "world/common/SpawnSunEffect.inc.c"

1
src/world/area_sbk/sbk_00/sbk_00_2.c
View File

@ -1,6 +1,5 @@
#include "common.h" #include "common.h"
//INCLUDE_ASM(s32, "world/area_sbk/sbk_00", func_80240040_929270);
ApiStatus func_80240040_929270(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80240040_929270(ScriptInstance* script, s32 isInitialCall) {
script->ownerActorID->unk_B5 = 3; script->ownerActorID->unk_B5 = 3;
return ApiStatus_DONE2; return ApiStatus_DONE2;

2
src/world/area_tik/tik_12.c
View File

@ -74,6 +74,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12", func_80241CF4);
INCLUDE_ASM(s32, "world/area_tik/tik_12", func_80242134); INCLUDE_ASM(s32, "world/area_tik/tik_12", func_80242134);
#include "world/common/AwaitPlayerNearNPC.c" #include "world/common/AwaitPlayerNearNPC.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_12", func_802421D4); INCLUDE_ASM(s32, "world/area_tik/tik_12", func_802421D4);

0
src/world/common/AwaitPlayerNearNPC.c → src/world/common/AwaitPlayerNearNPC.inc.c
View File

0
src/world/common/SpawnSunEffect.c → src/world/common/SpawnSunEffect.inc.c
View File