From f4dd1420b6f42db5a6bbf60cfcdebe25d0868807 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Wed, 23 Dec 2020 11:18:47 +0000 Subject: [PATCH] move partner source files --- .../partner/bombette}/func_802BD100_317E50.s | 0 .../partner/bombette}/func_802BD2D8.s | 0 .../partner/bombette}/func_802BD338.s | 0 .../partner/bombette}/func_802BD6DC.s | 0 .../partner/bombette}/func_802BD720.s | 0 .../partner/bombette}/func_802BD758.s | 0 .../partner/bombette}/func_802BE520.s | 0 .../partner/bombette}/func_802BE6E8.s | 0 .../partner/bow}/func_802BD100_323A50.s | 0 .../partner/bow}/func_802BD130.s | 0 .../partner/bow}/func_802BD168.s | 0 .../partner/bow}/func_802BD4FC.s | 0 .../partner/bow}/func_802BD540.s | 0 .../partner/bow}/func_802BD694.s | 0 .../partner/bow}/func_802BDDF0.s | 0 .../partner/bow}/func_802BDF08.s | 0 .../partner/bow}/func_802BDF64.s | 0 .../partner/goombario}/func_802BD188.s | 0 .../partner/goombario}/func_802BD1D0.s | 0 .../partner/goombario}/func_802BD564.s | 0 .../partner/goombario}/func_802BD5A8.s | 0 .../partner/goombario}/func_802BD5D8.s | 0 .../partner/goombario}/func_802BDB30.s | 0 .../goombario}/world_goombario_pre_battle.s | 0 .../partner/kooper}/func_802BD100_31B120.s | 0 .../partner/kooper}/func_802BD144.s | 0 .../partner/kooper}/func_802BD17C.s | 0 .../partner/kooper}/func_802BD200.s | 0 .../partner/kooper}/func_802BD228.s | 0 .../partner/kooper}/func_802BD260.s | 0 .../partner/kooper}/func_802BD5F4.s | 0 .../partner/kooper}/func_802BD638.s | 0 .../partner/kooper}/func_802BE7E0.s | 0 .../partner/kooper}/func_802BE818.s | 0 .../partner/kooper}/func_802BEA24.s | 0 .../partner/kooper}/func_802BEB10.s | 0 .../lakilester}/func_802BD100_320C50.s | 0 .../partner/lakilester}/func_802BD21C.s | 0 .../partner/lakilester}/func_802BD29C.s | 0 .../partner/lakilester}/func_802BD2D4.s | 0 .../partner/lakilester}/func_802BD678.s | 0 .../partner/lakilester}/func_802BD6BC.s | 0 .../partner/lakilester}/func_802BD7DC.s | 0 .../partner/lakilester}/func_802BD99C.s | 0 .../partner/lakilester}/func_802BDA90.s | 0 .../partner/lakilester}/func_802BDDD8.s | 0 .../partner/lakilester}/func_802BE6A0.s | 0 .../partner/lakilester}/func_802BE724.s | 0 .../partner/lakilester}/func_802BF4F0.s | 0 .../partner/lakilester}/func_802BFA00.s | 0 .../partner/lakilester}/func_802BFAA8.s | 0 .../partner/lakilester}/func_802BFB44.s | 0 .../partner/lakilester}/func_802BFBA0.s | 0 .../partner/parakarry}/func_802BD100_319670.s | 0 .../partner/parakarry}/func_802BD180.s | 0 .../partner/parakarry}/func_802BD514.s | 0 .../partner/parakarry}/func_802BD558.s | 0 .../partner/parakarry}/func_802BD660.s | 0 .../partner/parakarry}/func_802BE90C.s | 0 .../partner/parakarry}/func_802BE9D0.s | 0 .../partner/sushie}/func_802BD100_31DE70.s | 0 .../partner/sushie}/func_802BD20C.s | 0 .../partner/sushie}/func_802BD368.s | 0 .../partner/sushie}/func_802BD414.s | 0 .../partner/sushie}/func_802BE280.s | 0 .../partner/sushie}/func_802BE3A4.s | 0 .../partner/sushie}/func_802BF520.s | 0 .../partner/sushie}/func_802BF568.s | 0 .../partner/sushie}/func_802BF5A0.s | 0 .../partner/sushie}/func_802BF920.s | 0 .../partner/sushie}/func_802BF964.s | 0 .../partner/sushie}/func_802BF9B8.s | 0 .../partner/sushie}/func_802BFA58.s | 0 .../partner/sushie}/func_802BFAB8.s | 0 .../partner/watt}/func_802BD100_31CC70.s | 0 .../partner/watt}/func_802BD180_31CC70.s | 0 .../partner/watt}/func_802BD1AC.s | 0 .../partner/watt}/func_802BD23C.s | 0 .../partner/watt}/func_802BD27C.s | 0 .../partner/watt}/func_802BD2B4.s | 0 .../partner/watt}/func_802BD710.s | 0 .../partner/watt}/func_802BD754.s | 0 .../partner/watt}/func_802BDD0C.s | 0 .../partner/watt}/func_802BDD9C.s | 0 .../partner/watt}/func_802BDE10.s | 0 .../partner/watt}/func_802BDE88.s | 0 .../partner/watt}/func_802BE014.s | 0 .../partner/watt}/func_802BE070.s | 0 src/code_31B120.c | 25 ------------- src/code_31CC70.c | 29 --------------- src/code_31DE70.c | 29 --------------- src/code_320C50.c | 35 ------------------- src/code_323A50.c | 19 ---------- .../partner/bombette.c} | 16 ++++----- src/world/partner/bow.c | 19 ++++++++++ .../partner/goombario.c} | 14 ++++---- src/world/partner/kooper.c | 25 +++++++++++++ src/world/partner/lakilester.c | 35 +++++++++++++++++++ .../partner/parakarry.c} | 14 ++++---- src/world/partner/sushie.c | 29 +++++++++++++++ src/world/partner/watt.c | 29 +++++++++++++++ tools/splat.yaml | 16 ++++----- 102 files changed, 167 insertions(+), 167 deletions(-) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD100_317E50.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD2D8.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD338.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD6DC.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD720.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BD758.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BE520.s (100%) rename asm/nonmatchings/{code_317E50 => world/partner/bombette}/func_802BE6E8.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD100_323A50.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD130.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD168.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD4FC.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD540.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BD694.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BDDF0.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BDF08.s (100%) rename asm/nonmatchings/{code_323A50 => world/partner/bow}/func_802BDF64.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BD188.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BD1D0.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BD564.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BD5A8.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BD5D8.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/func_802BDB30.s (100%) rename asm/nonmatchings/{code_317020 => world/partner/goombario}/world_goombario_pre_battle.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD100_31B120.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD144.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD17C.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD200.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD228.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD260.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD5F4.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BD638.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BE7E0.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BE818.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BEA24.s (100%) rename asm/nonmatchings/{code_31B120 => world/partner/kooper}/func_802BEB10.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD100_320C50.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD21C.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD29C.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD2D4.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD678.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD6BC.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD7DC.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BD99C.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BDA90.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BDDD8.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BE6A0.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BE724.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BF4F0.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BFA00.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BFAA8.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BFB44.s (100%) rename asm/nonmatchings/{code_320C50 => world/partner/lakilester}/func_802BFBA0.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BD100_319670.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BD180.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BD514.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BD558.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BD660.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BE90C.s (100%) rename asm/nonmatchings/{code_319670 => world/partner/parakarry}/func_802BE9D0.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BD100_31DE70.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BD20C.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BD368.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BD414.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BE280.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BE3A4.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF520.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF568.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF5A0.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF920.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF964.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BF9B8.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BFA58.s (100%) rename asm/nonmatchings/{code_31DE70 => world/partner/sushie}/func_802BFAB8.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD100_31CC70.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD180_31CC70.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD1AC.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD23C.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD27C.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD2B4.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD710.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BD754.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BDD0C.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BDD9C.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BDE10.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BDE88.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BE014.s (100%) rename asm/nonmatchings/{code_31CC70 => world/partner/watt}/func_802BE070.s (100%) delete mode 100644 src/code_31B120.c delete mode 100644 src/code_31CC70.c delete mode 100644 src/code_31DE70.c delete mode 100644 src/code_320C50.c delete mode 100644 src/code_323A50.c rename src/{code_317E50.c => world/partner/bombette.c} (52%) create mode 100644 src/world/partner/bow.c rename src/{code_317020.c => world/partner/goombario.c} (72%) create mode 100644 src/world/partner/kooper.c create mode 100644 src/world/partner/lakilester.c rename src/{code_319670.c => world/partner/parakarry.c} (52%) create mode 100644 src/world/partner/sushie.c create mode 100644 src/world/partner/watt.c diff --git a/asm/nonmatchings/code_317E50/func_802BD100_317E50.s b/asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD100_317E50.s rename to asm/nonmatchings/world/partner/bombette/func_802BD100_317E50.s diff --git a/asm/nonmatchings/code_317E50/func_802BD2D8.s b/asm/nonmatchings/world/partner/bombette/func_802BD2D8.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD2D8.s rename to asm/nonmatchings/world/partner/bombette/func_802BD2D8.s diff --git a/asm/nonmatchings/code_317E50/func_802BD338.s b/asm/nonmatchings/world/partner/bombette/func_802BD338.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD338.s rename to asm/nonmatchings/world/partner/bombette/func_802BD338.s diff --git a/asm/nonmatchings/code_317E50/func_802BD6DC.s b/asm/nonmatchings/world/partner/bombette/func_802BD6DC.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD6DC.s rename to asm/nonmatchings/world/partner/bombette/func_802BD6DC.s diff --git a/asm/nonmatchings/code_317E50/func_802BD720.s b/asm/nonmatchings/world/partner/bombette/func_802BD720.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD720.s rename to asm/nonmatchings/world/partner/bombette/func_802BD720.s diff --git a/asm/nonmatchings/code_317E50/func_802BD758.s b/asm/nonmatchings/world/partner/bombette/func_802BD758.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BD758.s rename to asm/nonmatchings/world/partner/bombette/func_802BD758.s diff --git a/asm/nonmatchings/code_317E50/func_802BE520.s b/asm/nonmatchings/world/partner/bombette/func_802BE520.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BE520.s rename to asm/nonmatchings/world/partner/bombette/func_802BE520.s diff --git a/asm/nonmatchings/code_317E50/func_802BE6E8.s b/asm/nonmatchings/world/partner/bombette/func_802BE6E8.s similarity index 100% rename from asm/nonmatchings/code_317E50/func_802BE6E8.s rename to asm/nonmatchings/world/partner/bombette/func_802BE6E8.s diff --git a/asm/nonmatchings/code_323A50/func_802BD100_323A50.s b/asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD100_323A50.s rename to asm/nonmatchings/world/partner/bow/func_802BD100_323A50.s diff --git a/asm/nonmatchings/code_323A50/func_802BD130.s b/asm/nonmatchings/world/partner/bow/func_802BD130.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD130.s rename to asm/nonmatchings/world/partner/bow/func_802BD130.s diff --git a/asm/nonmatchings/code_323A50/func_802BD168.s b/asm/nonmatchings/world/partner/bow/func_802BD168.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD168.s rename to asm/nonmatchings/world/partner/bow/func_802BD168.s diff --git a/asm/nonmatchings/code_323A50/func_802BD4FC.s b/asm/nonmatchings/world/partner/bow/func_802BD4FC.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD4FC.s rename to asm/nonmatchings/world/partner/bow/func_802BD4FC.s diff --git a/asm/nonmatchings/code_323A50/func_802BD540.s b/asm/nonmatchings/world/partner/bow/func_802BD540.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD540.s rename to asm/nonmatchings/world/partner/bow/func_802BD540.s diff --git a/asm/nonmatchings/code_323A50/func_802BD694.s b/asm/nonmatchings/world/partner/bow/func_802BD694.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BD694.s rename to asm/nonmatchings/world/partner/bow/func_802BD694.s diff --git a/asm/nonmatchings/code_323A50/func_802BDDF0.s b/asm/nonmatchings/world/partner/bow/func_802BDDF0.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BDDF0.s rename to asm/nonmatchings/world/partner/bow/func_802BDDF0.s diff --git a/asm/nonmatchings/code_323A50/func_802BDF08.s b/asm/nonmatchings/world/partner/bow/func_802BDF08.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BDF08.s rename to asm/nonmatchings/world/partner/bow/func_802BDF08.s diff --git a/asm/nonmatchings/code_323A50/func_802BDF64.s b/asm/nonmatchings/world/partner/bow/func_802BDF64.s similarity index 100% rename from asm/nonmatchings/code_323A50/func_802BDF64.s rename to asm/nonmatchings/world/partner/bow/func_802BDF64.s diff --git a/asm/nonmatchings/code_317020/func_802BD188.s b/asm/nonmatchings/world/partner/goombario/func_802BD188.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BD188.s rename to asm/nonmatchings/world/partner/goombario/func_802BD188.s diff --git a/asm/nonmatchings/code_317020/func_802BD1D0.s b/asm/nonmatchings/world/partner/goombario/func_802BD1D0.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BD1D0.s rename to asm/nonmatchings/world/partner/goombario/func_802BD1D0.s diff --git a/asm/nonmatchings/code_317020/func_802BD564.s b/asm/nonmatchings/world/partner/goombario/func_802BD564.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BD564.s rename to asm/nonmatchings/world/partner/goombario/func_802BD564.s diff --git a/asm/nonmatchings/code_317020/func_802BD5A8.s b/asm/nonmatchings/world/partner/goombario/func_802BD5A8.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BD5A8.s rename to asm/nonmatchings/world/partner/goombario/func_802BD5A8.s diff --git a/asm/nonmatchings/code_317020/func_802BD5D8.s b/asm/nonmatchings/world/partner/goombario/func_802BD5D8.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BD5D8.s rename to asm/nonmatchings/world/partner/goombario/func_802BD5D8.s diff --git a/asm/nonmatchings/code_317020/func_802BDB30.s b/asm/nonmatchings/world/partner/goombario/func_802BDB30.s similarity index 100% rename from asm/nonmatchings/code_317020/func_802BDB30.s rename to asm/nonmatchings/world/partner/goombario/func_802BDB30.s diff --git a/asm/nonmatchings/code_317020/world_goombario_pre_battle.s b/asm/nonmatchings/world/partner/goombario/world_goombario_pre_battle.s similarity index 100% rename from asm/nonmatchings/code_317020/world_goombario_pre_battle.s rename to asm/nonmatchings/world/partner/goombario/world_goombario_pre_battle.s diff --git a/asm/nonmatchings/code_31B120/func_802BD100_31B120.s b/asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD100_31B120.s rename to asm/nonmatchings/world/partner/kooper/func_802BD100_31B120.s diff --git a/asm/nonmatchings/code_31B120/func_802BD144.s b/asm/nonmatchings/world/partner/kooper/func_802BD144.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD144.s rename to asm/nonmatchings/world/partner/kooper/func_802BD144.s diff --git a/asm/nonmatchings/code_31B120/func_802BD17C.s b/asm/nonmatchings/world/partner/kooper/func_802BD17C.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD17C.s rename to asm/nonmatchings/world/partner/kooper/func_802BD17C.s diff --git a/asm/nonmatchings/code_31B120/func_802BD200.s b/asm/nonmatchings/world/partner/kooper/func_802BD200.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD200.s rename to asm/nonmatchings/world/partner/kooper/func_802BD200.s diff --git a/asm/nonmatchings/code_31B120/func_802BD228.s b/asm/nonmatchings/world/partner/kooper/func_802BD228.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD228.s rename to asm/nonmatchings/world/partner/kooper/func_802BD228.s diff --git a/asm/nonmatchings/code_31B120/func_802BD260.s b/asm/nonmatchings/world/partner/kooper/func_802BD260.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD260.s rename to asm/nonmatchings/world/partner/kooper/func_802BD260.s diff --git a/asm/nonmatchings/code_31B120/func_802BD5F4.s b/asm/nonmatchings/world/partner/kooper/func_802BD5F4.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD5F4.s rename to asm/nonmatchings/world/partner/kooper/func_802BD5F4.s diff --git a/asm/nonmatchings/code_31B120/func_802BD638.s b/asm/nonmatchings/world/partner/kooper/func_802BD638.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BD638.s rename to asm/nonmatchings/world/partner/kooper/func_802BD638.s diff --git a/asm/nonmatchings/code_31B120/func_802BE7E0.s b/asm/nonmatchings/world/partner/kooper/func_802BE7E0.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BE7E0.s rename to asm/nonmatchings/world/partner/kooper/func_802BE7E0.s diff --git a/asm/nonmatchings/code_31B120/func_802BE818.s b/asm/nonmatchings/world/partner/kooper/func_802BE818.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BE818.s rename to asm/nonmatchings/world/partner/kooper/func_802BE818.s diff --git a/asm/nonmatchings/code_31B120/func_802BEA24.s b/asm/nonmatchings/world/partner/kooper/func_802BEA24.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BEA24.s rename to asm/nonmatchings/world/partner/kooper/func_802BEA24.s diff --git a/asm/nonmatchings/code_31B120/func_802BEB10.s b/asm/nonmatchings/world/partner/kooper/func_802BEB10.s similarity index 100% rename from asm/nonmatchings/code_31B120/func_802BEB10.s rename to asm/nonmatchings/world/partner/kooper/func_802BEB10.s diff --git a/asm/nonmatchings/code_320C50/func_802BD100_320C50.s b/asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD100_320C50.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD100_320C50.s diff --git a/asm/nonmatchings/code_320C50/func_802BD21C.s b/asm/nonmatchings/world/partner/lakilester/func_802BD21C.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD21C.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD21C.s diff --git a/asm/nonmatchings/code_320C50/func_802BD29C.s b/asm/nonmatchings/world/partner/lakilester/func_802BD29C.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD29C.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD29C.s diff --git a/asm/nonmatchings/code_320C50/func_802BD2D4.s b/asm/nonmatchings/world/partner/lakilester/func_802BD2D4.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD2D4.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD2D4.s diff --git a/asm/nonmatchings/code_320C50/func_802BD678.s b/asm/nonmatchings/world/partner/lakilester/func_802BD678.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD678.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD678.s diff --git a/asm/nonmatchings/code_320C50/func_802BD6BC.s b/asm/nonmatchings/world/partner/lakilester/func_802BD6BC.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD6BC.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD6BC.s diff --git a/asm/nonmatchings/code_320C50/func_802BD7DC.s b/asm/nonmatchings/world/partner/lakilester/func_802BD7DC.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD7DC.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD7DC.s diff --git a/asm/nonmatchings/code_320C50/func_802BD99C.s b/asm/nonmatchings/world/partner/lakilester/func_802BD99C.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BD99C.s rename to asm/nonmatchings/world/partner/lakilester/func_802BD99C.s diff --git a/asm/nonmatchings/code_320C50/func_802BDA90.s b/asm/nonmatchings/world/partner/lakilester/func_802BDA90.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BDA90.s rename to asm/nonmatchings/world/partner/lakilester/func_802BDA90.s diff --git a/asm/nonmatchings/code_320C50/func_802BDDD8.s b/asm/nonmatchings/world/partner/lakilester/func_802BDDD8.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BDDD8.s rename to asm/nonmatchings/world/partner/lakilester/func_802BDDD8.s diff --git a/asm/nonmatchings/code_320C50/func_802BE6A0.s b/asm/nonmatchings/world/partner/lakilester/func_802BE6A0.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BE6A0.s rename to asm/nonmatchings/world/partner/lakilester/func_802BE6A0.s diff --git a/asm/nonmatchings/code_320C50/func_802BE724.s b/asm/nonmatchings/world/partner/lakilester/func_802BE724.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BE724.s rename to asm/nonmatchings/world/partner/lakilester/func_802BE724.s diff --git a/asm/nonmatchings/code_320C50/func_802BF4F0.s b/asm/nonmatchings/world/partner/lakilester/func_802BF4F0.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BF4F0.s rename to asm/nonmatchings/world/partner/lakilester/func_802BF4F0.s diff --git a/asm/nonmatchings/code_320C50/func_802BFA00.s b/asm/nonmatchings/world/partner/lakilester/func_802BFA00.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BFA00.s rename to asm/nonmatchings/world/partner/lakilester/func_802BFA00.s diff --git a/asm/nonmatchings/code_320C50/func_802BFAA8.s b/asm/nonmatchings/world/partner/lakilester/func_802BFAA8.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BFAA8.s rename to asm/nonmatchings/world/partner/lakilester/func_802BFAA8.s diff --git a/asm/nonmatchings/code_320C50/func_802BFB44.s b/asm/nonmatchings/world/partner/lakilester/func_802BFB44.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BFB44.s rename to asm/nonmatchings/world/partner/lakilester/func_802BFB44.s diff --git a/asm/nonmatchings/code_320C50/func_802BFBA0.s b/asm/nonmatchings/world/partner/lakilester/func_802BFBA0.s similarity index 100% rename from asm/nonmatchings/code_320C50/func_802BFBA0.s rename to asm/nonmatchings/world/partner/lakilester/func_802BFBA0.s diff --git a/asm/nonmatchings/code_319670/func_802BD100_319670.s b/asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BD100_319670.s rename to asm/nonmatchings/world/partner/parakarry/func_802BD100_319670.s diff --git a/asm/nonmatchings/code_319670/func_802BD180.s b/asm/nonmatchings/world/partner/parakarry/func_802BD180.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BD180.s rename to asm/nonmatchings/world/partner/parakarry/func_802BD180.s diff --git a/asm/nonmatchings/code_319670/func_802BD514.s b/asm/nonmatchings/world/partner/parakarry/func_802BD514.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BD514.s rename to asm/nonmatchings/world/partner/parakarry/func_802BD514.s diff --git a/asm/nonmatchings/code_319670/func_802BD558.s b/asm/nonmatchings/world/partner/parakarry/func_802BD558.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BD558.s rename to asm/nonmatchings/world/partner/parakarry/func_802BD558.s diff --git a/asm/nonmatchings/code_319670/func_802BD660.s b/asm/nonmatchings/world/partner/parakarry/func_802BD660.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BD660.s rename to asm/nonmatchings/world/partner/parakarry/func_802BD660.s diff --git a/asm/nonmatchings/code_319670/func_802BE90C.s b/asm/nonmatchings/world/partner/parakarry/func_802BE90C.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BE90C.s rename to asm/nonmatchings/world/partner/parakarry/func_802BE90C.s diff --git a/asm/nonmatchings/code_319670/func_802BE9D0.s b/asm/nonmatchings/world/partner/parakarry/func_802BE9D0.s similarity index 100% rename from asm/nonmatchings/code_319670/func_802BE9D0.s rename to asm/nonmatchings/world/partner/parakarry/func_802BE9D0.s diff --git a/asm/nonmatchings/code_31DE70/func_802BD100_31DE70.s b/asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BD100_31DE70.s rename to asm/nonmatchings/world/partner/sushie/func_802BD100_31DE70.s diff --git a/asm/nonmatchings/code_31DE70/func_802BD20C.s b/asm/nonmatchings/world/partner/sushie/func_802BD20C.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BD20C.s rename to asm/nonmatchings/world/partner/sushie/func_802BD20C.s diff --git a/asm/nonmatchings/code_31DE70/func_802BD368.s b/asm/nonmatchings/world/partner/sushie/func_802BD368.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BD368.s rename to asm/nonmatchings/world/partner/sushie/func_802BD368.s diff --git a/asm/nonmatchings/code_31DE70/func_802BD414.s b/asm/nonmatchings/world/partner/sushie/func_802BD414.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BD414.s rename to asm/nonmatchings/world/partner/sushie/func_802BD414.s diff --git a/asm/nonmatchings/code_31DE70/func_802BE280.s b/asm/nonmatchings/world/partner/sushie/func_802BE280.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BE280.s rename to asm/nonmatchings/world/partner/sushie/func_802BE280.s diff --git a/asm/nonmatchings/code_31DE70/func_802BE3A4.s b/asm/nonmatchings/world/partner/sushie/func_802BE3A4.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BE3A4.s rename to asm/nonmatchings/world/partner/sushie/func_802BE3A4.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF520.s b/asm/nonmatchings/world/partner/sushie/func_802BF520.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF520.s rename to asm/nonmatchings/world/partner/sushie/func_802BF520.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF568.s b/asm/nonmatchings/world/partner/sushie/func_802BF568.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF568.s rename to asm/nonmatchings/world/partner/sushie/func_802BF568.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF5A0.s b/asm/nonmatchings/world/partner/sushie/func_802BF5A0.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF5A0.s rename to asm/nonmatchings/world/partner/sushie/func_802BF5A0.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF920.s b/asm/nonmatchings/world/partner/sushie/func_802BF920.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF920.s rename to asm/nonmatchings/world/partner/sushie/func_802BF920.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF964.s b/asm/nonmatchings/world/partner/sushie/func_802BF964.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF964.s rename to asm/nonmatchings/world/partner/sushie/func_802BF964.s diff --git a/asm/nonmatchings/code_31DE70/func_802BF9B8.s b/asm/nonmatchings/world/partner/sushie/func_802BF9B8.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BF9B8.s rename to asm/nonmatchings/world/partner/sushie/func_802BF9B8.s diff --git a/asm/nonmatchings/code_31DE70/func_802BFA58.s b/asm/nonmatchings/world/partner/sushie/func_802BFA58.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BFA58.s rename to asm/nonmatchings/world/partner/sushie/func_802BFA58.s diff --git a/asm/nonmatchings/code_31DE70/func_802BFAB8.s b/asm/nonmatchings/world/partner/sushie/func_802BFAB8.s similarity index 100% rename from asm/nonmatchings/code_31DE70/func_802BFAB8.s rename to asm/nonmatchings/world/partner/sushie/func_802BFAB8.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD100_31CC70.s b/asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD100_31CC70.s rename to asm/nonmatchings/world/partner/watt/func_802BD100_31CC70.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD180_31CC70.s b/asm/nonmatchings/world/partner/watt/func_802BD180_31CC70.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD180_31CC70.s rename to asm/nonmatchings/world/partner/watt/func_802BD180_31CC70.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD1AC.s b/asm/nonmatchings/world/partner/watt/func_802BD1AC.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD1AC.s rename to asm/nonmatchings/world/partner/watt/func_802BD1AC.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD23C.s b/asm/nonmatchings/world/partner/watt/func_802BD23C.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD23C.s rename to asm/nonmatchings/world/partner/watt/func_802BD23C.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD27C.s b/asm/nonmatchings/world/partner/watt/func_802BD27C.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD27C.s rename to asm/nonmatchings/world/partner/watt/func_802BD27C.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD2B4.s b/asm/nonmatchings/world/partner/watt/func_802BD2B4.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD2B4.s rename to asm/nonmatchings/world/partner/watt/func_802BD2B4.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD710.s b/asm/nonmatchings/world/partner/watt/func_802BD710.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD710.s rename to asm/nonmatchings/world/partner/watt/func_802BD710.s diff --git a/asm/nonmatchings/code_31CC70/func_802BD754.s b/asm/nonmatchings/world/partner/watt/func_802BD754.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BD754.s rename to asm/nonmatchings/world/partner/watt/func_802BD754.s diff --git a/asm/nonmatchings/code_31CC70/func_802BDD0C.s b/asm/nonmatchings/world/partner/watt/func_802BDD0C.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BDD0C.s rename to asm/nonmatchings/world/partner/watt/func_802BDD0C.s diff --git a/asm/nonmatchings/code_31CC70/func_802BDD9C.s b/asm/nonmatchings/world/partner/watt/func_802BDD9C.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BDD9C.s rename to asm/nonmatchings/world/partner/watt/func_802BDD9C.s diff --git a/asm/nonmatchings/code_31CC70/func_802BDE10.s b/asm/nonmatchings/world/partner/watt/func_802BDE10.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BDE10.s rename to asm/nonmatchings/world/partner/watt/func_802BDE10.s diff --git a/asm/nonmatchings/code_31CC70/func_802BDE88.s b/asm/nonmatchings/world/partner/watt/func_802BDE88.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BDE88.s rename to asm/nonmatchings/world/partner/watt/func_802BDE88.s diff --git a/asm/nonmatchings/code_31CC70/func_802BE014.s b/asm/nonmatchings/world/partner/watt/func_802BE014.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BE014.s rename to asm/nonmatchings/world/partner/watt/func_802BE014.s diff --git a/asm/nonmatchings/code_31CC70/func_802BE070.s b/asm/nonmatchings/world/partner/watt/func_802BE070.s similarity index 100% rename from asm/nonmatchings/code_31CC70/func_802BE070.s rename to asm/nonmatchings/world/partner/watt/func_802BE070.s diff --git a/src/code_31B120.c b/src/code_31B120.c deleted file mode 100644 index 9e43f4c2bf..0000000000 --- a/src/code_31B120.c +++ /dev/null @@ -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); diff --git a/src/code_31CC70.c b/src/code_31CC70.c deleted file mode 100644 index 5db97d63ef..0000000000 --- a/src/code_31CC70.c +++ /dev/null @@ -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); diff --git a/src/code_31DE70.c b/src/code_31DE70.c deleted file mode 100644 index 54a412abdd..0000000000 --- a/src/code_31DE70.c +++ /dev/null @@ -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); diff --git a/src/code_320C50.c b/src/code_320C50.c deleted file mode 100644 index 5a37d55f57..0000000000 --- a/src/code_320C50.c +++ /dev/null @@ -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); diff --git a/src/code_323A50.c b/src/code_323A50.c deleted file mode 100644 index fe8cee5912..0000000000 --- a/src/code_323A50.c +++ /dev/null @@ -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); diff --git a/src/code_317E50.c b/src/world/partner/bombette.c similarity index 52% rename from src/code_317E50.c rename to src/world/partner/bombette.c index 8c9bbbf551..855f49e752 100644 --- a/src/code_317E50.c +++ b/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); diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c new file mode 100644 index 0000000000..efa82d47f1 --- /dev/null +++ b/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); diff --git a/src/code_317020.c b/src/world/partner/goombario.c similarity index 72% rename from src/code_317020.c rename to src/world/partner/goombario.c index e65fb76488..b03be9b413 100644 --- a/src/code_317020.c +++ b/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 diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c new file mode 100644 index 0000000000..c937234064 --- /dev/null +++ b/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); diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c new file mode 100644 index 0000000000..25c4e258ff --- /dev/null +++ b/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); diff --git a/src/code_319670.c b/src/world/partner/parakarry.c similarity index 52% rename from src/code_319670.c rename to src/world/partner/parakarry.c index 6bf3ebff66..70d9036baf 100644 --- a/src/code_319670.c +++ b/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); diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c new file mode 100644 index 0000000000..1ee60dcbf6 --- /dev/null +++ b/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); diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c new file mode 100644 index 0000000000..d7ab539078 --- /dev/null +++ b/src/world/partner/watt.c @@ -0,0 +1,29 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD100_31CC70); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD180_31CC70); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD1AC); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD23C); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD27C); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD2B4); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD710); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BD754); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BDD0C); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BDD9C); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BDE10); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BDE88); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BE014); + +INCLUDE_ASM(s32, "world/partner/watt", func_802BE070); diff --git a/tools/splat.yaml b/tools/splat.yaml index 9b80271083..5424a4f89c 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -411,56 +411,56 @@ segments: start: 0x317020 vram: 0x802BD100 files: - - [0x317020, c] + - [0x317020, c, world/partner/goombario] - [0x317b60, bin] - type: code ld_name: world_partner_bombette start: 0x317e50 vram: 0x802BD100 files: - - [0x317e50, c] + - [0x317e50, c, world/partner/bombette] - [0x3195d0, bin] - type: code ld_name: world_partner_parakarry start: 0x319670 vram: 0x802BD100 files: - - [0x319670, c] + - [0x319670, c, world/partner/parakarry] - [0x31b000, bin] - type: code ld_name: world_partner_kooper start: 0x31b120 vram: 0x802BD100 files: - - [0x31b120, c] + - [0x31b120, c, world/partner/kooper] - [0x31cb60, bin] - type: code ld_name: world_partner_watt start: 0x31cc70 vram: 0x802BD100 files: - - [0x31cc70, c] + - [0x31cc70, c, world/partner/watt] - [0x31ddc0, bin] - type: code ld_name: world_partner_sushie start: 0x31de70 vram: 0x802BD100 files: - - [0x31de70, c] + - [0x31de70, c, world/partner/sushie] - [0x320b20, bin] - type: code ld_name: world_partner_lakilester start: 0x320c50 vram: 0x802BD100 files: - - [0x320c50, c] + - [0x320c50, c, world/partner/lakilester] - [0x3239b0, bin] - type: code ld_name: world_partner_bow start: 0x323A50 vram: 0x802BD100 files: - - [0x323A50, c] + - [0x323A50, c, world/partner/bow] - [0x324930, bin] - type: code ld_name: world_partner_goompa