move partner source files

src/code_31B120.c

@@ -1,25 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD100_31B120);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD144);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD17C);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD200);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD228);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD260);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD5F4);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BD638);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BE7E0);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BE818);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BEA24);
-
-INCLUDE_ASM(s32, "code_31B120", func_802BEB10);

src/code_31CC70.c

@@ -1,29 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD100_31CC70);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD180_31CC70);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD1AC);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD23C);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD27C);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD2B4);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD710);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BD754);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BDD0C);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BDD9C);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BDE10);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BDE88);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BE014);
-
-INCLUDE_ASM(s32, "code_31CC70", func_802BE070);

src/code_31DE70.c

@@ -1,29 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BD100_31DE70);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BD20C);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BD368);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BD414);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BE280);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BE3A4);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF520);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF568);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF5A0);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF920);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF964);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BF9B8);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BFA58);
-
-INCLUDE_ASM(s32, "code_31DE70", func_802BFAB8);

src/code_320C50.c

@@ -1,35 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD100_320C50);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD21C);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD29C);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD2D4);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD678);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD6BC);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD7DC);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BD99C);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BDA90);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BDDD8);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BE6A0);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BE724);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BF4F0);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BFA00);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BFAA8);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BFB44);
-
-INCLUDE_ASM(s32, "code_320C50", func_802BFBA0);

src/code_323A50.c

@@ -1,19 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD100_323A50);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD130);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD168);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD4FC);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD540);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BD694);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BDDF0);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BDF08);
-
-INCLUDE_ASM(s32, "code_323A50", func_802BDF64);

src/world/partner/bombette.c

@@ -1,8 +1,8 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD100_317E50);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD100_317E50);
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD2D8);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD2D8);
 
 ApiStatus func_802BD300(ScriptInstance* script, s32 isInitialCall) {
     s32 unk = script->owner2.npc; // todo what is this
@@ -13,17 +13,17 @@ ApiStatus func_802BD300(ScriptInstance* script, s32 isInitialCall) {
     return func_800EECE8(unk) != 0;
 }
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD338);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD338);
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD6DC);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD6DC);
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD720);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD720);
 
 s32 func_802BD748(void) {
     return D_8010EBB0[0] == 0;
 }
 
-INCLUDE_ASM(s32, "code_317E50", func_802BD758);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BD758);
 
 ApiStatus func_802BE4E8(ScriptInstance* script, s32 isInitialCall) {
     s32 unk = script->owner2.npc; // todo what is this
@@ -34,6 +34,6 @@ ApiStatus func_802BE4E8(ScriptInstance* script, s32 isInitialCall) {
     return func_800EE9B8(unk) != 0;
 }
 
-INCLUDE_ASM(s32, "code_317E50", func_802BE520);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BE520);
 
-INCLUDE_ASM(s32, "code_317E50", func_802BE6E8);
+INCLUDE_ASM(s32, "world/partner/bombette", func_802BE6E8);

src/world/partner/bow.c

@@ -0,0 +1,19 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD100_323A50);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD130);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD168);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD4FC);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD540);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BD694);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BDDF0);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BDF08);
+
+INCLUDE_ASM(s32, "world/partner/bow", func_802BDF64);

src/world/partner/goombario.c

@@ -21,17 +21,17 @@ void world_goombario_init(Npc* npc) {
     npc->collisionRadius = 20;
 }
 
-INCLUDE_ASM(s32, "code_317020", func_802BD188);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BD188);
 
-INCLUDE_ASM(s32, "code_317020", func_802BD1D0);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BD1D0);
 
-INCLUDE_ASM(s32, "code_317020", func_802BD564);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BD564);
 
-INCLUDE_ASM(s32, "code_317020", func_802BD5A8);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BD5A8);
 
-INCLUDE_ASM(s32, "code_317020", func_802BD5D8);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BD5D8);
 
-INCLUDE_ASM(s32, "code_317020", func_802BDB30);
+INCLUDE_ASM(s32, "world/partner/goombario", func_802BDB30);
 
 ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) {
     s32 unk = script->owner2.npc; // todo what is this?
@@ -58,5 +58,5 @@ void world_goombario_pre_battle(s32 arg0) {
     D_8010EBB0[3] = 1;
 }
 #else
-INCLUDE_ASM(void, "code_317020", world_goombario_pre_battle, s32 arg0);
+INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0);
 #endif

src/world/partner/kooper.c

@@ -0,0 +1,25 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD100_31B120);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD144);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD17C);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD200);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD228);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD260);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD5F4);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BD638);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BE7E0);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BE818);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BEA24);
+
+INCLUDE_ASM(s32, "world/partner/kooper", func_802BEB10);

src/world/partner/lakilester.c

@@ -0,0 +1,35 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD100_320C50);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD21C);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD29C);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD2D4);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD678);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD6BC);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD7DC);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BD99C);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BDA90);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BDDD8);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BE6A0);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BE724);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BF4F0);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BFA00);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BFAA8);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BFB44);
+
+INCLUDE_ASM(s32, "world/partner/lakilester", func_802BFBA0);

src/world/partner/parakarry.c

@@ -1,6 +1,6 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "code_319670", func_802BD100_319670);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD100_319670);
 
 ApiStatus func_802BD148(ScriptInstance* script, s32 isInitialCall) {
     s32 unk = script->owner2.npc; // todo what is this
@@ -11,13 +11,13 @@ ApiStatus func_802BD148(ScriptInstance* script, s32 isInitialCall) {
     return func_800EECE8(unk) != 0;
 }
 
-INCLUDE_ASM(s32, "code_319670", func_802BD180);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD180);
 
-INCLUDE_ASM(s32, "code_319670", func_802BD514);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD514);
 
-INCLUDE_ASM(s32, "code_319670", func_802BD558);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD558);
 
-INCLUDE_ASM(s32, "code_319670", func_802BD660);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD660);
 
 ApiStatus func_802BE8D4(ScriptInstance* script, s32 isInitialCall) {
     s32 unk = script->owner2.npc; // todo what is this
@@ -28,6 +28,6 @@ ApiStatus func_802BE8D4(ScriptInstance* script, s32 isInitialCall) {
     return func_800EE9B8(unk) != 0;
 }
 
-INCLUDE_ASM(s32, "code_319670", func_802BE90C);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BE90C);
 
-INCLUDE_ASM(s32, "code_319670", func_802BE9D0);
+INCLUDE_ASM(s32, "world/partner/parakarry", func_802BE9D0);

src/world/partner/sushie.c

@@ -0,0 +1,29 @@
+#include "common.h"
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BD100_31DE70);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BD20C);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BD368);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BD414);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BE280);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BE3A4);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF520);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF568);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF5A0);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF920);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF964);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BF9B8);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BFA58);
+
+INCLUDE_ASM(s32, "world/partner/sushie", func_802BFAB8);