From 85f7331004e944942e49ea90e483f7402a7258e5 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 00:29:30 +0000
Subject: [PATCH 001/101] match func_80055050

---
 src/code_303c0_len_3e10.c | 11 +++++++++++
 tools/symbol_addrs.txt    |  2 ++
 undefined_syms.txt        |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c
index d0fef616f3..24dc1e3abf 100644
--- a/src/code_303c0_len_3e10.c
+++ b/src/code_303c0_len_3e10.c
@@ -2,7 +2,18 @@
 
 INCLUDE_ASM(s32, "code_303c0_len_3e10", al_LoadBKHeaders);
 
+#ifdef NON_MATCHING
+// Needs rodata
+extern s32 D_80078DB0;
+extern u16 D_80078DB4;
+
+void func_80055050(void) {
+    D_80078DB4 = 1;
+    D_80078DB0 = 0;
+}
+#else
 INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055050);
+#endif
 
 INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055068);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 57d0da9329..1600940500 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1897,3 +1897,5 @@ gSpeakingActorPart;0x8029FA78
 EnterWalk;0x80285960
 EnemyNpcHit;0x80077F70
 EnemyNpcDefeat;0x8007809C
+D_80078DB0;0x80078DB0
+D_80078DB4;0x80078DB4
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 6f335270e1..cb04c32ef6 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -260,3 +260,6 @@ ShakeCamX = 0x802D9CE8;
 
 EnemyNpcHit = 0x80077F70;
 EnemyNpcDefeat = 0x8007809C;
+
+D_80078DB0 = 0x80078DB0;
+D_80078DB4 = 0x80078DB4;

From 9eef0b027310e27908a49de33176f8ffc200ded2 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 01:05:40 +0000
Subject: [PATCH 002/101] match set_music_track

rewrite flag as NOT


clean up set_music_track temps
---
 .../code_e0b30_len_b80/set_music_track.s      | 23 -------------------
 include/common_structs.h                      |  2 +-
 include/functions.h                           |  2 +-
 include/variables.h                           |  2 ++
 src/code_303c0_len_3e10.c                     | 13 ++++++-----
 src/code_e0b30_len_b80.c                      | 10 +++++---
 tools/symbol_addrs.txt                        |  1 +
 undefined_syms.txt                            |  2 ++
 8 files changed, 21 insertions(+), 34 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/set_music_track.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s b/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s
deleted file mode 100644
index ec472a1a63..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel set_music_track
-/* E1018 8014A918 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E101C 8014A91C 3C038016 */  lui       $v1, 0x8016
-/* E1020 8014A920 24639AF0 */  addiu     $v1, $v1, -0x6510
-/* E1024 8014A924 00041040 */  sll       $v0, $a0, 1
-/* E1028 8014A928 00441021 */  addu      $v0, $v0, $a0
-/* E102C 8014A92C 00021100 */  sll       $v0, $v0, 4
-/* E1030 8014A930 00431021 */  addu      $v0, $v0, $v1
-/* E1034 8014A934 AFBF0018 */  sw        $ra, 0x18($sp)
-/* E1038 8014A938 94430000 */  lhu       $v1, ($v0)
-/* E103C 8014A93C 8FA80030 */  lw        $t0, 0x30($sp)
-/* E1040 8014A940 3063FFF7 */  andi      $v1, $v1, 0xfff7
-/* E1044 8014A944 00084400 */  sll       $t0, $t0, 0x10
-/* E1048 8014A948 00084403 */  sra       $t0, $t0, 0x10
-/* E104C 8014A94C A4430000 */  sh        $v1, ($v0)
-/* E1050 8014A950 0C0529F8 */  jal       _set_music_track
-/* E1054 8014A954 AFA80010 */   sw       $t0, 0x10($sp)
-/* E1058 8014A958 8FBF0018 */  lw        $ra, 0x18($sp)
-/* E105C 8014A95C 03E00008 */  jr        $ra
-/* E1060 8014A960 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/include/common_structs.h b/include/common_structs.h
index 56eb064d23..e11bee5283 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -307,7 +307,7 @@ typedef struct StaticEntityData {
 } StaticEntityData; // size = 0x24
 
 typedef struct MusicPlayer {
-    /* 0x00 */ s16 unkFlags;
+    /* 0x00 */ u16 unkFlags;
     /* 0x02 */ char unk_02[2];
     /* 0x04 */ s32 fadeOutTime;
     /* 0x08 */ s32 fadeInTime;
diff --git a/include/functions.h b/include/functions.h
index 033f72bb6e..4d275b8495 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -113,7 +113,7 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
 void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 
 s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
-s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume);
+void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume);
 
 ScriptInstance* get_script_by_index(s32 index);
 
diff --git a/include/variables.h b/include/variables.h
index ccdc405f99..9e6d483bd2 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -165,4 +165,6 @@ extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;
 extern Bytecode* ShakeCamX;
 
+extern MusicPlayer gMusicPlayers[];
+
 #endif
diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c
index 24dc1e3abf..357c8a3faf 100644
--- a/src/code_303c0_len_3e10.c
+++ b/src/code_303c0_len_3e10.c
@@ -1,21 +1,22 @@
 #include "common.h"
 
+// TODO: rodata
+extern s32 D_80078DB0;
+extern u16 D_80078DB4;
+
 INCLUDE_ASM(s32, "code_303c0_len_3e10", al_LoadBKHeaders);
 
 #ifdef NON_MATCHING
-// Needs rodata
-extern s32 D_80078DB0;
-extern u16 D_80078DB4;
-
+// Delay slot (probably needs rodata)
 void func_80055050(void) {
     D_80078DB4 = 1;
     D_80078DB0 = 0;
 }
 #else
-INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055050);
+INCLUDE_ASM(void, "code_303c0_len_3e10", func_80055050, void);
 #endif
 
-INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055068);
+INCLUDE_ASM(void, "code_303c0_len_3e10", func_80055068, u32 arg0);
 
 INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055110);
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 40acc5fde5..13931dd072 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -11,10 +11,14 @@ void func_8014A52C(void) {
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track);
+INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track, s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk,
-            s32 volume);
+void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
+    MusicPlayer* musicPlayers = &gMusicPlayers;
+    musicPlayers[playerIndex].unkFlags &= ~8;
+
+    _set_music_track(playerIndex, songID, variation, unk, volume);
+}
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 1600940500..198f34f9cf 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1899,3 +1899,4 @@ EnemyNpcHit;0x80077F70
 EnemyNpcDefeat;0x8007809C
 D_80078DB0;0x80078DB0
 D_80078DB4;0x80078DB4
+gMusicPlayers;0x80159AF0
diff --git a/undefined_syms.txt b/undefined_syms.txt
index cb04c32ef6..c915c7faf3 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -263,3 +263,5 @@ EnemyNpcDefeat = 0x8007809C;
 
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
+
+gMusicPlayers = 0x80159AF0;

From e0c810854399d335de7b4263ce3b0697e6d420cc Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 01:33:45 +0000
Subject: [PATCH 003/101] match _set_music_track

---
 .../code_e0b30_len_b80/_set_music_track.s     | 88 -------------------
 include/common_structs.h                      |  5 +-
 include/variables.h                           |  1 +
 src/code_e0b30_len_b80.c                      | 49 ++++++++++-
 tools/symbol_addrs.txt                        |  1 +
 undefined_syms.txt                            |  1 +
 6 files changed, 53 insertions(+), 92 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s b/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s
deleted file mode 100644
index 12aff6540b..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel _set_music_track
-/* E0EE0 8014A7E0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* E0EE4 8014A7E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* E0EE8 8014A7E8 00A0902D */  daddu     $s2, $a1, $zero
-/* E0EEC 8014A7EC 3C058007 */  lui       $a1, %hi(gGameStatusPtr)
-/* E0EF0 8014A7F0 8CA5419C */  lw        $a1, %lo(gGameStatusPtr)($a1)
-/* E0EF4 8014A7F4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* E0EF8 8014A7F8 8FB30040 */  lw        $s3, 0x40($sp)
-/* E0EFC 8014A7FC AFB10014 */  sw        $s1, 0x14($sp)
-/* E0F00 8014A800 00C0882D */  daddu     $s1, $a2, $zero
-/* E0F04 8014A804 AFB50024 */  sw        $s5, 0x24($sp)
-/* E0F08 8014A808 00E0A82D */  daddu     $s5, $a3, $zero
-/* E0F0C 8014A80C AFBF0028 */  sw        $ra, 0x28($sp)
-/* E0F10 8014A810 AFB40020 */  sw        $s4, 0x20($sp)
-/* E0F14 8014A814 AFB00010 */  sw        $s0, 0x10($sp)
-/* E0F18 8014A818 80A20071 */  lb        $v0, 0x71($a1)
-/* E0F1C 8014A81C 10400003 */  beqz      $v0, .L8014A82C
-/* E0F20 8014A820 0260A02D */   daddu    $s4, $s3, $zero
-/* E0F24 8014A824 08052A3D */  j         .L8014A8F4
-/* E0F28 8014A828 24020001 */   addiu    $v0, $zero, 1
-.L8014A82C:
-/* E0F2C 8014A82C 3C028016 */  lui       $v0, 0x8016
-/* E0F30 8014A830 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E0F34 8014A834 00041840 */  sll       $v1, $a0, 1
-/* E0F38 8014A838 00641821 */  addu      $v1, $v1, $a0
-/* E0F3C 8014A83C 00031900 */  sll       $v1, $v1, 4
-/* E0F40 8014A840 80A4007A */  lb        $a0, 0x7a($a1)
-/* E0F44 8014A844 14800008 */  bnez      $a0, .L8014A868
-/* E0F48 8014A848 00628021 */   addu     $s0, $v1, $v0
-/* E0F4C 8014A84C 8E040018 */  lw        $a0, 0x18($s0)
-/* E0F50 8014A850 0C015671 */  jal       func_800559C4
-/* E0F54 8014A854 00000000 */   nop      
-/* E0F58 8014A858 96030000 */  lhu       $v1, ($s0)
-/* E0F5C 8014A85C 24020001 */  addiu     $v0, $zero, 1
-/* E0F60 8014A860 08052A3C */  j         .L8014A8F0
-/* E0F64 8014A864 3063FFFE */   andi     $v1, $v1, 0xfffe
-.L8014A868:
-/* E0F68 8014A868 0C05290C */  jal       get_default_variation_for_song
-/* E0F6C 8014A86C 0240202D */   daddu    $a0, $s2, $zero
-/* E0F70 8014A870 04430001 */  bgezl     $v0, .L8014A878
-/* E0F74 8014A874 0040882D */   daddu    $s1, $v0, $zero
-.L8014A878:
-/* E0F78 8014A878 8E020010 */  lw        $v0, 0x10($s0)
-/* E0F7C 8014A87C 14520013 */  bne       $v0, $s2, .L8014A8CC
-/* E0F80 8014A880 24020001 */   addiu    $v0, $zero, 1
-/* E0F84 8014A884 8E020014 */  lw        $v0, 0x14($s0)
-/* E0F88 8014A888 14510010 */  bne       $v0, $s1, .L8014A8CC
-/* E0F8C 8014A88C 24020001 */   addiu    $v0, $zero, 1
-/* E0F90 8014A890 00132400 */  sll       $a0, $s3, 0x10
-/* E0F94 8014A894 0C052B21 */  jal       func_8014AC84
-/* E0F98 8014A898 00042403 */   sra      $a0, $a0, 0x10
-/* E0F9C 8014A89C 96020000 */  lhu       $v0, ($s0)
-/* E0FA0 8014A8A0 30420004 */  andi      $v0, $v0, 4
-/* E0FA4 8014A8A4 50400013 */  beql      $v0, $zero, .L8014A8F4
-/* E0FA8 8014A8A8 24020002 */   addiu    $v0, $zero, 2
-/* E0FAC 8014A8AC 8E040018 */  lw        $a0, 0x18($s0)
-/* E0FB0 8014A8B0 0C0156E0 */  jal       func_80055B80
-/* E0FB4 8014A8B4 00000000 */   nop      
-/* E0FB8 8014A8B8 96020000 */  lhu       $v0, ($s0)
-/* E0FBC 8014A8BC 3042FFFB */  andi      $v0, $v0, 0xfffb
-/* E0FC0 8014A8C0 A6020000 */  sh        $v0, ($s0)
-/* E0FC4 8014A8C4 08052A3D */  j         .L8014A8F4
-/* E0FC8 8014A8C8 24020002 */   addiu    $v0, $zero, 2
-.L8014A8CC:
-/* E0FCC 8014A8CC 96030000 */  lhu       $v1, ($s0)
-/* E0FD0 8014A8D0 0040202D */  daddu     $a0, $v0, $zero
-/* E0FD4 8014A8D4 3C018016 */  lui       $at, 0x8016
-/* E0FD8 8014A8D8 A4349AE0 */  sh        $s4, -0x6520($at)
-/* E0FDC 8014A8DC AE120010 */  sw        $s2, 0x10($s0)
-/* E0FE0 8014A8E0 AE110014 */  sw        $s1, 0x14($s0)
-/* E0FE4 8014A8E4 AE150004 */  sw        $s5, 4($s0)
-/* E0FE8 8014A8E8 A6040002 */  sh        $a0, 2($s0)
-/* E0FEC 8014A8EC 3063FFFD */  andi      $v1, $v1, 0xfffd
-.L8014A8F0:
-/* E0FF0 8014A8F0 A6030000 */  sh        $v1, ($s0)
-.L8014A8F4:
-/* E0FF4 8014A8F4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* E0FF8 8014A8F8 8FB50024 */  lw        $s5, 0x24($sp)
-/* E0FFC 8014A8FC 8FB40020 */  lw        $s4, 0x20($sp)
-/* E1000 8014A900 8FB3001C */  lw        $s3, 0x1c($sp)
-/* E1004 8014A904 8FB20018 */  lw        $s2, 0x18($sp)
-/* E1008 8014A908 8FB10014 */  lw        $s1, 0x14($sp)
-/* E100C 8014A90C 8FB00010 */  lw        $s0, 0x10($sp)
-/* E1010 8014A910 03E00008 */  jr        $ra
-/* E1014 8014A914 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/include/common_structs.h b/include/common_structs.h
index e11bee5283..30d69e351a 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -308,13 +308,14 @@ typedef struct StaticEntityData {
 
 typedef struct MusicPlayer {
     /* 0x00 */ u16 unkFlags;
-    /* 0x02 */ char unk_02[2];
+    /* 0x02 */ u16 unk_02;
     /* 0x04 */ s32 fadeOutTime;
     /* 0x08 */ s32 fadeInTime;
     /* 0x0C */ char unk_0C[4];
     /* 0x10 */ s32 songID;
     /* 0x14 */ s32 variation;
-    /* 0x18 */ char unk_18[24];
+    /* 0x18 */ s32 unk_18;
+    /* 0x1C */ char unk_1C[20];
 } MusicPlayer; // size = 0x30
 
 typedef struct MenuIcon {
diff --git a/include/variables.h b/include/variables.h
index 9e6d483bd2..fcc0de30f5 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -165,6 +165,7 @@ extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;
 extern Bytecode* ShakeCamX;
 
+extern s16 gMusicVolume;
 extern MusicPlayer gMusicPlayers[];
 
 #endif
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 13931dd072..d0aae4452e 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -1,5 +1,8 @@
 #include "common.h"
 
+
+void func_8014AC84(s16 volume);
+
 INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
@@ -11,10 +14,52 @@ void func_8014A52C(void) {
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track, s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume);
+s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
+    GameStatus* gameStatus = GAME_STATUS;
+
+    if (gameStatus->demoState != 0) {
+        return 1;
+    } else {
+        MusicPlayer* musicPlayers = &gMusicPlayers;
+        MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
+
+        if (!gameStatus->musicEnabled) {
+            func_800559C4(musicPlayer->unk_18);
+            musicPlayer->unkFlags &= ~1;
+
+            return 1;
+        } else {
+            s32 defaultVariation = get_default_variation_for_song(songID);
+            if (defaultVariation >= 0) {
+                variation = defaultVariation;
+            }
+
+            if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
+                func_8014AC84(volume); // transition volume to?
+
+                if (musicPlayer->unkFlags & 4) {
+                    func_80055B80(musicPlayer->unk_18);
+                    musicPlayer->unkFlags &= ~4;
+                }
+
+                return 2;
+            }
+
+            gMusicVolume = volume;
+            musicPlayer->songID = songID;
+            musicPlayer->variation = variation;
+            musicPlayer->fadeOutTime = unk;
+            musicPlayer->unk_02 = 1;
+            musicPlayer->unkFlags &= ~2;
+
+            return 1;
+        }
+    }
+}
 
 void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
     MusicPlayer* musicPlayers = &gMusicPlayers;
+
     musicPlayers[playerIndex].unkFlags &= ~8;
 
     _set_music_track(playerIndex, songID, variation, unk, volume);
@@ -36,7 +81,7 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC5C);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC84);
+INCLUDE_ASM(void, "code_e0b30_len_b80", func_8014AC84, s16 volume);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 198f34f9cf..12db0921df 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1899,4 +1899,5 @@ EnemyNpcHit;0x80077F70
 EnemyNpcDefeat;0x8007809C
 D_80078DB0;0x80078DB0
 D_80078DB4;0x80078DB4
+gMusicVolume;0x80159AE0
 gMusicPlayers;0x80159AF0
diff --git a/undefined_syms.txt b/undefined_syms.txt
index c915c7faf3..5727b9abe2 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -264,4 +264,5 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 
+gMusicVolume = 0x80159AE0;
 gMusicPlayers = 0x80159AF0;

From 1a6b1f5fcdc0226c80d920714af9560a00547fde Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 01:35:05 +0000
Subject: [PATCH 004/101] rename MusicPlayer unkFlags to flags

---
 include/common_structs.h |  2 +-
 src/code_e0b30_len_b80.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/common_structs.h b/include/common_structs.h
index 30d69e351a..ef6c39c281 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -307,7 +307,7 @@ typedef struct StaticEntityData {
 } StaticEntityData; // size = 0x24
 
 typedef struct MusicPlayer {
-    /* 0x00 */ u16 unkFlags;
+    /* 0x00 */ u16 flags;
     /* 0x02 */ u16 unk_02;
     /* 0x04 */ s32 fadeOutTime;
     /* 0x08 */ s32 fadeInTime;
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index d0aae4452e..14f5df0b64 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -25,7 +25,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
 
         if (!gameStatus->musicEnabled) {
             func_800559C4(musicPlayer->unk_18);
-            musicPlayer->unkFlags &= ~1;
+            musicPlayer->flags &= ~1;
 
             return 1;
         } else {
@@ -37,9 +37,9 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
             if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
                 func_8014AC84(volume); // transition volume to?
 
-                if (musicPlayer->unkFlags & 4) {
+                if (musicPlayer->flags & 4) {
                     func_80055B80(musicPlayer->unk_18);
-                    musicPlayer->unkFlags &= ~4;
+                    musicPlayer->flags &= ~4;
                 }
 
                 return 2;
@@ -50,7 +50,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
             musicPlayer->variation = variation;
             musicPlayer->fadeOutTime = unk;
             musicPlayer->unk_02 = 1;
-            musicPlayer->unkFlags &= ~2;
+            musicPlayer->flags &= ~2;
 
             return 1;
         }
@@ -60,7 +60,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
 void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
     MusicPlayer* musicPlayers = &gMusicPlayers;
 
-    musicPlayers[playerIndex].unkFlags &= ~8;
+    musicPlayers[playerIndex].flags &= ~8;
 
     _set_music_track(playerIndex, songID, variation, unk, volume);
 }

From 322932c295e43aa3e594f71d00659bab6535632d Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 01:36:53 +0000
Subject: [PATCH 005/101] name set_music_track arg3

---
 include/functions.h      | 2 +-
 src/code_e0b30_len_b80.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 4d275b8495..1ab3425f04 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -113,7 +113,7 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
 void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 
 s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
-void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume);
+void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
 
 ScriptInstance* get_script_by_index(s32 index);
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 14f5df0b64..d89dd4953f 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -14,7 +14,7 @@ void func_8014A52C(void) {
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
 
-s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
+s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
     GameStatus* gameStatus = GAME_STATUS;
 
     if (gameStatus->demoState != 0) {
@@ -48,7 +48,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
             gMusicVolume = volume;
             musicPlayer->songID = songID;
             musicPlayer->variation = variation;
-            musicPlayer->fadeOutTime = unk;
+            musicPlayer->fadeOutTime = fadeOutTime;
             musicPlayer->unk_02 = 1;
             musicPlayer->flags &= ~2;
 
@@ -57,12 +57,12 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
     }
 }
 
-void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
+void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
     MusicPlayer* musicPlayers = &gMusicPlayers;
 
     musicPlayers[playerIndex].flags &= ~8;
 
-    _set_music_track(playerIndex, songID, variation, unk, volume);
+    _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
 }
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);

From d9d65955812269a1e86416daed06ff847e22ee6e Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 01:38:25 +0000
Subject: [PATCH 006/101] make set_music_track non-void

Still matches; its return value is used in SetMusicTrack
---
 include/functions.h      | 2 +-
 src/code_e0b30_len_b80.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 1ab3425f04..2e2fcd7851 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -113,7 +113,7 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
 void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 
 s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
-void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
+s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
 
 ScriptInstance* get_script_by_index(s32 index);
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index d89dd4953f..3ca5fced0d 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -57,12 +57,12 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
     }
 }
 
-void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
+s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
     MusicPlayer* musicPlayers = &gMusicPlayers;
 
     musicPlayers[playerIndex].flags &= ~8;
 
-    _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
+    return _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
 }
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);

From a2329fc84a993177d46e6afb8ac0b79d42955db5 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 02:17:11 +0000
Subject: [PATCH 007/101] match func_8014A964, func_8014AC84

---
 .../code_e0b30_len_b80/func_8014A964.s        | 69 -------------------
 .../code_e0b30_len_b80/func_8014AC84.s        |  8 ---
 include/common_structs.h                      |  3 +-
 include/variables.h                           |  2 +-
 src/code_e0b30_len_b80.c                      | 38 +++++++++-
 5 files changed, 39 insertions(+), 81 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s
deleted file mode 100644
index 727dc8afaa..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014A964
-/* E1064 8014A964 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* E1068 8014A968 AFB40020 */  sw        $s4, 0x20($sp)
-/* E106C 8014A96C 00A0A02D */  daddu     $s4, $a1, $zero
-/* E1070 8014A970 3C058007 */  lui       $a1, %hi(gGameStatusPtr)
-/* E1074 8014A974 8CA5419C */  lw        $a1, %lo(gGameStatusPtr)($a1)
-/* E1078 8014A978 AFB3001C */  sw        $s3, 0x1c($sp)
-/* E107C 8014A97C 8FB30040 */  lw        $s3, 0x40($sp)
-/* E1080 8014A980 AFB10014 */  sw        $s1, 0x14($sp)
-/* E1084 8014A984 00C0882D */  daddu     $s1, $a2, $zero
-/* E1088 8014A988 AFB50024 */  sw        $s5, 0x24($sp)
-/* E108C 8014A98C AFBF0028 */  sw        $ra, 0x28($sp)
-/* E1090 8014A990 AFB20018 */  sw        $s2, 0x18($sp)
-/* E1094 8014A994 AFB00010 */  sw        $s0, 0x10($sp)
-/* E1098 8014A998 80A20071 */  lb        $v0, 0x71($a1)
-/* E109C 8014A99C 8FB20044 */  lw        $s2, 0x44($sp)
-/* E10A0 8014A9A0 10400003 */  beqz      $v0, .L8014A9B0
-/* E10A4 8014A9A4 00E0A82D */   daddu    $s5, $a3, $zero
-/* E10A8 8014A9A8 08052A8C */  j         .L8014AA30
-/* E10AC 8014A9AC 24020001 */   addiu    $v0, $zero, 1
-.L8014A9B0:
-/* E10B0 8014A9B0 3C028016 */  lui       $v0, 0x8016
-/* E10B4 8014A9B4 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E10B8 8014A9B8 00041840 */  sll       $v1, $a0, 1
-/* E10BC 8014A9BC 00641821 */  addu      $v1, $v1, $a0
-/* E10C0 8014A9C0 00031900 */  sll       $v1, $v1, 4
-/* E10C4 8014A9C4 80A4007A */  lb        $a0, 0x7a($a1)
-/* E10C8 8014A9C8 14800008 */  bnez      $a0, .L8014A9EC
-/* E10CC 8014A9CC 00628021 */   addu     $s0, $v1, $v0
-/* E10D0 8014A9D0 8E040018 */  lw        $a0, 0x18($s0)
-/* E10D4 8014A9D4 0C015671 */  jal       func_800559C4
-/* E10D8 8014A9D8 00000000 */   nop      
-/* E10DC 8014A9DC 96030000 */  lhu       $v1, ($s0)
-/* E10E0 8014A9E0 24020001 */  addiu     $v0, $zero, 1
-/* E10E4 8014A9E4 08052A8B */  j         .L8014AA2C
-/* E10E8 8014A9E8 3063FFFE */   andi     $v1, $v1, 0xfffe
-.L8014A9EC:
-/* E10EC 8014A9EC 0C05290C */  jal       get_default_variation_for_song
-/* E10F0 8014A9F0 0280202D */   daddu    $a0, $s4, $zero
-/* E10F4 8014A9F4 04430001 */  bgezl     $v0, .L8014A9FC
-/* E10F8 8014A9F8 0040882D */   daddu    $s1, $v0, $zero
-.L8014A9FC:
-/* E10FC 8014A9FC 24020001 */  addiu     $v0, $zero, 1
-/* E1100 8014AA00 96030000 */  lhu       $v1, ($s0)
-/* E1104 8014AA04 0040202D */  daddu     $a0, $v0, $zero
-/* E1108 8014AA08 AE150008 */  sw        $s5, 8($s0)
-/* E110C 8014AA0C A613000C */  sh        $s3, 0xc($s0)
-/* E1110 8014AA10 A612000E */  sh        $s2, 0xe($s0)
-/* E1114 8014AA14 AE140010 */  sw        $s4, 0x10($s0)
-/* E1118 8014AA18 AE110014 */  sw        $s1, 0x14($s0)
-/* E111C 8014AA1C A6040002 */  sh        $a0, 2($s0)
-/* E1120 8014AA20 34630020 */  ori       $v1, $v1, 0x20
-/* E1124 8014AA24 A6030000 */  sh        $v1, ($s0)
-/* E1128 8014AA28 3063FFFD */  andi      $v1, $v1, 0xfffd
-.L8014AA2C:
-/* E112C 8014AA2C A6030000 */  sh        $v1, ($s0)
-.L8014AA30:
-/* E1130 8014AA30 8FBF0028 */  lw        $ra, 0x28($sp)
-/* E1134 8014AA34 8FB50024 */  lw        $s5, 0x24($sp)
-/* E1138 8014AA38 8FB40020 */  lw        $s4, 0x20($sp)
-/* E113C 8014AA3C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* E1140 8014AA40 8FB20018 */  lw        $s2, 0x18($sp)
-/* E1144 8014AA44 8FB10014 */  lw        $s1, 0x14($sp)
-/* E1148 8014AA48 8FB00010 */  lw        $s0, 0x10($sp)
-/* E114C 8014AA4C 03E00008 */  jr        $ra
-/* E1150 8014AA50 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s
deleted file mode 100644
index 8a219c2e58..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AC84
-/* E1384 8014AC84 3C018016 */  lui       $at, %hi(D_80159AE2)
-/* E1388 8014AC88 A4249AE2 */  sh        $a0, %lo(D_80159AE2)($at)
-/* E138C 8014AC8C 03E00008 */  jr        $ra
-/* E1390 8014AC90 00000000 */   nop      
diff --git a/include/common_structs.h b/include/common_structs.h
index ef6c39c281..74516f195e 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -311,7 +311,8 @@ typedef struct MusicPlayer {
     /* 0x02 */ u16 unk_02;
     /* 0x04 */ s32 fadeOutTime;
     /* 0x08 */ s32 fadeInTime;
-    /* 0x0C */ char unk_0C[4];
+    /* 0x0C */ s16 unk_0C;
+    /* 0x0E */ s16 unk_0E;
     /* 0x10 */ s32 songID;
     /* 0x14 */ s32 variation;
     /* 0x18 */ s32 unk_18;
diff --git a/include/variables.h b/include/variables.h
index fcc0de30f5..871adf2067 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -80,7 +80,7 @@ extern s32 D_8010CD20;
 extern s32 D_8010EF08;
 extern s32 D_8010F094; // player shadow index?
 extern s32 D_801595A0;
-extern s16 D_80159AE2;
+extern s16 D_80159AE2; // music target volume?
 extern s16 D_80159AE4;
 extern BackgroundHeader gBackgroundImage;
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 3ca5fced0d..35a9193232 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -65,7 +65,39 @@ s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime,
     return _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
 }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);
+s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
+    GameStatus* gameStatus = GAME_STATUS;
+
+    if (gameStatus->demoState != 0) {
+        return 1;
+    } else {
+        MusicPlayer* musicPlayers = &gMusicPlayers;
+        MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
+
+        if (!gameStatus->musicEnabled) {
+            func_800559C4(musicPlayer->unk_18);
+            musicPlayer->flags &= ~1;
+
+            return 1;
+        } else {
+            s32 defaultVariation = get_default_variation_for_song(songID);
+            if (defaultVariation >= 0) {
+                variation = defaultVariation;
+            }
+
+            musicPlayer->fadeInTime = fadeInTime;
+            musicPlayer->unk_0C = arg4;
+            musicPlayer->unk_0E = arg5;
+            musicPlayer->songID = songID;
+            musicPlayer->variation = variation;
+            musicPlayer->flags |= 0x20;
+            musicPlayer->unk_02 = 1;
+            musicPlayer->flags &= ~2;
+
+            return 1;
+        }
+    }
+}
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AA54);
 
@@ -81,7 +113,9 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC5C);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70);
 
-INCLUDE_ASM(void, "code_e0b30_len_b80", func_8014AC84, s16 volume);
+void func_8014AC84(s16 volume) {
+    D_80159AE2 = volume;
+}
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94);
 

From 9c5338c04b2ee4ce036926d22bf1a69aa1c9c1ac Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 02:54:01 +0000
Subject: [PATCH 008/101] match func_8014AA54

---
 .../code_e0b30_len_b80/func_8014AA54.s        | 57 -------------------
 include/variables.h                           |  4 +-
 src/code_e0b30_len_b80.c                      | 29 +++++++++-
 tools/symbol_addrs.txt                        |  4 +-
 undefined_syms.txt                            |  4 +-
 5 files changed, 36 insertions(+), 62 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s
deleted file mode 100644
index 9141c6f751..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AA54
-/* E1154 8014AA54 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E1158 8014AA58 3C028016 */  lui       $v0, 0x8016
-/* E115C 8014AA5C 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E1160 8014AA60 00041840 */  sll       $v1, $a0, 1
-/* E1164 8014AA64 00641821 */  addu      $v1, $v1, $a0
-/* E1168 8014AA68 00031900 */  sll       $v1, $v1, 4
-/* E116C 8014AA6C 00621821 */  addu      $v1, $v1, $v0
-/* E1170 8014AA70 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E1174 8014AA74 94640000 */  lhu       $a0, ($v1)
-/* E1178 8014AA78 30820001 */  andi      $v0, $a0, 1
-/* E117C 8014AA7C 10400003 */  beqz      $v0, .L8014AA8C
-/* E1180 8014AA80 30820002 */   andi     $v0, $a0, 2
-/* E1184 8014AA84 14400003 */  bnez      $v0, .L8014AA94
-/* E1188 8014AA88 00061400 */   sll      $v0, $a2, 0x10
-.L8014AA8C:
-/* E118C 8014AA8C 08052AC0 */  j         .L8014AB00
-/* E1190 8014AA90 0000102D */   daddu    $v0, $zero, $zero
-.L8014AA94:
-/* E1194 8014AA94 00022403 */  sra       $a0, $v0, 0x10
-/* E1198 8014AA98 24020001 */  addiu     $v0, $zero, 1
-/* E119C 8014AA9C 1082000F */  beq       $a0, $v0, .L8014AADC
-/* E11A0 8014AAA0 28820002 */   slti     $v0, $a0, 2
-/* E11A4 8014AAA4 10400005 */  beqz      $v0, .L8014AABC
-/* E11A8 8014AAA8 24020002 */   addiu    $v0, $zero, 2
-/* E11AC 8014AAAC 10800007 */  beqz      $a0, .L8014AACC
-/* E11B0 8014AAB0 24020001 */   addiu    $v0, $zero, 1
-/* E11B4 8014AAB4 08052AC0 */  j         .L8014AB00
-/* E11B8 8014AAB8 00000000 */   nop      
-.L8014AABC:
-/* E11BC 8014AABC 1082000C */  beq       $a0, $v0, .L8014AAF0
-/* E11C0 8014AAC0 24020001 */   addiu    $v0, $zero, 1
-/* E11C4 8014AAC4 08052AC0 */  j         .L8014AB00
-/* E11C8 8014AAC8 00000000 */   nop      
-.L8014AACC:
-/* E11CC 8014AACC 0C01580A */  jal       func_80056028
-/* E11D0 8014AAD0 8C640018 */   lw       $a0, 0x18($v1)
-/* E11D4 8014AAD4 08052AC0 */  j         .L8014AB00
-/* E11D8 8014AAD8 24020001 */   addiu    $v0, $zero, 1
-.L8014AADC:
-/* E11DC 8014AADC 8C640018 */  lw        $a0, 0x18($v1)
-/* E11E0 8014AAE0 0C015811 */  jal       func_80056044
-/* E11E4 8014AAE4 00000000 */   nop      
-/* E11E8 8014AAE8 08052AC0 */  j         .L8014AB00
-/* E11EC 8014AAEC 24020001 */   addiu    $v0, $zero, 1
-.L8014AAF0:
-/* E11F0 8014AAF0 8C640018 */  lw        $a0, 0x18($v1)
-/* E11F4 8014AAF4 0C01581A */  jal       func_80056068
-/* E11F8 8014AAF8 00000000 */   nop      
-/* E11FC 8014AAFC 24020001 */  addiu     $v0, $zero, 1
-.L8014AB00:
-/* E1200 8014AB00 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E1204 8014AB04 03E00008 */  jr        $ra
-/* E1208 8014AB08 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/variables.h b/include/variables.h
index 871adf2067..dff7fd36a2 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -165,7 +165,9 @@ extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;
 extern Bytecode* ShakeCamX;
 
-extern s16 gMusicVolume;
+extern s16 gMusicUnkVolume;
+extern s16 gMusicCurrentVolume;
+extern s16 gMusicTargetVolume;
 extern MusicPlayer gMusicPlayers[];
 
 #endif
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 35a9193232..0e24ebc7df 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -45,7 +45,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
                 return 2;
             }
 
-            gMusicVolume = volume;
+            gMusicUnkVolume = volume;
             musicPlayer->songID = songID;
             musicPlayer->variation = variation;
             musicPlayer->fadeOutTime = fadeOutTime;
@@ -99,7 +99,32 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
     }
 }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AA54);
+s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) {
+    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
+
+    if (!(musicPlayer->flags & 1)) {
+        return 0;
+    }
+
+    if (!(musicPlayer->flags & 2)) {
+        return 0;
+    }
+
+    switch (arg2) {
+        case 0:
+            func_80056028(musicPlayer->unk_18, arg1);
+            break;
+        case 1:
+            func_80056044(musicPlayer->unk_18, arg1);
+            break;
+        case 2:
+            func_80056068(musicPlayer->unk_18, arg1);
+            break;
+    }
+
+    return 1;
+}
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AB0C);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 12db0921df..c83ba8dce3 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1899,5 +1899,7 @@ EnemyNpcHit;0x80077F70
 EnemyNpcDefeat;0x8007809C
 D_80078DB0;0x80078DB0
 D_80078DB4;0x80078DB4
-gMusicVolume;0x80159AE0
 gMusicPlayers;0x80159AF0
+gMusicUnkVolume;0x80159AE0
+gMusicTargetVolume;0x80159AE2
+gMusicCurVolume;0x80159AE6
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 5727b9abe2..ba19514be9 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -264,5 +264,7 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 
-gMusicVolume = 0x80159AE0;
+gMusicUnkVolume = 0x80159AE0;
+gMusicTargetVolume = 0x80159AE2;
+gMusicCurVolume = 0x80159AE6;
 gMusicPlayers = 0x80159AF0;

From 631afbe47798c153dd4e4c347e5eef6d5389cba3 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 03:43:58 +0000
Subject: [PATCH 009/101] match many small funcs, rename symbols

---
 .../code_e0b30_len_b80/func_8014A498.s        |  8 +--
 .../code_e0b30_len_b80/func_8014AB0C.s        | 27 --------
 .../code_e0b30_len_b80/func_8014AB60.s        | 27 --------
 .../code_e0b30_len_b80/func_8014ABB4.s        | 27 --------
 .../code_e0b30_len_b80/func_8014AC08.s        | 25 --------
 .../code_e0b30_len_b80/func_8014AC5C.s        |  9 ---
 .../code_e0b30_len_b80/func_8014AC70.s        |  9 ---
 .../code_e0b30_len_b80/func_8014AC94.s        | 18 +++---
 .../code_e0b30_len_b80/func_8014AF8C.s        |  9 ---
 include/common_structs.h                      |  4 +-
 include/variables.h                           |  3 +-
 src/code_e0b30_len_b80.c                      | 61 +++++++++++++++----
 tools/symbol_addrs.txt                        |  1 +
 undefined_syms.txt                            | 13 ++--
 14 files changed, 74 insertions(+), 167 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AB60.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014ABB4.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s
index 013083418f..69f5b7c302 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s
@@ -30,10 +30,10 @@ glabel func_8014A498
 /* E0BF4 8014A4F4 1440FFF0 */  bnez      $v0, .L8014A4B8
 /* E0BF8 8014A4F8 24840030 */   addiu    $a0, $a0, 0x30
 /* E0BFC 8014A4FC 24020008 */  addiu     $v0, $zero, 8
-/* E0C00 8014A500 3C018016 */  lui       $at, %hi(D_80159AE2)
-/* E0C04 8014A504 A4229AE2 */  sh        $v0, %lo(D_80159AE2)($at)
-/* E0C08 8014A508 3C018016 */  lui       $at, %hi(D_80159AE4)
-/* E0C0C 8014A50C A4229AE4 */  sh        $v0, %lo(D_80159AE4)($at)
+/* E0C00 8014A500 3C018016 */  lui       $at, %hi(gMusicTargetVolume)
+/* E0C04 8014A504 A4229AE2 */  sh        $v0, %lo(gMusicTargetVolume)($at)
+/* E0C08 8014A508 3C018016 */  lui       $at, %hi(gMusicUnkVolume2)
+/* E0C0C 8014A50C A4229AE4 */  sh        $v0, %lo(gMusicUnkVolume2)($at)
 /* E0C10 8014A510 3C018016 */  lui       $at, 0x8016
 /* E0C14 8014A514 A4229AE6 */  sh        $v0, -0x651a($at)
 /* E0C18 8014A518 0C015869 */  jal       func_800561A4
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s
deleted file mode 100644
index 8f8d3ba207..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AB0C
-/* E120C 8014AB0C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E1210 8014AB10 3C028016 */  lui       $v0, 0x8016
-/* E1214 8014AB14 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E1218 8014AB18 00041840 */  sll       $v1, $a0, 1
-/* E121C 8014AB1C 00641821 */  addu      $v1, $v1, $a0
-/* E1220 8014AB20 00031900 */  sll       $v1, $v1, 4
-/* E1224 8014AB24 00621821 */  addu      $v1, $v1, $v0
-/* E1228 8014AB28 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E122C 8014AB2C 94620000 */  lhu       $v0, ($v1)
-/* E1230 8014AB30 30420001 */  andi      $v0, $v0, 1
-/* E1234 8014AB34 10400006 */  beqz      $v0, .L8014AB50
-/* E1238 8014AB38 00052C00 */   sll      $a1, $a1, 0x10
-/* E123C 8014AB3C 8C640018 */  lw        $a0, 0x18($v1)
-/* E1240 8014AB40 0C015777 */  jal       func_80055DDC
-/* E1244 8014AB44 00052C03 */   sra      $a1, $a1, 0x10
-/* E1248 8014AB48 08052AD5 */  j         .L8014AB54
-/* E124C 8014AB4C 00000000 */   nop      
-.L8014AB50:
-/* E1250 8014AB50 0000102D */  daddu     $v0, $zero, $zero
-.L8014AB54:
-/* E1254 8014AB54 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E1258 8014AB58 03E00008 */  jr        $ra
-/* E125C 8014AB5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB60.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AB60.s
deleted file mode 100644
index 46042b52a4..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB60.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AB60
-/* E1260 8014AB60 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E1264 8014AB64 3C028016 */  lui       $v0, 0x8016
-/* E1268 8014AB68 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E126C 8014AB6C 00041840 */  sll       $v1, $a0, 1
-/* E1270 8014AB70 00641821 */  addu      $v1, $v1, $a0
-/* E1274 8014AB74 00031900 */  sll       $v1, $v1, 4
-/* E1278 8014AB78 00621821 */  addu      $v1, $v1, $v0
-/* E127C 8014AB7C AFBF0010 */  sw        $ra, 0x10($sp)
-/* E1280 8014AB80 94620000 */  lhu       $v0, ($v1)
-/* E1284 8014AB84 30420001 */  andi      $v0, $v0, 1
-/* E1288 8014AB88 10400006 */  beqz      $v0, .L8014ABA4
-/* E128C 8014AB8C 00052C00 */   sll      $a1, $a1, 0x10
-/* E1290 8014AB90 8C640018 */  lw        $a0, 0x18($v1)
-/* E1294 8014AB94 0C015792 */  jal       func_80055E48
-/* E1298 8014AB98 00052C03 */   sra      $a1, $a1, 0x10
-/* E129C 8014AB9C 08052AEA */  j         .L8014ABA8
-/* E12A0 8014ABA0 00000000 */   nop      
-.L8014ABA4:
-/* E12A4 8014ABA4 0000102D */  daddu     $v0, $zero, $zero
-.L8014ABA8:
-/* E12A8 8014ABA8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E12AC 8014ABAC 03E00008 */  jr        $ra
-/* E12B0 8014ABB0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ABB4.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ABB4.s
deleted file mode 100644
index 1899e95433..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ABB4.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014ABB4
-/* E12B4 8014ABB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E12B8 8014ABB8 3C028016 */  lui       $v0, 0x8016
-/* E12BC 8014ABBC 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E12C0 8014ABC0 00041840 */  sll       $v1, $a0, 1
-/* E12C4 8014ABC4 00641821 */  addu      $v1, $v1, $a0
-/* E12C8 8014ABC8 00031900 */  sll       $v1, $v1, 4
-/* E12CC 8014ABCC 00621821 */  addu      $v1, $v1, $v0
-/* E12D0 8014ABD0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E12D4 8014ABD4 94620000 */  lhu       $v0, ($v1)
-/* E12D8 8014ABD8 30420001 */  andi      $v0, $v0, 1
-/* E12DC 8014ABDC 10400006 */  beqz      $v0, .L8014ABF8
-/* E12E0 8014ABE0 00052C00 */   sll      $a1, $a1, 0x10
-/* E12E4 8014ABE4 8C640018 */  lw        $a0, 0x18($v1)
-/* E12E8 8014ABE8 0C015731 */  jal       func_80055CC4
-/* E12EC 8014ABEC 00052C03 */   sra      $a1, $a1, 0x10
-/* E12F0 8014ABF0 08052AFF */  j         .L8014ABFC
-/* E12F4 8014ABF4 00000000 */   nop      
-.L8014ABF8:
-/* E12F8 8014ABF8 0000102D */  daddu     $v0, $zero, $zero
-.L8014ABFC:
-/* E12FC 8014ABFC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E1300 8014AC00 03E00008 */  jr        $ra
-/* E1304 8014AC04 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s
deleted file mode 100644
index 0b64c7e4d2..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AC08
-/* E1308 8014AC08 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E130C 8014AC0C 0000202D */  daddu     $a0, $zero, $zero
-/* E1310 8014AC10 2405FFFF */  addiu     $a1, $zero, -1
-/* E1314 8014AC14 0080302D */  daddu     $a2, $a0, $zero
-/* E1318 8014AC18 240700FA */  addiu     $a3, $zero, 0xfa
-/* E131C 8014AC1C AFB00018 */  sw        $s0, 0x18($sp)
-/* E1320 8014AC20 24100008 */  addiu     $s0, $zero, 8
-/* E1324 8014AC24 AFBF001C */  sw        $ra, 0x1c($sp)
-/* E1328 8014AC28 0C052A46 */  jal       set_music_track
-/* E132C 8014AC2C AFB00010 */   sw       $s0, 0x10($sp)
-/* E1330 8014AC30 24040001 */  addiu     $a0, $zero, 1
-/* E1334 8014AC34 2405FFFF */  addiu     $a1, $zero, -1
-/* E1338 8014AC38 0000302D */  daddu     $a2, $zero, $zero
-/* E133C 8014AC3C 240700FA */  addiu     $a3, $zero, 0xfa
-/* E1340 8014AC40 0C052A46 */  jal       set_music_track
-/* E1344 8014AC44 AFB00010 */   sw       $s0, 0x10($sp)
-/* E1348 8014AC48 8FBF001C */  lw        $ra, 0x1c($sp)
-/* E134C 8014AC4C 8FB00018 */  lw        $s0, 0x18($sp)
-/* E1350 8014AC50 24020001 */  addiu     $v0, $zero, 1
-/* E1354 8014AC54 03E00008 */  jr        $ra
-/* E1358 8014AC58 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s
deleted file mode 100644
index 3bc632238a..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AC5C
-/* E135C 8014AC5C 24020004 */  addiu     $v0, $zero, 4
-/* E1360 8014AC60 3C018016 */  lui       $at, %hi(D_80159AE4)
-/* E1364 8014AC64 A4229AE4 */  sh        $v0, %lo(D_80159AE4)($at)
-/* E1368 8014AC68 03E00008 */  jr        $ra
-/* E136C 8014AC6C 00000000 */   nop      
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s
deleted file mode 100644
index 9b0abe19a3..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AC70
-/* E1370 8014AC70 24020008 */  addiu     $v0, $zero, 8
-/* E1374 8014AC74 3C018016 */  lui       $at, %hi(D_80159AE4)
-/* E1378 8014AC78 A4229AE4 */  sh        $v0, %lo(D_80159AE4)($at)
-/* E137C 8014AC7C 03E00008 */  jr        $ra
-/* E1380 8014AC80 00000000 */   nop      
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
index 3428a38914..f1b97ef67a 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
@@ -13,15 +13,15 @@ glabel func_8014AC94
 /* E13B4 8014ACB4 08052B4D */  j         .L8014AD34
 /* E13B8 8014ACB8 A4820000 */   sh       $v0, ($a0)
 .L8014ACBC:
-/* E13BC 8014ACBC 3C038016 */  lui       $v1, %hi(D_80159AE2)
-/* E13C0 8014ACC0 84639AE2 */  lh        $v1, %lo(D_80159AE2)($v1)
-/* E13C4 8014ACC4 3C028016 */  lui       $v0, %hi(D_80159AE4)
-/* E13C8 8014ACC8 84429AE4 */  lh        $v0, %lo(D_80159AE4)($v0)
-/* E13CC 8014ACCC 3C048016 */  lui       $a0, %hi(D_80159AE2)
-/* E13D0 8014ACD0 94849AE2 */  lhu       $a0, %lo(D_80159AE2)($a0)
+/* E13BC 8014ACBC 3C038016 */  lui       $v1, %hi(gMusicTargetVolume)
+/* E13C0 8014ACC0 84639AE2 */  lh        $v1, %lo(gMusicTargetVolume)($v1)
+/* E13C4 8014ACC4 3C028016 */  lui       $v0, %hi(gMusicUnkVolume2)
+/* E13C8 8014ACC8 84429AE4 */  lh        $v0, %lo(gMusicUnkVolume2)($v0)
+/* E13CC 8014ACCC 3C048016 */  lui       $a0, %hi(gMusicTargetVolume)
+/* E13D0 8014ACD0 94849AE2 */  lhu       $a0, %lo(gMusicTargetVolume)($a0)
 /* E13D4 8014ACD4 0043102A */  slt       $v0, $v0, $v1
-/* E13D8 8014ACD8 3C038016 */  lui       $v1, %hi(D_80159AE4)
-/* E13DC 8014ACDC 94639AE4 */  lhu       $v1, %lo(D_80159AE4)($v1)
+/* E13D8 8014ACD8 3C038016 */  lui       $v1, %hi(gMusicUnkVolume2)
+/* E13DC 8014ACDC 94639AE4 */  lhu       $v1, %lo(gMusicUnkVolume2)($v1)
 /* E13E0 8014ACE0 54400001 */  bnel      $v0, $zero, .L8014ACE8
 /* E13E4 8014ACE4 0060202D */   daddu    $a0, $v1, $zero
 .L8014ACE8:
@@ -41,7 +41,7 @@ glabel func_8014AC94
 /* E1418 8014AD18 3C048016 */  lui       $a0, 0x8016
 /* E141C 8014AD1C 84849AE6 */  lh        $a0, -0x651a($a0)
 /* E1420 8014AD20 0C015869 */  jal       func_800561A4
-/* E1424 8014AD24 00000000 */   nop      
+/* E1424 8014AD24 00000000 */   nop
 /* E1428 8014AD28 24020003 */  addiu     $v0, $zero, 3
 /* E142C 8014AD2C 3C018015 */  lui       $at, 0x8015
 /* E1430 8014AD30 A422F738 */  sh        $v0, -0x8c8($at)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s
deleted file mode 100644
index d105d8a217..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014AF8C
-/* E168C 8014AF8C 3C028016 */  lui       $v0, 0x8016
-/* E1690 8014AF90 24429AF0 */  addiu     $v0, $v0, -0x6510
-/* E1694 8014AF94 AC44001C */  sw        $a0, 0x1c($v0)
-/* E1698 8014AF98 03E00008 */  jr        $ra
-/* E169C 8014AF9C AC450020 */   sw       $a1, 0x20($v0)
diff --git a/include/common_structs.h b/include/common_structs.h
index 74516f195e..3034c2317c 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -316,7 +316,9 @@ typedef struct MusicPlayer {
     /* 0x10 */ s32 songID;
     /* 0x14 */ s32 variation;
     /* 0x18 */ s32 unk_18;
-    /* 0x1C */ char unk_1C[20];
+    /* 0x1C */ s32 unk_1C;
+    /* 0x20 */ s32 unk_20;
+    /* 0x24 */ char unk_24[12];
 } MusicPlayer; // size = 0x30
 
 typedef struct MenuIcon {
diff --git a/include/variables.h b/include/variables.h
index dff7fd36a2..0d6ce235df 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -80,8 +80,6 @@ extern s32 D_8010CD20;
 extern s32 D_8010EF08;
 extern s32 D_8010F094; // player shadow index?
 extern s32 D_801595A0;
-extern s16 D_80159AE2; // music target volume?
-extern s16 D_80159AE4;
 extern BackgroundHeader gBackgroundImage;
 
 extern PrintContext* gCurrentPrintContext;
@@ -166,6 +164,7 @@ extern Bytecode* ShakeCam1;
 extern Bytecode* ShakeCamX;
 
 extern s16 gMusicUnkVolume;
+extern s16 gMusicUnkVolume2;
 extern s16 gMusicCurrentVolume;
 extern s16 gMusicTargetVolume;
 extern MusicPlayer gMusicPlayers[];
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 0e24ebc7df..f186d032a8 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -1,6 +1,5 @@
 #include "common.h"
 
-
 void func_8014AC84(s16 volume);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song);
@@ -8,8 +7,8 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song);
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
 
 void func_8014A52C(void) {
-    D_80159AE2 = 0x08;
-    D_80159AE4 = 0x08;
+    gMusicTargetVolume = 8;
+    gMusicUnkVolume2 = 8;
 }
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
@@ -126,20 +125,56 @@ s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) {
     return 1;
 }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AB0C);
+s32 func_8014AB0C(s32 playerIndex, s16 arg1) {
+    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AB60);
+    if (!(musicPlayer->flags & 1)) {
+        return 0;
+    }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014ABB4);
+    return func_80055DDC(musicPlayer->unk_18, arg1);
+}
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC08);
+s32 func_8014AB60(s32 playerIndex, s16 arg1) {
+    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC5C);
+    if (!(musicPlayer->flags & 1)) {
+        return 0;
+    }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70);
+    return func_80055E48(musicPlayer->unk_18, arg1);
+}
+
+s32 func_8014ABB4(s32 playerIndex, s16 arg1) {
+    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
+
+    if (!(musicPlayer->flags & 1)) {
+        return 0;
+    }
+
+    return func_80055CC4(musicPlayer->unk_18, arg1);
+}
+
+s32 func_8014AC08(void) {
+    set_music_track(0, -1, 0, 250, 8);
+    set_music_track(1, -1, 0, 250, 8);
+
+    return 1;
+}
+
+void func_8014AC5C(void) {
+    gMusicUnkVolume2 = 4;
+}
+
+void func_8014AC70(void) {
+    gMusicUnkVolume2 = 8;
+}
 
 void func_8014AC84(s16 volume) {
-    D_80159AE2 = volume;
+    gMusicTargetVolume = volume;
 }
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94);
@@ -154,7 +189,11 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AE6C);
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AEF8);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AF8C);
+void func_8014AF8C(s32 arg0, s32 arg1) {
+    MusicPlayer* musicPlayer = &gMusicPlayers[0];
+    musicPlayer->unk_1C = arg0;
+    musicPlayer->unk_20 = arg1;
+}
 
 void func_8014AFA0(void) {
 }
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index c83ba8dce3..27ca6bc9e6 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1901,5 +1901,6 @@ D_80078DB0;0x80078DB0
 D_80078DB4;0x80078DB4
 gMusicPlayers;0x80159AF0
 gMusicUnkVolume;0x80159AE0
+gMusicUnkVolume2;0x80159AE4
 gMusicTargetVolume;0x80159AE2
 gMusicCurVolume;0x80159AE6
diff --git a/undefined_syms.txt b/undefined_syms.txt
index ba19514be9..0442c35f66 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -179,8 +179,12 @@ gTriggerList2 = 0x80159290;
 gCurrentTriggerListPtr = 0x80159390;
 
 D_801595A0 = 0x801595A0;
-D_80159AE2 = 0x80159AE2;
-D_80159AE4 = 0x80159AE4;
+gMusicUnkVolume = 0x80159AE0;
+gMusicTargetVolume = 0x80159AE2;
+gMusicUnkVolume2 = 0x80159AE4;
+gMusicCurVolume = 0x80159AE6;
+gMusicPlayers = 0x80159AF0;
+
 gCollisionStatus = 0x8015A550;
 D_8015C7C0 = 0x8015C7C0;
 gLastCreatedEntityIndex = 0x801512EC;
@@ -263,8 +267,3 @@ EnemyNpcDefeat = 0x8007809C;
 
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
-
-gMusicUnkVolume = 0x80159AE0;
-gMusicTargetVolume = 0x80159AE2;
-gMusicCurVolume = 0x80159AE6;
-gMusicPlayers = 0x80159AF0;

From 7376b736d01e4f7625ca0022a463b67d3106ae20 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 12:08:00 -0400
Subject: [PATCH 010/101] a couple

---
 Makefile                                    |  6 +-
 asm/nonmatchings/code_F5750/PlayerMoveTo.s  | 86 ---------------------
 asm/nonmatchings/code_F5750/func_802D249C.s | 27 -------
 include/functions.h                         |  1 +
 src/code_7bb60_len_41b0.c                   |  2 +-
 src/code_F5750.c                            | 38 ++++++++-
 6 files changed, 41 insertions(+), 119 deletions(-)
 delete mode 100644 asm/nonmatchings/code_F5750/PlayerMoveTo.s
 delete mode 100644 asm/nonmatchings/code_F5750/func_802D249C.s

diff --git a/Makefile b/Makefile
index 0bb9ba311e..f838e6f178 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ CPP := cpp
 LD := $(CROSS)ld
 OBJCOPY := $(CROSS)objcopy
 
-CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment -MP -MD
+CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment
 ASFLAGS    := -EB -Iinclude -march=vr4300 -mtune=vr4300
 OLDASFLAGS := -EB -Iinclude -G 0
 CFLAGS     := -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow
@@ -133,12 +133,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -MP -MD -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -MP -MD -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s
diff --git a/asm/nonmatchings/code_F5750/PlayerMoveTo.s b/asm/nonmatchings/code_F5750/PlayerMoveTo.s
deleted file mode 100644
index 50896c8d7a..0000000000
--- a/asm/nonmatchings/code_F5750/PlayerMoveTo.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel PlayerMoveTo
-/* F5AE4 802D1134 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F5AE8 802D1138 AFB10014 */  sw        $s1, 0x14($sp)
-/* F5AEC 802D113C 0080882D */  daddu     $s1, $a0, $zero
-/* F5AF0 802D1140 AFB20018 */  sw        $s2, 0x18($sp)
-/* F5AF4 802D1144 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* F5AF8 802D1148 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* F5AFC 802D114C AFBF001C */  sw        $ra, 0x1c($sp)
-/* F5B00 802D1150 AFB00010 */  sw        $s0, 0x10($sp)
-/* F5B04 802D1154 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F5B08 802D1158 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F5B0C 802D115C 10A00038 */  beqz      $a1, .L802D1240
-/* F5B10 802D1160 8E30000C */   lw       $s0, 0xc($s1)
-/* F5B14 802D1164 8E050000 */  lw        $a1, ($s0)
-/* F5B18 802D1168 0C0B1EAF */  jal       get_variable
-/* F5B1C 802D116C 26100004 */   addiu    $s0, $s0, 4
-/* F5B20 802D1170 8E050000 */  lw        $a1, ($s0)
-/* F5B24 802D1174 26100004 */  addiu     $s0, $s0, 4
-/* F5B28 802D1178 4482B000 */  mtc1      $v0, $f22
-/* F5B2C 802D117C 00000000 */  nop       
-/* F5B30 802D1180 4680B5A0 */  cvt.s.w   $f22, $f22
-/* F5B34 802D1184 0C0B1EAF */  jal       get_variable
-/* F5B38 802D1188 0220202D */   daddu    $a0, $s1, $zero
-/* F5B3C 802D118C 8E050000 */  lw        $a1, ($s0)
-/* F5B40 802D1190 4482A000 */  mtc1      $v0, $f20
-/* F5B44 802D1194 00000000 */  nop       
-/* F5B48 802D1198 4680A520 */  cvt.s.w   $f20, $f20
-/* F5B4C 802D119C 0C0B1EAF */  jal       get_variable
-/* F5B50 802D11A0 0220202D */   daddu    $a0, $s1, $zero
-/* F5B54 802D11A4 AE220070 */  sw        $v0, 0x70($s1)
-/* F5B58 802D11A8 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5B5C 802D11AC C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5B60 802D11B0 4406B000 */  mfc1      $a2, $f22
-/* F5B64 802D11B4 4407A000 */  mfc1      $a3, $f20
-/* F5B68 802D11B8 0C00A720 */  jal       atan2
-/* F5B6C 802D11BC 00000000 */   nop      
-/* F5B70 802D11C0 E6400080 */  swc1      $f0, 0x80($s2)
-/* F5B74 802D11C4 8E220070 */  lw        $v0, 0x70($s1)
-/* F5B78 802D11C8 1440000F */  bnez      $v0, .L802D1208
-/* F5B7C 802D11CC 00000000 */   nop      
-/* F5B80 802D11D0 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5B84 802D11D4 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5B88 802D11D8 4406B000 */  mfc1      $a2, $f22
-/* F5B8C 802D11DC 4407A000 */  mfc1      $a3, $f20
-/* F5B90 802D11E0 0C00A7B5 */  jal       dist2D
-/* F5B94 802D11E4 00000000 */   nop      
-/* F5B98 802D11E8 3C02802E */  lui       $v0, %hi(gPlayerNpcPtr)
-/* F5B9C 802D11EC 8C429D20 */  lw        $v0, %lo(gPlayerNpcPtr)($v0)
-/* F5BA0 802D11F0 C4420018 */  lwc1      $f2, 0x18($v0)
-/* F5BA4 802D11F4 46020003 */  div.s     $f0, $f0, $f2
-/* F5BA8 802D11F8 4600010D */  trunc.w.s $f4, $f0
-/* F5BAC 802D11FC E6240070 */  swc1      $f4, 0x70($s1)
-/* F5BB0 802D1200 080B448B */  j         .L802D122C
-/* F5BB4 802D1204 C4400018 */   lwc1     $f0, 0x18($v0)
-.L802D1208:
-/* F5BB8 802D1208 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5BBC 802D120C C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5BC0 802D1210 4406B000 */  mfc1      $a2, $f22
-/* F5BC4 802D1214 4407A000 */  mfc1      $a3, $f20
-/* F5BC8 802D1218 0C00A7B5 */  jal       dist2D
-/* F5BCC 802D121C 00000000 */   nop      
-/* F5BD0 802D1220 C6220070 */  lwc1      $f2, 0x70($s1)
-/* F5BD4 802D1224 468010A0 */  cvt.s.w   $f2, $f2
-/* F5BD8 802D1228 46020003 */  div.s     $f0, $f0, $f2
-.L802D122C:
-/* F5BDC 802D122C 8E240070 */  lw        $a0, 0x70($s1)
-/* F5BE0 802D1230 8E450080 */  lw        $a1, 0x80($s2)
-/* F5BE4 802D1234 44060000 */  mfc1      $a2, $f0
-/* F5BE8 802D1238 0C0389DE */  jal       move_player
-/* F5BEC 802D123C 00000000 */   nop      
-.L802D1240:
-/* F5BF0 802D1240 8E230070 */  lw        $v1, 0x70($s1)
-/* F5BF4 802D1244 2463FFFF */  addiu     $v1, $v1, -1
-/* F5BF8 802D1248 AE230070 */  sw        $v1, 0x70($s1)
-/* F5BFC 802D124C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F5C00 802D1250 8FB20018 */  lw        $s2, 0x18($sp)
-/* F5C04 802D1254 8FB10014 */  lw        $s1, 0x14($sp)
-/* F5C08 802D1258 8FB00010 */  lw        $s0, 0x10($sp)
-/* F5C0C 802D125C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F5C10 802D1260 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F5C14 802D1264 000317C2 */  srl       $v0, $v1, 0x1f
-/* F5C18 802D1268 03E00008 */  jr        $ra
-/* F5C1C 802D126C 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/code_F5750/func_802D249C.s b/asm/nonmatchings/code_F5750/func_802D249C.s
deleted file mode 100644
index 7202fe94dc..0000000000
--- a/asm/nonmatchings/code_F5750/func_802D249C.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D249C
-/* F6E4C 802D249C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F6E50 802D24A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* F6E54 802D24A4 0080882D */  daddu     $s1, $a0, $zero
-/* F6E58 802D24A8 3C028016 */  lui       $v0, 0x8016
-/* F6E5C 802D24AC 8442A552 */  lh        $v0, -0x5aae($v0)
-/* F6E60 802D24B0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F6E64 802D24B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* F6E68 802D24B8 8E30000C */  lw        $s0, 0xc($s1)
-/* F6E6C 802D24BC 04400004 */  bltz      $v0, .L802D24D0
-/* F6E70 802D24C0 0000302D */   daddu    $a2, $zero, $zero
-/* F6E74 802D24C4 0C0B48FE */  jal       func_802D23F8
-/* F6E78 802D24C8 00000000 */   nop      
-/* F6E7C 802D24CC 0002302B */  sltu      $a2, $zero, $v0
-.L802D24D0:
-/* F6E80 802D24D0 8E050000 */  lw        $a1, ($s0)
-/* F6E84 802D24D4 0C0B2026 */  jal       set_variable
-/* F6E88 802D24D8 0220202D */   daddu    $a0, $s1, $zero
-/* F6E8C 802D24DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F6E90 802D24E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* F6E94 802D24E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* F6E98 802D24E8 24020002 */  addiu     $v0, $zero, 2
-/* F6E9C 802D24EC 03E00008 */  jr        $ra
-/* F6EA0 802D24F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/include/functions.h b/include/functions.h
index 033f72bb6e..c4333481bb 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -102,6 +102,7 @@ s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode item
 void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);
 
 void disable_player_shadow(void);
+void move_player(s32 duration, f32 heading, f32 speed);
 
 Npc* get_npc_safe(NpcId npcId);
 Npc* get_npc_unsafe(NpcId npcId);
diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c
index 35841f3fcf..7becacbe3f 100644
--- a/src/code_7bb60_len_41b0.c
+++ b/src/code_7bb60_len_41b0.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E26C4);
 
 void set_action_state(s32 actionState);
 
-void move_player(s16 duration, f32 heading, f32 speed) {
+void move_player(s32 duration, f32 heading, f32 speed) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
     playerStatus->flags |= 0x4000;
diff --git a/src/code_F5750.c b/src/code_F5750.c
index 02b1382646..2654cfc464 100644
--- a/src/code_F5750.c
+++ b/src/code_F5750.c
@@ -122,7 +122,32 @@ ApiStatus SetPlayerAnimationSpeed(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "code_F5750", PlayerMoveTo, ScriptInstance* script, s32 isInitialCall);
+ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+    f32 var0;
+    f32 var1;
+    f32 moveSpeed;
+
+    if (isInitialCall) {
+        var1 = get_variable(script, *args++);
+        var0 = get_variable(script, *args++);
+        script->functionTemp[0].s = get_variable(script, *args++);
+        playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, var1, var0);
+
+        if (script->functionTemp[0].s == 0) {
+            script->functionTemp[0].s = (dist2D(playerStatus->position.x, playerStatus->position.z, var1,
+                                                var0) / gPlayerNpcPtr->moveSpeed);
+            moveSpeed = gPlayerNpcPtr->moveSpeed;
+        } else {
+            moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, var1, var0) / script->functionTemp[0].s;
+        }
+        move_player(script->functionTemp[0].s, playerStatus->targetYaw, moveSpeed);
+    }
+
+    script->functionTemp[0].s--;
+    return script->functionTemp[0].s < 0;
+}
 
 INCLUDE_ASM(s32, "code_F5750", func_802D1270);
 
@@ -236,7 +261,16 @@ INCLUDE_ASM(s32, "code_F5750", func_802D244C);
 
 INCLUDE_ASM(s32, "code_F5750", func_802D2484);
 
-INCLUDE_ASM(s32, "code_F5750", func_802D249C);
+ApiStatus func_802D249C(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 val = 0;
+    if (gCollisionStatus.currentFloor >= 0) {
+        val = func_802D23F8() != 0;
+    }
+    set_variable(script, *args, val);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_802D24F4(ScriptInstance* script, s32 isInitialCall) {
     return (gPlayerStatus.moveFrames == 0) * ApiStatus_DONE2;

From 13d3c64295192851d04541a5ff0823ddcb24bdf4 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 17:45:40 +0000
Subject: [PATCH 011/101] fix WATCH_INCLUDES=0 and pipefail

---
 Makefile | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 0bb9ba311e..8e9c2e466d 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,11 @@ ifeq ($(NON_MATCHING),1)
 override COMPARE=0
 endif
 
+# PERMUTER=1 implies WATCH_INCLUDES=0
+ifeq ($(PERMUTER),1)
+override WATCH_INCLUDES=0
+endif
+
 
 ### Output ###
 
@@ -38,14 +43,7 @@ N64CKSUM := tools/n64crc
 SPLAT_YAML := tools/splat.yaml
 SPLAT = $(PYTHON) tools/n64splat/split.py $(BASEROM) $(SPLAT_YAML) .
 YAY0COMPRESS = tools/Yay0compress
-
-ifndef EMULATOR
-ifneq ($(shell which mupen64plus-gui),)
-EMULATOR = mupen64plus-gui
-else
 EMULATOR = mupen64plus
-endif
-endif
 
 
 ### Compiler Options ###
@@ -58,12 +56,17 @@ CPP := cpp
 LD := $(CROSS)ld
 OBJCOPY := $(CROSS)objcopy
 
-CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment -MP -MD
+CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment
 ASFLAGS    := -EB -Iinclude -march=vr4300 -mtune=vr4300
 OLDASFLAGS := -EB -Iinclude -G 0
 CFLAGS     := -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow
 LDFLAGS    := -T undefined_syms.txt -T undefined_funcs.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(LD_MAP) --no-check-sections
 
+ifeq ($(WATCH_INCLUDES),1)
+CPPMFLAGS   = -MP -MD -MF $@.mk -MT $(BUILD_DIR)/$*.d
+MDEPS       = $(BUILD_DIR)/%.d
+endif
+
 ifeq ($(NON_MATCHING),1)
 CPPFLAGS += -DNON_MATCHING
 endif
@@ -106,11 +109,7 @@ split-all:
 	$(SPLAT) --modes all
 
 test: $(ROM)
-ifdef EMULATOR
 	$(EMULATOR) $<
-else
-	@echo "N64 emulator not detected." && false
-endif
 
 # Compressed files
 %.Yay0: %
@@ -131,14 +130,14 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 	$(LD) -r -b binary -o $@ $<
 
 # Compile C files
-$(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
+$(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
-$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
+$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s
@@ -173,12 +172,12 @@ ifeq ($(COMPARE),1)
 	@sha1sum -c checksum.sha1 || (echo 'The build succeeded, but did not match the base ROM. This is expected if you are making changes to the game. To skip this check, use "make COMPARE=0".' && false)
 endif
 
-$(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
-	$(OBJCOPY) $< $@ -O binary
-
 $(BUILD_DIR)/$(TARGET).elf: $(BUILD_DIR)/$(LD_SCRIPT) $(OBJECTS)
 	$(LD) $(LDFLAGS) -o $@
 
+$(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
+	$(OBJCOPY) $< $@ -O binary
+
 
 ### Make Settings ###
 
@@ -190,3 +189,6 @@ $(BUILD_DIR)/$(TARGET).elf: $(BUILD_DIR)/$(LD_SCRIPT) $(OBJECTS)
 
 # Remove built-in implicit rules to improve performance
 MAKEFLAGS += --no-builtin-rules
+
+# Fail targets if any command in the pipe exits with error
+SHELL = /bin/bash -e -o pipefail

From 18e8c3ca6859af5016232ba4808fe566aaa21e53 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 18:04:11 +0000
Subject: [PATCH 012/101] fix permuter

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8e9c2e466d..ece296eab5 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s

From 977fa7117d092043348b280f8c7f12a62361cbde Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 15:56:58 -0400
Subject: [PATCH 013/101] InterpPlayerYaw

---
 asm/nonmatchings/code_F5750/InterpPlayerYaw.s | 122 ------------------
 src/code_F5750.c                              |  42 +++++-
 2 files changed, 41 insertions(+), 123 deletions(-)
 delete mode 100644 asm/nonmatchings/code_F5750/InterpPlayerYaw.s

diff --git a/asm/nonmatchings/code_F5750/InterpPlayerYaw.s b/asm/nonmatchings/code_F5750/InterpPlayerYaw.s
deleted file mode 100644
index 4cb76428ce..0000000000
--- a/asm/nonmatchings/code_F5750/InterpPlayerYaw.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel InterpPlayerYaw
-/* F62EC 802D193C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F62F0 802D1940 AFB10014 */  sw        $s1, 0x14($sp)
-/* F62F4 802D1944 0080882D */  daddu     $s1, $a0, $zero
-/* F62F8 802D1948 AFB50024 */  sw        $s5, 0x24($sp)
-/* F62FC 802D194C 3C158011 */  lui       $s5, %hi(gPlayerStatus)
-/* F6300 802D1950 26B5EFC8 */  addiu     $s5, $s5, %lo(gPlayerStatus)
-/* F6304 802D1954 AFB60028 */  sw        $s6, 0x28($sp)
-/* F6308 802D1958 26360074 */  addiu     $s6, $s1, 0x74
-/* F630C 802D195C AFB40020 */  sw        $s4, 0x20($sp)
-/* F6310 802D1960 26340078 */  addiu     $s4, $s1, 0x78
-/* F6314 802D1964 AFB3001C */  sw        $s3, 0x1c($sp)
-/* F6318 802D1968 AFBF002C */  sw        $ra, 0x2c($sp)
-/* F631C 802D196C AFB20018 */  sw        $s2, 0x18($sp)
-/* F6320 802D1970 AFB00010 */  sw        $s0, 0x10($sp)
-/* F6324 802D1974 8E32000C */  lw        $s2, 0xc($s1)
-/* F6328 802D1978 10A0002C */  beqz      $a1, .L802D1A2C
-/* F632C 802D197C 2633007C */   addiu    $s3, $s1, 0x7c
-/* F6330 802D1980 3C10802E */  lui       $s0, %hi(gPlayerNpcPtr)
-/* F6334 802D1984 26109D20 */  addiu     $s0, $s0, %lo(gPlayerNpcPtr)
-/* F6338 802D1988 8E020000 */  lw        $v0, ($s0)
-/* F633C 802D198C C6A00080 */  lwc1      $f0, 0x80($s5)
-/* F6340 802D1990 E440000C */  swc1      $f0, 0xc($v0)
-/* F6344 802D1994 E6200074 */  swc1      $f0, 0x74($s1)
-/* F6348 802D1998 8E450000 */  lw        $a1, ($s2)
-/* F634C 802D199C 0C0B210B */  jal       get_float_variable
-/* F6350 802D19A0 26520004 */   addiu    $s2, $s2, 4
-/* F6354 802D19A4 C6220074 */  lwc1      $f2, 0x74($s1)
-/* F6358 802D19A8 46020001 */  sub.s     $f0, $f0, $f2
-/* F635C 802D19AC E6200078 */  swc1      $f0, 0x78($s1)
-/* F6360 802D19B0 8E450000 */  lw        $a1, ($s2)
-/* F6364 802D19B4 0C0B1EAF */  jal       get_variable
-/* F6368 802D19B8 0220202D */   daddu    $a0, $s1, $zero
-/* F636C 802D19BC AE22007C */  sw        $v0, 0x7c($s1)
-/* F6370 802D19C0 8E020000 */  lw        $v0, ($s0)
-/* F6374 802D19C4 3C01C334 */  lui       $at, 0xc334
-/* F6378 802D19C8 44810000 */  mtc1      $at, $f0
-/* F637C 802D19CC A440008E */  sh        $zero, 0x8e($v0)
-/* F6380 802D19D0 C6220078 */  lwc1      $f2, 0x78($s1)
-/* F6384 802D19D4 4600103C */  c.lt.s    $f2, $f0
-/* F6388 802D19D8 00000000 */  nop       
-/* F638C 802D19DC 45000007 */  bc1f      .L802D19FC
-/* F6390 802D19E0 00000000 */   nop      
-/* F6394 802D19E4 3C0143B4 */  lui       $at, 0x43b4
-/* F6398 802D19E8 44810000 */  mtc1      $at, $f0
-/* F639C 802D19EC 00000000 */  nop       
-/* F63A0 802D19F0 46001000 */  add.s     $f0, $f2, $f0
-/* F63A4 802D19F4 E6200078 */  swc1      $f0, 0x78($s1)
-/* F63A8 802D19F8 C6220078 */  lwc1      $f2, 0x78($s1)
-.L802D19FC:
-/* F63AC 802D19FC 3C014334 */  lui       $at, 0x4334
-/* F63B0 802D1A00 44810000 */  mtc1      $at, $f0
-/* F63B4 802D1A04 00000000 */  nop       
-/* F63B8 802D1A08 4602003C */  c.lt.s    $f0, $f2
-/* F63BC 802D1A0C 00000000 */  nop       
-/* F63C0 802D1A10 45000006 */  bc1f      .L802D1A2C
-/* F63C4 802D1A14 00000000 */   nop      
-/* F63C8 802D1A18 3C0143B4 */  lui       $at, 0x43b4
-/* F63CC 802D1A1C 44810000 */  mtc1      $at, $f0
-/* F63D0 802D1A20 00000000 */  nop       
-/* F63D4 802D1A24 46001001 */  sub.s     $f0, $f2, $f0
-/* F63D8 802D1A28 E6200078 */  swc1      $f0, 0x78($s1)
-.L802D1A2C:
-/* F63DC 802D1A2C 8E620000 */  lw        $v0, ($s3)
-/* F63E0 802D1A30 1C40000E */  bgtz      $v0, .L802D1A6C
-/* F63E4 802D1A34 00000000 */   nop      
-/* F63E8 802D1A38 3C10802E */  lui       $s0, %hi(gPlayerNpcPtr)
-/* F63EC 802D1A3C 26109D20 */  addiu     $s0, $s0, %lo(gPlayerNpcPtr)
-/* F63F0 802D1A40 8E020000 */  lw        $v0, ($s0)
-/* F63F4 802D1A44 C6800000 */  lwc1      $f0, ($s4)
-/* F63F8 802D1A48 C44C000C */  lwc1      $f12, 0xc($v0)
-/* F63FC 802D1A4C 46006300 */  add.s     $f12, $f12, $f0
-/* F6400 802D1A50 0C00A6C9 */  jal       clamp_angle
-/* F6404 802D1A54 E44C000C */   swc1     $f12, 0xc($v0)
-/* F6408 802D1A58 8E030000 */  lw        $v1, ($s0)
-/* F640C 802D1A5C 24020002 */  addiu     $v0, $zero, 2
-/* F6410 802D1A60 E460000C */  swc1      $f0, 0xc($v1)
-/* F6414 802D1A64 080B46B7 */  j         .L802D1ADC
-/* F6418 802D1A68 E6A00080 */   swc1     $f0, 0x80($s5)
-.L802D1A6C:
-/* F641C 802D1A6C 3C10802E */  lui       $s0, %hi(gPlayerNpcPtr)
-/* F6420 802D1A70 26109D20 */  addiu     $s0, $s0, %lo(gPlayerNpcPtr)
-/* F6424 802D1A74 8E030000 */  lw        $v1, ($s0)
-/* F6428 802D1A78 9462008E */  lhu       $v0, 0x8e($v1)
-/* F642C 802D1A7C 24420001 */  addiu     $v0, $v0, 1
-/* F6430 802D1A80 A462008E */  sh        $v0, 0x8e($v1)
-/* F6434 802D1A84 00021400 */  sll       $v0, $v0, 0x10
-/* F6438 802D1A88 00021403 */  sra       $v0, $v0, 0x10
-/* F643C 802D1A8C C6800000 */  lwc1      $f0, ($s4)
-/* F6440 802D1A90 44821000 */  mtc1      $v0, $f2
-/* F6444 802D1A94 00000000 */  nop       
-/* F6448 802D1A98 468010A0 */  cvt.s.w   $f2, $f2
-/* F644C 802D1A9C 46020002 */  mul.s     $f0, $f0, $f2
-/* F6450 802D1AA0 00000000 */  nop       
-/* F6454 802D1AA4 C6CC0000 */  lwc1      $f12, ($s6)
-/* F6458 802D1AA8 C6620000 */  lwc1      $f2, ($s3)
-/* F645C 802D1AAC 468010A0 */  cvt.s.w   $f2, $f2
-/* F6460 802D1AB0 46020003 */  div.s     $f0, $f0, $f2
-/* F6464 802D1AB4 46006300 */  add.s     $f12, $f12, $f0
-/* F6468 802D1AB8 0C00A6C9 */  jal       clamp_angle
-/* F646C 802D1ABC E46C000C */   swc1     $f12, 0xc($v1)
-/* F6470 802D1AC0 8E020000 */  lw        $v0, ($s0)
-/* F6474 802D1AC4 E440000C */  swc1      $f0, 0xc($v0)
-/* F6478 802D1AC8 E6A00080 */  swc1      $f0, 0x80($s5)
-/* F647C 802D1ACC 8442008E */  lh        $v0, 0x8e($v0)
-/* F6480 802D1AD0 8E630000 */  lw        $v1, ($s3)
-/* F6484 802D1AD4 0043102A */  slt       $v0, $v0, $v1
-/* F6488 802D1AD8 38420001 */  xori      $v0, $v0, 1
-.L802D1ADC:
-/* F648C 802D1ADC 8FBF002C */  lw        $ra, 0x2c($sp)
-/* F6490 802D1AE0 8FB60028 */  lw        $s6, 0x28($sp)
-/* F6494 802D1AE4 8FB50024 */  lw        $s5, 0x24($sp)
-/* F6498 802D1AE8 8FB40020 */  lw        $s4, 0x20($sp)
-/* F649C 802D1AEC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* F64A0 802D1AF0 8FB20018 */  lw        $s2, 0x18($sp)
-/* F64A4 802D1AF4 8FB10014 */  lw        $s1, 0x14($sp)
-/* F64A8 802D1AF8 8FB00010 */  lw        $s0, 0x10($sp)
-/* F64AC 802D1AFC 03E00008 */  jr        $ra
-/* F64B0 802D1B00 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/src/code_F5750.c b/src/code_F5750.c
index 2654cfc464..e473f39c32 100644
--- a/src/code_F5750.c
+++ b/src/code_F5750.c
@@ -167,7 +167,47 @@ void PlayerJump2(ScriptInstance* script, s32 isInitialCall) {
     player_jump(script, isInitialCall, 2);
 }
 
-INCLUDE_ASM(s32, "code_F5750", InterpPlayerYaw, ScriptInstance* script, s32 isInitialCall);
+ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+    f32* t1 = &script->functionTemp[1].f;
+    f32* t2 = &script->functionTemp[2].f;
+    s32* t3 = &script->functionTemp[3].s;
+
+    if (isInitialCall) {
+        Npc** player = &gPlayerNpcPtr;
+
+        (*player)->yaw = playerStatus->targetYaw;
+        *t1 = (*player)->yaw;
+        *t2 = get_float_variable(script, *args++) - *t1;
+        *t3 = get_variable(script, *args++);
+        (*player)->duration = 0;
+
+        if (*t2 < -180.0f) {
+            *t2 += 360.0f;
+        }
+        if (*t2 > 180.0f) {
+            *t2 -= 360.0f;
+        }
+    }
+
+    if (*t3 > 0) {
+        Npc** player = &gPlayerNpcPtr;
+
+        (*player)->duration++;
+        (*player)->yaw = *t1 + ((*t2 * (*player)->duration) / *t3);
+        (*player)->yaw = clamp_angle((*player)->yaw);
+        playerStatus->targetYaw = (*player)->yaw;
+        return ((*player)->duration < *t3) ^ 1;
+    } else {
+        Npc** player = &gPlayerNpcPtr;
+
+        (*player)->yaw += *t2;
+        (*player)->yaw = clamp_angle((*player)->yaw);;
+        playerStatus->targetYaw = (*player)->yaw;
+        return ApiStatus_DONE2;
+    }
+}
 
 INCLUDE_ASM(s32, "code_F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
 

From d0d833cd1d5fbe0dffe6773190692bbbbb57a969 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 16:16:39 -0400
Subject: [PATCH 014/101] LoadPath

---
 .../code_f8f60_len_1560/LoadPath.s            | 65 ---------------
 include/common_structs.h                      | 82 +++++++++++--------
 src/code_f8f60_len_1560.c                     | 22 ++++-
 3 files changed, 67 insertions(+), 102 deletions(-)
 delete mode 100644 asm/nonmatchings/code_f8f60_len_1560/LoadPath.s

diff --git a/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s b/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s
deleted file mode 100644
index 27425f3455..0000000000
--- a/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel LoadPath
-/* F9DE0 802D5430 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F9DE4 802D5434 AFB20018 */  sw        $s2, 0x18($sp)
-/* F9DE8 802D5438 0080902D */  daddu     $s2, $a0, $zero
-/* F9DEC 802D543C AFBF0028 */  sw        $ra, 0x28($sp)
-/* F9DF0 802D5440 AFB50024 */  sw        $s5, 0x24($sp)
-/* F9DF4 802D5444 AFB40020 */  sw        $s4, 0x20($sp)
-/* F9DF8 802D5448 AFB3001C */  sw        $s3, 0x1c($sp)
-/* F9DFC 802D544C AFB10014 */  sw        $s1, 0x14($sp)
-/* F9E00 802D5450 AFB00010 */  sw        $s0, 0x10($sp)
-/* F9E04 802D5454 8E50000C */  lw        $s0, 0xc($s2)
-/* F9E08 802D5458 8E050000 */  lw        $a1, ($s0)
-/* F9E0C 802D545C 0C0B1EAF */  jal       get_variable
-/* F9E10 802D5460 26100004 */   addiu    $s0, $s0, 4
-/* F9E14 802D5464 8E050000 */  lw        $a1, ($s0)
-/* F9E18 802D5468 26100004 */  addiu     $s0, $s0, 4
-/* F9E1C 802D546C 0240202D */  daddu     $a0, $s2, $zero
-/* F9E20 802D5470 0C0B1EAF */  jal       get_variable
-/* F9E24 802D5474 0040982D */   daddu    $s3, $v0, $zero
-/* F9E28 802D5478 8E050000 */  lw        $a1, ($s0)
-/* F9E2C 802D547C 26100004 */  addiu     $s0, $s0, 4
-/* F9E30 802D5480 0240202D */  daddu     $a0, $s2, $zero
-/* F9E34 802D5484 0C0B1EAF */  jal       get_variable
-/* F9E38 802D5488 0040A02D */   daddu    $s4, $v0, $zero
-/* F9E3C 802D548C 0240202D */  daddu     $a0, $s2, $zero
-/* F9E40 802D5490 8E050000 */  lw        $a1, ($s0)
-/* F9E44 802D5494 0C0B1EAF */  jal       get_variable
-/* F9E48 802D5498 0040882D */   daddu    $s1, $v0, $zero
-/* F9E4C 802D549C 2404001C */  addiu     $a0, $zero, 0x1c
-/* F9E50 802D54A0 0C00AB39 */  jal       heap_malloc
-/* F9E54 802D54A4 0040A82D */   daddu    $s5, $v0, $zero
-/* F9E58 802D54A8 00112080 */  sll       $a0, $s1, 2
-/* F9E5C 802D54AC 0040802D */  daddu     $s0, $v0, $zero
-/* F9E60 802D54B0 AE5000C0 */  sw        $s0, 0xc0($s2)
-/* F9E64 802D54B4 0C00AB39 */  jal       heap_malloc
-/* F9E68 802D54B8 AE110000 */   sw       $s1, ($s0)
-/* F9E6C 802D54BC 00112040 */  sll       $a0, $s1, 1
-/* F9E70 802D54C0 00912021 */  addu      $a0, $a0, $s1
-/* F9E74 802D54C4 00042080 */  sll       $a0, $a0, 2
-/* F9E78 802D54C8 AE020004 */  sw        $v0, 4($s0)
-/* F9E7C 802D54CC 0C00AB39 */  jal       heap_malloc
-/* F9E80 802D54D0 AE140008 */   sw       $s4, 8($s0)
-/* F9E84 802D54D4 8E040000 */  lw        $a0, ($s0)
-/* F9E88 802D54D8 8E050004 */  lw        $a1, 4($s0)
-/* F9E8C 802D54DC 8E060008 */  lw        $a2, 8($s0)
-/* F9E90 802D54E0 0040382D */  daddu     $a3, $v0, $zero
-/* F9E94 802D54E4 0C0B536B */  jal       setup_path_data
-/* F9E98 802D54E8 AE02000C */   sw       $v0, 0xc($s0)
-/* F9E9C 802D54EC 2673FFFF */  addiu     $s3, $s3, -1
-/* F9EA0 802D54F0 AE000010 */  sw        $zero, 0x10($s0)
-/* F9EA4 802D54F4 AE130014 */  sw        $s3, 0x14($s0)
-/* F9EA8 802D54F8 AE150018 */  sw        $s5, 0x18($s0)
-/* F9EAC 802D54FC 8FBF0028 */  lw        $ra, 0x28($sp)
-/* F9EB0 802D5500 8FB50024 */  lw        $s5, 0x24($sp)
-/* F9EB4 802D5504 8FB40020 */  lw        $s4, 0x20($sp)
-/* F9EB8 802D5508 8FB3001C */  lw        $s3, 0x1c($sp)
-/* F9EBC 802D550C 8FB20018 */  lw        $s2, 0x18($sp)
-/* F9EC0 802D5510 8FB10014 */  lw        $s1, 0x14($sp)
-/* F9EC4 802D5514 8FB00010 */  lw        $s0, 0x10($sp)
-/* F9EC8 802D5518 24020002 */  addiu     $v0, $zero, 2
-/* F9ECC 802D551C 03E00008 */  jr        $ra
-/* F9ED0 802D5520 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/include/common_structs.h b/include/common_structs.h
index 56eb064d23..c2c2be9b11 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -49,7 +49,7 @@ typedef struct CamPosSettings {
     /* 0x04 */ f32 boomLength;
     /* 0x08 */ f32 boomPitch;
     /* 0x0C */ f32 viewPitch;
-    /* 0x10 */ struct Vec3f position;
+    /* 0x10 */ Vec3f position;
 } CamPosSettings; // size = 0x1C
 
 typedef struct PartnerData {
@@ -90,12 +90,12 @@ typedef struct Npc {
     /* 0x02C */ char unk_2C[4];
     /* 0x030 */ f32 animationSpeed;
     /* 0x034 */ char unk_34[4];
-    /* 0x038 */ struct Vec3f pos;
-    /* 0x044 */ struct Vec3f rotation;
+    /* 0x038 */ Vec3f pos;
+    /* 0x044 */ Vec3f rotation;
     /* 0x050 */ f32 unk_50;
-    /* 0x054 */ struct Vec3f scale;
-    /* 0x060 */ struct Vec3f moveToPos;
-    /* 0x06C */ struct Vec3f colliderPos; /* used during collision with player */
+    /* 0x054 */ Vec3f scale;
+    /* 0x060 */ Vec3f moveToPos;
+    /* 0x06C */ Vec3f colliderPos; /* used during collision with player */
     /* 0x078 */ s32 shadowIndex;
     /* 0x07C */ f32 shadowScale;
     /* 0x080 */ s32 unk_80;
@@ -431,7 +431,7 @@ typedef struct Camera {
     /* 0x054 */ f32 unk_54;
     /* 0x058 */ f32 unk_58;
     /* 0x05C */ f32 unk_5C;
-    /* 0x060 */ struct Vec3f targetPos;
+    /* 0x060 */ Vec3f targetPos;
     /* 0x06C */ f32 currentYaw;
     /* 0x070 */ char unk_70[4];
     /* 0x074 */ f32 currentBoomYaw;
@@ -458,13 +458,13 @@ typedef struct Camera {
     /* 0x48C */ f32 linearInterpScale; /* 3.0? */
     /* 0x490 */ f32 moveSpeed;
     /* 0x494 */ char unk_494[28];
-    /* 0x4B0 */ struct Vec3f movePos;
+    /* 0x4B0 */ Vec3f movePos;
     /* 0x4BC */ char unk_4BC[28];
     /* 0x4D8 */ s32 controllerType;
     /* 0x4DC */ f32 controllerBoomLen;
     /* 0x4E0 */ f32 controllerBoomPitch;
-    /* 0x4E4 */ struct Vec3f posA;
-    /* 0x4F0 */ struct Vec3f posB;
+    /* 0x4E4 */ Vec3f posA;
+    /* 0x4F0 */ Vec3f posB;
     /* 0x4FC */ f32 controllerViewPitch;
     /* 0x500 */ s32 unk_500;
     /* 0x504 */ s16 boolTargetPlayer;
@@ -767,7 +767,7 @@ typedef struct ItemEntity {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s16 boundVar; /* see make_item_entity */
     /* 0x06 */ char unk_06[2];
-    /* 0x08 */ struct Vec3f position;
+    /* 0x08 */ Vec3f position;
     /* 0x14 */ struct ItemEntityPhysicsData* physicsData;
     /* 0x18 */ s16 itemID; /* into item table, also worldIconID */
     /* 0x1A */ u8 state;
@@ -806,10 +806,10 @@ typedef struct SpriteComponent {
     /* 0x10 */ s32 loopCounter;
     /* 0x14 */ s32 currentRaster;
     /* 0x18 */ s32 currentPalette;
-    /* 0x1C */ struct Vec3f posOffset;
-    /* 0x28 */ struct Vec3f compPos;
-    /* 0x34 */ struct Vec3f rotation;
-    /* 0x40 */ struct Vec3f scale;
+    /* 0x1C */ Vec3f posOffset;
+    /* 0x28 */ Vec3f compPos;
+    /* 0x34 */ Vec3f rotation;
+    /* 0x40 */ Vec3f scale;
     /* 0x4C */ char unk_4C[4];
 } SpriteComponent; // size = 0x50
 
@@ -897,7 +897,7 @@ typedef struct GameStatus {
     /* 0x08E */ s16 entryID;
     /* 0x090 */ char unk_90[4];
     /* 0x094 */ f32 exitAngle;
-    /* 0x098 */ struct Vec3f playerPos;
+    /* 0x098 */ Vec3f playerPos;
     /* 0x0A4 */ f32 playerYaw;
     /* 0x0A8 */ s8 unk_A8;
     /* 0x0A9 */ s8 unk_A9;
@@ -942,8 +942,8 @@ typedef struct PartnerAnimations {
 typedef struct Shadow {
     /* 0x00 */ s32 flags;
     /* 0x04 */ char unk_04[12];
-    /* 0x10 */ struct Vec3f position;
-    /* 0x1C */ struct Vec3f scale;
+    /* 0x10 */ Vec3f position;
+    /* 0x1C */ Vec3f scale;
     /* 0x28 */ char unk_28[80];
 } Shadow; // size = 0x78
 
@@ -1005,13 +1005,13 @@ typedef struct ActorPart {
     /* 0x10 */ struct ActorPartMovement* movement;
     /* 0x14 */ s16 partOffset[3];
     /* 0x1A */ s16 visualOffset[3];
-    /* 0x20 */ struct Vec3f partOffsetFloat;
-    /* 0x2C */ struct Vec3f absolutePosition;
-    /* 0x38 */ struct Vec3f rotation;
+    /* 0x20 */ Vec3f partOffsetFloat;
+    /* 0x2C */ Vec3f absolutePosition;
+    /* 0x38 */ Vec3f rotation;
     /* 0x44 */ s16 rotationPivotOffset[3];
     /* 0x4A */ char unk_4A[2];
     /* 0x4C */ f32 scale[3];
-    /* 0x58 */ struct Vec3f currentPos;
+    /* 0x58 */ Vec3f currentPos;
     /* 0x64 */ f32 yaw;
     /* 0x68 */ s16 unkOffset[2];
     /* 0x6C */ s16 targetOffset[2];
@@ -1142,14 +1142,14 @@ typedef struct Encounter {
 
 typedef struct PlayerPathElement {
     /* 0x00 */ char unk_00[4];
-    /* 0x04 */ struct Vec3f pos;
+    /* 0x04 */ Vec3f pos;
 } PlayerPathElement; // size = 0x10
 
 typedef struct AnimatedModel {
     /* 0x00 */ s32 animModelID;
-    /* 0x04 */ struct Vec3f pos; /* Created by retype action */
-    /* 0x10 */ struct Vec3f rot;
-    /* 0x1C */ struct Vec3f scale;
+    /* 0x04 */ Vec3f pos; /* Created by retype action */
+    /* 0x10 */ Vec3f rot;
+    /* 0x1C */ Vec3f scale;
     /* 0x28 */ struct Matrix4s* mtx;
     /* 0x2C */ char unk_2C[60];
     /* 0x68 */ u32 currentAnimData;
@@ -1182,9 +1182,9 @@ typedef struct Actor {
     /* 0x000 */ s32 flags;
     /* 0x004 */ char unk_04[4];
     /* 0x008 */ struct StaticActorData* staticActorData;
-    /* 0x00C */ struct Vec3f moveCurrentPos;
-    /* 0x018 */ struct Vec3f moveGoalPos;
-    /* 0x024 */ struct Vec3f moveEndPos; /* where other actors should target this one at. saved before partner switching */
+    /* 0x00C */ Vec3f moveCurrentPos;
+    /* 0x018 */ Vec3f moveGoalPos;
+    /* 0x024 */ Vec3f moveEndPos; /* where other actors should target this one at. saved before partner switching */
     /* 0x030 */ char unk_30[24];
     /* 0x048 */ f32 jumpAccel;
     /* 0x04C */ f32 moveSpeed;
@@ -1202,9 +1202,9 @@ typedef struct Actor {
     /* 0x077 */ u8 jumpPartIndex;
     /* 0x078 */ char unk_78[16];
     /* 0x088 */ s32 varTable[16];
-    /* 0x0C8 */ struct Vec3f flyCurrentPos;
-    /* 0x0D4 */ struct Vec3f flyGoalPos;
-    /* 0x0E0 */ struct Vec3f flyTempPos; /* used for start in fly functions, end in flyrun functions */
+    /* 0x0C8 */ Vec3f flyCurrentPos;
+    /* 0x0D4 */ Vec3f flyGoalPos;
+    /* 0x0E0 */ Vec3f flyTempPos; /* used for start in fly functions, end in flyrun functions */
     /* 0x0EC */ char unk_EC[24];
     /* 0x104 */ f32 flyJumpAccel;
     /* 0x108 */ f32 flySpeed;
@@ -1219,8 +1219,8 @@ typedef struct Actor {
     /* 0x135 */ u8 footStepCounter;
     /* 0x136 */ u8 actorType;
     /* 0x137 */ char unk_137;
-    /* 0x138 */ struct Vec3f homePos;
-    /* 0x144 */ struct Vec3f currentPos;
+    /* 0x138 */ Vec3f homePos;
+    /* 0x144 */ Vec3f currentPos;
     /* 0x150 */ Vec3s headOffset;
     /* 0x156 */ s16 healthBarPosition[3];
     /* 0x15C */ f32 rotation[3];
@@ -1382,8 +1382,8 @@ typedef struct PlayerStatus {
     /* 0x014 */ s8 enableCollisionOverlapsCheck;
     /* 0x015 */ s8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */
     /* 0x016 */ Vec3s lastGoodPosition;
-    /* 0x01C */ struct Vec3f extraVelocity;
-    /* 0x028 */ struct Vec3f position;
+    /* 0x01C */ Vec3f extraVelocity;
+    /* 0x028 */ Vec3f position;
     /* 0x034 */ char unk_34[16];
     /* 0x044 */ f32 decorationPos[2];
     /* 0x04C */ char unk_4C[4];
@@ -1501,4 +1501,14 @@ typedef struct SaveData {
     /* 0x1304 */ char unk_1304[0x7C];
 } SaveData; // size = 0x1380
 
+typedef struct {
+    /* 0x00 */ s32 numVectors;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ Vec3f* staticVectorList;
+    /* 0x0C */ Vec3f* vectors;
+    /* 0x10 */ s32 timeElapsed;
+    /* 0x14 */ s32 timeLeft;
+    /* 0x18 */ s32 easingType;
+} Path; // size = 0x1C
+
 #endif
diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c
index 92191c1926..a369e6073a 100644
--- a/src/code_f8f60_len_1560.c
+++ b/src/code_f8f60_len_1560.c
@@ -351,7 +351,27 @@ INCLUDE_ASM(s32, "code_f8f60_len_1560", setup_path_data);
 
 INCLUDE_ASM(s32, "code_f8f60_len_1560", func_802D5270);
 
-INCLUDE_ASM(s32, "code_f8f60_len_1560", LoadPath, ScriptInstance* script, s32 isInitialCall);
+s32 LoadPath(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 time = get_variable(script, *args++);
+    s32 vectorList = get_variable(script, *args++);
+    s32 numVectors = get_variable(script, *args++);
+    s32 easingType = get_variable(script, *args++);
+    Path* path = heap_malloc(sizeof(Path));
+
+    script->varTable[15] = path;
+    path->numVectors = numVectors;
+    path->unk_04 = heap_malloc(numVectors * sizeof(f32));
+    path->staticVectorList = vectorList;
+    path->vectors = heap_malloc(numVectors * sizeof(Vec3f));
+    setup_path_data(path->numVectors, path->unk_04, path->staticVectorList, path->vectors);
+
+    path->timeElapsed = 0;
+    path->timeLeft = time - 1;
+    path->easingType = easingType;
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "code_f8f60_len_1560", GetNextPathPos, ScriptInstance* script, s32 isInitialCall);
 

From 0fb1e1ab307819a076de7c853bea188475b089cc Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 16:58:34 -0400
Subject: [PATCH 015/101] :dog:

---
 Makefile                                    |  6 +-
 asm/nonmatchings/code_FBE10/func_802D7CF8.s | 72 ---------------------
 include/variables.h                         |  1 +
 src/code_FBE10.c                            | 22 ++++++-
 tools/symbol_addrs.txt                      |  1 +
 undefined_syms.txt                          |  2 +
 6 files changed, 28 insertions(+), 76 deletions(-)
 delete mode 100644 asm/nonmatchings/code_FBE10/func_802D7CF8.s

diff --git a/Makefile b/Makefile
index f838e6f178..0bb9ba311e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ CPP := cpp
 LD := $(CROSS)ld
 OBJCOPY := $(CROSS)objcopy
 
-CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment
+CPPFLAGS   := -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -Wundef -Wcomment -MP -MD
 ASFLAGS    := -EB -Iinclude -march=vr4300 -mtune=vr4300
 OLDASFLAGS := -EB -Iinclude -G 0
 CFLAGS     := -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow
@@ -133,12 +133,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -MP -MD -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(BUILD_DIR)/%.d
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -MP -MD -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< -MF $@.mk -MT $(BUILD_DIR)/$*.d | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s
diff --git a/asm/nonmatchings/code_FBE10/func_802D7CF8.s b/asm/nonmatchings/code_FBE10/func_802D7CF8.s
deleted file mode 100644
index 508e87c920..0000000000
--- a/asm/nonmatchings/code_FBE10/func_802D7CF8.s
+++ /dev/null
@@ -1,72 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D7CF8
-/* FC6A8 802D7CF8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* FC6AC 802D7CFC AFB10014 */  sw        $s1, 0x14($sp)
-/* FC6B0 802D7D00 0080882D */  daddu     $s1, $a0, $zero
-/* FC6B4 802D7D04 AFBF002C */  sw        $ra, 0x2c($sp)
-/* FC6B8 802D7D08 AFB60028 */  sw        $s6, 0x28($sp)
-/* FC6BC 802D7D0C AFB50024 */  sw        $s5, 0x24($sp)
-/* FC6C0 802D7D10 AFB40020 */  sw        $s4, 0x20($sp)
-/* FC6C4 802D7D14 AFB3001C */  sw        $s3, 0x1c($sp)
-/* FC6C8 802D7D18 AFB20018 */  sw        $s2, 0x18($sp)
-/* FC6CC 802D7D1C AFB00010 */  sw        $s0, 0x10($sp)
-/* FC6D0 802D7D20 8E30000C */  lw        $s0, 0xc($s1)
-/* FC6D4 802D7D24 8E050000 */  lw        $a1, ($s0)
-/* FC6D8 802D7D28 0C0B1EAF */  jal       get_variable
-/* FC6DC 802D7D2C 26100004 */   addiu    $s0, $s0, 4
-/* FC6E0 802D7D30 8E050000 */  lw        $a1, ($s0)
-/* FC6E4 802D7D34 26100004 */  addiu     $s0, $s0, 4
-/* FC6E8 802D7D38 0220202D */  daddu     $a0, $s1, $zero
-/* FC6EC 802D7D3C 0C0B1EAF */  jal       get_variable
-/* FC6F0 802D7D40 0040B02D */   daddu    $s6, $v0, $zero
-/* FC6F4 802D7D44 8E050000 */  lw        $a1, ($s0)
-/* FC6F8 802D7D48 26100004 */  addiu     $s0, $s0, 4
-/* FC6FC 802D7D4C 0220202D */  daddu     $a0, $s1, $zero
-/* FC700 802D7D50 0C0B1EAF */  jal       get_variable
-/* FC704 802D7D54 0040A82D */   daddu    $s5, $v0, $zero
-/* FC708 802D7D58 8E050000 */  lw        $a1, ($s0)
-/* FC70C 802D7D5C 26100004 */  addiu     $s0, $s0, 4
-/* FC710 802D7D60 0220202D */  daddu     $a0, $s1, $zero
-/* FC714 802D7D64 0C0B1EAF */  jal       get_variable
-/* FC718 802D7D68 0040A02D */   daddu    $s4, $v0, $zero
-/* FC71C 802D7D6C 8E050000 */  lw        $a1, ($s0)
-/* FC720 802D7D70 26100004 */  addiu     $s0, $s0, 4
-/* FC724 802D7D74 0220202D */  daddu     $a0, $s1, $zero
-/* FC728 802D7D78 0C0B1EAF */  jal       get_variable
-/* FC72C 802D7D7C 0040982D */   daddu    $s3, $v0, $zero
-/* FC730 802D7D80 8E050000 */  lw        $a1, ($s0)
-/* FC734 802D7D84 26100004 */  addiu     $s0, $s0, 4
-/* FC738 802D7D88 0220202D */  daddu     $a0, $s1, $zero
-/* FC73C 802D7D8C 0C0B1EAF */  jal       get_variable
-/* FC740 802D7D90 0040902D */   daddu    $s2, $v0, $zero
-/* FC744 802D7D94 0220202D */  daddu     $a0, $s1, $zero
-/* FC748 802D7D98 8E050000 */  lw        $a1, ($s0)
-/* FC74C 802D7D9C 0C0B1EAF */  jal       get_variable
-/* FC750 802D7DA0 0040882D */   daddu    $s1, $v0, $zero
-/* FC754 802D7DA4 3C04802E */  lui       $a0, 0x802e
-/* FC758 802D7DA8 24849D50 */  addiu     $a0, $a0, -0x62b0
-/* FC75C 802D7DAC 24050001 */  addiu     $a1, $zero, 1
-/* FC760 802D7DB0 0040802D */  daddu     $s0, $v0, $zero
-/* FC764 802D7DB4 0C0B0CF8 */  jal       start_script
-/* FC768 802D7DB8 0000302D */   daddu    $a2, $zero, $zero
-/* FC76C 802D7DBC 0040182D */  daddu     $v1, $v0, $zero
-/* FC770 802D7DC0 AC760084 */  sw        $s6, 0x84($v1)
-/* FC774 802D7DC4 AC750088 */  sw        $s5, 0x88($v1)
-/* FC778 802D7DC8 AC74008C */  sw        $s4, 0x8c($v1)
-/* FC77C 802D7DCC AC730090 */  sw        $s3, 0x90($v1)
-/* FC780 802D7DD0 AC720094 */  sw        $s2, 0x94($v1)
-/* FC784 802D7DD4 AC710098 */  sw        $s1, 0x98($v1)
-/* FC788 802D7DD8 AC70009C */  sw        $s0, 0x9c($v1)
-/* FC78C 802D7DDC 8FBF002C */  lw        $ra, 0x2c($sp)
-/* FC790 802D7DE0 8FB60028 */  lw        $s6, 0x28($sp)
-/* FC794 802D7DE4 8FB50024 */  lw        $s5, 0x24($sp)
-/* FC798 802D7DE8 8FB40020 */  lw        $s4, 0x20($sp)
-/* FC79C 802D7DEC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* FC7A0 802D7DF0 8FB20018 */  lw        $s2, 0x18($sp)
-/* FC7A4 802D7DF4 8FB10014 */  lw        $s1, 0x14($sp)
-/* FC7A8 802D7DF8 8FB00010 */  lw        $s0, 0x10($sp)
-/* FC7AC 802D7DFC 24020002 */  addiu     $v0, $zero, 2
-/* FC7B0 802D7E00 03E00008 */  jr        $ra
-/* FC7B4 802D7E04 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/include/variables.h b/include/variables.h
index ccdc405f99..1adaf1c1ef 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -164,5 +164,6 @@ extern s32 mapScriptLibVram;
 extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;
 extern Bytecode* ShakeCamX;
+extern Bytecode* D_802D9D50;
 
 #endif
diff --git a/src/code_FBE10.c b/src/code_FBE10.c
index 559197088e..c2ee2333cc 100644
--- a/src/code_FBE10.c
+++ b/src/code_FBE10.c
@@ -67,7 +67,27 @@ ApiStatus func_802D7B74(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "code_FBE10", func_802D7BA4);
 
-INCLUDE_ASM(s32, "code_FBE10", func_802D7CF8);
+ApiStatus func_802D7CF8(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
+    s32 var5 = get_variable(script, *args++);
+    s32 var6 = get_variable(script, *args++);
+    ScriptInstance* newScript = start_script(&D_802D9D50, 1, 0);
+
+    newScript->varTable[0] = var0;
+    newScript->varTable[1] = var1;
+    newScript->varTable[2] = var2;
+    newScript->varTable[3] = var3;
+    newScript->varTable[4] = var4;
+    newScript->varTable[5] = var5;
+    newScript->varTable[6] = var6;
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "code_FBE10", func_802D7E08);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 57d0da9329..b78c0e7827 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1897,3 +1897,4 @@ gSpeakingActorPart;0x8029FA78
 EnterWalk;0x80285960
 EnemyNpcHit;0x80077F70
 EnemyNpcDefeat;0x8007809C
+D_802D9D50;0x802D9D50
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 6f335270e1..1574ba51ba 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -214,6 +214,8 @@ gWorldDynamicEntityList = 0x801543A0;
 gBattleDynamicEntityList = 0x801543E0;
 gCurrentDynamicEntityListPtr = 0x80154420;
 
+D_802D9D50 = 0x802D9D50;
+
 gScriptIndexList = 0x802DA898;
 gScriptIdList = 0x802DAA98;
 gScriptListCount = 0x802DAC98;

From c1df09dba870bf4412d71371c5e506624a0e1081 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 21:35:59 +0000
Subject: [PATCH 016/101] match some cursed funcs + cleanup

---
 .../code_28910_len_5090/func_8004DA0C.s       | 33 -----------------
 .../code_303c0_len_3e10/func_800559C4.s       | 11 ------
 include/variables.h                           |  2 +-
 src/code_28910_len_5090.c                     | 36 +++++++++++++++++--
 src/code_28910_len_5090.h                     | 22 ++++++++++++
 src/code_2e230_len_2190.c                     |  8 +++--
 src/code_2e230_len_2190.h                     | 17 +++++++++
 src/code_303c0_len_3e10.c                     |  4 ++-
 src/code_e0b30_len_b80.c                      | 15 ++++----
 9 files changed, 90 insertions(+), 58 deletions(-)
 delete mode 100644 asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s
 delete mode 100644 asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s
 create mode 100644 src/code_28910_len_5090.h
 create mode 100644 src/code_2e230_len_2190.h

diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s
deleted file mode 100644
index 823f6ef476..0000000000
--- a/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8004DA0C
-/* 28E0C 8004DA0C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 28E10 8004DA10 AFB10014 */  sw        $s1, 0x14($sp)
-/* 28E14 8004DA14 0080882D */  daddu     $s1, $a0, $zero
-/* 28E18 8004DA18 AFB00010 */  sw        $s0, 0x10($sp)
-/* 28E1C 8004DA1C 0000802D */  daddu     $s0, $zero, $zero
-/* 28E20 8004DA20 1220000D */  beqz      $s1, .L8004DA58
-/* 28E24 8004DA24 AFBF0018 */   sw       $ra, 0x18($sp)
-/* 28E28 8004DA28 0C0135E5 */  jal       func_8004D794
-/* 28E2C 8004DA2C 00000000 */   nop      
-/* 28E30 8004DA30 0040202D */  daddu     $a0, $v0, $zero
-/* 28E34 8004DA34 50800009 */  beql      $a0, $zero, .L8004DA5C
-/* 28E38 8004DA38 24100002 */   addiu    $s0, $zero, 2
-/* 28E3C 8004DA3C 8C82001C */  lw        $v0, 0x1c($a0)
-/* 28E40 8004DA40 16220007 */  bne       $s1, $v0, .L8004DA60
-/* 28E44 8004DA44 0200102D */   daddu    $v0, $s0, $zero
-/* 28E48 8004DA48 0C0136AA */  jal       func_8004DAA8
-/* 28E4C 8004DA4C 00000000 */   nop      
-/* 28E50 8004DA50 08013698 */  j         .L8004DA60
-/* 28E54 8004DA54 0200102D */   daddu    $v0, $s0, $zero
-.L8004DA58:
-/* 28E58 8004DA58 24100003 */  addiu     $s0, $zero, 3
-.L8004DA5C:
-/* 28E5C 8004DA5C 0200102D */  daddu     $v0, $s0, $zero
-.L8004DA60:
-/* 28E60 8004DA60 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 28E64 8004DA64 8FB10014 */  lw        $s1, 0x14($sp)
-/* 28E68 8004DA68 8FB00010 */  lw        $s0, 0x10($sp)
-/* 28E6C 8004DA6C 03E00008 */  jr        $ra
-/* 28E70 8004DA70 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s
deleted file mode 100644
index c0e9dfc395..0000000000
--- a/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_800559C4
-/* 30DC4 800559C4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 30DC8 800559C8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 30DCC 800559CC 0C013683 */  jal       func_8004DA0C
-/* 30DD0 800559D0 00000000 */   nop      
-/* 30DD4 800559D4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 30DD8 800559D8 03E00008 */  jr        $ra
-/* 30DDC 800559DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/variables.h b/include/variables.h
index 0d6ce235df..d892d99244 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -167,6 +167,6 @@ extern s16 gMusicUnkVolume;
 extern s16 gMusicUnkVolume2;
 extern s16 gMusicCurrentVolume;
 extern s16 gMusicTargetVolume;
-extern MusicPlayer gMusicPlayers[];
+extern MusicPlayer gMusicPlayers[]; // TODO: how many?
 
 #endif
diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c
index 9ea3bbb779..62fe271554 100644
--- a/src/code_28910_len_5090.c
+++ b/src/code_28910_len_5090.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "code_28910_len_5090.h"
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D510);
 
@@ -6,11 +6,41 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D794);
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D7E0);
 
-INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA0C);
+s32 func_8004DA0C(UNK_TYPE arg0) {
+    s32 ret = 0;
+
+    if (arg0 != 0) {
+        UnkStructFor8004DAA8* unknown;
+
+        do {
+            unknown = func_8004D794();
+        } while (0);
+
+        do {
+            if (unknown == NULL) {
+                ret = 2;
+            } else if (arg0 == unknown->unk_01C) {
+                func_8004DAA8(unknown);
+                ret = 0;
+            }
+        } while (0);
+    } else {
+        ret = 3;
+    }
+
+    return ret;
+}
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74);
 
-INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DAA8);
+void func_8004DAA8(UnkStructFor8004DAA8 *arg0) {
+    if (arg0->unk_221 != 0) {
+        arg0->unk_221 = 4;
+        arg0->unk_010 = 1;
+        arg0->unk_008 = 1;
+        func_80053A18(&arg0->unk_02C);
+    }
+}
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DAE0);
 
diff --git a/src/code_28910_len_5090.h b/src/code_28910_len_5090.h
new file mode 100644
index 0000000000..1aa5bb7712
--- /dev/null
+++ b/src/code_28910_len_5090.h
@@ -0,0 +1,22 @@
+#ifndef _CODE_28910_LEN_5090_H_
+#define _CODE_28910_LEN_5090_H_
+
+#include "common.h"
+#include "code_2e230_len_2190.h"
+
+typedef struct {
+    /* 0x000 */ char unk_000[8];
+    /* 0x008 */ s32 unk_008;
+    /* 0x00C */ char unk_00C[4];
+    /* 0x010 */ s32 unk_010;
+    /* 0x014 */ char unk_014[8];
+    /* 0x01C */ UNK_TYPE unk_01C;
+    /* 0x020 */ char unk_020[0xC];
+    /* 0x02C */ UnkStructFor80053A18 unk_02C;
+    /* 0x03C */ char unk_03C[0x1E5];
+    /* 0x221 */ u8 unk_221;
+} UnkStructFor8004DAA8; // size unknown
+
+void func_8004DAA8(UnkStructFor8004DAA8* arg0);
+
+#endif
diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c
index 7716dc523f..d97c70f1b3 100644
--- a/src/code_2e230_len_2190.c
+++ b/src/code_2e230_len_2190.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "code_2e230_len_2190.h"
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80052E30);
 
@@ -24,7 +24,11 @@ INCLUDE_ASM(s32, "code_2e230_len_2190", func_800538F8);
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053974);
 
-INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053A18);
+void func_80053A18(UnkStructFor80053A18* arg0) {
+    arg0->unk_0A = 0;
+    arg0->unk_04 = 0;
+    arg0->unk_0C = 0;
+}
 
 INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053A28);
 
diff --git a/src/code_2e230_len_2190.h b/src/code_2e230_len_2190.h
new file mode 100644
index 0000000000..5b3dc33da0
--- /dev/null
+++ b/src/code_2e230_len_2190.h
@@ -0,0 +1,17 @@
+#ifndef _CODE_2E230_LEN_2190_H_
+#define _CODE_2E230_LEN_2190_H_
+
+#include "common.h"
+
+// Probably some libultra audio thing
+typedef struct UnkStructFor80053A18 {
+    /* 0x00 */ UNK_TYPE unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ char unk_08[2];
+    /* 0x0A */ u16 unk_0A;
+    /* 0x0C */ s32 unk_0C;
+} UnkStructFor80053A18; // size unknown
+
+void func_80053A18(UnkStructFor80053A18* arg0);
+
+#endif
diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c
index 357c8a3faf..0fb5eb1c82 100644
--- a/src/code_303c0_len_3e10.c
+++ b/src/code_303c0_len_3e10.c
@@ -70,7 +70,9 @@ INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005591C);
 
 INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055970);
 
-INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800559C4);
+s32 func_800559C4(UNK_TYPE arg0) {
+    return func_8004DA0C(arg0);
+}
 
 INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800559E0);
 
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index f186d032a8..f7be58427b 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -19,7 +19,8 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
     if (gameStatus->demoState != 0) {
         return 1;
     } else {
-        MusicPlayer* musicPlayers = &gMusicPlayers;
+        // TODO: these two lines likely a MUSIC_PLAYER(idx) macro
+        MusicPlayer* musicPlayers = gMusicPlayers;
         MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
         if (!gameStatus->musicEnabled) {
@@ -57,7 +58,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
 }
 
 s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
-    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayers = gMusicPlayers;
 
     musicPlayers[playerIndex].flags &= ~8;
 
@@ -70,7 +71,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
     if (gameStatus->demoState != 0) {
         return 1;
     } else {
-        MusicPlayer* musicPlayers = &gMusicPlayers;
+        MusicPlayer* musicPlayers = gMusicPlayers;
         MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
         if (!gameStatus->musicEnabled) {
@@ -99,7 +100,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
 }
 
 s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) {
-    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayers = gMusicPlayers;
     MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
     if (!(musicPlayer->flags & 1)) {
@@ -126,7 +127,7 @@ s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) {
 }
 
 s32 func_8014AB0C(s32 playerIndex, s16 arg1) {
-    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayers = gMusicPlayers;
     MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
     if (!(musicPlayer->flags & 1)) {
@@ -137,7 +138,7 @@ s32 func_8014AB0C(s32 playerIndex, s16 arg1) {
 }
 
 s32 func_8014AB60(s32 playerIndex, s16 arg1) {
-    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayers = gMusicPlayers;
     MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
     if (!(musicPlayer->flags & 1)) {
@@ -148,7 +149,7 @@ s32 func_8014AB60(s32 playerIndex, s16 arg1) {
 }
 
 s32 func_8014ABB4(s32 playerIndex, s16 arg1) {
-    MusicPlayer* musicPlayers = &gMusicPlayers;
+    MusicPlayer* musicPlayers = gMusicPlayers;
     MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
 
     if (!(musicPlayer->flags & 1)) {

From db1ee14d8f90d431a9d7b597421bb7e287c958f8 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 22:41:43 +0000
Subject: [PATCH 017/101] match get_song_variation_override_for_cur_map

This was previously called get_default_variation_for_song, but its more of an override than a default.
---
 .../code_28910_len_5090/func_8004DAA8.s       | 19 ----------
 .../code_2e230_len_2190/func_80053A18.s       |  8 ----
 .../get_default_variation_for_song.s          | 32 ----------------
 include/enums.h                               |  2 +-
 include/map.h                                 | 38 ++++++++++++++++++-
 src/code_e0b30_len_b80.c                      | 38 +++++++++++++++----
 tools/symbol_addrs.txt                        |  2 +
 undefined_syms.txt                            |  3 ++
 8 files changed, 72 insertions(+), 70 deletions(-)
 delete mode 100644 asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s
 delete mode 100644 asm/nonmatchings/code_2e230_len_2190/func_80053A18.s
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s

diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s b/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s
deleted file mode 100644
index 5f5c5bc996..0000000000
--- a/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8004DAA8
-/* 28EA8 8004DAA8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 28EAC 8004DAAC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 28EB0 8004DAB0 90820221 */  lbu       $v0, 0x221($a0)
-/* 28EB4 8004DAB4 10400007 */  beqz      $v0, .L8004DAD4
-/* 28EB8 8004DAB8 24020004 */   addiu    $v0, $zero, 4
-/* 28EBC 8004DABC A0820221 */  sb        $v0, 0x221($a0)
-/* 28EC0 8004DAC0 24020001 */  addiu     $v0, $zero, 1
-/* 28EC4 8004DAC4 AC820010 */  sw        $v0, 0x10($a0)
-/* 28EC8 8004DAC8 AC820008 */  sw        $v0, 8($a0)
-/* 28ECC 8004DACC 0C014E86 */  jal       func_80053A18
-/* 28ED0 8004DAD0 2484002C */   addiu    $a0, $a0, 0x2c
-.L8004DAD4:
-/* 28ED4 8004DAD4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 28ED8 8004DAD8 03E00008 */  jr        $ra
-/* 28EDC 8004DADC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s b/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s
deleted file mode 100644
index 6c3a79075d..0000000000
--- a/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80053A18
-/* 2EE18 80053A18 A480000A */  sh        $zero, 0xa($a0)
-/* 2EE1C 80053A1C AC800004 */  sw        $zero, 4($a0)
-/* 2EE20 80053A20 03E00008 */  jr        $ra
-/* 2EE24 80053A24 AC80000C */   sw       $zero, 0xc($a0)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s b/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s
deleted file mode 100644
index 4a660c6f77..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_default_variation_for_song
-/* E0B30 8014A430 0000302D */  daddu     $a2, $zero, $zero
-/* E0B34 8014A434 3C078009 */  lui       $a3, 0x8009
-/* E0B38 8014A438 24E734F0 */  addiu     $a3, $a3, 0x34f0
-/* E0B3C 8014A43C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* E0B40 8014A440 2463419C */  addiu     $v1, $v1, %lo(gGameStatusPtr)
-/* E0B44 8014A444 3C058015 */  lui       $a1, 0x8015
-/* E0B48 8014A448 24A5F720 */  addiu     $a1, $a1, -0x8e0
-.L8014A44C:
-/* E0B4C 8014A44C 8CA20000 */  lw        $v0, ($a1)
-/* E0B50 8014A450 1444000C */  bne       $v0, $a0, .L8014A484
-/* E0B54 8014A454 24C60001 */   addiu    $a2, $a2, 1
-/* E0B58 8014A458 8C630000 */  lw        $v1, ($v1)
-/* E0B5C 8014A45C 84620086 */  lh        $v0, 0x86($v1)
-/* E0B60 8014A460 8463008C */  lh        $v1, 0x8c($v1)
-/* E0B64 8014A464 00021100 */  sll       $v0, $v0, 4
-/* E0B68 8014A468 00471021 */  addu      $v0, $v0, $a3
-/* E0B6C 8014A46C 8C420004 */  lw        $v0, 4($v0)
-/* E0B70 8014A470 00031940 */  sll       $v1, $v1, 5
-/* E0B74 8014A474 00431021 */  addu      $v0, $v0, $v1
-/* E0B78 8014A478 9042001E */  lbu       $v0, 0x1e($v0)
-/* E0B7C 8014A47C 03E00008 */  jr        $ra
-/* E0B80 8014A480 30420001 */   andi     $v0, $v0, 1
-.L8014A484:
-/* E0B84 8014A484 2CC20006 */  sltiu     $v0, $a2, 6
-/* E0B88 8014A488 1440FFF0 */  bnez      $v0, .L8014A44C
-/* E0B8C 8014A48C 24A50004 */   addiu    $a1, $a1, 4
-/* E0B90 8014A490 03E00008 */  jr        $ra
-/* E0B94 8014A494 2402FFFF */   addiu    $v0, $zero, -1
diff --git a/include/enums.h b/include/enums.h
index 8b669f3116..4669f119bf 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -260,7 +260,7 @@ typedef UNK_TYPE SpriteId;
 #define SpriteId_PARADE_TWINK          0x000000E8
 #define SpriteId_LEAF                  0x000000E9
 
-typedef UNK_TYPE Song;
+typedef s32 SongID;
 #define Song_TOAD_TOWN              0x00000000
 #define Song_NORMAL_BATTLE          0x00000002
 #define Song_SPECIAL_BATTLE         0x00000003
diff --git a/include/map.h b/include/map.h
index 594850b6f6..f40c65c2b9 100644
--- a/include/map.h
+++ b/include/map.h
@@ -13,12 +13,19 @@
 
 typedef Vec4f EntryList[];
 
+/// Fields other than main, entryList, entryCount, background, and tattle are initialised when the map loads.
 typedef struct MapConfig {
-    /* 0x00 */ char unk_00[0x10];
+    /* 0x00 */ ModelNode* modelTreeRoot;
+    /* 0x04 */ UNK_PTR collision;
+    /* 0x08 */ char unk_08[8];
     /* 0x10 */ Script* main;
     /* 0x14 */ EntryList* entryList;
     /* 0x18 */ s32 entryCount;
-    /* 0x1C */ char unk_1C[0x1C];
+    /* 0x1C */ char unk_1C[12];
+    /* 0x28 */ char** modelNameList;
+    /* 0x2C */ char** colliderNameList;
+    /* 0x30 */ char** zoneNameList;
+    /* 0x34 */ char unk_34[4];
     /* 0x38 */ BackgroundHeader* background;
     /* 0x3C */ union {
         MessageID msgID;
@@ -26,6 +33,26 @@ typedef struct MapConfig {
     } tattle;
 } MapConfig; // size = 0x40
 
+#define MAP_ID_MAX_LEN 7 ///< "xxx_yyy" excluding null terminator.
+typedef struct Map {
+    /* 0x00 */ char* id; ///< @see MAP_ID_MAX_LEN
+    /* 0x04 */ MapConfig* config;
+    /* 0x08 */ void* dmaStart;
+    /* 0x0C */ void* dmaEnd;
+    /* 0x10 */ void* dmaDest;
+    /* 0x14 */ char* bgName;
+    /* 0x18 */ s32 (*init)(void); ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
+    /* 0x1C */ s16 flags1;
+    /* 0x1E */ s8 flags2;
+    /* 0x1F */ s8 flags3;
+} Map; // size = 0x20
+
+typedef struct Area {
+    /* 0x00 */ s32 mapCount;
+    /* 0x04 */ Map* maps;
+    /* 0x08 */ char* id; ///< "area_xxx"
+    /* 0x0C */ char* name; ///< JP debug name.
+} Area; // size = 0x10
 typedef struct NpcAISettings {
     /* 0x00 */ f32 moveSpeed;
     /* 0x04 */ s32 moveTime;
@@ -218,4 +245,11 @@ typedef struct {
 
 Enemy* get_enemy(NpcId npcId);
 
+/// Zero-terminated.
+extern Area gAreas[];
+
+/// Lists the songs that are forced to use the variation determined by `map.flags2 & 1`.
+/// @see get_song_variation_override_for_cur_map
+extern SongID gSongsUsingVariationFlag[6];
+
 #endif
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index f7be58427b..bd04bf4db9 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -1,8 +1,30 @@
 #include "common.h"
+#include "map.h"
 
 void func_8014AC84(s16 volume);
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song);
+/// If the given song ID is present in gSongsUsingVariationFlag, returns the current
+/// map's `flags2 & 1` value. Otherwise, returns -1.
+///
+/// @see gSongsUsingVariationFlag
+/// @returns -1: no override; 0: override to variation 0; 1 override to variation 1
+s32 get_song_variation_override_for_cur_map(SongID songID) {
+    u32 i = 0;
+    Area* areas = gAreas;
+    SongID* allowed = gSongsUsingVariationFlag;
+    GameStatus** gameStatusPtr = gGameStatusPtr;
+
+    for (i = 0; i < ARRAY_COUNT(gSongsUsingVariationFlag); i++) {
+        if (allowed[i] == songID) {
+            GameStatus* gameStatus = *gameStatusPtr;
+            Map* map = &areas[gameStatus->areaID].maps[gameStatus->mapID];
+
+            return map->flags2 & 1;
+        }
+    }
+
+    return -1;
+}
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
 
@@ -13,7 +35,7 @@ void func_8014A52C(void) {
 
 INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
 
-s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
+s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
     GameStatus* gameStatus = GAME_STATUS;
 
     if (gameStatus->demoState != 0) {
@@ -29,9 +51,9 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
 
             return 1;
         } else {
-            s32 defaultVariation = get_default_variation_for_song(songID);
-            if (defaultVariation >= 0) {
-                variation = defaultVariation;
+            s32 override = get_song_variation_override_for_cur_map(songID);
+            if (override >= 0) {
+                variation = override;
             }
 
             if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
@@ -57,7 +79,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
     }
 }
 
-s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
+s32 set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
     MusicPlayer* musicPlayers = gMusicPlayers;
 
     musicPlayers[playerIndex].flags &= ~8;
@@ -65,7 +87,7 @@ s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime,
     return _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
 }
 
-s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
+s32 func_8014A964(s32 playerIndex, SongID songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
     GameStatus* gameStatus = GAME_STATUS;
 
     if (gameStatus->demoState != 0) {
@@ -80,7 +102,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
 
             return 1;
         } else {
-            s32 defaultVariation = get_default_variation_for_song(songID);
+            s32 defaultVariation = get_song_variation_override_for_cur_map(songID);
             if (defaultVariation >= 0) {
                 variation = defaultVariation;
             }
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 27ca6bc9e6..a82b45a98d 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1904,3 +1904,5 @@ gMusicUnkVolume;0x80159AE0
 gMusicUnkVolume2;0x80159AE4
 gMusicTargetVolume;0x80159AE2
 gMusicCurVolume;0x80159AE6
+gAreas;0x800934F0
+gSongArray;0x8014F720
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 0442c35f66..cf1496998c 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -267,3 +267,6 @@ EnemyNpcDefeat = 0x8007809C;
 
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
+
+gAreas = 0x800934F0;
+gSongsUsingVariationFlag = 0x8014F720;

From 484fba8d4d62b7e5e0feb2f06cbe6893bb9f8e03 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 22:42:34 +0000
Subject: [PATCH 018/101] name transition_music_volume_to

---
 .../code_e0b30_len_b80/func_8014A548.s        | 28 +++++++++----------
 src/code_e0b30_len_b80.c                      |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
index 5c779984ab..c9dbd5c772 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
@@ -27,7 +27,7 @@ glabel func_8014A548
 /* E0C9C 8014A59C 00220821 */  addu      $at, $at, $v0
 /* E0CA0 8014A5A0 8C221290 */  lw        $v0, 0x1290($at)
 /* E0CA4 8014A5A4 00400008 */  jr        $v0
-/* E0CA8 8014A5A8 00000000 */   nop      
+/* E0CA8 8014A5A8 00000000 */   nop
 /* E0CAC 8014A5AC 96230000 */  lhu       $v1, ($s1)
 /* E0CB0 8014A5B0 30620001 */  andi      $v0, $v1, 1
 /* E0CB4 8014A5B4 1040001D */  beqz      $v0, .L8014A62C
@@ -37,24 +37,24 @@ glabel func_8014A548
 /* E0CC4 8014A5C4 1040000B */  beqz      $v0, .L8014A5F4
 /* E0CC8 8014A5C8 30620004 */   andi     $v0, $v1, 4
 /* E0CCC 8014A5CC 14400005 */  bnez      $v0, .L8014A5E4
-/* E0CD0 8014A5D0 00000000 */   nop      
+/* E0CD0 8014A5D0 00000000 */   nop
 /* E0CD4 8014A5D4 0C015671 */  jal       func_800559C4
 /* E0CD8 8014A5D8 8E040016 */   lw       $a0, 0x16($s0)
 /* E0CDC 8014A5DC 08052987 */  j         .L8014A61C
-/* E0CE0 8014A5E0 00000000 */   nop      
+/* E0CE0 8014A5E0 00000000 */   nop
 .L8014A5E4:
 /* E0CE4 8014A5E4 0C0156BC */  jal       func_80055AF0
 /* E0CE8 8014A5E8 8E040016 */   lw       $a0, 0x16($s0)
 /* E0CEC 8014A5EC 08052987 */  j         .L8014A61C
-/* E0CF0 8014A5F0 00000000 */   nop      
+/* E0CF0 8014A5F0 00000000 */   nop
 .L8014A5F4:
 /* E0CF4 8014A5F4 14400006 */  bnez      $v0, .L8014A610
-/* E0CF8 8014A5F8 00000000 */   nop      
+/* E0CF8 8014A5F8 00000000 */   nop
 /* E0CFC 8014A5FC 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D00 8014A600 0C0156AF */  jal       func_80055ABC
 /* E0D04 8014A604 0000302D */   daddu    $a2, $zero, $zero
 /* E0D08 8014A608 08052987 */  j         .L8014A61C
-/* E0D0C 8014A60C 00000000 */   nop      
+/* E0D0C 8014A60C 00000000 */   nop
 .L8014A610:
 /* E0D10 8014A610 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D14 8014A614 0C0156EE */  jal       func_80055BB8
@@ -82,7 +82,7 @@ glabel func_8014A548
 /* E0D5C 8014A65C A6220000 */   sh       $v0, ($s1)
 /* E0D60 8014A660 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D64 8014A664 0C01567F */  jal       func_800559FC
-/* E0D68 8014A668 00000000 */   nop      
+/* E0D68 8014A668 00000000 */   nop
 /* E0D6C 8014A66C 5440004D */  bnel      $v0, $zero, .L8014A7A4
 /* E0D70 8014A670 26520001 */   addiu    $s2, $s2, 1
 /* E0D74 8014A674 96220000 */  lhu       $v0, ($s1)
@@ -100,7 +100,7 @@ glabel func_8014A548
 /* E0DA4 8014A6A4 30620010 */   andi     $v0, $v1, 0x10
 /* E0DA8 8014A6A8 8E04000E */  lw        $a0, 0xe($s0)
 /* E0DAC 8014A6AC 04810003 */  bgez      $a0, .L8014A6BC
-/* E0DB0 8014A6B0 00000000 */   nop      
+/* E0DB0 8014A6B0 00000000 */   nop
 /* E0DB4 8014A6B4 080529E8 */  j         .L8014A7A0
 /* E0DB8 8014A6B8 A6000000 */   sh       $zero, ($s0)
 .L8014A6BC:
@@ -113,7 +113,7 @@ glabel func_8014A548
 /* E0DD4 8014A6D4 96220000 */  lhu       $v0, ($s1)
 /* E0DD8 8014A6D8 30420020 */  andi      $v0, $v0, 0x20
 /* E0DDC 8014A6DC 1040000C */  beqz      $v0, .L8014A710
-/* E0DE0 8014A6E0 00000000 */   nop      
+/* E0DE0 8014A6E0 00000000 */   nop
 /* E0DE4 8014A6E4 8602000C */  lh        $v0, 0xc($s0)
 /* E0DE8 8014A6E8 8607000A */  lh        $a3, 0xa($s0)
 /* E0DEC 8014A6EC AFA20010 */  sw        $v0, 0x10($sp)
@@ -128,8 +128,8 @@ glabel func_8014A548
 .L8014A710:
 /* E0E10 8014A710 3C048016 */  lui       $a0, 0x8016
 /* E0E14 8014A714 84849AE0 */  lh        $a0, -0x6520($a0)
-/* E0E18 8014A718 0C052B21 */  jal       func_8014AC84
-/* E0E1C 8014A71C 00000000 */   nop      
+/* E0E18 8014A718 0C052B21 */  jal       transition_music_volume_to
+/* E0E1C 8014A71C 00000000 */   nop
 .L8014A720:
 /* E0E20 8014A720 8E040016 */  lw        $a0, 0x16($s0)
 /* E0E24 8014A724 0C01565C */  jal       func_80055970
@@ -143,7 +143,7 @@ glabel func_8014A548
 /* E0E44 8014A744 A6000000 */   sh       $zero, ($s0)
 .L8014A748:
 /* E0E48 8014A748 10400005 */  beqz      $v0, .L8014A760
-/* E0E4C 8014A74C 00000000 */   nop      
+/* E0E4C 8014A74C 00000000 */   nop
 /* E0E50 8014A750 A6000000 */  sh        $zero, ($s0)
 /* E0E54 8014A754 96220000 */  lhu       $v0, ($s1)
 /* E0E58 8014A758 080529E7 */  j         .L8014A79C
@@ -151,7 +151,7 @@ glabel func_8014A548
 .L8014A760:
 /* E0E60 8014A760 8E04002A */  lw        $a0, 0x2a($s0)
 /* E0E64 8014A764 0C0156CA */  jal       func_80055B28
-/* E0E68 8014A768 00000000 */   nop      
+/* E0E68 8014A768 00000000 */   nop
 /* E0E6C 8014A76C 5440000D */  bnel      $v0, $zero, .L8014A7A4
 /* E0E70 8014A770 26520001 */   addiu    $s2, $s2, 1
 /* E0E74 8014A774 8E020022 */  lw        $v0, 0x22($s0)
@@ -174,7 +174,7 @@ glabel func_8014A548
 /* E0EAC 8014A7AC 1440FF75 */  bnez      $v0, .L8014A584
 /* E0EB0 8014A7B0 26310030 */   addiu    $s1, $s1, 0x30
 /* E0EB4 8014A7B4 0C052B25 */  jal       func_8014AC94
-/* E0EB8 8014A7B8 00000000 */   nop      
+/* E0EB8 8014A7B8 00000000 */   nop
 /* E0EBC 8014A7BC 8FBF0030 */  lw        $ra, 0x30($sp)
 /* E0EC0 8014A7C0 8FB5002C */  lw        $s5, 0x2c($sp)
 /* E0EC4 8014A7C4 8FB40028 */  lw        $s4, 0x28($sp)
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index bd04bf4db9..1aff819a74 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "map.h"
 
-void func_8014AC84(s16 volume);
+void transition_music_volume_to(s16 volume);
 
 /// If the given song ID is present in gSongsUsingVariationFlag, returns the current
 /// map's `flags2 & 1` value. Otherwise, returns -1.
@@ -57,7 +57,7 @@ s32 _set_music_track(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutT
             }
 
             if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
-                func_8014AC84(volume); // transition volume to?
+                transition_music_volume_to(volume);
 
                 if (musicPlayer->flags & 4) {
                     func_80055B80(musicPlayer->unk_18);
@@ -196,7 +196,7 @@ void func_8014AC70(void) {
     gMusicUnkVolume2 = 8;
 }
 
-void func_8014AC84(s16 volume) {
+void transition_music_volume_to(s16 volume) {
     gMusicTargetVolume = volume;
 }
 

From 9193d0a4ca81622ec1e13c303240af88c31af152 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 19:23:22 -0400
Subject: [PATCH 019/101] PR comments

---
 src/code_F5750.c | 50 +++++++++++++++++++++++++-----------------------
 src/code_FBE10.c |  2 +-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/code_F5750.c b/src/code_F5750.c
index e473f39c32..6e1ee4993a 100644
--- a/src/code_F5750.c
+++ b/src/code_F5750.c
@@ -125,26 +125,26 @@ ApiStatus SetPlayerAnimationSpeed(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     PlayerStatus* playerStatus = PLAYER_STATUS;
-    f32 var0;
-    f32 var1;
-    f32 moveSpeed;
 
     if (isInitialCall) {
-        var1 = get_variable(script, *args++);
-        var0 = get_variable(script, *args++);
+        f32 targetX = get_variable(script, *args++);
+        f32 targetZ = get_variable(script, *args++);
+        f32 moveSpeed;
+
         script->functionTemp[0].s = get_variable(script, *args++);
-        playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, var1, var0);
+        playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
 
         if (script->functionTemp[0].s == 0) {
-            script->functionTemp[0].s = (dist2D(playerStatus->position.x, playerStatus->position.z, var1,
-                                                var0) / gPlayerNpcPtr->moveSpeed);
+            script->functionTemp[0].s = dist2D(playerStatus->position.x, playerStatus->position.z, targetX,
+                                               targetZ) / gPlayerNpcPtr->moveSpeed;
             moveSpeed = gPlayerNpcPtr->moveSpeed;
         } else {
-            moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, var1, var0) / script->functionTemp[0].s;
+            moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / script->functionTemp[0].s;
         }
         move_player(script->functionTemp[0].s, playerStatus->targetYaw, moveSpeed);
     }
 
+    // functionTemp 0 is the time left
     script->functionTemp[0].s--;
     return script->functionTemp[0].s < 0;
 }
@@ -170,41 +170,43 @@ void PlayerJump2(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     PlayerStatus* playerStatus = PLAYER_STATUS;
-    f32* t1 = &script->functionTemp[1].f;
-    f32* t2 = &script->functionTemp[2].f;
-    s32* t3 = &script->functionTemp[3].s;
+    f32* initialYaw = &script->functionTemp[1].f;
+    f32* deltaYaw = &script->functionTemp[2].f;
+    s32* time = &script->functionTemp[3].s;
 
     if (isInitialCall) {
         Npc** player = &gPlayerNpcPtr;
 
         (*player)->yaw = playerStatus->targetYaw;
-        *t1 = (*player)->yaw;
-        *t2 = get_float_variable(script, *args++) - *t1;
-        *t3 = get_variable(script, *args++);
+        *initialYaw = (*player)->yaw;
+        *deltaYaw = get_float_variable(script, *args++) - *initialYaw;
+        *time = get_variable(script, *args++);
         (*player)->duration = 0;
 
-        if (*t2 < -180.0f) {
-            *t2 += 360.0f;
+        if (*deltaYaw < -180.0f) {
+            *deltaYaw += 360.0f;
         }
-        if (*t2 > 180.0f) {
-            *t2 -= 360.0f;
+        if (*deltaYaw > 180.0f) {
+            *deltaYaw -= 360.0f;
         }
     }
 
-    if (*t3 > 0) {
+    if (*time > 0) {
         Npc** player = &gPlayerNpcPtr;
 
         (*player)->duration++;
-        (*player)->yaw = *t1 + ((*t2 * (*player)->duration) / *t3);
+        (*player)->yaw = *initialYaw + ((*deltaYaw * (*player)->duration) / *time);
         (*player)->yaw = clamp_angle((*player)->yaw);
         playerStatus->targetYaw = (*player)->yaw;
-        return ((*player)->duration < *t3) ^ 1;
+
+        return !((*player)->duration < *time);
     } else {
         Npc** player = &gPlayerNpcPtr;
 
-        (*player)->yaw += *t2;
-        (*player)->yaw = clamp_angle((*player)->yaw);;
+        (*player)->yaw += *deltaYaw;
+        (*player)->yaw = clamp_angle((*player)->yaw);
         playerStatus->targetYaw = (*player)->yaw;
+
         return ApiStatus_DONE2;
     }
 }
diff --git a/src/code_FBE10.c b/src/code_FBE10.c
index c2ee2333cc..4b8ec5e185 100644
--- a/src/code_FBE10.c
+++ b/src/code_FBE10.c
@@ -67,7 +67,7 @@ ApiStatus func_802D7B74(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "code_FBE10", func_802D7BA4);
 
-ApiStatus func_802D7CF8(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 var0 = get_variable(script, *args++);
     s32 var1 = get_variable(script, *args++);

From e8ba79a88c5e2d52bc34bc3e0bff98e1ee37fc11 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 19:27:23 -0400
Subject: [PATCH 020/101] PR comment ;(

---
 src/code_FBE10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/code_FBE10.c b/src/code_FBE10.c
index 4b8ec5e185..374adb7b5c 100644
--- a/src/code_FBE10.c
+++ b/src/code_FBE10.c
@@ -76,8 +76,8 @@ ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) {
     s32 var4 = get_variable(script, *args++);
     s32 var5 = get_variable(script, *args++);
     s32 var6 = get_variable(script, *args++);
-    ScriptInstance* newScript = start_script(&D_802D9D50, 1, 0);
 
+    ScriptInstance* newScript = start_script(&D_802D9D50, 1, 0);
     newScript->varTable[0] = var0;
     newScript->varTable[1] = var1;
     newScript->varTable[2] = var2;

From cce065d5299e257be21b0ea609d82bf35c70c313 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 29 Oct 2020 23:52:24 +0000
Subject: [PATCH 021/101] badly match func_8014A498

---
 include/variables.h      |  3 ++-
 src/code_e0b30_len_b80.c | 16 +++++++++++++++-
 tools/symbol_addrs.txt   |  2 +-
 undefined_syms.txt       |  3 ++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/variables.h b/include/variables.h
index d892d99244..753be45c0d 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -167,6 +167,7 @@ extern s16 gMusicUnkVolume;
 extern s16 gMusicUnkVolume2;
 extern s16 gMusicCurrentVolume;
 extern s16 gMusicTargetVolume;
-extern MusicPlayer gMusicPlayers[]; // TODO: how many?
+extern MusicPlayer gMusicPlayers[4];
+extern MusicPlayer D_8014F6F0;
 
 #endif
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 1aff819a74..0b81071ac3 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -26,7 +26,21 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
     return -1;
 }
 
-INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
+//INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
+void func_8014A498(void) {
+    MusicPlayer* src;
+    s32 i;
+
+    for (i = 0; i < 2; i++) {
+        MusicPlayer *musicPlayers = gMusicPlayers;
+        musicPlayers[i] = *(src = &D_8014F6F0);
+    }
+
+    gMusicTargetVolume = 8;
+    gMusicUnkVolume2 = 8;
+    gMusicCurrentVolume = 8;
+    func_800561A4(8);
+}
 
 void func_8014A52C(void) {
     gMusicTargetVolume = 8;
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index a82b45a98d..a88c409173 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1903,6 +1903,6 @@ gMusicPlayers;0x80159AF0
 gMusicUnkVolume;0x80159AE0
 gMusicUnkVolume2;0x80159AE4
 gMusicTargetVolume;0x80159AE2
-gMusicCurVolume;0x80159AE6
+gMusicCurrentVolume;0x80159AE6
 gAreas;0x800934F0
 gSongArray;0x8014F720
diff --git a/undefined_syms.txt b/undefined_syms.txt
index cf1496998c..fa88c9a7e9 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -182,8 +182,9 @@ D_801595A0 = 0x801595A0;
 gMusicUnkVolume = 0x80159AE0;
 gMusicTargetVolume = 0x80159AE2;
 gMusicUnkVolume2 = 0x80159AE4;
-gMusicCurVolume = 0x80159AE6;
+gMusicCurrentVolume = 0x80159AE6;
 gMusicPlayers = 0x80159AF0;
+D_8014F6F0 = 0x8014F6F0;
 
 gCollisionStatus = 0x8015A550;
 D_8015C7C0 = 0x8015C7C0;

From 0f4b4f8db073e16ecdf8a31006460875af742f1c Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 00:01:11 +0000
Subject: [PATCH 022/101] add comment about .data

---
 src/code_e0b30_len_b80.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 0b81071ac3..c9a96443c1 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -26,9 +26,8 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
     return -1;
 }
 
-//INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
 void func_8014A498(void) {
-    MusicPlayer* src;
+    MusicPlayer* src; // TODO: remove this temp when .data section for this file (incl. D_8014F6F0) is set up
     s32 i;
 
     for (i = 0; i < 2; i++) {

From f94c542a9df21329a66da13f0310ee9bd07d681a Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 22:15:51 -0400
Subject: [PATCH 023/101] Set80151310_0

---
 .../dro_01/95B7E0/func_8024159C_95C79C.s      |  8 ----
 .../dro_02/9694C0/func_8024042C_9695EC.s      |  8 ----
 .../hos_03/A1BDB0/func_802425D0_A1D6D0.s      |  8 ----
 .../jan_02/B2C8A0/func_80241740_B2DBB0.s      |  8 ----
 .../jan_03/B34BD0/func_80241CC8_B36898.s      |  8 ----
 .../kmr_02/8B0070/func_802404BC_8B052C.s      |  8 ----
 .../mac_00/7EB340/func_8024075C_7EB46C.s      |  8 ----
 .../mac_01/800880/func_80240000_800880.s      | 21 -----------
 .../mac_01/800880/func_80240044_8008C4.s      | 37 -------------------
 .../mac_01/8017D0/func_8024203C_8028BC.s      |  8 ----
 .../mac_01/8017D0/func_80243AA0_804320.s      |  6 ---
 .../mac_02/823BF0/func_802418EC_824BAC.s      |  8 ----
 .../mac_03/831B20/func_802405DC_831DDC.s      |  8 ----
 .../mac_04/843030/func_8024058C_84315C.s      |  8 ----
 .../mac_05/852170/func_8024144C_8535BC.s      |  8 ----
 .../nok_01/9C53E0/func_80240E94_9C6274.s      |  8 ----
 .../nok_02/9D7AA0/func_80241A3C_9D8A5C.s      |  8 ----
 .../sam_01/CF7E80/func_8024082C_CF839C.s      |  8 ----
 .../sam_02/D05F60/func_80240C58_D06388.s      |  8 ----
 .../sam_11/D3A930/func_80240554_D3AB24.s      |  8 ----
 .../sam_11/D3ADA0/func_802408FC_D3AECC.s      |  8 ----
 include/common_structs.h                      |  2 +-
 include/functions.h                           |  2 +-
 src/code_7E2AA0.c                             |  1 +
 src/code_b72b0_len_15ed0.c                    |  2 +-
 src/world/area_dro/dro_01/95B7E0.c            |  2 +-
 src/world/area_dro/dro_02/9694C0.c            |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c            |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c            |  2 +-
 src/world/area_jan/jan_03/B34BD0.c            |  2 +-
 src/world/area_kmr/kmr_02/8B0070.c            |  2 +-
 src/world/area_mac/mac_00/7EB340.c            |  2 +-
 src/world/area_mac/mac_01/800880.c            | 16 +++++++-
 src/world/area_mac/mac_01/8017D0.c            |  6 ++-
 src/world/area_mac/mac_02/823BF0.c            |  2 +-
 src/world/area_mac/mac_03/831B20.c            |  2 +-
 src/world/area_mac/mac_04/843030.c            |  2 +-
 src/world/area_mac/mac_05/852170.c            |  2 +-
 src/world/area_nok/nok_01/9C53E0.c            |  2 +-
 src/world/area_nok/nok_02/9D7AA0.c            |  2 +-
 src/world/area_sam/sam_01/CF7E80.c            |  2 +-
 src/world/area_sam/sam_02/D05F60.c            |  2 +-
 src/world/area_sam/sam_11/D3A930.c            |  2 +-
 src/world/area_sam/sam_11/D3ADA0.c            |  2 +-
 src/world/common/Set80151310_0.inc.c          |  6 +++
 45 files changed, 45 insertions(+), 232 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s
 create mode 100644 src/world/common/Set80151310_0.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s
deleted file mode 100644
index a09e694f23..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024159C_95C79C
-/* 95C79C 8024159C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 95C7A0 802415A0 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 95C7A4 802415A4 03E00008 */  jr        $ra
-/* 95C7A8 802415A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s
deleted file mode 100644
index 67a3458f14..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024042C_9695EC
-/* 9695EC 8024042C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9695F0 80240430 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 9695F4 80240434 03E00008 */  jr        $ra
-/* 9695F8 80240438 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s
deleted file mode 100644
index 67421acd62..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802425D0_A1D6D0
-/* A1D6D0 802425D0 3C018015 */  lui       $at, %hi(D_80151310)
-/* A1D6D4 802425D4 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* A1D6D8 802425D8 03E00008 */  jr        $ra
-/* A1D6DC 802425DC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s
deleted file mode 100644
index 25e083dfc7..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241740_B2DBB0
-/* B2DBB0 80241740 3C018015 */  lui       $at, %hi(D_80151310)
-/* B2DBB4 80241744 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* B2DBB8 80241748 03E00008 */  jr        $ra
-/* B2DBBC 8024174C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s
deleted file mode 100644
index 4d608bced3..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CC8_B36898
-/* B36898 80241CC8 3C018015 */  lui       $at, %hi(D_80151310)
-/* B3689C 80241CCC AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* B368A0 80241CD0 03E00008 */  jr        $ra
-/* B368A4 80241CD4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s
deleted file mode 100644
index 1d8f1385f5..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404BC_8B052C
-/* 8B052C 802404BC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8B0530 802404C0 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 8B0534 802404C4 03E00008 */  jr        $ra
-/* 8B0538 802404C8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s
deleted file mode 100644
index ab1858da37..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024075C_7EB46C
-/* 7EB46C 8024075C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 7EB470 80240760 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 7EB474 80240764 03E00008 */  jr        $ra
-/* 7EB478 80240768 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s
deleted file mode 100644
index 00ed9945be..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_800880
-/* 800880 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 800884 80240004 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 800888 80240008 8C82000C */  lw        $v0, 0xc($a0)
-/* 80088C 8024000C 0C0B1EAF */  jal       get_variable
-/* 800890 80240010 8C450000 */   lw       $a1, ($v0)
-/* 800894 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 800898 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 80089C 8024001C 8C630140 */  lw        $v1, 0x140($v1)
-/* 8008A0 80240020 00021100 */  sll       $v0, $v0, 4
-/* 8008A4 80240024 00431021 */  addu      $v0, $v0, $v1
-/* 8008A8 80240028 8C440000 */  lw        $a0, ($v0)
-/* 8008AC 8024002C 0C04D052 */  jal       set_item_entity_flags
-/* 8008B0 80240030 24050040 */   addiu    $a1, $zero, 0x40
-/* 8008B4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8008B8 80240038 24020002 */  addiu     $v0, $zero, 2
-/* 8008BC 8024003C 03E00008 */  jr        $ra
-/* 8008C0 80240040 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s
deleted file mode 100644
index feadb69b5c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240044_8008C4
-/* 8008C4 80240044 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8008C8 80240048 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8008CC 8024004C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8008D0 80240050 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8008D4 80240054 8C82000C */  lw        $v0, 0xc($a0)
-/* 8008D8 80240058 0C0B1EAF */  jal       get_variable
-/* 8008DC 8024005C 8C450000 */   lw       $a1, ($v0)
-/* 8008E0 80240060 0000202D */  daddu     $a0, $zero, $zero
-/* 8008E4 80240064 3C05FD05 */  lui       $a1, 0xfd05
-/* 8008E8 80240068 34A50F82 */  ori       $a1, $a1, 0xf82
-/* 8008EC 8024006C 0C0B1EAF */  jal       get_variable
-/* 8008F0 80240070 0040802D */   daddu    $s0, $v0, $zero
-/* 8008F4 80240074 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8008F8 80240078 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8008FC 8024007C 24050040 */  addiu     $a1, $zero, 0x40
-/* 800900 80240080 8C640140 */  lw        $a0, 0x140($v1)
-/* 800904 80240084 00101900 */  sll       $v1, $s0, 4
-/* 800908 80240088 00641821 */  addu      $v1, $v1, $a0
-/* 80090C 8024008C 8C640000 */  lw        $a0, ($v1)
-/* 800910 80240090 0C04D052 */  jal       set_item_entity_flags
-/* 800914 80240094 0040882D */   daddu    $s1, $v0, $zero
-/* 800918 80240098 0000202D */  daddu     $a0, $zero, $zero
-/* 80091C 8024009C 00108080 */  sll       $s0, $s0, 2
-/* 800920 802400A0 02118021 */  addu      $s0, $s0, $s1
-/* 800924 802400A4 8E050000 */  lw        $a1, ($s0)
-/* 800928 802400A8 0C0B2026 */  jal       set_variable
-/* 80092C 802400AC 24060001 */   addiu    $a2, $zero, 1
-/* 800930 802400B0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 800934 802400B4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 800938 802400B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 80093C 802400BC 24020002 */  addiu     $v0, $zero, 2
-/* 800940 802400C0 03E00008 */  jr        $ra
-/* 800944 802400C4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s
deleted file mode 100644
index d88bf7c134..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024203C_8028BC
-/* 8028BC 8024203C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8028C0 80242040 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 8028C4 80242044 03E00008 */  jr        $ra
-/* 8028C8 80242048 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s
deleted file mode 100644
index 6db024c51e..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243AA0_804320
-/* 804320 80243AA0 03E00008 */  jr        $ra
-/* 804324 80243AA4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s
deleted file mode 100644
index f5aeb9f695..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418EC_824BAC
-/* 824BAC 802418EC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 824BB0 802418F0 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 824BB4 802418F4 03E00008 */  jr        $ra
-/* 824BB8 802418F8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s
deleted file mode 100644
index e57f03e92f..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405DC_831DDC
-/* 831DDC 802405DC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 831DE0 802405E0 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 831DE4 802405E4 03E00008 */  jr        $ra
-/* 831DE8 802405E8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s
deleted file mode 100644
index 4a79b1c634..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024058C_84315C
-/* 84315C 8024058C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 843160 80240590 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 843164 80240594 03E00008 */  jr        $ra
-/* 843168 80240598 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s
deleted file mode 100644
index fb3ec316b1..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024144C_8535BC
-/* 8535BC 8024144C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8535C0 80241450 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 8535C4 80241454 03E00008 */  jr        $ra
-/* 8535C8 80241458 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s
deleted file mode 100644
index 1c38b3a255..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E94_9C6274
-/* 9C6274 80240E94 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9C6278 80240E98 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 9C627C 80240E9C 03E00008 */  jr        $ra
-/* 9C6280 80240EA0 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s
deleted file mode 100644
index 37af635b84..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A3C_9D8A5C
-/* 9D8A5C 80241A3C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9D8A60 80241A40 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* 9D8A64 80241A44 03E00008 */  jr        $ra
-/* 9D8A68 80241A48 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s
deleted file mode 100644
index 3aa0d280ba..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024082C_CF839C
-/* CF839C 8024082C 3C018015 */  lui       $at, %hi(D_80151310)
-/* CF83A0 80240830 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* CF83A4 80240834 03E00008 */  jr        $ra
-/* CF83A8 80240838 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s
deleted file mode 100644
index 478c4497ba..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C58_D06388
-/* D06388 80240C58 3C018015 */  lui       $at, %hi(D_80151310)
-/* D0638C 80240C5C AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* D06390 80240C60 03E00008 */  jr        $ra
-/* D06394 80240C64 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s
deleted file mode 100644
index 8fb3711d85..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240554_D3AB24
-/* D3AB24 80240554 3C018015 */  lui       $at, %hi(D_80151310)
-/* D3AB28 80240558 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* D3AB2C 8024055C 03E00008 */  jr        $ra
-/* D3AB30 80240560 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s
deleted file mode 100644
index 602720afe0..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408FC_D3AECC
-/* D3AECC 802408FC 3C018015 */  lui       $at, %hi(D_80151310)
-/* D3AED0 80240900 AC201310 */  sw        $zero, %lo(D_80151310)($at)
-/* D3AED4 80240904 03E00008 */  jr        $ra
-/* D3AED8 80240908 24020002 */   addiu    $v0, $zero, 2
diff --git a/include/common_structs.h b/include/common_structs.h
index c2c2be9b11..a10f482c20 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -916,7 +916,7 @@ typedef struct GameStatus {
     /* 0x136 */ char unk_136[2];
     /* 0x138 */ s32 nextRNG;
     /* 0x13C */ char unk_13C[4];
-    /* 0x140 */ UNK_PTR shopItemData;
+    /* 0x140 */ s32* shopItemData;
     /* 0x144 */ struct Shop* mapShop;
     /* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */
     /* 0x14A */ s16 backgroundMinW;
diff --git a/include/functions.h b/include/functions.h
index c4333481bb..0b63c6b884 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -97,7 +97,7 @@ void make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 unk1, s32 unk
 void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z);
 ItemEntity* get_item_entity(s32 itemEntityIndex);
 s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar);
-
+void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
 
 void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);
 
diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c
index 7b711c0be3..339305f3b6 100644
--- a/src/code_7E2AA0.c
+++ b/src/code_7E2AA0.c
@@ -96,6 +96,7 @@ ApiStatus func_80282610(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
+// common probably
 ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) {
     D_80151310 = 0;
     return ApiStatus_DONE2;
diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c
index 035599feaf..32148743d3 100644
--- a/src/code_b72b0_len_15ed0.c
+++ b/src/code_b72b0_len_15ed0.c
@@ -232,7 +232,7 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", test_item_player_collision);
 
 INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8);
 
-INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_item_entity_flags);
+INCLUDE_ASM(void, "code_b72b0_len_15ed0", set_item_entity_flags, s32 itemEntityIndex, s32 flag);
 
 INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags);
 
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 5a3ae9fb82..07cc068199 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024159C_95C79C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 29d999086e..f1b83904dc 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024042C_9695EC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 3b7df30ad8..7cb60e96ea 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425D0_A1D6D0);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 6463b1417d..5e4e1bdb84 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241740_B2DBB0);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 57041180db..24c7350a8c 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -84,7 +84,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CC8_B36898);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 9d942f4147..5a9849bd69 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404BC_8B052C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 8417e2cb9a..658037b61e 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024075C_7EB46C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);
 
diff --git a/src/world/area_mac/mac_01/800880.c b/src/world/area_mac/mac_01/800880.c
index 775a7760db..308033f505 100644
--- a/src/world/area_mac/mac_01/800880.c
+++ b/src/world/area_mac/mac_01/800880.c
@@ -1,7 +1,19 @@
 #include "mac_01.h"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240000_800880);
+ApiStatus func_80240000_800880(ScriptInstance* script, s32 isInitialCall) {
+    s32 itemIndex = get_variable(script, *script->ptrReadPos);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240044_8008C4);
+    set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240044_8008C4(ScriptInstance* script, s32 isInitialCall) {
+    s32 itemIndex = get_variable(script, *script->ptrReadPos);
+    s32* var1 = get_variable(NULL, SI_MAP_VAR(2));
+
+    set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40);
+    set_variable(NULL, var1[itemIndex], 1);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_802400C8_800948);
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 5505145b5f..0e381f6894 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024203C_8028BC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
 
@@ -116,7 +116,9 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0_804320);
+ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 21d7a537f0..ff42fb2076 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418EC_824BAC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 9091489de7..7f58c90beb 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405DC_831DDC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index a2a0da5d38..bedafef124 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024058C_84315C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index f6ae4a2a04..e9436ae700 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024144C_8535BC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 3b6c77494e..da63e5ea1b 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E94_9C6274);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index ca0701e2b8..dd4613d90e 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A3C_9D8A5C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 7f842bc9bd..78f0cd4ac7 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024082C_CF839C);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 929ed9196e..8ddd53f427 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C58_D06388);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index 2f47758e38..9496af1550 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240554_D3AB24);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 93d62f51de..2367a47ff8 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408FC_D3AECC);
+#include "world/common/Set80151310_0.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);
 
diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310_0.inc.c
new file mode 100644
index 0000000000..953e1f4232
--- /dev/null
+++ b/src/world/common/Set80151310_0.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
+    D_80151310 = 0;
+    return ApiStatus_DONE2;
+}

From ba35048ab208a65a6504d17de0e0b7c658553323 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 22:20:45 -0400
Subject: [PATCH 024/101] GetPlayerCoins

---
 .../world/area_mac/mac_01/8017D0/func_802440E8_804968.s  | 9 ---------
 .../world/area_mac/mac_03/833740/func_80241F6C_83376C.s  | 9 ---------
 .../world/area_mac/mac_04/843030/func_802419D0_8445A0.s  | 9 ---------
 src/world/area_mac/mac_01/8017D0.c                       | 2 +-
 src/world/area_mac/mac_03/833740.c                       | 2 +-
 src/world/area_mac/mac_04/843030.c                       | 2 +-
 src/world/common/GetPlayerCoins.inc.c                    | 6 ++++++
 7 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s
 create mode 100644 src/world/common/GetPlayerCoins.inc.c

diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s
deleted file mode 100644
index 198bddddb5..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802440E8_804968
-/* 804968 802440E8 3C028011 */  lui       $v0, 0x8011
-/* 80496C 802440EC 8442F29C */  lh        $v0, -0xd64($v0)
-/* 804970 802440F0 AC820084 */  sw        $v0, 0x84($a0)
-/* 804974 802440F4 03E00008 */  jr        $ra
-/* 804978 802440F8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s
deleted file mode 100644
index f8b4208bfe..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F6C_83376C
-/* 83376C 80241F6C 3C028011 */  lui       $v0, 0x8011
-/* 833770 80241F70 8442F29C */  lh        $v0, -0xd64($v0)
-/* 833774 80241F74 AC820084 */  sw        $v0, 0x84($a0)
-/* 833778 80241F78 03E00008 */  jr        $ra
-/* 83377C 80241F7C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s
deleted file mode 100644
index d61c2be71c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419D0_8445A0
-/* 8445A0 802419D0 3C028011 */  lui       $v0, 0x8011
-/* 8445A4 802419D4 8442F29C */  lh        $v0, -0xd64($v0)
-/* 8445A8 802419D8 AC820084 */  sw        $v0, 0x84($a0)
-/* 8445AC 802419DC 03E00008 */  jr        $ra
-/* 8445B0 802419E0 24020002 */   addiu    $v0, $zero, 2
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 0e381f6894..cd2278afa4 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -138,7 +138,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440E8_804968);
+#include "world/common/GetPlayerCoins.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC_80497C);
 
diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c
index 57156e2697..c2d5f59a26 100644
--- a/src/world/area_mac/mac_03/833740.c
+++ b/src/world/area_mac/mac_03/833740.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F40_833740);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F6C_83376C);
+#include "world/common/GetPlayerCoins.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F80_833780);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index bedafef124..f0c1cf813b 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -82,7 +82,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980_844550);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC_84457C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419D0_8445A0);
+#include "world/common/GetPlayerCoins.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4_8445B4);
 
diff --git a/src/world/common/GetPlayerCoins.inc.c b/src/world/common/GetPlayerCoins.inc.c
new file mode 100644
index 0000000000..68b3ffec3b
--- /dev/null
+++ b/src/world/common/GetPlayerCoins.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus GetPlayerCoins(ScriptInstance* script, s32 isInitialCall) {
+    script->varTable[0] = gPlayerData.coins;
+    return ApiStatus_DONE2;
+}

From 4a1f26c6eaf624176fd026151215611a906509f0 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 22:33:01 -0400
Subject: [PATCH 025/101] Set80151310

---
 .../area_dro/dro_01/95B7E0/func_80241588_95C788.s     |  9 ---------
 .../area_dro/dro_02/9694C0/func_80240418_9695D8.s     |  9 ---------
 .../area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s     |  9 ---------
 .../area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s     |  9 ---------
 .../area_jan/jan_03/B34BD0/func_80241CB4_B36884.s     |  9 ---------
 .../area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s     |  9 ---------
 .../area_mac/mac_00/7EB340/func_80240748_7EB458.s     |  9 ---------
 .../area_mac/mac_01/8017D0/func_80242028_8028A8.s     |  9 ---------
 .../area_mac/mac_02/823BF0/func_802418D8_824B98.s     |  9 ---------
 .../area_mac/mac_03/831B20/func_802405C8_831DC8.s     |  9 ---------
 .../area_mac/mac_04/843030/func_80240578_843148.s     |  9 ---------
 .../area_mac/mac_05/852170/func_80241438_8535A8.s     |  9 ---------
 .../area_nok/nok_01/9C53E0/func_80240E80_9C6260.s     |  9 ---------
 .../area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s     |  9 ---------
 .../area_sam/sam_01/CF7E80/func_80240818_CF8388.s     |  9 ---------
 .../area_sam/sam_02/D05F60/func_80240C44_D06374.s     |  9 ---------
 .../area_sam/sam_11/D3A930/func_80240540_D3AB10.s     |  9 ---------
 .../area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s     |  9 ---------
 src/world/area_dro/dro_01/95B7E0.c                    |  4 +---
 src/world/area_dro/dro_02/9694C0.c                    |  4 +---
 src/world/area_hos/hos_03/A1BDB0.c                    |  4 +---
 src/world/area_jan/jan_02/B2C8A0.c                    |  4 +---
 src/world/area_jan/jan_03/B34BD0.c                    |  4 +---
 src/world/area_kmr/kmr_02/8B0070.c                    |  4 +---
 src/world/area_mac/mac_00/7EB340.c                    |  4 +---
 src/world/area_mac/mac_01/8017D0.c                    |  4 +---
 src/world/area_mac/mac_02/823BF0.c                    |  4 +---
 src/world/area_mac/mac_03/831B20.c                    |  4 +---
 src/world/area_mac/mac_04/843030.c                    |  4 +---
 src/world/area_mac/mac_05/852170.c                    |  4 +---
 src/world/area_nok/nok_01/9C53E0.c                    |  4 +---
 src/world/area_nok/nok_02/9D7AA0.c                    |  4 +---
 src/world/area_sam/sam_01/CF7E80.c                    |  4 +---
 src/world/area_sam/sam_02/D05F60.c                    |  4 +---
 src/world/area_sam/sam_11/D3A930.c                    | 11 +++++++++--
 src/world/area_sam/sam_11/D3ADA0.c                    |  4 +---
 .../common/{Set80151310_0.inc.c => Set80151310.inc.c} |  5 +++++
 37 files changed, 31 insertions(+), 215 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s
 rename src/world/common/{Set80151310_0.inc.c => Set80151310.inc.c} (53%)

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s
deleted file mode 100644
index b1c7c9d842..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241588_95C788
-/* 95C788 80241588 24020001 */  addiu     $v0, $zero, 1
-/* 95C78C 8024158C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 95C790 80241590 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 95C794 80241594 03E00008 */  jr        $ra
-/* 95C798 80241598 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s
deleted file mode 100644
index a2c503ecc0..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240418_9695D8
-/* 9695D8 80240418 24020001 */  addiu     $v0, $zero, 1
-/* 9695DC 8024041C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9695E0 80240420 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 9695E4 80240424 03E00008 */  jr        $ra
-/* 9695E8 80240428 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s
deleted file mode 100644
index 17f8a0fa7b..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802425BC_A1D6BC
-/* A1D6BC 802425BC 24020001 */  addiu     $v0, $zero, 1
-/* A1D6C0 802425C0 3C018015 */  lui       $at, %hi(D_80151310)
-/* A1D6C4 802425C4 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* A1D6C8 802425C8 03E00008 */  jr        $ra
-/* A1D6CC 802425CC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s
deleted file mode 100644
index 85143edf50..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024172C_B2DB9C
-/* B2DB9C 8024172C 24020001 */  addiu     $v0, $zero, 1
-/* B2DBA0 80241730 3C018015 */  lui       $at, %hi(D_80151310)
-/* B2DBA4 80241734 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* B2DBA8 80241738 03E00008 */  jr        $ra
-/* B2DBAC 8024173C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s
deleted file mode 100644
index 09ed36b550..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CB4_B36884
-/* B36884 80241CB4 24020001 */  addiu     $v0, $zero, 1
-/* B36888 80241CB8 3C018015 */  lui       $at, %hi(D_80151310)
-/* B3688C 80241CBC AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* B36890 80241CC0 03E00008 */  jr        $ra
-/* B36894 80241CC4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s
deleted file mode 100644
index 9b149d8e42..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404A8_8B0518
-/* 8B0518 802404A8 24020001 */  addiu     $v0, $zero, 1
-/* 8B051C 802404AC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8B0520 802404B0 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 8B0524 802404B4 03E00008 */  jr        $ra
-/* 8B0528 802404B8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s
deleted file mode 100644
index ad4d76513b..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240748_7EB458
-/* 7EB458 80240748 24020001 */  addiu     $v0, $zero, 1
-/* 7EB45C 8024074C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 7EB460 80240750 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 7EB464 80240754 03E00008 */  jr        $ra
-/* 7EB468 80240758 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s
deleted file mode 100644
index dee90ec51a..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242028_8028A8
-/* 8028A8 80242028 24020001 */  addiu     $v0, $zero, 1
-/* 8028AC 8024202C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8028B0 80242030 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 8028B4 80242034 03E00008 */  jr        $ra
-/* 8028B8 80242038 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s
deleted file mode 100644
index 1564a3e7d0..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418D8_824B98
-/* 824B98 802418D8 24020001 */  addiu     $v0, $zero, 1
-/* 824B9C 802418DC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 824BA0 802418E0 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 824BA4 802418E4 03E00008 */  jr        $ra
-/* 824BA8 802418E8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s
deleted file mode 100644
index 0d0b173707..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405C8_831DC8
-/* 831DC8 802405C8 24020001 */  addiu     $v0, $zero, 1
-/* 831DCC 802405CC 3C018015 */  lui       $at, %hi(D_80151310)
-/* 831DD0 802405D0 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 831DD4 802405D4 03E00008 */  jr        $ra
-/* 831DD8 802405D8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s
deleted file mode 100644
index a1fe2bd8db..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240578_843148
-/* 843148 80240578 24020001 */  addiu     $v0, $zero, 1
-/* 84314C 8024057C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 843150 80240580 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 843154 80240584 03E00008 */  jr        $ra
-/* 843158 80240588 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s
deleted file mode 100644
index 7bfa348ac9..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241438_8535A8
-/* 8535A8 80241438 24020001 */  addiu     $v0, $zero, 1
-/* 8535AC 8024143C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 8535B0 80241440 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 8535B4 80241444 03E00008 */  jr        $ra
-/* 8535B8 80241448 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s
deleted file mode 100644
index cf6b163608..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E80_9C6260
-/* 9C6260 80240E80 24020001 */  addiu     $v0, $zero, 1
-/* 9C6264 80240E84 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9C6268 80240E88 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 9C626C 80240E8C 03E00008 */  jr        $ra
-/* 9C6270 80240E90 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s
deleted file mode 100644
index 561e80d2a0..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A28_9D8A48
-/* 9D8A48 80241A28 24020001 */  addiu     $v0, $zero, 1
-/* 9D8A4C 80241A2C 3C018015 */  lui       $at, %hi(D_80151310)
-/* 9D8A50 80241A30 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* 9D8A54 80241A34 03E00008 */  jr        $ra
-/* 9D8A58 80241A38 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s
deleted file mode 100644
index dadba2d8a8..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240818_CF8388
-/* CF8388 80240818 24020001 */  addiu     $v0, $zero, 1
-/* CF838C 8024081C 3C018015 */  lui       $at, %hi(D_80151310)
-/* CF8390 80240820 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* CF8394 80240824 03E00008 */  jr        $ra
-/* CF8398 80240828 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s
deleted file mode 100644
index e90f8d35f5..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C44_D06374
-/* D06374 80240C44 24020001 */  addiu     $v0, $zero, 1
-/* D06378 80240C48 3C018015 */  lui       $at, %hi(D_80151310)
-/* D0637C 80240C4C AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* D06380 80240C50 03E00008 */  jr        $ra
-/* D06384 80240C54 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s
deleted file mode 100644
index ffe44ebffd..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240540_D3AB10
-/* D3AB10 80240540 24020002 */  addiu     $v0, $zero, 2
-/* D3AB14 80240544 3C018015 */  lui       $at, %hi(D_80151310)
-/* D3AB18 80240548 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* D3AB1C 8024054C 03E00008 */  jr        $ra
-/* D3AB20 80240550 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s
deleted file mode 100644
index 8b351f5459..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408E8_D3AEB8
-/* D3AEB8 802408E8 24020001 */  addiu     $v0, $zero, 1
-/* D3AEBC 802408EC 3C018015 */  lui       $at, %hi(D_80151310)
-/* D3AEC0 802408F0 AC221310 */  sw        $v0, %lo(D_80151310)($at)
-/* D3AEC4 802408F4 03E00008 */  jr        $ra
-/* D3AEC8 802408F8 24020002 */   addiu    $v0, $zero, 2
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 07cc068199..567019d605 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index f1b83904dc..b09cc58c04 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 7cb60e96ea..5acb918d18 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -50,9 +50,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 5e4e1bdb84..4c0ff535b8 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -38,9 +38,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 24c7350a8c..8c4248f91c 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -82,9 +82,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 5a9849bd69..a4c1bb554c 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -20,9 +20,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 658037b61e..3e66a781e0 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index cd2278afa4..ac8052fe96 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index ff42fb2076..f5f17d7151 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 7f58c90beb..1d11fd62e9 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -6,9 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index f0c1cf813b..c1411631b0 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index e9436ae700..44b24bb640 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -36,9 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index da63e5ea1b..747ceb53e7 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -48,9 +48,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index dd4613d90e..efaed89d54 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 78f0cd4ac7..446e390df9 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 8ddd53f427..9f4b58cb6b 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index 9496af1550..33450ec0ed 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -4,9 +4,16 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10);
+// Almost the same as Set80151310, but we're setting it to 2 in the first func instead of 1
+static ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) {
+    D_80151310 = 2;
+    return ApiStatus_DONE2;
+}
 
-#include "world/common/Set80151310_0.inc.c"
+static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
+    D_80151310 = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 2367a47ff8..b014d1b7b8 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0);
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8);
-
-#include "world/common/Set80151310_0.inc.c"
+#include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);
 
diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310.inc.c
similarity index 53%
rename from src/world/common/Set80151310_0.inc.c
rename to src/world/common/Set80151310.inc.c
index 953e1f4232..2223ab43f6 100644
--- a/src/world/common/Set80151310_0.inc.c
+++ b/src/world/common/Set80151310.inc.c
@@ -1,5 +1,10 @@
 #include "common.h"
 
+static ApiStatus Set80151310_1(ScriptInstance* script, s32 isInitialCall) {
+    D_80151310 = 1;
+    return ApiStatus_DONE2;
+}
+
 static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
     D_80151310 = 0;
     return ApiStatus_DONE2;

From bef10dd44e7f7399fa172cc4555a297b8c334974 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 22:40:04 -0400
Subject: [PATCH 026/101] Call800E9894

---
 .../area_dro/dro_02/9694C0/func_80243484_96C644.s    | 12 ------------
 .../area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s    | 12 ------------
 .../area_jan/jan_03/B34BD0/func_802414B0_B36080.s    | 12 ------------
 .../area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s    | 12 ------------
 .../area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s    | 12 ------------
 .../area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s    | 12 ------------
 .../area_kpa/kpa_91/A86A50/func_80241528_A87F78.s    | 12 ------------
 .../area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s    | 12 ------------
 .../area_mac/mac_01/8017D0/func_802437AC_80402C.s    | 12 ------------
 .../area_mac/mac_04/843030/func_80241C20_8447F0.s    | 12 ------------
 .../area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s    | 12 ------------
 .../area_sam/sam_02/D05F60/func_80240830_D05F60.s    | 12 ------------
 .../area_sam/sam_06/D203E0/func_80241F50_D21DE0.s    | 12 ------------
 src/world/area_dro/dro_02/9694C0.c                   |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c                   |  2 +-
 src/world/area_jan/jan_03/B34BD0.c                   |  2 +-
 src/world/area_kkj/kkj_20/AFDE00.c                   |  2 +-
 src/world/area_kmr/kmr_02/8B30E0.c                   |  2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c                   |  2 +-
 src/world/area_kpa/kpa_91/A86A50.c                   |  2 +-
 src/world/area_kpa/kpa_95/A8CB60.c                   |  2 +-
 src/world/area_mac/mac_01/8017D0.c                   |  2 +-
 src/world/area_mac/mac_04/843030.c                   |  2 +-
 src/world/area_nok/nok_01/9C53E0.c                   |  2 +-
 src/world/area_sam/sam_02/D05F60.c                   |  2 +-
 src/world/area_sam/sam_06/D203E0.c                   |  2 +-
 src/world/common/Call800E9894.inc.c                  |  6 ++++++
 27 files changed, 19 insertions(+), 169 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s
 create mode 100644 src/world/common/Call800E9894.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s
deleted file mode 100644
index 80d6c097f8..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243484_96C644
-/* 96C644 80243484 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C648 80243488 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C64C 8024348C 0C03A625 */  jal       func_800E9894
-/* 96C650 80243490 00000000 */   nop      
-/* 96C654 80243494 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C658 80243498 24020002 */  addiu     $v0, $zero, 2
-/* 96C65C 8024349C 03E00008 */  jr        $ra
-/* 96C660 802434A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s
deleted file mode 100644
index 347f95c415..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421A8_A1D2A8
-/* A1D2A8 802421A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D2AC 802421AC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D2B0 802421B0 0C03A625 */  jal       func_800E9894
-/* A1D2B4 802421B4 00000000 */   nop      
-/* A1D2B8 802421B8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D2BC 802421BC 24020002 */  addiu     $v0, $zero, 2
-/* A1D2C0 802421C0 03E00008 */  jr        $ra
-/* A1D2C4 802421C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s
deleted file mode 100644
index 5c822db0c3..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414B0_B36080
-/* B36080 802414B0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36084 802414B4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36088 802414B8 0C03A625 */  jal       func_800E9894
-/* B3608C 802414BC 00000000 */   nop      
-/* B36090 802414C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36094 802414C4 24020002 */  addiu     $v0, $zero, 2
-/* B36098 802414C8 03E00008 */  jr        $ra
-/* B3609C 802414CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s
deleted file mode 100644
index edab8c1754..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402C0_AFDE00
-/* AFDE00 802402C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFDE04 802402C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFDE08 802402C8 0C03A625 */  jal       func_800E9894
-/* AFDE0C 802402CC 00000000 */   nop      
-/* AFDE10 802402D0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFDE14 802402D4 24020002 */  addiu     $v0, $zero, 2
-/* AFDE18 802402D8 03E00008 */  jr        $ra
-/* AFDE1C 802402DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s
deleted file mode 100644
index 0618959d77..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243070_8B30E0
-/* 8B30E0 80243070 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B30E4 80243074 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B30E8 80243078 0C03A625 */  jal       func_800E9894
-/* 8B30EC 8024307C 00000000 */   nop      
-/* 8B30F0 80243080 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B30F4 80243084 24020002 */  addiu     $v0, $zero, 2
-/* 8B30F8 80243088 03E00008 */  jr        $ra
-/* 8B30FC 8024308C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s
deleted file mode 100644
index 59c2adb5fb..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412A0_8ED0C0
-/* 8ED0C0 802412A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED0C4 802412A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED0C8 802412A8 0C03A625 */  jal       func_800E9894
-/* 8ED0CC 802412AC 00000000 */   nop      
-/* 8ED0D0 802412B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED0D4 802412B4 24020002 */  addiu     $v0, $zero, 2
-/* 8ED0D8 802412B8 03E00008 */  jr        $ra
-/* 8ED0DC 802412BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s
deleted file mode 100644
index 6bb6d6c785..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241528_A87F78
-/* A87F78 80241528 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A87F7C 8024152C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A87F80 80241530 0C03A625 */  jal       func_800E9894
-/* A87F84 80241534 00000000 */   nop      
-/* A87F88 80241538 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A87F8C 8024153C 24020002 */  addiu     $v0, $zero, 2
-/* A87F90 80241540 03E00008 */  jr        $ra
-/* A87F94 80241544 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s
deleted file mode 100644
index 47400bd37f..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241608_A8E088
-/* A8E088 80241608 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E08C 8024160C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E090 80241610 0C03A625 */  jal       func_800E9894
-/* A8E094 80241614 00000000 */   nop      
-/* A8E098 80241618 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E09C 8024161C 24020002 */  addiu     $v0, $zero, 2
-/* A8E0A0 80241620 03E00008 */  jr        $ra
-/* A8E0A4 80241624 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s
deleted file mode 100644
index 6f7e6b9fce..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802437AC_80402C
-/* 80402C 802437AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 804030 802437B0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 804034 802437B4 0C03A625 */  jal       func_800E9894
-/* 804038 802437B8 00000000 */   nop      
-/* 80403C 802437BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 804040 802437C0 24020002 */  addiu     $v0, $zero, 2
-/* 804044 802437C4 03E00008 */  jr        $ra
-/* 804048 802437C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s
deleted file mode 100644
index d7340f5175..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C20_8447F0
-/* 8447F0 80241C20 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8447F4 80241C24 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8447F8 80241C28 0C03A625 */  jal       func_800E9894
-/* 8447FC 80241C2C 00000000 */   nop      
-/* 844800 80241C30 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 844804 80241C34 24020002 */  addiu     $v0, $zero, 2
-/* 844808 80241C38 03E00008 */  jr        $ra
-/* 84480C 80241C3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s
deleted file mode 100644
index f088194dcb..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A6C_9C5E4C
-/* 9C5E4C 80240A6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C5E50 80240A70 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C5E54 80240A74 0C03A625 */  jal       func_800E9894
-/* 9C5E58 80240A78 00000000 */   nop      
-/* 9C5E5C 80240A7C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C5E60 80240A80 24020002 */  addiu     $v0, $zero, 2
-/* 9C5E64 80240A84 03E00008 */  jr        $ra
-/* 9C5E68 80240A88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s
deleted file mode 100644
index 28763cfcd6..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240830_D05F60
-/* D05F60 80240830 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D05F64 80240834 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D05F68 80240838 0C03A625 */  jal       func_800E9894
-/* D05F6C 8024083C 00000000 */   nop      
-/* D05F70 80240840 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D05F74 80240844 24020002 */  addiu     $v0, $zero, 2
-/* D05F78 80240848 03E00008 */  jr        $ra
-/* D05F7C 8024084C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s
deleted file mode 100644
index 4d2f754750..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F50_D21DE0
-/* D21DE0 80241F50 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21DE4 80241F54 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D21DE8 80241F58 0C03A625 */  jal       func_800E9894
-/* D21DEC 80241F5C 00000000 */   nop      
-/* D21DF0 80241F60 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21DF4 80241F64 24020002 */  addiu     $v0, $zero, 2
-/* D21DF8 80241F68 03E00008 */  jr        $ra
-/* D21DFC 80241F6C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index b09cc58c04..4eb91270f0 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024334C_96C50C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243484_96C644);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 5acb918d18..048fd17804 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241E98_A1CF98);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421A8_A1D2A8);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 8c4248f91c..a6a26446b5 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414B0_B36080);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index c3556b54d0..f7b897aa31 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -1,6 +1,6 @@
 #include "kkj_20.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402C0_AFDE00);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402E0_AFDE20);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index d58867fb6b..9ffcee5159 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -1,6 +1,6 @@
 #include "kmr_02.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243070_8B30E0);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index eefa891c4f..86177005f7 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -1,6 +1,6 @@
 #include "kmr_20.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412A0_8ED0C0);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index afa9bdfee4..c84dd51ff4 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802411A4_A87BF4);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241528_A87F78);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98);
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index 335f400bc3..63d71a56a1 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241284_A8DD04);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241608_A8E088);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index ac8052fe96..91ae25bf5d 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -92,7 +92,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680_803F00);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437AC_80402C);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index c1411631b0..59073d8f5e 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -90,7 +90,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90_844760);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241BB8_844788);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C20_8447F0);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40_844810);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 747ceb53e7..36d95b9d93 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802405EC_9C59CC);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A6C_9C5E4C);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 9f4b58cb6b..d1ae4a06a1 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -1,6 +1,6 @@
 #include "sam_02.h"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240830_D05F60);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index d1635388ee..2e87ca9e37 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F50_D21DE0);
+#include "world/common/Call800E9894.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00);
 
diff --git a/src/world/common/Call800E9894.inc.c b/src/world/common/Call800E9894.inc.c
new file mode 100644
index 0000000000..9962016b2d
--- /dev/null
+++ b/src/world/common/Call800E9894.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus Call800E9894(ScriptInstance* script, s32 isInitialCall) {
+    func_800E9894();
+    return ApiStatus_DONE2;
+}

From 19a34fe4bf105acc8e0d12a0c4106118c32e8d35 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 22:49:54 -0400
Subject: [PATCH 027/101] GetNpcUnsafeOwner2

---
 .../area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s    | 12 ------------
 .../area_dro/dro_02/9694C0/func_802406AC_96986C.s    | 12 ------------
 .../area_hos/hos_03/A1BDB0/func_80242850_A1D950.s    | 12 ------------
 .../area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s    | 12 ------------
 .../area_jan/jan_03/B34BD0/func_80241F48_B36B18.s    | 12 ------------
 .../area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s    | 12 ------------
 .../area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s    | 12 ------------
 .../area_mac/mac_01/8017D0/func_802422BC_802B3C.s    | 12 ------------
 .../area_mac/mac_01/8017D0/func_8024394C_8041CC.s    | 12 ------------
 .../area_mac/mac_02/823BF0/func_80241B6C_824E2C.s    | 12 ------------
 .../area_mac/mac_03/831B20/func_8024085C_83205C.s    | 12 ------------
 .../area_mac/mac_04/843030/func_8024080C_8433DC.s    | 12 ------------
 .../area_mac/mac_05/852170/func_802416CC_85383C.s    | 12 ------------
 .../area_nok/nok_01/9C53E0/func_80241114_9C64F4.s    | 12 ------------
 .../area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s    | 12 ------------
 .../area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s    | 12 ------------
 .../area_sam/sam_02/D05F60/func_80240ED8_D06608.s    | 12 ------------
 .../area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s    | 12 ------------
 src/world/area_dro/dro_01/95B7E0.c                   |  2 +-
 src/world/area_dro/dro_02/9694C0.c                   |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c                   |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c                   |  2 +-
 src/world/area_jan/jan_03/B34BD0.c                   |  2 +-
 src/world/area_kmr/kmr_02/8B0070.c                   |  2 +-
 src/world/area_mac/mac_00/7EB340.c                   |  2 +-
 src/world/area_mac/mac_01/8017D0.c                   |  7 +++++--
 src/world/area_mac/mac_02/823BF0.c                   |  2 +-
 src/world/area_mac/mac_03/831B20.c                   |  2 +-
 src/world/area_mac/mac_04/843030.c                   |  2 +-
 src/world/area_mac/mac_05/852170.c                   |  2 +-
 src/world/area_nok/nok_01/9C53E0.c                   |  2 +-
 src/world/area_nok/nok_02/9D7AA0.c                   |  2 +-
 src/world/area_sam/sam_01/CF7E80.c                   |  2 +-
 src/world/area_sam/sam_02/D05F60.c                   |  2 +-
 src/world/area_sam/sam_11/D3ADA0.c                   |  2 +-
 src/world/common/GetNpcUnsafeOwner2.inc.c            |  6 ++++++
 36 files changed, 27 insertions(+), 234 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s
 create mode 100644 src/world/common/GetNpcUnsafeOwner2.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s
deleted file mode 100644
index 3e7e7a1a70..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024181C_95CA1C
-/* 95CA1C 8024181C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95CA20 80241820 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95CA24 80241824 0C00EABB */  jal       get_npc_unsafe
-/* 95CA28 80241828 8C84014C */   lw       $a0, 0x14c($a0)
-/* 95CA2C 8024182C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95CA30 80241830 0000102D */  daddu     $v0, $zero, $zero
-/* 95CA34 80241834 03E00008 */  jr        $ra
-/* 95CA38 80241838 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s
deleted file mode 100644
index 5726597c6e..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406AC_96986C
-/* 96986C 802406AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969870 802406B0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 969874 802406B4 0C00EABB */  jal       get_npc_unsafe
-/* 969878 802406B8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 96987C 802406BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 969880 802406C0 0000102D */  daddu     $v0, $zero, $zero
-/* 969884 802406C4 03E00008 */  jr        $ra
-/* 969888 802406C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s
deleted file mode 100644
index ae0d9174b2..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242850_A1D950
-/* A1D950 80242850 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D954 80242854 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D958 80242858 0C00EABB */  jal       get_npc_unsafe
-/* A1D95C 8024285C 8C84014C */   lw       $a0, 0x14c($a0)
-/* A1D960 80242860 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D964 80242864 0000102D */  daddu     $v0, $zero, $zero
-/* A1D968 80242868 03E00008 */  jr        $ra
-/* A1D96C 8024286C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s
deleted file mode 100644
index 216750a4e5..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419C0_B2DE30
-/* B2DE30 802419C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2DE34 802419C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B2DE38 802419C8 0C00EABB */  jal       get_npc_unsafe
-/* B2DE3C 802419CC 8C84014C */   lw       $a0, 0x14c($a0)
-/* B2DE40 802419D0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2DE44 802419D4 0000102D */  daddu     $v0, $zero, $zero
-/* B2DE48 802419D8 03E00008 */  jr        $ra
-/* B2DE4C 802419DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s
deleted file mode 100644
index 8be9f67b52..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F48_B36B18
-/* B36B18 80241F48 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36B1C 80241F4C AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36B20 80241F50 0C00EABB */  jal       get_npc_unsafe
-/* B36B24 80241F54 8C84014C */   lw       $a0, 0x14c($a0)
-/* B36B28 80241F58 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36B2C 80241F5C 0000102D */  daddu     $v0, $zero, $zero
-/* B36B30 80241F60 03E00008 */  jr        $ra
-/* B36B34 80241F64 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s
deleted file mode 100644
index 1dad685eca..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024073C_8B07AC
-/* 8B07AC 8024073C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B07B0 80240740 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B07B4 80240744 0C00EABB */  jal       get_npc_unsafe
-/* 8B07B8 80240748 8C84014C */   lw       $a0, 0x14c($a0)
-/* 8B07BC 8024074C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B07C0 80240750 0000102D */  daddu     $v0, $zero, $zero
-/* 8B07C4 80240754 03E00008 */  jr        $ra
-/* 8B07C8 80240758 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s
deleted file mode 100644
index fbb4a7a24c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409DC_7EB6EC
-/* 7EB6EC 802409DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EB6F0 802409E0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7EB6F4 802409E4 0C00EABB */  jal       get_npc_unsafe
-/* 7EB6F8 802409E8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 7EB6FC 802409EC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EB700 802409F0 0000102D */  daddu     $v0, $zero, $zero
-/* 7EB704 802409F4 03E00008 */  jr        $ra
-/* 7EB708 802409F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s
deleted file mode 100644
index 807a032753..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422BC_802B3C
-/* 802B3C 802422BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 802B40 802422C0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 802B44 802422C4 0C00EABB */  jal       get_npc_unsafe
-/* 802B48 802422C8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 802B4C 802422CC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 802B50 802422D0 0000102D */  daddu     $v0, $zero, $zero
-/* 802B54 802422D4 03E00008 */  jr        $ra
-/* 802B58 802422D8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s
deleted file mode 100644
index d35da2544a..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024394C_8041CC
-/* 8041CC 8024394C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8041D0 80243950 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8041D4 80243954 0C03AE18 */  jal       partner_resume_ability_script
-/* 8041D8 80243958 00000000 */   nop      
-/* 8041DC 8024395C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8041E0 80243960 24020002 */  addiu     $v0, $zero, 2
-/* 8041E4 80243964 03E00008 */  jr        $ra
-/* 8041E8 80243968 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s
deleted file mode 100644
index baac1be28c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B6C_824E2C
-/* 824E2C 80241B6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 824E30 80241B70 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 824E34 80241B74 0C00EABB */  jal       get_npc_unsafe
-/* 824E38 80241B78 8C84014C */   lw       $a0, 0x14c($a0)
-/* 824E3C 80241B7C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 824E40 80241B80 0000102D */  daddu     $v0, $zero, $zero
-/* 824E44 80241B84 03E00008 */  jr        $ra
-/* 824E48 80241B88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s
deleted file mode 100644
index db0206c019..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024085C_83205C
-/* 83205C 8024085C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832060 80240860 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 832064 80240864 0C00EABB */  jal       get_npc_unsafe
-/* 832068 80240868 8C84014C */   lw       $a0, 0x14c($a0)
-/* 83206C 8024086C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 832070 80240870 0000102D */  daddu     $v0, $zero, $zero
-/* 832074 80240874 03E00008 */  jr        $ra
-/* 832078 80240878 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s
deleted file mode 100644
index c28c31c70b..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024080C_8433DC
-/* 8433DC 8024080C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8433E0 80240810 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8433E4 80240814 0C00EABB */  jal       get_npc_unsafe
-/* 8433E8 80240818 8C84014C */   lw       $a0, 0x14c($a0)
-/* 8433EC 8024081C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8433F0 80240820 0000102D */  daddu     $v0, $zero, $zero
-/* 8433F4 80240824 03E00008 */  jr        $ra
-/* 8433F8 80240828 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s
deleted file mode 100644
index 2b150ccfd3..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416CC_85383C
-/* 85383C 802416CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 853840 802416D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 853844 802416D4 0C00EABB */  jal       get_npc_unsafe
-/* 853848 802416D8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 85384C 802416DC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 853850 802416E0 0000102D */  daddu     $v0, $zero, $zero
-/* 853854 802416E4 03E00008 */  jr        $ra
-/* 853858 802416E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s
deleted file mode 100644
index c442e04124..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241114_9C64F4
-/* 9C64F4 80241114 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C64F8 80241118 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C64FC 8024111C 0C00EABB */  jal       get_npc_unsafe
-/* 9C6500 80241120 8C84014C */   lw       $a0, 0x14c($a0)
-/* 9C6504 80241124 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C6508 80241128 0000102D */  daddu     $v0, $zero, $zero
-/* 9C650C 8024112C 03E00008 */  jr        $ra
-/* 9C6510 80241130 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s
deleted file mode 100644
index 7a943321ac..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CBC_9D8CDC
-/* 9D8CDC 80241CBC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D8CE0 80241CC0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9D8CE4 80241CC4 0C00EABB */  jal       get_npc_unsafe
-/* 9D8CE8 80241CC8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 9D8CEC 80241CCC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D8CF0 80241CD0 0000102D */  daddu     $v0, $zero, $zero
-/* 9D8CF4 80241CD4 03E00008 */  jr        $ra
-/* 9D8CF8 80241CD8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s
deleted file mode 100644
index da8920679c..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AAC_CF861C
-/* CF861C 80240AAC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF8620 80240AB0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF8624 80240AB4 0C00EABB */  jal       get_npc_unsafe
-/* CF8628 80240AB8 8C84014C */   lw       $a0, 0x14c($a0)
-/* CF862C 80240ABC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF8630 80240AC0 0000102D */  daddu     $v0, $zero, $zero
-/* CF8634 80240AC4 03E00008 */  jr        $ra
-/* CF8638 80240AC8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s
deleted file mode 100644
index 3850de84f6..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240ED8_D06608
-/* D06608 80240ED8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D0660C 80240EDC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D06610 80240EE0 0C00EABB */  jal       get_npc_unsafe
-/* D06614 80240EE4 8C84014C */   lw       $a0, 0x14c($a0)
-/* D06618 80240EE8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D0661C 80240EEC 0000102D */  daddu     $v0, $zero, $zero
-/* D06620 80240EF0 03E00008 */  jr        $ra
-/* D06624 80240EF4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s
deleted file mode 100644
index d9ad763d88..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B7C_D3B14C
-/* D3B14C 80240B7C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3B150 80240B80 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D3B154 80240B84 0C00EABB */  jal       get_npc_unsafe
-/* D3B158 80240B88 8C84014C */   lw       $a0, 0x14c($a0)
-/* D3B15C 80240B8C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D3B160 80240B90 0000102D */  daddu     $v0, $zero, $zero
-/* D3B164 80240B94 03E00008 */  jr        $ra
-/* D3B168 80240B98 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 567019d605..e3efb1148d 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0_95C9D0);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024181C_95CA1C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C_95CA3C);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 4eb91270f0..b83f6531db 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660_969820);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406AC_96986C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC_96988C);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 048fd17804..e114a963e1 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242804_A1D904);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242850_A1D950);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242870_A1D970);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 4c0ff535b8..5b4e06e2c4 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974_B2DDE4);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419C0_B2DE30);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0_B2DE50);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index a6a26446b5..68be87c175 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC_B36ACC);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F48_B36B18);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68_B36B38);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index a4c1bb554c..8d220bd67d 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0_8B0760);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024073C_8B07AC);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024075C_8B07CC);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 3e66a781e0..cc917dc914 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990_7EB6A0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409DC_7EB6EC);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC_7EB70C);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 91ae25bf5d..342f3881ba 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270_802AF0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422BC_802B3C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC_802B5C);
 
@@ -104,7 +104,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920_8041A0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024394C_8041CC);
+ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) {
+    partner_resume_ability_script();
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index f5f17d7151..27384dfcc6 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20_824DE0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B6C_824E2C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C_824E4C);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 1d11fd62e9..9cfe529fe9 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810_832010);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024085C_83205C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C_83207C);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 59073d8f5e..ead724658c 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0_843390);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024080C_8433DC);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C_8433FC);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 44b24bb640..aec6a9d2da 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680_8537F0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416CC_85383C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC_85385C);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 36d95b9d93..f3d8467455 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8_9C64A8);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241114_9C64F4);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134_9C6514);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index efaed89d54..573f2ad2ad 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70_9D8C90);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CBC_9D8CDC);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC_9D8CFC);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 446e390df9..0869a20d70 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240A60_CF85D0);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240AAC_CF861C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC_CF863C);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index d1ae4a06a1..670a7c10e5 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C_D065BC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240ED8_D06608);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240EF8_D06628);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index b014d1b7b8..e355401aea 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B30_D3B100);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B7C_D3B14C);
+#include "world/common/GetNpcUnsafeOwner2.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B9C_D3B16C);
 
diff --git a/src/world/common/GetNpcUnsafeOwner2.inc.c b/src/world/common/GetNpcUnsafeOwner2.inc.c
new file mode 100644
index 0000000000..d6e8b0f867
--- /dev/null
+++ b/src/world/common/GetNpcUnsafeOwner2.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus GetNpcUnsafeOwner2(ScriptInstance* script, s32 isInitialCall) {
+    get_npc_unsafe(script->owner2.npc);
+    return ApiStatus_BLOCK;
+}

From 3a53233b1d1cd666ecd70dad121f5b6681ae9dbe Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 23:37:25 -0400
Subject: [PATCH 028/101] Unk800E98C4SyncStatusMenu

---
 .../area_dro/dro_02/9694C0/func_802434A4_96C664.s  | 14 --------------
 .../area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s  | 14 --------------
 .../area_jan/jan_03/B34BD0/func_802414D0_B360A0.s  | 14 --------------
 .../area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s  | 14 --------------
 .../area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s  | 14 --------------
 .../area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s  | 14 --------------
 .../area_kpa/kpa_91/A86A50/func_80241548_A87F98.s  | 14 --------------
 .../area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s  | 14 --------------
 .../area_mac/mac_01/8017D0/func_802437CC_80404C.s  | 14 --------------
 .../area_mac/mac_01/8017D0/func_8024552C_805DAC.s  | 13 -------------
 .../area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s  | 14 --------------
 .../area_sam/sam_02/D05F60/func_80240850_D05F80.s  | 14 --------------
 .../area_sam/sam_06/D203E0/func_80241F70_D21E00.s  | 14 --------------
 src/world/area_dro/dro_02/9694C0.c                 |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c                 |  2 +-
 src/world/area_jan/jan_03/B34BD0.c                 |  2 +-
 src/world/area_kkj/kkj_20/AFDE00.c                 |  2 +-
 src/world/area_kmr/kmr_02/8B30E0.c                 |  2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c                 |  2 +-
 src/world/area_kpa/kpa_91/A86A50.c                 |  2 +-
 src/world/area_kpa/kpa_95/A8CB60.c                 |  2 +-
 src/world/area_mac/mac_01/8017D0.c                 |  7 +++++--
 src/world/area_nok/nok_01/9C53E0.c                 |  2 +-
 src/world/area_sam/sam_02/D05F60.c                 |  2 +-
 src/world/area_sam/sam_06/D203E0.c                 |  2 +-
 src/world/common/Unk800E98C4SyncStatusMenu.inc.c   |  7 +++++++
 26 files changed, 23 insertions(+), 194 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s
 create mode 100644 src/world/common/Unk800E98C4SyncStatusMenu.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s
deleted file mode 100644
index 8c4bc6cba2..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802434A4_96C664
-/* 96C664 802434A4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C668 802434A8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C66C 802434AC 0C03A631 */  jal       func_800E98C4
-/* 96C670 802434B0 00000000 */   nop      
-/* 96C674 802434B4 0C03A6DB */  jal       sync_status_menu
-/* 96C678 802434B8 00000000 */   nop      
-/* 96C67C 802434BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C680 802434C0 24020002 */  addiu     $v0, $zero, 2
-/* 96C684 802434C4 03E00008 */  jr        $ra
-/* 96C688 802434C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s
deleted file mode 100644
index 3db6a153dc..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421C8_A1D2C8
-/* A1D2C8 802421C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D2CC 802421CC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D2D0 802421D0 0C03A631 */  jal       func_800E98C4
-/* A1D2D4 802421D4 00000000 */   nop      
-/* A1D2D8 802421D8 0C03A6DB */  jal       sync_status_menu
-/* A1D2DC 802421DC 00000000 */   nop      
-/* A1D2E0 802421E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D2E4 802421E4 24020002 */  addiu     $v0, $zero, 2
-/* A1D2E8 802421E8 03E00008 */  jr        $ra
-/* A1D2EC 802421EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s
deleted file mode 100644
index bc22b1c1ed..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414D0_B360A0
-/* B360A0 802414D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B360A4 802414D4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B360A8 802414D8 0C03A631 */  jal       func_800E98C4
-/* B360AC 802414DC 00000000 */   nop      
-/* B360B0 802414E0 0C03A6DB */  jal       sync_status_menu
-/* B360B4 802414E4 00000000 */   nop      
-/* B360B8 802414E8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B360BC 802414EC 24020002 */  addiu     $v0, $zero, 2
-/* B360C0 802414F0 03E00008 */  jr        $ra
-/* B360C4 802414F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s
deleted file mode 100644
index d12c22dc00..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402E0_AFDE20
-/* AFDE20 802402E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFDE24 802402E4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFDE28 802402E8 0C03A631 */  jal       func_800E98C4
-/* AFDE2C 802402EC 00000000 */   nop      
-/* AFDE30 802402F0 0C03A6DB */  jal       sync_status_menu
-/* AFDE34 802402F4 00000000 */   nop      
-/* AFDE38 802402F8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFDE3C 802402FC 24020002 */  addiu     $v0, $zero, 2
-/* AFDE40 80240300 03E00008 */  jr        $ra
-/* AFDE44 80240304 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s
deleted file mode 100644
index 148f155323..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243090_8B3100
-/* 8B3100 80243090 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3104 80243094 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B3108 80243098 0C03A631 */  jal       func_800E98C4
-/* 8B310C 8024309C 00000000 */   nop      
-/* 8B3110 802430A0 0C03A6DB */  jal       sync_status_menu
-/* 8B3114 802430A4 00000000 */   nop      
-/* 8B3118 802430A8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B311C 802430AC 24020002 */  addiu     $v0, $zero, 2
-/* 8B3120 802430B0 03E00008 */  jr        $ra
-/* 8B3124 802430B4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s
deleted file mode 100644
index f55916e467..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412C0_8ED0E0
-/* 8ED0E0 802412C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED0E4 802412C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED0E8 802412C8 0C03A631 */  jal       func_800E98C4
-/* 8ED0EC 802412CC 00000000 */   nop      
-/* 8ED0F0 802412D0 0C03A6DB */  jal       sync_status_menu
-/* 8ED0F4 802412D4 00000000 */   nop      
-/* 8ED0F8 802412D8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED0FC 802412DC 24020002 */  addiu     $v0, $zero, 2
-/* 8ED100 802412E0 03E00008 */  jr        $ra
-/* 8ED104 802412E4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s
deleted file mode 100644
index a19bca4574..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241548_A87F98
-/* A87F98 80241548 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A87F9C 8024154C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A87FA0 80241550 0C03A631 */  jal       func_800E98C4
-/* A87FA4 80241554 00000000 */   nop      
-/* A87FA8 80241558 0C03A6DB */  jal       sync_status_menu
-/* A87FAC 8024155C 00000000 */   nop      
-/* A87FB0 80241560 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A87FB4 80241564 24020002 */  addiu     $v0, $zero, 2
-/* A87FB8 80241568 03E00008 */  jr        $ra
-/* A87FBC 8024156C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s
deleted file mode 100644
index 4076386945..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241628_A8E0A8
-/* A8E0A8 80241628 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E0AC 8024162C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E0B0 80241630 0C03A631 */  jal       func_800E98C4
-/* A8E0B4 80241634 00000000 */   nop      
-/* A8E0B8 80241638 0C03A6DB */  jal       sync_status_menu
-/* A8E0BC 8024163C 00000000 */   nop      
-/* A8E0C0 80241640 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E0C4 80241644 24020002 */  addiu     $v0, $zero, 2
-/* A8E0C8 80241648 03E00008 */  jr        $ra
-/* A8E0CC 8024164C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s
deleted file mode 100644
index f08b379a6a..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802437CC_80404C
-/* 80404C 802437CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 804050 802437D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 804054 802437D4 0C03A631 */  jal       func_800E98C4
-/* 804058 802437D8 00000000 */   nop      
-/* 80405C 802437DC 0C03A6DB */  jal       sync_status_menu
-/* 804060 802437E0 00000000 */   nop      
-/* 804064 802437E4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 804068 802437E8 24020002 */  addiu     $v0, $zero, 2
-/* 80406C 802437EC 03E00008 */  jr        $ra
-/* 804070 802437F0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s
deleted file mode 100644
index 0bc23d492d..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024552C_805DAC
-/* 805DAC 8024552C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805DB0 80245530 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 805DB4 80245534 0C03BCE9 */  jal       func_800EF3A4
-/* 805DB8 80245538 00000000 */   nop      
-/* 805DBC 8024553C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 805DC0 80245540 24020002 */  addiu     $v0, $zero, 2
-/* 805DC4 80245544 03E00008 */  jr        $ra
-/* 805DC8 80245548 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 805DCC 8024554C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s
deleted file mode 100644
index 98cc382f6f..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A8C_9C5E6C
-/* 9C5E6C 80240A8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C5E70 80240A90 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C5E74 80240A94 0C03A631 */  jal       func_800E98C4
-/* 9C5E78 80240A98 00000000 */   nop      
-/* 9C5E7C 80240A9C 0C03A6DB */  jal       sync_status_menu
-/* 9C5E80 80240AA0 00000000 */   nop      
-/* 9C5E84 80240AA4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C5E88 80240AA8 24020002 */  addiu     $v0, $zero, 2
-/* 9C5E8C 80240AAC 03E00008 */  jr        $ra
-/* 9C5E90 80240AB0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s
deleted file mode 100644
index 79f4dca6c4..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240850_D05F80
-/* D05F80 80240850 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D05F84 80240854 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D05F88 80240858 0C03A631 */  jal       func_800E98C4
-/* D05F8C 8024085C 00000000 */   nop      
-/* D05F90 80240860 0C03A6DB */  jal       sync_status_menu
-/* D05F94 80240864 00000000 */   nop      
-/* D05F98 80240868 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D05F9C 8024086C 24020002 */  addiu     $v0, $zero, 2
-/* D05FA0 80240870 03E00008 */  jr        $ra
-/* D05FA4 80240874 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s
deleted file mode 100644
index ab125b4731..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F70_D21E00
-/* D21E00 80241F70 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21E04 80241F74 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D21E08 80241F78 0C03A631 */  jal       func_800E98C4
-/* D21E0C 80241F7C 00000000 */   nop      
-/* D21E10 80241F80 0C03A6DB */  jal       sync_status_menu
-/* D21E14 80241F84 00000000 */   nop      
-/* D21E18 80241F88 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21E1C 80241F8C 24020002 */  addiu     $v0, $zero, 2
-/* D21E20 80241F90 03E00008 */  jr        $ra
-/* D21E24 80241F94 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index b83f6531db..80a476decc 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index e114a963e1..deae16f636 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 68be87c175..a6dba2e1a9 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index f7b897aa31..65a0137d53 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402E0_AFDE20);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index 9ffcee5159..90ab04e118 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index 86177005f7..591ef2d39c 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index c84dd51ff4..db6b873542 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index 63d71a56a1..a94ad62287 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 342f3881ba..a2816f87f5 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074);
 
@@ -189,4 +189,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024552C_805DAC);
+ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) {
+    func_800EF3A4();
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index f3d8467455..bdc56984a6 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 670a7c10e5..f611159bfe 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 2e87ca9e37..8e573c3ed6 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
 
 #include "world/common/Call800E9894.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00);
+#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
 
diff --git a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c
new file mode 100644
index 0000000000..90e4efc6a3
--- /dev/null
+++ b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+static ApiStatus Unk800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) {
+    func_800E98C4();
+    sync_status_menu();
+    return ApiStatus_DONE2;
+}

From 8dc783bf5bd8e8e10480a935ab770d8e1a56d9d5 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 23:47:20 -0400
Subject: [PATCH 029/101] PartnerToggleAbilityScript

---
 .../dro_02/9694C0/func_802435F8_96C7B8.s         | 16 ----------------
 .../dro_02/9694C0/func_80243624_96C7E4.s         | 12 ------------
 .../hos_03/A1BDB0/func_8024231C_A1D41C.s         | 16 ----------------
 .../hos_03/A1BDB0/func_80242348_A1D448.s         | 12 ------------
 .../jan_03/B34BD0/func_80241624_B361F4.s         | 16 ----------------
 .../jan_03/B34BD0/func_80241650_B36220.s         | 12 ------------
 .../kkj_20/AFDE00/func_80240434_AFDF74.s         | 16 ----------------
 .../kkj_20/AFDE00/func_80240460_AFDFA0.s         | 12 ------------
 .../kmr_02/8B30E0/func_802431E4_8B3254.s         | 16 ----------------
 .../kmr_02/8B30E0/func_80243210_8B3280.s         | 12 ------------
 .../kmr_20/8ED0C0/func_80241414_8ED234.s         | 16 ----------------
 .../kmr_20/8ED0C0/func_80241440_8ED260.s         | 12 ------------
 .../kpa_91/A86A50/func_8024169C_A880EC.s         | 16 ----------------
 .../kpa_91/A86A50/func_802416C8_A88118.s         | 12 ------------
 .../kpa_95/A8CB60/func_8024177C_A8E1FC.s         | 16 ----------------
 .../kpa_95/A8CB60/func_802417A8_A8E228.s         | 12 ------------
 .../mac_01/8017D0/func_80243920_8041A0.s         | 16 ----------------
 .../mac_01/8017D0/func_80245504_805D84.s         | 14 --------------
 .../nok_01/9C53E0/func_80240BE0_9C5FC0.s         | 16 ----------------
 .../nok_01/9C53E0/func_80240C0C_9C5FEC.s         | 12 ------------
 .../sam_02/D05F60/func_802409A4_D060D4.s         | 16 ----------------
 .../sam_02/D05F60/func_802409D0_D06100.s         | 12 ------------
 .../sam_06/D203E0/func_802420C4_D21F54.s         | 16 ----------------
 .../sam_06/D203E0/func_802420F0_D21F80.s         | 12 ------------
 src/world/area_dro/dro_02/9694C0.c               |  4 +---
 src/world/area_hos/hos_03/A1BDB0.c               |  4 +---
 src/world/area_jan/jan_03/B34BD0.c               |  4 +---
 src/world/area_kkj/kkj_20/AFDE00.c               |  4 +---
 src/world/area_kmr/kmr_02/8B30E0.c               |  4 +---
 src/world/area_kmr/kmr_20/8ED0C0.c               |  4 +---
 src/world/area_kpa/kpa_91/A86A50.c               |  4 +---
 src/world/area_kpa/kpa_95/A8CB60.c               |  4 +---
 src/world/area_mac/mac_01/8017D0.c               | 12 +++++-------
 src/world/area_nok/nok_01/9C53E0.c               |  4 +---
 src/world/area_sam/sam_02/D05F60.c               |  4 +---
 src/world/area_sam/sam_06/D203E0.c               |  4 +---
 .../common/PartnerToggleAbilityScript.inc.c      | 14 ++++++++++++++
 37 files changed, 30 insertions(+), 378 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s
 create mode 100644 src/world/common/PartnerToggleAbilityScript.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s
deleted file mode 100644
index cf62591195..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435F8_96C7B8
-/* 96C7B8 802435F8 3C028011 */  lui       $v0, 0x8011
-/* 96C7BC 802435FC 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 96C7C0 80243600 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C7C4 80243604 10400003 */  beqz      $v0, .L80243614
-/* 96C7C8 80243608 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 96C7CC 8024360C 0C03AE06 */  jal       partner_suspend_ability_script
-/* 96C7D0 80243610 00000000 */   nop      
-.L80243614:
-/* 96C7D4 80243614 24020002 */  addiu     $v0, $zero, 2
-/* 96C7D8 80243618 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C7DC 8024361C 03E00008 */  jr        $ra
-/* 96C7E0 80243620 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s
deleted file mode 100644
index c19416d262..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243624_96C7E4
-/* 96C7E4 80243624 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C7E8 80243628 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C7EC 8024362C 0C03AE18 */  jal       partner_resume_ability_script
-/* 96C7F0 80243630 00000000 */   nop      
-/* 96C7F4 80243634 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C7F8 80243638 24020002 */  addiu     $v0, $zero, 2
-/* 96C7FC 8024363C 03E00008 */  jr        $ra
-/* 96C800 80243640 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s
deleted file mode 100644
index 0fef1c1081..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024231C_A1D41C
-/* A1D41C 8024231C 3C028011 */  lui       $v0, 0x8011
-/* A1D420 80242320 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* A1D424 80242324 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D428 80242328 10400003 */  beqz      $v0, .L80242338
-/* A1D42C 8024232C AFBF0010 */   sw       $ra, 0x10($sp)
-/* A1D430 80242330 0C03AE06 */  jal       partner_suspend_ability_script
-/* A1D434 80242334 00000000 */   nop      
-.L80242338:
-/* A1D438 80242338 24020002 */  addiu     $v0, $zero, 2
-/* A1D43C 8024233C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D440 80242340 03E00008 */  jr        $ra
-/* A1D444 80242344 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s
deleted file mode 100644
index d5befc3f78..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242348_A1D448
-/* A1D448 80242348 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D44C 8024234C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D450 80242350 0C03AE18 */  jal       partner_resume_ability_script
-/* A1D454 80242354 00000000 */   nop      
-/* A1D458 80242358 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D45C 8024235C 24020002 */  addiu     $v0, $zero, 2
-/* A1D460 80242360 03E00008 */  jr        $ra
-/* A1D464 80242364 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s
deleted file mode 100644
index 26f5f5a757..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241624_B361F4
-/* B361F4 80241624 3C028011 */  lui       $v0, 0x8011
-/* B361F8 80241628 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* B361FC 8024162C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36200 80241630 10400003 */  beqz      $v0, .L80241640
-/* B36204 80241634 AFBF0010 */   sw       $ra, 0x10($sp)
-/* B36208 80241638 0C03AE06 */  jal       partner_suspend_ability_script
-/* B3620C 8024163C 00000000 */   nop      
-.L80241640:
-/* B36210 80241640 24020002 */  addiu     $v0, $zero, 2
-/* B36214 80241644 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36218 80241648 03E00008 */  jr        $ra
-/* B3621C 8024164C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s
deleted file mode 100644
index af5b8f82cd..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241650_B36220
-/* B36220 80241650 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36224 80241654 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36228 80241658 0C03AE18 */  jal       partner_resume_ability_script
-/* B3622C 8024165C 00000000 */   nop      
-/* B36230 80241660 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36234 80241664 24020002 */  addiu     $v0, $zero, 2
-/* B36238 80241668 03E00008 */  jr        $ra
-/* B3623C 8024166C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s
deleted file mode 100644
index b4625fd8d0..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240434_AFDF74
-/* AFDF74 80240434 3C028011 */  lui       $v0, 0x8011
-/* AFDF78 80240438 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* AFDF7C 8024043C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFDF80 80240440 10400003 */  beqz      $v0, .L80240450
-/* AFDF84 80240444 AFBF0010 */   sw       $ra, 0x10($sp)
-/* AFDF88 80240448 0C03AE06 */  jal       partner_suspend_ability_script
-/* AFDF8C 8024044C 00000000 */   nop      
-.L80240450:
-/* AFDF90 80240450 24020002 */  addiu     $v0, $zero, 2
-/* AFDF94 80240454 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFDF98 80240458 03E00008 */  jr        $ra
-/* AFDF9C 8024045C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s
deleted file mode 100644
index c95e2d2802..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240460_AFDFA0
-/* AFDFA0 80240460 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFDFA4 80240464 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFDFA8 80240468 0C03AE18 */  jal       partner_resume_ability_script
-/* AFDFAC 8024046C 00000000 */   nop      
-/* AFDFB0 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFDFB4 80240474 24020002 */  addiu     $v0, $zero, 2
-/* AFDFB8 80240478 03E00008 */  jr        $ra
-/* AFDFBC 8024047C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s
deleted file mode 100644
index a1ad5c51b5..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431E4_8B3254
-/* 8B3254 802431E4 3C028011 */  lui       $v0, 0x8011
-/* 8B3258 802431E8 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 8B325C 802431EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3260 802431F0 10400003 */  beqz      $v0, .L80243200
-/* 8B3264 802431F4 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 8B3268 802431F8 0C03AE06 */  jal       partner_suspend_ability_script
-/* 8B326C 802431FC 00000000 */   nop      
-.L80243200:
-/* 8B3270 80243200 24020002 */  addiu     $v0, $zero, 2
-/* 8B3274 80243204 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B3278 80243208 03E00008 */  jr        $ra
-/* 8B327C 8024320C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s
deleted file mode 100644
index 31b714dbf7..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243210_8B3280
-/* 8B3280 80243210 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3284 80243214 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B3288 80243218 0C03AE18 */  jal       partner_resume_ability_script
-/* 8B328C 8024321C 00000000 */   nop      
-/* 8B3290 80243220 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B3294 80243224 24020002 */  addiu     $v0, $zero, 2
-/* 8B3298 80243228 03E00008 */  jr        $ra
-/* 8B329C 8024322C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s
deleted file mode 100644
index 633f211abf..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241414_8ED234
-/* 8ED234 80241414 3C028011 */  lui       $v0, 0x8011
-/* 8ED238 80241418 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 8ED23C 8024141C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED240 80241420 10400003 */  beqz      $v0, .L80241430
-/* 8ED244 80241424 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 8ED248 80241428 0C03AE06 */  jal       partner_suspend_ability_script
-/* 8ED24C 8024142C 00000000 */   nop      
-.L80241430:
-/* 8ED250 80241430 24020002 */  addiu     $v0, $zero, 2
-/* 8ED254 80241434 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED258 80241438 03E00008 */  jr        $ra
-/* 8ED25C 8024143C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s
deleted file mode 100644
index 1b754b3e3b..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241440_8ED260
-/* 8ED260 80241440 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED264 80241444 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED268 80241448 0C03AE18 */  jal       partner_resume_ability_script
-/* 8ED26C 8024144C 00000000 */   nop      
-/* 8ED270 80241450 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED274 80241454 24020002 */  addiu     $v0, $zero, 2
-/* 8ED278 80241458 03E00008 */  jr        $ra
-/* 8ED27C 8024145C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s
deleted file mode 100644
index 5733b7c686..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024169C_A880EC
-/* A880EC 8024169C 3C028011 */  lui       $v0, 0x8011
-/* A880F0 802416A0 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* A880F4 802416A4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A880F8 802416A8 10400003 */  beqz      $v0, .L802416B8
-/* A880FC 802416AC AFBF0010 */   sw       $ra, 0x10($sp)
-/* A88100 802416B0 0C03AE06 */  jal       partner_suspend_ability_script
-/* A88104 802416B4 00000000 */   nop      
-.L802416B8:
-/* A88108 802416B8 24020002 */  addiu     $v0, $zero, 2
-/* A8810C 802416BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A88110 802416C0 03E00008 */  jr        $ra
-/* A88114 802416C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s
deleted file mode 100644
index 50df82f11a..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416C8_A88118
-/* A88118 802416C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8811C 802416CC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A88120 802416D0 0C03AE18 */  jal       partner_resume_ability_script
-/* A88124 802416D4 00000000 */   nop      
-/* A88128 802416D8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8812C 802416DC 24020002 */  addiu     $v0, $zero, 2
-/* A88130 802416E0 03E00008 */  jr        $ra
-/* A88134 802416E4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s
deleted file mode 100644
index 6bf87bbc8f..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024177C_A8E1FC
-/* A8E1FC 8024177C 3C028011 */  lui       $v0, 0x8011
-/* A8E200 80241780 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* A8E204 80241784 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E208 80241788 10400003 */  beqz      $v0, .L80241798
-/* A8E20C 8024178C AFBF0010 */   sw       $ra, 0x10($sp)
-/* A8E210 80241790 0C03AE06 */  jal       partner_suspend_ability_script
-/* A8E214 80241794 00000000 */   nop      
-.L80241798:
-/* A8E218 80241798 24020002 */  addiu     $v0, $zero, 2
-/* A8E21C 8024179C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E220 802417A0 03E00008 */  jr        $ra
-/* A8E224 802417A4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s
deleted file mode 100644
index e249e3c001..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417A8_A8E228
-/* A8E228 802417A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E22C 802417AC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E230 802417B0 0C03AE18 */  jal       partner_resume_ability_script
-/* A8E234 802417B4 00000000 */   nop      
-/* A8E238 802417B8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E23C 802417BC 24020002 */  addiu     $v0, $zero, 2
-/* A8E240 802417C0 03E00008 */  jr        $ra
-/* A8E244 802417C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s
deleted file mode 100644
index a8c07f81d2..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243920_8041A0
-/* 8041A0 80243920 3C028011 */  lui       $v0, 0x8011
-/* 8041A4 80243924 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 8041A8 80243928 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8041AC 8024392C 10400003 */  beqz      $v0, .L8024393C
-/* 8041B0 80243930 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 8041B4 80243934 0C03AE06 */  jal       partner_suspend_ability_script
-/* 8041B8 80243938 00000000 */   nop      
-.L8024393C:
-/* 8041BC 8024393C 24020002 */  addiu     $v0, $zero, 2
-/* 8041C0 80243940 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8041C4 80243944 03E00008 */  jr        $ra
-/* 8041C8 80243948 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s
deleted file mode 100644
index 3ff47e1923..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80245504_805D84
-/* 805D84 80245504 3C0141A0 */  lui       $at, 0x41a0
-/* 805D88 80245508 44816000 */  mtc1      $at, $f12
-/* 805D8C 8024550C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805D90 80245510 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 805D94 80245514 0C03BCE5 */  jal       func_800EF394
-/* 805D98 80245518 00000000 */   nop      
-/* 805D9C 8024551C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 805DA0 80245520 24020002 */  addiu     $v0, $zero, 2
-/* 805DA4 80245524 03E00008 */  jr        $ra
-/* 805DA8 80245528 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s
deleted file mode 100644
index 16b30d3430..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BE0_9C5FC0
-/* 9C5FC0 80240BE0 3C028011 */  lui       $v0, 0x8011
-/* 9C5FC4 80240BE4 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 9C5FC8 80240BE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C5FCC 80240BEC 10400003 */  beqz      $v0, .L80240BFC
-/* 9C5FD0 80240BF0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 9C5FD4 80240BF4 0C03AE06 */  jal       partner_suspend_ability_script
-/* 9C5FD8 80240BF8 00000000 */   nop      
-.L80240BFC:
-/* 9C5FDC 80240BFC 24020002 */  addiu     $v0, $zero, 2
-/* 9C5FE0 80240C00 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C5FE4 80240C04 03E00008 */  jr        $ra
-/* 9C5FE8 80240C08 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s
deleted file mode 100644
index 40d7fa4df1..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C0C_9C5FEC
-/* 9C5FEC 80240C0C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C5FF0 80240C10 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C5FF4 80240C14 0C03AE18 */  jal       partner_resume_ability_script
-/* 9C5FF8 80240C18 00000000 */   nop      
-/* 9C5FFC 80240C1C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C6000 80240C20 24020002 */  addiu     $v0, $zero, 2
-/* 9C6004 80240C24 03E00008 */  jr        $ra
-/* 9C6008 80240C28 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s
deleted file mode 100644
index 5e228d9dc5..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409A4_D060D4
-/* D060D4 802409A4 3C028011 */  lui       $v0, 0x8011
-/* D060D8 802409A8 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* D060DC 802409AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D060E0 802409B0 10400003 */  beqz      $v0, .L802409C0
-/* D060E4 802409B4 AFBF0010 */   sw       $ra, 0x10($sp)
-/* D060E8 802409B8 0C03AE06 */  jal       partner_suspend_ability_script
-/* D060EC 802409BC 00000000 */   nop      
-.L802409C0:
-/* D060F0 802409C0 24020002 */  addiu     $v0, $zero, 2
-/* D060F4 802409C4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D060F8 802409C8 03E00008 */  jr        $ra
-/* D060FC 802409CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s
deleted file mode 100644
index 6f9347d460..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409D0_D06100
-/* D06100 802409D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D06104 802409D4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D06108 802409D8 0C03AE18 */  jal       partner_resume_ability_script
-/* D0610C 802409DC 00000000 */   nop      
-/* D06110 802409E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D06114 802409E4 24020002 */  addiu     $v0, $zero, 2
-/* D06118 802409E8 03E00008 */  jr        $ra
-/* D0611C 802409EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s
deleted file mode 100644
index 09a4660d84..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802420C4_D21F54
-/* D21F54 802420C4 3C028011 */  lui       $v0, 0x8011
-/* D21F58 802420C8 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* D21F5C 802420CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21F60 802420D0 10400003 */  beqz      $v0, .L802420E0
-/* D21F64 802420D4 AFBF0010 */   sw       $ra, 0x10($sp)
-/* D21F68 802420D8 0C03AE06 */  jal       partner_suspend_ability_script
-/* D21F6C 802420DC 00000000 */   nop      
-.L802420E0:
-/* D21F70 802420E0 24020002 */  addiu     $v0, $zero, 2
-/* D21F74 802420E4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21F78 802420E8 03E00008 */  jr        $ra
-/* D21F7C 802420EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s
deleted file mode 100644
index 0ae571f005..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802420F0_D21F80
-/* D21F80 802420F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21F84 802420F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D21F88 802420F8 0C03AE18 */  jal       partner_resume_ability_script
-/* D21F8C 802420FC 00000000 */   nop      
-/* D21F90 80242100 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21F94 80242104 24020002 */  addiu     $v0, $zero, 2
-/* D21F98 80242108 03E00008 */  jr        $ra
-/* D21F9C 8024210C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 80a476decc..00d0e04206 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -96,9 +96,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8_96C788);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435F8_96C7B8);
-
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243624_96C7E4);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index deae16f636..0615515cb2 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -32,9 +32,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802422EC_A1D3EC);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024231C_A1D41C);
-
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242348_A1D448);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index a6dba2e1a9..b693e85636 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -52,9 +52,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4_B361C4);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241624_B361F4);
-
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241650_B36220);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 65a0137d53..2eef9988ec 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240404_AFDF44);
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240434_AFDF74);
-
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240460_AFDFA0);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240480_AFDFC0);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index 90ab04e118..a9f3c35823 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4_8B3224);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431E4_8B3254);
-
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243210_8B3280);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index 591ef2d39c..e4fbb0c751 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4_8ED204);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241414_8ED234);
-
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241440_8ED260);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index db6b873542..273018611d 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C_A880BC);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024169C_A880EC);
-
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416C8_A88118);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138);
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index a94ad62287..c2b28adcd5 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024174C_A8E1CC);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024177C_A8E1FC);
-
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417A8_A8E228);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417C8_A8E248);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index a2816f87f5..8652153fbb 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -102,12 +102,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920_8041A0);
-
-ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) {
-    partner_resume_ability_script();
-    return ApiStatus_DONE2;
-}
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC);
 
@@ -187,7 +182,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488_805D08);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84);
+ApiStatus func_80245504_805D84(ScriptInstance* script, s32 isInitialCall) {
+    func_800EF394(20.0f);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) {
     func_800EF3A4();
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index bdc56984a6..9aabd27060 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0_9C5F90);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BE0_9C5FC0);
-
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C0C_9C5FEC);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index f611159bfe..1f64709ca6 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240974_D060A4);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409A4_D060D4);
-
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409D0_D06100);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 8e573c3ed6..58d61fa64e 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -48,9 +48,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094_D21F24);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420C4_D21F54);
-
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420F0_D21F80);
+#include "world/common/PartnerToggleAbilityScript.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0);
 
diff --git a/src/world/common/PartnerToggleAbilityScript.inc.c b/src/world/common/PartnerToggleAbilityScript.inc.c
new file mode 100644
index 0000000000..a20b7f45de
--- /dev/null
+++ b/src/world/common/PartnerToggleAbilityScript.inc.c
@@ -0,0 +1,14 @@
+#include "common.h"
+
+static ApiStatus PartnerSuspendAbilityScript(ScriptInstance* script, s32 isInitialCall) {
+    if (gPlayerData.currentPartner == PartnerId_NONE) {
+        return ApiStatus_DONE2;
+    }
+    partner_suspend_ability_script();
+    return ApiStatus_DONE2;
+}
+
+static ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) {
+    partner_resume_ability_script();
+    return ApiStatus_DONE2;
+}

From 7717a96628be9c767509d6d149f88cfcd8794a2f Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Thu, 29 Oct 2020 23:56:54 -0400
Subject: [PATCH 030/101] Call800EB168

---
 .../dro_02/9694C0/func_80243748_96C908.s         | 16 ----------------
 .../hos_03/A1BDB0/func_8024246C_A1D56C.s         | 16 ----------------
 .../jan_03/B34BD0/func_80241774_B36344.s         | 16 ----------------
 .../kkj_20/AFDE00/func_80240584_AFE0C4.s         | 16 ----------------
 .../kmr_02/8B30E0/func_80243334_8B33A4.s         | 16 ----------------
 .../kmr_20/8ED0C0/func_80241564_8ED384.s         | 16 ----------------
 .../kpa_91/A86A50/func_802417EC_A8823C.s         | 16 ----------------
 .../kpa_95/A8CB60/func_802418CC_A8E34C.s         | 16 ----------------
 .../mac_01/8017D0/func_80243A70_8042F0.s         | 16 ----------------
 .../nok_01/9C53E0/func_80240D30_9C6110.s         | 16 ----------------
 .../sam_02/D05F60/func_80240AF4_D06224.s         | 16 ----------------
 .../sam_06/D203E0/func_80242214_D220A4.s         | 16 ----------------
 include/functions.h                              |  2 ++
 src/code_838b0_len_5900.c                        |  2 +-
 src/world/area_dro/dro_02/9694C0.c               |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c               |  2 +-
 src/world/area_jan/jan_03/B34BD0.c               |  2 +-
 src/world/area_kkj/kkj_20/AFDE00.c               |  2 +-
 src/world/area_kmr/kmr_02/8B30E0.c               |  2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c               |  2 +-
 src/world/area_kpa/kpa_91/A86A50.c               |  2 +-
 src/world/area_kpa/kpa_95/A8CB60.c               |  2 +-
 src/world/area_mac/mac_01/8017D0.c               |  2 +-
 src/world/area_nok/nok_01/9C53E0.c               |  2 +-
 src/world/area_sam/sam_02/D05F60.c               |  2 +-
 src/world/area_sam/sam_06/D203E0.c               |  2 +-
 src/world/common/Call800EB168.inc.c              |  6 ++++++
 27 files changed, 21 insertions(+), 205 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s
 create mode 100644 src/world/common/Call800EB168.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s
deleted file mode 100644
index f39a0a6e35..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243748_96C908
-/* 96C908 80243748 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C90C 8024374C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C910 80243750 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C914 80243754 0C0B1EAF */  jal       get_variable
-/* 96C918 80243758 8C450000 */   lw       $a1, ($v0)
-/* 96C91C 8024375C 00021600 */  sll       $v0, $v0, 0x18
-/* 96C920 80243760 0C03AC5A */  jal       func_800EB168
-/* 96C924 80243764 00022603 */   sra      $a0, $v0, 0x18
-/* 96C928 80243768 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C92C 8024376C 24020002 */  addiu     $v0, $zero, 2
-/* 96C930 80243770 03E00008 */  jr        $ra
-/* 96C934 80243774 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s
deleted file mode 100644
index 940aeaa07f..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024246C_A1D56C
-/* A1D56C 8024246C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D570 80242470 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D574 80242474 8C82000C */  lw        $v0, 0xc($a0)
-/* A1D578 80242478 0C0B1EAF */  jal       get_variable
-/* A1D57C 8024247C 8C450000 */   lw       $a1, ($v0)
-/* A1D580 80242480 00021600 */  sll       $v0, $v0, 0x18
-/* A1D584 80242484 0C03AC5A */  jal       func_800EB168
-/* A1D588 80242488 00022603 */   sra      $a0, $v0, 0x18
-/* A1D58C 8024248C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D590 80242490 24020002 */  addiu     $v0, $zero, 2
-/* A1D594 80242494 03E00008 */  jr        $ra
-/* A1D598 80242498 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s
deleted file mode 100644
index cf4e2e0fa6..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241774_B36344
-/* B36344 80241774 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36348 80241778 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B3634C 8024177C 8C82000C */  lw        $v0, 0xc($a0)
-/* B36350 80241780 0C0B1EAF */  jal       get_variable
-/* B36354 80241784 8C450000 */   lw       $a1, ($v0)
-/* B36358 80241788 00021600 */  sll       $v0, $v0, 0x18
-/* B3635C 8024178C 0C03AC5A */  jal       func_800EB168
-/* B36360 80241790 00022603 */   sra      $a0, $v0, 0x18
-/* B36364 80241794 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36368 80241798 24020002 */  addiu     $v0, $zero, 2
-/* B3636C 8024179C 03E00008 */  jr        $ra
-/* B36370 802417A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s
deleted file mode 100644
index 92fdbef2d6..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240584_AFE0C4
-/* AFE0C4 80240584 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFE0C8 80240588 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFE0CC 8024058C 8C82000C */  lw        $v0, 0xc($a0)
-/* AFE0D0 80240590 0C0B1EAF */  jal       get_variable
-/* AFE0D4 80240594 8C450000 */   lw       $a1, ($v0)
-/* AFE0D8 80240598 00021600 */  sll       $v0, $v0, 0x18
-/* AFE0DC 8024059C 0C03AC5A */  jal       func_800EB168
-/* AFE0E0 802405A0 00022603 */   sra      $a0, $v0, 0x18
-/* AFE0E4 802405A4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFE0E8 802405A8 24020002 */  addiu     $v0, $zero, 2
-/* AFE0EC 802405AC 03E00008 */  jr        $ra
-/* AFE0F0 802405B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s
deleted file mode 100644
index 6bd5963e90..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243334_8B33A4
-/* 8B33A4 80243334 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B33A8 80243338 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B33AC 8024333C 8C82000C */  lw        $v0, 0xc($a0)
-/* 8B33B0 80243340 0C0B1EAF */  jal       get_variable
-/* 8B33B4 80243344 8C450000 */   lw       $a1, ($v0)
-/* 8B33B8 80243348 00021600 */  sll       $v0, $v0, 0x18
-/* 8B33BC 8024334C 0C03AC5A */  jal       func_800EB168
-/* 8B33C0 80243350 00022603 */   sra      $a0, $v0, 0x18
-/* 8B33C4 80243354 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B33C8 80243358 24020002 */  addiu     $v0, $zero, 2
-/* 8B33CC 8024335C 03E00008 */  jr        $ra
-/* 8B33D0 80243360 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s
deleted file mode 100644
index 3f8a50f883..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241564_8ED384
-/* 8ED384 80241564 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED388 80241568 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED38C 8024156C 8C82000C */  lw        $v0, 0xc($a0)
-/* 8ED390 80241570 0C0B1EAF */  jal       get_variable
-/* 8ED394 80241574 8C450000 */   lw       $a1, ($v0)
-/* 8ED398 80241578 00021600 */  sll       $v0, $v0, 0x18
-/* 8ED39C 8024157C 0C03AC5A */  jal       func_800EB168
-/* 8ED3A0 80241580 00022603 */   sra      $a0, $v0, 0x18
-/* 8ED3A4 80241584 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED3A8 80241588 24020002 */  addiu     $v0, $zero, 2
-/* 8ED3AC 8024158C 03E00008 */  jr        $ra
-/* 8ED3B0 80241590 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s
deleted file mode 100644
index fc06affc8f..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417EC_A8823C
-/* A8823C 802417EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A88240 802417F0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A88244 802417F4 8C82000C */  lw        $v0, 0xc($a0)
-/* A88248 802417F8 0C0B1EAF */  jal       get_variable
-/* A8824C 802417FC 8C450000 */   lw       $a1, ($v0)
-/* A88250 80241800 00021600 */  sll       $v0, $v0, 0x18
-/* A88254 80241804 0C03AC5A */  jal       func_800EB168
-/* A88258 80241808 00022603 */   sra      $a0, $v0, 0x18
-/* A8825C 8024180C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A88260 80241810 24020002 */  addiu     $v0, $zero, 2
-/* A88264 80241814 03E00008 */  jr        $ra
-/* A88268 80241818 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s
deleted file mode 100644
index 353115d95f..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418CC_A8E34C
-/* A8E34C 802418CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E350 802418D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E354 802418D4 8C82000C */  lw        $v0, 0xc($a0)
-/* A8E358 802418D8 0C0B1EAF */  jal       get_variable
-/* A8E35C 802418DC 8C450000 */   lw       $a1, ($v0)
-/* A8E360 802418E0 00021600 */  sll       $v0, $v0, 0x18
-/* A8E364 802418E4 0C03AC5A */  jal       func_800EB168
-/* A8E368 802418E8 00022603 */   sra      $a0, $v0, 0x18
-/* A8E36C 802418EC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E370 802418F0 24020002 */  addiu     $v0, $zero, 2
-/* A8E374 802418F4 03E00008 */  jr        $ra
-/* A8E378 802418F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s
deleted file mode 100644
index 1defd7a02d..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243A70_8042F0
-/* 8042F0 80243A70 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8042F4 80243A74 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8042F8 80243A78 8C82000C */  lw        $v0, 0xc($a0)
-/* 8042FC 80243A7C 0C0B1EAF */  jal       get_variable
-/* 804300 80243A80 8C450000 */   lw       $a1, ($v0)
-/* 804304 80243A84 00021600 */  sll       $v0, $v0, 0x18
-/* 804308 80243A88 0C03AC5A */  jal       func_800EB168
-/* 80430C 80243A8C 00022603 */   sra      $a0, $v0, 0x18
-/* 804310 80243A90 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 804314 80243A94 24020002 */  addiu     $v0, $zero, 2
-/* 804318 80243A98 03E00008 */  jr        $ra
-/* 80431C 80243A9C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s
deleted file mode 100644
index 393eda7a34..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D30_9C6110
-/* 9C6110 80240D30 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C6114 80240D34 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C6118 80240D38 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C611C 80240D3C 0C0B1EAF */  jal       get_variable
-/* 9C6120 80240D40 8C450000 */   lw       $a1, ($v0)
-/* 9C6124 80240D44 00021600 */  sll       $v0, $v0, 0x18
-/* 9C6128 80240D48 0C03AC5A */  jal       func_800EB168
-/* 9C612C 80240D4C 00022603 */   sra      $a0, $v0, 0x18
-/* 9C6130 80240D50 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C6134 80240D54 24020002 */  addiu     $v0, $zero, 2
-/* 9C6138 80240D58 03E00008 */  jr        $ra
-/* 9C613C 80240D5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s
deleted file mode 100644
index 77d1ce5032..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AF4_D06224
-/* D06224 80240AF4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D06228 80240AF8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D0622C 80240AFC 8C82000C */  lw        $v0, 0xc($a0)
-/* D06230 80240B00 0C0B1EAF */  jal       get_variable
-/* D06234 80240B04 8C450000 */   lw       $a1, ($v0)
-/* D06238 80240B08 00021600 */  sll       $v0, $v0, 0x18
-/* D0623C 80240B0C 0C03AC5A */  jal       func_800EB168
-/* D06240 80240B10 00022603 */   sra      $a0, $v0, 0x18
-/* D06244 80240B14 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D06248 80240B18 24020002 */  addiu     $v0, $zero, 2
-/* D0624C 80240B1C 03E00008 */  jr        $ra
-/* D06250 80240B20 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s
deleted file mode 100644
index 75756157e8..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242214_D220A4
-/* D220A4 80242214 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D220A8 80242218 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D220AC 8024221C 8C82000C */  lw        $v0, 0xc($a0)
-/* D220B0 80242220 0C0B1EAF */  jal       get_variable
-/* D220B4 80242224 8C450000 */   lw       $a1, ($v0)
-/* D220B8 80242228 00021600 */  sll       $v0, $v0, 0x18
-/* D220BC 8024222C 0C03AC5A */  jal       func_800EB168
-/* D220C0 80242230 00022603 */   sra      $a0, $v0, 0x18
-/* D220C4 80242234 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D220C8 80242238 24020002 */  addiu     $v0, $zero, 2
-/* D220CC 8024223C 03E00008 */  jr        $ra
-/* D220D0 80242240 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/functions.h b/include/functions.h
index 0b63c6b884..abc8ebebd0 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -70,6 +70,8 @@ void set_curtain_fade(f32 scale);
 
 void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
 
+s32 func_800EB168(s8);
+
 // Partner
 void func_800EBA3C(Npc* partner);
 void func_800EBB40(Npc* partner);
diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c
index 81ce3b95d3..a5c09f35ed 100644
--- a/src/code_838b0_len_5900.c
+++ b/src/code_838b0_len_5900.c
@@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8);
 
 INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC);
 
-INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168);
+INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s8 arg0);
 
 INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 00d0e04206..3aa40148ca 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -104,7 +104,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714_96C8D4);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243748_96C908);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 0615515cb2..eedf563a06 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438_A1D538);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024246C_A1D56C);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index b693e85636..009935db8d 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241740_B36310);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241774_B36344);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 2eef9988ec..e7148b9e94 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802404D4_AFE014);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240550_AFE090);
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240584_AFE0C4);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index a9f3c35823..084612b528 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300_8B3370);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243334_8B33A4);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index e4fbb0c751..e5f3122e66 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530_8ED350);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241564_8ED384);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index 273018611d..8b0d639bbe 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8_A88208);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417EC_A8823C);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024181C_A8826C);
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index c2b28adcd5..a2adfc8a57 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241898_A8E318);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418CC_A8E34C);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C);
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 8652153fbb..eb8f845ec4 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -110,7 +110,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0);
+#include "world/common/Call800EB168.inc.c"
 
 ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 9aabd27060..f7b71c1b6b 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC_9C60DC);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D30_9C6110);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 1f64709ca6..4b718caf18 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0_D061F0);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AF4_D06224);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 58d61fa64e..e16fd8d903 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802421E0_D22070);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242214_D220A4);
+#include "world/common/Call800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4);
 
diff --git a/src/world/common/Call800EB168.inc.c b/src/world/common/Call800EB168.inc.c
new file mode 100644
index 0000000000..0d80634214
--- /dev/null
+++ b/src/world/common/Call800EB168.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) {
+    func_800EB168(get_variable(script, *script->ptrReadPos));
+    return ApiStatus_DONE2;
+}

From 3848319469fbd7e0862fcb07e143c003bf58d7c4 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 00:01:25 -0400
Subject: [PATCH 031/101] NotDoesScriptExist

---
 .../dro_02/9694C0/func_802435C8_96C788.s         | 16 ----------------
 .../hos_03/A1BDB0/func_802422EC_A1D3EC.s         | 16 ----------------
 .../jan_03/B34BD0/func_802415F4_B361C4.s         | 16 ----------------
 .../kkj_20/AFDE00/func_80240404_AFDF44.s         | 16 ----------------
 .../kmr_02/8B30E0/func_802431B4_8B3224.s         | 16 ----------------
 .../kmr_20/8ED0C0/func_802413E4_8ED204.s         | 16 ----------------
 .../kpa_91/A86A50/func_8024166C_A880BC.s         | 16 ----------------
 .../kpa_95/A8CB60/func_8024174C_A8E1CC.s         | 16 ----------------
 .../mac_01/8017D0/func_802438F0_804170.s         | 16 ----------------
 .../nok_01/9C53E0/func_80240BB0_9C5F90.s         | 16 ----------------
 .../sam_02/D05F60/func_80240974_D060A4.s         | 16 ----------------
 .../sam_06/D203E0/func_80242094_D21F24.s         | 16 ----------------
 src/world/area_dro/dro_02/9694C0.c               |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c               |  2 +-
 src/world/area_jan/jan_03/B34BD0.c               |  2 +-
 src/world/area_kkj/kkj_20/AFDE00.c               |  2 +-
 src/world/area_kmr/kmr_02/8B30E0.c               |  2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c               |  2 +-
 src/world/area_kpa/kpa_91/A86A50.c               |  2 +-
 src/world/area_kpa/kpa_95/A8CB60.c               |  2 +-
 src/world/area_mac/mac_01/8017D0.c               |  2 +-
 src/world/area_nok/nok_01/9C53E0.c               |  2 +-
 src/world/area_sam/sam_02/D05F60.c               |  2 +-
 src/world/area_sam/sam_06/D203E0.c               |  2 +-
 src/world/common/NotDoesScriptExist.inc.c        |  5 +++++
 25 files changed, 17 insertions(+), 204 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s
 create mode 100644 src/world/common/NotDoesScriptExist.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s
deleted file mode 100644
index ea148d4bf8..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435C8_96C788
-/* 96C788 802435C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C78C 802435CC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C790 802435D0 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C794 802435D4 0C0B1EAF */  jal       get_variable
-/* 96C798 802435D8 8C450000 */   lw       $a1, ($v0)
-/* 96C79C 802435DC 0C0B1059 */  jal       does_script_exist
-/* 96C7A0 802435E0 0040202D */   daddu    $a0, $v0, $zero
-/* 96C7A4 802435E4 2C420001 */  sltiu     $v0, $v0, 1
-/* 96C7A8 802435E8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C7AC 802435EC 00021040 */  sll       $v0, $v0, 1
-/* 96C7B0 802435F0 03E00008 */  jr        $ra
-/* 96C7B4 802435F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s
deleted file mode 100644
index c9f8d55b7c..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422EC_A1D3EC
-/* A1D3EC 802422EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D3F0 802422F0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D3F4 802422F4 8C82000C */  lw        $v0, 0xc($a0)
-/* A1D3F8 802422F8 0C0B1EAF */  jal       get_variable
-/* A1D3FC 802422FC 8C450000 */   lw       $a1, ($v0)
-/* A1D400 80242300 0C0B1059 */  jal       does_script_exist
-/* A1D404 80242304 0040202D */   daddu    $a0, $v0, $zero
-/* A1D408 80242308 2C420001 */  sltiu     $v0, $v0, 1
-/* A1D40C 8024230C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D410 80242310 00021040 */  sll       $v0, $v0, 1
-/* A1D414 80242314 03E00008 */  jr        $ra
-/* A1D418 80242318 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s
deleted file mode 100644
index c25aeba348..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415F4_B361C4
-/* B361C4 802415F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B361C8 802415F8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B361CC 802415FC 8C82000C */  lw        $v0, 0xc($a0)
-/* B361D0 80241600 0C0B1EAF */  jal       get_variable
-/* B361D4 80241604 8C450000 */   lw       $a1, ($v0)
-/* B361D8 80241608 0C0B1059 */  jal       does_script_exist
-/* B361DC 8024160C 0040202D */   daddu    $a0, $v0, $zero
-/* B361E0 80241610 2C420001 */  sltiu     $v0, $v0, 1
-/* B361E4 80241614 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B361E8 80241618 00021040 */  sll       $v0, $v0, 1
-/* B361EC 8024161C 03E00008 */  jr        $ra
-/* B361F0 80241620 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s
deleted file mode 100644
index e35648e20f..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240404_AFDF44
-/* AFDF44 80240404 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFDF48 80240408 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFDF4C 8024040C 8C82000C */  lw        $v0, 0xc($a0)
-/* AFDF50 80240410 0C0B1EAF */  jal       get_variable
-/* AFDF54 80240414 8C450000 */   lw       $a1, ($v0)
-/* AFDF58 80240418 0C0B1059 */  jal       does_script_exist
-/* AFDF5C 8024041C 0040202D */   daddu    $a0, $v0, $zero
-/* AFDF60 80240420 2C420001 */  sltiu     $v0, $v0, 1
-/* AFDF64 80240424 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFDF68 80240428 00021040 */  sll       $v0, $v0, 1
-/* AFDF6C 8024042C 03E00008 */  jr        $ra
-/* AFDF70 80240430 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s
deleted file mode 100644
index d21815dd5f..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431B4_8B3224
-/* 8B3224 802431B4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3228 802431B8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B322C 802431BC 8C82000C */  lw        $v0, 0xc($a0)
-/* 8B3230 802431C0 0C0B1EAF */  jal       get_variable
-/* 8B3234 802431C4 8C450000 */   lw       $a1, ($v0)
-/* 8B3238 802431C8 0C0B1059 */  jal       does_script_exist
-/* 8B323C 802431CC 0040202D */   daddu    $a0, $v0, $zero
-/* 8B3240 802431D0 2C420001 */  sltiu     $v0, $v0, 1
-/* 8B3244 802431D4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B3248 802431D8 00021040 */  sll       $v0, $v0, 1
-/* 8B324C 802431DC 03E00008 */  jr        $ra
-/* 8B3250 802431E0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s
deleted file mode 100644
index 67794efeef..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413E4_8ED204
-/* 8ED204 802413E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED208 802413E8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED20C 802413EC 8C82000C */  lw        $v0, 0xc($a0)
-/* 8ED210 802413F0 0C0B1EAF */  jal       get_variable
-/* 8ED214 802413F4 8C450000 */   lw       $a1, ($v0)
-/* 8ED218 802413F8 0C0B1059 */  jal       does_script_exist
-/* 8ED21C 802413FC 0040202D */   daddu    $a0, $v0, $zero
-/* 8ED220 80241400 2C420001 */  sltiu     $v0, $v0, 1
-/* 8ED224 80241404 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED228 80241408 00021040 */  sll       $v0, $v0, 1
-/* 8ED22C 8024140C 03E00008 */  jr        $ra
-/* 8ED230 80241410 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s
deleted file mode 100644
index 1333a5a1b3..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024166C_A880BC
-/* A880BC 8024166C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A880C0 80241670 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A880C4 80241674 8C82000C */  lw        $v0, 0xc($a0)
-/* A880C8 80241678 0C0B1EAF */  jal       get_variable
-/* A880CC 8024167C 8C450000 */   lw       $a1, ($v0)
-/* A880D0 80241680 0C0B1059 */  jal       does_script_exist
-/* A880D4 80241684 0040202D */   daddu    $a0, $v0, $zero
-/* A880D8 80241688 2C420001 */  sltiu     $v0, $v0, 1
-/* A880DC 8024168C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A880E0 80241690 00021040 */  sll       $v0, $v0, 1
-/* A880E4 80241694 03E00008 */  jr        $ra
-/* A880E8 80241698 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s
deleted file mode 100644
index 2998e1e7aa..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024174C_A8E1CC
-/* A8E1CC 8024174C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E1D0 80241750 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E1D4 80241754 8C82000C */  lw        $v0, 0xc($a0)
-/* A8E1D8 80241758 0C0B1EAF */  jal       get_variable
-/* A8E1DC 8024175C 8C450000 */   lw       $a1, ($v0)
-/* A8E1E0 80241760 0C0B1059 */  jal       does_script_exist
-/* A8E1E4 80241764 0040202D */   daddu    $a0, $v0, $zero
-/* A8E1E8 80241768 2C420001 */  sltiu     $v0, $v0, 1
-/* A8E1EC 8024176C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E1F0 80241770 00021040 */  sll       $v0, $v0, 1
-/* A8E1F4 80241774 03E00008 */  jr        $ra
-/* A8E1F8 80241778 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s
deleted file mode 100644
index 6e3b37c95c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802438F0_804170
-/* 804170 802438F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 804174 802438F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 804178 802438F8 8C82000C */  lw        $v0, 0xc($a0)
-/* 80417C 802438FC 0C0B1EAF */  jal       get_variable
-/* 804180 80243900 8C450000 */   lw       $a1, ($v0)
-/* 804184 80243904 0C0B1059 */  jal       does_script_exist
-/* 804188 80243908 0040202D */   daddu    $a0, $v0, $zero
-/* 80418C 8024390C 2C420001 */  sltiu     $v0, $v0, 1
-/* 804190 80243910 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 804194 80243914 00021040 */  sll       $v0, $v0, 1
-/* 804198 80243918 03E00008 */  jr        $ra
-/* 80419C 8024391C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s
deleted file mode 100644
index 6350b38660..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BB0_9C5F90
-/* 9C5F90 80240BB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C5F94 80240BB4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C5F98 80240BB8 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C5F9C 80240BBC 0C0B1EAF */  jal       get_variable
-/* 9C5FA0 80240BC0 8C450000 */   lw       $a1, ($v0)
-/* 9C5FA4 80240BC4 0C0B1059 */  jal       does_script_exist
-/* 9C5FA8 80240BC8 0040202D */   daddu    $a0, $v0, $zero
-/* 9C5FAC 80240BCC 2C420001 */  sltiu     $v0, $v0, 1
-/* 9C5FB0 80240BD0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C5FB4 80240BD4 00021040 */  sll       $v0, $v0, 1
-/* 9C5FB8 80240BD8 03E00008 */  jr        $ra
-/* 9C5FBC 80240BDC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s
deleted file mode 100644
index 2eaaf35507..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240974_D060A4
-/* D060A4 80240974 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D060A8 80240978 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D060AC 8024097C 8C82000C */  lw        $v0, 0xc($a0)
-/* D060B0 80240980 0C0B1EAF */  jal       get_variable
-/* D060B4 80240984 8C450000 */   lw       $a1, ($v0)
-/* D060B8 80240988 0C0B1059 */  jal       does_script_exist
-/* D060BC 8024098C 0040202D */   daddu    $a0, $v0, $zero
-/* D060C0 80240990 2C420001 */  sltiu     $v0, $v0, 1
-/* D060C4 80240994 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D060C8 80240998 00021040 */  sll       $v0, $v0, 1
-/* D060CC 8024099C 03E00008 */  jr        $ra
-/* D060D0 802409A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s
deleted file mode 100644
index cdb5372ebc..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242094_D21F24
-/* D21F24 80242094 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21F28 80242098 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D21F2C 8024209C 8C82000C */  lw        $v0, 0xc($a0)
-/* D21F30 802420A0 0C0B1EAF */  jal       get_variable
-/* D21F34 802420A4 8C450000 */   lw       $a1, ($v0)
-/* D21F38 802420A8 0C0B1059 */  jal       does_script_exist
-/* D21F3C 802420AC 0040202D */   daddu    $a0, $v0, $zero
-/* D21F40 802420B0 2C420001 */  sltiu     $v0, $v0, 1
-/* D21F44 802420B4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21F48 802420B8 00021040 */  sll       $v0, $v0, 1
-/* D21F4C 802420BC 03E00008 */  jr        $ra
-/* D21F50 802420C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 3aa40148ca..83149e5e4e 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8_96C788);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index eedf563a06..df7a2a10f6 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802422EC_A1D3EC);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 009935db8d..fe533e2b8a 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4_B361C4);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index e7148b9e94..9e5f6305d4 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4);
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240404_AFDF44);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index 084612b528..c5f6ac31b4 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4_8B3224);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index e5f3122e66..e978d116de 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4_8ED204);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index 8b0d639bbe..9cbdbda024 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C_A880BC);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index a2adfc8a57..07812c57d7 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024174C_A8E1CC);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index eb8f845ec4..03af03a6ac 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -100,7 +100,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_80
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index f7b71c1b6b..c4e92f65f6 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0_9C5F90);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 4b718caf18..5affe1f3de 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240974_D060A4);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index e16fd8d903..0a460e3c95 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094_D21F24);
+#include "world/common/NotDoesScriptExist.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/common/NotDoesScriptExist.inc.c b/src/world/common/NotDoesScriptExist.inc.c
new file mode 100644
index 0000000000..cdd6ce8750
--- /dev/null
+++ b/src/world/common/NotDoesScriptExist.inc.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+static ApiStatus NotDoesScriptExist(ScriptInstance* script, s32 isInitialCall) {
+    return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2;
+}

From da058dc0950e151abdedf6f0825368d62415d908 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 00:07:11 -0400
Subject: [PATCH 032/101] GetGameStatus75

---
 .../dro_01/95B7E0/func_80241FAC_95D1AC.s         | 16 ----------------
 .../dro_02/9694C0/func_80240E3C_969FFC.s         | 16 ----------------
 .../hos_03/A1BDB0/func_80242FE0_A1E0E0.s         | 16 ----------------
 .../jan_02/B2C8A0/func_80242150_B2E5C0.s         | 16 ----------------
 .../jan_03/B34BD0/func_802426D8_B372A8.s         | 16 ----------------
 .../kmr_02/8B0070/func_80240ECC_8B0F3C.s         | 16 ----------------
 .../mac_00/7EB340/func_8024116C_7EBE7C.s         | 16 ----------------
 .../mac_01/8017D0/func_80242A4C_8032CC.s         | 16 ----------------
 .../mac_02/823BF0/func_802422FC_8255BC.s         | 16 ----------------
 .../mac_03/831B20/func_80240FEC_8327EC.s         | 16 ----------------
 .../mac_04/843030/func_80240F9C_843B6C.s         | 16 ----------------
 .../mac_05/852170/func_80241E5C_853FCC.s         | 16 ----------------
 .../nok_01/9C53E0/func_802418A4_9C6C84.s         | 16 ----------------
 .../nok_02/9D7AA0/func_8024244C_9D946C.s         | 16 ----------------
 .../sam_01/CF7E80/func_8024123C_CF8DAC.s         | 16 ----------------
 .../sam_02/D05F60/func_80241668_D06D98.s         | 16 ----------------
 .../sam_11/D3ADA0/func_8024130C_D3B8DC.s         | 16 ----------------
 include/common_structs.h                         |  3 ++-
 src/world/area_dro/dro_01/95B7E0.c               |  2 +-
 src/world/area_dro/dro_02/9694C0.c               |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c               |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c               |  2 +-
 src/world/area_jan/jan_03/B34BD0.c               |  2 +-
 src/world/area_kmr/kmr_02/8B0070.c               |  2 +-
 src/world/area_mac/mac_00/7EB340.c               |  2 +-
 src/world/area_mac/mac_01/8017D0.c               |  2 +-
 src/world/area_mac/mac_02/823BF0.c               |  2 +-
 src/world/area_mac/mac_03/831B20.c               |  2 +-
 src/world/area_mac/mac_04/843030.c               |  2 +-
 src/world/area_mac/mac_05/852170.c               |  2 +-
 src/world/area_nok/nok_01/9C53E0.c               |  2 +-
 src/world/area_nok/nok_02/9D7AA0.c               |  2 +-
 src/world/area_sam/sam_01/CF7E80.c               |  2 +-
 src/world/area_sam/sam_02/D05F60.c               |  2 +-
 src/world/area_sam/sam_11/D3ADA0.c               |  2 +-
 src/world/common/GetGameStatus75.inc.c           |  6 ++++++
 36 files changed, 25 insertions(+), 290 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s
 create mode 100644 src/world/common/GetGameStatus75.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s
deleted file mode 100644
index 2c1668a23a..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FAC_95D1AC
-/* 95D1AC 80241FAC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D1B0 80241FB0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 95D1B4 80241FB4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 95D1B8 80241FB8 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D1BC 80241FBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D1C0 80241FC0 80460075 */  lb        $a2, 0x75($v0)
-/* 95D1C4 80241FC4 0C0B2026 */  jal       set_variable
-/* 95D1C8 80241FC8 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 95D1CC 80241FCC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D1D0 80241FD0 24020002 */  addiu     $v0, $zero, 2
-/* 95D1D4 80241FD4 03E00008 */  jr        $ra
-/* 95D1D8 80241FD8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s
deleted file mode 100644
index 14fe34bfc1..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E3C_969FFC
-/* 969FFC 80240E3C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96A000 80240E40 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 96A004 80240E44 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 96A008 80240E48 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A00C 80240E4C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96A010 80240E50 80460075 */  lb        $a2, 0x75($v0)
-/* 96A014 80240E54 0C0B2026 */  jal       set_variable
-/* 96A018 80240E58 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 96A01C 80240E5C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96A020 80240E60 24020002 */  addiu     $v0, $zero, 2
-/* 96A024 80240E64 03E00008 */  jr        $ra
-/* 96A028 80240E68 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s
deleted file mode 100644
index b17c26eeea..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242FE0_A1E0E0
-/* A1E0E0 80242FE0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1E0E4 80242FE4 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* A1E0E8 80242FE8 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* A1E0EC 80242FEC 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E0F0 80242FF0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1E0F4 80242FF4 80460075 */  lb        $a2, 0x75($v0)
-/* A1E0F8 80242FF8 0C0B2026 */  jal       set_variable
-/* A1E0FC 80242FFC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* A1E100 80243000 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1E104 80243004 24020002 */  addiu     $v0, $zero, 2
-/* A1E108 80243008 03E00008 */  jr        $ra
-/* A1E10C 8024300C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s
deleted file mode 100644
index d52189f12e..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242150_B2E5C0
-/* B2E5C0 80242150 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2E5C4 80242154 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* B2E5C8 80242158 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* B2E5CC 8024215C 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E5D0 80242160 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B2E5D4 80242164 80460075 */  lb        $a2, 0x75($v0)
-/* B2E5D8 80242168 0C0B2026 */  jal       set_variable
-/* B2E5DC 8024216C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B2E5E0 80242170 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2E5E4 80242174 24020002 */  addiu     $v0, $zero, 2
-/* B2E5E8 80242178 03E00008 */  jr        $ra
-/* B2E5EC 8024217C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s
deleted file mode 100644
index 764671914f..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802426D8_B372A8
-/* B372A8 802426D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B372AC 802426DC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* B372B0 802426E0 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* B372B4 802426E4 3C05FE36 */  lui       $a1, 0xfe36
-/* B372B8 802426E8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B372BC 802426EC 80460075 */  lb        $a2, 0x75($v0)
-/* B372C0 802426F0 0C0B2026 */  jal       set_variable
-/* B372C4 802426F4 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B372C8 802426F8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B372CC 802426FC 24020002 */  addiu     $v0, $zero, 2
-/* B372D0 80242700 03E00008 */  jr        $ra
-/* B372D4 80242704 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s
deleted file mode 100644
index c12dac7408..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240ECC_8B0F3C
-/* 8B0F3C 80240ECC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B0F40 80240ED0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8B0F44 80240ED4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8B0F48 80240ED8 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B0F4C 80240EDC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B0F50 80240EE0 80460075 */  lb        $a2, 0x75($v0)
-/* 8B0F54 80240EE4 0C0B2026 */  jal       set_variable
-/* 8B0F58 80240EE8 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8B0F5C 80240EEC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B0F60 80240EF0 24020002 */  addiu     $v0, $zero, 2
-/* 8B0F64 80240EF4 03E00008 */  jr        $ra
-/* 8B0F68 80240EF8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s
deleted file mode 100644
index d7ffbd5013..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024116C_7EBE7C
-/* 7EBE7C 8024116C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EBE80 80241170 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7EBE84 80241174 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7EBE88 80241178 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EBE8C 8024117C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7EBE90 80241180 80460075 */  lb        $a2, 0x75($v0)
-/* 7EBE94 80241184 0C0B2026 */  jal       set_variable
-/* 7EBE98 80241188 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 7EBE9C 8024118C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EBEA0 80241190 24020002 */  addiu     $v0, $zero, 2
-/* 7EBEA4 80241194 03E00008 */  jr        $ra
-/* 7EBEA8 80241198 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s
deleted file mode 100644
index 883819a6bd..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A4C_8032CC
-/* 8032CC 80242A4C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8032D0 80242A50 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8032D4 80242A54 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8032D8 80242A58 3C05FE36 */  lui       $a1, 0xfe36
-/* 8032DC 80242A5C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8032E0 80242A60 80460075 */  lb        $a2, 0x75($v0)
-/* 8032E4 80242A64 0C0B2026 */  jal       set_variable
-/* 8032E8 80242A68 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8032EC 80242A6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8032F0 80242A70 24020002 */  addiu     $v0, $zero, 2
-/* 8032F4 80242A74 03E00008 */  jr        $ra
-/* 8032F8 80242A78 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s
deleted file mode 100644
index 5725780ba2..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422FC_8255BC
-/* 8255BC 802422FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8255C0 80242300 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8255C4 80242304 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8255C8 80242308 3C05FE36 */  lui       $a1, 0xfe36
-/* 8255CC 8024230C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8255D0 80242310 80460075 */  lb        $a2, 0x75($v0)
-/* 8255D4 80242314 0C0B2026 */  jal       set_variable
-/* 8255D8 80242318 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8255DC 8024231C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8255E0 80242320 24020002 */  addiu     $v0, $zero, 2
-/* 8255E4 80242324 03E00008 */  jr        $ra
-/* 8255E8 80242328 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s
deleted file mode 100644
index 4949f1e384..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FEC_8327EC
-/* 8327EC 80240FEC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8327F0 80240FF0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8327F4 80240FF4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8327F8 80240FF8 3C05FE36 */  lui       $a1, 0xfe36
-/* 8327FC 80240FFC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 832800 80241000 80460075 */  lb        $a2, 0x75($v0)
-/* 832804 80241004 0C0B2026 */  jal       set_variable
-/* 832808 80241008 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 83280C 8024100C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 832810 80241010 24020002 */  addiu     $v0, $zero, 2
-/* 832814 80241014 03E00008 */  jr        $ra
-/* 832818 80241018 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s
deleted file mode 100644
index c9949efe6f..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F9C_843B6C
-/* 843B6C 80240F9C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 843B70 80240FA0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 843B74 80240FA4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 843B78 80240FA8 3C05FE36 */  lui       $a1, 0xfe36
-/* 843B7C 80240FAC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 843B80 80240FB0 80460075 */  lb        $a2, 0x75($v0)
-/* 843B84 80240FB4 0C0B2026 */  jal       set_variable
-/* 843B88 80240FB8 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 843B8C 80240FBC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 843B90 80240FC0 24020002 */  addiu     $v0, $zero, 2
-/* 843B94 80240FC4 03E00008 */  jr        $ra
-/* 843B98 80240FC8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s
deleted file mode 100644
index 2448ab78c2..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E5C_853FCC
-/* 853FCC 80241E5C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 853FD0 80241E60 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 853FD4 80241E64 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 853FD8 80241E68 3C05FE36 */  lui       $a1, 0xfe36
-/* 853FDC 80241E6C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 853FE0 80241E70 80460075 */  lb        $a2, 0x75($v0)
-/* 853FE4 80241E74 0C0B2026 */  jal       set_variable
-/* 853FE8 80241E78 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 853FEC 80241E7C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 853FF0 80241E80 24020002 */  addiu     $v0, $zero, 2
-/* 853FF4 80241E84 03E00008 */  jr        $ra
-/* 853FF8 80241E88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s
deleted file mode 100644
index 77956f0cbe..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418A4_9C6C84
-/* 9C6C84 802418A4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C6C88 802418A8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 9C6C8C 802418AC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 9C6C90 802418B0 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C6C94 802418B4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C6C98 802418B8 80460075 */  lb        $a2, 0x75($v0)
-/* 9C6C9C 802418BC 0C0B2026 */  jal       set_variable
-/* 9C6CA0 802418C0 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9C6CA4 802418C4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C6CA8 802418C8 24020002 */  addiu     $v0, $zero, 2
-/* 9C6CAC 802418CC 03E00008 */  jr        $ra
-/* 9C6CB0 802418D0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s
deleted file mode 100644
index 0cbfc43145..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024244C_9D946C
-/* 9D946C 8024244C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D9470 80242450 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 9D9474 80242454 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 9D9478 80242458 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D947C 8024245C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9D9480 80242460 80460075 */  lb        $a2, 0x75($v0)
-/* 9D9484 80242464 0C0B2026 */  jal       set_variable
-/* 9D9488 80242468 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9D948C 8024246C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D9490 80242470 24020002 */  addiu     $v0, $zero, 2
-/* 9D9494 80242474 03E00008 */  jr        $ra
-/* 9D9498 80242478 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s
deleted file mode 100644
index ab47e3b9d1..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024123C_CF8DAC
-/* CF8DAC 8024123C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF8DB0 80241240 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* CF8DB4 80241244 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* CF8DB8 80241248 3C05FE36 */  lui       $a1, 0xfe36
-/* CF8DBC 8024124C AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF8DC0 80241250 80460075 */  lb        $a2, 0x75($v0)
-/* CF8DC4 80241254 0C0B2026 */  jal       set_variable
-/* CF8DC8 80241258 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* CF8DCC 8024125C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF8DD0 80241260 24020002 */  addiu     $v0, $zero, 2
-/* CF8DD4 80241264 03E00008 */  jr        $ra
-/* CF8DD8 80241268 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s
deleted file mode 100644
index 05d98f2420..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241668_D06D98
-/* D06D98 80241668 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D06D9C 8024166C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* D06DA0 80241670 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* D06DA4 80241674 3C05FE36 */  lui       $a1, 0xfe36
-/* D06DA8 80241678 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D06DAC 8024167C 80460075 */  lb        $a2, 0x75($v0)
-/* D06DB0 80241680 0C0B2026 */  jal       set_variable
-/* D06DB4 80241684 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D06DB8 80241688 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D06DBC 8024168C 24020002 */  addiu     $v0, $zero, 2
-/* D06DC0 80241690 03E00008 */  jr        $ra
-/* D06DC4 80241694 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s
deleted file mode 100644
index 1c74a349fd..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024130C_D3B8DC
-/* D3B8DC 8024130C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3B8E0 80241310 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* D3B8E4 80241314 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* D3B8E8 80241318 3C05FE36 */  lui       $a1, 0xfe36
-/* D3B8EC 8024131C AFBF0010 */  sw        $ra, 0x10($sp)
-/* D3B8F0 80241320 80460075 */  lb        $a2, 0x75($v0)
-/* D3B8F4 80241324 0C0B2026 */  jal       set_variable
-/* D3B8F8 80241328 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D3B8FC 8024132C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D3B900 80241330 24020002 */  addiu     $v0, $zero, 2
-/* D3B904 80241334 03E00008 */  jr        $ra
-/* D3B908 80241338 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/common_structs.h b/include/common_structs.h
index a10f482c20..ddba0e53cd 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -879,7 +879,8 @@ typedef struct GameStatus {
     /* 0x071 */ s8 demoState; /* (0 = not demo, 1 = map demo, 2 = demo map changing) */
     /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */
     /* 0x073 */ u8 contBitPattern;
-    /* 0x074 */ char unk_74[2];
+    /* 0x074 */ char unk_74;
+    /* 0x075 */ s8 unk_75;
     /* 0x076 */ s8 unk_76;
     /* 0x077 */ char unk_77;
     /* 0x078 */ s8 disableScripts;
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index e3efb1148d..22ec45c565 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F78_95D178);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FAC_95D1AC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 83149e5e4e..a9474f9dd1 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E08_969FC8);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E3C_969FFC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index df7a2a10f6..38a86a3bdf 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC_A1E0AC);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FE0_A1E0E0);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 5b4e06e2c4..3b851deac3 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -68,7 +68,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C_B2E58C);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242150_B2E5C0);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index fe533e2b8a..a3c05adbbb 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -110,7 +110,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426A4_B37274);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426D8_B372A8);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 8d220bd67d..4bd0517de5 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98_8B0F08);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240ECC_8B0F3C);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index cc917dc914..ff665da249 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138_7EBE48);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024116C_7EBE7C);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 03af03a6ac..6f9f9137e3 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18_803298);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A4C_8032CC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 27384dfcc6..bcd3e2f306 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8_825588);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422FC_8255BC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 9cfe529fe9..570b5a783d 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FB8_8327B8);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FEC_8327EC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index ead724658c..6b8e166615 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68_843B38);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F9C_843B6C);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index aec6a9d2da..4d8d5c54b7 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28_853F98);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E5C_853FCC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index c4e92f65f6..535dc3b510 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241870_9C6C50);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418A4_9C6C84);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 573f2ad2ad..664291827c 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418_9D9438);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024244C_9D946C);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 0869a20d70..69254b3d83 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208_CF8D78);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024123C_CF8DAC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 5affe1f3de..3ddca1dd30 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634_D06D64);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241668_D06D98);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index e355401aea..19820e5db8 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412D8_D3B8A8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024130C_D3B8DC);
+#include "world/common/GetGameStatus75.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C);
 
diff --git a/src/world/common/GetGameStatus75.inc.c b/src/world/common/GetGameStatus75.inc.c
new file mode 100644
index 0000000000..952ed80cde
--- /dev/null
+++ b/src/world/common/GetGameStatus75.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus GetGameStatus75(ScriptInstance* script, s32 isInitialCall) {
+    set_variable(script, SI_VAR(0), GAME_STATUS->unk_75);
+    return ApiStatus_DONE2;
+}

From 83a5d82fbd380458762bfb7666c65a963486e5e0 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 00:15:44 -0400
Subject: [PATCH 033/101] GetPartnerCall800EB168

---
 .../dro_02/9694C0/func_80243714_96C8D4.s        | 17 -----------------
 .../hos_03/A1BDB0/func_80242438_A1D538.s        | 17 -----------------
 .../jan_03/B34BD0/func_80241740_B36310.s        | 17 -----------------
 .../kkj_20/AFDE00/func_80240550_AFE090.s        | 17 -----------------
 .../kmr_02/8B30E0/func_80243300_8B3370.s        | 17 -----------------
 .../kmr_20/8ED0C0/func_80241530_8ED350.s        | 17 -----------------
 .../kpa_91/A86A50/func_802417B8_A88208.s        | 17 -----------------
 .../kpa_95/A8CB60/func_80241898_A8E318.s        | 17 -----------------
 .../mac_01/8017D0/func_80243A3C_8042BC.s        | 17 -----------------
 .../nok_01/9C53E0/func_80240CFC_9C60DC.s        | 17 -----------------
 .../sam_02/D05F60/func_80240AC0_D061F0.s        | 17 -----------------
 .../sam_06/D203E0/func_802421E0_D22070.s        | 17 -----------------
 src/world/area_dro/dro_02/9694C0.c              |  4 +---
 src/world/area_hos/hos_03/A1BDB0.c              |  4 +---
 src/world/area_jan/jan_03/B34BD0.c              |  4 +---
 src/world/area_kkj/kkj_20/AFDE00.c              |  4 +---
 src/world/area_kmr/kmr_02/8B30E0.c              |  4 +---
 src/world/area_kmr/kmr_20/8ED0C0.c              |  4 +---
 src/world/area_kpa/kpa_91/A86A50.c              |  4 +---
 src/world/area_kpa/kpa_95/A8CB60.c              |  4 +---
 src/world/area_mac/mac_01/8017D0.c              |  4 +---
 src/world/area_nok/nok_01/9C53E0.c              |  4 +---
 src/world/area_sam/sam_02/D05F60.c              |  4 +---
 src/world/area_sam/sam_06/D203E0.c              |  4 +---
 src/world/common/Call800EB168.inc.c             |  6 ------
 src/world/common/GetPartnerCall800EB168.inc.c   | 12 ++++++++++++
 26 files changed, 24 insertions(+), 246 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s
 delete mode 100644 src/world/common/Call800EB168.inc.c
 create mode 100644 src/world/common/GetPartnerCall800EB168.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s
deleted file mode 100644
index 1176828dd0..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243714_96C8D4
-/* 96C8D4 80243714 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C8D8 80243718 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C8DC 8024371C 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C8E0 80243720 3C068011 */  lui       $a2, 0x8011
-/* 96C8E4 80243724 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* 96C8E8 80243728 0C0B2026 */  jal       set_variable
-/* 96C8EC 8024372C 8C450000 */   lw       $a1, ($v0)
-/* 96C8F0 80243730 0C03AC5A */  jal       func_800EB168
-/* 96C8F4 80243734 0000202D */   daddu    $a0, $zero, $zero
-/* 96C8F8 80243738 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C8FC 8024373C 24020002 */  addiu     $v0, $zero, 2
-/* 96C900 80243740 03E00008 */  jr        $ra
-/* 96C904 80243744 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s
deleted file mode 100644
index 35bd20a86d..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242438_A1D538
-/* A1D538 80242438 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D53C 8024243C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D540 80242440 8C82000C */  lw        $v0, 0xc($a0)
-/* A1D544 80242444 3C068011 */  lui       $a2, 0x8011
-/* A1D548 80242448 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* A1D54C 8024244C 0C0B2026 */  jal       set_variable
-/* A1D550 80242450 8C450000 */   lw       $a1, ($v0)
-/* A1D554 80242454 0C03AC5A */  jal       func_800EB168
-/* A1D558 80242458 0000202D */   daddu    $a0, $zero, $zero
-/* A1D55C 8024245C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D560 80242460 24020002 */  addiu     $v0, $zero, 2
-/* A1D564 80242464 03E00008 */  jr        $ra
-/* A1D568 80242468 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s
deleted file mode 100644
index e6fbcb7c61..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241740_B36310
-/* B36310 80241740 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36314 80241744 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36318 80241748 8C82000C */  lw        $v0, 0xc($a0)
-/* B3631C 8024174C 3C068011 */  lui       $a2, 0x8011
-/* B36320 80241750 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* B36324 80241754 0C0B2026 */  jal       set_variable
-/* B36328 80241758 8C450000 */   lw       $a1, ($v0)
-/* B3632C 8024175C 0C03AC5A */  jal       func_800EB168
-/* B36330 80241760 0000202D */   daddu    $a0, $zero, $zero
-/* B36334 80241764 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36338 80241768 24020002 */  addiu     $v0, $zero, 2
-/* B3633C 8024176C 03E00008 */  jr        $ra
-/* B36340 80241770 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s
deleted file mode 100644
index 7560858316..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240550_AFE090
-/* AFE090 80240550 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AFE094 80240554 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AFE098 80240558 8C82000C */  lw        $v0, 0xc($a0)
-/* AFE09C 8024055C 3C068011 */  lui       $a2, 0x8011
-/* AFE0A0 80240560 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* AFE0A4 80240564 0C0B2026 */  jal       set_variable
-/* AFE0A8 80240568 8C450000 */   lw       $a1, ($v0)
-/* AFE0AC 8024056C 0C03AC5A */  jal       func_800EB168
-/* AFE0B0 80240570 0000202D */   daddu    $a0, $zero, $zero
-/* AFE0B4 80240574 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AFE0B8 80240578 24020002 */  addiu     $v0, $zero, 2
-/* AFE0BC 8024057C 03E00008 */  jr        $ra
-/* AFE0C0 80240580 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s
deleted file mode 100644
index ccad403851..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243300_8B3370
-/* 8B3370 80243300 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3374 80243304 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B3378 80243308 8C82000C */  lw        $v0, 0xc($a0)
-/* 8B337C 8024330C 3C068011 */  lui       $a2, 0x8011
-/* 8B3380 80243310 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* 8B3384 80243314 0C0B2026 */  jal       set_variable
-/* 8B3388 80243318 8C450000 */   lw       $a1, ($v0)
-/* 8B338C 8024331C 0C03AC5A */  jal       func_800EB168
-/* 8B3390 80243320 0000202D */   daddu    $a0, $zero, $zero
-/* 8B3394 80243324 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B3398 80243328 24020002 */  addiu     $v0, $zero, 2
-/* 8B339C 8024332C 03E00008 */  jr        $ra
-/* 8B33A0 80243330 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s
deleted file mode 100644
index 19cf43f203..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241530_8ED350
-/* 8ED350 80241530 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED354 80241534 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED358 80241538 8C82000C */  lw        $v0, 0xc($a0)
-/* 8ED35C 8024153C 3C068011 */  lui       $a2, 0x8011
-/* 8ED360 80241540 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* 8ED364 80241544 0C0B2026 */  jal       set_variable
-/* 8ED368 80241548 8C450000 */   lw       $a1, ($v0)
-/* 8ED36C 8024154C 0C03AC5A */  jal       func_800EB168
-/* 8ED370 80241550 0000202D */   daddu    $a0, $zero, $zero
-/* 8ED374 80241554 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED378 80241558 24020002 */  addiu     $v0, $zero, 2
-/* 8ED37C 8024155C 03E00008 */  jr        $ra
-/* 8ED380 80241560 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s
deleted file mode 100644
index d967f519bb..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417B8_A88208
-/* A88208 802417B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8820C 802417BC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A88210 802417C0 8C82000C */  lw        $v0, 0xc($a0)
-/* A88214 802417C4 3C068011 */  lui       $a2, 0x8011
-/* A88218 802417C8 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* A8821C 802417CC 0C0B2026 */  jal       set_variable
-/* A88220 802417D0 8C450000 */   lw       $a1, ($v0)
-/* A88224 802417D4 0C03AC5A */  jal       func_800EB168
-/* A88228 802417D8 0000202D */   daddu    $a0, $zero, $zero
-/* A8822C 802417DC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A88230 802417E0 24020002 */  addiu     $v0, $zero, 2
-/* A88234 802417E4 03E00008 */  jr        $ra
-/* A88238 802417E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s
deleted file mode 100644
index 5a7bda3260..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241898_A8E318
-/* A8E318 80241898 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A8E31C 8024189C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A8E320 802418A0 8C82000C */  lw        $v0, 0xc($a0)
-/* A8E324 802418A4 3C068011 */  lui       $a2, 0x8011
-/* A8E328 802418A8 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* A8E32C 802418AC 0C0B2026 */  jal       set_variable
-/* A8E330 802418B0 8C450000 */   lw       $a1, ($v0)
-/* A8E334 802418B4 0C03AC5A */  jal       func_800EB168
-/* A8E338 802418B8 0000202D */   daddu    $a0, $zero, $zero
-/* A8E33C 802418BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A8E340 802418C0 24020002 */  addiu     $v0, $zero, 2
-/* A8E344 802418C4 03E00008 */  jr        $ra
-/* A8E348 802418C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s
deleted file mode 100644
index da4540da2d..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243A3C_8042BC
-/* 8042BC 80243A3C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8042C0 80243A40 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8042C4 80243A44 8C82000C */  lw        $v0, 0xc($a0)
-/* 8042C8 80243A48 3C068011 */  lui       $a2, 0x8011
-/* 8042CC 80243A4C 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* 8042D0 80243A50 0C0B2026 */  jal       set_variable
-/* 8042D4 80243A54 8C450000 */   lw       $a1, ($v0)
-/* 8042D8 80243A58 0C03AC5A */  jal       func_800EB168
-/* 8042DC 80243A5C 0000202D */   daddu    $a0, $zero, $zero
-/* 8042E0 80243A60 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8042E4 80243A64 24020002 */  addiu     $v0, $zero, 2
-/* 8042E8 80243A68 03E00008 */  jr        $ra
-/* 8042EC 80243A6C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s
deleted file mode 100644
index fff7263a9d..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CFC_9C60DC
-/* 9C60DC 80240CFC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C60E0 80240D00 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C60E4 80240D04 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C60E8 80240D08 3C068011 */  lui       $a2, 0x8011
-/* 9C60EC 80240D0C 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* 9C60F0 80240D10 0C0B2026 */  jal       set_variable
-/* 9C60F4 80240D14 8C450000 */   lw       $a1, ($v0)
-/* 9C60F8 80240D18 0C03AC5A */  jal       func_800EB168
-/* 9C60FC 80240D1C 0000202D */   daddu    $a0, $zero, $zero
-/* 9C6100 80240D20 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C6104 80240D24 24020002 */  addiu     $v0, $zero, 2
-/* 9C6108 80240D28 03E00008 */  jr        $ra
-/* 9C610C 80240D2C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s
deleted file mode 100644
index fa91a1cdfa..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AC0_D061F0
-/* D061F0 80240AC0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D061F4 80240AC4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D061F8 80240AC8 8C82000C */  lw        $v0, 0xc($a0)
-/* D061FC 80240ACC 3C068011 */  lui       $a2, 0x8011
-/* D06200 80240AD0 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* D06204 80240AD4 0C0B2026 */  jal       set_variable
-/* D06208 80240AD8 8C450000 */   lw       $a1, ($v0)
-/* D0620C 80240ADC 0C03AC5A */  jal       func_800EB168
-/* D06210 80240AE0 0000202D */   daddu    $a0, $zero, $zero
-/* D06214 80240AE4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D06218 80240AE8 24020002 */  addiu     $v0, $zero, 2
-/* D0621C 80240AEC 03E00008 */  jr        $ra
-/* D06220 80240AF0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s
deleted file mode 100644
index f3a6d4f68c..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421E0_D22070
-/* D22070 802421E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D22074 802421E4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D22078 802421E8 8C82000C */  lw        $v0, 0xc($a0)
-/* D2207C 802421EC 3C068011 */  lui       $a2, 0x8011
-/* D22080 802421F0 80C6F2A2 */  lb        $a2, -0xd5e($a2)
-/* D22084 802421F4 0C0B2026 */  jal       set_variable
-/* D22088 802421F8 8C450000 */   lw       $a1, ($v0)
-/* D2208C 802421FC 0C03AC5A */  jal       func_800EB168
-/* D22090 80242200 0000202D */   daddu    $a0, $zero, $zero
-/* D22094 80242204 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D22098 80242208 24020002 */  addiu     $v0, $zero, 2
-/* D2209C 8024220C 03E00008 */  jr        $ra
-/* D220A0 80242210 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index a9474f9dd1..4c8bdffcad 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -102,9 +102,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714_96C8D4);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 38a86a3bdf..986867485f 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -38,9 +38,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438_A1D538);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index a3c05adbbb..dfac9edc8f 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -58,9 +58,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241740_B36310);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 9e5f6305d4..3d57f7cb62 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240480_AFDFC0);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802404D4_AFE014);
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240550_AFE090);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index c5f6ac31b4..de4ed0600c 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300_8B3370);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index e978d116de..49d7b27bdf 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530_8ED350);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index 9cbdbda024..c764b65e4a 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -50,8 +50,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8_A88208);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024181C_A8826C);
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index 07812c57d7..a21a3de683 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -50,8 +50,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417C8_A8E248);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241898_A8E318);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C);
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 6f9f9137e3..9a9b09cab2 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -108,9 +108,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 535dc3b510..47b559c19d 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -36,9 +36,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC_9C60DC);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 3ddca1dd30..ab35caf081 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0_D061F0);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 0a460e3c95..f1467f9a0a 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -54,9 +54,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802421E0_D22070);
-
-#include "world/common/Call800EB168.inc.c"
+#include "world/common/GetPartnerCall800EB168.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4);
 
diff --git a/src/world/common/Call800EB168.inc.c b/src/world/common/Call800EB168.inc.c
deleted file mode 100644
index 0d80634214..0000000000
--- a/src/world/common/Call800EB168.inc.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "common.h"
-
-static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) {
-    func_800EB168(get_variable(script, *script->ptrReadPos));
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c
new file mode 100644
index 0000000000..c7b85eb2c6
--- /dev/null
+++ b/src/world/common/GetPartnerCall800EB168.inc.c
@@ -0,0 +1,12 @@
+#include "common.h"
+
+static ApiStatus GetPartnerCall800EB168(ScriptInstance* script, s32 isInitialCall) {
+    set_variable(script, *script->ptrReadPos, PLAYER_DATA->currentPartner);
+    func_800EB168(0);
+    return ApiStatus_DONE2;
+}
+
+static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) {
+    func_800EB168(get_variable(script, *script->ptrReadPos));
+    return ApiStatus_DONE2;
+}

From 0b04520f257311fcf8019bfa8d78de37419aa06c Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 00:32:25 -0400
Subject: [PATCH 034/101] 1 more

---
 .../mac_01/8017D0/func_80245440_805CC0.s      | 23 -------------------
 include/functions.h                           |  2 +-
 src/code_838b0_len_5900.c                     |  2 +-
 src/world/area_mac/mac_01/8017D0.c            | 11 ++++++++-
 src/world/common/GetPartnerCall800EB168.inc.c |  2 +-
 5 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s

diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s
deleted file mode 100644
index fd0bbefcb5..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80245440_805CC0
-/* 805CC0 80245440 3C028011 */  lui       $v0, 0x8011
-/* 805CC4 80245444 8042F2A2 */  lb        $v0, -0xd5e($v0)
-/* 805CC8 80245448 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805CCC 8024544C AFB00010 */  sw        $s0, 0x10($sp)
-/* 805CD0 80245450 0080802D */  daddu     $s0, $a0, $zero
-/* 805CD4 80245454 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 805CD8 80245458 8E0400AC */  lw        $a0, 0xac($s0)
-/* 805CDC 8024545C 50440005 */  beql      $v0, $a0, .L80245474
-/* 805CE0 80245460 AE000088 */   sw       $zero, 0x88($s0)
-/* 805CE4 80245464 0C03AC5A */  jal       func_800EB168
-/* 805CE8 80245468 00000000 */   nop      
-/* 805CEC 8024546C 24020001 */  addiu     $v0, $zero, 1
-/* 805CF0 80245470 AE020088 */  sw        $v0, 0x88($s0)
-.L80245474:
-/* 805CF4 80245474 24020002 */  addiu     $v0, $zero, 2
-/* 805CF8 80245478 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 805CFC 8024547C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 805D00 80245480 03E00008 */  jr        $ra
-/* 805D04 80245484 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/functions.h b/include/functions.h
index abc8ebebd0..7a6b9ed69c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -70,7 +70,7 @@ void set_curtain_fade(f32 scale);
 
 void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
 
-s32 func_800EB168(s8);
+s32 func_800EB168(s32);
 
 // Partner
 void func_800EBA3C(Npc* partner);
diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c
index a5c09f35ed..e55f7cbc49 100644
--- a/src/code_838b0_len_5900.c
+++ b/src/code_838b0_len_5900.c
@@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8);
 
 INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC);
 
-INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s8 arg0);
+INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s32 arg0);
 
 INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 9a9b09cab2..2e61f7ff5b 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -174,7 +174,16 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028_8058A8);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C_805AAC);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245440_805CC0);
+ApiStatus func_80245440_805CC0(ScriptInstance* script, s32 isInitialCall) {
+    if (PLAYER_DATA->currentPartner == script->varTable[10]) {
+        script->varTable[1] = 0;
+        return ApiStatus_DONE2;
+    }
+
+    func_800EB168(script->varTable[10]);
+    script->varTable[1] = 1;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488_805D08);
 
diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c
index c7b85eb2c6..97c821c33a 100644
--- a/src/world/common/GetPartnerCall800EB168.inc.c
+++ b/src/world/common/GetPartnerCall800EB168.inc.c
@@ -7,6 +7,6 @@ static ApiStatus GetPartnerCall800EB168(ScriptInstance* script, s32 isInitialCal
 }
 
 static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) {
-    func_800EB168(get_variable(script, *script->ptrReadPos));
+    func_800EB168((s8)get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }

From a61be9ab779b987d1c31edbd1abce30f6817657b Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 00:43:23 -0400
Subject: [PATCH 035/101] rename

---
 src/world/area_dro/dro_02/9694C0.c                              | 2 +-
 src/world/area_hos/hos_03/A1BDB0.c                              | 2 +-
 src/world/area_jan/jan_03/B34BD0.c                              | 2 +-
 src/world/area_kkj/kkj_20/AFDE00.c                              | 2 +-
 src/world/area_kmr/kmr_02/8B30E0.c                              | 2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c                              | 2 +-
 src/world/area_kpa/kpa_91/A86A50.c                              | 2 +-
 src/world/area_kpa/kpa_95/A8CB60.c                              | 2 +-
 src/world/area_mac/mac_01/8017D0.c                              | 2 +-
 src/world/area_nok/nok_01/9C53E0.c                              | 2 +-
 src/world/area_sam/sam_02/D05F60.c                              | 2 +-
 src/world/area_sam/sam_06/D203E0.c                              | 2 +-
 ...8C4SyncStatusMenu.inc.c => Call800E98C4SyncStatusMenu.inc.c} | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 rename src/world/common/{Unk800E98C4SyncStatusMenu.inc.c => Call800E98C4SyncStatusMenu.inc.c} (51%)

diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 4c8bdffcad..7faca769c7 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 986867485f..7ace53be75 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index dfac9edc8f..dc4d3968e3 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 3d57f7cb62..5ec4549dae 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index de4ed0600c..894052300a 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index 49d7b27bdf..a273cad41b 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index c764b65e4a..f7bdac79c3 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index a21a3de683..44daaa48f2 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 2e61f7ff5b..b6d4d62a6e 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 47b559c19d..af5f8a1f64 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index ab35caf081..add231fef5 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -2,7 +2,7 @@
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index f1467f9a0a..699d01bcfe 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
 
 #include "world/common/Call800E9894.inc.c"
 
-#include "world/common/Unk800E98C4SyncStatusMenu.inc.c"
+#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
 
diff --git a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c b/src/world/common/Call800E98C4SyncStatusMenu.inc.c
similarity index 51%
rename from src/world/common/Unk800E98C4SyncStatusMenu.inc.c
rename to src/world/common/Call800E98C4SyncStatusMenu.inc.c
index 90e4efc6a3..9609cf7f35 100644
--- a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c
+++ b/src/world/common/Call800E98C4SyncStatusMenu.inc.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
-static ApiStatus Unk800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) {
+static ApiStatus Call800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) {
     func_800E98C4();
     sync_status_menu();
     return ApiStatus_DONE2;

From debc0016fd5db4580a0b7c1a782039d74d3761e7 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 15:51:17 +0000
Subject: [PATCH 036/101] use ld_addrs.h in load_world_script_api

Renamed from load_map_script_lib
---
 .../code_341d0_len_20d0/load_map_by_IDs.s     | 98 +++++++++----------
 .../code_ebd0_len_6a0/func_80033BC0.s         | 54 +++++-----
 .../code_f270_len_1190/func_80034C3C.s        | 90 ++++++++---------
 include/functions.h                           |  1 +
 include/variables.h                           |  4 -
 src/code_341d0_len_20d0.c                     |  5 +-
 .../script_api/7E0E80.c}                      |  0
 .../script_api/7E2AA0.c}                      |  0
 .../script_api/7E3700.c}                      |  0
 tools/n64splat                                |  2 +-
 tools/splat.yaml                              |  6 +-
 undefined_syms.txt                            |  4 -
 12 files changed, 130 insertions(+), 134 deletions(-)
 rename src/{code_7e0e80.c => world/script_api/7E0E80.c} (100%)
 rename src/{code_7E2AA0.c => world/script_api/7E2AA0.c} (100%)
 rename src/{code_7E3700.c => world/script_api/7E3700.c} (100%)

diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
index 0268832392..34eb98d497 100644
--- a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
+++ b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
@@ -32,24 +32,24 @@ glabel load_map_by_IDs
 /* 35B60 8005A760 0C047624 */  jal       func_8011D890
 /* 35B64 8005A764 00108403 */   sra      $s0, $s0, 0x10
 /* 35B68 8005A768 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35B6C 8005A76C 00000000 */   nop      
+/* 35B6C 8005A76C 00000000 */   nop
 /* 35B70 8005A770 0C0B0C77 */  jal       clear_script_list
-/* 35B74 8005A774 00000000 */   nop      
+/* 35B74 8005A774 00000000 */   nop
 /* 35B78 8005A778 12000005 */  beqz      $s0, .L8005A790
 /* 35B7C 8005A77C 24020001 */   addiu    $v0, $zero, 1
 /* 35B80 8005A780 12020008 */  beq       $s0, $v0, .L8005A7A4
-/* 35B84 8005A784 00000000 */   nop      
+/* 35B84 8005A784 00000000 */   nop
 /* 35B88 8005A788 080169F0 */  j         .L8005A7C0
-/* 35B8C 8005A78C 00000000 */   nop      
+/* 35B8C 8005A78C 00000000 */   nop
 .L8005A790:
 /* 35B90 8005A790 0C0514E4 */  jal       clear_area_flags
-/* 35B94 8005A794 00000000 */   nop      
+/* 35B94 8005A794 00000000 */   nop
 /* 35B98 8005A798 8E420000 */  lw        $v0, ($s2)
 /* 35B9C 8005A79C 080169F0 */  j         .L8005A7C0
 /* 35BA0 8005A7A0 A0400167 */   sb       $zero, 0x167($v0)
 .L8005A7A4:
 /* 35BA4 8005A7A4 0C00AD24 */  jal       fio_deserialize_state
-/* 35BA8 8005A7A8 00000000 */   nop      
+/* 35BA8 8005A7A8 00000000 */   nop
 /* 35BAC 8005A7AC 8E420000 */  lw        $v0, ($s2)
 /* 35BB0 8005A7B0 94510086 */  lhu       $s1, 0x86($v0)
 /* 35BB4 8005A7B4 9453008C */  lhu       $s3, 0x8c($v0)
@@ -93,17 +93,17 @@ glabel load_map_by_IDs
 /* 35C48 8005A848 3C01800A */  lui       $at, 0x800a
 /* 35C4C 8005A84C AC3241E0 */  sw        $s2, 0x41e0($at)
 /* 35C50 8005A850 10A00005 */  beqz      $a1, .L8005A868
-/* 35C54 8005A854 00000000 */   nop      
+/* 35C54 8005A854 00000000 */   nop
 /* 35C58 8005A858 3C04800E */  lui       $a0, 0x800e
 /* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, -0x6998
 /* 35C60 8005A860 0C01BB50 */  jal       strcpy
-/* 35C64 8005A864 00000000 */   nop      
+/* 35C64 8005A864 00000000 */   nop
 .L8005A868:
-/* 35C68 8005A868 0C0169B0 */  jal       load_map_script_lib
-/* 35C6C 8005A86C 00000000 */   nop      
+/* 35C68 8005A868 0C0169B0 */  jal       load_world_script_api
+/* 35C6C 8005A86C 00000000 */   nop
 /* 35C70 8005A870 8E440008 */  lw        $a0, 8($s2)
 /* 35C74 8005A874 10800004 */  beqz      $a0, .L8005A888
-/* 35C78 8005A878 00000000 */   nop      
+/* 35C78 8005A878 00000000 */   nop
 /* 35C7C 8005A87C 8E45000C */  lw        $a1, 0xc($s2)
 /* 35C80 8005A880 0C00A5CF */  jal       dma_copy
 /* 35C84 8005A884 8E460010 */   lw       $a2, 0x10($s2)
@@ -128,13 +128,13 @@ glabel load_map_by_IDs
 /* 35CC8 8005A8C8 3C13800A */  lui       $s3, 0x800a
 /* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, 0x41e8
 /* 35CD0 8005A8D0 10400004 */  beqz      $v0, .L8005A8E4
-/* 35CD4 8005A8D4 00000000 */   nop      
+/* 35CD4 8005A8D4 00000000 */   nop
 /* 35CD8 8005A8D8 0040F809 */  jalr      $v0
-/* 35CDC 8005A8DC 00000000 */   nop      
+/* 35CDC 8005A8DC 00000000 */   nop
 /* 35CE0 8005A8E0 0040A02D */  daddu     $s4, $v0, $zero
 .L8005A8E4:
 /* 35CE4 8005A8E4 16800015 */  bnez      $s4, .L8005A93C
-/* 35CE8 8005A8E8 00000000 */   nop      
+/* 35CE8 8005A8E8 00000000 */   nop
 /* 35CEC 8005A8EC 3C04800E */  lui       $a0, 0x800e
 /* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* 35CF4 8005A8F4 0C016B3A */  jal       load_asset_by_name
@@ -158,78 +158,78 @@ glabel load_map_by_IDs
 .L8005A93C:
 /* 35D3C 8005A93C 8E420014 */  lw        $v0, 0x14($s2)
 /* 35D40 8005A940 10400005 */  beqz      $v0, .L8005A958
-/* 35D44 8005A944 00000000 */   nop      
+/* 35D44 8005A944 00000000 */   nop
 /* 35D48 8005A948 3C04800E */  lui       $a0, 0x800e
 /* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, -0x6998
 /* 35D50 8005A950 0C05175C */  jal       load_map_bg
-/* 35D54 8005A954 00000000 */   nop      
+/* 35D54 8005A954 00000000 */   nop
 .L8005A958:
 /* 35D58 8005A958 0C00B458 */  jal       func_8002D160
-/* 35D5C 8005A95C 00000000 */   nop      
+/* 35D5C 8005A95C 00000000 */   nop
 /* 35D60 8005A960 0C0AC81E */  jal       func_802B2078
-/* 35D64 8005A964 00000000 */   nop      
+/* 35D64 8005A964 00000000 */   nop
 /* 35D68 8005A968 0C05259C */  jal       func_80149670
 /* 35D6C 8005A96C 0000202D */   daddu    $a0, $zero, $zero
 /* 35D70 8005A970 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35D74 8005A974 00000000 */   nop      
+/* 35D74 8005A974 00000000 */   nop
 /* 35D78 8005A978 0C0B0C77 */  jal       clear_script_list
-/* 35D7C 8005A97C 00000000 */   nop      
+/* 35D7C 8005A97C 00000000 */   nop
 /* 35D80 8005A980 0C00B7BD */  jal       create_cameras_a
-/* 35D84 8005A984 00000000 */   nop      
+/* 35D84 8005A984 00000000 */   nop
 /* 35D88 8005A988 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
 /* 35D8C 8005A98C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
 /* 35D90 8005A990 8E020000 */  lw        $v0, ($s0)
 /* 35D94 8005A994 0C0B763E */  jal       func_802DD8F8
 /* 35D98 8005A998 80440084 */   lb       $a0, 0x84($v0)
 /* 35D9C 8005A99C 0C047889 */  jal       func_8011E224
-/* 35DA0 8005A9A0 00000000 */   nop      
+/* 35DA0 8005A9A0 00000000 */   nop
 /* 35DA4 8005A9A4 0C0482EC */  jal       clear_virtual_models
-/* 35DA8 8005A9A8 00000000 */   nop      
+/* 35DA8 8005A9A8 00000000 */   nop
 /* 35DAC 8005A9AC 0C00E12F */  jal       clear_npcs
-/* 35DB0 8005A9B0 00000000 */   nop      
+/* 35DB0 8005A9B0 00000000 */   nop
 /* 35DB4 8005A9B4 0C050440 */  jal       func_80141100
-/* 35DB8 8005A9B8 00000000 */   nop      
+/* 35DB8 8005A9B8 00000000 */   nop
 /* 35DBC 8005A9BC 0C0515A0 */  jal       clear_trigger_data
-/* 35DC0 8005A9C0 00000000 */   nop      
+/* 35DC0 8005A9C0 00000000 */   nop
 /* 35DC4 8005A9C4 0C045751 */  jal       clear_model_data
-/* 35DC8 8005A9C8 00000000 */   nop      
+/* 35DC8 8005A9C8 00000000 */   nop
 /* 35DCC 8005A9CC 0C052010 */  jal       func_80148040
-/* 35DD0 8005A9D0 00000000 */   nop      
+/* 35DD0 8005A9D0 00000000 */   nop
 /* 35DD4 8005A9D4 0C05177E */  jal       func_80145DF8
-/* 35DD8 8005A9D8 00000000 */   nop      
+/* 35DD8 8005A9D8 00000000 */   nop
 /* 35DDC 8005A9DC 8E020000 */  lw        $v0, ($s0)
 /* 35DE0 8005A9E0 804300A8 */  lb        $v1, 0xa8($v0)
 /* 35DE4 8005A9E4 2402FFFF */  addiu     $v0, $zero, -1
 /* 35DE8 8005A9E8 14620003 */  bne       $v1, $v0, .L8005A9F8
-/* 35DEC 8005A9EC 00000000 */   nop      
+/* 35DEC 8005A9EC 00000000 */   nop
 /* 35DF0 8005A9F0 0C04E062 */  jal       func_80138188
-/* 35DF4 8005A9F4 00000000 */   nop      
+/* 35DF4 8005A9F4 00000000 */   nop
 .L8005A9F8:
 /* 35DF8 8005A9F8 16800005 */  bnez      $s4, .L8005AA10
-/* 35DFC 8005A9FC 00000000 */   nop      
+/* 35DFC 8005A9FC 00000000 */   nop
 /* 35E00 8005AA00 0C016BE5 */  jal       initialize_collision
-/* 35E04 8005AA04 00000000 */   nop      
+/* 35E04 8005AA04 00000000 */   nop
 /* 35E08 8005AA08 0C016BF0 */  jal       load_hit_asset
-/* 35E0C 8005AA0C 00000000 */   nop      
+/* 35E0C 8005AA0C 00000000 */   nop
 .L8005AA10:
 /* 35E10 8005AA10 0C01CACC */  jal       func_80072B30
-/* 35E14 8005AA14 00000000 */   nop      
+/* 35E14 8005AA14 00000000 */   nop
 /* 35E18 8005AA18 0C00F900 */  jal       clear_encounter_status
-/* 35E1C 8005AA1C 00000000 */   nop      
+/* 35E1C 8005AA1C 00000000 */   nop
 /* 35E20 8005AA20 0C04432E */  jal       clear_entity_data
 /* 35E24 8005AA24 24040001 */   addiu    $a0, $zero, 1
 /* 35E28 8005AA28 0C016727 */  jal       func_80059C9C
-/* 35E2C 8005AA2C 00000000 */   nop      
+/* 35E2C 8005AA2C 00000000 */   nop
 /* 35E30 8005AA30 0C037F14 */  jal       clear_player_status
-/* 35E34 8005AA34 00000000 */   nop      
+/* 35E34 8005AA34 00000000 */   nop
 /* 35E38 8005AA38 0C037F1D */  jal       func_800DFC74
-/* 35E3C 8005AA3C 00000000 */   nop      
+/* 35E3C 8005AA3C 00000000 */   nop
 /* 35E40 8005AA40 0C03AD1D */  jal       partner_reset_data
-/* 35E44 8005AA44 00000000 */   nop      
+/* 35E44 8005AA44 00000000 */   nop
 /* 35E48 8005AA48 0C048D9D */  jal       clear_printers
-/* 35E4C 8005AA4C 00000000 */   nop      
+/* 35E4C 8005AA4C 00000000 */   nop
 /* 35E50 8005AA50 0C04C3FC */  jal       clear_item_entity_data
-/* 35E54 8005AA54 00000000 */   nop      
+/* 35E54 8005AA54 00000000 */   nop
 /* 35E58 8005AA58 3C028011 */  lui       $v0, %hi(gPlayerStatus)
 /* 35E5C 8005AA5C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* 35E60 8005AA60 C4400084 */  lwc1      $f0, 0x84($v0)
@@ -242,16 +242,16 @@ glabel load_map_by_IDs
 /* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
 /* 35E80 8005AA80 8C84FF60 */   lw       $a0, -0xa0($a0)
 /* 35E84 8005AA84 0C052580 */  jal       func_80149600
-/* 35E88 8005AA88 00000000 */   nop      
+/* 35E88 8005AA88 00000000 */   nop
 /* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
-/* 35E90 8005AA90 00000000 */   nop      
+/* 35E90 8005AA90 00000000 */   nop
 /* 35E94 8005AA94 3C04800B */  lui       $a0, 0x800b
 /* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, 0xcf0
 /* 35E9C 8005AA9C 0C016B74 */  jal       get_asset_offset
 /* 35EA0 8005AAA0 27A50030 */   addiu    $a1, $sp, 0x30
 /* 35EA4 8005AAA4 8E640000 */  lw        $a0, ($s3)
 /* 35EA8 8005AAA8 10800004 */  beqz      $a0, .L8005AABC
-/* 35EAC 8005AAAC 00000000 */   nop      
+/* 35EAC 8005AAAC 00000000 */   nop
 /* 35EB0 8005AAB0 8FA60030 */  lw        $a2, 0x30($sp)
 /* 35EB4 8005AAB4 0C046B52 */  jal       load_data_for_models
 /* 35EB8 8005AAB8 0040282D */   daddu    $a1, $v0, $zero
@@ -260,9 +260,9 @@ glabel load_map_by_IDs
 /* 35EC0 8005AAC0 50800005 */  beql      $a0, $zero, .L8005AAD8
 /* 35EC4 8005AAC4 24040128 */   addiu    $a0, $zero, 0x128
 /* 35EC8 8005AAC8 0C05178A */  jal       read_background_size
-/* 35ECC 8005AACC 00000000 */   nop      
+/* 35ECC 8005AACC 00000000 */   nop
 /* 35ED0 8005AAD0 08016ABA */  j         .L8005AAE8
-/* 35ED4 8005AAD4 00000000 */   nop      
+/* 35ED4 8005AAD4 00000000 */   nop
 .L8005AAD8:
 /* 35ED8 8005AAD8 240500C8 */  addiu     $a1, $zero, 0xc8
 /* 35EDC 8005AADC 2406000C */  addiu     $a2, $zero, 0xc
@@ -306,9 +306,9 @@ glabel load_map_by_IDs
 /* 35F6C 8005AB6C 24070106 */  addiu     $a3, $zero, 0x106
 .L8005AB70:
 /* 35F70 8005AB70 0C00B8C5 */  jal       set_cam_viewport
-/* 35F74 8005AB74 00000000 */   nop      
+/* 35F74 8005AB74 00000000 */   nop
 /* 35F78 8005AB78 0C039E4D */  jal       initialize_status_menu
-/* 35F7C 8005AB7C 00000000 */   nop      
+/* 35F7C 8005AB7C 00000000 */   nop
 /* 35F80 8005AB80 0000282D */  daddu     $a1, $zero, $zero
 /* 35F84 8005AB84 00A0302D */  daddu     $a2, $a1, $zero
 /* 35F88 8005AB88 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
index 9b1cfbade8..d7331898fe 100644
--- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
+++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
@@ -33,9 +33,9 @@ glabel func_80033BC0
 /* F030 80033C30 0C018030 */  jal       nuContRmbForceStopEnd
 /* F034 80033C34 AC820000 */   sw       $v0, ($a0)
 /* F038 80033C38 0C05260E */  jal       func_80149838
-/* F03C 80033C3C 00000000 */   nop      
+/* F03C 80033C3C 00000000 */   nop
 /* F040 80033C40 0C016AFA */  jal       get_current_map_header
-/* F044 80033C44 00000000 */   nop      
+/* F044 80033C44 00000000 */   nop
 /* F048 80033C48 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
 /* F04C 80033C4C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
 /* F050 80033C50 8E040000 */  lw        $a0, ($s0)
@@ -53,7 +53,7 @@ glabel func_80033BC0
 /* F080 80033C80 0C016BE1 */  jal       func_8005AF84
 /* F084 80033C84 A0400070 */   sb       $zero, 0x70($v0)
 /* F088 80033C88 0C00AB37 */  jal       func_8002ACDC
-/* F08C 80033C8C 00000000 */   nop      
+/* F08C 80033C8C 00000000 */   nop
 /* F090 80033C90 0C05259C */  jal       func_80149670
 /* F094 80033C94 24040001 */   addiu    $a0, $zero, 1
 /* F098 80033C98 8E030000 */  lw        $v1, ($s0)
@@ -65,37 +65,37 @@ glabel func_80033BC0
 /* F0B0 80033CB0 0C0B763E */  jal       func_802DD8F8
 /* F0B4 80033CB4 80440084 */   lb       $a0, 0x84($v0)
 /* F0B8 80033CB8 0C0457FA */  jal       init_model_data
-/* F0BC 80033CBC 00000000 */   nop      
+/* F0BC 80033CBC 00000000 */   nop
 /* F0C0 80033CC0 0C05203C */  jal       func_801480F0
-/* F0C4 80033CC4 00000000 */   nop      
+/* F0C4 80033CC4 00000000 */   nop
 /* F0C8 80033CC8 0C048316 */  jal       init_virtual_models
-/* F0CC 80033CCC 00000000 */   nop      
+/* F0CC 80033CCC 00000000 */   nop
 /* F0D0 80033CD0 0C0478C4 */  jal       func_8011E310
-/* F0D4 80033CD4 00000000 */   nop      
+/* F0D4 80033CD4 00000000 */   nop
 /* F0D8 80033CD8 0C048C45 */  jal       init_dynamic_entity_list
-/* F0DC 80033CDC 00000000 */   nop      
+/* F0DC 80033CDC 00000000 */   nop
 /* F0E0 80033CE0 0000202D */  daddu     $a0, $zero, $zero
 /* F0E4 80033CE4 0C0514BA */  jal       func_801452E8
 /* F0E8 80033CE8 0080282D */   daddu    $a1, $a0, $zero
 /* F0EC 80033CEC 0C0504C0 */  jal       init_menu_icon_list
-/* F0F0 80033CF0 00000000 */   nop      
+/* F0F0 80033CF0 00000000 */   nop
 /* F0F4 80033CF4 0C04C433 */  jal       init_item_entity_list
-/* F0F8 80033CF8 00000000 */   nop      
+/* F0F8 80033CF8 00000000 */   nop
 /* F0FC 80033CFC 0C0B0CBB */  jal       init_script_list
-/* F100 80033D00 00000000 */   nop      
+/* F100 80033D00 00000000 */   nop
 /* F104 80033D04 0C00E14B */  jal       init_npc_list
-/* F108 80033D08 00000000 */   nop      
+/* F108 80033D08 00000000 */   nop
 /* F10C 80033D0C 0C044396 */  jal       func_80110E58
-/* F110 80033D10 00000000 */   nop      
+/* F110 80033D10 00000000 */   nop
 /* F114 80033D14 0C0515CA */  jal       init_trigger_list
-/* F118 80033D18 00000000 */   nop      
+/* F118 80033D18 00000000 */   nop
 /* F11C 80033D1C 8E020000 */  lw        $v0, ($s0)
 /* F120 80033D20 904200AA */  lbu       $v0, 0xaa($v0)
 /* F124 80033D24 30420001 */  andi      $v0, $v0, 1
 /* F128 80033D28 10400008 */  beqz      $v0, .L80033D4C
-/* F12C 80033D2C 00000000 */   nop      
+/* F12C 80033D2C 00000000 */   nop
 /* F130 80033D30 0C00EC6C */  jal       func_8003B1B0
-/* F134 80033D34 00000000 */   nop      
+/* F134 80033D34 00000000 */   nop
 /* F138 80033D38 3C02800A */  lui       $v0, 0x800a
 /* F13C 80033D3C 8C420904 */  lw        $v0, 0x904($v0)
 /* F140 80033D40 24040011 */  addiu     $a0, $zero, 0x11
@@ -106,8 +106,8 @@ glabel func_80033BC0
 /* F150 80033D50 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
 /* F154 80033D54 0C03AC80 */  jal       func_800EB200
 /* F158 80033D58 80440012 */   lb       $a0, 0x12($v0)
-/* F15C 80033D5C 0C0169B0 */  jal       load_map_script_lib
-/* F160 80033D60 00000000 */   nop      
+/* F15C 80033D5C 0C0169B0 */  jal       load_world_script_api
+/* F160 80033D60 00000000 */   nop
 /* F164 80033D64 3C04800E */  lui       $a0, 0x800e
 /* F168 80033D68 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* F16C 80033D6C 0C016B3A */  jal       load_asset_by_name
@@ -120,12 +120,12 @@ glabel func_80033BC0
 /* F188 80033D88 0C00AB1E */  jal       general_heap_free
 /* F18C 80033D8C 0200202D */   daddu    $a0, $s0, $zero
 /* F190 80033D90 0C016BE5 */  jal       initialize_collision
-/* F194 80033D94 00000000 */   nop      
+/* F194 80033D94 00000000 */   nop
 /* F198 80033D98 0C016C16 */  jal       load_collision
-/* F19C 80033D9C 00000000 */   nop      
+/* F19C 80033D9C 00000000 */   nop
 /* F1A0 80033DA0 8E240008 */  lw        $a0, 8($s1)
 /* F1A4 80033DA4 10800004 */  beqz      $a0, .L80033DB8
-/* F1A8 80033DA8 00000000 */   nop      
+/* F1A8 80033DA8 00000000 */   nop
 /* F1AC 80033DAC 8E25000C */  lw        $a1, 0xc($s1)
 /* F1B0 80033DB0 0C00A5CF */  jal       dma_copy
 /* F1B4 80033DB4 8E260010 */   lw       $a2, 0x10($s1)
@@ -136,9 +136,9 @@ glabel func_80033BC0
 /* F1C4 80033DC4 50800005 */  beql      $a0, $zero, .L80033DDC
 /* F1C8 80033DC8 24040128 */   addiu    $a0, $zero, 0x128
 /* F1CC 80033DCC 0C05178A */  jal       read_background_size
-/* F1D0 80033DD0 00000000 */   nop      
+/* F1D0 80033DD0 00000000 */   nop
 /* F1D4 80033DD4 0800CF7B */  j         .L80033DEC
-/* F1D8 80033DD8 00000000 */   nop      
+/* F1D8 80033DD8 00000000 */   nop
 .L80033DDC:
 /* F1DC 80033DDC 240500C8 */  addiu     $a1, $zero, 0xc8
 /* F1E0 80033DE0 2406000C */  addiu     $a2, $zero, 0xc
@@ -154,9 +154,9 @@ glabel func_80033BC0
 /* F204 80033E04 0C045709 */  jal       load_model_textures
 /* F208 80033E08 0040282D */   daddu    $a1, $v0, $zero
 /* F20C 80033E0C 0C04584B */  jal       calculate_model_sizes
-/* F210 80033E10 00000000 */   nop      
+/* F210 80033E10 00000000 */   nop
 /* F214 80033E14 0C00EC6C */  jal       func_8003B1B0
-/* F218 80033E18 00000000 */   nop      
+/* F218 80033E18 00000000 */   nop
 /* F21C 80033E1C 3C02800A */  lui       $v0, 0x800a
 /* F220 80033E20 8C420904 */  lw        $v0, 0x904($v0)
 /* F224 80033E24 3C04800A */  lui       $a0, 0x800a
@@ -164,12 +164,12 @@ glabel func_80033BC0
 /* F22C 80033E2C 10800003 */  beqz      $a0, .L80033E3C
 /* F230 80033E30 AE620004 */   sw       $v0, 4($s3)
 /* F234 80033E34 0C009C22 */  jal       func_80027088
-/* F238 80033E38 00000000 */   nop      
+/* F238 80033E38 00000000 */   nop
 .L80033E3C:
 /* F23C 80033E3C 24040004 */  addiu     $a0, $zero, 4
 .L80033E40:
 /* F240 80033E40 0C00CD3C */  jal       set_game_mode
-/* F244 80033E44 00000000 */   nop      
+/* F244 80033E44 00000000 */   nop
 .L80033E48:
 /* F248 80033E48 8FBF0028 */  lw        $ra, 0x28($sp)
 /* F24C 80033E4C 8FB30024 */  lw        $s3, 0x24($sp)
diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
index dedf270b12..75b1db7e46 100644
--- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
+++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
@@ -17,19 +17,19 @@ glabel func_80034C3C
 /* 1006C 80034C6C 28620002 */   slti     $v0, $v1, 2
 /* 10070 80034C70 24020004 */  addiu     $v0, $zero, 4
 /* 10074 80034C74 106200CA */  beq       $v1, $v0, .L80034FA0
-/* 10078 80034C78 00000000 */   nop      
+/* 10078 80034C78 00000000 */   nop
 /* 1007C 80034C7C 0800D3F6 */  j         .L80034FD8
-/* 10080 80034C80 00000000 */   nop      
+/* 10080 80034C80 00000000 */   nop
 .L80034C84:
 /* 10084 80034C84 104000D4 */  beqz      $v0, .L80034FD8
-/* 10088 80034C88 00000000 */   nop      
+/* 10088 80034C88 00000000 */   nop
 /* 1008C 80034C8C 046000D2 */  bltz      $v1, .L80034FD8
 /* 10090 80034C90 24020004 */   addiu    $v0, $zero, 4
 /* 10094 80034C94 3C06800A */  lui       $a2, 0x800a
 /* 10098 80034C98 24C60920 */  addiu     $a2, $a2, 0x920
 /* 1009C 80034C9C 80C30000 */  lb        $v1, ($a2)
 /* 100A0 80034CA0 14620007 */  bne       $v1, $v0, .L80034CC0
-/* 100A4 80034CA4 00000000 */   nop      
+/* 100A4 80034CA4 00000000 */   nop
 /* 100A8 80034CA8 3C03800A */  lui       $v1, %hi(D_8009A650)
 /* 100AC 80034CAC 2463A650 */  addiu     $v1, $v1, %lo(D_8009A650)
 /* 100B0 80034CB0 8C620000 */  lw        $v0, ($v1)
@@ -44,7 +44,7 @@ glabel func_80034C3C
 /* 100D0 80034CD0 A0C20000 */  sb        $v0, ($a2)
 /* 100D4 80034CD4 00021600 */  sll       $v0, $v0, 0x18
 /* 100D8 80034CD8 144000BF */  bnez      $v0, .L80034FD8
-/* 100DC 80034CDC 00000000 */   nop      
+/* 100DC 80034CDC 00000000 */   nop
 .L80034CE0:
 /* 100E0 80034CE0 3C048007 */  lui       $a0, 0x8007
 /* 100E4 80034CE4 24847950 */  addiu     $a0, $a0, 0x7950
@@ -53,7 +53,7 @@ glabel func_80034C3C
 /* 100F0 80034CF0 0C017CBC */  jal       nuGfxSetCfb
 /* 100F4 80034CF4 A0C20000 */   sb       $v0, ($a2)
 /* 100F8 80034CF8 0C0911C2 */  jal       pause_cleanup
-/* 100FC 80034CFC 00000000 */   nop      
+/* 100FC 80034CFC 00000000 */   nop
 /* 10100 80034D00 3C04800A */  lui       $a0, %hi(D_8009A650)
 /* 10104 80034D04 2484A650 */  addiu     $a0, $a0, %lo(D_8009A650)
 /* 10108 80034D08 8C820000 */  lw        $v0, ($a0)
@@ -80,47 +80,47 @@ glabel func_80034C3C
 /* 1015C 80034D5C 0C016BE1 */  jal       func_8005AF84
 /* 10160 80034D60 A4A30148 */   sh       $v1, 0x148($a1)
 /* 10164 80034D64 0C00AB37 */  jal       func_8002ACDC
-/* 10168 80034D68 00000000 */   nop      
+/* 10168 80034D68 00000000 */   nop
 /* 1016C 80034D6C 0C018030 */  jal       nuContRmbForceStopEnd
-/* 10170 80034D70 00000000 */   nop      
+/* 10170 80034D70 00000000 */   nop
 /* 10174 80034D74 0C05259C */  jal       func_80149670
 /* 10178 80034D78 24040001 */   addiu    $a0, $zero, 1
 /* 1017C 80034D7C 8E020000 */  lw        $v0, ($s0)
 /* 10180 80034D80 0C0B763E */  jal       func_802DD8F8
 /* 10184 80034D84 80440084 */   lb       $a0, 0x84($v0)
 /* 10188 80034D88 0C0457FA */  jal       init_model_data
-/* 1018C 80034D8C 00000000 */   nop      
+/* 1018C 80034D8C 00000000 */   nop
 /* 10190 80034D90 0C05203C */  jal       func_801480F0
-/* 10194 80034D94 00000000 */   nop      
+/* 10194 80034D94 00000000 */   nop
 /* 10198 80034D98 0C048316 */  jal       init_virtual_models
-/* 1019C 80034D9C 00000000 */   nop      
+/* 1019C 80034D9C 00000000 */   nop
 /* 101A0 80034DA0 0C0478C4 */  jal       func_8011E310
-/* 101A4 80034DA4 00000000 */   nop      
+/* 101A4 80034DA4 00000000 */   nop
 /* 101A8 80034DA8 0C048C45 */  jal       init_dynamic_entity_list
-/* 101AC 80034DAC 00000000 */   nop      
+/* 101AC 80034DAC 00000000 */   nop
 /* 101B0 80034DB0 0000202D */  daddu     $a0, $zero, $zero
 /* 101B4 80034DB4 0C0514BA */  jal       func_801452E8
 /* 101B8 80034DB8 0080282D */   daddu    $a1, $a0, $zero
 /* 101BC 80034DBC 0C0504C0 */  jal       init_menu_icon_list
-/* 101C0 80034DC0 00000000 */   nop      
+/* 101C0 80034DC0 00000000 */   nop
 /* 101C4 80034DC4 0C04C433 */  jal       init_item_entity_list
-/* 101C8 80034DC8 00000000 */   nop      
+/* 101C8 80034DC8 00000000 */   nop
 /* 101CC 80034DCC 0C0B0CBB */  jal       init_script_list
-/* 101D0 80034DD0 00000000 */   nop      
+/* 101D0 80034DD0 00000000 */   nop
 /* 101D4 80034DD4 0C00E14B */  jal       init_npc_list
-/* 101D8 80034DD8 00000000 */   nop      
+/* 101D8 80034DD8 00000000 */   nop
 /* 101DC 80034DDC 0C044396 */  jal       func_80110E58
-/* 101E0 80034DE0 00000000 */   nop      
+/* 101E0 80034DE0 00000000 */   nop
 /* 101E4 80034DE4 0C0515CA */  jal       init_trigger_list
-/* 101E8 80034DE8 00000000 */   nop      
+/* 101E8 80034DE8 00000000 */   nop
 /* 101EC 80034DEC 3C04800A */  lui       $a0, 0x800a
 /* 101F0 80034DF0 8C840924 */  lw        $a0, 0x924($a0)
 /* 101F4 80034DF4 0C0525FF */  jal       func_801497FC
-/* 101F8 80034DF8 00000000 */   nop      
+/* 101F8 80034DF8 00000000 */   nop
 /* 101FC 80034DFC 0C052B1C */  jal       func_8014AC70
-/* 10200 80034E00 00000000 */   nop      
-/* 10204 80034E04 0C0169B0 */  jal       load_map_script_lib
-/* 10208 80034E08 00000000 */   nop      
+/* 10200 80034E00 00000000 */   nop
+/* 10204 80034E04 0C0169B0 */  jal       load_world_script_api
+/* 10208 80034E08 00000000 */   nop
 /* 1020C 80034E0C 3C04800E */  lui       $a0, 0x800e
 /* 10210 80034E10 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* 10214 80034E14 0C016B3A */  jal       load_asset_by_name
@@ -133,12 +133,12 @@ glabel func_80034C3C
 /* 10230 80034E30 0C00AB1E */  jal       general_heap_free
 /* 10234 80034E34 0200202D */   daddu    $a0, $s0, $zero
 /* 10238 80034E38 0C016BE5 */  jal       initialize_collision
-/* 1023C 80034E3C 00000000 */   nop      
+/* 1023C 80034E3C 00000000 */   nop
 /* 10240 80034E40 0C016C16 */  jal       load_collision
-/* 10244 80034E44 00000000 */   nop      
+/* 10244 80034E44 00000000 */   nop
 /* 10248 80034E48 8E240008 */  lw        $a0, 8($s1)
 /* 1024C 80034E4C 10800004 */  beqz      $a0, .L80034E60
-/* 10250 80034E50 00000000 */   nop      
+/* 10250 80034E50 00000000 */   nop
 /* 10254 80034E54 8E25000C */  lw        $a1, 0xc($s1)
 /* 10258 80034E58 0C00A5CF */  jal       dma_copy
 /* 1025C 80034E5C 8E260010 */   lw       $a2, 0x10($s1)
@@ -149,9 +149,9 @@ glabel func_80034C3C
 /* 1026C 80034E6C 50800005 */  beql      $a0, $zero, .L80034E84
 /* 10270 80034E70 24040128 */   addiu    $a0, $zero, 0x128
 /* 10274 80034E74 0C05178A */  jal       read_background_size
-/* 10278 80034E78 00000000 */   nop      
+/* 10278 80034E78 00000000 */   nop
 /* 1027C 80034E7C 0800D3A5 */  j         .L80034E94
-/* 10280 80034E80 00000000 */   nop      
+/* 10280 80034E80 00000000 */   nop
 .L80034E84:
 /* 10284 80034E84 240500C8 */  addiu     $a1, $zero, 0xc8
 /* 10288 80034E88 2406000C */  addiu     $a2, $zero, 0xc
@@ -164,11 +164,11 @@ glabel func_80034C3C
 /* 102A0 80034EA0 0C04584B */  jal       calculate_model_sizes
 /* 102A4 80034EA4 A462015C */   sh       $v0, 0x15c($v1)
 /* 102A8 80034EA8 0C00EC6C */  jal       func_8003B1B0
-/* 102AC 80034EAC 00000000 */   nop      
+/* 102AC 80034EAC 00000000 */   nop
 /* 102B0 80034EB0 0C051FB1 */  jal       func_80147EC4
 /* 102B4 80034EB4 0000202D */   daddu    $a0, $zero, $zero
 /* 102B8 80034EB8 0C03A631 */  jal       func_800E98C4
-/* 102BC 80034EBC 00000000 */   nop      
+/* 102BC 80034EBC 00000000 */   nop
 /* 102C0 80034EC0 0C009C22 */  jal       func_80027088
 /* 102C4 80034EC4 24040001 */   addiu    $a0, $zero, 1
 /* 102C8 80034EC8 24020003 */  addiu     $v0, $zero, 3
@@ -185,13 +185,13 @@ glabel func_80034C3C
 /* 102F4 80034EF4 3C01802E */  lui       $at, 0x802e
 /* 102F8 80034EF8 A0239D71 */  sb        $v1, -0x628f($at)
 /* 102FC 80034EFC 0C00F949 */  jal       func_8003E524
-/* 10300 80034F00 00000000 */   nop      
+/* 10300 80034F00 00000000 */   nop
 /* 10304 80034F04 0C00E64C */  jal       update_npcs
-/* 10308 80034F08 00000000 */   nop      
+/* 10308 80034F08 00000000 */   nop
 /* 1030C 80034F0C 0C037DD0 */  jal       update_player
-/* 10310 80034F10 00000000 */   nop      
+/* 10310 80034F10 00000000 */   nop
 /* 10314 80034F14 0C016754 */  jal       func_80059D50
-/* 10318 80034F18 00000000 */   nop      
+/* 10318 80034F18 00000000 */   nop
 /* 1031C 80034F1C 3C03800A */  lui       $v1, 0x800a
 /* 10320 80034F20 24630922 */  addiu     $v1, $v1, 0x922
 /* 10324 80034F24 94620000 */  lhu       $v0, ($v1)
@@ -201,16 +201,16 @@ glabel func_80034C3C
 /* 10334 80034F34 04420028 */  bltzl     $v0, .L80034FD8
 /* 10338 80034F38 A4600000 */   sh       $zero, ($v1)
 /* 1033C 80034F3C 0800D3F6 */  j         .L80034FD8
-/* 10340 80034F40 00000000 */   nop      
+/* 10340 80034F40 00000000 */   nop
 .L80034F44:
 /* 10344 80034F44 0C00F949 */  jal       func_8003E524
-/* 10348 80034F48 00000000 */   nop      
+/* 10348 80034F48 00000000 */   nop
 /* 1034C 80034F4C 0C00E64C */  jal       update_npcs
-/* 10350 80034F50 00000000 */   nop      
+/* 10350 80034F50 00000000 */   nop
 /* 10354 80034F54 0C037DD0 */  jal       update_player
-/* 10358 80034F58 00000000 */   nop      
+/* 10358 80034F58 00000000 */   nop
 /* 1035C 80034F5C 0C016754 */  jal       func_80059D50
-/* 10360 80034F60 00000000 */   nop      
+/* 10360 80034F60 00000000 */   nop
 /* 10364 80034F64 3C04800A */  lui       $a0, 0x800a
 /* 10368 80034F68 24840922 */  addiu     $a0, $a0, 0x922
 /* 1036C 80034F6C 84820000 */  lh        $v0, ($a0)
@@ -226,20 +226,20 @@ glabel func_80034C3C
 /* 10390 80034F90 04420011 */  bltzl     $v0, .L80034FD8
 /* 10394 80034F94 A4800000 */   sh       $zero, ($a0)
 /* 10398 80034F98 0800D3F6 */  j         .L80034FD8
-/* 1039C 80034F9C 00000000 */   nop      
+/* 1039C 80034F9C 00000000 */   nop
 .L80034FA0:
 /* 103A0 80034FA0 0C009C22 */  jal       func_80027088
 /* 103A4 80034FA4 0000202D */   daddu    $a0, $zero, $zero
 /* 103A8 80034FA8 0C00F949 */  jal       func_8003E524
-/* 103AC 80034FAC 00000000 */   nop      
+/* 103AC 80034FAC 00000000 */   nop
 /* 103B0 80034FB0 0C00E64C */  jal       update_npcs
-/* 103B4 80034FB4 00000000 */   nop      
+/* 103B4 80034FB4 00000000 */   nop
 /* 103B8 80034FB8 0C037DD0 */  jal       update_player
-/* 103BC 80034FBC 00000000 */   nop      
+/* 103BC 80034FBC 00000000 */   nop
 /* 103C0 80034FC0 0C016754 */  jal       func_80059D50
-/* 103C4 80034FC4 00000000 */   nop      
+/* 103C4 80034FC4 00000000 */   nop
 /* 103C8 80034FC8 0C038069 */  jal       enable_player_input
-/* 103CC 80034FCC 00000000 */   nop      
+/* 103CC 80034FCC 00000000 */   nop
 /* 103D0 80034FD0 0C00CD3C */  jal       set_game_mode
 /* 103D4 80034FD4 24040004 */   addiu    $a0, $zero, 4
 .L80034FD8:
diff --git a/include/functions.h b/include/functions.h
index 2e2fcd7851..28c40261f8 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,6 +9,7 @@ void osCleanupThread(void);
 
 s32 heap_malloc(s32 size);
 HeapNode* _heap_create(void* addr, s32 size);
+void dma_copy(void* romStart, void* romEnd, void* vramDest);
 
 s32 get_global_byte(s32 index);
 s32 get_global_flag(s32 index);
diff --git a/include/variables.h b/include/variables.h
index d892d99244..3d8e7e7347 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -154,10 +154,6 @@ extern s32 D_8009A5D8;
 extern u8 D_800779B0;
 extern u8 D_800A0963;
 
-extern s32 mapScriptLibStart;
-extern s32 mapScriptLibEnd;
-extern s32 mapScriptLibVram;
-
 // Scripts
 extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;
diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c
index 2cf1492877..fffc1b3c18 100644
--- a/src/code_341d0_len_20d0.c
+++ b/src/code_341d0_len_20d0.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
 
@@ -42,8 +43,8 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects);
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect);
 
-void load_map_script_lib(void) {
-    dma_copy(&mapScriptLibStart, &mapScriptLibEnd, &mapScriptLibVram);
+void load_world_script_api(void) {
+    dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM);
 }
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
diff --git a/src/code_7e0e80.c b/src/world/script_api/7E0E80.c
similarity index 100%
rename from src/code_7e0e80.c
rename to src/world/script_api/7E0E80.c
diff --git a/src/code_7E2AA0.c b/src/world/script_api/7E2AA0.c
similarity index 100%
rename from src/code_7E2AA0.c
rename to src/world/script_api/7E2AA0.c
diff --git a/src/code_7E3700.c b/src/world/script_api/7E3700.c
similarity index 100%
rename from src/code_7E3700.c
rename to src/world/script_api/7E3700.c
diff --git a/tools/n64splat b/tools/n64splat
index 037d80e00c..fdb44704e6 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 037d80e00cb3aeae37bdad77bfac871036982456
+Subproject commit fdb44704e6da70d5d2bab3bfc2e307745600fe0d
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 68395935ff..4650d48de1 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -820,11 +820,13 @@ segments:
     files:
     - [0x415D90, "c"]
   - [0x4200C0, "bin"] # todo split this further
-  - type: code
+  - name: world/script_api/
+    ld_name: world_script_api
+    type: code
     start: 0x7E0E80
     vram: 0x80280000
     files:
-    - [0x7e0e80, "c", "code_7e0e80"]
+    - [0x7e0e80, "c"]
     - [0x7E2AA0, "c"]
     - [0x7E3700, "c"]
     - [0x7e4d00, "bin"]
diff --git a/undefined_syms.txt b/undefined_syms.txt
index cf1496998c..b5fe5e04f0 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -68,10 +68,6 @@ gBattleState = 0x800DC068;
 gBattleStatus = 0x800DC070;
 gPauseMenuStrings = 0x8026F778;
 
-mapScriptLibStart = 0x7E0E80;
-mapScriptLibEnd = 0x7E73A0;
-mapScriptLibVram = 0x80280000;
-
 D_000759B0 = 0x000759B0;
 D_000759B0_end = 0x000A5DD0;
 D_000A5DD0 = 0x000A5DD0;

From 3d9127a340d00ea0feac87a39d3d752203209a94 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 17:43:12 +0000
Subject: [PATCH 037/101] match world table .data

---
 include/map.h                      |  14 +-
 src/code_341d0_len_20d0.c          | 590 +++++++++++++++++++++++++++++
 src/code_e0b30_len_b80.c           |   4 +-
 src/world/area_kmr/kmr_12/kmr_12.h |   2 +
 tools/n64splat                     |   2 +-
 tools/splat.yaml                   |   5 +-
 tools/symbol_addrs.txt             |   1 -
 undefined_syms.txt                 |   1 -
 8 files changed, 607 insertions(+), 12 deletions(-)

diff --git a/include/map.h b/include/map.h
index f40c65c2b9..7336be6331 100644
--- a/include/map.h
+++ b/include/map.h
@@ -33,6 +33,8 @@ typedef struct MapConfig {
     } tattle;
 } MapConfig; // size = 0x40
 
+typedef s32 MapInitialiser(void);
+
 #define MAP_ID_MAX_LEN 7 ///< "xxx_yyy" excluding null terminator.
 typedef struct Map {
     /* 0x00 */ char* id; ///< @see MAP_ID_MAX_LEN
@@ -41,10 +43,10 @@ typedef struct Map {
     /* 0x0C */ void* dmaEnd;
     /* 0x10 */ void* dmaDest;
     /* 0x14 */ char* bgName;
-    /* 0x18 */ s32 (*init)(void); ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
-    /* 0x1C */ s16 flags1;
-    /* 0x1E */ s8 flags2;
-    /* 0x1F */ s8 flags3;
+    /* 0x18 */ MapInitialiser* init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
+    /* 0x1C */ s16 unk_1C; // Unused?
+    /* 0x1E */ s8 songVariation; ///< 0 or 1. @see get_song_variation_override_for_cur_map
+    /* 0x1F */ s8 flags;
 } Map; // size = 0x20
 
 typedef struct Area {
@@ -246,9 +248,9 @@ typedef struct {
 Enemy* get_enemy(NpcId npcId);
 
 /// Zero-terminated.
-extern Area gAreas[];
+Area gAreas[29];
 
-/// Lists the songs that are forced to use the variation determined by `map.flags2 & 1`.
+/// Lists the songs that are forced to use the variation determined by `map.songVariation & 1`.
 /// @see get_song_variation_override_for_cur_map
 extern SongID gSongsUsingVariationFlag[6];
 
diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c
index fffc1b3c18..d012373330 100644
--- a/src/code_341d0_len_20d0.c
+++ b/src/code_341d0_len_20d0.c
@@ -1,5 +1,9 @@
 #include "common.h"
 #include "ld_addrs.h"
+#include "map.h"
+
+#include "world/area_kmr/kmr_12/kmr_12.h"
+#undef MAP_NAME
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
 
@@ -47,6 +51,9 @@ void load_world_script_api(void) {
     dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM);
 }
 
+//const char* shape_sprintf = "%s_shape";
+//const char* hit_sprintf = "%s_hit";
+//const char* tex_sprintf = "%s_tex";
 INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config);
@@ -58,3 +65,586 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name);
 INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize);
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);
+
+#define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), &area##_maps, "area_" #area, jp_name }
+
+#define MAP(map) \
+    .id = #map, \
+    .config = &map##_config, \
+    .dmaStart = (void*)LD_code_##map##_ROM_START, \
+    .dmaEnd = (void*)LD_code_##map##_ROM_END, \
+    .dmaDest = (void*)LD_code_##map##_VRAM \
+
+// Should be removed once the data section containing .init and .config of all maps have been disassembled
+#define MAP_UNSPLIT(map, configVRAM) \
+    .id = #map, \
+    .config = (MapConfig*)(configVRAM), \
+    .dmaStart = (void*)LD_code_##map##_ROM_START, \
+    .dmaEnd = (void*)LD_code_##map##_ROM_END, \
+    .dmaDest = (void*)LD_code_##map##_VRAM \
+
+/// Toad Town
+static Map mac_maps[] = {
+    { MAP_UNSPLIT(machi,  0x802407A0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_00, 0x80243BE0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_03, 0x802428B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" },
+};
+
+/// Toad Town Tunnels
+static Map tik_maps[] = {
+    { MAP_UNSPLIT(tik_01, 0x80240AE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_02, 0x802409B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_03, 0x80240B00), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_04, 0x80240CB0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_05, 0x80240A90), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_06, 0x802409A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_07, 0x80242920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_08, 0x80240B10), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_09, 0x802412D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_10, 0x802413D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_12, 0x80242260), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_14, 0x80240980), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_15, 0x80240B30), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_17, 0x80241380), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_18, 0x802406D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_19, 0x80241340), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_20, 0x80241170), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_21, 0x80240990), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_22, 0x802409D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_23, 0x80241160), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_24, 0x80240ED0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(tik_25, 0x802407D0), .songVariation = 1, .flags = 2 },
+};
+
+/// Inside the Whale
+static Map kgr_maps[] = {
+    { MAP_UNSPLIT(kgr_01, 0x80240540), .flags = 1 },
+    { MAP_UNSPLIT(kgr_02, 0x80240790), .flags = 1 },
+};
+
+/// Goomba Region
+static Map kmr_maps[] = {
+    { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .flags = 1 },
+    { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_03, 0x80240680), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_04, 0x80240520), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_05, 0x802417A0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_06, 0x80241DC0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_07, 0x80240B70), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_09, 0x80241550), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_10, 0x80240640), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_11, 0x80241180), .bgName = "kmr_bg" },
+    { MAP(kmr_12), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_20, 0x80242C00), .bgName = "kmr_bg" }, // Mario's House
+    { MAP_UNSPLIT(kmr_21, 0x802402F0), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kmr_22, 0x80240DA0), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kmr_23, 0x80241150), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kmr_24, 0x80240120), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kmr_30, 0x802404F0) },
+};
+
+/// Mt. Rugged
+static Map iwa_maps[] = {
+    { MAP_UNSPLIT(iwa_00, 0x80240310), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_01, 0x80243320), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_02, 0x80241140), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_03, 0x80241360), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_04, 0x80241100), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_10, 0x80241810), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_11, 0x80240330), .bgName = "iwa_bg" },
+};
+
+/// Dry Dry Outpost
+static Map dro_maps[] = {
+    { MAP_UNSPLIT(dro_01, 0x80243B70), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(dro_02, 0x80243AB0), .bgName = "sbk_bg" },
+};
+
+/// Dry Dry Desert
+static Map sbk_maps[] = {
+    { MAP_UNSPLIT(sbk_00, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_01, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_02, 0x80240C80), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_03, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_04, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_05, 0x802400B0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_06, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_10, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_11, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_12, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_13, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_14, 0x80240090), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_15, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_16, 0x802402C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_20, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_21, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_22, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_23, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_24, 0x802403D0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_25, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_26, 0x802403E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_30, 0x80241870), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_31, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_32, 0x802401B0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_33, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_34, 0x80240A20), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_35, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_36, 0x802402C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_40, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_41, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_42, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_43, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_44, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_45, 0x80240090), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_46, 0x802403E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_50, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_51, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_52, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_53, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_54, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_55, 0x802402E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_56, 0x80241040), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_60, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_61, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_62, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_63, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_64, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_65, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_66, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_99, 0x80240020), .bgName = "sbk_bg" },
+};
+
+/// Dry Dry Ruins
+static Map isk_maps[] = {
+    { MAP_UNSPLIT(isk_01, 0x80240020), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_02, 0x80240140), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_03, 0x80240030), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_04, 0x80240AD0), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_05, 0x80241ED0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_06, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_07, 0x80240130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_08, 0x80240930), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_09, 0x80240340), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_10, 0x80240DE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_11, 0x802401A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_12, 0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_13, 0x80242080), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_14, 0x80241D70), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_16, 0x80240B20), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_18, 0x80240910), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_19, 0x80240020), .songVariation = 1, .flags = 2 },
+};
+
+/// Koopa Bros. Fortress
+static Map trd_maps[] = {
+    { MAP_UNSPLIT(trd_00, 0x80240690), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(trd_01, 0x80241700), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_02, 0x80241AA0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_03, 0x80240A40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_04, 0x80243900), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_05, 0x802407B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_06, 0x80240D60), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_07, 0x80242910), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_08, 0x80240A30), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_09, 0x80240200), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(trd_10, 0x80240870), .songVariation = 1, .flags = 3 },
+};
+
+/// Koopa Region
+static Map nok_maps[] = {
+    { MAP_UNSPLIT(nok_01, 0x80242B90), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_02, 0x802445F0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_03, 0x80240E40), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_04, 0x80240F40), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_11, 0x80241F70), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_12, 0x80242100), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_13, 0x802414C0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_14, 0x80242440), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_15, 0x802427D0), .bgName = "nok_bg" },
+};
+
+/// Star Region
+static Map hos_maps[] = {
+    { MAP_UNSPLIT(hos_00, 0x80240D50), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(hos_01, 0x80240E40), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_02, 0x80242B90), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_03, 0x802435F0), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_04, 0x80240EE0), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(hos_06, 0x80242570), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(hos_20, 0x80240390), .bgName = "hos_bg" },
+};
+
+/// Bowser's Castle
+static Map kpa_maps[] = {
+    { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_118, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_119, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_121, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_130, 0x80240760), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_133, 0x802404B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_134, 0x80240740), .songVariation = 1, .flags = 3 },
+};
+
+/// Peach's Castle Grounds
+static Map osr_maps[] = {
+    { MAP_UNSPLIT(osr_00, 0x802407E0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(osr_01, 0x80240B00), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(osr_02, 0x80240170), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(osr_03, 0x802403F0), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(osr_04, 0x802400D0), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+};
+
+/// Peach's Castle
+/// @bug There are two entries for kkj_26; the latter is unreachable.
+static Map kkj_maps[] = {
+    { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .songVariation = 1, .flags = 3, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .flags = 2 },
+    { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .flags = 3, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .flags = 3, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_15, 0x80240640) },
+    { MAP_UNSPLIT(kkj_16, 0x80241090), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_17, 0x802405B0) },
+    { MAP_UNSPLIT(kkj_18, 0x80240830), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kkj_19, 0x80240D20) },
+    { MAP_UNSPLIT(kkj_20, 0x80240600) },
+    { MAP_UNSPLIT(kkj_21, 0x80240010), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kkj_26, 0x80240070), .flags = 0x2 },
+    { MAP_UNSPLIT(kkj_27, 0x802404C0), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_28, 0x80240010), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_29, 0x80240080), .flags = 0x1 },
+};
+
+/// Jade Jungle
+static Map jan_maps[] = {
+    { MAP_UNSPLIT(jan_00, 0x80241BD0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_01, 0x802413F0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_02, 0x80242940), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_03, 0x802432D0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_04, 0x80241140), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_05, 0x80242710), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_06, 0x80242620), .bgName = "jan_bg" },
+    { MAP_UNSPLIT(jan_07, 0x80241230), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_08, 0x80242460), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_09, 0x80241960), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_10, 0x80241750), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_17, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_18, 0x80240020), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_19, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_23, 0x80240010), .bgName = "yos_bg" },
+};
+
+/// Forever Forest
+static Map mim_maps[] = {
+    { MAP_UNSPLIT(mim_01, 0x80241EF0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_02, 0x80241220), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_03, 0x80240570), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_04, 0x80241170), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_05, 0x80241A60), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_06, 0x80242D70), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_07, 0x802410D0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_08, 0x80242F80), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_09, 0x80240F00), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_10, 0x802401B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mim_11, 0x80240C20), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_12, 0x80240600), .bgName = "arn_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Boo's Mansion
+static Map obk_maps[] = {
+    { MAP_UNSPLIT(obk_01, 0x802411B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(obk_02, 0x802402E0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_03, 0x80241020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_04, 0x80240E90), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_05, 0x802409F0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_06, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_07, 0x80241BA0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_08, 0x802417B0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_09, 0x80240460), .songVariation = 1, .flags = 2 },
+};
+
+/// Gusty Gulch
+static Map arn_maps[] = {
+    { MAP_UNSPLIT(arn_02, 0x80241000), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_03, 0x80241740), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_04, 0x80243390), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_05, 0x80241320), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_07, 0x80241ED0), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_08, 0x802402C0), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_09, 0x80240060), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_10, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_11, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_12, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_13, 0x80240020), .songVariation = 1, .flags = 1 },
+};
+
+/// Tubba Blubba's Castle
+static Map dgb_maps[] = {
+    { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(dgb_01, 0x80243460), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_02, 0x80241470), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_03, 0x80242830), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_04, 0x80243130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_05, 0x802414A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_06, 0x802402E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_07, 0x80241450), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_08, 0x80243CB0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_09, 0x80243840), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_10, 0x80240210), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_11, 0x80240090), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_12, 0x802402D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_13, 0x80240010), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_14, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_15, 0x802418A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_16, 0x80241440), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_17, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_18, 0x80241280), .songVariation = 1, .flags = 2 },
+};
+
+/// Mt. Lavalava
+static Map kzn_maps[] = {
+    { MAP_UNSPLIT(kzn_01, 0x80240330), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_02, 0x80242850), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_03, 0x802430E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_04, 0x80241770), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_05, 0x80240330), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_06, 0x80240AA0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_07, 0x80242320), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_08, 0x80244130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_09, 0x80243A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_10, 0x802406F0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_11, 0x80242680), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_17, 0x802430C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_18, 0x802403F0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_19, 0x80241D70), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_20, 0x80240AE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_22, 0x802403A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_23, 0x80240630), .bgName = "yos_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Flower Fields
+static Map flo_maps[] = {
+    { MAP_UNSPLIT(flo_00, 0x80241490), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_03, 0x80240660), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_07, 0x80240760), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_08, 0x80241F00), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_09, 0x80241840), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_10, 0x802414A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_11, 0x802403A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_12, 0x80240710), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_13, 0x80243690), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_14, 0x802423B0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_15, 0x80240020), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_16, 0x80242990), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_17, 0x80243240), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_18, 0x802407F0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_19, 0x80240980), .bgName = "sra_bg" },
+    { MAP_UNSPLIT(flo_21, 0x80240D00), .bgName = "sra_bg" },
+    { MAP_UNSPLIT(flo_22, 0x802402A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_23, 0x80240CF0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_24, 0x802405C0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_25, 0x802422F0), .bgName = "fla_bg" },
+};
+
+/// Shiver Region
+static Map sam_maps[] = {
+    { MAP_UNSPLIT(sam_01, 0x80241F70), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_02, 0x80241C00), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_03, 0x80240940), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_04, 0x80240740), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_05, 0x80241D60), .bgName = "sam_bg" },
+    { MAP_UNSPLIT(sam_06, 0x80242630), .bgName = "sam_bg" },
+    { MAP_UNSPLIT(sam_07, 0x80242020), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_08, 0x802417D0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_09, 0x80240420), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_10, 0x80240CE0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_11, 0x802421A0), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_12, 0x802403B0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+};
+
+/// Crystal Palace
+static Map pra_maps[] = {
+    { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+};
+
+/// Shy Guy's Toy Box
+static Map omo_maps[] = {
+    { MAP_UNSPLIT(omo_01, 0x80240C40), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_02, 0x80242BD0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_03, 0x80240900), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_04, 0x80241F30), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_05, 0x80242440), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_07, 0x80243310), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_08, 0x80240E10), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_09, 0x80243700), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_10, 0x802408B0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_11, 0x802414F0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_12, 0x802404D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_13, 0x80241510), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_14, 0x802405E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_15, 0x80240810), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_16, 0x80240620), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_17, 0x80243770), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Debug
+static Map tst_maps[] = {
+    { MAP_UNSPLIT(tst_01, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_02, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_03, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_04, 0x80240740), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_10, 0x80240040), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_11, 0x80240780), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_12, 0x80240010), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_13, 0x802403D0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_20, 0x80240010), .bgName = "nok_bg" },
+};
+
+/// Credits
+static Map end_maps[] = {
+    { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInitialiser*)0x80240000 },
+};
+
+/// Toad Town Playroom
+static Map mgm_maps[] = {
+    { MAP_UNSPLIT(mgm_00, 0x80241810) },
+    { MAP_UNSPLIT(mgm_01, 0x802417C0) },
+    { MAP_UNSPLIT(mgm_02, 0x80242410) },
+    { MAP_UNSPLIT(mgm_03, 0x80240010) },
+};
+
+/// Game Over
+static Map gv_maps[] = {
+    { MAP_UNSPLIT(gv_01, 0x802407D0) },
+};
+
+Area gAreas[] = {
+    AREA(kmr, "クリむら"),  // kuri mura [kuribou village, Goomba Village]
+    AREA(mac, "まち"),  // machi [town, Toad Town]
+    AREA(tik, "まちのちか"),  // machi no chika [under the town, Toad Town Tunnels]
+    AREA(kgr, "くじらのなか"),  // kujira no naka [inside the whale]
+    AREA(kkj, "きのこ城"),  // kinoko shiro [mushroom castle, Princess Peach's Castle]
+    AREA(hos, "星ふる丘"),  // hoshi furu oka [star fall hill, Shooting Star Summit]
+    AREA(nok, "ノコノコむら"),  // nokonoko mura [nokonoko village, Koopa Village]
+    AREA(trd, "とりで"),  // toride [fortress, Koopa Bros. Fortress]
+    AREA(iwa, "岩山"),  // iwayama [rock mountain, Mt. Rugged]
+    AREA(dro, "カラカラタウン"),  // karakara taun [dried up town, Dry Dry Outpost]
+    AREA(sbk, "カラカラ砂漠"),  // karakara sabaku [dried up desert, Dry Dry Desert]
+    AREA(isk, "カラカラいせき"),  // karakara iseki [dried up ruins, Dry Dry Ruins]
+    AREA(mim, "迷いの森"),  // mayoi no mori [lost forest, Forever Forest]
+    AREA(obk, "テレサハウス"),  // teresa hausu [teresa house, Boo's Mansion]
+    AREA(arn, "あれの"),  // areno [wasteland, Gusty Gulch]
+    AREA(dgb, "ドガボンの城"),  // dogabon no shiro [dogabon's castle, Tubba Blubba's Castle]
+    AREA(omo, "ヘイホーのおもちゃばこ"),  // heiho no omochabako [heiho's toy box, Shy Guy's Toy Box]
+    AREA(jan, "ジャングル"),  // janguru [jungle, Jade Jungle]
+    AREA(kzn, "火山"),  // kazan [volcano, Mt. Lavalava]
+    AREA(flo, "フラワーランド"),  // furawaa rando [flower land, Flower Fields]
+    AREA(sam, "さむいさむい村"),  // samui samui mura [cold cold village, Shiver City]
+    AREA(pra, "パラレルきゅうでん"),  // parareru kyuuden [parallel palace, Crystal Palace]
+    AREA(kpa, "クッパ城"),  // kuppa shiro [koopa's castle, Bowser's Castle]
+    AREA(osr, "きのこ城そと"),  // kinoko shiro soto [outside mushroom castle, Outside Peach's Castle]
+    AREA(end, "エンディング"),  // endingu [Ending]
+    AREA(mgm, "ミニゲーム"),  // minige-mu [Minigames]
+    AREA(gv, "ゲームオーバー"),  // ge-mu o-ba- [Game Over]
+    AREA(tst, "テストマップ"),  // tesuto mappu [Test map]
+    0, 0, 0, 0,
+};
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index bd04bf4db9..a1b3cf4fab 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -4,7 +4,7 @@
 void func_8014AC84(s16 volume);
 
 /// If the given song ID is present in gSongsUsingVariationFlag, returns the current
-/// map's `flags2 & 1` value. Otherwise, returns -1.
+/// map's `songVariation & 1` value. Otherwise, returns -1.
 ///
 /// @see gSongsUsingVariationFlag
 /// @returns -1: no override; 0: override to variation 0; 1 override to variation 1
@@ -19,7 +19,7 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
             GameStatus* gameStatus = *gameStatusPtr;
             Map* map = &areas[gameStatus->areaID].maps[gameStatus->mapID];
 
-            return map->flags2 & 1;
+            return map->songVariation & 1;
         }
     }
 
diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h
index 406b7f4299..573ea67911 100644
--- a/src/world/area_kmr/kmr_12/kmr_12.h
+++ b/src/world/area_kmr/kmr_12/kmr_12.h
@@ -8,6 +8,8 @@
 #define GetGoomba M(GetGoomba)
 ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall);
 
+MapConfig M(config);
+
 Script M(Main);
 Script M(PlayMusic);
 Script M(MakeEntities);
diff --git a/tools/n64splat b/tools/n64splat
index fdb44704e6..03bc049656 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit fdb44704e6da70d5d2bab3bfc2e307745600fe0d
+Subproject commit 03bc04965678a0484257fdc2a566e905fb4ee653
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 4650d48de1..e813489ef3 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -197,7 +197,10 @@ segments:
     - [0x4a360, "c", "os/code_4a360_len_930"]
     - [0x4ac90, "c", "os/code_4ac90_len_3910"]
     - [0x4E5A0, "bin"]
-  - [0x6E8F0, "bin", "world/area_table"]
+    - [0x52D50, "bin"]
+    - [0x6B450, ".data", "code_341d0_len_20d0"]
+    - [0x6EAC0, "bin"] # has scripts
+    - [0x73DA0, ".rodata", "code_341d0_len_20d0"]
   - type: code
     start: 0x759B0
     vram: 0x800DC500
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index a82b45a98d..9c89ca7b9c 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1904,5 +1904,4 @@ gMusicUnkVolume;0x80159AE0
 gMusicUnkVolume2;0x80159AE4
 gMusicTargetVolume;0x80159AE2
 gMusicCurVolume;0x80159AE6
-gAreas;0x800934F0
 gSongArray;0x8014F720
diff --git a/undefined_syms.txt b/undefined_syms.txt
index b5fe5e04f0..4aa926a174 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -264,5 +264,4 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 
-gAreas = 0x800934F0;
 gSongsUsingVariationFlag = 0x8014F720;

From 97121d2c50703e04242d2f321f4019e613b75340 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 13:43:45 -0400
Subject: [PATCH 038/101] UnkCameraFunc

---
 .../dro_01/95B7E0/func_802420F0_95D2F0.s      | 107 ------------------
 .../dro_02/9694C0/func_80240F80_96A140.s      | 107 ------------------
 .../hos_03/A1BDB0/func_80243124_A1E224.s      | 107 ------------------
 .../jan_02/B2C8A0/func_80242294_B2E704.s      | 107 ------------------
 .../jan_03/B34BD0/func_8024281C_B373EC.s      | 107 ------------------
 .../kmr_02/8B0070/func_80241010_8B1080.s      | 107 ------------------
 .../mac_00/7EB340/func_802412B0_7EBFC0.s      | 107 ------------------
 .../mac_01/8017D0/func_80242B90_803410.s      | 107 ------------------
 .../mac_02/823BF0/func_80242440_825700.s      | 107 ------------------
 .../mac_03/831B20/func_80241130_832930.s      | 107 ------------------
 .../mac_04/843030/func_802410E0_843CB0.s      | 107 ------------------
 .../mac_05/852170/func_80241FA0_854110.s      | 107 ------------------
 .../nok_01/9C53E0/func_802419E8_9C6DC8.s      | 107 ------------------
 .../nok_02/9D7AA0/func_80242590_9D95B0.s      | 107 ------------------
 .../sam_01/CF7E80/func_80241380_CF8EF0.s      | 107 ------------------
 .../sam_02/D05F60/func_802417AC_D06EDC.s      | 107 ------------------
 .../sam_11/D3ADA0/func_80241450_D3BA20.s      | 107 ------------------
 src/world/area_dro/dro_01/95B7E0.c            |   2 +-
 src/world/area_dro/dro_02/9694C0.c            |   2 +-
 src/world/area_hos/hos_03/A1BDB0.c            |   2 +-
 src/world/area_jan/jan_02/B2C8A0.c            |   2 +-
 src/world/area_jan/jan_03/B34BD0.c            |   2 +-
 src/world/area_kmr/kmr_02/8B0070.c            |   2 +-
 src/world/area_mac/mac_00/7EB340.c            |   2 +-
 src/world/area_mac/mac_01/8017D0.c            |   2 +-
 src/world/area_mac/mac_02/823BF0.c            |   2 +-
 src/world/area_mac/mac_03/831B20.c            |   2 +-
 src/world/area_mac/mac_04/843030.c            |   2 +-
 src/world/area_mac/mac_05/852170.c            |   2 +-
 src/world/area_nok/nok_01/9C53E0.c            |   2 +-
 src/world/area_nok/nok_02/9D7AA0.c            |   2 +-
 src/world/area_sam/sam_01/CF7E80.c            |   2 +-
 src/world/area_sam/sam_02/D05F60.c            |   2 +-
 src/world/area_sam/sam_11/D3ADA0.c            |   2 +-
 src/world/common/UnkCameraFunc.inc.c          |  21 ++++
 35 files changed, 38 insertions(+), 1836 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s
 create mode 100644 src/world/common/UnkCameraFunc.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s
deleted file mode 100644
index 5537574bea..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802420F0_95D2F0
-/* 95D2F0 802420F0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 95D2F4 802420F4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 95D2F8 802420F8 0080902D */  daddu     $s2, $a0, $zero
-/* 95D2FC 802420FC AFBF0030 */  sw        $ra, 0x30($sp)
-/* 95D300 80242100 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 95D304 80242104 AFB60028 */  sw        $s6, 0x28($sp)
-/* 95D308 80242108 AFB50024 */  sw        $s5, 0x24($sp)
-/* 95D30C 8024210C AFB40020 */  sw        $s4, 0x20($sp)
-/* 95D310 80242110 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 95D314 80242114 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D318 80242118 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D31C 8024211C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 95D320 80242120 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 95D324 80242124 8E50000C */  lw        $s0, 0xc($s2)
-/* 95D328 80242128 8E050000 */  lw        $a1, ($s0)
-/* 95D32C 8024212C 0C0B1EAF */  jal       get_variable
-/* 95D330 80242130 26100004 */   addiu    $s0, $s0, 4
-/* 95D334 80242134 8E050000 */  lw        $a1, ($s0)
-/* 95D338 80242138 26100004 */  addiu     $s0, $s0, 4
-/* 95D33C 8024213C 0240202D */  daddu     $a0, $s2, $zero
-/* 95D340 80242140 0C0B1EAF */  jal       get_variable
-/* 95D344 80242144 0040B82D */   daddu    $s7, $v0, $zero
-/* 95D348 80242148 8E050000 */  lw        $a1, ($s0)
-/* 95D34C 8024214C 26100004 */  addiu     $s0, $s0, 4
-/* 95D350 80242150 0240202D */  daddu     $a0, $s2, $zero
-/* 95D354 80242154 0C0B1EAF */  jal       get_variable
-/* 95D358 80242158 0040B02D */   daddu    $s6, $v0, $zero
-/* 95D35C 8024215C 0240202D */  daddu     $a0, $s2, $zero
-/* 95D360 80242160 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95D364 80242164 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 95D368 80242168 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 95D36C 8024216C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 95D370 80242170 8E140000 */  lw        $s4, ($s0)
-/* 95D374 80242174 00061880 */  sll       $v1, $a2, 2
-/* 95D378 80242178 00661821 */  addu      $v1, $v1, $a2
-/* 95D37C 8024217C 00031880 */  sll       $v1, $v1, 2
-/* 95D380 80242180 00661823 */  subu      $v1, $v1, $a2
-/* 95D384 80242184 000330C0 */  sll       $a2, $v1, 3
-/* 95D388 80242188 00661821 */  addu      $v1, $v1, $a2
-/* 95D38C 8024218C 000318C0 */  sll       $v1, $v1, 3
-/* 95D390 80242190 3C01800B */  lui       $at, 0x800b
-/* 95D394 80242194 00230821 */  addu      $at, $at, $v1
-/* 95D398 80242198 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 95D39C 8024219C 8E150004 */  lw        $s5, 4($s0)
-/* 95D3A0 802421A0 4600010D */  trunc.w.s $f4, $f0
-/* 95D3A4 802421A4 44112000 */  mfc1      $s1, $f4
-/* 95D3A8 802421A8 0C0B1EAF */  jal       get_variable
-/* 95D3AC 802421AC 0040982D */   daddu    $s3, $v0, $zero
-/* 95D3B0 802421B0 4491B000 */  mtc1      $s1, $f22
-/* 95D3B4 802421B4 00000000 */  nop       
-/* 95D3B8 802421B8 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 95D3BC 802421BC 4600B306 */  mov.s     $f12, $f22
-/* 95D3C0 802421C0 0C00A8D4 */  jal       cos_deg
-/* 95D3C4 802421C4 0040802D */   daddu    $s0, $v0, $zero
-/* 95D3C8 802421C8 4493A000 */  mtc1      $s3, $f20
-/* 95D3CC 802421CC 00000000 */  nop       
-/* 95D3D0 802421D0 4680A520 */  cvt.s.w   $f20, $f20
-/* 95D3D4 802421D4 4600A002 */  mul.s     $f0, $f20, $f0
-/* 95D3D8 802421D8 00000000 */  nop       
-/* 95D3DC 802421DC 0240202D */  daddu     $a0, $s2, $zero
-/* 95D3E0 802421E0 44901000 */  mtc1      $s0, $f2
-/* 95D3E4 802421E4 00000000 */  nop       
-/* 95D3E8 802421E8 468010A0 */  cvt.s.w   $f2, $f2
-/* 95D3EC 802421EC 46001081 */  sub.s     $f2, $f2, $f0
-/* 95D3F0 802421F0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95D3F4 802421F4 4600110D */  trunc.w.s $f4, $f2
-/* 95D3F8 802421F8 44102000 */  mfc1      $s0, $f4
-/* 95D3FC 802421FC 0C0B1EAF */  jal       get_variable
-/* 95D400 80242200 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 95D404 80242204 4600B306 */  mov.s     $f12, $f22
-/* 95D408 80242208 0C00A8BB */  jal       sin_deg
-/* 95D40C 8024220C 0040882D */   daddu    $s1, $v0, $zero
-/* 95D410 80242210 4600A502 */  mul.s     $f20, $f20, $f0
-/* 95D414 80242214 00000000 */  nop       
-/* 95D418 80242218 0240202D */  daddu     $a0, $s2, $zero
-/* 95D41C 8024221C 44910000 */  mtc1      $s1, $f0
-/* 95D420 80242220 00000000 */  nop       
-/* 95D424 80242224 46800020 */  cvt.s.w   $f0, $f0
-/* 95D428 80242228 46140001 */  sub.s     $f0, $f0, $f20
-/* 95D42C 8024222C 0280282D */  daddu     $a1, $s4, $zero
-/* 95D430 80242230 02173023 */  subu      $a2, $s0, $s7
-/* 95D434 80242234 4600010D */  trunc.w.s $f4, $f0
-/* 95D438 80242238 44102000 */  mfc1      $s0, $f4
-/* 95D43C 8024223C 0C0B2026 */  jal       set_variable
-/* 95D440 80242240 02168023 */   subu     $s0, $s0, $s6
-/* 95D444 80242244 0240202D */  daddu     $a0, $s2, $zero
-/* 95D448 80242248 02A0282D */  daddu     $a1, $s5, $zero
-/* 95D44C 8024224C 0C0B2026 */  jal       set_variable
-/* 95D450 80242250 0200302D */   daddu    $a2, $s0, $zero
-/* 95D454 80242254 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 95D458 80242258 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 95D45C 8024225C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 95D460 80242260 8FB50024 */  lw        $s5, 0x24($sp)
-/* 95D464 80242264 8FB40020 */  lw        $s4, 0x20($sp)
-/* 95D468 80242268 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 95D46C 8024226C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95D470 80242270 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D474 80242274 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D478 80242278 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 95D47C 8024227C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 95D480 80242280 24020002 */  addiu     $v0, $zero, 2
-/* 95D484 80242284 03E00008 */  jr        $ra
-/* 95D488 80242288 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s
deleted file mode 100644
index ad96c5c26f..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F80_96A140
-/* 96A140 80240F80 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 96A144 80240F84 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A148 80240F88 0080902D */  daddu     $s2, $a0, $zero
-/* 96A14C 80240F8C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 96A150 80240F90 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 96A154 80240F94 AFB60028 */  sw        $s6, 0x28($sp)
-/* 96A158 80240F98 AFB50024 */  sw        $s5, 0x24($sp)
-/* 96A15C 80240F9C AFB40020 */  sw        $s4, 0x20($sp)
-/* 96A160 80240FA0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 96A164 80240FA4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A168 80240FA8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A16C 80240FAC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 96A170 80240FB0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 96A174 80240FB4 8E50000C */  lw        $s0, 0xc($s2)
-/* 96A178 80240FB8 8E050000 */  lw        $a1, ($s0)
-/* 96A17C 80240FBC 0C0B1EAF */  jal       get_variable
-/* 96A180 80240FC0 26100004 */   addiu    $s0, $s0, 4
-/* 96A184 80240FC4 8E050000 */  lw        $a1, ($s0)
-/* 96A188 80240FC8 26100004 */  addiu     $s0, $s0, 4
-/* 96A18C 80240FCC 0240202D */  daddu     $a0, $s2, $zero
-/* 96A190 80240FD0 0C0B1EAF */  jal       get_variable
-/* 96A194 80240FD4 0040B82D */   daddu    $s7, $v0, $zero
-/* 96A198 80240FD8 8E050000 */  lw        $a1, ($s0)
-/* 96A19C 80240FDC 26100004 */  addiu     $s0, $s0, 4
-/* 96A1A0 80240FE0 0240202D */  daddu     $a0, $s2, $zero
-/* 96A1A4 80240FE4 0C0B1EAF */  jal       get_variable
-/* 96A1A8 80240FE8 0040B02D */   daddu    $s6, $v0, $zero
-/* 96A1AC 80240FEC 0240202D */  daddu     $a0, $s2, $zero
-/* 96A1B0 80240FF0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A1B4 80240FF4 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 96A1B8 80240FF8 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 96A1BC 80240FFC 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 96A1C0 80241000 8E140000 */  lw        $s4, ($s0)
-/* 96A1C4 80241004 00061880 */  sll       $v1, $a2, 2
-/* 96A1C8 80241008 00661821 */  addu      $v1, $v1, $a2
-/* 96A1CC 8024100C 00031880 */  sll       $v1, $v1, 2
-/* 96A1D0 80241010 00661823 */  subu      $v1, $v1, $a2
-/* 96A1D4 80241014 000330C0 */  sll       $a2, $v1, 3
-/* 96A1D8 80241018 00661821 */  addu      $v1, $v1, $a2
-/* 96A1DC 8024101C 000318C0 */  sll       $v1, $v1, 3
-/* 96A1E0 80241020 3C01800B */  lui       $at, 0x800b
-/* 96A1E4 80241024 00230821 */  addu      $at, $at, $v1
-/* 96A1E8 80241028 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 96A1EC 8024102C 8E150004 */  lw        $s5, 4($s0)
-/* 96A1F0 80241030 4600010D */  trunc.w.s $f4, $f0
-/* 96A1F4 80241034 44112000 */  mfc1      $s1, $f4
-/* 96A1F8 80241038 0C0B1EAF */  jal       get_variable
-/* 96A1FC 8024103C 0040982D */   daddu    $s3, $v0, $zero
-/* 96A200 80241040 4491B000 */  mtc1      $s1, $f22
-/* 96A204 80241044 00000000 */  nop       
-/* 96A208 80241048 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 96A20C 8024104C 4600B306 */  mov.s     $f12, $f22
-/* 96A210 80241050 0C00A8D4 */  jal       cos_deg
-/* 96A214 80241054 0040802D */   daddu    $s0, $v0, $zero
-/* 96A218 80241058 4493A000 */  mtc1      $s3, $f20
-/* 96A21C 8024105C 00000000 */  nop       
-/* 96A220 80241060 4680A520 */  cvt.s.w   $f20, $f20
-/* 96A224 80241064 4600A002 */  mul.s     $f0, $f20, $f0
-/* 96A228 80241068 00000000 */  nop       
-/* 96A22C 8024106C 0240202D */  daddu     $a0, $s2, $zero
-/* 96A230 80241070 44901000 */  mtc1      $s0, $f2
-/* 96A234 80241074 00000000 */  nop       
-/* 96A238 80241078 468010A0 */  cvt.s.w   $f2, $f2
-/* 96A23C 8024107C 46001081 */  sub.s     $f2, $f2, $f0
-/* 96A240 80241080 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A244 80241084 4600110D */  trunc.w.s $f4, $f2
-/* 96A248 80241088 44102000 */  mfc1      $s0, $f4
-/* 96A24C 8024108C 0C0B1EAF */  jal       get_variable
-/* 96A250 80241090 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 96A254 80241094 4600B306 */  mov.s     $f12, $f22
-/* 96A258 80241098 0C00A8BB */  jal       sin_deg
-/* 96A25C 8024109C 0040882D */   daddu    $s1, $v0, $zero
-/* 96A260 802410A0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 96A264 802410A4 00000000 */  nop       
-/* 96A268 802410A8 0240202D */  daddu     $a0, $s2, $zero
-/* 96A26C 802410AC 44910000 */  mtc1      $s1, $f0
-/* 96A270 802410B0 00000000 */  nop       
-/* 96A274 802410B4 46800020 */  cvt.s.w   $f0, $f0
-/* 96A278 802410B8 46140001 */  sub.s     $f0, $f0, $f20
-/* 96A27C 802410BC 0280282D */  daddu     $a1, $s4, $zero
-/* 96A280 802410C0 02173023 */  subu      $a2, $s0, $s7
-/* 96A284 802410C4 4600010D */  trunc.w.s $f4, $f0
-/* 96A288 802410C8 44102000 */  mfc1      $s0, $f4
-/* 96A28C 802410CC 0C0B2026 */  jal       set_variable
-/* 96A290 802410D0 02168023 */   subu     $s0, $s0, $s6
-/* 96A294 802410D4 0240202D */  daddu     $a0, $s2, $zero
-/* 96A298 802410D8 02A0282D */  daddu     $a1, $s5, $zero
-/* 96A29C 802410DC 0C0B2026 */  jal       set_variable
-/* 96A2A0 802410E0 0200302D */   daddu    $a2, $s0, $zero
-/* 96A2A4 802410E4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 96A2A8 802410E8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 96A2AC 802410EC 8FB60028 */  lw        $s6, 0x28($sp)
-/* 96A2B0 802410F0 8FB50024 */  lw        $s5, 0x24($sp)
-/* 96A2B4 802410F4 8FB40020 */  lw        $s4, 0x20($sp)
-/* 96A2B8 802410F8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 96A2BC 802410FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A2C0 80241100 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A2C4 80241104 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A2C8 80241108 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 96A2CC 8024110C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 96A2D0 80241110 24020002 */  addiu     $v0, $zero, 2
-/* 96A2D4 80241114 03E00008 */  jr        $ra
-/* 96A2D8 80241118 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s
deleted file mode 100644
index a559277c47..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243124_A1E224
-/* A1E224 80243124 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A1E228 80243128 AFB20018 */  sw        $s2, 0x18($sp)
-/* A1E22C 8024312C 0080902D */  daddu     $s2, $a0, $zero
-/* A1E230 80243130 AFBF0030 */  sw        $ra, 0x30($sp)
-/* A1E234 80243134 AFB7002C */  sw        $s7, 0x2c($sp)
-/* A1E238 80243138 AFB60028 */  sw        $s6, 0x28($sp)
-/* A1E23C 8024313C AFB50024 */  sw        $s5, 0x24($sp)
-/* A1E240 80243140 AFB40020 */  sw        $s4, 0x20($sp)
-/* A1E244 80243144 AFB3001C */  sw        $s3, 0x1c($sp)
-/* A1E248 80243148 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E24C 8024314C AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E250 80243150 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* A1E254 80243154 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A1E258 80243158 8E50000C */  lw        $s0, 0xc($s2)
-/* A1E25C 8024315C 8E050000 */  lw        $a1, ($s0)
-/* A1E260 80243160 0C0B1EAF */  jal       get_variable
-/* A1E264 80243164 26100004 */   addiu    $s0, $s0, 4
-/* A1E268 80243168 8E050000 */  lw        $a1, ($s0)
-/* A1E26C 8024316C 26100004 */  addiu     $s0, $s0, 4
-/* A1E270 80243170 0240202D */  daddu     $a0, $s2, $zero
-/* A1E274 80243174 0C0B1EAF */  jal       get_variable
-/* A1E278 80243178 0040B82D */   daddu    $s7, $v0, $zero
-/* A1E27C 8024317C 8E050000 */  lw        $a1, ($s0)
-/* A1E280 80243180 26100004 */  addiu     $s0, $s0, 4
-/* A1E284 80243184 0240202D */  daddu     $a0, $s2, $zero
-/* A1E288 80243188 0C0B1EAF */  jal       get_variable
-/* A1E28C 8024318C 0040B02D */   daddu    $s6, $v0, $zero
-/* A1E290 80243190 0240202D */  daddu     $a0, $s2, $zero
-/* A1E294 80243194 3C05F4AC */  lui       $a1, 0xf4ac
-/* A1E298 80243198 34A5D481 */  ori       $a1, $a1, 0xd481
-/* A1E29C 8024319C 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* A1E2A0 802431A0 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* A1E2A4 802431A4 8E140000 */  lw        $s4, ($s0)
-/* A1E2A8 802431A8 00061880 */  sll       $v1, $a2, 2
-/* A1E2AC 802431AC 00661821 */  addu      $v1, $v1, $a2
-/* A1E2B0 802431B0 00031880 */  sll       $v1, $v1, 2
-/* A1E2B4 802431B4 00661823 */  subu      $v1, $v1, $a2
-/* A1E2B8 802431B8 000330C0 */  sll       $a2, $v1, 3
-/* A1E2BC 802431BC 00661821 */  addu      $v1, $v1, $a2
-/* A1E2C0 802431C0 000318C0 */  sll       $v1, $v1, 3
-/* A1E2C4 802431C4 3C01800B */  lui       $at, 0x800b
-/* A1E2C8 802431C8 00230821 */  addu      $at, $at, $v1
-/* A1E2CC 802431CC C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* A1E2D0 802431D0 8E150004 */  lw        $s5, 4($s0)
-/* A1E2D4 802431D4 4600010D */  trunc.w.s $f4, $f0
-/* A1E2D8 802431D8 44112000 */  mfc1      $s1, $f4
-/* A1E2DC 802431DC 0C0B1EAF */  jal       get_variable
-/* A1E2E0 802431E0 0040982D */   daddu    $s3, $v0, $zero
-/* A1E2E4 802431E4 4491B000 */  mtc1      $s1, $f22
-/* A1E2E8 802431E8 00000000 */  nop       
-/* A1E2EC 802431EC 4680B5A0 */  cvt.s.w   $f22, $f22
-/* A1E2F0 802431F0 4600B306 */  mov.s     $f12, $f22
-/* A1E2F4 802431F4 0C00A8D4 */  jal       cos_deg
-/* A1E2F8 802431F8 0040802D */   daddu    $s0, $v0, $zero
-/* A1E2FC 802431FC 4493A000 */  mtc1      $s3, $f20
-/* A1E300 80243200 00000000 */  nop       
-/* A1E304 80243204 4680A520 */  cvt.s.w   $f20, $f20
-/* A1E308 80243208 4600A002 */  mul.s     $f0, $f20, $f0
-/* A1E30C 8024320C 00000000 */  nop       
-/* A1E310 80243210 0240202D */  daddu     $a0, $s2, $zero
-/* A1E314 80243214 44901000 */  mtc1      $s0, $f2
-/* A1E318 80243218 00000000 */  nop       
-/* A1E31C 8024321C 468010A0 */  cvt.s.w   $f2, $f2
-/* A1E320 80243220 46001081 */  sub.s     $f2, $f2, $f0
-/* A1E324 80243224 3C05F4AC */  lui       $a1, 0xf4ac
-/* A1E328 80243228 4600110D */  trunc.w.s $f4, $f2
-/* A1E32C 8024322C 44102000 */  mfc1      $s0, $f4
-/* A1E330 80243230 0C0B1EAF */  jal       get_variable
-/* A1E334 80243234 34A5D483 */   ori      $a1, $a1, 0xd483
-/* A1E338 80243238 4600B306 */  mov.s     $f12, $f22
-/* A1E33C 8024323C 0C00A8BB */  jal       sin_deg
-/* A1E340 80243240 0040882D */   daddu    $s1, $v0, $zero
-/* A1E344 80243244 4600A502 */  mul.s     $f20, $f20, $f0
-/* A1E348 80243248 00000000 */  nop       
-/* A1E34C 8024324C 0240202D */  daddu     $a0, $s2, $zero
-/* A1E350 80243250 44910000 */  mtc1      $s1, $f0
-/* A1E354 80243254 00000000 */  nop       
-/* A1E358 80243258 46800020 */  cvt.s.w   $f0, $f0
-/* A1E35C 8024325C 46140001 */  sub.s     $f0, $f0, $f20
-/* A1E360 80243260 0280282D */  daddu     $a1, $s4, $zero
-/* A1E364 80243264 02173023 */  subu      $a2, $s0, $s7
-/* A1E368 80243268 4600010D */  trunc.w.s $f4, $f0
-/* A1E36C 8024326C 44102000 */  mfc1      $s0, $f4
-/* A1E370 80243270 0C0B2026 */  jal       set_variable
-/* A1E374 80243274 02168023 */   subu     $s0, $s0, $s6
-/* A1E378 80243278 0240202D */  daddu     $a0, $s2, $zero
-/* A1E37C 8024327C 02A0282D */  daddu     $a1, $s5, $zero
-/* A1E380 80243280 0C0B2026 */  jal       set_variable
-/* A1E384 80243284 0200302D */   daddu    $a2, $s0, $zero
-/* A1E388 80243288 8FBF0030 */  lw        $ra, 0x30($sp)
-/* A1E38C 8024328C 8FB7002C */  lw        $s7, 0x2c($sp)
-/* A1E390 80243290 8FB60028 */  lw        $s6, 0x28($sp)
-/* A1E394 80243294 8FB50024 */  lw        $s5, 0x24($sp)
-/* A1E398 80243298 8FB40020 */  lw        $s4, 0x20($sp)
-/* A1E39C 8024329C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A1E3A0 802432A0 8FB20018 */  lw        $s2, 0x18($sp)
-/* A1E3A4 802432A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E3A8 802432A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E3AC 802432AC D7B60040 */  ldc1      $f22, 0x40($sp)
-/* A1E3B0 802432B0 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* A1E3B4 802432B4 24020002 */  addiu     $v0, $zero, 2
-/* A1E3B8 802432B8 03E00008 */  jr        $ra
-/* A1E3BC 802432BC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s
deleted file mode 100644
index 9bbecdde90..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242294_B2E704
-/* B2E704 80242294 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* B2E708 80242298 AFB20018 */  sw        $s2, 0x18($sp)
-/* B2E70C 8024229C 0080902D */  daddu     $s2, $a0, $zero
-/* B2E710 802422A0 AFBF0030 */  sw        $ra, 0x30($sp)
-/* B2E714 802422A4 AFB7002C */  sw        $s7, 0x2c($sp)
-/* B2E718 802422A8 AFB60028 */  sw        $s6, 0x28($sp)
-/* B2E71C 802422AC AFB50024 */  sw        $s5, 0x24($sp)
-/* B2E720 802422B0 AFB40020 */  sw        $s4, 0x20($sp)
-/* B2E724 802422B4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* B2E728 802422B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E72C 802422BC AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E730 802422C0 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* B2E734 802422C4 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* B2E738 802422C8 8E50000C */  lw        $s0, 0xc($s2)
-/* B2E73C 802422CC 8E050000 */  lw        $a1, ($s0)
-/* B2E740 802422D0 0C0B1EAF */  jal       get_variable
-/* B2E744 802422D4 26100004 */   addiu    $s0, $s0, 4
-/* B2E748 802422D8 8E050000 */  lw        $a1, ($s0)
-/* B2E74C 802422DC 26100004 */  addiu     $s0, $s0, 4
-/* B2E750 802422E0 0240202D */  daddu     $a0, $s2, $zero
-/* B2E754 802422E4 0C0B1EAF */  jal       get_variable
-/* B2E758 802422E8 0040B82D */   daddu    $s7, $v0, $zero
-/* B2E75C 802422EC 8E050000 */  lw        $a1, ($s0)
-/* B2E760 802422F0 26100004 */  addiu     $s0, $s0, 4
-/* B2E764 802422F4 0240202D */  daddu     $a0, $s2, $zero
-/* B2E768 802422F8 0C0B1EAF */  jal       get_variable
-/* B2E76C 802422FC 0040B02D */   daddu    $s6, $v0, $zero
-/* B2E770 80242300 0240202D */  daddu     $a0, $s2, $zero
-/* B2E774 80242304 3C05F4AC */  lui       $a1, 0xf4ac
-/* B2E778 80242308 34A5D481 */  ori       $a1, $a1, 0xd481
-/* B2E77C 8024230C 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* B2E780 80242310 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* B2E784 80242314 8E140000 */  lw        $s4, ($s0)
-/* B2E788 80242318 00061880 */  sll       $v1, $a2, 2
-/* B2E78C 8024231C 00661821 */  addu      $v1, $v1, $a2
-/* B2E790 80242320 00031880 */  sll       $v1, $v1, 2
-/* B2E794 80242324 00661823 */  subu      $v1, $v1, $a2
-/* B2E798 80242328 000330C0 */  sll       $a2, $v1, 3
-/* B2E79C 8024232C 00661821 */  addu      $v1, $v1, $a2
-/* B2E7A0 80242330 000318C0 */  sll       $v1, $v1, 3
-/* B2E7A4 80242334 3C01800B */  lui       $at, 0x800b
-/* B2E7A8 80242338 00230821 */  addu      $at, $at, $v1
-/* B2E7AC 8024233C C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* B2E7B0 80242340 8E150004 */  lw        $s5, 4($s0)
-/* B2E7B4 80242344 4600010D */  trunc.w.s $f4, $f0
-/* B2E7B8 80242348 44112000 */  mfc1      $s1, $f4
-/* B2E7BC 8024234C 0C0B1EAF */  jal       get_variable
-/* B2E7C0 80242350 0040982D */   daddu    $s3, $v0, $zero
-/* B2E7C4 80242354 4491B000 */  mtc1      $s1, $f22
-/* B2E7C8 80242358 00000000 */  nop       
-/* B2E7CC 8024235C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* B2E7D0 80242360 4600B306 */  mov.s     $f12, $f22
-/* B2E7D4 80242364 0C00A8D4 */  jal       cos_deg
-/* B2E7D8 80242368 0040802D */   daddu    $s0, $v0, $zero
-/* B2E7DC 8024236C 4493A000 */  mtc1      $s3, $f20
-/* B2E7E0 80242370 00000000 */  nop       
-/* B2E7E4 80242374 4680A520 */  cvt.s.w   $f20, $f20
-/* B2E7E8 80242378 4600A002 */  mul.s     $f0, $f20, $f0
-/* B2E7EC 8024237C 00000000 */  nop       
-/* B2E7F0 80242380 0240202D */  daddu     $a0, $s2, $zero
-/* B2E7F4 80242384 44901000 */  mtc1      $s0, $f2
-/* B2E7F8 80242388 00000000 */  nop       
-/* B2E7FC 8024238C 468010A0 */  cvt.s.w   $f2, $f2
-/* B2E800 80242390 46001081 */  sub.s     $f2, $f2, $f0
-/* B2E804 80242394 3C05F4AC */  lui       $a1, 0xf4ac
-/* B2E808 80242398 4600110D */  trunc.w.s $f4, $f2
-/* B2E80C 8024239C 44102000 */  mfc1      $s0, $f4
-/* B2E810 802423A0 0C0B1EAF */  jal       get_variable
-/* B2E814 802423A4 34A5D483 */   ori      $a1, $a1, 0xd483
-/* B2E818 802423A8 4600B306 */  mov.s     $f12, $f22
-/* B2E81C 802423AC 0C00A8BB */  jal       sin_deg
-/* B2E820 802423B0 0040882D */   daddu    $s1, $v0, $zero
-/* B2E824 802423B4 4600A502 */  mul.s     $f20, $f20, $f0
-/* B2E828 802423B8 00000000 */  nop       
-/* B2E82C 802423BC 0240202D */  daddu     $a0, $s2, $zero
-/* B2E830 802423C0 44910000 */  mtc1      $s1, $f0
-/* B2E834 802423C4 00000000 */  nop       
-/* B2E838 802423C8 46800020 */  cvt.s.w   $f0, $f0
-/* B2E83C 802423CC 46140001 */  sub.s     $f0, $f0, $f20
-/* B2E840 802423D0 0280282D */  daddu     $a1, $s4, $zero
-/* B2E844 802423D4 02173023 */  subu      $a2, $s0, $s7
-/* B2E848 802423D8 4600010D */  trunc.w.s $f4, $f0
-/* B2E84C 802423DC 44102000 */  mfc1      $s0, $f4
-/* B2E850 802423E0 0C0B2026 */  jal       set_variable
-/* B2E854 802423E4 02168023 */   subu     $s0, $s0, $s6
-/* B2E858 802423E8 0240202D */  daddu     $a0, $s2, $zero
-/* B2E85C 802423EC 02A0282D */  daddu     $a1, $s5, $zero
-/* B2E860 802423F0 0C0B2026 */  jal       set_variable
-/* B2E864 802423F4 0200302D */   daddu    $a2, $s0, $zero
-/* B2E868 802423F8 8FBF0030 */  lw        $ra, 0x30($sp)
-/* B2E86C 802423FC 8FB7002C */  lw        $s7, 0x2c($sp)
-/* B2E870 80242400 8FB60028 */  lw        $s6, 0x28($sp)
-/* B2E874 80242404 8FB50024 */  lw        $s5, 0x24($sp)
-/* B2E878 80242408 8FB40020 */  lw        $s4, 0x20($sp)
-/* B2E87C 8024240C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B2E880 80242410 8FB20018 */  lw        $s2, 0x18($sp)
-/* B2E884 80242414 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2E888 80242418 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2E88C 8024241C D7B60040 */  ldc1      $f22, 0x40($sp)
-/* B2E890 80242420 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* B2E894 80242424 24020002 */  addiu     $v0, $zero, 2
-/* B2E898 80242428 03E00008 */  jr        $ra
-/* B2E89C 8024242C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s
deleted file mode 100644
index 02b7b41c13..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024281C_B373EC
-/* B373EC 8024281C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* B373F0 80242820 AFB20018 */  sw        $s2, 0x18($sp)
-/* B373F4 80242824 0080902D */  daddu     $s2, $a0, $zero
-/* B373F8 80242828 AFBF0030 */  sw        $ra, 0x30($sp)
-/* B373FC 8024282C AFB7002C */  sw        $s7, 0x2c($sp)
-/* B37400 80242830 AFB60028 */  sw        $s6, 0x28($sp)
-/* B37404 80242834 AFB50024 */  sw        $s5, 0x24($sp)
-/* B37408 80242838 AFB40020 */  sw        $s4, 0x20($sp)
-/* B3740C 8024283C AFB3001C */  sw        $s3, 0x1c($sp)
-/* B37410 80242840 AFB10014 */  sw        $s1, 0x14($sp)
-/* B37414 80242844 AFB00010 */  sw        $s0, 0x10($sp)
-/* B37418 80242848 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* B3741C 8024284C F7B40038 */  sdc1      $f20, 0x38($sp)
-/* B37420 80242850 8E50000C */  lw        $s0, 0xc($s2)
-/* B37424 80242854 8E050000 */  lw        $a1, ($s0)
-/* B37428 80242858 0C0B1EAF */  jal       get_variable
-/* B3742C 8024285C 26100004 */   addiu    $s0, $s0, 4
-/* B37430 80242860 8E050000 */  lw        $a1, ($s0)
-/* B37434 80242864 26100004 */  addiu     $s0, $s0, 4
-/* B37438 80242868 0240202D */  daddu     $a0, $s2, $zero
-/* B3743C 8024286C 0C0B1EAF */  jal       get_variable
-/* B37440 80242870 0040B82D */   daddu    $s7, $v0, $zero
-/* B37444 80242874 8E050000 */  lw        $a1, ($s0)
-/* B37448 80242878 26100004 */  addiu     $s0, $s0, 4
-/* B3744C 8024287C 0240202D */  daddu     $a0, $s2, $zero
-/* B37450 80242880 0C0B1EAF */  jal       get_variable
-/* B37454 80242884 0040B02D */   daddu    $s6, $v0, $zero
-/* B37458 80242888 0240202D */  daddu     $a0, $s2, $zero
-/* B3745C 8024288C 3C05F4AC */  lui       $a1, 0xf4ac
-/* B37460 80242890 34A5D481 */  ori       $a1, $a1, 0xd481
-/* B37464 80242894 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* B37468 80242898 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* B3746C 8024289C 8E140000 */  lw        $s4, ($s0)
-/* B37470 802428A0 00061880 */  sll       $v1, $a2, 2
-/* B37474 802428A4 00661821 */  addu      $v1, $v1, $a2
-/* B37478 802428A8 00031880 */  sll       $v1, $v1, 2
-/* B3747C 802428AC 00661823 */  subu      $v1, $v1, $a2
-/* B37480 802428B0 000330C0 */  sll       $a2, $v1, 3
-/* B37484 802428B4 00661821 */  addu      $v1, $v1, $a2
-/* B37488 802428B8 000318C0 */  sll       $v1, $v1, 3
-/* B3748C 802428BC 3C01800B */  lui       $at, 0x800b
-/* B37490 802428C0 00230821 */  addu      $at, $at, $v1
-/* B37494 802428C4 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* B37498 802428C8 8E150004 */  lw        $s5, 4($s0)
-/* B3749C 802428CC 4600010D */  trunc.w.s $f4, $f0
-/* B374A0 802428D0 44112000 */  mfc1      $s1, $f4
-/* B374A4 802428D4 0C0B1EAF */  jal       get_variable
-/* B374A8 802428D8 0040982D */   daddu    $s3, $v0, $zero
-/* B374AC 802428DC 4491B000 */  mtc1      $s1, $f22
-/* B374B0 802428E0 00000000 */  nop       
-/* B374B4 802428E4 4680B5A0 */  cvt.s.w   $f22, $f22
-/* B374B8 802428E8 4600B306 */  mov.s     $f12, $f22
-/* B374BC 802428EC 0C00A8D4 */  jal       cos_deg
-/* B374C0 802428F0 0040802D */   daddu    $s0, $v0, $zero
-/* B374C4 802428F4 4493A000 */  mtc1      $s3, $f20
-/* B374C8 802428F8 00000000 */  nop       
-/* B374CC 802428FC 4680A520 */  cvt.s.w   $f20, $f20
-/* B374D0 80242900 4600A002 */  mul.s     $f0, $f20, $f0
-/* B374D4 80242904 00000000 */  nop       
-/* B374D8 80242908 0240202D */  daddu     $a0, $s2, $zero
-/* B374DC 8024290C 44901000 */  mtc1      $s0, $f2
-/* B374E0 80242910 00000000 */  nop       
-/* B374E4 80242914 468010A0 */  cvt.s.w   $f2, $f2
-/* B374E8 80242918 46001081 */  sub.s     $f2, $f2, $f0
-/* B374EC 8024291C 3C05F4AC */  lui       $a1, 0xf4ac
-/* B374F0 80242920 4600110D */  trunc.w.s $f4, $f2
-/* B374F4 80242924 44102000 */  mfc1      $s0, $f4
-/* B374F8 80242928 0C0B1EAF */  jal       get_variable
-/* B374FC 8024292C 34A5D483 */   ori      $a1, $a1, 0xd483
-/* B37500 80242930 4600B306 */  mov.s     $f12, $f22
-/* B37504 80242934 0C00A8BB */  jal       sin_deg
-/* B37508 80242938 0040882D */   daddu    $s1, $v0, $zero
-/* B3750C 8024293C 4600A502 */  mul.s     $f20, $f20, $f0
-/* B37510 80242940 00000000 */  nop       
-/* B37514 80242944 0240202D */  daddu     $a0, $s2, $zero
-/* B37518 80242948 44910000 */  mtc1      $s1, $f0
-/* B3751C 8024294C 00000000 */  nop       
-/* B37520 80242950 46800020 */  cvt.s.w   $f0, $f0
-/* B37524 80242954 46140001 */  sub.s     $f0, $f0, $f20
-/* B37528 80242958 0280282D */  daddu     $a1, $s4, $zero
-/* B3752C 8024295C 02173023 */  subu      $a2, $s0, $s7
-/* B37530 80242960 4600010D */  trunc.w.s $f4, $f0
-/* B37534 80242964 44102000 */  mfc1      $s0, $f4
-/* B37538 80242968 0C0B2026 */  jal       set_variable
-/* B3753C 8024296C 02168023 */   subu     $s0, $s0, $s6
-/* B37540 80242970 0240202D */  daddu     $a0, $s2, $zero
-/* B37544 80242974 02A0282D */  daddu     $a1, $s5, $zero
-/* B37548 80242978 0C0B2026 */  jal       set_variable
-/* B3754C 8024297C 0200302D */   daddu    $a2, $s0, $zero
-/* B37550 80242980 8FBF0030 */  lw        $ra, 0x30($sp)
-/* B37554 80242984 8FB7002C */  lw        $s7, 0x2c($sp)
-/* B37558 80242988 8FB60028 */  lw        $s6, 0x28($sp)
-/* B3755C 8024298C 8FB50024 */  lw        $s5, 0x24($sp)
-/* B37560 80242990 8FB40020 */  lw        $s4, 0x20($sp)
-/* B37564 80242994 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B37568 80242998 8FB20018 */  lw        $s2, 0x18($sp)
-/* B3756C 8024299C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B37570 802429A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37574 802429A4 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* B37578 802429A8 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* B3757C 802429AC 24020002 */  addiu     $v0, $zero, 2
-/* B37580 802429B0 03E00008 */  jr        $ra
-/* B37584 802429B4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s
deleted file mode 100644
index 92e2eb8a40..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241010_8B1080
-/* 8B1080 80241010 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8B1084 80241014 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B1088 80241018 0080902D */  daddu     $s2, $a0, $zero
-/* 8B108C 8024101C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 8B1090 80241020 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 8B1094 80241024 AFB60028 */  sw        $s6, 0x28($sp)
-/* 8B1098 80241028 AFB50024 */  sw        $s5, 0x24($sp)
-/* 8B109C 8024102C AFB40020 */  sw        $s4, 0x20($sp)
-/* 8B10A0 80241030 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8B10A4 80241034 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B10A8 80241038 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B10AC 8024103C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 8B10B0 80241040 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 8B10B4 80241044 8E50000C */  lw        $s0, 0xc($s2)
-/* 8B10B8 80241048 8E050000 */  lw        $a1, ($s0)
-/* 8B10BC 8024104C 0C0B1EAF */  jal       get_variable
-/* 8B10C0 80241050 26100004 */   addiu    $s0, $s0, 4
-/* 8B10C4 80241054 8E050000 */  lw        $a1, ($s0)
-/* 8B10C8 80241058 26100004 */  addiu     $s0, $s0, 4
-/* 8B10CC 8024105C 0240202D */  daddu     $a0, $s2, $zero
-/* 8B10D0 80241060 0C0B1EAF */  jal       get_variable
-/* 8B10D4 80241064 0040B82D */   daddu    $s7, $v0, $zero
-/* 8B10D8 80241068 8E050000 */  lw        $a1, ($s0)
-/* 8B10DC 8024106C 26100004 */  addiu     $s0, $s0, 4
-/* 8B10E0 80241070 0240202D */  daddu     $a0, $s2, $zero
-/* 8B10E4 80241074 0C0B1EAF */  jal       get_variable
-/* 8B10E8 80241078 0040B02D */   daddu    $s6, $v0, $zero
-/* 8B10EC 8024107C 0240202D */  daddu     $a0, $s2, $zero
-/* 8B10F0 80241080 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8B10F4 80241084 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 8B10F8 80241088 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 8B10FC 8024108C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 8B1100 80241090 8E140000 */  lw        $s4, ($s0)
-/* 8B1104 80241094 00061880 */  sll       $v1, $a2, 2
-/* 8B1108 80241098 00661821 */  addu      $v1, $v1, $a2
-/* 8B110C 8024109C 00031880 */  sll       $v1, $v1, 2
-/* 8B1110 802410A0 00661823 */  subu      $v1, $v1, $a2
-/* 8B1114 802410A4 000330C0 */  sll       $a2, $v1, 3
-/* 8B1118 802410A8 00661821 */  addu      $v1, $v1, $a2
-/* 8B111C 802410AC 000318C0 */  sll       $v1, $v1, 3
-/* 8B1120 802410B0 3C01800B */  lui       $at, 0x800b
-/* 8B1124 802410B4 00230821 */  addu      $at, $at, $v1
-/* 8B1128 802410B8 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 8B112C 802410BC 8E150004 */  lw        $s5, 4($s0)
-/* 8B1130 802410C0 4600010D */  trunc.w.s $f4, $f0
-/* 8B1134 802410C4 44112000 */  mfc1      $s1, $f4
-/* 8B1138 802410C8 0C0B1EAF */  jal       get_variable
-/* 8B113C 802410CC 0040982D */   daddu    $s3, $v0, $zero
-/* 8B1140 802410D0 4491B000 */  mtc1      $s1, $f22
-/* 8B1144 802410D4 00000000 */  nop       
-/* 8B1148 802410D8 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8B114C 802410DC 4600B306 */  mov.s     $f12, $f22
-/* 8B1150 802410E0 0C00A8D4 */  jal       cos_deg
-/* 8B1154 802410E4 0040802D */   daddu    $s0, $v0, $zero
-/* 8B1158 802410E8 4493A000 */  mtc1      $s3, $f20
-/* 8B115C 802410EC 00000000 */  nop       
-/* 8B1160 802410F0 4680A520 */  cvt.s.w   $f20, $f20
-/* 8B1164 802410F4 4600A002 */  mul.s     $f0, $f20, $f0
-/* 8B1168 802410F8 00000000 */  nop       
-/* 8B116C 802410FC 0240202D */  daddu     $a0, $s2, $zero
-/* 8B1170 80241100 44901000 */  mtc1      $s0, $f2
-/* 8B1174 80241104 00000000 */  nop       
-/* 8B1178 80241108 468010A0 */  cvt.s.w   $f2, $f2
-/* 8B117C 8024110C 46001081 */  sub.s     $f2, $f2, $f0
-/* 8B1180 80241110 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8B1184 80241114 4600110D */  trunc.w.s $f4, $f2
-/* 8B1188 80241118 44102000 */  mfc1      $s0, $f4
-/* 8B118C 8024111C 0C0B1EAF */  jal       get_variable
-/* 8B1190 80241120 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 8B1194 80241124 4600B306 */  mov.s     $f12, $f22
-/* 8B1198 80241128 0C00A8BB */  jal       sin_deg
-/* 8B119C 8024112C 0040882D */   daddu    $s1, $v0, $zero
-/* 8B11A0 80241130 4600A502 */  mul.s     $f20, $f20, $f0
-/* 8B11A4 80241134 00000000 */  nop       
-/* 8B11A8 80241138 0240202D */  daddu     $a0, $s2, $zero
-/* 8B11AC 8024113C 44910000 */  mtc1      $s1, $f0
-/* 8B11B0 80241140 00000000 */  nop       
-/* 8B11B4 80241144 46800020 */  cvt.s.w   $f0, $f0
-/* 8B11B8 80241148 46140001 */  sub.s     $f0, $f0, $f20
-/* 8B11BC 8024114C 0280282D */  daddu     $a1, $s4, $zero
-/* 8B11C0 80241150 02173023 */  subu      $a2, $s0, $s7
-/* 8B11C4 80241154 4600010D */  trunc.w.s $f4, $f0
-/* 8B11C8 80241158 44102000 */  mfc1      $s0, $f4
-/* 8B11CC 8024115C 0C0B2026 */  jal       set_variable
-/* 8B11D0 80241160 02168023 */   subu     $s0, $s0, $s6
-/* 8B11D4 80241164 0240202D */  daddu     $a0, $s2, $zero
-/* 8B11D8 80241168 02A0282D */  daddu     $a1, $s5, $zero
-/* 8B11DC 8024116C 0C0B2026 */  jal       set_variable
-/* 8B11E0 80241170 0200302D */   daddu    $a2, $s0, $zero
-/* 8B11E4 80241174 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 8B11E8 80241178 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 8B11EC 8024117C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 8B11F0 80241180 8FB50024 */  lw        $s5, 0x24($sp)
-/* 8B11F4 80241184 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8B11F8 80241188 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8B11FC 8024118C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B1200 80241190 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B1204 80241194 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B1208 80241198 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 8B120C 8024119C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 8B1210 802411A0 24020002 */  addiu     $v0, $zero, 2
-/* 8B1214 802411A4 03E00008 */  jr        $ra
-/* 8B1218 802411A8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s
deleted file mode 100644
index 1eced077b2..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412B0_7EBFC0
-/* 7EBFC0 802412B0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 7EBFC4 802412B4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7EBFC8 802412B8 0080902D */  daddu     $s2, $a0, $zero
-/* 7EBFCC 802412BC AFBF0030 */  sw        $ra, 0x30($sp)
-/* 7EBFD0 802412C0 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 7EBFD4 802412C4 AFB60028 */  sw        $s6, 0x28($sp)
-/* 7EBFD8 802412C8 AFB50024 */  sw        $s5, 0x24($sp)
-/* 7EBFDC 802412CC AFB40020 */  sw        $s4, 0x20($sp)
-/* 7EBFE0 802412D0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7EBFE4 802412D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EBFE8 802412D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EBFEC 802412DC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 7EBFF0 802412E0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 7EBFF4 802412E4 8E50000C */  lw        $s0, 0xc($s2)
-/* 7EBFF8 802412E8 8E050000 */  lw        $a1, ($s0)
-/* 7EBFFC 802412EC 0C0B1EAF */  jal       get_variable
-/* 7EC000 802412F0 26100004 */   addiu    $s0, $s0, 4
-/* 7EC004 802412F4 8E050000 */  lw        $a1, ($s0)
-/* 7EC008 802412F8 26100004 */  addiu     $s0, $s0, 4
-/* 7EC00C 802412FC 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC010 80241300 0C0B1EAF */  jal       get_variable
-/* 7EC014 80241304 0040B82D */   daddu    $s7, $v0, $zero
-/* 7EC018 80241308 8E050000 */  lw        $a1, ($s0)
-/* 7EC01C 8024130C 26100004 */  addiu     $s0, $s0, 4
-/* 7EC020 80241310 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC024 80241314 0C0B1EAF */  jal       get_variable
-/* 7EC028 80241318 0040B02D */   daddu    $s6, $v0, $zero
-/* 7EC02C 8024131C 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC030 80241320 3C05F4AC */  lui       $a1, 0xf4ac
-/* 7EC034 80241324 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 7EC038 80241328 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 7EC03C 8024132C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 7EC040 80241330 8E140000 */  lw        $s4, ($s0)
-/* 7EC044 80241334 00061880 */  sll       $v1, $a2, 2
-/* 7EC048 80241338 00661821 */  addu      $v1, $v1, $a2
-/* 7EC04C 8024133C 00031880 */  sll       $v1, $v1, 2
-/* 7EC050 80241340 00661823 */  subu      $v1, $v1, $a2
-/* 7EC054 80241344 000330C0 */  sll       $a2, $v1, 3
-/* 7EC058 80241348 00661821 */  addu      $v1, $v1, $a2
-/* 7EC05C 8024134C 000318C0 */  sll       $v1, $v1, 3
-/* 7EC060 80241350 3C01800B */  lui       $at, 0x800b
-/* 7EC064 80241354 00230821 */  addu      $at, $at, $v1
-/* 7EC068 80241358 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 7EC06C 8024135C 8E150004 */  lw        $s5, 4($s0)
-/* 7EC070 80241360 4600010D */  trunc.w.s $f4, $f0
-/* 7EC074 80241364 44112000 */  mfc1      $s1, $f4
-/* 7EC078 80241368 0C0B1EAF */  jal       get_variable
-/* 7EC07C 8024136C 0040982D */   daddu    $s3, $v0, $zero
-/* 7EC080 80241370 4491B000 */  mtc1      $s1, $f22
-/* 7EC084 80241374 00000000 */  nop       
-/* 7EC088 80241378 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 7EC08C 8024137C 4600B306 */  mov.s     $f12, $f22
-/* 7EC090 80241380 0C00A8D4 */  jal       cos_deg
-/* 7EC094 80241384 0040802D */   daddu    $s0, $v0, $zero
-/* 7EC098 80241388 4493A000 */  mtc1      $s3, $f20
-/* 7EC09C 8024138C 00000000 */  nop       
-/* 7EC0A0 80241390 4680A520 */  cvt.s.w   $f20, $f20
-/* 7EC0A4 80241394 4600A002 */  mul.s     $f0, $f20, $f0
-/* 7EC0A8 80241398 00000000 */  nop       
-/* 7EC0AC 8024139C 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC0B0 802413A0 44901000 */  mtc1      $s0, $f2
-/* 7EC0B4 802413A4 00000000 */  nop       
-/* 7EC0B8 802413A8 468010A0 */  cvt.s.w   $f2, $f2
-/* 7EC0BC 802413AC 46001081 */  sub.s     $f2, $f2, $f0
-/* 7EC0C0 802413B0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 7EC0C4 802413B4 4600110D */  trunc.w.s $f4, $f2
-/* 7EC0C8 802413B8 44102000 */  mfc1      $s0, $f4
-/* 7EC0CC 802413BC 0C0B1EAF */  jal       get_variable
-/* 7EC0D0 802413C0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 7EC0D4 802413C4 4600B306 */  mov.s     $f12, $f22
-/* 7EC0D8 802413C8 0C00A8BB */  jal       sin_deg
-/* 7EC0DC 802413CC 0040882D */   daddu    $s1, $v0, $zero
-/* 7EC0E0 802413D0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 7EC0E4 802413D4 00000000 */  nop       
-/* 7EC0E8 802413D8 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC0EC 802413DC 44910000 */  mtc1      $s1, $f0
-/* 7EC0F0 802413E0 00000000 */  nop       
-/* 7EC0F4 802413E4 46800020 */  cvt.s.w   $f0, $f0
-/* 7EC0F8 802413E8 46140001 */  sub.s     $f0, $f0, $f20
-/* 7EC0FC 802413EC 0280282D */  daddu     $a1, $s4, $zero
-/* 7EC100 802413F0 02173023 */  subu      $a2, $s0, $s7
-/* 7EC104 802413F4 4600010D */  trunc.w.s $f4, $f0
-/* 7EC108 802413F8 44102000 */  mfc1      $s0, $f4
-/* 7EC10C 802413FC 0C0B2026 */  jal       set_variable
-/* 7EC110 80241400 02168023 */   subu     $s0, $s0, $s6
-/* 7EC114 80241404 0240202D */  daddu     $a0, $s2, $zero
-/* 7EC118 80241408 02A0282D */  daddu     $a1, $s5, $zero
-/* 7EC11C 8024140C 0C0B2026 */  jal       set_variable
-/* 7EC120 80241410 0200302D */   daddu    $a2, $s0, $zero
-/* 7EC124 80241414 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 7EC128 80241418 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 7EC12C 8024141C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 7EC130 80241420 8FB50024 */  lw        $s5, 0x24($sp)
-/* 7EC134 80241424 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7EC138 80241428 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7EC13C 8024142C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7EC140 80241430 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EC144 80241434 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EC148 80241438 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 7EC14C 8024143C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 7EC150 80241440 24020002 */  addiu     $v0, $zero, 2
-/* 7EC154 80241444 03E00008 */  jr        $ra
-/* 7EC158 80241448 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s
deleted file mode 100644
index 536996d9dc..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242B90_803410
-/* 803410 80242B90 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 803414 80242B94 AFB20018 */  sw        $s2, 0x18($sp)
-/* 803418 80242B98 0080902D */  daddu     $s2, $a0, $zero
-/* 80341C 80242B9C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 803420 80242BA0 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 803424 80242BA4 AFB60028 */  sw        $s6, 0x28($sp)
-/* 803428 80242BA8 AFB50024 */  sw        $s5, 0x24($sp)
-/* 80342C 80242BAC AFB40020 */  sw        $s4, 0x20($sp)
-/* 803430 80242BB0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 803434 80242BB4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803438 80242BB8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 80343C 80242BBC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 803440 80242BC0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 803444 80242BC4 8E50000C */  lw        $s0, 0xc($s2)
-/* 803448 80242BC8 8E050000 */  lw        $a1, ($s0)
-/* 80344C 80242BCC 0C0B1EAF */  jal       get_variable
-/* 803450 80242BD0 26100004 */   addiu    $s0, $s0, 4
-/* 803454 80242BD4 8E050000 */  lw        $a1, ($s0)
-/* 803458 80242BD8 26100004 */  addiu     $s0, $s0, 4
-/* 80345C 80242BDC 0240202D */  daddu     $a0, $s2, $zero
-/* 803460 80242BE0 0C0B1EAF */  jal       get_variable
-/* 803464 80242BE4 0040B82D */   daddu    $s7, $v0, $zero
-/* 803468 80242BE8 8E050000 */  lw        $a1, ($s0)
-/* 80346C 80242BEC 26100004 */  addiu     $s0, $s0, 4
-/* 803470 80242BF0 0240202D */  daddu     $a0, $s2, $zero
-/* 803474 80242BF4 0C0B1EAF */  jal       get_variable
-/* 803478 80242BF8 0040B02D */   daddu    $s6, $v0, $zero
-/* 80347C 80242BFC 0240202D */  daddu     $a0, $s2, $zero
-/* 803480 80242C00 3C05F4AC */  lui       $a1, 0xf4ac
-/* 803484 80242C04 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 803488 80242C08 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 80348C 80242C0C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 803490 80242C10 8E140000 */  lw        $s4, ($s0)
-/* 803494 80242C14 00061880 */  sll       $v1, $a2, 2
-/* 803498 80242C18 00661821 */  addu      $v1, $v1, $a2
-/* 80349C 80242C1C 00031880 */  sll       $v1, $v1, 2
-/* 8034A0 80242C20 00661823 */  subu      $v1, $v1, $a2
-/* 8034A4 80242C24 000330C0 */  sll       $a2, $v1, 3
-/* 8034A8 80242C28 00661821 */  addu      $v1, $v1, $a2
-/* 8034AC 80242C2C 000318C0 */  sll       $v1, $v1, 3
-/* 8034B0 80242C30 3C01800B */  lui       $at, 0x800b
-/* 8034B4 80242C34 00230821 */  addu      $at, $at, $v1
-/* 8034B8 80242C38 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 8034BC 80242C3C 8E150004 */  lw        $s5, 4($s0)
-/* 8034C0 80242C40 4600010D */  trunc.w.s $f4, $f0
-/* 8034C4 80242C44 44112000 */  mfc1      $s1, $f4
-/* 8034C8 80242C48 0C0B1EAF */  jal       get_variable
-/* 8034CC 80242C4C 0040982D */   daddu    $s3, $v0, $zero
-/* 8034D0 80242C50 4491B000 */  mtc1      $s1, $f22
-/* 8034D4 80242C54 00000000 */  nop       
-/* 8034D8 80242C58 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8034DC 80242C5C 4600B306 */  mov.s     $f12, $f22
-/* 8034E0 80242C60 0C00A8D4 */  jal       cos_deg
-/* 8034E4 80242C64 0040802D */   daddu    $s0, $v0, $zero
-/* 8034E8 80242C68 4493A000 */  mtc1      $s3, $f20
-/* 8034EC 80242C6C 00000000 */  nop       
-/* 8034F0 80242C70 4680A520 */  cvt.s.w   $f20, $f20
-/* 8034F4 80242C74 4600A002 */  mul.s     $f0, $f20, $f0
-/* 8034F8 80242C78 00000000 */  nop       
-/* 8034FC 80242C7C 0240202D */  daddu     $a0, $s2, $zero
-/* 803500 80242C80 44901000 */  mtc1      $s0, $f2
-/* 803504 80242C84 00000000 */  nop       
-/* 803508 80242C88 468010A0 */  cvt.s.w   $f2, $f2
-/* 80350C 80242C8C 46001081 */  sub.s     $f2, $f2, $f0
-/* 803510 80242C90 3C05F4AC */  lui       $a1, 0xf4ac
-/* 803514 80242C94 4600110D */  trunc.w.s $f4, $f2
-/* 803518 80242C98 44102000 */  mfc1      $s0, $f4
-/* 80351C 80242C9C 0C0B1EAF */  jal       get_variable
-/* 803520 80242CA0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 803524 80242CA4 4600B306 */  mov.s     $f12, $f22
-/* 803528 80242CA8 0C00A8BB */  jal       sin_deg
-/* 80352C 80242CAC 0040882D */   daddu    $s1, $v0, $zero
-/* 803530 80242CB0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 803534 80242CB4 00000000 */  nop       
-/* 803538 80242CB8 0240202D */  daddu     $a0, $s2, $zero
-/* 80353C 80242CBC 44910000 */  mtc1      $s1, $f0
-/* 803540 80242CC0 00000000 */  nop       
-/* 803544 80242CC4 46800020 */  cvt.s.w   $f0, $f0
-/* 803548 80242CC8 46140001 */  sub.s     $f0, $f0, $f20
-/* 80354C 80242CCC 0280282D */  daddu     $a1, $s4, $zero
-/* 803550 80242CD0 02173023 */  subu      $a2, $s0, $s7
-/* 803554 80242CD4 4600010D */  trunc.w.s $f4, $f0
-/* 803558 80242CD8 44102000 */  mfc1      $s0, $f4
-/* 80355C 80242CDC 0C0B2026 */  jal       set_variable
-/* 803560 80242CE0 02168023 */   subu     $s0, $s0, $s6
-/* 803564 80242CE4 0240202D */  daddu     $a0, $s2, $zero
-/* 803568 80242CE8 02A0282D */  daddu     $a1, $s5, $zero
-/* 80356C 80242CEC 0C0B2026 */  jal       set_variable
-/* 803570 80242CF0 0200302D */   daddu    $a2, $s0, $zero
-/* 803574 80242CF4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 803578 80242CF8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 80357C 80242CFC 8FB60028 */  lw        $s6, 0x28($sp)
-/* 803580 80242D00 8FB50024 */  lw        $s5, 0x24($sp)
-/* 803584 80242D04 8FB40020 */  lw        $s4, 0x20($sp)
-/* 803588 80242D08 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 80358C 80242D0C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803590 80242D10 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803594 80242D14 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803598 80242D18 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 80359C 80242D1C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 8035A0 80242D20 24020002 */  addiu     $v0, $zero, 2
-/* 8035A4 80242D24 03E00008 */  jr        $ra
-/* 8035A8 80242D28 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s
deleted file mode 100644
index dcba1d6f43..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242440_825700
-/* 825700 80242440 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 825704 80242444 AFB20018 */  sw        $s2, 0x18($sp)
-/* 825708 80242448 0080902D */  daddu     $s2, $a0, $zero
-/* 82570C 8024244C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 825710 80242450 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 825714 80242454 AFB60028 */  sw        $s6, 0x28($sp)
-/* 825718 80242458 AFB50024 */  sw        $s5, 0x24($sp)
-/* 82571C 8024245C AFB40020 */  sw        $s4, 0x20($sp)
-/* 825720 80242460 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 825724 80242464 AFB10014 */  sw        $s1, 0x14($sp)
-/* 825728 80242468 AFB00010 */  sw        $s0, 0x10($sp)
-/* 82572C 8024246C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 825730 80242470 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 825734 80242474 8E50000C */  lw        $s0, 0xc($s2)
-/* 825738 80242478 8E050000 */  lw        $a1, ($s0)
-/* 82573C 8024247C 0C0B1EAF */  jal       get_variable
-/* 825740 80242480 26100004 */   addiu    $s0, $s0, 4
-/* 825744 80242484 8E050000 */  lw        $a1, ($s0)
-/* 825748 80242488 26100004 */  addiu     $s0, $s0, 4
-/* 82574C 8024248C 0240202D */  daddu     $a0, $s2, $zero
-/* 825750 80242490 0C0B1EAF */  jal       get_variable
-/* 825754 80242494 0040B82D */   daddu    $s7, $v0, $zero
-/* 825758 80242498 8E050000 */  lw        $a1, ($s0)
-/* 82575C 8024249C 26100004 */  addiu     $s0, $s0, 4
-/* 825760 802424A0 0240202D */  daddu     $a0, $s2, $zero
-/* 825764 802424A4 0C0B1EAF */  jal       get_variable
-/* 825768 802424A8 0040B02D */   daddu    $s6, $v0, $zero
-/* 82576C 802424AC 0240202D */  daddu     $a0, $s2, $zero
-/* 825770 802424B0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 825774 802424B4 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 825778 802424B8 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 82577C 802424BC 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 825780 802424C0 8E140000 */  lw        $s4, ($s0)
-/* 825784 802424C4 00061880 */  sll       $v1, $a2, 2
-/* 825788 802424C8 00661821 */  addu      $v1, $v1, $a2
-/* 82578C 802424CC 00031880 */  sll       $v1, $v1, 2
-/* 825790 802424D0 00661823 */  subu      $v1, $v1, $a2
-/* 825794 802424D4 000330C0 */  sll       $a2, $v1, 3
-/* 825798 802424D8 00661821 */  addu      $v1, $v1, $a2
-/* 82579C 802424DC 000318C0 */  sll       $v1, $v1, 3
-/* 8257A0 802424E0 3C01800B */  lui       $at, 0x800b
-/* 8257A4 802424E4 00230821 */  addu      $at, $at, $v1
-/* 8257A8 802424E8 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 8257AC 802424EC 8E150004 */  lw        $s5, 4($s0)
-/* 8257B0 802424F0 4600010D */  trunc.w.s $f4, $f0
-/* 8257B4 802424F4 44112000 */  mfc1      $s1, $f4
-/* 8257B8 802424F8 0C0B1EAF */  jal       get_variable
-/* 8257BC 802424FC 0040982D */   daddu    $s3, $v0, $zero
-/* 8257C0 80242500 4491B000 */  mtc1      $s1, $f22
-/* 8257C4 80242504 00000000 */  nop       
-/* 8257C8 80242508 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8257CC 8024250C 4600B306 */  mov.s     $f12, $f22
-/* 8257D0 80242510 0C00A8D4 */  jal       cos_deg
-/* 8257D4 80242514 0040802D */   daddu    $s0, $v0, $zero
-/* 8257D8 80242518 4493A000 */  mtc1      $s3, $f20
-/* 8257DC 8024251C 00000000 */  nop       
-/* 8257E0 80242520 4680A520 */  cvt.s.w   $f20, $f20
-/* 8257E4 80242524 4600A002 */  mul.s     $f0, $f20, $f0
-/* 8257E8 80242528 00000000 */  nop       
-/* 8257EC 8024252C 0240202D */  daddu     $a0, $s2, $zero
-/* 8257F0 80242530 44901000 */  mtc1      $s0, $f2
-/* 8257F4 80242534 00000000 */  nop       
-/* 8257F8 80242538 468010A0 */  cvt.s.w   $f2, $f2
-/* 8257FC 8024253C 46001081 */  sub.s     $f2, $f2, $f0
-/* 825800 80242540 3C05F4AC */  lui       $a1, 0xf4ac
-/* 825804 80242544 4600110D */  trunc.w.s $f4, $f2
-/* 825808 80242548 44102000 */  mfc1      $s0, $f4
-/* 82580C 8024254C 0C0B1EAF */  jal       get_variable
-/* 825810 80242550 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 825814 80242554 4600B306 */  mov.s     $f12, $f22
-/* 825818 80242558 0C00A8BB */  jal       sin_deg
-/* 82581C 8024255C 0040882D */   daddu    $s1, $v0, $zero
-/* 825820 80242560 4600A502 */  mul.s     $f20, $f20, $f0
-/* 825824 80242564 00000000 */  nop       
-/* 825828 80242568 0240202D */  daddu     $a0, $s2, $zero
-/* 82582C 8024256C 44910000 */  mtc1      $s1, $f0
-/* 825830 80242570 00000000 */  nop       
-/* 825834 80242574 46800020 */  cvt.s.w   $f0, $f0
-/* 825838 80242578 46140001 */  sub.s     $f0, $f0, $f20
-/* 82583C 8024257C 0280282D */  daddu     $a1, $s4, $zero
-/* 825840 80242580 02173023 */  subu      $a2, $s0, $s7
-/* 825844 80242584 4600010D */  trunc.w.s $f4, $f0
-/* 825848 80242588 44102000 */  mfc1      $s0, $f4
-/* 82584C 8024258C 0C0B2026 */  jal       set_variable
-/* 825850 80242590 02168023 */   subu     $s0, $s0, $s6
-/* 825854 80242594 0240202D */  daddu     $a0, $s2, $zero
-/* 825858 80242598 02A0282D */  daddu     $a1, $s5, $zero
-/* 82585C 8024259C 0C0B2026 */  jal       set_variable
-/* 825860 802425A0 0200302D */   daddu    $a2, $s0, $zero
-/* 825864 802425A4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 825868 802425A8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 82586C 802425AC 8FB60028 */  lw        $s6, 0x28($sp)
-/* 825870 802425B0 8FB50024 */  lw        $s5, 0x24($sp)
-/* 825874 802425B4 8FB40020 */  lw        $s4, 0x20($sp)
-/* 825878 802425B8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 82587C 802425BC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 825880 802425C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825884 802425C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825888 802425C8 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 82588C 802425CC D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 825890 802425D0 24020002 */  addiu     $v0, $zero, 2
-/* 825894 802425D4 03E00008 */  jr        $ra
-/* 825898 802425D8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s
deleted file mode 100644
index 4806014e37..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241130_832930
-/* 832930 80241130 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 832934 80241134 AFB20018 */  sw        $s2, 0x18($sp)
-/* 832938 80241138 0080902D */  daddu     $s2, $a0, $zero
-/* 83293C 8024113C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 832940 80241140 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 832944 80241144 AFB60028 */  sw        $s6, 0x28($sp)
-/* 832948 80241148 AFB50024 */  sw        $s5, 0x24($sp)
-/* 83294C 8024114C AFB40020 */  sw        $s4, 0x20($sp)
-/* 832950 80241150 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 832954 80241154 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832958 80241158 AFB00010 */  sw        $s0, 0x10($sp)
-/* 83295C 8024115C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 832960 80241160 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 832964 80241164 8E50000C */  lw        $s0, 0xc($s2)
-/* 832968 80241168 8E050000 */  lw        $a1, ($s0)
-/* 83296C 8024116C 0C0B1EAF */  jal       get_variable
-/* 832970 80241170 26100004 */   addiu    $s0, $s0, 4
-/* 832974 80241174 8E050000 */  lw        $a1, ($s0)
-/* 832978 80241178 26100004 */  addiu     $s0, $s0, 4
-/* 83297C 8024117C 0240202D */  daddu     $a0, $s2, $zero
-/* 832980 80241180 0C0B1EAF */  jal       get_variable
-/* 832984 80241184 0040B82D */   daddu    $s7, $v0, $zero
-/* 832988 80241188 8E050000 */  lw        $a1, ($s0)
-/* 83298C 8024118C 26100004 */  addiu     $s0, $s0, 4
-/* 832990 80241190 0240202D */  daddu     $a0, $s2, $zero
-/* 832994 80241194 0C0B1EAF */  jal       get_variable
-/* 832998 80241198 0040B02D */   daddu    $s6, $v0, $zero
-/* 83299C 8024119C 0240202D */  daddu     $a0, $s2, $zero
-/* 8329A0 802411A0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8329A4 802411A4 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 8329A8 802411A8 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 8329AC 802411AC 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 8329B0 802411B0 8E140000 */  lw        $s4, ($s0)
-/* 8329B4 802411B4 00061880 */  sll       $v1, $a2, 2
-/* 8329B8 802411B8 00661821 */  addu      $v1, $v1, $a2
-/* 8329BC 802411BC 00031880 */  sll       $v1, $v1, 2
-/* 8329C0 802411C0 00661823 */  subu      $v1, $v1, $a2
-/* 8329C4 802411C4 000330C0 */  sll       $a2, $v1, 3
-/* 8329C8 802411C8 00661821 */  addu      $v1, $v1, $a2
-/* 8329CC 802411CC 000318C0 */  sll       $v1, $v1, 3
-/* 8329D0 802411D0 3C01800B */  lui       $at, 0x800b
-/* 8329D4 802411D4 00230821 */  addu      $at, $at, $v1
-/* 8329D8 802411D8 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 8329DC 802411DC 8E150004 */  lw        $s5, 4($s0)
-/* 8329E0 802411E0 4600010D */  trunc.w.s $f4, $f0
-/* 8329E4 802411E4 44112000 */  mfc1      $s1, $f4
-/* 8329E8 802411E8 0C0B1EAF */  jal       get_variable
-/* 8329EC 802411EC 0040982D */   daddu    $s3, $v0, $zero
-/* 8329F0 802411F0 4491B000 */  mtc1      $s1, $f22
-/* 8329F4 802411F4 00000000 */  nop       
-/* 8329F8 802411F8 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8329FC 802411FC 4600B306 */  mov.s     $f12, $f22
-/* 832A00 80241200 0C00A8D4 */  jal       cos_deg
-/* 832A04 80241204 0040802D */   daddu    $s0, $v0, $zero
-/* 832A08 80241208 4493A000 */  mtc1      $s3, $f20
-/* 832A0C 8024120C 00000000 */  nop       
-/* 832A10 80241210 4680A520 */  cvt.s.w   $f20, $f20
-/* 832A14 80241214 4600A002 */  mul.s     $f0, $f20, $f0
-/* 832A18 80241218 00000000 */  nop       
-/* 832A1C 8024121C 0240202D */  daddu     $a0, $s2, $zero
-/* 832A20 80241220 44901000 */  mtc1      $s0, $f2
-/* 832A24 80241224 00000000 */  nop       
-/* 832A28 80241228 468010A0 */  cvt.s.w   $f2, $f2
-/* 832A2C 8024122C 46001081 */  sub.s     $f2, $f2, $f0
-/* 832A30 80241230 3C05F4AC */  lui       $a1, 0xf4ac
-/* 832A34 80241234 4600110D */  trunc.w.s $f4, $f2
-/* 832A38 80241238 44102000 */  mfc1      $s0, $f4
-/* 832A3C 8024123C 0C0B1EAF */  jal       get_variable
-/* 832A40 80241240 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 832A44 80241244 4600B306 */  mov.s     $f12, $f22
-/* 832A48 80241248 0C00A8BB */  jal       sin_deg
-/* 832A4C 8024124C 0040882D */   daddu    $s1, $v0, $zero
-/* 832A50 80241250 4600A502 */  mul.s     $f20, $f20, $f0
-/* 832A54 80241254 00000000 */  nop       
-/* 832A58 80241258 0240202D */  daddu     $a0, $s2, $zero
-/* 832A5C 8024125C 44910000 */  mtc1      $s1, $f0
-/* 832A60 80241260 00000000 */  nop       
-/* 832A64 80241264 46800020 */  cvt.s.w   $f0, $f0
-/* 832A68 80241268 46140001 */  sub.s     $f0, $f0, $f20
-/* 832A6C 8024126C 0280282D */  daddu     $a1, $s4, $zero
-/* 832A70 80241270 02173023 */  subu      $a2, $s0, $s7
-/* 832A74 80241274 4600010D */  trunc.w.s $f4, $f0
-/* 832A78 80241278 44102000 */  mfc1      $s0, $f4
-/* 832A7C 8024127C 0C0B2026 */  jal       set_variable
-/* 832A80 80241280 02168023 */   subu     $s0, $s0, $s6
-/* 832A84 80241284 0240202D */  daddu     $a0, $s2, $zero
-/* 832A88 80241288 02A0282D */  daddu     $a1, $s5, $zero
-/* 832A8C 8024128C 0C0B2026 */  jal       set_variable
-/* 832A90 80241290 0200302D */   daddu    $a2, $s0, $zero
-/* 832A94 80241294 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 832A98 80241298 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 832A9C 8024129C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 832AA0 802412A0 8FB50024 */  lw        $s5, 0x24($sp)
-/* 832AA4 802412A4 8FB40020 */  lw        $s4, 0x20($sp)
-/* 832AA8 802412A8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 832AAC 802412AC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 832AB0 802412B0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832AB4 802412B4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832AB8 802412B8 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 832ABC 802412BC D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 832AC0 802412C0 24020002 */  addiu     $v0, $zero, 2
-/* 832AC4 802412C4 03E00008 */  jr        $ra
-/* 832AC8 802412C8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s
deleted file mode 100644
index 4e17291946..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410E0_843CB0
-/* 843CB0 802410E0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 843CB4 802410E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 843CB8 802410E8 0080902D */  daddu     $s2, $a0, $zero
-/* 843CBC 802410EC AFBF0030 */  sw        $ra, 0x30($sp)
-/* 843CC0 802410F0 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 843CC4 802410F4 AFB60028 */  sw        $s6, 0x28($sp)
-/* 843CC8 802410F8 AFB50024 */  sw        $s5, 0x24($sp)
-/* 843CCC 802410FC AFB40020 */  sw        $s4, 0x20($sp)
-/* 843CD0 80241100 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 843CD4 80241104 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843CD8 80241108 AFB00010 */  sw        $s0, 0x10($sp)
-/* 843CDC 8024110C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 843CE0 80241110 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 843CE4 80241114 8E50000C */  lw        $s0, 0xc($s2)
-/* 843CE8 80241118 8E050000 */  lw        $a1, ($s0)
-/* 843CEC 8024111C 0C0B1EAF */  jal       get_variable
-/* 843CF0 80241120 26100004 */   addiu    $s0, $s0, 4
-/* 843CF4 80241124 8E050000 */  lw        $a1, ($s0)
-/* 843CF8 80241128 26100004 */  addiu     $s0, $s0, 4
-/* 843CFC 8024112C 0240202D */  daddu     $a0, $s2, $zero
-/* 843D00 80241130 0C0B1EAF */  jal       get_variable
-/* 843D04 80241134 0040B82D */   daddu    $s7, $v0, $zero
-/* 843D08 80241138 8E050000 */  lw        $a1, ($s0)
-/* 843D0C 8024113C 26100004 */  addiu     $s0, $s0, 4
-/* 843D10 80241140 0240202D */  daddu     $a0, $s2, $zero
-/* 843D14 80241144 0C0B1EAF */  jal       get_variable
-/* 843D18 80241148 0040B02D */   daddu    $s6, $v0, $zero
-/* 843D1C 8024114C 0240202D */  daddu     $a0, $s2, $zero
-/* 843D20 80241150 3C05F4AC */  lui       $a1, 0xf4ac
-/* 843D24 80241154 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 843D28 80241158 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 843D2C 8024115C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 843D30 80241160 8E140000 */  lw        $s4, ($s0)
-/* 843D34 80241164 00061880 */  sll       $v1, $a2, 2
-/* 843D38 80241168 00661821 */  addu      $v1, $v1, $a2
-/* 843D3C 8024116C 00031880 */  sll       $v1, $v1, 2
-/* 843D40 80241170 00661823 */  subu      $v1, $v1, $a2
-/* 843D44 80241174 000330C0 */  sll       $a2, $v1, 3
-/* 843D48 80241178 00661821 */  addu      $v1, $v1, $a2
-/* 843D4C 8024117C 000318C0 */  sll       $v1, $v1, 3
-/* 843D50 80241180 3C01800B */  lui       $at, 0x800b
-/* 843D54 80241184 00230821 */  addu      $at, $at, $v1
-/* 843D58 80241188 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 843D5C 8024118C 8E150004 */  lw        $s5, 4($s0)
-/* 843D60 80241190 4600010D */  trunc.w.s $f4, $f0
-/* 843D64 80241194 44112000 */  mfc1      $s1, $f4
-/* 843D68 80241198 0C0B1EAF */  jal       get_variable
-/* 843D6C 8024119C 0040982D */   daddu    $s3, $v0, $zero
-/* 843D70 802411A0 4491B000 */  mtc1      $s1, $f22
-/* 843D74 802411A4 00000000 */  nop       
-/* 843D78 802411A8 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 843D7C 802411AC 4600B306 */  mov.s     $f12, $f22
-/* 843D80 802411B0 0C00A8D4 */  jal       cos_deg
-/* 843D84 802411B4 0040802D */   daddu    $s0, $v0, $zero
-/* 843D88 802411B8 4493A000 */  mtc1      $s3, $f20
-/* 843D8C 802411BC 00000000 */  nop       
-/* 843D90 802411C0 4680A520 */  cvt.s.w   $f20, $f20
-/* 843D94 802411C4 4600A002 */  mul.s     $f0, $f20, $f0
-/* 843D98 802411C8 00000000 */  nop       
-/* 843D9C 802411CC 0240202D */  daddu     $a0, $s2, $zero
-/* 843DA0 802411D0 44901000 */  mtc1      $s0, $f2
-/* 843DA4 802411D4 00000000 */  nop       
-/* 843DA8 802411D8 468010A0 */  cvt.s.w   $f2, $f2
-/* 843DAC 802411DC 46001081 */  sub.s     $f2, $f2, $f0
-/* 843DB0 802411E0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 843DB4 802411E4 4600110D */  trunc.w.s $f4, $f2
-/* 843DB8 802411E8 44102000 */  mfc1      $s0, $f4
-/* 843DBC 802411EC 0C0B1EAF */  jal       get_variable
-/* 843DC0 802411F0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 843DC4 802411F4 4600B306 */  mov.s     $f12, $f22
-/* 843DC8 802411F8 0C00A8BB */  jal       sin_deg
-/* 843DCC 802411FC 0040882D */   daddu    $s1, $v0, $zero
-/* 843DD0 80241200 4600A502 */  mul.s     $f20, $f20, $f0
-/* 843DD4 80241204 00000000 */  nop       
-/* 843DD8 80241208 0240202D */  daddu     $a0, $s2, $zero
-/* 843DDC 8024120C 44910000 */  mtc1      $s1, $f0
-/* 843DE0 80241210 00000000 */  nop       
-/* 843DE4 80241214 46800020 */  cvt.s.w   $f0, $f0
-/* 843DE8 80241218 46140001 */  sub.s     $f0, $f0, $f20
-/* 843DEC 8024121C 0280282D */  daddu     $a1, $s4, $zero
-/* 843DF0 80241220 02173023 */  subu      $a2, $s0, $s7
-/* 843DF4 80241224 4600010D */  trunc.w.s $f4, $f0
-/* 843DF8 80241228 44102000 */  mfc1      $s0, $f4
-/* 843DFC 8024122C 0C0B2026 */  jal       set_variable
-/* 843E00 80241230 02168023 */   subu     $s0, $s0, $s6
-/* 843E04 80241234 0240202D */  daddu     $a0, $s2, $zero
-/* 843E08 80241238 02A0282D */  daddu     $a1, $s5, $zero
-/* 843E0C 8024123C 0C0B2026 */  jal       set_variable
-/* 843E10 80241240 0200302D */   daddu    $a2, $s0, $zero
-/* 843E14 80241244 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 843E18 80241248 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 843E1C 8024124C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 843E20 80241250 8FB50024 */  lw        $s5, 0x24($sp)
-/* 843E24 80241254 8FB40020 */  lw        $s4, 0x20($sp)
-/* 843E28 80241258 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 843E2C 8024125C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 843E30 80241260 8FB10014 */  lw        $s1, 0x14($sp)
-/* 843E34 80241264 8FB00010 */  lw        $s0, 0x10($sp)
-/* 843E38 80241268 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 843E3C 8024126C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 843E40 80241270 24020002 */  addiu     $v0, $zero, 2
-/* 843E44 80241274 03E00008 */  jr        $ra
-/* 843E48 80241278 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s
deleted file mode 100644
index 07ecacde2e..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FA0_854110
-/* 854110 80241FA0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 854114 80241FA4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 854118 80241FA8 0080902D */  daddu     $s2, $a0, $zero
-/* 85411C 80241FAC AFBF0030 */  sw        $ra, 0x30($sp)
-/* 854120 80241FB0 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 854124 80241FB4 AFB60028 */  sw        $s6, 0x28($sp)
-/* 854128 80241FB8 AFB50024 */  sw        $s5, 0x24($sp)
-/* 85412C 80241FBC AFB40020 */  sw        $s4, 0x20($sp)
-/* 854130 80241FC0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 854134 80241FC4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 854138 80241FC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 85413C 80241FCC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 854140 80241FD0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 854144 80241FD4 8E50000C */  lw        $s0, 0xc($s2)
-/* 854148 80241FD8 8E050000 */  lw        $a1, ($s0)
-/* 85414C 80241FDC 0C0B1EAF */  jal       get_variable
-/* 854150 80241FE0 26100004 */   addiu    $s0, $s0, 4
-/* 854154 80241FE4 8E050000 */  lw        $a1, ($s0)
-/* 854158 80241FE8 26100004 */  addiu     $s0, $s0, 4
-/* 85415C 80241FEC 0240202D */  daddu     $a0, $s2, $zero
-/* 854160 80241FF0 0C0B1EAF */  jal       get_variable
-/* 854164 80241FF4 0040B82D */   daddu    $s7, $v0, $zero
-/* 854168 80241FF8 8E050000 */  lw        $a1, ($s0)
-/* 85416C 80241FFC 26100004 */  addiu     $s0, $s0, 4
-/* 854170 80242000 0240202D */  daddu     $a0, $s2, $zero
-/* 854174 80242004 0C0B1EAF */  jal       get_variable
-/* 854178 80242008 0040B02D */   daddu    $s6, $v0, $zero
-/* 85417C 8024200C 0240202D */  daddu     $a0, $s2, $zero
-/* 854180 80242010 3C05F4AC */  lui       $a1, 0xf4ac
-/* 854184 80242014 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 854188 80242018 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 85418C 8024201C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 854190 80242020 8E140000 */  lw        $s4, ($s0)
-/* 854194 80242024 00061880 */  sll       $v1, $a2, 2
-/* 854198 80242028 00661821 */  addu      $v1, $v1, $a2
-/* 85419C 8024202C 00031880 */  sll       $v1, $v1, 2
-/* 8541A0 80242030 00661823 */  subu      $v1, $v1, $a2
-/* 8541A4 80242034 000330C0 */  sll       $a2, $v1, 3
-/* 8541A8 80242038 00661821 */  addu      $v1, $v1, $a2
-/* 8541AC 8024203C 000318C0 */  sll       $v1, $v1, 3
-/* 8541B0 80242040 3C01800B */  lui       $at, 0x800b
-/* 8541B4 80242044 00230821 */  addu      $at, $at, $v1
-/* 8541B8 80242048 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 8541BC 8024204C 8E150004 */  lw        $s5, 4($s0)
-/* 8541C0 80242050 4600010D */  trunc.w.s $f4, $f0
-/* 8541C4 80242054 44112000 */  mfc1      $s1, $f4
-/* 8541C8 80242058 0C0B1EAF */  jal       get_variable
-/* 8541CC 8024205C 0040982D */   daddu    $s3, $v0, $zero
-/* 8541D0 80242060 4491B000 */  mtc1      $s1, $f22
-/* 8541D4 80242064 00000000 */  nop       
-/* 8541D8 80242068 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8541DC 8024206C 4600B306 */  mov.s     $f12, $f22
-/* 8541E0 80242070 0C00A8D4 */  jal       cos_deg
-/* 8541E4 80242074 0040802D */   daddu    $s0, $v0, $zero
-/* 8541E8 80242078 4493A000 */  mtc1      $s3, $f20
-/* 8541EC 8024207C 00000000 */  nop       
-/* 8541F0 80242080 4680A520 */  cvt.s.w   $f20, $f20
-/* 8541F4 80242084 4600A002 */  mul.s     $f0, $f20, $f0
-/* 8541F8 80242088 00000000 */  nop       
-/* 8541FC 8024208C 0240202D */  daddu     $a0, $s2, $zero
-/* 854200 80242090 44901000 */  mtc1      $s0, $f2
-/* 854204 80242094 00000000 */  nop       
-/* 854208 80242098 468010A0 */  cvt.s.w   $f2, $f2
-/* 85420C 8024209C 46001081 */  sub.s     $f2, $f2, $f0
-/* 854210 802420A0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 854214 802420A4 4600110D */  trunc.w.s $f4, $f2
-/* 854218 802420A8 44102000 */  mfc1      $s0, $f4
-/* 85421C 802420AC 0C0B1EAF */  jal       get_variable
-/* 854220 802420B0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 854224 802420B4 4600B306 */  mov.s     $f12, $f22
-/* 854228 802420B8 0C00A8BB */  jal       sin_deg
-/* 85422C 802420BC 0040882D */   daddu    $s1, $v0, $zero
-/* 854230 802420C0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 854234 802420C4 00000000 */  nop       
-/* 854238 802420C8 0240202D */  daddu     $a0, $s2, $zero
-/* 85423C 802420CC 44910000 */  mtc1      $s1, $f0
-/* 854240 802420D0 00000000 */  nop       
-/* 854244 802420D4 46800020 */  cvt.s.w   $f0, $f0
-/* 854248 802420D8 46140001 */  sub.s     $f0, $f0, $f20
-/* 85424C 802420DC 0280282D */  daddu     $a1, $s4, $zero
-/* 854250 802420E0 02173023 */  subu      $a2, $s0, $s7
-/* 854254 802420E4 4600010D */  trunc.w.s $f4, $f0
-/* 854258 802420E8 44102000 */  mfc1      $s0, $f4
-/* 85425C 802420EC 0C0B2026 */  jal       set_variable
-/* 854260 802420F0 02168023 */   subu     $s0, $s0, $s6
-/* 854264 802420F4 0240202D */  daddu     $a0, $s2, $zero
-/* 854268 802420F8 02A0282D */  daddu     $a1, $s5, $zero
-/* 85426C 802420FC 0C0B2026 */  jal       set_variable
-/* 854270 80242100 0200302D */   daddu    $a2, $s0, $zero
-/* 854274 80242104 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 854278 80242108 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 85427C 8024210C 8FB60028 */  lw        $s6, 0x28($sp)
-/* 854280 80242110 8FB50024 */  lw        $s5, 0x24($sp)
-/* 854284 80242114 8FB40020 */  lw        $s4, 0x20($sp)
-/* 854288 80242118 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 85428C 8024211C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 854290 80242120 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854294 80242124 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854298 80242128 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 85429C 8024212C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 8542A0 80242130 24020002 */  addiu     $v0, $zero, 2
-/* 8542A4 80242134 03E00008 */  jr        $ra
-/* 8542A8 80242138 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s
deleted file mode 100644
index abdcd550d0..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419E8_9C6DC8
-/* 9C6DC8 802419E8 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 9C6DCC 802419EC AFB20018 */  sw        $s2, 0x18($sp)
-/* 9C6DD0 802419F0 0080902D */  daddu     $s2, $a0, $zero
-/* 9C6DD4 802419F4 AFBF0030 */  sw        $ra, 0x30($sp)
-/* 9C6DD8 802419F8 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 9C6DDC 802419FC AFB60028 */  sw        $s6, 0x28($sp)
-/* 9C6DE0 80241A00 AFB50024 */  sw        $s5, 0x24($sp)
-/* 9C6DE4 80241A04 AFB40020 */  sw        $s4, 0x20($sp)
-/* 9C6DE8 80241A08 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9C6DEC 80241A0C AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C6DF0 80241A10 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6DF4 80241A14 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 9C6DF8 80241A18 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 9C6DFC 80241A1C 8E50000C */  lw        $s0, 0xc($s2)
-/* 9C6E00 80241A20 8E050000 */  lw        $a1, ($s0)
-/* 9C6E04 80241A24 0C0B1EAF */  jal       get_variable
-/* 9C6E08 80241A28 26100004 */   addiu    $s0, $s0, 4
-/* 9C6E0C 80241A2C 8E050000 */  lw        $a1, ($s0)
-/* 9C6E10 80241A30 26100004 */  addiu     $s0, $s0, 4
-/* 9C6E14 80241A34 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6E18 80241A38 0C0B1EAF */  jal       get_variable
-/* 9C6E1C 80241A3C 0040B82D */   daddu    $s7, $v0, $zero
-/* 9C6E20 80241A40 8E050000 */  lw        $a1, ($s0)
-/* 9C6E24 80241A44 26100004 */  addiu     $s0, $s0, 4
-/* 9C6E28 80241A48 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6E2C 80241A4C 0C0B1EAF */  jal       get_variable
-/* 9C6E30 80241A50 0040B02D */   daddu    $s6, $v0, $zero
-/* 9C6E34 80241A54 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6E38 80241A58 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9C6E3C 80241A5C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 9C6E40 80241A60 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 9C6E44 80241A64 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 9C6E48 80241A68 8E140000 */  lw        $s4, ($s0)
-/* 9C6E4C 80241A6C 00061880 */  sll       $v1, $a2, 2
-/* 9C6E50 80241A70 00661821 */  addu      $v1, $v1, $a2
-/* 9C6E54 80241A74 00031880 */  sll       $v1, $v1, 2
-/* 9C6E58 80241A78 00661823 */  subu      $v1, $v1, $a2
-/* 9C6E5C 80241A7C 000330C0 */  sll       $a2, $v1, 3
-/* 9C6E60 80241A80 00661821 */  addu      $v1, $v1, $a2
-/* 9C6E64 80241A84 000318C0 */  sll       $v1, $v1, 3
-/* 9C6E68 80241A88 3C01800B */  lui       $at, 0x800b
-/* 9C6E6C 80241A8C 00230821 */  addu      $at, $at, $v1
-/* 9C6E70 80241A90 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 9C6E74 80241A94 8E150004 */  lw        $s5, 4($s0)
-/* 9C6E78 80241A98 4600010D */  trunc.w.s $f4, $f0
-/* 9C6E7C 80241A9C 44112000 */  mfc1      $s1, $f4
-/* 9C6E80 80241AA0 0C0B1EAF */  jal       get_variable
-/* 9C6E84 80241AA4 0040982D */   daddu    $s3, $v0, $zero
-/* 9C6E88 80241AA8 4491B000 */  mtc1      $s1, $f22
-/* 9C6E8C 80241AAC 00000000 */  nop       
-/* 9C6E90 80241AB0 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 9C6E94 80241AB4 4600B306 */  mov.s     $f12, $f22
-/* 9C6E98 80241AB8 0C00A8D4 */  jal       cos_deg
-/* 9C6E9C 80241ABC 0040802D */   daddu    $s0, $v0, $zero
-/* 9C6EA0 80241AC0 4493A000 */  mtc1      $s3, $f20
-/* 9C6EA4 80241AC4 00000000 */  nop       
-/* 9C6EA8 80241AC8 4680A520 */  cvt.s.w   $f20, $f20
-/* 9C6EAC 80241ACC 4600A002 */  mul.s     $f0, $f20, $f0
-/* 9C6EB0 80241AD0 00000000 */  nop       
-/* 9C6EB4 80241AD4 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6EB8 80241AD8 44901000 */  mtc1      $s0, $f2
-/* 9C6EBC 80241ADC 00000000 */  nop       
-/* 9C6EC0 80241AE0 468010A0 */  cvt.s.w   $f2, $f2
-/* 9C6EC4 80241AE4 46001081 */  sub.s     $f2, $f2, $f0
-/* 9C6EC8 80241AE8 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9C6ECC 80241AEC 4600110D */  trunc.w.s $f4, $f2
-/* 9C6ED0 80241AF0 44102000 */  mfc1      $s0, $f4
-/* 9C6ED4 80241AF4 0C0B1EAF */  jal       get_variable
-/* 9C6ED8 80241AF8 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 9C6EDC 80241AFC 4600B306 */  mov.s     $f12, $f22
-/* 9C6EE0 80241B00 0C00A8BB */  jal       sin_deg
-/* 9C6EE4 80241B04 0040882D */   daddu    $s1, $v0, $zero
-/* 9C6EE8 80241B08 4600A502 */  mul.s     $f20, $f20, $f0
-/* 9C6EEC 80241B0C 00000000 */  nop       
-/* 9C6EF0 80241B10 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6EF4 80241B14 44910000 */  mtc1      $s1, $f0
-/* 9C6EF8 80241B18 00000000 */  nop       
-/* 9C6EFC 80241B1C 46800020 */  cvt.s.w   $f0, $f0
-/* 9C6F00 80241B20 46140001 */  sub.s     $f0, $f0, $f20
-/* 9C6F04 80241B24 0280282D */  daddu     $a1, $s4, $zero
-/* 9C6F08 80241B28 02173023 */  subu      $a2, $s0, $s7
-/* 9C6F0C 80241B2C 4600010D */  trunc.w.s $f4, $f0
-/* 9C6F10 80241B30 44102000 */  mfc1      $s0, $f4
-/* 9C6F14 80241B34 0C0B2026 */  jal       set_variable
-/* 9C6F18 80241B38 02168023 */   subu     $s0, $s0, $s6
-/* 9C6F1C 80241B3C 0240202D */  daddu     $a0, $s2, $zero
-/* 9C6F20 80241B40 02A0282D */  daddu     $a1, $s5, $zero
-/* 9C6F24 80241B44 0C0B2026 */  jal       set_variable
-/* 9C6F28 80241B48 0200302D */   daddu    $a2, $s0, $zero
-/* 9C6F2C 80241B4C 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 9C6F30 80241B50 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 9C6F34 80241B54 8FB60028 */  lw        $s6, 0x28($sp)
-/* 9C6F38 80241B58 8FB50024 */  lw        $s5, 0x24($sp)
-/* 9C6F3C 80241B5C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9C6F40 80241B60 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9C6F44 80241B64 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9C6F48 80241B68 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C6F4C 80241B6C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C6F50 80241B70 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 9C6F54 80241B74 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 9C6F58 80241B78 24020002 */  addiu     $v0, $zero, 2
-/* 9C6F5C 80241B7C 03E00008 */  jr        $ra
-/* 9C6F60 80241B80 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s
deleted file mode 100644
index 9de74ff0f4..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242590_9D95B0
-/* 9D95B0 80242590 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 9D95B4 80242594 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9D95B8 80242598 0080902D */  daddu     $s2, $a0, $zero
-/* 9D95BC 8024259C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 9D95C0 802425A0 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 9D95C4 802425A4 AFB60028 */  sw        $s6, 0x28($sp)
-/* 9D95C8 802425A8 AFB50024 */  sw        $s5, 0x24($sp)
-/* 9D95CC 802425AC AFB40020 */  sw        $s4, 0x20($sp)
-/* 9D95D0 802425B0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9D95D4 802425B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D95D8 802425B8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D95DC 802425BC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 9D95E0 802425C0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 9D95E4 802425C4 8E50000C */  lw        $s0, 0xc($s2)
-/* 9D95E8 802425C8 8E050000 */  lw        $a1, ($s0)
-/* 9D95EC 802425CC 0C0B1EAF */  jal       get_variable
-/* 9D95F0 802425D0 26100004 */   addiu    $s0, $s0, 4
-/* 9D95F4 802425D4 8E050000 */  lw        $a1, ($s0)
-/* 9D95F8 802425D8 26100004 */  addiu     $s0, $s0, 4
-/* 9D95FC 802425DC 0240202D */  daddu     $a0, $s2, $zero
-/* 9D9600 802425E0 0C0B1EAF */  jal       get_variable
-/* 9D9604 802425E4 0040B82D */   daddu    $s7, $v0, $zero
-/* 9D9608 802425E8 8E050000 */  lw        $a1, ($s0)
-/* 9D960C 802425EC 26100004 */  addiu     $s0, $s0, 4
-/* 9D9610 802425F0 0240202D */  daddu     $a0, $s2, $zero
-/* 9D9614 802425F4 0C0B1EAF */  jal       get_variable
-/* 9D9618 802425F8 0040B02D */   daddu    $s6, $v0, $zero
-/* 9D961C 802425FC 0240202D */  daddu     $a0, $s2, $zero
-/* 9D9620 80242600 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9D9624 80242604 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 9D9628 80242608 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 9D962C 8024260C 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 9D9630 80242610 8E140000 */  lw        $s4, ($s0)
-/* 9D9634 80242614 00061880 */  sll       $v1, $a2, 2
-/* 9D9638 80242618 00661821 */  addu      $v1, $v1, $a2
-/* 9D963C 8024261C 00031880 */  sll       $v1, $v1, 2
-/* 9D9640 80242620 00661823 */  subu      $v1, $v1, $a2
-/* 9D9644 80242624 000330C0 */  sll       $a2, $v1, 3
-/* 9D9648 80242628 00661821 */  addu      $v1, $v1, $a2
-/* 9D964C 8024262C 000318C0 */  sll       $v1, $v1, 3
-/* 9D9650 80242630 3C01800B */  lui       $at, 0x800b
-/* 9D9654 80242634 00230821 */  addu      $at, $at, $v1
-/* 9D9658 80242638 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* 9D965C 8024263C 8E150004 */  lw        $s5, 4($s0)
-/* 9D9660 80242640 4600010D */  trunc.w.s $f4, $f0
-/* 9D9664 80242644 44112000 */  mfc1      $s1, $f4
-/* 9D9668 80242648 0C0B1EAF */  jal       get_variable
-/* 9D966C 8024264C 0040982D */   daddu    $s3, $v0, $zero
-/* 9D9670 80242650 4491B000 */  mtc1      $s1, $f22
-/* 9D9674 80242654 00000000 */  nop       
-/* 9D9678 80242658 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 9D967C 8024265C 4600B306 */  mov.s     $f12, $f22
-/* 9D9680 80242660 0C00A8D4 */  jal       cos_deg
-/* 9D9684 80242664 0040802D */   daddu    $s0, $v0, $zero
-/* 9D9688 80242668 4493A000 */  mtc1      $s3, $f20
-/* 9D968C 8024266C 00000000 */  nop       
-/* 9D9690 80242670 4680A520 */  cvt.s.w   $f20, $f20
-/* 9D9694 80242674 4600A002 */  mul.s     $f0, $f20, $f0
-/* 9D9698 80242678 00000000 */  nop       
-/* 9D969C 8024267C 0240202D */  daddu     $a0, $s2, $zero
-/* 9D96A0 80242680 44901000 */  mtc1      $s0, $f2
-/* 9D96A4 80242684 00000000 */  nop       
-/* 9D96A8 80242688 468010A0 */  cvt.s.w   $f2, $f2
-/* 9D96AC 8024268C 46001081 */  sub.s     $f2, $f2, $f0
-/* 9D96B0 80242690 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9D96B4 80242694 4600110D */  trunc.w.s $f4, $f2
-/* 9D96B8 80242698 44102000 */  mfc1      $s0, $f4
-/* 9D96BC 8024269C 0C0B1EAF */  jal       get_variable
-/* 9D96C0 802426A0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 9D96C4 802426A4 4600B306 */  mov.s     $f12, $f22
-/* 9D96C8 802426A8 0C00A8BB */  jal       sin_deg
-/* 9D96CC 802426AC 0040882D */   daddu    $s1, $v0, $zero
-/* 9D96D0 802426B0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 9D96D4 802426B4 00000000 */  nop       
-/* 9D96D8 802426B8 0240202D */  daddu     $a0, $s2, $zero
-/* 9D96DC 802426BC 44910000 */  mtc1      $s1, $f0
-/* 9D96E0 802426C0 00000000 */  nop       
-/* 9D96E4 802426C4 46800020 */  cvt.s.w   $f0, $f0
-/* 9D96E8 802426C8 46140001 */  sub.s     $f0, $f0, $f20
-/* 9D96EC 802426CC 0280282D */  daddu     $a1, $s4, $zero
-/* 9D96F0 802426D0 02173023 */  subu      $a2, $s0, $s7
-/* 9D96F4 802426D4 4600010D */  trunc.w.s $f4, $f0
-/* 9D96F8 802426D8 44102000 */  mfc1      $s0, $f4
-/* 9D96FC 802426DC 0C0B2026 */  jal       set_variable
-/* 9D9700 802426E0 02168023 */   subu     $s0, $s0, $s6
-/* 9D9704 802426E4 0240202D */  daddu     $a0, $s2, $zero
-/* 9D9708 802426E8 02A0282D */  daddu     $a1, $s5, $zero
-/* 9D970C 802426EC 0C0B2026 */  jal       set_variable
-/* 9D9710 802426F0 0200302D */   daddu    $a2, $s0, $zero
-/* 9D9714 802426F4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 9D9718 802426F8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 9D971C 802426FC 8FB60028 */  lw        $s6, 0x28($sp)
-/* 9D9720 80242700 8FB50024 */  lw        $s5, 0x24($sp)
-/* 9D9724 80242704 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9D9728 80242708 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9D972C 8024270C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9D9730 80242710 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9734 80242714 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9738 80242718 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 9D973C 8024271C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 9D9740 80242720 24020002 */  addiu     $v0, $zero, 2
-/* 9D9744 80242724 03E00008 */  jr        $ra
-/* 9D9748 80242728 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s
deleted file mode 100644
index 366f4cab7e..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241380_CF8EF0
-/* CF8EF0 80241380 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* CF8EF4 80241384 AFB20018 */  sw        $s2, 0x18($sp)
-/* CF8EF8 80241388 0080902D */  daddu     $s2, $a0, $zero
-/* CF8EFC 8024138C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CF8F00 80241390 AFB7002C */  sw        $s7, 0x2c($sp)
-/* CF8F04 80241394 AFB60028 */  sw        $s6, 0x28($sp)
-/* CF8F08 80241398 AFB50024 */  sw        $s5, 0x24($sp)
-/* CF8F0C 8024139C AFB40020 */  sw        $s4, 0x20($sp)
-/* CF8F10 802413A0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CF8F14 802413A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF8F18 802413A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF8F1C 802413AC F7B60040 */  sdc1      $f22, 0x40($sp)
-/* CF8F20 802413B0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* CF8F24 802413B4 8E50000C */  lw        $s0, 0xc($s2)
-/* CF8F28 802413B8 8E050000 */  lw        $a1, ($s0)
-/* CF8F2C 802413BC 0C0B1EAF */  jal       get_variable
-/* CF8F30 802413C0 26100004 */   addiu    $s0, $s0, 4
-/* CF8F34 802413C4 8E050000 */  lw        $a1, ($s0)
-/* CF8F38 802413C8 26100004 */  addiu     $s0, $s0, 4
-/* CF8F3C 802413CC 0240202D */  daddu     $a0, $s2, $zero
-/* CF8F40 802413D0 0C0B1EAF */  jal       get_variable
-/* CF8F44 802413D4 0040B82D */   daddu    $s7, $v0, $zero
-/* CF8F48 802413D8 8E050000 */  lw        $a1, ($s0)
-/* CF8F4C 802413DC 26100004 */  addiu     $s0, $s0, 4
-/* CF8F50 802413E0 0240202D */  daddu     $a0, $s2, $zero
-/* CF8F54 802413E4 0C0B1EAF */  jal       get_variable
-/* CF8F58 802413E8 0040B02D */   daddu    $s6, $v0, $zero
-/* CF8F5C 802413EC 0240202D */  daddu     $a0, $s2, $zero
-/* CF8F60 802413F0 3C05F4AC */  lui       $a1, 0xf4ac
-/* CF8F64 802413F4 34A5D481 */  ori       $a1, $a1, 0xd481
-/* CF8F68 802413F8 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* CF8F6C 802413FC 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* CF8F70 80241400 8E140000 */  lw        $s4, ($s0)
-/* CF8F74 80241404 00061880 */  sll       $v1, $a2, 2
-/* CF8F78 80241408 00661821 */  addu      $v1, $v1, $a2
-/* CF8F7C 8024140C 00031880 */  sll       $v1, $v1, 2
-/* CF8F80 80241410 00661823 */  subu      $v1, $v1, $a2
-/* CF8F84 80241414 000330C0 */  sll       $a2, $v1, 3
-/* CF8F88 80241418 00661821 */  addu      $v1, $v1, $a2
-/* CF8F8C 8024141C 000318C0 */  sll       $v1, $v1, 3
-/* CF8F90 80241420 3C01800B */  lui       $at, 0x800b
-/* CF8F94 80241424 00230821 */  addu      $at, $at, $v1
-/* CF8F98 80241428 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* CF8F9C 8024142C 8E150004 */  lw        $s5, 4($s0)
-/* CF8FA0 80241430 4600010D */  trunc.w.s $f4, $f0
-/* CF8FA4 80241434 44112000 */  mfc1      $s1, $f4
-/* CF8FA8 80241438 0C0B1EAF */  jal       get_variable
-/* CF8FAC 8024143C 0040982D */   daddu    $s3, $v0, $zero
-/* CF8FB0 80241440 4491B000 */  mtc1      $s1, $f22
-/* CF8FB4 80241444 00000000 */  nop       
-/* CF8FB8 80241448 4680B5A0 */  cvt.s.w   $f22, $f22
-/* CF8FBC 8024144C 4600B306 */  mov.s     $f12, $f22
-/* CF8FC0 80241450 0C00A8D4 */  jal       cos_deg
-/* CF8FC4 80241454 0040802D */   daddu    $s0, $v0, $zero
-/* CF8FC8 80241458 4493A000 */  mtc1      $s3, $f20
-/* CF8FCC 8024145C 00000000 */  nop       
-/* CF8FD0 80241460 4680A520 */  cvt.s.w   $f20, $f20
-/* CF8FD4 80241464 4600A002 */  mul.s     $f0, $f20, $f0
-/* CF8FD8 80241468 00000000 */  nop       
-/* CF8FDC 8024146C 0240202D */  daddu     $a0, $s2, $zero
-/* CF8FE0 80241470 44901000 */  mtc1      $s0, $f2
-/* CF8FE4 80241474 00000000 */  nop       
-/* CF8FE8 80241478 468010A0 */  cvt.s.w   $f2, $f2
-/* CF8FEC 8024147C 46001081 */  sub.s     $f2, $f2, $f0
-/* CF8FF0 80241480 3C05F4AC */  lui       $a1, 0xf4ac
-/* CF8FF4 80241484 4600110D */  trunc.w.s $f4, $f2
-/* CF8FF8 80241488 44102000 */  mfc1      $s0, $f4
-/* CF8FFC 8024148C 0C0B1EAF */  jal       get_variable
-/* CF9000 80241490 34A5D483 */   ori      $a1, $a1, 0xd483
-/* CF9004 80241494 4600B306 */  mov.s     $f12, $f22
-/* CF9008 80241498 0C00A8BB */  jal       sin_deg
-/* CF900C 8024149C 0040882D */   daddu    $s1, $v0, $zero
-/* CF9010 802414A0 4600A502 */  mul.s     $f20, $f20, $f0
-/* CF9014 802414A4 00000000 */  nop       
-/* CF9018 802414A8 0240202D */  daddu     $a0, $s2, $zero
-/* CF901C 802414AC 44910000 */  mtc1      $s1, $f0
-/* CF9020 802414B0 00000000 */  nop       
-/* CF9024 802414B4 46800020 */  cvt.s.w   $f0, $f0
-/* CF9028 802414B8 46140001 */  sub.s     $f0, $f0, $f20
-/* CF902C 802414BC 0280282D */  daddu     $a1, $s4, $zero
-/* CF9030 802414C0 02173023 */  subu      $a2, $s0, $s7
-/* CF9034 802414C4 4600010D */  trunc.w.s $f4, $f0
-/* CF9038 802414C8 44102000 */  mfc1      $s0, $f4
-/* CF903C 802414CC 0C0B2026 */  jal       set_variable
-/* CF9040 802414D0 02168023 */   subu     $s0, $s0, $s6
-/* CF9044 802414D4 0240202D */  daddu     $a0, $s2, $zero
-/* CF9048 802414D8 02A0282D */  daddu     $a1, $s5, $zero
-/* CF904C 802414DC 0C0B2026 */  jal       set_variable
-/* CF9050 802414E0 0200302D */   daddu    $a2, $s0, $zero
-/* CF9054 802414E4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CF9058 802414E8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* CF905C 802414EC 8FB60028 */  lw        $s6, 0x28($sp)
-/* CF9060 802414F0 8FB50024 */  lw        $s5, 0x24($sp)
-/* CF9064 802414F4 8FB40020 */  lw        $s4, 0x20($sp)
-/* CF9068 802414F8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CF906C 802414FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* CF9070 80241500 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF9074 80241504 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF9078 80241508 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* CF907C 8024150C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* CF9080 80241510 24020002 */  addiu     $v0, $zero, 2
-/* CF9084 80241514 03E00008 */  jr        $ra
-/* CF9088 80241518 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s
deleted file mode 100644
index 26ee6de3ae..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417AC_D06EDC
-/* D06EDC 802417AC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D06EE0 802417B0 AFB20018 */  sw        $s2, 0x18($sp)
-/* D06EE4 802417B4 0080902D */  daddu     $s2, $a0, $zero
-/* D06EE8 802417B8 AFBF0030 */  sw        $ra, 0x30($sp)
-/* D06EEC 802417BC AFB7002C */  sw        $s7, 0x2c($sp)
-/* D06EF0 802417C0 AFB60028 */  sw        $s6, 0x28($sp)
-/* D06EF4 802417C4 AFB50024 */  sw        $s5, 0x24($sp)
-/* D06EF8 802417C8 AFB40020 */  sw        $s4, 0x20($sp)
-/* D06EFC 802417CC AFB3001C */  sw        $s3, 0x1c($sp)
-/* D06F00 802417D0 AFB10014 */  sw        $s1, 0x14($sp)
-/* D06F04 802417D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* D06F08 802417D8 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* D06F0C 802417DC F7B40038 */  sdc1      $f20, 0x38($sp)
-/* D06F10 802417E0 8E50000C */  lw        $s0, 0xc($s2)
-/* D06F14 802417E4 8E050000 */  lw        $a1, ($s0)
-/* D06F18 802417E8 0C0B1EAF */  jal       get_variable
-/* D06F1C 802417EC 26100004 */   addiu    $s0, $s0, 4
-/* D06F20 802417F0 8E050000 */  lw        $a1, ($s0)
-/* D06F24 802417F4 26100004 */  addiu     $s0, $s0, 4
-/* D06F28 802417F8 0240202D */  daddu     $a0, $s2, $zero
-/* D06F2C 802417FC 0C0B1EAF */  jal       get_variable
-/* D06F30 80241800 0040B82D */   daddu    $s7, $v0, $zero
-/* D06F34 80241804 8E050000 */  lw        $a1, ($s0)
-/* D06F38 80241808 26100004 */  addiu     $s0, $s0, 4
-/* D06F3C 8024180C 0240202D */  daddu     $a0, $s2, $zero
-/* D06F40 80241810 0C0B1EAF */  jal       get_variable
-/* D06F44 80241814 0040B02D */   daddu    $s6, $v0, $zero
-/* D06F48 80241818 0240202D */  daddu     $a0, $s2, $zero
-/* D06F4C 8024181C 3C05F4AC */  lui       $a1, 0xf4ac
-/* D06F50 80241820 34A5D481 */  ori       $a1, $a1, 0xd481
-/* D06F54 80241824 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* D06F58 80241828 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* D06F5C 8024182C 8E140000 */  lw        $s4, ($s0)
-/* D06F60 80241830 00061880 */  sll       $v1, $a2, 2
-/* D06F64 80241834 00661821 */  addu      $v1, $v1, $a2
-/* D06F68 80241838 00031880 */  sll       $v1, $v1, 2
-/* D06F6C 8024183C 00661823 */  subu      $v1, $v1, $a2
-/* D06F70 80241840 000330C0 */  sll       $a2, $v1, 3
-/* D06F74 80241844 00661821 */  addu      $v1, $v1, $a2
-/* D06F78 80241848 000318C0 */  sll       $v1, $v1, 3
-/* D06F7C 8024184C 3C01800B */  lui       $at, 0x800b
-/* D06F80 80241850 00230821 */  addu      $at, $at, $v1
-/* D06F84 80241854 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* D06F88 80241858 8E150004 */  lw        $s5, 4($s0)
-/* D06F8C 8024185C 4600010D */  trunc.w.s $f4, $f0
-/* D06F90 80241860 44112000 */  mfc1      $s1, $f4
-/* D06F94 80241864 0C0B1EAF */  jal       get_variable
-/* D06F98 80241868 0040982D */   daddu    $s3, $v0, $zero
-/* D06F9C 8024186C 4491B000 */  mtc1      $s1, $f22
-/* D06FA0 80241870 00000000 */  nop       
-/* D06FA4 80241874 4680B5A0 */  cvt.s.w   $f22, $f22
-/* D06FA8 80241878 4600B306 */  mov.s     $f12, $f22
-/* D06FAC 8024187C 0C00A8D4 */  jal       cos_deg
-/* D06FB0 80241880 0040802D */   daddu    $s0, $v0, $zero
-/* D06FB4 80241884 4493A000 */  mtc1      $s3, $f20
-/* D06FB8 80241888 00000000 */  nop       
-/* D06FBC 8024188C 4680A520 */  cvt.s.w   $f20, $f20
-/* D06FC0 80241890 4600A002 */  mul.s     $f0, $f20, $f0
-/* D06FC4 80241894 00000000 */  nop       
-/* D06FC8 80241898 0240202D */  daddu     $a0, $s2, $zero
-/* D06FCC 8024189C 44901000 */  mtc1      $s0, $f2
-/* D06FD0 802418A0 00000000 */  nop       
-/* D06FD4 802418A4 468010A0 */  cvt.s.w   $f2, $f2
-/* D06FD8 802418A8 46001081 */  sub.s     $f2, $f2, $f0
-/* D06FDC 802418AC 3C05F4AC */  lui       $a1, 0xf4ac
-/* D06FE0 802418B0 4600110D */  trunc.w.s $f4, $f2
-/* D06FE4 802418B4 44102000 */  mfc1      $s0, $f4
-/* D06FE8 802418B8 0C0B1EAF */  jal       get_variable
-/* D06FEC 802418BC 34A5D483 */   ori      $a1, $a1, 0xd483
-/* D06FF0 802418C0 4600B306 */  mov.s     $f12, $f22
-/* D06FF4 802418C4 0C00A8BB */  jal       sin_deg
-/* D06FF8 802418C8 0040882D */   daddu    $s1, $v0, $zero
-/* D06FFC 802418CC 4600A502 */  mul.s     $f20, $f20, $f0
-/* D07000 802418D0 00000000 */  nop       
-/* D07004 802418D4 0240202D */  daddu     $a0, $s2, $zero
-/* D07008 802418D8 44910000 */  mtc1      $s1, $f0
-/* D0700C 802418DC 00000000 */  nop       
-/* D07010 802418E0 46800020 */  cvt.s.w   $f0, $f0
-/* D07014 802418E4 46140001 */  sub.s     $f0, $f0, $f20
-/* D07018 802418E8 0280282D */  daddu     $a1, $s4, $zero
-/* D0701C 802418EC 02173023 */  subu      $a2, $s0, $s7
-/* D07020 802418F0 4600010D */  trunc.w.s $f4, $f0
-/* D07024 802418F4 44102000 */  mfc1      $s0, $f4
-/* D07028 802418F8 0C0B2026 */  jal       set_variable
-/* D0702C 802418FC 02168023 */   subu     $s0, $s0, $s6
-/* D07030 80241900 0240202D */  daddu     $a0, $s2, $zero
-/* D07034 80241904 02A0282D */  daddu     $a1, $s5, $zero
-/* D07038 80241908 0C0B2026 */  jal       set_variable
-/* D0703C 8024190C 0200302D */   daddu    $a2, $s0, $zero
-/* D07040 80241910 8FBF0030 */  lw        $ra, 0x30($sp)
-/* D07044 80241914 8FB7002C */  lw        $s7, 0x2c($sp)
-/* D07048 80241918 8FB60028 */  lw        $s6, 0x28($sp)
-/* D0704C 8024191C 8FB50024 */  lw        $s5, 0x24($sp)
-/* D07050 80241920 8FB40020 */  lw        $s4, 0x20($sp)
-/* D07054 80241924 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D07058 80241928 8FB20018 */  lw        $s2, 0x18($sp)
-/* D0705C 8024192C 8FB10014 */  lw        $s1, 0x14($sp)
-/* D07060 80241930 8FB00010 */  lw        $s0, 0x10($sp)
-/* D07064 80241934 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* D07068 80241938 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* D0706C 8024193C 24020002 */  addiu     $v0, $zero, 2
-/* D07070 80241940 03E00008 */  jr        $ra
-/* D07074 80241944 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s
deleted file mode 100644
index 546c2ed5db..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241450_D3BA20
-/* D3BA20 80241450 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D3BA24 80241454 AFB20018 */  sw        $s2, 0x18($sp)
-/* D3BA28 80241458 0080902D */  daddu     $s2, $a0, $zero
-/* D3BA2C 8024145C AFBF0030 */  sw        $ra, 0x30($sp)
-/* D3BA30 80241460 AFB7002C */  sw        $s7, 0x2c($sp)
-/* D3BA34 80241464 AFB60028 */  sw        $s6, 0x28($sp)
-/* D3BA38 80241468 AFB50024 */  sw        $s5, 0x24($sp)
-/* D3BA3C 8024146C AFB40020 */  sw        $s4, 0x20($sp)
-/* D3BA40 80241470 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D3BA44 80241474 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3BA48 80241478 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BA4C 8024147C F7B60040 */  sdc1      $f22, 0x40($sp)
-/* D3BA50 80241480 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* D3BA54 80241484 8E50000C */  lw        $s0, 0xc($s2)
-/* D3BA58 80241488 8E050000 */  lw        $a1, ($s0)
-/* D3BA5C 8024148C 0C0B1EAF */  jal       get_variable
-/* D3BA60 80241490 26100004 */   addiu    $s0, $s0, 4
-/* D3BA64 80241494 8E050000 */  lw        $a1, ($s0)
-/* D3BA68 80241498 26100004 */  addiu     $s0, $s0, 4
-/* D3BA6C 8024149C 0240202D */  daddu     $a0, $s2, $zero
-/* D3BA70 802414A0 0C0B1EAF */  jal       get_variable
-/* D3BA74 802414A4 0040B82D */   daddu    $s7, $v0, $zero
-/* D3BA78 802414A8 8E050000 */  lw        $a1, ($s0)
-/* D3BA7C 802414AC 26100004 */  addiu     $s0, $s0, 4
-/* D3BA80 802414B0 0240202D */  daddu     $a0, $s2, $zero
-/* D3BA84 802414B4 0C0B1EAF */  jal       get_variable
-/* D3BA88 802414B8 0040B02D */   daddu    $s6, $v0, $zero
-/* D3BA8C 802414BC 0240202D */  daddu     $a0, $s2, $zero
-/* D3BA90 802414C0 3C05F4AC */  lui       $a1, 0xf4ac
-/* D3BA94 802414C4 34A5D481 */  ori       $a1, $a1, 0xd481
-/* D3BA98 802414C8 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* D3BA9C 802414CC 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* D3BAA0 802414D0 8E140000 */  lw        $s4, ($s0)
-/* D3BAA4 802414D4 00061880 */  sll       $v1, $a2, 2
-/* D3BAA8 802414D8 00661821 */  addu      $v1, $v1, $a2
-/* D3BAAC 802414DC 00031880 */  sll       $v1, $v1, 2
-/* D3BAB0 802414E0 00661823 */  subu      $v1, $v1, $a2
-/* D3BAB4 802414E4 000330C0 */  sll       $a2, $v1, 3
-/* D3BAB8 802414E8 00661821 */  addu      $v1, $v1, $a2
-/* D3BABC 802414EC 000318C0 */  sll       $v1, $v1, 3
-/* D3BAC0 802414F0 3C01800B */  lui       $at, 0x800b
-/* D3BAC4 802414F4 00230821 */  addu      $at, $at, $v1
-/* D3BAC8 802414F8 C4201DEC */  lwc1      $f0, 0x1dec($at)
-/* D3BACC 802414FC 8E150004 */  lw        $s5, 4($s0)
-/* D3BAD0 80241500 4600010D */  trunc.w.s $f4, $f0
-/* D3BAD4 80241504 44112000 */  mfc1      $s1, $f4
-/* D3BAD8 80241508 0C0B1EAF */  jal       get_variable
-/* D3BADC 8024150C 0040982D */   daddu    $s3, $v0, $zero
-/* D3BAE0 80241510 4491B000 */  mtc1      $s1, $f22
-/* D3BAE4 80241514 00000000 */  nop       
-/* D3BAE8 80241518 4680B5A0 */  cvt.s.w   $f22, $f22
-/* D3BAEC 8024151C 4600B306 */  mov.s     $f12, $f22
-/* D3BAF0 80241520 0C00A8D4 */  jal       cos_deg
-/* D3BAF4 80241524 0040802D */   daddu    $s0, $v0, $zero
-/* D3BAF8 80241528 4493A000 */  mtc1      $s3, $f20
-/* D3BAFC 8024152C 00000000 */  nop       
-/* D3BB00 80241530 4680A520 */  cvt.s.w   $f20, $f20
-/* D3BB04 80241534 4600A002 */  mul.s     $f0, $f20, $f0
-/* D3BB08 80241538 00000000 */  nop       
-/* D3BB0C 8024153C 0240202D */  daddu     $a0, $s2, $zero
-/* D3BB10 80241540 44901000 */  mtc1      $s0, $f2
-/* D3BB14 80241544 00000000 */  nop       
-/* D3BB18 80241548 468010A0 */  cvt.s.w   $f2, $f2
-/* D3BB1C 8024154C 46001081 */  sub.s     $f2, $f2, $f0
-/* D3BB20 80241550 3C05F4AC */  lui       $a1, 0xf4ac
-/* D3BB24 80241554 4600110D */  trunc.w.s $f4, $f2
-/* D3BB28 80241558 44102000 */  mfc1      $s0, $f4
-/* D3BB2C 8024155C 0C0B1EAF */  jal       get_variable
-/* D3BB30 80241560 34A5D483 */   ori      $a1, $a1, 0xd483
-/* D3BB34 80241564 4600B306 */  mov.s     $f12, $f22
-/* D3BB38 80241568 0C00A8BB */  jal       sin_deg
-/* D3BB3C 8024156C 0040882D */   daddu    $s1, $v0, $zero
-/* D3BB40 80241570 4600A502 */  mul.s     $f20, $f20, $f0
-/* D3BB44 80241574 00000000 */  nop       
-/* D3BB48 80241578 0240202D */  daddu     $a0, $s2, $zero
-/* D3BB4C 8024157C 44910000 */  mtc1      $s1, $f0
-/* D3BB50 80241580 00000000 */  nop       
-/* D3BB54 80241584 46800020 */  cvt.s.w   $f0, $f0
-/* D3BB58 80241588 46140001 */  sub.s     $f0, $f0, $f20
-/* D3BB5C 8024158C 0280282D */  daddu     $a1, $s4, $zero
-/* D3BB60 80241590 02173023 */  subu      $a2, $s0, $s7
-/* D3BB64 80241594 4600010D */  trunc.w.s $f4, $f0
-/* D3BB68 80241598 44102000 */  mfc1      $s0, $f4
-/* D3BB6C 8024159C 0C0B2026 */  jal       set_variable
-/* D3BB70 802415A0 02168023 */   subu     $s0, $s0, $s6
-/* D3BB74 802415A4 0240202D */  daddu     $a0, $s2, $zero
-/* D3BB78 802415A8 02A0282D */  daddu     $a1, $s5, $zero
-/* D3BB7C 802415AC 0C0B2026 */  jal       set_variable
-/* D3BB80 802415B0 0200302D */   daddu    $a2, $s0, $zero
-/* D3BB84 802415B4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* D3BB88 802415B8 8FB7002C */  lw        $s7, 0x2c($sp)
-/* D3BB8C 802415BC 8FB60028 */  lw        $s6, 0x28($sp)
-/* D3BB90 802415C0 8FB50024 */  lw        $s5, 0x24($sp)
-/* D3BB94 802415C4 8FB40020 */  lw        $s4, 0x20($sp)
-/* D3BB98 802415C8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D3BB9C 802415CC 8FB20018 */  lw        $s2, 0x18($sp)
-/* D3BBA0 802415D0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3BBA4 802415D4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BBA8 802415D8 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* D3BBAC 802415DC D7B40038 */  ldc1      $f20, 0x38($sp)
-/* D3BBB0 802415E0 24020002 */  addiu     $v0, $zero, 2
-/* D3BBB4 802415E4 03E00008 */  jr        $ra
-/* D3BBB8 802415E8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 22ec45c565..6c830f1a9b 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802420F0_95D2F0);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 7faca769c7..79119f7cc0 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240F80_96A140);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 7ace53be75..39e7b1af09 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -82,7 +82,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243124_A1E224);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 3b851deac3..ffbcd5fa49 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -74,7 +74,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242294_B2E704);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index dc4d3968e3..42110a0238 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -114,7 +114,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024281C_B373EC);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 4bd0517de5..dabb7538d5 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241010_8B1080);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index ff665da249..fab9255b53 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802412B0_7EBFC0);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index b6d4d62a6e..a58a831e4e 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242B90_803410);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index bcd3e2f306..743a8f3e88 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242440_825700);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 570b5a783d..d9ecc7e362 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241130_832930);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 6b8e166615..720e4bb115 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802410E0_843CB0);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 4d8d5c54b7..988afe6e52 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241FA0_854110);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index af5f8a1f64..7d13ba69b1 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802419E8_9C6DC8);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 664291827c..5a0850fdad 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242590_9D95B0);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 69254b3d83..b71f92c9ac 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241380_CF8EF0);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index add231fef5..76ec88b1d9 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802417AC_D06EDC);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 19820e5db8..841f1b7b7f 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241450_D3BA20);
+#include "world/common/UnkCameraFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC);
 
diff --git a/src/world/common/UnkCameraFunc.inc.c b/src/world/common/UnkCameraFunc.inc.c
new file mode 100644
index 0000000000..e20d04f1cd
--- /dev/null
+++ b/src/world/common/UnkCameraFunc.inc.c
@@ -0,0 +1,21 @@
+#include "common.h"
+
+static ApiStatus UnkCameraFunc(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    Bytecode out1 = *args++;
+    Bytecode out2 = *args++;
+    s32 cameraYaw = gCameras[gCurrentCameraID].currentYaw;
+    s32 outVal1 = get_variable(script, SI_ARRAY(1)) - (var2 * cos_deg(cameraYaw));
+    s32 outVal2 = get_variable(script, SI_ARRAY(3)) - (var2 * sin_deg(cameraYaw));
+
+    outVal1 -= var0;
+    outVal2 -= var1;
+
+    set_variable(script, out1, outVal1);
+    set_variable(script, out2, outVal2);
+
+    return ApiStatus_DONE2;
+}

From 8939f6da763f2dd09564e3f6ba7803ac63a683c8 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 17:45:38 +0000
Subject: [PATCH 039/101] fix dma_copy

---
 src/code_42e0_len_1f60.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c
index b38715016e..5a96a65017 100644
--- a/src/code_42e0_len_1f60.c
+++ b/src/code_42e0_len_1f60.c
@@ -53,7 +53,7 @@ void copy_matrix(Matrix4f* src, Matrix4f* dest) {
     bcopy(src, dest, sizeof(Matrix4f));
 }
 
-INCLUDE_ASM(s32, "code_42e0_len_1f60", dma_copy);
+INCLUDE_ASM(void, "code_42e0_len_1f60", dma_copy, void* romStart, void* romEnd, void* vramDest);
 
 INCLUDE_ASM(s32, "code_42e0_len_1f60", func_800297D4);
 

From 2a1c35a80ced96622222398a3ce05ae64f8003df Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 17:50:58 +0000
Subject: [PATCH 040/101] lint

---
 .../code_e0b30_len_b80/func_8014A498.s        | 43 -------------------
 include/map.h                                 |  2 +-
 src/code_28910_len_5090.c                     |  2 +-
 src/code_e0b30_len_b80.c                      |  2 +-
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s

diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s
deleted file mode 100644
index 69f5b7c302..0000000000
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8014A498
-/* E0B98 8014A498 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E0B9C 8014A49C AFBF0010 */  sw        $ra, 0x10($sp)
-/* E0BA0 8014A4A0 0000282D */  daddu     $a1, $zero, $zero
-/* E0BA4 8014A4A4 3C068015 */  lui       $a2, 0x8015
-/* E0BA8 8014A4A8 24C6F6F0 */  addiu     $a2, $a2, -0x910
-/* E0BAC 8014A4AC 24C70030 */  addiu     $a3, $a2, 0x30
-/* E0BB0 8014A4B0 3C048016 */  lui       $a0, 0x8016
-/* E0BB4 8014A4B4 24849AF0 */  addiu     $a0, $a0, -0x6510
-.L8014A4B8:
-/* E0BB8 8014A4B8 0080182D */  daddu     $v1, $a0, $zero
-/* E0BBC 8014A4BC 00C0102D */  daddu     $v0, $a2, $zero
-.L8014A4C0:
-/* E0BC0 8014A4C0 8C480000 */  lw        $t0, ($v0)
-/* E0BC4 8014A4C4 8C490004 */  lw        $t1, 4($v0)
-/* E0BC8 8014A4C8 8C4A0008 */  lw        $t2, 8($v0)
-/* E0BCC 8014A4CC 8C4B000C */  lw        $t3, 0xc($v0)
-/* E0BD0 8014A4D0 AC680000 */  sw        $t0, ($v1)
-/* E0BD4 8014A4D4 AC690004 */  sw        $t1, 4($v1)
-/* E0BD8 8014A4D8 AC6A0008 */  sw        $t2, 8($v1)
-/* E0BDC 8014A4DC AC6B000C */  sw        $t3, 0xc($v1)
-/* E0BE0 8014A4E0 24420010 */  addiu     $v0, $v0, 0x10
-/* E0BE4 8014A4E4 1447FFF6 */  bne       $v0, $a3, .L8014A4C0
-/* E0BE8 8014A4E8 24630010 */   addiu    $v1, $v1, 0x10
-/* E0BEC 8014A4EC 24A50001 */  addiu     $a1, $a1, 1
-/* E0BF0 8014A4F0 28A20002 */  slti      $v0, $a1, 2
-/* E0BF4 8014A4F4 1440FFF0 */  bnez      $v0, .L8014A4B8
-/* E0BF8 8014A4F8 24840030 */   addiu    $a0, $a0, 0x30
-/* E0BFC 8014A4FC 24020008 */  addiu     $v0, $zero, 8
-/* E0C00 8014A500 3C018016 */  lui       $at, %hi(gMusicTargetVolume)
-/* E0C04 8014A504 A4229AE2 */  sh        $v0, %lo(gMusicTargetVolume)($at)
-/* E0C08 8014A508 3C018016 */  lui       $at, %hi(gMusicUnkVolume2)
-/* E0C0C 8014A50C A4229AE4 */  sh        $v0, %lo(gMusicUnkVolume2)($at)
-/* E0C10 8014A510 3C018016 */  lui       $at, 0x8016
-/* E0C14 8014A514 A4229AE6 */  sh        $v0, -0x651a($at)
-/* E0C18 8014A518 0C015869 */  jal       func_800561A4
-/* E0C1C 8014A51C 24040008 */   addiu    $a0, $zero, 8
-/* E0C20 8014A520 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E0C24 8014A524 03E00008 */  jr        $ra
-/* E0C28 8014A528 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/map.h b/include/map.h
index f40c65c2b9..b06d236645 100644
--- a/include/map.h
+++ b/include/map.h
@@ -41,7 +41,7 @@ typedef struct Map {
     /* 0x0C */ void* dmaEnd;
     /* 0x10 */ void* dmaDest;
     /* 0x14 */ char* bgName;
-    /* 0x18 */ s32 (*init)(void); ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
+    /* 0x18 */ s32(*init)(void);  ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
     /* 0x1C */ s16 flags1;
     /* 0x1E */ s8 flags2;
     /* 0x1F */ s8 flags3;
diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c
index 62fe271554..40274bd6f0 100644
--- a/src/code_28910_len_5090.c
+++ b/src/code_28910_len_5090.c
@@ -33,7 +33,7 @@ s32 func_8004DA0C(UNK_TYPE arg0) {
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74);
 
-void func_8004DAA8(UnkStructFor8004DAA8 *arg0) {
+void func_8004DAA8(UnkStructFor8004DAA8* arg0) {
     if (arg0->unk_221 != 0) {
         arg0->unk_221 = 4;
         arg0->unk_010 = 1;
diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index c9a96443c1..3592d23ed6 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -31,7 +31,7 @@ void func_8014A498(void) {
     s32 i;
 
     for (i = 0; i < 2; i++) {
-        MusicPlayer *musicPlayers = gMusicPlayers;
+        MusicPlayer* musicPlayers = gMusicPlayers;
         musicPlayers[i] = *(src = &D_8014F6F0);
     }
 

From 0c2d448abbac653530e90c2ae5faf7b4563dc0ed Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 18:43:53 +0000
Subject: [PATCH 041/101] match start of rodata_73DA0

---
 src/code_341d0_len_20d0.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c
index d012373330..7808dbbc2b 100644
--- a/src/code_341d0_len_20d0.c
+++ b/src/code_341d0_len_20d0.c
@@ -51,9 +51,22 @@ void load_world_script_api(void) {
     dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM);
 }
 
-//const char* shape_sprintf = "%s_shape";
-//const char* hit_sprintf = "%s_hit";
-//const char* tex_sprintf = "%s_tex";
+// TODO
+static const s32 rodata_73DA0[] = {
+    0x82C882B5, 0x00000000, 0x82A982AD, 0x82B982A2,
+    0x00000000, 0x82B982C1, 0x82AB82E5, 0x82A40000,
+    0x82DE82C9, 0x82E182DE, 0x82C982E1, 0x00000000,
+    0x82D082C6, 0x82E882DA, 0x82AF0000, 0x83748340,
+    0x83438369, 0x838B837B, 0x83808377, 0x83430000,
+    0x83748340, 0x83438369, 0x838B834E, 0x838A8357,
+    0x83430000, 0X82C282A4, 0x82B682E5, 0x82A40000,
+
+    // These string literals belong to load_map_by_IDs
+    0x25735F73, 0x68617065, 0x00000000, // "%_shape"
+    0x25735F68, 0x69740000, // "%s_hit"
+    0x25735F74, 0x65780000, // "%s_tex"
+};
+
 INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config);

From a912691cfb827d106fb2486b1c1ea854dba86984 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 18:45:23 +0000
Subject: [PATCH 042/101] match SJIS

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ece296eab5..70b5f0dc8f 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	iconv --from UTF-8 --to SHIFT-JIS $< | $(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	iconv --from UTF-8 --to SHIFT-JIS $< | $(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s

From c1c0a98810125429b8f8543d4405cd975b03cf87 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 18:58:59 +0000
Subject: [PATCH 043/101] match area table

YOOOOOOOOOOOOOO
---
 src/code_341d0_len_20d0.c | 4 ++--
 tools/splat.yaml          | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c
index 7808dbbc2b..1ba99a02de 100644
--- a/src/code_341d0_len_20d0.c
+++ b/src/code_341d0_len_20d0.c
@@ -330,8 +330,8 @@ static Map kpa_maps[] = {
     { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .flags = 1 },
-    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
     { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .flags = 2 },
diff --git a/tools/splat.yaml b/tools/splat.yaml
index e813489ef3..4410ca32ee 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -201,6 +201,7 @@ segments:
     - [0x6B450, ".data", "code_341d0_len_20d0"]
     - [0x6EAC0, "bin"] # has scripts
     - [0x73DA0, ".rodata", "code_341d0_len_20d0"]
+    - [0x74EA0, "bin"]
   - type: code
     start: 0x759B0
     vram: 0x800DC500
@@ -4883,11 +4884,11 @@ segments:
       - [0xC047F0, "bin"]
       - [0xC20C70, "bin"] # rodata
       - [0xC20CF8, "bin"] # rodata
-      - [0xC20F40, "bin"] # rodata
+  - [0xC20F40, "bin"]
   - name: world/area_dgb/dgb_02/
     type: code
     overlay: True
-    start: 0xC2EBA0
+    start: 0xC2EBA0 # this is right
     vram: 0x80240000
     files:
       - [0xC2EBA0, "c"]
@@ -6503,7 +6504,7 @@ segments:
     files:
       - [0xE1E460, "c"]
       - [0xE1EC20, "bin"]
-      - [0xE20110, "bin"]
+  - [0xE20110, "bin"]
   - type: code
     overlay: True
     start: 0xE20EB0

From 3206f6ffde4b8b504c5c079dfc9a694e8bc175cd Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 19:01:24 +0000
Subject: [PATCH 044/101] name code_341d0_len_20d0.c

---
 src/{code_341d0_len_20d0.c => world/world.c} | 0
 tools/splat.yaml                             | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{code_341d0_len_20d0.c => world/world.c} (100%)

diff --git a/src/code_341d0_len_20d0.c b/src/world/world.c
similarity index 100%
rename from src/code_341d0_len_20d0.c
rename to src/world/world.c
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 4410ca32ee..12669b66e4 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -58,7 +58,7 @@ segments:
     - [0x2d9a0, "c", "code_2d9a0_len_890"]
     - [0x2e230, "c", "code_2e230_len_2190"]
     - [0x303c0, "c", "code_303c0_len_3e10"]
-    - [0x341d0, "c", "code_341d0_len_20d0"]
+    - [0x341d0, "c", "world/world"]
     - [0x362a0, "c", "code_362a0_len_2f70"]
     - [0x39210, "c", "code_39210_len_aa0"]
     - [0x39cb0, "c", "os/code_39cb0_len_100"]
@@ -198,9 +198,9 @@ segments:
     - [0x4ac90, "c", "os/code_4ac90_len_3910"]
     - [0x4E5A0, "bin"]
     - [0x52D50, "bin"]
-    - [0x6B450, ".data", "code_341d0_len_20d0"]
+    - [0x6B450, ".data", "world/world"]
     - [0x6EAC0, "bin"] # has scripts
-    - [0x73DA0, ".rodata", "code_341d0_len_20d0"]
+    - [0x73DA0, ".rodata", "world/world"]
     - [0x74EA0, "bin"]
   - type: code
     start: 0x759B0

From 241b037b5cd08d6a45acc568918013a033395b2c Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 19:08:29 +0000
Subject: [PATCH 045/101] iconv after preprocessing

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 70b5f0dc8f..06896b9546 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	iconv --from UTF-8 --to SHIFT-JIS $< | $(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	iconv --from UTF-8 --to SHIFT-JIS $< | $(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | tools/compile_dsl_macros.py | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s

From 202fc247ad41bba1a5bbf51bdcef0f2e90363f70 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 19:09:09 +0000
Subject: [PATCH 046/101] format

---
 src/code_28910_len_5090.c |  2 +-
 src/world/world.c         | 68 +++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c
index 62fe271554..40274bd6f0 100644
--- a/src/code_28910_len_5090.c
+++ b/src/code_28910_len_5090.c
@@ -33,7 +33,7 @@ s32 func_8004DA0C(UNK_TYPE arg0) {
 
 INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74);
 
-void func_8004DAA8(UnkStructFor8004DAA8 *arg0) {
+void func_8004DAA8(UnkStructFor8004DAA8* arg0) {
     if (arg0->unk_221 != 0) {
         arg0->unk_221 = 4;
         arg0->unk_010 = 1;
diff --git a/src/world/world.c b/src/world/world.c
index 1ba99a02de..e735380720 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -296,40 +296,40 @@ static Map hos_maps[] = {
 
 /// Bowser's Castle
 static Map kpa_maps[] = {
-    { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" },
-    { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_01,  0x80240A70), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_03,  0x80241EE0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_04,  0x80240190), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_08,  0x802414C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_09,  0x80241310), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_10,  0x80240360), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_11,  0x80240B40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_12,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_13,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_14,  0x802408A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_15,  0x802405E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_16,  0x802403B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_17,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_32,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_33,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_40,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_41,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_50,  0x80241A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_51,  0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_52,  0x80241360), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_53,  0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_60,  0x80240450), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_61,  0x80242360), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_62,  0x80240430), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_63,  0x802401B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_70,  0x80240B10), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_81,  0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_82,  0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_83,  0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_90,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_91,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_94,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_95,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_96,  0x80240040), .songVariation = 1, .flags = 1 },
     { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
     { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
     { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },

From 7fa97805b921ab0367db0a7aedee8ff1b2d3ed74 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 19:19:17 +0000
Subject: [PATCH 047/101] clean up get_song_variation_override_for_cur_map

---
 src/code_e0b30_len_b80.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c
index 3592d23ed6..4cf4fdfe38 100644
--- a/src/code_e0b30_len_b80.c
+++ b/src/code_e0b30_len_b80.c
@@ -12,12 +12,10 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
     u32 i = 0;
     Area* areas = gAreas;
     SongID* allowed = gSongsUsingVariationFlag;
-    GameStatus** gameStatusPtr = gGameStatusPtr;
 
     for (i = 0; i < ARRAY_COUNT(gSongsUsingVariationFlag); i++) {
         if (allowed[i] == songID) {
-            GameStatus* gameStatus = *gameStatusPtr;
-            Map* map = &areas[gameStatus->areaID].maps[gameStatus->mapID];
+            Map* map = &areas[GAME_STATUS->areaID].maps[GAME_STATUS->mapID];
 
             return map->flags2 & 1;
         }

From 74e8c61db17acd04a3cff46aa4a08339eb8b4569 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 19:28:42 +0000
Subject: [PATCH 048/101] bump splat

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 03bc049656..51961d2977 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 03bc04965678a0484257fdc2a566e905fb4ee653
+Subproject commit 51961d2977be12c340f0cc1d28d2c876dfc744ca

From 8ee2bf4522ae51b870845320232befa7929584af Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 16:23:23 -0400
Subject: [PATCH 049/101] UnkMoveNpc

---
 .../dro_01/95B7E0/func_80242380_95D580.s      | 63 -----------------
 .../dro_02/9694C0/func_80241210_96A3D0.s      | 63 -----------------
 .../hos_03/A1BDB0/func_802433B4_A1E4B4.s      | 63 -----------------
 .../jan_02/B2C8A0/func_80242524_B2E994.s      | 63 -----------------
 .../jan_03/B34BD0/func_80242AAC_B3767C.s      | 63 -----------------
 .../kmr_02/8B0070/func_802412A0_8B1310.s      | 63 -----------------
 .../mac_00/7EB340/func_80241540_7EC250.s      | 63 -----------------
 .../mac_00/7EB340/func_80242078_7ECD88.s      | 70 -------------------
 .../mac_01/8017D0/func_80242E20_8036A0.s      | 63 -----------------
 .../mac_02/823BF0/func_802426D0_825990.s      | 63 -----------------
 .../mac_03/831B20/func_802413C0_832BC0.s      | 63 -----------------
 .../mac_04/843030/func_80241370_843F40.s      | 63 -----------------
 .../mac_05/852170/func_80242230_8543A0.s      | 63 -----------------
 .../nok_01/9C53E0/func_80241C78_9C7058.s      | 63 -----------------
 .../nok_02/9D7AA0/func_80242820_9D9840.s      | 63 -----------------
 .../sam_01/CF7E80/func_80241610_CF9180.s      | 63 -----------------
 .../sam_02/D05F60/func_80241A3C_D0716C.s      | 63 -----------------
 .../sam_11/D3ADA0/func_802416E0_D3BCB0.s      | 63 -----------------
 src/world/area_dro/dro_01/95B7E0.c            |  2 +-
 src/world/area_dro/dro_02/9694C0.c            |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c            |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c            |  2 +-
 src/world/area_jan/jan_03/B34BD0.c            |  2 +-
 src/world/area_kmr/kmr_02/8B0070.c            |  2 +-
 src/world/area_mac/mac_00/7EB340.c            | 24 ++++++-
 src/world/area_mac/mac_01/8017D0.c            |  2 +-
 src/world/area_mac/mac_02/823BF0.c            |  2 +-
 src/world/area_mac/mac_03/831B20.c            |  2 +-
 src/world/area_mac/mac_04/843030.c            |  2 +-
 src/world/area_mac/mac_05/852170.c            |  2 +-
 src/world/area_nok/nok_01/9C53E0.c            |  2 +-
 src/world/area_nok/nok_02/9D7AA0.c            |  2 +-
 src/world/area_sam/sam_01/CF7E80.c            |  2 +-
 src/world/area_sam/sam_02/D05F60.c            |  2 +-
 src/world/area_sam/sam_11/D3ADA0.c            |  2 +-
 src/world/common/UnkMoveNpc.inc.c             | 19 +++++
 tools/m2ctx.py                                |  4 +-
 37 files changed, 58 insertions(+), 1162 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
 create mode 100644 src/world/common/UnkMoveNpc.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
deleted file mode 100644
index 89d307f487..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242380_95D580
-/* 95D580 80242380 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 95D584 80242384 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D588 80242388 0080882D */  daddu     $s1, $a0, $zero
-/* 95D58C 8024238C AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D590 80242390 00A0802D */  daddu     $s0, $a1, $zero
-/* 95D594 80242394 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 95D598 80242398 AFB20018 */  sw        $s2, 0x18($sp)
-/* 95D59C 8024239C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 95D5A0 802423A0 0C00EABB */  jal       get_npc_unsafe
-/* 95D5A4 802423A4 2404FFFC */   addiu    $a0, $zero, -4
-/* 95D5A8 802423A8 12000017 */  beqz      $s0, .L80242408
-/* 95D5AC 802423AC 0040902D */   daddu    $s2, $v0, $zero
-/* 95D5B0 802423B0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5B4 802423B4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5B8 802423B8 0C0B210B */  jal       get_float_variable
-/* 95D5BC 802423BC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 95D5C0 802423C0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5C4 802423C4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5C8 802423C8 3C014270 */  lui       $at, 0x4270
-/* 95D5CC 802423CC 4481A000 */  mtc1      $at, $f20
-/* 95D5D0 802423D0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 95D5D4 802423D4 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5D8 802423D8 0C0B210B */  jal       get_float_variable
-/* 95D5DC 802423DC E6200074 */   swc1     $f0, 0x74($s1)
-/* 95D5E0 802423E0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5E4 802423E4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5E8 802423E8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 95D5EC 802423EC 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5F0 802423F0 0C0B210B */  jal       get_float_variable
-/* 95D5F4 802423F4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 95D5F8 802423F8 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5FC 802423FC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 95D600 80242400 E620007C */  swc1      $f0, 0x7c($s1)
-/* 95D604 80242404 AE220070 */  sw        $v0, 0x70($s1)
-.L80242408:
-/* 95D608 80242408 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 95D60C 8024240C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 95D610 80242410 46020000 */  add.s     $f0, $f0, $f2
-/* 95D614 80242414 E6400038 */  swc1      $f0, 0x38($s2)
-/* 95D618 80242418 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 95D61C 8024241C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 95D620 80242420 46020000 */  add.s     $f0, $f0, $f2
-/* 95D624 80242424 E640003C */  swc1      $f0, 0x3c($s2)
-/* 95D628 80242428 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 95D62C 8024242C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 95D630 80242430 46020000 */  add.s     $f0, $f0, $f2
-/* 95D634 80242434 E6400040 */  swc1      $f0, 0x40($s2)
-/* 95D638 80242438 8E230070 */  lw        $v1, 0x70($s1)
-/* 95D63C 8024243C 2463FFFF */  addiu     $v1, $v1, -1
-/* 95D640 80242440 2C620001 */  sltiu     $v0, $v1, 1
-/* 95D644 80242444 AE230070 */  sw        $v1, 0x70($s1)
-/* 95D648 80242448 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 95D64C 8024244C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95D650 80242450 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D654 80242454 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D658 80242458 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 95D65C 8024245C 00021040 */  sll       $v0, $v0, 1
-/* 95D660 80242460 03E00008 */  jr        $ra
-/* 95D664 80242464 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
deleted file mode 100644
index 1311c901c0..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241210_96A3D0
-/* 96A3D0 80241210 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 96A3D4 80241214 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A3D8 80241218 0080882D */  daddu     $s1, $a0, $zero
-/* 96A3DC 8024121C AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A3E0 80241220 00A0802D */  daddu     $s0, $a1, $zero
-/* 96A3E4 80241224 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 96A3E8 80241228 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A3EC 8024122C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 96A3F0 80241230 0C00EABB */  jal       get_npc_unsafe
-/* 96A3F4 80241234 2404FFFC */   addiu    $a0, $zero, -4
-/* 96A3F8 80241238 12000017 */  beqz      $s0, .L80241298
-/* 96A3FC 8024123C 0040902D */   daddu    $s2, $v0, $zero
-/* 96A400 80241240 0220202D */  daddu     $a0, $s1, $zero
-/* 96A404 80241244 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A408 80241248 0C0B210B */  jal       get_float_variable
-/* 96A40C 8024124C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 96A410 80241250 0220202D */  daddu     $a0, $s1, $zero
-/* 96A414 80241254 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A418 80241258 3C014270 */  lui       $at, 0x4270
-/* 96A41C 8024125C 4481A000 */  mtc1      $at, $f20
-/* 96A420 80241260 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 96A424 80241264 46140003 */  div.s     $f0, $f0, $f20
-/* 96A428 80241268 0C0B210B */  jal       get_float_variable
-/* 96A42C 8024126C E6200074 */   swc1     $f0, 0x74($s1)
-/* 96A430 80241270 0220202D */  daddu     $a0, $s1, $zero
-/* 96A434 80241274 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A438 80241278 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 96A43C 8024127C 46140003 */  div.s     $f0, $f0, $f20
-/* 96A440 80241280 0C0B210B */  jal       get_float_variable
-/* 96A444 80241284 E6200078 */   swc1     $f0, 0x78($s1)
-/* 96A448 80241288 46140003 */  div.s     $f0, $f0, $f20
-/* 96A44C 8024128C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 96A450 80241290 E620007C */  swc1      $f0, 0x7c($s1)
-/* 96A454 80241294 AE220070 */  sw        $v0, 0x70($s1)
-.L80241298:
-/* 96A458 80241298 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 96A45C 8024129C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 96A460 802412A0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A464 802412A4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 96A468 802412A8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 96A46C 802412AC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 96A470 802412B0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A474 802412B4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 96A478 802412B8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 96A47C 802412BC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 96A480 802412C0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A484 802412C4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 96A488 802412C8 8E230070 */  lw        $v1, 0x70($s1)
-/* 96A48C 802412CC 2463FFFF */  addiu     $v1, $v1, -1
-/* 96A490 802412D0 2C620001 */  sltiu     $v0, $v1, 1
-/* 96A494 802412D4 AE230070 */  sw        $v1, 0x70($s1)
-/* 96A498 802412D8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 96A49C 802412DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A4A0 802412E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A4A4 802412E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A4A8 802412E8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 96A4AC 802412EC 00021040 */  sll       $v0, $v0, 1
-/* 96A4B0 802412F0 03E00008 */  jr        $ra
-/* 96A4B4 802412F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
deleted file mode 100644
index bad058ad7d..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802433B4_A1E4B4
-/* A1E4B4 802433B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A1E4B8 802433B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E4BC 802433BC 0080882D */  daddu     $s1, $a0, $zero
-/* A1E4C0 802433C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E4C4 802433C4 00A0802D */  daddu     $s0, $a1, $zero
-/* A1E4C8 802433C8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* A1E4CC 802433CC AFB20018 */  sw        $s2, 0x18($sp)
-/* A1E4D0 802433D0 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* A1E4D4 802433D4 0C00EABB */  jal       get_npc_unsafe
-/* A1E4D8 802433D8 2404FFFC */   addiu    $a0, $zero, -4
-/* A1E4DC 802433DC 12000017 */  beqz      $s0, .L8024343C
-/* A1E4E0 802433E0 0040902D */   daddu    $s2, $v0, $zero
-/* A1E4E4 802433E4 0220202D */  daddu     $a0, $s1, $zero
-/* A1E4E8 802433E8 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E4EC 802433EC 0C0B210B */  jal       get_float_variable
-/* A1E4F0 802433F0 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* A1E4F4 802433F4 0220202D */  daddu     $a0, $s1, $zero
-/* A1E4F8 802433F8 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E4FC 802433FC 3C014270 */  lui       $at, 0x4270
-/* A1E500 80243400 4481A000 */  mtc1      $at, $f20
-/* A1E504 80243404 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* A1E508 80243408 46140003 */  div.s     $f0, $f0, $f20
-/* A1E50C 8024340C 0C0B210B */  jal       get_float_variable
-/* A1E510 80243410 E6200074 */   swc1     $f0, 0x74($s1)
-/* A1E514 80243414 0220202D */  daddu     $a0, $s1, $zero
-/* A1E518 80243418 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E51C 8024341C 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* A1E520 80243420 46140003 */  div.s     $f0, $f0, $f20
-/* A1E524 80243424 0C0B210B */  jal       get_float_variable
-/* A1E528 80243428 E6200078 */   swc1     $f0, 0x78($s1)
-/* A1E52C 8024342C 46140003 */  div.s     $f0, $f0, $f20
-/* A1E530 80243430 2402003C */  addiu     $v0, $zero, 0x3c
-/* A1E534 80243434 E620007C */  swc1      $f0, 0x7c($s1)
-/* A1E538 80243438 AE220070 */  sw        $v0, 0x70($s1)
-.L8024343C:
-/* A1E53C 8024343C C6400038 */  lwc1      $f0, 0x38($s2)
-/* A1E540 80243440 C6220074 */  lwc1      $f2, 0x74($s1)
-/* A1E544 80243444 46020000 */  add.s     $f0, $f0, $f2
-/* A1E548 80243448 E6400038 */  swc1      $f0, 0x38($s2)
-/* A1E54C 8024344C C640003C */  lwc1      $f0, 0x3c($s2)
-/* A1E550 80243450 C6220078 */  lwc1      $f2, 0x78($s1)
-/* A1E554 80243454 46020000 */  add.s     $f0, $f0, $f2
-/* A1E558 80243458 E640003C */  swc1      $f0, 0x3c($s2)
-/* A1E55C 8024345C C6400040 */  lwc1      $f0, 0x40($s2)
-/* A1E560 80243460 C622007C */  lwc1      $f2, 0x7c($s1)
-/* A1E564 80243464 46020000 */  add.s     $f0, $f0, $f2
-/* A1E568 80243468 E6400040 */  swc1      $f0, 0x40($s2)
-/* A1E56C 8024346C 8E230070 */  lw        $v1, 0x70($s1)
-/* A1E570 80243470 2463FFFF */  addiu     $v1, $v1, -1
-/* A1E574 80243474 2C620001 */  sltiu     $v0, $v1, 1
-/* A1E578 80243478 AE230070 */  sw        $v1, 0x70($s1)
-/* A1E57C 8024347C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A1E580 80243480 8FB20018 */  lw        $s2, 0x18($sp)
-/* A1E584 80243484 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E588 80243488 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E58C 8024348C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* A1E590 80243490 00021040 */  sll       $v0, $v0, 1
-/* A1E594 80243494 03E00008 */  jr        $ra
-/* A1E598 80243498 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
deleted file mode 100644
index 2da5e2cd12..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242524_B2E994
-/* B2E994 80242524 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B2E998 80242528 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E99C 8024252C 0080882D */  daddu     $s1, $a0, $zero
-/* B2E9A0 80242530 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E9A4 80242534 00A0802D */  daddu     $s0, $a1, $zero
-/* B2E9A8 80242538 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B2E9AC 8024253C AFB20018 */  sw        $s2, 0x18($sp)
-/* B2E9B0 80242540 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B2E9B4 80242544 0C00EABB */  jal       get_npc_unsafe
-/* B2E9B8 80242548 2404FFFC */   addiu    $a0, $zero, -4
-/* B2E9BC 8024254C 12000017 */  beqz      $s0, .L802425AC
-/* B2E9C0 80242550 0040902D */   daddu    $s2, $v0, $zero
-/* B2E9C4 80242554 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9C8 80242558 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9CC 8024255C 0C0B210B */  jal       get_float_variable
-/* B2E9D0 80242560 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B2E9D4 80242564 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9D8 80242568 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9DC 8024256C 3C014270 */  lui       $at, 0x4270
-/* B2E9E0 80242570 4481A000 */  mtc1      $at, $f20
-/* B2E9E4 80242574 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* B2E9E8 80242578 46140003 */  div.s     $f0, $f0, $f20
-/* B2E9EC 8024257C 0C0B210B */  jal       get_float_variable
-/* B2E9F0 80242580 E6200074 */   swc1     $f0, 0x74($s1)
-/* B2E9F4 80242584 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9F8 80242588 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9FC 8024258C 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* B2EA00 80242590 46140003 */  div.s     $f0, $f0, $f20
-/* B2EA04 80242594 0C0B210B */  jal       get_float_variable
-/* B2EA08 80242598 E6200078 */   swc1     $f0, 0x78($s1)
-/* B2EA0C 8024259C 46140003 */  div.s     $f0, $f0, $f20
-/* B2EA10 802425A0 2402003C */  addiu     $v0, $zero, 0x3c
-/* B2EA14 802425A4 E620007C */  swc1      $f0, 0x7c($s1)
-/* B2EA18 802425A8 AE220070 */  sw        $v0, 0x70($s1)
-.L802425AC:
-/* B2EA1C 802425AC C6400038 */  lwc1      $f0, 0x38($s2)
-/* B2EA20 802425B0 C6220074 */  lwc1      $f2, 0x74($s1)
-/* B2EA24 802425B4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA28 802425B8 E6400038 */  swc1      $f0, 0x38($s2)
-/* B2EA2C 802425BC C640003C */  lwc1      $f0, 0x3c($s2)
-/* B2EA30 802425C0 C6220078 */  lwc1      $f2, 0x78($s1)
-/* B2EA34 802425C4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA38 802425C8 E640003C */  swc1      $f0, 0x3c($s2)
-/* B2EA3C 802425CC C6400040 */  lwc1      $f0, 0x40($s2)
-/* B2EA40 802425D0 C622007C */  lwc1      $f2, 0x7c($s1)
-/* B2EA44 802425D4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA48 802425D8 E6400040 */  swc1      $f0, 0x40($s2)
-/* B2EA4C 802425DC 8E230070 */  lw        $v1, 0x70($s1)
-/* B2EA50 802425E0 2463FFFF */  addiu     $v1, $v1, -1
-/* B2EA54 802425E4 2C620001 */  sltiu     $v0, $v1, 1
-/* B2EA58 802425E8 AE230070 */  sw        $v1, 0x70($s1)
-/* B2EA5C 802425EC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B2EA60 802425F0 8FB20018 */  lw        $s2, 0x18($sp)
-/* B2EA64 802425F4 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2EA68 802425F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2EA6C 802425FC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B2EA70 80242600 00021040 */  sll       $v0, $v0, 1
-/* B2EA74 80242604 03E00008 */  jr        $ra
-/* B2EA78 80242608 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
deleted file mode 100644
index 2378ae9c8f..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242AAC_B3767C
-/* B3767C 80242AAC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B37680 80242AB0 AFB10014 */  sw        $s1, 0x14($sp)
-/* B37684 80242AB4 0080882D */  daddu     $s1, $a0, $zero
-/* B37688 80242AB8 AFB00010 */  sw        $s0, 0x10($sp)
-/* B3768C 80242ABC 00A0802D */  daddu     $s0, $a1, $zero
-/* B37690 80242AC0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B37694 80242AC4 AFB20018 */  sw        $s2, 0x18($sp)
-/* B37698 80242AC8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B3769C 80242ACC 0C00EABB */  jal       get_npc_unsafe
-/* B376A0 80242AD0 2404FFFC */   addiu    $a0, $zero, -4
-/* B376A4 80242AD4 12000017 */  beqz      $s0, .L80242B34
-/* B376A8 80242AD8 0040902D */   daddu    $s2, $v0, $zero
-/* B376AC 80242ADC 0220202D */  daddu     $a0, $s1, $zero
-/* B376B0 80242AE0 3C05FE36 */  lui       $a1, 0xfe36
-/* B376B4 80242AE4 0C0B210B */  jal       get_float_variable
-/* B376B8 80242AE8 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B376BC 80242AEC 0220202D */  daddu     $a0, $s1, $zero
-/* B376C0 80242AF0 3C05FE36 */  lui       $a1, 0xfe36
-/* B376C4 80242AF4 3C014270 */  lui       $at, 0x4270
-/* B376C8 80242AF8 4481A000 */  mtc1      $at, $f20
-/* B376CC 80242AFC 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* B376D0 80242B00 46140003 */  div.s     $f0, $f0, $f20
-/* B376D4 80242B04 0C0B210B */  jal       get_float_variable
-/* B376D8 80242B08 E6200074 */   swc1     $f0, 0x74($s1)
-/* B376DC 80242B0C 0220202D */  daddu     $a0, $s1, $zero
-/* B376E0 80242B10 3C05FE36 */  lui       $a1, 0xfe36
-/* B376E4 80242B14 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* B376E8 80242B18 46140003 */  div.s     $f0, $f0, $f20
-/* B376EC 80242B1C 0C0B210B */  jal       get_float_variable
-/* B376F0 80242B20 E6200078 */   swc1     $f0, 0x78($s1)
-/* B376F4 80242B24 46140003 */  div.s     $f0, $f0, $f20
-/* B376F8 80242B28 2402003C */  addiu     $v0, $zero, 0x3c
-/* B376FC 80242B2C E620007C */  swc1      $f0, 0x7c($s1)
-/* B37700 80242B30 AE220070 */  sw        $v0, 0x70($s1)
-.L80242B34:
-/* B37704 80242B34 C6400038 */  lwc1      $f0, 0x38($s2)
-/* B37708 80242B38 C6220074 */  lwc1      $f2, 0x74($s1)
-/* B3770C 80242B3C 46020000 */  add.s     $f0, $f0, $f2
-/* B37710 80242B40 E6400038 */  swc1      $f0, 0x38($s2)
-/* B37714 80242B44 C640003C */  lwc1      $f0, 0x3c($s2)
-/* B37718 80242B48 C6220078 */  lwc1      $f2, 0x78($s1)
-/* B3771C 80242B4C 46020000 */  add.s     $f0, $f0, $f2
-/* B37720 80242B50 E640003C */  swc1      $f0, 0x3c($s2)
-/* B37724 80242B54 C6400040 */  lwc1      $f0, 0x40($s2)
-/* B37728 80242B58 C622007C */  lwc1      $f2, 0x7c($s1)
-/* B3772C 80242B5C 46020000 */  add.s     $f0, $f0, $f2
-/* B37730 80242B60 E6400040 */  swc1      $f0, 0x40($s2)
-/* B37734 80242B64 8E230070 */  lw        $v1, 0x70($s1)
-/* B37738 80242B68 2463FFFF */  addiu     $v1, $v1, -1
-/* B3773C 80242B6C 2C620001 */  sltiu     $v0, $v1, 1
-/* B37740 80242B70 AE230070 */  sw        $v1, 0x70($s1)
-/* B37744 80242B74 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B37748 80242B78 8FB20018 */  lw        $s2, 0x18($sp)
-/* B3774C 80242B7C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B37750 80242B80 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37754 80242B84 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B37758 80242B88 00021040 */  sll       $v0, $v0, 1
-/* B3775C 80242B8C 03E00008 */  jr        $ra
-/* B37760 80242B90 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
deleted file mode 100644
index a5efd31cb6..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412A0_8B1310
-/* 8B1310 802412A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8B1314 802412A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B1318 802412A8 0080882D */  daddu     $s1, $a0, $zero
-/* 8B131C 802412AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B1320 802412B0 00A0802D */  daddu     $s0, $a1, $zero
-/* 8B1324 802412B4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8B1328 802412B8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B132C 802412BC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8B1330 802412C0 0C00EABB */  jal       get_npc_unsafe
-/* 8B1334 802412C4 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B1338 802412C8 12000017 */  beqz      $s0, .L80241328
-/* 8B133C 802412CC 0040902D */   daddu    $s2, $v0, $zero
-/* 8B1340 802412D0 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1344 802412D4 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1348 802412D8 0C0B210B */  jal       get_float_variable
-/* 8B134C 802412DC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8B1350 802412E0 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1354 802412E4 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1358 802412E8 3C014270 */  lui       $at, 0x4270
-/* 8B135C 802412EC 4481A000 */  mtc1      $at, $f20
-/* 8B1360 802412F0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8B1364 802412F4 46140003 */  div.s     $f0, $f0, $f20
-/* 8B1368 802412F8 0C0B210B */  jal       get_float_variable
-/* 8B136C 802412FC E6200074 */   swc1     $f0, 0x74($s1)
-/* 8B1370 80241300 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1374 80241304 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1378 80241308 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 8B137C 8024130C 46140003 */  div.s     $f0, $f0, $f20
-/* 8B1380 80241310 0C0B210B */  jal       get_float_variable
-/* 8B1384 80241314 E6200078 */   swc1     $f0, 0x78($s1)
-/* 8B1388 80241318 46140003 */  div.s     $f0, $f0, $f20
-/* 8B138C 8024131C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 8B1390 80241320 E620007C */  swc1      $f0, 0x7c($s1)
-/* 8B1394 80241324 AE220070 */  sw        $v0, 0x70($s1)
-.L80241328:
-/* 8B1398 80241328 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 8B139C 8024132C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 8B13A0 80241330 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13A4 80241334 E6400038 */  swc1      $f0, 0x38($s2)
-/* 8B13A8 80241338 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 8B13AC 8024133C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 8B13B0 80241340 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13B4 80241344 E640003C */  swc1      $f0, 0x3c($s2)
-/* 8B13B8 80241348 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 8B13BC 8024134C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 8B13C0 80241350 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13C4 80241354 E6400040 */  swc1      $f0, 0x40($s2)
-/* 8B13C8 80241358 8E230070 */  lw        $v1, 0x70($s1)
-/* 8B13CC 8024135C 2463FFFF */  addiu     $v1, $v1, -1
-/* 8B13D0 80241360 2C620001 */  sltiu     $v0, $v1, 1
-/* 8B13D4 80241364 AE230070 */  sw        $v1, 0x70($s1)
-/* 8B13D8 80241368 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 8B13DC 8024136C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B13E0 80241370 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B13E4 80241374 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B13E8 80241378 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8B13EC 8024137C 00021040 */  sll       $v0, $v0, 1
-/* 8B13F0 80241380 03E00008 */  jr        $ra
-/* 8B13F4 80241384 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
deleted file mode 100644
index 6bf81c6c08..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241540_7EC250
-/* 7EC250 80241540 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7EC254 80241544 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EC258 80241548 0080882D */  daddu     $s1, $a0, $zero
-/* 7EC25C 8024154C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EC260 80241550 00A0802D */  daddu     $s0, $a1, $zero
-/* 7EC264 80241554 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7EC268 80241558 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7EC26C 8024155C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 7EC270 80241560 0C00EABB */  jal       get_npc_unsafe
-/* 7EC274 80241564 2404FFFC */   addiu    $a0, $zero, -4
-/* 7EC278 80241568 12000017 */  beqz      $s0, .L802415C8
-/* 7EC27C 8024156C 0040902D */   daddu    $s2, $v0, $zero
-/* 7EC280 80241570 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC284 80241574 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC288 80241578 0C0B210B */  jal       get_float_variable
-/* 7EC28C 8024157C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 7EC290 80241580 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC294 80241584 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC298 80241588 3C014270 */  lui       $at, 0x4270
-/* 7EC29C 8024158C 4481A000 */  mtc1      $at, $f20
-/* 7EC2A0 80241590 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 7EC2A4 80241594 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2A8 80241598 0C0B210B */  jal       get_float_variable
-/* 7EC2AC 8024159C E6200074 */   swc1     $f0, 0x74($s1)
-/* 7EC2B0 802415A0 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC2B4 802415A4 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC2B8 802415A8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 7EC2BC 802415AC 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2C0 802415B0 0C0B210B */  jal       get_float_variable
-/* 7EC2C4 802415B4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 7EC2C8 802415B8 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2CC 802415BC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 7EC2D0 802415C0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 7EC2D4 802415C4 AE220070 */  sw        $v0, 0x70($s1)
-.L802415C8:
-/* 7EC2D8 802415C8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 7EC2DC 802415CC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 7EC2E0 802415D0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC2E4 802415D4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 7EC2E8 802415D8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 7EC2EC 802415DC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 7EC2F0 802415E0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC2F4 802415E4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 7EC2F8 802415E8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 7EC2FC 802415EC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 7EC300 802415F0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC304 802415F4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 7EC308 802415F8 8E230070 */  lw        $v1, 0x70($s1)
-/* 7EC30C 802415FC 2463FFFF */  addiu     $v1, $v1, -1
-/* 7EC310 80241600 2C620001 */  sltiu     $v0, $v1, 1
-/* 7EC314 80241604 AE230070 */  sw        $v1, 0x70($s1)
-/* 7EC318 80241608 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7EC31C 8024160C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7EC320 80241610 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EC324 80241614 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EC328 80241618 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 7EC32C 8024161C 00021040 */  sll       $v0, $v0, 1
-/* 7EC330 80241620 03E00008 */  jr        $ra
-/* 7EC334 80241624 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
deleted file mode 100644
index 5592ea8fd1..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242078_7ECD88
-/* 7ECD88 80242078 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 7ECD8C 8024207C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECD90 80242080 0080882D */  daddu     $s1, $a0, $zero
-/* 7ECD94 80242084 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7ECD98 80242088 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECD9C 8024208C F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 7ECDA0 80242090 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 7ECDA4 80242094 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 7ECDA8 80242098 8E30000C */  lw        $s0, 0xc($s1)
-/* 7ECDAC 8024209C 8E050000 */  lw        $a1, ($s0)
-/* 7ECDB0 802420A0 0C0B1EAF */  jal       get_variable
-/* 7ECDB4 802420A4 26100004 */   addiu    $s0, $s0, 4
-/* 7ECDB8 802420A8 8E050000 */  lw        $a1, ($s0)
-/* 7ECDBC 802420AC 26100004 */  addiu     $s0, $s0, 4
-/* 7ECDC0 802420B0 4482C000 */  mtc1      $v0, $f24
-/* 7ECDC4 802420B4 00000000 */  nop       
-/* 7ECDC8 802420B8 4680C620 */  cvt.s.w   $f24, $f24
-/* 7ECDCC 802420BC 0C0B1EAF */  jal       get_variable
-/* 7ECDD0 802420C0 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECDD4 802420C4 8E050000 */  lw        $a1, ($s0)
-/* 7ECDD8 802420C8 26100004 */  addiu     $s0, $s0, 4
-/* 7ECDDC 802420CC 4482B000 */  mtc1      $v0, $f22
-/* 7ECDE0 802420D0 00000000 */  nop       
-/* 7ECDE4 802420D4 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 7ECDE8 802420D8 0C0B1EAF */  jal       get_variable
-/* 7ECDEC 802420DC 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECDF0 802420E0 8E050000 */  lw        $a1, ($s0)
-/* 7ECDF4 802420E4 4482A000 */  mtc1      $v0, $f20
-/* 7ECDF8 802420E8 00000000 */  nop       
-/* 7ECDFC 802420EC 4680A520 */  cvt.s.w   $f20, $f20
-/* 7ECE00 802420F0 0C0B1EAF */  jal       get_variable
-/* 7ECE04 802420F4 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECE08 802420F8 44820000 */  mtc1      $v0, $f0
-/* 7ECE0C 802420FC 00000000 */  nop       
-/* 7ECE10 80242100 46800020 */  cvt.s.w   $f0, $f0
-/* 7ECE14 80242104 46160001 */  sub.s     $f0, $f0, $f22
-/* 7ECE18 80242108 4618A501 */  sub.s     $f20, $f20, $f24
-/* 7ECE1C 8024210C 46140003 */  div.s     $f0, $f0, $f20
-/* 7ECE20 80242110 46180602 */  mul.s     $f24, $f0, $f24
-/* 7ECE24 80242114 00000000 */  nop       
-/* 7ECE28 80242118 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 7ECE2C 8024211C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 7ECE30 80242120 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 7ECE34 80242124 46020002 */  mul.s     $f0, $f0, $f2
-/* 7ECE38 80242128 00000000 */  nop       
-/* 7ECE3C 8024212C 4618B581 */  sub.s     $f22, $f22, $f24
-/* 7ECE40 80242130 46160000 */  add.s     $f0, $f0, $f22
-/* 7ECE44 80242134 C4420030 */  lwc1      $f2, 0x30($v0)
-/* 7ECE48 80242138 4600103C */  c.lt.s    $f2, $f0
-/* 7ECE4C 8024213C 00000000 */  nop       
-/* 7ECE50 80242140 45000003 */  bc1f      .L80242150
-/* 7ECE54 80242144 24020001 */   addiu    $v0, $zero, 1
-/* 7ECE58 80242148 08090855 */  j         .L80242154
-/* 7ECE5C 8024214C AE200084 */   sw       $zero, 0x84($s1)
-.L80242150:
-/* 7ECE60 80242150 AE220084 */  sw        $v0, 0x84($s1)
-.L80242154:
-/* 7ECE64 80242154 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7ECE68 80242158 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECE6C 8024215C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECE70 80242160 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 7ECE74 80242164 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 7ECE78 80242168 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 7ECE7C 8024216C 24020002 */  addiu     $v0, $zero, 2
-/* 7ECE80 80242170 03E00008 */  jr        $ra
-/* 7ECE84 80242174 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
deleted file mode 100644
index 7dedd216dc..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242E20_8036A0
-/* 8036A0 80242E20 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8036A4 80242E24 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8036A8 80242E28 0080882D */  daddu     $s1, $a0, $zero
-/* 8036AC 80242E2C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8036B0 80242E30 00A0802D */  daddu     $s0, $a1, $zero
-/* 8036B4 80242E34 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8036B8 80242E38 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8036BC 80242E3C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8036C0 80242E40 0C00EABB */  jal       get_npc_unsafe
-/* 8036C4 80242E44 2404FFFC */   addiu    $a0, $zero, -4
-/* 8036C8 80242E48 12000017 */  beqz      $s0, .L80242EA8
-/* 8036CC 80242E4C 0040902D */   daddu    $s2, $v0, $zero
-/* 8036D0 80242E50 0220202D */  daddu     $a0, $s1, $zero
-/* 8036D4 80242E54 3C05FE36 */  lui       $a1, 0xfe36
-/* 8036D8 80242E58 0C0B210B */  jal       get_float_variable
-/* 8036DC 80242E5C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8036E0 80242E60 0220202D */  daddu     $a0, $s1, $zero
-/* 8036E4 80242E64 3C05FE36 */  lui       $a1, 0xfe36
-/* 8036E8 80242E68 3C014270 */  lui       $at, 0x4270
-/* 8036EC 80242E6C 4481A000 */  mtc1      $at, $f20
-/* 8036F0 80242E70 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8036F4 80242E74 46140003 */  div.s     $f0, $f0, $f20
-/* 8036F8 80242E78 0C0B210B */  jal       get_float_variable
-/* 8036FC 80242E7C E6200074 */   swc1     $f0, 0x74($s1)
-/* 803700 80242E80 0220202D */  daddu     $a0, $s1, $zero
-/* 803704 80242E84 3C05FE36 */  lui       $a1, 0xfe36
-/* 803708 80242E88 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 80370C 80242E8C 46140003 */  div.s     $f0, $f0, $f20
-/* 803710 80242E90 0C0B210B */  jal       get_float_variable
-/* 803714 80242E94 E6200078 */   swc1     $f0, 0x78($s1)
-/* 803718 80242E98 46140003 */  div.s     $f0, $f0, $f20
-/* 80371C 80242E9C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 803720 80242EA0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 803724 80242EA4 AE220070 */  sw        $v0, 0x70($s1)
-.L80242EA8:
-/* 803728 80242EA8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 80372C 80242EAC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 803730 80242EB0 46020000 */  add.s     $f0, $f0, $f2
-/* 803734 80242EB4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 803738 80242EB8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 80373C 80242EBC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 803740 80242EC0 46020000 */  add.s     $f0, $f0, $f2
-/* 803744 80242EC4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 803748 80242EC8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 80374C 80242ECC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 803750 80242ED0 46020000 */  add.s     $f0, $f0, $f2
-/* 803754 80242ED4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 803758 80242ED8 8E230070 */  lw        $v1, 0x70($s1)
-/* 80375C 80242EDC 2463FFFF */  addiu     $v1, $v1, -1
-/* 803760 80242EE0 2C620001 */  sltiu     $v0, $v1, 1
-/* 803764 80242EE4 AE230070 */  sw        $v1, 0x70($s1)
-/* 803768 80242EE8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 80376C 80242EEC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803770 80242EF0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803774 80242EF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803778 80242EF8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 80377C 80242EFC 00021040 */  sll       $v0, $v0, 1
-/* 803780 80242F00 03E00008 */  jr        $ra
-/* 803784 80242F04 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
deleted file mode 100644
index f7c22a373e..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802426D0_825990
-/* 825990 802426D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 825994 802426D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 825998 802426D8 0080882D */  daddu     $s1, $a0, $zero
-/* 82599C 802426DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8259A0 802426E0 00A0802D */  daddu     $s0, $a1, $zero
-/* 8259A4 802426E4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8259A8 802426E8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8259AC 802426EC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8259B0 802426F0 0C00EABB */  jal       get_npc_unsafe
-/* 8259B4 802426F4 2404FFFC */   addiu    $a0, $zero, -4
-/* 8259B8 802426F8 12000017 */  beqz      $s0, .L80242758
-/* 8259BC 802426FC 0040902D */   daddu    $s2, $v0, $zero
-/* 8259C0 80242700 0220202D */  daddu     $a0, $s1, $zero
-/* 8259C4 80242704 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259C8 80242708 0C0B210B */  jal       get_float_variable
-/* 8259CC 8024270C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8259D0 80242710 0220202D */  daddu     $a0, $s1, $zero
-/* 8259D4 80242714 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259D8 80242718 3C014270 */  lui       $at, 0x4270
-/* 8259DC 8024271C 4481A000 */  mtc1      $at, $f20
-/* 8259E0 80242720 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8259E4 80242724 46140003 */  div.s     $f0, $f0, $f20
-/* 8259E8 80242728 0C0B210B */  jal       get_float_variable
-/* 8259EC 8024272C E6200074 */   swc1     $f0, 0x74($s1)
-/* 8259F0 80242730 0220202D */  daddu     $a0, $s1, $zero
-/* 8259F4 80242734 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259F8 80242738 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 8259FC 8024273C 46140003 */  div.s     $f0, $f0, $f20
-/* 825A00 80242740 0C0B210B */  jal       get_float_variable
-/* 825A04 80242744 E6200078 */   swc1     $f0, 0x78($s1)
-/* 825A08 80242748 46140003 */  div.s     $f0, $f0, $f20
-/* 825A0C 8024274C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 825A10 80242750 E620007C */  swc1      $f0, 0x7c($s1)
-/* 825A14 80242754 AE220070 */  sw        $v0, 0x70($s1)
-.L80242758:
-/* 825A18 80242758 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 825A1C 8024275C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 825A20 80242760 46020000 */  add.s     $f0, $f0, $f2
-/* 825A24 80242764 E6400038 */  swc1      $f0, 0x38($s2)
-/* 825A28 80242768 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 825A2C 8024276C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 825A30 80242770 46020000 */  add.s     $f0, $f0, $f2
-/* 825A34 80242774 E640003C */  swc1      $f0, 0x3c($s2)
-/* 825A38 80242778 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 825A3C 8024277C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 825A40 80242780 46020000 */  add.s     $f0, $f0, $f2
-/* 825A44 80242784 E6400040 */  swc1      $f0, 0x40($s2)
-/* 825A48 80242788 8E230070 */  lw        $v1, 0x70($s1)
-/* 825A4C 8024278C 2463FFFF */  addiu     $v1, $v1, -1
-/* 825A50 80242790 2C620001 */  sltiu     $v0, $v1, 1
-/* 825A54 80242794 AE230070 */  sw        $v1, 0x70($s1)
-/* 825A58 80242798 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 825A5C 8024279C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 825A60 802427A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825A64 802427A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825A68 802427A8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 825A6C 802427AC 00021040 */  sll       $v0, $v0, 1
-/* 825A70 802427B0 03E00008 */  jr        $ra
-/* 825A74 802427B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
deleted file mode 100644
index 63ba3c5753..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413C0_832BC0
-/* 832BC0 802413C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 832BC4 802413C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832BC8 802413C8 0080882D */  daddu     $s1, $a0, $zero
-/* 832BCC 802413CC AFB00010 */  sw        $s0, 0x10($sp)
-/* 832BD0 802413D0 00A0802D */  daddu     $s0, $a1, $zero
-/* 832BD4 802413D4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 832BD8 802413D8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 832BDC 802413DC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 832BE0 802413E0 0C00EABB */  jal       get_npc_unsafe
-/* 832BE4 802413E4 2404FFFC */   addiu    $a0, $zero, -4
-/* 832BE8 802413E8 12000017 */  beqz      $s0, .L80241448
-/* 832BEC 802413EC 0040902D */   daddu    $s2, $v0, $zero
-/* 832BF0 802413F0 0220202D */  daddu     $a0, $s1, $zero
-/* 832BF4 802413F4 3C05FE36 */  lui       $a1, 0xfe36
-/* 832BF8 802413F8 0C0B210B */  jal       get_float_variable
-/* 832BFC 802413FC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 832C00 80241400 0220202D */  daddu     $a0, $s1, $zero
-/* 832C04 80241404 3C05FE36 */  lui       $a1, 0xfe36
-/* 832C08 80241408 3C014270 */  lui       $at, 0x4270
-/* 832C0C 8024140C 4481A000 */  mtc1      $at, $f20
-/* 832C10 80241410 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 832C14 80241414 46140003 */  div.s     $f0, $f0, $f20
-/* 832C18 80241418 0C0B210B */  jal       get_float_variable
-/* 832C1C 8024141C E6200074 */   swc1     $f0, 0x74($s1)
-/* 832C20 80241420 0220202D */  daddu     $a0, $s1, $zero
-/* 832C24 80241424 3C05FE36 */  lui       $a1, 0xfe36
-/* 832C28 80241428 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 832C2C 8024142C 46140003 */  div.s     $f0, $f0, $f20
-/* 832C30 80241430 0C0B210B */  jal       get_float_variable
-/* 832C34 80241434 E6200078 */   swc1     $f0, 0x78($s1)
-/* 832C38 80241438 46140003 */  div.s     $f0, $f0, $f20
-/* 832C3C 8024143C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 832C40 80241440 E620007C */  swc1      $f0, 0x7c($s1)
-/* 832C44 80241444 AE220070 */  sw        $v0, 0x70($s1)
-.L80241448:
-/* 832C48 80241448 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 832C4C 8024144C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 832C50 80241450 46020000 */  add.s     $f0, $f0, $f2
-/* 832C54 80241454 E6400038 */  swc1      $f0, 0x38($s2)
-/* 832C58 80241458 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 832C5C 8024145C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 832C60 80241460 46020000 */  add.s     $f0, $f0, $f2
-/* 832C64 80241464 E640003C */  swc1      $f0, 0x3c($s2)
-/* 832C68 80241468 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 832C6C 8024146C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 832C70 80241470 46020000 */  add.s     $f0, $f0, $f2
-/* 832C74 80241474 E6400040 */  swc1      $f0, 0x40($s2)
-/* 832C78 80241478 8E230070 */  lw        $v1, 0x70($s1)
-/* 832C7C 8024147C 2463FFFF */  addiu     $v1, $v1, -1
-/* 832C80 80241480 2C620001 */  sltiu     $v0, $v1, 1
-/* 832C84 80241484 AE230070 */  sw        $v1, 0x70($s1)
-/* 832C88 80241488 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 832C8C 8024148C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 832C90 80241490 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832C94 80241494 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832C98 80241498 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 832C9C 8024149C 00021040 */  sll       $v0, $v0, 1
-/* 832CA0 802414A0 03E00008 */  jr        $ra
-/* 832CA4 802414A4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
deleted file mode 100644
index 43bf452bf7..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241370_843F40
-/* 843F40 80241370 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 843F44 80241374 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843F48 80241378 0080882D */  daddu     $s1, $a0, $zero
-/* 843F4C 8024137C AFB00010 */  sw        $s0, 0x10($sp)
-/* 843F50 80241380 00A0802D */  daddu     $s0, $a1, $zero
-/* 843F54 80241384 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 843F58 80241388 AFB20018 */  sw        $s2, 0x18($sp)
-/* 843F5C 8024138C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 843F60 80241390 0C00EABB */  jal       get_npc_unsafe
-/* 843F64 80241394 2404FFFC */   addiu    $a0, $zero, -4
-/* 843F68 80241398 12000017 */  beqz      $s0, .L802413F8
-/* 843F6C 8024139C 0040902D */   daddu    $s2, $v0, $zero
-/* 843F70 802413A0 0220202D */  daddu     $a0, $s1, $zero
-/* 843F74 802413A4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843F78 802413A8 0C0B210B */  jal       get_float_variable
-/* 843F7C 802413AC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 843F80 802413B0 0220202D */  daddu     $a0, $s1, $zero
-/* 843F84 802413B4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843F88 802413B8 3C014270 */  lui       $at, 0x4270
-/* 843F8C 802413BC 4481A000 */  mtc1      $at, $f20
-/* 843F90 802413C0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 843F94 802413C4 46140003 */  div.s     $f0, $f0, $f20
-/* 843F98 802413C8 0C0B210B */  jal       get_float_variable
-/* 843F9C 802413CC E6200074 */   swc1     $f0, 0x74($s1)
-/* 843FA0 802413D0 0220202D */  daddu     $a0, $s1, $zero
-/* 843FA4 802413D4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843FA8 802413D8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 843FAC 802413DC 46140003 */  div.s     $f0, $f0, $f20
-/* 843FB0 802413E0 0C0B210B */  jal       get_float_variable
-/* 843FB4 802413E4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 843FB8 802413E8 46140003 */  div.s     $f0, $f0, $f20
-/* 843FBC 802413EC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 843FC0 802413F0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 843FC4 802413F4 AE220070 */  sw        $v0, 0x70($s1)
-.L802413F8:
-/* 843FC8 802413F8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 843FCC 802413FC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 843FD0 80241400 46020000 */  add.s     $f0, $f0, $f2
-/* 843FD4 80241404 E6400038 */  swc1      $f0, 0x38($s2)
-/* 843FD8 80241408 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 843FDC 8024140C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 843FE0 80241410 46020000 */  add.s     $f0, $f0, $f2
-/* 843FE4 80241414 E640003C */  swc1      $f0, 0x3c($s2)
-/* 843FE8 80241418 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 843FEC 8024141C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 843FF0 80241420 46020000 */  add.s     $f0, $f0, $f2
-/* 843FF4 80241424 E6400040 */  swc1      $f0, 0x40($s2)
-/* 843FF8 80241428 8E230070 */  lw        $v1, 0x70($s1)
-/* 843FFC 8024142C 2463FFFF */  addiu     $v1, $v1, -1
-/* 844000 80241430 2C620001 */  sltiu     $v0, $v1, 1
-/* 844004 80241434 AE230070 */  sw        $v1, 0x70($s1)
-/* 844008 80241438 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 84400C 8024143C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 844010 80241440 8FB10014 */  lw        $s1, 0x14($sp)
-/* 844014 80241444 8FB00010 */  lw        $s0, 0x10($sp)
-/* 844018 80241448 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 84401C 8024144C 00021040 */  sll       $v0, $v0, 1
-/* 844020 80241450 03E00008 */  jr        $ra
-/* 844024 80241454 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
deleted file mode 100644
index 0cb1bb647a..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242230_8543A0
-/* 8543A0 80242230 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8543A4 80242234 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8543A8 80242238 0080882D */  daddu     $s1, $a0, $zero
-/* 8543AC 8024223C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8543B0 80242240 00A0802D */  daddu     $s0, $a1, $zero
-/* 8543B4 80242244 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8543B8 80242248 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8543BC 8024224C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8543C0 80242250 0C00EABB */  jal       get_npc_unsafe
-/* 8543C4 80242254 2404FFFC */   addiu    $a0, $zero, -4
-/* 8543C8 80242258 12000017 */  beqz      $s0, .L802422B8
-/* 8543CC 8024225C 0040902D */   daddu    $s2, $v0, $zero
-/* 8543D0 80242260 0220202D */  daddu     $a0, $s1, $zero
-/* 8543D4 80242264 3C05FE36 */  lui       $a1, 0xfe36
-/* 8543D8 80242268 0C0B210B */  jal       get_float_variable
-/* 8543DC 8024226C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8543E0 80242270 0220202D */  daddu     $a0, $s1, $zero
-/* 8543E4 80242274 3C05FE36 */  lui       $a1, 0xfe36
-/* 8543E8 80242278 3C014270 */  lui       $at, 0x4270
-/* 8543EC 8024227C 4481A000 */  mtc1      $at, $f20
-/* 8543F0 80242280 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8543F4 80242284 46140003 */  div.s     $f0, $f0, $f20
-/* 8543F8 80242288 0C0B210B */  jal       get_float_variable
-/* 8543FC 8024228C E6200074 */   swc1     $f0, 0x74($s1)
-/* 854400 80242290 0220202D */  daddu     $a0, $s1, $zero
-/* 854404 80242294 3C05FE36 */  lui       $a1, 0xfe36
-/* 854408 80242298 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 85440C 8024229C 46140003 */  div.s     $f0, $f0, $f20
-/* 854410 802422A0 0C0B210B */  jal       get_float_variable
-/* 854414 802422A4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 854418 802422A8 46140003 */  div.s     $f0, $f0, $f20
-/* 85441C 802422AC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 854420 802422B0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 854424 802422B4 AE220070 */  sw        $v0, 0x70($s1)
-.L802422B8:
-/* 854428 802422B8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 85442C 802422BC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 854430 802422C0 46020000 */  add.s     $f0, $f0, $f2
-/* 854434 802422C4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 854438 802422C8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 85443C 802422CC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 854440 802422D0 46020000 */  add.s     $f0, $f0, $f2
-/* 854444 802422D4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 854448 802422D8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 85444C 802422DC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 854450 802422E0 46020000 */  add.s     $f0, $f0, $f2
-/* 854454 802422E4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 854458 802422E8 8E230070 */  lw        $v1, 0x70($s1)
-/* 85445C 802422EC 2463FFFF */  addiu     $v1, $v1, -1
-/* 854460 802422F0 2C620001 */  sltiu     $v0, $v1, 1
-/* 854464 802422F4 AE230070 */  sw        $v1, 0x70($s1)
-/* 854468 802422F8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 85446C 802422FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 854470 80242300 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854474 80242304 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854478 80242308 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 85447C 8024230C 00021040 */  sll       $v0, $v0, 1
-/* 854480 80242310 03E00008 */  jr        $ra
-/* 854484 80242314 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
deleted file mode 100644
index 1d6636bac3..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C78_9C7058
-/* 9C7058 80241C78 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9C705C 80241C7C AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C7060 80241C80 0080882D */  daddu     $s1, $a0, $zero
-/* 9C7064 80241C84 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C7068 80241C88 00A0802D */  daddu     $s0, $a1, $zero
-/* 9C706C 80241C8C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9C7070 80241C90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9C7074 80241C94 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9C7078 80241C98 0C00EABB */  jal       get_npc_unsafe
-/* 9C707C 80241C9C 2404FFFC */   addiu    $a0, $zero, -4
-/* 9C7080 80241CA0 12000017 */  beqz      $s0, .L80241D00
-/* 9C7084 80241CA4 0040902D */   daddu    $s2, $v0, $zero
-/* 9C7088 80241CA8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C708C 80241CAC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C7090 80241CB0 0C0B210B */  jal       get_float_variable
-/* 9C7094 80241CB4 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9C7098 80241CB8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C709C 80241CBC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C70A0 80241CC0 3C014270 */  lui       $at, 0x4270
-/* 9C70A4 80241CC4 4481A000 */  mtc1      $at, $f20
-/* 9C70A8 80241CC8 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 9C70AC 80241CCC 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70B0 80241CD0 0C0B210B */  jal       get_float_variable
-/* 9C70B4 80241CD4 E6200074 */   swc1     $f0, 0x74($s1)
-/* 9C70B8 80241CD8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C70BC 80241CDC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C70C0 80241CE0 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 9C70C4 80241CE4 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70C8 80241CE8 0C0B210B */  jal       get_float_variable
-/* 9C70CC 80241CEC E6200078 */   swc1     $f0, 0x78($s1)
-/* 9C70D0 80241CF0 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70D4 80241CF4 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9C70D8 80241CF8 E620007C */  swc1      $f0, 0x7c($s1)
-/* 9C70DC 80241CFC AE220070 */  sw        $v0, 0x70($s1)
-.L80241D00:
-/* 9C70E0 80241D00 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 9C70E4 80241D04 C6220074 */  lwc1      $f2, 0x74($s1)
-/* 9C70E8 80241D08 46020000 */  add.s     $f0, $f0, $f2
-/* 9C70EC 80241D0C E6400038 */  swc1      $f0, 0x38($s2)
-/* 9C70F0 80241D10 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 9C70F4 80241D14 C6220078 */  lwc1      $f2, 0x78($s1)
-/* 9C70F8 80241D18 46020000 */  add.s     $f0, $f0, $f2
-/* 9C70FC 80241D1C E640003C */  swc1      $f0, 0x3c($s2)
-/* 9C7100 80241D20 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 9C7104 80241D24 C622007C */  lwc1      $f2, 0x7c($s1)
-/* 9C7108 80241D28 46020000 */  add.s     $f0, $f0, $f2
-/* 9C710C 80241D2C E6400040 */  swc1      $f0, 0x40($s2)
-/* 9C7110 80241D30 8E230070 */  lw        $v1, 0x70($s1)
-/* 9C7114 80241D34 2463FFFF */  addiu     $v1, $v1, -1
-/* 9C7118 80241D38 2C620001 */  sltiu     $v0, $v1, 1
-/* 9C711C 80241D3C AE230070 */  sw        $v1, 0x70($s1)
-/* 9C7120 80241D40 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9C7124 80241D44 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9C7128 80241D48 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C712C 80241D4C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C7130 80241D50 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9C7134 80241D54 00021040 */  sll       $v0, $v0, 1
-/* 9C7138 80241D58 03E00008 */  jr        $ra
-/* 9C713C 80241D5C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
deleted file mode 100644
index f1ec2096ef..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242820_9D9840
-/* 9D9840 80242820 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9D9844 80242824 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D9848 80242828 0080882D */  daddu     $s1, $a0, $zero
-/* 9D984C 8024282C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D9850 80242830 00A0802D */  daddu     $s0, $a1, $zero
-/* 9D9854 80242834 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9D9858 80242838 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9D985C 8024283C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9D9860 80242840 0C00EABB */  jal       get_npc_unsafe
-/* 9D9864 80242844 2404FFFC */   addiu    $a0, $zero, -4
-/* 9D9868 80242848 12000017 */  beqz      $s0, .L802428A8
-/* 9D986C 8024284C 0040902D */   daddu    $s2, $v0, $zero
-/* 9D9870 80242850 0220202D */  daddu     $a0, $s1, $zero
-/* 9D9874 80242854 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D9878 80242858 0C0B210B */  jal       get_float_variable
-/* 9D987C 8024285C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9D9880 80242860 0220202D */  daddu     $a0, $s1, $zero
-/* 9D9884 80242864 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D9888 80242868 3C014270 */  lui       $at, 0x4270
-/* 9D988C 8024286C 4481A000 */  mtc1      $at, $f20
-/* 9D9890 80242870 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 9D9894 80242874 46140003 */  div.s     $f0, $f0, $f20
-/* 9D9898 80242878 0C0B210B */  jal       get_float_variable
-/* 9D989C 8024287C E6200074 */   swc1     $f0, 0x74($s1)
-/* 9D98A0 80242880 0220202D */  daddu     $a0, $s1, $zero
-/* 9D98A4 80242884 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D98A8 80242888 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 9D98AC 8024288C 46140003 */  div.s     $f0, $f0, $f20
-/* 9D98B0 80242890 0C0B210B */  jal       get_float_variable
-/* 9D98B4 80242894 E6200078 */   swc1     $f0, 0x78($s1)
-/* 9D98B8 80242898 46140003 */  div.s     $f0, $f0, $f20
-/* 9D98BC 8024289C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9D98C0 802428A0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 9D98C4 802428A4 AE220070 */  sw        $v0, 0x70($s1)
-.L802428A8:
-/* 9D98C8 802428A8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 9D98CC 802428AC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 9D98D0 802428B0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98D4 802428B4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 9D98D8 802428B8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 9D98DC 802428BC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 9D98E0 802428C0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98E4 802428C4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 9D98E8 802428C8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 9D98EC 802428CC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 9D98F0 802428D0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98F4 802428D4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 9D98F8 802428D8 8E230070 */  lw        $v1, 0x70($s1)
-/* 9D98FC 802428DC 2463FFFF */  addiu     $v1, $v1, -1
-/* 9D9900 802428E0 2C620001 */  sltiu     $v0, $v1, 1
-/* 9D9904 802428E4 AE230070 */  sw        $v1, 0x70($s1)
-/* 9D9908 802428E8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9D990C 802428EC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9D9910 802428F0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9914 802428F4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9918 802428F8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9D991C 802428FC 00021040 */  sll       $v0, $v0, 1
-/* 9D9920 80242900 03E00008 */  jr        $ra
-/* 9D9924 80242904 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
deleted file mode 100644
index ada9d7a6c1..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241610_CF9180
-/* CF9180 80241610 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CF9184 80241614 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF9188 80241618 0080882D */  daddu     $s1, $a0, $zero
-/* CF918C 8024161C AFB00010 */  sw        $s0, 0x10($sp)
-/* CF9190 80241620 00A0802D */  daddu     $s0, $a1, $zero
-/* CF9194 80241624 AFBF001C */  sw        $ra, 0x1c($sp)
-/* CF9198 80241628 AFB20018 */  sw        $s2, 0x18($sp)
-/* CF919C 8024162C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* CF91A0 80241630 0C00EABB */  jal       get_npc_unsafe
-/* CF91A4 80241634 2404FFFC */   addiu    $a0, $zero, -4
-/* CF91A8 80241638 12000017 */  beqz      $s0, .L80241698
-/* CF91AC 8024163C 0040902D */   daddu    $s2, $v0, $zero
-/* CF91B0 80241640 0220202D */  daddu     $a0, $s1, $zero
-/* CF91B4 80241644 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91B8 80241648 0C0B210B */  jal       get_float_variable
-/* CF91BC 8024164C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* CF91C0 80241650 0220202D */  daddu     $a0, $s1, $zero
-/* CF91C4 80241654 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91C8 80241658 3C014270 */  lui       $at, 0x4270
-/* CF91CC 8024165C 4481A000 */  mtc1      $at, $f20
-/* CF91D0 80241660 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* CF91D4 80241664 46140003 */  div.s     $f0, $f0, $f20
-/* CF91D8 80241668 0C0B210B */  jal       get_float_variable
-/* CF91DC 8024166C E6200074 */   swc1     $f0, 0x74($s1)
-/* CF91E0 80241670 0220202D */  daddu     $a0, $s1, $zero
-/* CF91E4 80241674 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91E8 80241678 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* CF91EC 8024167C 46140003 */  div.s     $f0, $f0, $f20
-/* CF91F0 80241680 0C0B210B */  jal       get_float_variable
-/* CF91F4 80241684 E6200078 */   swc1     $f0, 0x78($s1)
-/* CF91F8 80241688 46140003 */  div.s     $f0, $f0, $f20
-/* CF91FC 8024168C 2402003C */  addiu     $v0, $zero, 0x3c
-/* CF9200 80241690 E620007C */  swc1      $f0, 0x7c($s1)
-/* CF9204 80241694 AE220070 */  sw        $v0, 0x70($s1)
-.L80241698:
-/* CF9208 80241698 C6400038 */  lwc1      $f0, 0x38($s2)
-/* CF920C 8024169C C6220074 */  lwc1      $f2, 0x74($s1)
-/* CF9210 802416A0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9214 802416A4 E6400038 */  swc1      $f0, 0x38($s2)
-/* CF9218 802416A8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* CF921C 802416AC C6220078 */  lwc1      $f2, 0x78($s1)
-/* CF9220 802416B0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9224 802416B4 E640003C */  swc1      $f0, 0x3c($s2)
-/* CF9228 802416B8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* CF922C 802416BC C622007C */  lwc1      $f2, 0x7c($s1)
-/* CF9230 802416C0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9234 802416C4 E6400040 */  swc1      $f0, 0x40($s2)
-/* CF9238 802416C8 8E230070 */  lw        $v1, 0x70($s1)
-/* CF923C 802416CC 2463FFFF */  addiu     $v1, $v1, -1
-/* CF9240 802416D0 2C620001 */  sltiu     $v0, $v1, 1
-/* CF9244 802416D4 AE230070 */  sw        $v1, 0x70($s1)
-/* CF9248 802416D8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* CF924C 802416DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* CF9250 802416E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF9254 802416E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF9258 802416E8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* CF925C 802416EC 00021040 */  sll       $v0, $v0, 1
-/* CF9260 802416F0 03E00008 */  jr        $ra
-/* CF9264 802416F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
deleted file mode 100644
index 60094ee900..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A3C_D0716C
-/* D0716C 80241A3C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D07170 80241A40 AFB10014 */  sw        $s1, 0x14($sp)
-/* D07174 80241A44 0080882D */  daddu     $s1, $a0, $zero
-/* D07178 80241A48 AFB00010 */  sw        $s0, 0x10($sp)
-/* D0717C 80241A4C 00A0802D */  daddu     $s0, $a1, $zero
-/* D07180 80241A50 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D07184 80241A54 AFB20018 */  sw        $s2, 0x18($sp)
-/* D07188 80241A58 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D0718C 80241A5C 0C00EABB */  jal       get_npc_unsafe
-/* D07190 80241A60 2404FFFC */   addiu    $a0, $zero, -4
-/* D07194 80241A64 12000017 */  beqz      $s0, .L80241AC4
-/* D07198 80241A68 0040902D */   daddu    $s2, $v0, $zero
-/* D0719C 80241A6C 0220202D */  daddu     $a0, $s1, $zero
-/* D071A0 80241A70 3C05FE36 */  lui       $a1, 0xfe36
-/* D071A4 80241A74 0C0B210B */  jal       get_float_variable
-/* D071A8 80241A78 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D071AC 80241A7C 0220202D */  daddu     $a0, $s1, $zero
-/* D071B0 80241A80 3C05FE36 */  lui       $a1, 0xfe36
-/* D071B4 80241A84 3C014270 */  lui       $at, 0x4270
-/* D071B8 80241A88 4481A000 */  mtc1      $at, $f20
-/* D071BC 80241A8C 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* D071C0 80241A90 46140003 */  div.s     $f0, $f0, $f20
-/* D071C4 80241A94 0C0B210B */  jal       get_float_variable
-/* D071C8 80241A98 E6200074 */   swc1     $f0, 0x74($s1)
-/* D071CC 80241A9C 0220202D */  daddu     $a0, $s1, $zero
-/* D071D0 80241AA0 3C05FE36 */  lui       $a1, 0xfe36
-/* D071D4 80241AA4 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* D071D8 80241AA8 46140003 */  div.s     $f0, $f0, $f20
-/* D071DC 80241AAC 0C0B210B */  jal       get_float_variable
-/* D071E0 80241AB0 E6200078 */   swc1     $f0, 0x78($s1)
-/* D071E4 80241AB4 46140003 */  div.s     $f0, $f0, $f20
-/* D071E8 80241AB8 2402003C */  addiu     $v0, $zero, 0x3c
-/* D071EC 80241ABC E620007C */  swc1      $f0, 0x7c($s1)
-/* D071F0 80241AC0 AE220070 */  sw        $v0, 0x70($s1)
-.L80241AC4:
-/* D071F4 80241AC4 C6400038 */  lwc1      $f0, 0x38($s2)
-/* D071F8 80241AC8 C6220074 */  lwc1      $f2, 0x74($s1)
-/* D071FC 80241ACC 46020000 */  add.s     $f0, $f0, $f2
-/* D07200 80241AD0 E6400038 */  swc1      $f0, 0x38($s2)
-/* D07204 80241AD4 C640003C */  lwc1      $f0, 0x3c($s2)
-/* D07208 80241AD8 C6220078 */  lwc1      $f2, 0x78($s1)
-/* D0720C 80241ADC 46020000 */  add.s     $f0, $f0, $f2
-/* D07210 80241AE0 E640003C */  swc1      $f0, 0x3c($s2)
-/* D07214 80241AE4 C6400040 */  lwc1      $f0, 0x40($s2)
-/* D07218 80241AE8 C622007C */  lwc1      $f2, 0x7c($s1)
-/* D0721C 80241AEC 46020000 */  add.s     $f0, $f0, $f2
-/* D07220 80241AF0 E6400040 */  swc1      $f0, 0x40($s2)
-/* D07224 80241AF4 8E230070 */  lw        $v1, 0x70($s1)
-/* D07228 80241AF8 2463FFFF */  addiu     $v1, $v1, -1
-/* D0722C 80241AFC 2C620001 */  sltiu     $v0, $v1, 1
-/* D07230 80241B00 AE230070 */  sw        $v1, 0x70($s1)
-/* D07234 80241B04 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D07238 80241B08 8FB20018 */  lw        $s2, 0x18($sp)
-/* D0723C 80241B0C 8FB10014 */  lw        $s1, 0x14($sp)
-/* D07240 80241B10 8FB00010 */  lw        $s0, 0x10($sp)
-/* D07244 80241B14 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D07248 80241B18 00021040 */  sll       $v0, $v0, 1
-/* D0724C 80241B1C 03E00008 */  jr        $ra
-/* D07250 80241B20 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
deleted file mode 100644
index 9fc9db0881..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416E0_D3BCB0
-/* D3BCB0 802416E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D3BCB4 802416E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3BCB8 802416E8 0080882D */  daddu     $s1, $a0, $zero
-/* D3BCBC 802416EC AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BCC0 802416F0 00A0802D */  daddu     $s0, $a1, $zero
-/* D3BCC4 802416F4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D3BCC8 802416F8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D3BCCC 802416FC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D3BCD0 80241700 0C00EABB */  jal       get_npc_unsafe
-/* D3BCD4 80241704 2404FFFC */   addiu    $a0, $zero, -4
-/* D3BCD8 80241708 12000017 */  beqz      $s0, .L80241768
-/* D3BCDC 8024170C 0040902D */   daddu    $s2, $v0, $zero
-/* D3BCE0 80241710 0220202D */  daddu     $a0, $s1, $zero
-/* D3BCE4 80241714 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BCE8 80241718 0C0B210B */  jal       get_float_variable
-/* D3BCEC 8024171C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D3BCF0 80241720 0220202D */  daddu     $a0, $s1, $zero
-/* D3BCF4 80241724 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BCF8 80241728 3C014270 */  lui       $at, 0x4270
-/* D3BCFC 8024172C 4481A000 */  mtc1      $at, $f20
-/* D3BD00 80241730 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* D3BD04 80241734 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD08 80241738 0C0B210B */  jal       get_float_variable
-/* D3BD0C 8024173C E6200074 */   swc1     $f0, 0x74($s1)
-/* D3BD10 80241740 0220202D */  daddu     $a0, $s1, $zero
-/* D3BD14 80241744 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BD18 80241748 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* D3BD1C 8024174C 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD20 80241750 0C0B210B */  jal       get_float_variable
-/* D3BD24 80241754 E6200078 */   swc1     $f0, 0x78($s1)
-/* D3BD28 80241758 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD2C 8024175C 2402003C */  addiu     $v0, $zero, 0x3c
-/* D3BD30 80241760 E620007C */  swc1      $f0, 0x7c($s1)
-/* D3BD34 80241764 AE220070 */  sw        $v0, 0x70($s1)
-.L80241768:
-/* D3BD38 80241768 C6400038 */  lwc1      $f0, 0x38($s2)
-/* D3BD3C 8024176C C6220074 */  lwc1      $f2, 0x74($s1)
-/* D3BD40 80241770 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD44 80241774 E6400038 */  swc1      $f0, 0x38($s2)
-/* D3BD48 80241778 C640003C */  lwc1      $f0, 0x3c($s2)
-/* D3BD4C 8024177C C6220078 */  lwc1      $f2, 0x78($s1)
-/* D3BD50 80241780 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD54 80241784 E640003C */  swc1      $f0, 0x3c($s2)
-/* D3BD58 80241788 C6400040 */  lwc1      $f0, 0x40($s2)
-/* D3BD5C 8024178C C622007C */  lwc1      $f2, 0x7c($s1)
-/* D3BD60 80241790 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD64 80241794 E6400040 */  swc1      $f0, 0x40($s2)
-/* D3BD68 80241798 8E230070 */  lw        $v1, 0x70($s1)
-/* D3BD6C 8024179C 2463FFFF */  addiu     $v1, $v1, -1
-/* D3BD70 802417A0 2C620001 */  sltiu     $v0, $v1, 1
-/* D3BD74 802417A4 AE230070 */  sw        $v1, 0x70($s1)
-/* D3BD78 802417A8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D3BD7C 802417AC 8FB20018 */  lw        $s2, 0x18($sp)
-/* D3BD80 802417B0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3BD84 802417B4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BD88 802417B8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D3BD8C 802417BC 00021040 */  sll       $v0, $v0, 1
-/* D3BD90 802417C0 03E00008 */  jr        $ra
-/* D3BD94 802417C4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 6c830f1a9b..c6c01e1fc7 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242380_95D580);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 79119f7cc0..5dc8d5f6cd 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241210_96A3D0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 39e7b1af09..09ebdc0fa9 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802433B4_A1E4B4);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index ffbcd5fa49..3f6a1212bc 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242524_B2E994);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 42110a0238..fb4a6ad2a2 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242AAC_B3767C);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index dabb7538d5..126fc7b1eb 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802412A0_8B1310);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index fab9255b53..947070a15b 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241540_7EC250);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338);
 
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728);
 
 #include "world/common/SetManyVars.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4);
+INCLUDE_ASM(ApiStatus, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4, ScriptInstance* script, s32 isInitialCall);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40);
 
@@ -80,7 +80,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242078_7ECD88);
+ApiStatus func_80242078_7ECD88(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+    f32 var0 = get_variable(script, *args++);
+    f32 var1 = get_variable(script, *args++);
+    f32 var2 = get_variable(script, *args++);
+    f32 var3 = get_variable(script, *args++);
+    f32 temp;
+
+    temp = (var3 - var1) / (var2 - var0);
+
+    if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) {
+        script->varTable[0] = 0;
+    } else {
+        script->varTable[0] = 1;
+    }
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index a58a831e4e..1c6e82fb0c 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242E20_8036A0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 743a8f3e88..2f9dab34c7 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802426D0_825990);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index d9ecc7e362..cd479148d1 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802413C0_832BC0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 720e4bb115..db3265f824 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241370_843F40);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 988afe6e52..e9195bf47e 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242230_8543A0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 7d13ba69b1..cc74b3b3b1 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241C78_9C7058);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 5a0850fdad..ad4f99f871 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242820_9D9840);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index b71f92c9ac..07aef28454 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241580_CF90F0);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241610_CF9180);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 76ec88b1d9..1cad9e8f54 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241A3C_D0716C);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 841f1b7b7f..184b1b44f0 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241650_D3BC20);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802416E0_D3BCB0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98);
 
diff --git a/src/world/common/UnkMoveNpc.inc.c b/src/world/common/UnkMoveNpc.inc.c
new file mode 100644
index 0000000000..e77ac52f90
--- /dev/null
+++ b/src/world/common/UnkMoveNpc.inc.c
@@ -0,0 +1,19 @@
+#include "common.h"
+
+static ApiStatus UnkMoveNpc(ScriptInstance* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(NpcId_PARTNER);
+
+    if (isInitialCall) {
+        script->functionTemp[1].f = get_float_variable(script, SI_VAR(0)) / 60.0f;
+        script->functionTemp[2].f = get_float_variable(script, SI_VAR(5)) / 60.0f;
+        script->functionTemp[3].f = get_float_variable(script, SI_VAR(1)) / 60.0f;
+        script->functionTemp[0].s = 60;
+    }
+
+    npc->pos.x += script->functionTemp[1].f;
+    npc->pos.y += script->functionTemp[2].f;
+    npc->pos.z += script->functionTemp[3].f;
+    script->functionTemp[0].s--;
+
+    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+}
diff --git a/tools/m2ctx.py b/tools/m2ctx.py
index f6c477f0eb..59821b9c5c 100755
--- a/tools/m2ctx.py
+++ b/tools/m2ctx.py
@@ -26,7 +26,7 @@ def get_c_file(directory):
 
 def import_c_file(in_file):
     in_file = os.path.relpath(in_file, root_dir)
-    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
+    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
     try:
         return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
     except subprocess.CalledProcessError:
@@ -53,7 +53,7 @@ def main():
             sys.exit("Cannot find appropriate c file dir. In argumentless mode, run this script from the c file's corresponding asm dir.")
         c_file = get_c_file(c_dir_path)
         c_file_path = os.path.join(c_dir_path, c_file)
-    
+
     processed = import_c_file(c_file_path)
     processed_lines = processed.split("\n")
     output = []

From 984b7667ca7512c082bd18c6e643c74b80b8e2ed Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Fri, 30 Oct 2020 20:33:06 +0000
Subject: [PATCH 050/101] install python-setuptools

Requirement of PyYAML
---
 install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index efbc4324cc..472281d052 100755
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@
 if command -v apt &> /dev/null; then
     echo "Installing packages for Ubuntu (apt)"
 
-    sudo apt install -y git python3 python3-pip build-essential binutils-mips-linux-gnu zlib1g-dev libyaml-dev || exit 1
+    sudo apt install -y git python3 python3-pip python3-setuptools build-essential binutils-mips-linux-gnu zlib1g-dev libyaml-dev || exit 1
     python3 -m pip install -U -r requirements.txt
 
     if [[ $1 == "--extra" ]]; then
@@ -25,7 +25,7 @@ if command -v pacman &> /dev/null; then
     sudo pacman -Syu || exit 1
 
     # Install dependencies
-    sudo pacman -S --noconfirm --needed git python python-pip base-devel zlib libyaml || exit 1
+    sudo pacman -S --noconfirm --needed git python python-pip python-setuptools base-devel zlib libyaml || exit 1
     python3 -m pip install -U -r requirements.txt
 
     # Install binutils if required
@@ -62,7 +62,7 @@ fi
 if command -v zypper &> /dev/null; then
     echo "Installing packages for openSUSE (zypper)"
 
-    sudo zypper -n install git python3 python3-devel python3-pip gcc gcc-c++ glibc-devel make cross-mips-binutils zlib-devel libyaml-devel
+    sudo zypper -n install git python3 python3-devel python3-pip python3-setuptools gcc gcc-c++ glibc-devel make cross-mips-binutils zlib-devel libyaml-devel
 
     # Link the openSUSE locations for binutils tools to their usual GNU locations
     sudo ln -s /usr/bin/mips-suse-linux-addr2line /usr/bin/mips-linux-gnu-addr2line

From 31fc3ab212820db6ba30996001c738c8b57a0932 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 17:50:48 -0400
Subject: [PATCH 051/101] UnkPartnerFuncs

---
 .../dro_01/95B7E0/func_802422F0_95D4F0.s      | 42 -------------------
 .../dro_02/9694C0/func_80241180_96A340.s      | 42 -------------------
 .../hos_03/A1BDB0/func_80243324_A1E424.s      | 42 -------------------
 .../jan_02/B2C8A0/func_80242494_B2E904.s      | 42 -------------------
 .../jan_03/B34BD0/func_80242A1C_B375EC.s      | 42 -------------------
 .../kmr_02/8B0070/func_80241210_8B1280.s      | 42 -------------------
 .../mac_00/7EB340/func_802414B0_7EC1C0.s      | 42 -------------------
 .../mac_01/8017D0/func_80242D90_803610.s      | 42 -------------------
 .../mac_02/823BF0/func_80242640_825900.s      | 42 -------------------
 .../mac_03/831B20/func_80241330_832B30.s      | 42 -------------------
 .../mac_04/843030/func_802412E0_843EB0.s      | 42 -------------------
 .../mac_05/852170/func_802421A0_854310.s      | 42 -------------------
 .../nok_01/9C53E0/func_80241BE8_9C6FC8.s      | 42 -------------------
 .../nok_02/9D7AA0/func_80242790_9D97B0.s      | 42 -------------------
 .../sam_01/CF7E80/func_80241580_CF90F0.s      | 42 -------------------
 .../sam_02/D05F60/func_802419AC_D070DC.s      | 42 -------------------
 .../sam_11/D3ADA0/func_80241650_D3BC20.s      | 42 -------------------
 src/world/area_dro/dro_01/95B7E0.c            |  4 +-
 src/world/area_dro/dro_02/9694C0.c            |  4 +-
 src/world/area_hos/hos_03/A1BDB0.c            |  4 +-
 src/world/area_jan/jan_02/B2C8A0.c            |  4 +-
 src/world/area_jan/jan_03/B34BD0.c            |  4 +-
 src/world/area_kmr/kmr_02/8B0070.c            |  4 +-
 src/world/area_mac/mac_00/7EB340.c            |  4 +-
 src/world/area_mac/mac_01/8017D0.c            |  4 +-
 src/world/area_mac/mac_02/823BF0.c            |  4 +-
 src/world/area_mac/mac_03/831B20.c            |  4 +-
 src/world/area_mac/mac_04/843030.c            |  4 +-
 src/world/area_mac/mac_05/852170.c            |  4 +-
 src/world/area_nok/nok_01/9C53E0.c            |  4 +-
 src/world/area_nok/nok_02/9D7AA0.c            |  4 +-
 src/world/area_sam/sam_01/CF7E80.c            |  4 +-
 src/world/area_sam/sam_02/D05F60.c            |  4 +-
 src/world/area_sam/sam_11/D3ADA0.c            |  4 +-
 ...UnkMoveNpc.inc.c => UnkPartnerFuncs.inc.c} | 20 ++++++++-
 35 files changed, 36 insertions(+), 766 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s
 rename src/world/common/{UnkMoveNpc.inc.c => UnkPartnerFuncs.inc.c} (56%)

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s
deleted file mode 100644
index d8dccf460e..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422F0_95D4F0
-/* 95D4F0 802422F0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95D4F4 802422F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D4F8 802422F8 0080882D */  daddu     $s1, $a0, $zero
-/* 95D4FC 802422FC AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D500 80242300 00A0802D */  daddu     $s0, $a1, $zero
-/* 95D504 80242304 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95D508 80242308 0C00EABB */  jal       get_npc_unsafe
-/* 95D50C 8024230C 2404FFFC */   addiu    $a0, $zero, -4
-/* 95D510 80242310 12000003 */  beqz      $s0, .L80242320
-/* 95D514 80242314 0040182D */   daddu    $v1, $v0, $zero
-/* 95D518 80242318 2402003C */  addiu     $v0, $zero, 0x3c
-/* 95D51C 8024231C AE220070 */  sw        $v0, 0x70($s1)
-.L80242320:
-/* 95D520 80242320 C462000C */  lwc1      $f2, 0xc($v1)
-/* 95D524 80242324 3C0141F0 */  lui       $at, 0x41f0
-/* 95D528 80242328 44810000 */  mtc1      $at, $f0
-/* 95D52C 8024232C 00000000 */  nop       
-/* 95D530 80242330 46001000 */  add.s     $f0, $f2, $f0
-/* 95D534 80242334 3C0143B4 */  lui       $at, 0x43b4
-/* 95D538 80242338 44811000 */  mtc1      $at, $f2
-/* 95D53C 8024233C 00000000 */  nop       
-/* 95D540 80242340 4600103E */  c.le.s    $f2, $f0
-/* 95D544 80242344 00000000 */  nop       
-/* 95D548 80242348 45000003 */  bc1f      .L80242358
-/* 95D54C 8024234C E460000C */   swc1     $f0, 0xc($v1)
-/* 95D550 80242350 46020001 */  sub.s     $f0, $f0, $f2
-/* 95D554 80242354 E460000C */  swc1      $f0, 0xc($v1)
-.L80242358:
-/* 95D558 80242358 8E230070 */  lw        $v1, 0x70($s1)
-/* 95D55C 8024235C 2463FFFF */  addiu     $v1, $v1, -1
-/* 95D560 80242360 000317C3 */  sra       $v0, $v1, 0x1f
-/* 95D564 80242364 AE230070 */  sw        $v1, 0x70($s1)
-/* 95D568 80242368 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95D56C 8024236C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D570 80242370 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D574 80242374 30420002 */  andi      $v0, $v0, 2
-/* 95D578 80242378 03E00008 */  jr        $ra
-/* 95D57C 8024237C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s
deleted file mode 100644
index 52ec3dd2d2..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241180_96A340
-/* 96A340 80241180 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96A344 80241184 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A348 80241188 0080882D */  daddu     $s1, $a0, $zero
-/* 96A34C 8024118C AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A350 80241190 00A0802D */  daddu     $s0, $a1, $zero
-/* 96A354 80241194 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 96A358 80241198 0C00EABB */  jal       get_npc_unsafe
-/* 96A35C 8024119C 2404FFFC */   addiu    $a0, $zero, -4
-/* 96A360 802411A0 12000003 */  beqz      $s0, .L802411B0
-/* 96A364 802411A4 0040182D */   daddu    $v1, $v0, $zero
-/* 96A368 802411A8 2402003C */  addiu     $v0, $zero, 0x3c
-/* 96A36C 802411AC AE220070 */  sw        $v0, 0x70($s1)
-.L802411B0:
-/* 96A370 802411B0 C462000C */  lwc1      $f2, 0xc($v1)
-/* 96A374 802411B4 3C0141F0 */  lui       $at, 0x41f0
-/* 96A378 802411B8 44810000 */  mtc1      $at, $f0
-/* 96A37C 802411BC 00000000 */  nop       
-/* 96A380 802411C0 46001000 */  add.s     $f0, $f2, $f0
-/* 96A384 802411C4 3C0143B4 */  lui       $at, 0x43b4
-/* 96A388 802411C8 44811000 */  mtc1      $at, $f2
-/* 96A38C 802411CC 00000000 */  nop       
-/* 96A390 802411D0 4600103E */  c.le.s    $f2, $f0
-/* 96A394 802411D4 00000000 */  nop       
-/* 96A398 802411D8 45000003 */  bc1f      .L802411E8
-/* 96A39C 802411DC E460000C */   swc1     $f0, 0xc($v1)
-/* 96A3A0 802411E0 46020001 */  sub.s     $f0, $f0, $f2
-/* 96A3A4 802411E4 E460000C */  swc1      $f0, 0xc($v1)
-.L802411E8:
-/* 96A3A8 802411E8 8E230070 */  lw        $v1, 0x70($s1)
-/* 96A3AC 802411EC 2463FFFF */  addiu     $v1, $v1, -1
-/* 96A3B0 802411F0 000317C3 */  sra       $v0, $v1, 0x1f
-/* 96A3B4 802411F4 AE230070 */  sw        $v1, 0x70($s1)
-/* 96A3B8 802411F8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 96A3BC 802411FC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A3C0 80241200 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A3C4 80241204 30420002 */  andi      $v0, $v0, 2
-/* 96A3C8 80241208 03E00008 */  jr        $ra
-/* 96A3CC 8024120C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s
deleted file mode 100644
index 142902f789..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243324_A1E424
-/* A1E424 80243324 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1E428 80243328 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E42C 8024332C 0080882D */  daddu     $s1, $a0, $zero
-/* A1E430 80243330 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E434 80243334 00A0802D */  daddu     $s0, $a1, $zero
-/* A1E438 80243338 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A1E43C 8024333C 0C00EABB */  jal       get_npc_unsafe
-/* A1E440 80243340 2404FFFC */   addiu    $a0, $zero, -4
-/* A1E444 80243344 12000003 */  beqz      $s0, .L80243354
-/* A1E448 80243348 0040182D */   daddu    $v1, $v0, $zero
-/* A1E44C 8024334C 2402003C */  addiu     $v0, $zero, 0x3c
-/* A1E450 80243350 AE220070 */  sw        $v0, 0x70($s1)
-.L80243354:
-/* A1E454 80243354 C462000C */  lwc1      $f2, 0xc($v1)
-/* A1E458 80243358 3C0141F0 */  lui       $at, 0x41f0
-/* A1E45C 8024335C 44810000 */  mtc1      $at, $f0
-/* A1E460 80243360 00000000 */  nop       
-/* A1E464 80243364 46001000 */  add.s     $f0, $f2, $f0
-/* A1E468 80243368 3C0143B4 */  lui       $at, 0x43b4
-/* A1E46C 8024336C 44811000 */  mtc1      $at, $f2
-/* A1E470 80243370 00000000 */  nop       
-/* A1E474 80243374 4600103E */  c.le.s    $f2, $f0
-/* A1E478 80243378 00000000 */  nop       
-/* A1E47C 8024337C 45000003 */  bc1f      .L8024338C
-/* A1E480 80243380 E460000C */   swc1     $f0, 0xc($v1)
-/* A1E484 80243384 46020001 */  sub.s     $f0, $f0, $f2
-/* A1E488 80243388 E460000C */  swc1      $f0, 0xc($v1)
-.L8024338C:
-/* A1E48C 8024338C 8E230070 */  lw        $v1, 0x70($s1)
-/* A1E490 80243390 2463FFFF */  addiu     $v1, $v1, -1
-/* A1E494 80243394 000317C3 */  sra       $v0, $v1, 0x1f
-/* A1E498 80243398 AE230070 */  sw        $v1, 0x70($s1)
-/* A1E49C 8024339C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A1E4A0 802433A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E4A4 802433A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E4A8 802433A8 30420002 */  andi      $v0, $v0, 2
-/* A1E4AC 802433AC 03E00008 */  jr        $ra
-/* A1E4B0 802433B0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s
deleted file mode 100644
index da066920cb..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242494_B2E904
-/* B2E904 80242494 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B2E908 80242498 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E90C 8024249C 0080882D */  daddu     $s1, $a0, $zero
-/* B2E910 802424A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E914 802424A4 00A0802D */  daddu     $s0, $a1, $zero
-/* B2E918 802424A8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B2E91C 802424AC 0C00EABB */  jal       get_npc_unsafe
-/* B2E920 802424B0 2404FFFC */   addiu    $a0, $zero, -4
-/* B2E924 802424B4 12000003 */  beqz      $s0, .L802424C4
-/* B2E928 802424B8 0040182D */   daddu    $v1, $v0, $zero
-/* B2E92C 802424BC 2402003C */  addiu     $v0, $zero, 0x3c
-/* B2E930 802424C0 AE220070 */  sw        $v0, 0x70($s1)
-.L802424C4:
-/* B2E934 802424C4 C462000C */  lwc1      $f2, 0xc($v1)
-/* B2E938 802424C8 3C0141F0 */  lui       $at, 0x41f0
-/* B2E93C 802424CC 44810000 */  mtc1      $at, $f0
-/* B2E940 802424D0 00000000 */  nop       
-/* B2E944 802424D4 46001000 */  add.s     $f0, $f2, $f0
-/* B2E948 802424D8 3C0143B4 */  lui       $at, 0x43b4
-/* B2E94C 802424DC 44811000 */  mtc1      $at, $f2
-/* B2E950 802424E0 00000000 */  nop       
-/* B2E954 802424E4 4600103E */  c.le.s    $f2, $f0
-/* B2E958 802424E8 00000000 */  nop       
-/* B2E95C 802424EC 45000003 */  bc1f      .L802424FC
-/* B2E960 802424F0 E460000C */   swc1     $f0, 0xc($v1)
-/* B2E964 802424F4 46020001 */  sub.s     $f0, $f0, $f2
-/* B2E968 802424F8 E460000C */  swc1      $f0, 0xc($v1)
-.L802424FC:
-/* B2E96C 802424FC 8E230070 */  lw        $v1, 0x70($s1)
-/* B2E970 80242500 2463FFFF */  addiu     $v1, $v1, -1
-/* B2E974 80242504 000317C3 */  sra       $v0, $v1, 0x1f
-/* B2E978 80242508 AE230070 */  sw        $v1, 0x70($s1)
-/* B2E97C 8024250C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B2E980 80242510 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2E984 80242514 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2E988 80242518 30420002 */  andi      $v0, $v0, 2
-/* B2E98C 8024251C 03E00008 */  jr        $ra
-/* B2E990 80242520 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s
deleted file mode 100644
index e7d25b3e55..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A1C_B375EC
-/* B375EC 80242A1C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B375F0 80242A20 AFB10014 */  sw        $s1, 0x14($sp)
-/* B375F4 80242A24 0080882D */  daddu     $s1, $a0, $zero
-/* B375F8 80242A28 AFB00010 */  sw        $s0, 0x10($sp)
-/* B375FC 80242A2C 00A0802D */  daddu     $s0, $a1, $zero
-/* B37600 80242A30 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B37604 80242A34 0C00EABB */  jal       get_npc_unsafe
-/* B37608 80242A38 2404FFFC */   addiu    $a0, $zero, -4
-/* B3760C 80242A3C 12000003 */  beqz      $s0, .L80242A4C
-/* B37610 80242A40 0040182D */   daddu    $v1, $v0, $zero
-/* B37614 80242A44 2402003C */  addiu     $v0, $zero, 0x3c
-/* B37618 80242A48 AE220070 */  sw        $v0, 0x70($s1)
-.L80242A4C:
-/* B3761C 80242A4C C462000C */  lwc1      $f2, 0xc($v1)
-/* B37620 80242A50 3C0141F0 */  lui       $at, 0x41f0
-/* B37624 80242A54 44810000 */  mtc1      $at, $f0
-/* B37628 80242A58 00000000 */  nop       
-/* B3762C 80242A5C 46001000 */  add.s     $f0, $f2, $f0
-/* B37630 80242A60 3C0143B4 */  lui       $at, 0x43b4
-/* B37634 80242A64 44811000 */  mtc1      $at, $f2
-/* B37638 80242A68 00000000 */  nop       
-/* B3763C 80242A6C 4600103E */  c.le.s    $f2, $f0
-/* B37640 80242A70 00000000 */  nop       
-/* B37644 80242A74 45000003 */  bc1f      .L80242A84
-/* B37648 80242A78 E460000C */   swc1     $f0, 0xc($v1)
-/* B3764C 80242A7C 46020001 */  sub.s     $f0, $f0, $f2
-/* B37650 80242A80 E460000C */  swc1      $f0, 0xc($v1)
-.L80242A84:
-/* B37654 80242A84 8E230070 */  lw        $v1, 0x70($s1)
-/* B37658 80242A88 2463FFFF */  addiu     $v1, $v1, -1
-/* B3765C 80242A8C 000317C3 */  sra       $v0, $v1, 0x1f
-/* B37660 80242A90 AE230070 */  sw        $v1, 0x70($s1)
-/* B37664 80242A94 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B37668 80242A98 8FB10014 */  lw        $s1, 0x14($sp)
-/* B3766C 80242A9C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37670 80242AA0 30420002 */  andi      $v0, $v0, 2
-/* B37674 80242AA4 03E00008 */  jr        $ra
-/* B37678 80242AA8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s
deleted file mode 100644
index d18cd9c7cf..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241210_8B1280
-/* 8B1280 80241210 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B1284 80241214 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B1288 80241218 0080882D */  daddu     $s1, $a0, $zero
-/* 8B128C 8024121C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B1290 80241220 00A0802D */  daddu     $s0, $a1, $zero
-/* 8B1294 80241224 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B1298 80241228 0C00EABB */  jal       get_npc_unsafe
-/* 8B129C 8024122C 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B12A0 80241230 12000003 */  beqz      $s0, .L80241240
-/* 8B12A4 80241234 0040182D */   daddu    $v1, $v0, $zero
-/* 8B12A8 80241238 2402003C */  addiu     $v0, $zero, 0x3c
-/* 8B12AC 8024123C AE220070 */  sw        $v0, 0x70($s1)
-.L80241240:
-/* 8B12B0 80241240 C462000C */  lwc1      $f2, 0xc($v1)
-/* 8B12B4 80241244 3C0141F0 */  lui       $at, 0x41f0
-/* 8B12B8 80241248 44810000 */  mtc1      $at, $f0
-/* 8B12BC 8024124C 00000000 */  nop       
-/* 8B12C0 80241250 46001000 */  add.s     $f0, $f2, $f0
-/* 8B12C4 80241254 3C0143B4 */  lui       $at, 0x43b4
-/* 8B12C8 80241258 44811000 */  mtc1      $at, $f2
-/* 8B12CC 8024125C 00000000 */  nop       
-/* 8B12D0 80241260 4600103E */  c.le.s    $f2, $f0
-/* 8B12D4 80241264 00000000 */  nop       
-/* 8B12D8 80241268 45000003 */  bc1f      .L80241278
-/* 8B12DC 8024126C E460000C */   swc1     $f0, 0xc($v1)
-/* 8B12E0 80241270 46020001 */  sub.s     $f0, $f0, $f2
-/* 8B12E4 80241274 E460000C */  swc1      $f0, 0xc($v1)
-.L80241278:
-/* 8B12E8 80241278 8E230070 */  lw        $v1, 0x70($s1)
-/* 8B12EC 8024127C 2463FFFF */  addiu     $v1, $v1, -1
-/* 8B12F0 80241280 000317C3 */  sra       $v0, $v1, 0x1f
-/* 8B12F4 80241284 AE230070 */  sw        $v1, 0x70($s1)
-/* 8B12F8 80241288 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B12FC 8024128C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B1300 80241290 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B1304 80241294 30420002 */  andi      $v0, $v0, 2
-/* 8B1308 80241298 03E00008 */  jr        $ra
-/* 8B130C 8024129C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s
deleted file mode 100644
index 7cf24cd05d..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414B0_7EC1C0
-/* 7EC1C0 802414B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7EC1C4 802414B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EC1C8 802414B8 0080882D */  daddu     $s1, $a0, $zero
-/* 7EC1CC 802414BC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EC1D0 802414C0 00A0802D */  daddu     $s0, $a1, $zero
-/* 7EC1D4 802414C4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7EC1D8 802414C8 0C00EABB */  jal       get_npc_unsafe
-/* 7EC1DC 802414CC 2404FFFC */   addiu    $a0, $zero, -4
-/* 7EC1E0 802414D0 12000003 */  beqz      $s0, .L802414E0
-/* 7EC1E4 802414D4 0040182D */   daddu    $v1, $v0, $zero
-/* 7EC1E8 802414D8 2402003C */  addiu     $v0, $zero, 0x3c
-/* 7EC1EC 802414DC AE220070 */  sw        $v0, 0x70($s1)
-.L802414E0:
-/* 7EC1F0 802414E0 C462000C */  lwc1      $f2, 0xc($v1)
-/* 7EC1F4 802414E4 3C0141F0 */  lui       $at, 0x41f0
-/* 7EC1F8 802414E8 44810000 */  mtc1      $at, $f0
-/* 7EC1FC 802414EC 00000000 */  nop       
-/* 7EC200 802414F0 46001000 */  add.s     $f0, $f2, $f0
-/* 7EC204 802414F4 3C0143B4 */  lui       $at, 0x43b4
-/* 7EC208 802414F8 44811000 */  mtc1      $at, $f2
-/* 7EC20C 802414FC 00000000 */  nop       
-/* 7EC210 80241500 4600103E */  c.le.s    $f2, $f0
-/* 7EC214 80241504 00000000 */  nop       
-/* 7EC218 80241508 45000003 */  bc1f      .L80241518
-/* 7EC21C 8024150C E460000C */   swc1     $f0, 0xc($v1)
-/* 7EC220 80241510 46020001 */  sub.s     $f0, $f0, $f2
-/* 7EC224 80241514 E460000C */  swc1      $f0, 0xc($v1)
-.L80241518:
-/* 7EC228 80241518 8E230070 */  lw        $v1, 0x70($s1)
-/* 7EC22C 8024151C 2463FFFF */  addiu     $v1, $v1, -1
-/* 7EC230 80241520 000317C3 */  sra       $v0, $v1, 0x1f
-/* 7EC234 80241524 AE230070 */  sw        $v1, 0x70($s1)
-/* 7EC238 80241528 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7EC23C 8024152C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EC240 80241530 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EC244 80241534 30420002 */  andi      $v0, $v0, 2
-/* 7EC248 80241538 03E00008 */  jr        $ra
-/* 7EC24C 8024153C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s
deleted file mode 100644
index 9d627a7f31..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242D90_803610
-/* 803610 80242D90 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803614 80242D94 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803618 80242D98 0080882D */  daddu     $s1, $a0, $zero
-/* 80361C 80242D9C AFB00010 */  sw        $s0, 0x10($sp)
-/* 803620 80242DA0 00A0802D */  daddu     $s0, $a1, $zero
-/* 803624 80242DA4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 803628 80242DA8 0C00EABB */  jal       get_npc_unsafe
-/* 80362C 80242DAC 2404FFFC */   addiu    $a0, $zero, -4
-/* 803630 80242DB0 12000003 */  beqz      $s0, .L80242DC0
-/* 803634 80242DB4 0040182D */   daddu    $v1, $v0, $zero
-/* 803638 80242DB8 2402003C */  addiu     $v0, $zero, 0x3c
-/* 80363C 80242DBC AE220070 */  sw        $v0, 0x70($s1)
-.L80242DC0:
-/* 803640 80242DC0 C462000C */  lwc1      $f2, 0xc($v1)
-/* 803644 80242DC4 3C0141F0 */  lui       $at, 0x41f0
-/* 803648 80242DC8 44810000 */  mtc1      $at, $f0
-/* 80364C 80242DCC 00000000 */  nop       
-/* 803650 80242DD0 46001000 */  add.s     $f0, $f2, $f0
-/* 803654 80242DD4 3C0143B4 */  lui       $at, 0x43b4
-/* 803658 80242DD8 44811000 */  mtc1      $at, $f2
-/* 80365C 80242DDC 00000000 */  nop       
-/* 803660 80242DE0 4600103E */  c.le.s    $f2, $f0
-/* 803664 80242DE4 00000000 */  nop       
-/* 803668 80242DE8 45000003 */  bc1f      .L80242DF8
-/* 80366C 80242DEC E460000C */   swc1     $f0, 0xc($v1)
-/* 803670 80242DF0 46020001 */  sub.s     $f0, $f0, $f2
-/* 803674 80242DF4 E460000C */  swc1      $f0, 0xc($v1)
-.L80242DF8:
-/* 803678 80242DF8 8E230070 */  lw        $v1, 0x70($s1)
-/* 80367C 80242DFC 2463FFFF */  addiu     $v1, $v1, -1
-/* 803680 80242E00 000317C3 */  sra       $v0, $v1, 0x1f
-/* 803684 80242E04 AE230070 */  sw        $v1, 0x70($s1)
-/* 803688 80242E08 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 80368C 80242E0C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803690 80242E10 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803694 80242E14 30420002 */  andi      $v0, $v0, 2
-/* 803698 80242E18 03E00008 */  jr        $ra
-/* 80369C 80242E1C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s
deleted file mode 100644
index e150f1fbd5..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242640_825900
-/* 825900 80242640 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 825904 80242644 AFB10014 */  sw        $s1, 0x14($sp)
-/* 825908 80242648 0080882D */  daddu     $s1, $a0, $zero
-/* 82590C 8024264C AFB00010 */  sw        $s0, 0x10($sp)
-/* 825910 80242650 00A0802D */  daddu     $s0, $a1, $zero
-/* 825914 80242654 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 825918 80242658 0C00EABB */  jal       get_npc_unsafe
-/* 82591C 8024265C 2404FFFC */   addiu    $a0, $zero, -4
-/* 825920 80242660 12000003 */  beqz      $s0, .L80242670
-/* 825924 80242664 0040182D */   daddu    $v1, $v0, $zero
-/* 825928 80242668 2402003C */  addiu     $v0, $zero, 0x3c
-/* 82592C 8024266C AE220070 */  sw        $v0, 0x70($s1)
-.L80242670:
-/* 825930 80242670 C462000C */  lwc1      $f2, 0xc($v1)
-/* 825934 80242674 3C0141F0 */  lui       $at, 0x41f0
-/* 825938 80242678 44810000 */  mtc1      $at, $f0
-/* 82593C 8024267C 00000000 */  nop       
-/* 825940 80242680 46001000 */  add.s     $f0, $f2, $f0
-/* 825944 80242684 3C0143B4 */  lui       $at, 0x43b4
-/* 825948 80242688 44811000 */  mtc1      $at, $f2
-/* 82594C 8024268C 00000000 */  nop       
-/* 825950 80242690 4600103E */  c.le.s    $f2, $f0
-/* 825954 80242694 00000000 */  nop       
-/* 825958 80242698 45000003 */  bc1f      .L802426A8
-/* 82595C 8024269C E460000C */   swc1     $f0, 0xc($v1)
-/* 825960 802426A0 46020001 */  sub.s     $f0, $f0, $f2
-/* 825964 802426A4 E460000C */  swc1      $f0, 0xc($v1)
-.L802426A8:
-/* 825968 802426A8 8E230070 */  lw        $v1, 0x70($s1)
-/* 82596C 802426AC 2463FFFF */  addiu     $v1, $v1, -1
-/* 825970 802426B0 000317C3 */  sra       $v0, $v1, 0x1f
-/* 825974 802426B4 AE230070 */  sw        $v1, 0x70($s1)
-/* 825978 802426B8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 82597C 802426BC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825980 802426C0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825984 802426C4 30420002 */  andi      $v0, $v0, 2
-/* 825988 802426C8 03E00008 */  jr        $ra
-/* 82598C 802426CC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s
deleted file mode 100644
index 4f4864ebad..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241330_832B30
-/* 832B30 80241330 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 832B34 80241334 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832B38 80241338 0080882D */  daddu     $s1, $a0, $zero
-/* 832B3C 8024133C AFB00010 */  sw        $s0, 0x10($sp)
-/* 832B40 80241340 00A0802D */  daddu     $s0, $a1, $zero
-/* 832B44 80241344 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 832B48 80241348 0C00EABB */  jal       get_npc_unsafe
-/* 832B4C 8024134C 2404FFFC */   addiu    $a0, $zero, -4
-/* 832B50 80241350 12000003 */  beqz      $s0, .L80241360
-/* 832B54 80241354 0040182D */   daddu    $v1, $v0, $zero
-/* 832B58 80241358 2402003C */  addiu     $v0, $zero, 0x3c
-/* 832B5C 8024135C AE220070 */  sw        $v0, 0x70($s1)
-.L80241360:
-/* 832B60 80241360 C462000C */  lwc1      $f2, 0xc($v1)
-/* 832B64 80241364 3C0141F0 */  lui       $at, 0x41f0
-/* 832B68 80241368 44810000 */  mtc1      $at, $f0
-/* 832B6C 8024136C 00000000 */  nop       
-/* 832B70 80241370 46001000 */  add.s     $f0, $f2, $f0
-/* 832B74 80241374 3C0143B4 */  lui       $at, 0x43b4
-/* 832B78 80241378 44811000 */  mtc1      $at, $f2
-/* 832B7C 8024137C 00000000 */  nop       
-/* 832B80 80241380 4600103E */  c.le.s    $f2, $f0
-/* 832B84 80241384 00000000 */  nop       
-/* 832B88 80241388 45000003 */  bc1f      .L80241398
-/* 832B8C 8024138C E460000C */   swc1     $f0, 0xc($v1)
-/* 832B90 80241390 46020001 */  sub.s     $f0, $f0, $f2
-/* 832B94 80241394 E460000C */  swc1      $f0, 0xc($v1)
-.L80241398:
-/* 832B98 80241398 8E230070 */  lw        $v1, 0x70($s1)
-/* 832B9C 8024139C 2463FFFF */  addiu     $v1, $v1, -1
-/* 832BA0 802413A0 000317C3 */  sra       $v0, $v1, 0x1f
-/* 832BA4 802413A4 AE230070 */  sw        $v1, 0x70($s1)
-/* 832BA8 802413A8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 832BAC 802413AC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832BB0 802413B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832BB4 802413B4 30420002 */  andi      $v0, $v0, 2
-/* 832BB8 802413B8 03E00008 */  jr        $ra
-/* 832BBC 802413BC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s
deleted file mode 100644
index 162d8949bb..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412E0_843EB0
-/* 843EB0 802412E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 843EB4 802412E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843EB8 802412E8 0080882D */  daddu     $s1, $a0, $zero
-/* 843EBC 802412EC AFB00010 */  sw        $s0, 0x10($sp)
-/* 843EC0 802412F0 00A0802D */  daddu     $s0, $a1, $zero
-/* 843EC4 802412F4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 843EC8 802412F8 0C00EABB */  jal       get_npc_unsafe
-/* 843ECC 802412FC 2404FFFC */   addiu    $a0, $zero, -4
-/* 843ED0 80241300 12000003 */  beqz      $s0, .L80241310
-/* 843ED4 80241304 0040182D */   daddu    $v1, $v0, $zero
-/* 843ED8 80241308 2402003C */  addiu     $v0, $zero, 0x3c
-/* 843EDC 8024130C AE220070 */  sw        $v0, 0x70($s1)
-.L80241310:
-/* 843EE0 80241310 C462000C */  lwc1      $f2, 0xc($v1)
-/* 843EE4 80241314 3C0141F0 */  lui       $at, 0x41f0
-/* 843EE8 80241318 44810000 */  mtc1      $at, $f0
-/* 843EEC 8024131C 00000000 */  nop       
-/* 843EF0 80241320 46001000 */  add.s     $f0, $f2, $f0
-/* 843EF4 80241324 3C0143B4 */  lui       $at, 0x43b4
-/* 843EF8 80241328 44811000 */  mtc1      $at, $f2
-/* 843EFC 8024132C 00000000 */  nop       
-/* 843F00 80241330 4600103E */  c.le.s    $f2, $f0
-/* 843F04 80241334 00000000 */  nop       
-/* 843F08 80241338 45000003 */  bc1f      .L80241348
-/* 843F0C 8024133C E460000C */   swc1     $f0, 0xc($v1)
-/* 843F10 80241340 46020001 */  sub.s     $f0, $f0, $f2
-/* 843F14 80241344 E460000C */  swc1      $f0, 0xc($v1)
-.L80241348:
-/* 843F18 80241348 8E230070 */  lw        $v1, 0x70($s1)
-/* 843F1C 8024134C 2463FFFF */  addiu     $v1, $v1, -1
-/* 843F20 80241350 000317C3 */  sra       $v0, $v1, 0x1f
-/* 843F24 80241354 AE230070 */  sw        $v1, 0x70($s1)
-/* 843F28 80241358 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 843F2C 8024135C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 843F30 80241360 8FB00010 */  lw        $s0, 0x10($sp)
-/* 843F34 80241364 30420002 */  andi      $v0, $v0, 2
-/* 843F38 80241368 03E00008 */  jr        $ra
-/* 843F3C 8024136C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s
deleted file mode 100644
index 5b145b0814..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421A0_854310
-/* 854310 802421A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 854314 802421A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 854318 802421A8 0080882D */  daddu     $s1, $a0, $zero
-/* 85431C 802421AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 854320 802421B0 00A0802D */  daddu     $s0, $a1, $zero
-/* 854324 802421B4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 854328 802421B8 0C00EABB */  jal       get_npc_unsafe
-/* 85432C 802421BC 2404FFFC */   addiu    $a0, $zero, -4
-/* 854330 802421C0 12000003 */  beqz      $s0, .L802421D0
-/* 854334 802421C4 0040182D */   daddu    $v1, $v0, $zero
-/* 854338 802421C8 2402003C */  addiu     $v0, $zero, 0x3c
-/* 85433C 802421CC AE220070 */  sw        $v0, 0x70($s1)
-.L802421D0:
-/* 854340 802421D0 C462000C */  lwc1      $f2, 0xc($v1)
-/* 854344 802421D4 3C0141F0 */  lui       $at, 0x41f0
-/* 854348 802421D8 44810000 */  mtc1      $at, $f0
-/* 85434C 802421DC 00000000 */  nop       
-/* 854350 802421E0 46001000 */  add.s     $f0, $f2, $f0
-/* 854354 802421E4 3C0143B4 */  lui       $at, 0x43b4
-/* 854358 802421E8 44811000 */  mtc1      $at, $f2
-/* 85435C 802421EC 00000000 */  nop       
-/* 854360 802421F0 4600103E */  c.le.s    $f2, $f0
-/* 854364 802421F4 00000000 */  nop       
-/* 854368 802421F8 45000003 */  bc1f      .L80242208
-/* 85436C 802421FC E460000C */   swc1     $f0, 0xc($v1)
-/* 854370 80242200 46020001 */  sub.s     $f0, $f0, $f2
-/* 854374 80242204 E460000C */  swc1      $f0, 0xc($v1)
-.L80242208:
-/* 854378 80242208 8E230070 */  lw        $v1, 0x70($s1)
-/* 85437C 8024220C 2463FFFF */  addiu     $v1, $v1, -1
-/* 854380 80242210 000317C3 */  sra       $v0, $v1, 0x1f
-/* 854384 80242214 AE230070 */  sw        $v1, 0x70($s1)
-/* 854388 80242218 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 85438C 8024221C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854390 80242220 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854394 80242224 30420002 */  andi      $v0, $v0, 2
-/* 854398 80242228 03E00008 */  jr        $ra
-/* 85439C 8024222C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s
deleted file mode 100644
index 26e45f88ed..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241BE8_9C6FC8
-/* 9C6FC8 80241BE8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C6FCC 80241BEC AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C6FD0 80241BF0 0080882D */  daddu     $s1, $a0, $zero
-/* 9C6FD4 80241BF4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6FD8 80241BF8 00A0802D */  daddu     $s0, $a1, $zero
-/* 9C6FDC 80241BFC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9C6FE0 80241C00 0C00EABB */  jal       get_npc_unsafe
-/* 9C6FE4 80241C04 2404FFFC */   addiu    $a0, $zero, -4
-/* 9C6FE8 80241C08 12000003 */  beqz      $s0, .L80241C18
-/* 9C6FEC 80241C0C 0040182D */   daddu    $v1, $v0, $zero
-/* 9C6FF0 80241C10 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9C6FF4 80241C14 AE220070 */  sw        $v0, 0x70($s1)
-.L80241C18:
-/* 9C6FF8 80241C18 C462000C */  lwc1      $f2, 0xc($v1)
-/* 9C6FFC 80241C1C 3C0141F0 */  lui       $at, 0x41f0
-/* 9C7000 80241C20 44810000 */  mtc1      $at, $f0
-/* 9C7004 80241C24 00000000 */  nop       
-/* 9C7008 80241C28 46001000 */  add.s     $f0, $f2, $f0
-/* 9C700C 80241C2C 3C0143B4 */  lui       $at, 0x43b4
-/* 9C7010 80241C30 44811000 */  mtc1      $at, $f2
-/* 9C7014 80241C34 00000000 */  nop       
-/* 9C7018 80241C38 4600103E */  c.le.s    $f2, $f0
-/* 9C701C 80241C3C 00000000 */  nop       
-/* 9C7020 80241C40 45000003 */  bc1f      .L80241C50
-/* 9C7024 80241C44 E460000C */   swc1     $f0, 0xc($v1)
-/* 9C7028 80241C48 46020001 */  sub.s     $f0, $f0, $f2
-/* 9C702C 80241C4C E460000C */  swc1      $f0, 0xc($v1)
-.L80241C50:
-/* 9C7030 80241C50 8E230070 */  lw        $v1, 0x70($s1)
-/* 9C7034 80241C54 2463FFFF */  addiu     $v1, $v1, -1
-/* 9C7038 80241C58 000317C3 */  sra       $v0, $v1, 0x1f
-/* 9C703C 80241C5C AE230070 */  sw        $v1, 0x70($s1)
-/* 9C7040 80241C60 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9C7044 80241C64 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C7048 80241C68 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C704C 80241C6C 30420002 */  andi      $v0, $v0, 2
-/* 9C7050 80241C70 03E00008 */  jr        $ra
-/* 9C7054 80241C74 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s
deleted file mode 100644
index 0b09a0ed76..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242790_9D97B0
-/* 9D97B0 80242790 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9D97B4 80242794 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D97B8 80242798 0080882D */  daddu     $s1, $a0, $zero
-/* 9D97BC 8024279C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D97C0 802427A0 00A0802D */  daddu     $s0, $a1, $zero
-/* 9D97C4 802427A4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9D97C8 802427A8 0C00EABB */  jal       get_npc_unsafe
-/* 9D97CC 802427AC 2404FFFC */   addiu    $a0, $zero, -4
-/* 9D97D0 802427B0 12000003 */  beqz      $s0, .L802427C0
-/* 9D97D4 802427B4 0040182D */   daddu    $v1, $v0, $zero
-/* 9D97D8 802427B8 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9D97DC 802427BC AE220070 */  sw        $v0, 0x70($s1)
-.L802427C0:
-/* 9D97E0 802427C0 C462000C */  lwc1      $f2, 0xc($v1)
-/* 9D97E4 802427C4 3C0141F0 */  lui       $at, 0x41f0
-/* 9D97E8 802427C8 44810000 */  mtc1      $at, $f0
-/* 9D97EC 802427CC 00000000 */  nop       
-/* 9D97F0 802427D0 46001000 */  add.s     $f0, $f2, $f0
-/* 9D97F4 802427D4 3C0143B4 */  lui       $at, 0x43b4
-/* 9D97F8 802427D8 44811000 */  mtc1      $at, $f2
-/* 9D97FC 802427DC 00000000 */  nop       
-/* 9D9800 802427E0 4600103E */  c.le.s    $f2, $f0
-/* 9D9804 802427E4 00000000 */  nop       
-/* 9D9808 802427E8 45000003 */  bc1f      .L802427F8
-/* 9D980C 802427EC E460000C */   swc1     $f0, 0xc($v1)
-/* 9D9810 802427F0 46020001 */  sub.s     $f0, $f0, $f2
-/* 9D9814 802427F4 E460000C */  swc1      $f0, 0xc($v1)
-.L802427F8:
-/* 9D9818 802427F8 8E230070 */  lw        $v1, 0x70($s1)
-/* 9D981C 802427FC 2463FFFF */  addiu     $v1, $v1, -1
-/* 9D9820 80242800 000317C3 */  sra       $v0, $v1, 0x1f
-/* 9D9824 80242804 AE230070 */  sw        $v1, 0x70($s1)
-/* 9D9828 80242808 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9D982C 8024280C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9830 80242810 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9834 80242814 30420002 */  andi      $v0, $v0, 2
-/* 9D9838 80242818 03E00008 */  jr        $ra
-/* 9D983C 8024281C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s
deleted file mode 100644
index d9ad39c33f..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241580_CF90F0
-/* CF90F0 80241580 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF90F4 80241584 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF90F8 80241588 0080882D */  daddu     $s1, $a0, $zero
-/* CF90FC 8024158C AFB00010 */  sw        $s0, 0x10($sp)
-/* CF9100 80241590 00A0802D */  daddu     $s0, $a1, $zero
-/* CF9104 80241594 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF9108 80241598 0C00EABB */  jal       get_npc_unsafe
-/* CF910C 8024159C 2404FFFC */   addiu    $a0, $zero, -4
-/* CF9110 802415A0 12000003 */  beqz      $s0, .L802415B0
-/* CF9114 802415A4 0040182D */   daddu    $v1, $v0, $zero
-/* CF9118 802415A8 2402003C */  addiu     $v0, $zero, 0x3c
-/* CF911C 802415AC AE220070 */  sw        $v0, 0x70($s1)
-.L802415B0:
-/* CF9120 802415B0 C462000C */  lwc1      $f2, 0xc($v1)
-/* CF9124 802415B4 3C0141F0 */  lui       $at, 0x41f0
-/* CF9128 802415B8 44810000 */  mtc1      $at, $f0
-/* CF912C 802415BC 00000000 */  nop       
-/* CF9130 802415C0 46001000 */  add.s     $f0, $f2, $f0
-/* CF9134 802415C4 3C0143B4 */  lui       $at, 0x43b4
-/* CF9138 802415C8 44811000 */  mtc1      $at, $f2
-/* CF913C 802415CC 00000000 */  nop       
-/* CF9140 802415D0 4600103E */  c.le.s    $f2, $f0
-/* CF9144 802415D4 00000000 */  nop       
-/* CF9148 802415D8 45000003 */  bc1f      .L802415E8
-/* CF914C 802415DC E460000C */   swc1     $f0, 0xc($v1)
-/* CF9150 802415E0 46020001 */  sub.s     $f0, $f0, $f2
-/* CF9154 802415E4 E460000C */  swc1      $f0, 0xc($v1)
-.L802415E8:
-/* CF9158 802415E8 8E230070 */  lw        $v1, 0x70($s1)
-/* CF915C 802415EC 2463FFFF */  addiu     $v1, $v1, -1
-/* CF9160 802415F0 000317C3 */  sra       $v0, $v1, 0x1f
-/* CF9164 802415F4 AE230070 */  sw        $v1, 0x70($s1)
-/* CF9168 802415F8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF916C 802415FC 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF9170 80241600 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF9174 80241604 30420002 */  andi      $v0, $v0, 2
-/* CF9178 80241608 03E00008 */  jr        $ra
-/* CF917C 8024160C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s
deleted file mode 100644
index d6e0afad60..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419AC_D070DC
-/* D070DC 802419AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D070E0 802419B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* D070E4 802419B4 0080882D */  daddu     $s1, $a0, $zero
-/* D070E8 802419B8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D070EC 802419BC 00A0802D */  daddu     $s0, $a1, $zero
-/* D070F0 802419C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D070F4 802419C4 0C00EABB */  jal       get_npc_unsafe
-/* D070F8 802419C8 2404FFFC */   addiu    $a0, $zero, -4
-/* D070FC 802419CC 12000003 */  beqz      $s0, .L802419DC
-/* D07100 802419D0 0040182D */   daddu    $v1, $v0, $zero
-/* D07104 802419D4 2402003C */  addiu     $v0, $zero, 0x3c
-/* D07108 802419D8 AE220070 */  sw        $v0, 0x70($s1)
-.L802419DC:
-/* D0710C 802419DC C462000C */  lwc1      $f2, 0xc($v1)
-/* D07110 802419E0 3C0141F0 */  lui       $at, 0x41f0
-/* D07114 802419E4 44810000 */  mtc1      $at, $f0
-/* D07118 802419E8 00000000 */  nop       
-/* D0711C 802419EC 46001000 */  add.s     $f0, $f2, $f0
-/* D07120 802419F0 3C0143B4 */  lui       $at, 0x43b4
-/* D07124 802419F4 44811000 */  mtc1      $at, $f2
-/* D07128 802419F8 00000000 */  nop       
-/* D0712C 802419FC 4600103E */  c.le.s    $f2, $f0
-/* D07130 80241A00 00000000 */  nop       
-/* D07134 80241A04 45000003 */  bc1f      .L80241A14
-/* D07138 80241A08 E460000C */   swc1     $f0, 0xc($v1)
-/* D0713C 80241A0C 46020001 */  sub.s     $f0, $f0, $f2
-/* D07140 80241A10 E460000C */  swc1      $f0, 0xc($v1)
-.L80241A14:
-/* D07144 80241A14 8E230070 */  lw        $v1, 0x70($s1)
-/* D07148 80241A18 2463FFFF */  addiu     $v1, $v1, -1
-/* D0714C 80241A1C 000317C3 */  sra       $v0, $v1, 0x1f
-/* D07150 80241A20 AE230070 */  sw        $v1, 0x70($s1)
-/* D07154 80241A24 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D07158 80241A28 8FB10014 */  lw        $s1, 0x14($sp)
-/* D0715C 80241A2C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D07160 80241A30 30420002 */  andi      $v0, $v0, 2
-/* D07164 80241A34 03E00008 */  jr        $ra
-/* D07168 80241A38 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s
deleted file mode 100644
index 1c705acb9e..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241650_D3BC20
-/* D3BC20 80241650 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D3BC24 80241654 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3BC28 80241658 0080882D */  daddu     $s1, $a0, $zero
-/* D3BC2C 8024165C AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BC30 80241660 00A0802D */  daddu     $s0, $a1, $zero
-/* D3BC34 80241664 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D3BC38 80241668 0C00EABB */  jal       get_npc_unsafe
-/* D3BC3C 8024166C 2404FFFC */   addiu    $a0, $zero, -4
-/* D3BC40 80241670 12000003 */  beqz      $s0, .L80241680
-/* D3BC44 80241674 0040182D */   daddu    $v1, $v0, $zero
-/* D3BC48 80241678 2402003C */  addiu     $v0, $zero, 0x3c
-/* D3BC4C 8024167C AE220070 */  sw        $v0, 0x70($s1)
-.L80241680:
-/* D3BC50 80241680 C462000C */  lwc1      $f2, 0xc($v1)
-/* D3BC54 80241684 3C0141F0 */  lui       $at, 0x41f0
-/* D3BC58 80241688 44810000 */  mtc1      $at, $f0
-/* D3BC5C 8024168C 00000000 */  nop       
-/* D3BC60 80241690 46001000 */  add.s     $f0, $f2, $f0
-/* D3BC64 80241694 3C0143B4 */  lui       $at, 0x43b4
-/* D3BC68 80241698 44811000 */  mtc1      $at, $f2
-/* D3BC6C 8024169C 00000000 */  nop       
-/* D3BC70 802416A0 4600103E */  c.le.s    $f2, $f0
-/* D3BC74 802416A4 00000000 */  nop       
-/* D3BC78 802416A8 45000003 */  bc1f      .L802416B8
-/* D3BC7C 802416AC E460000C */   swc1     $f0, 0xc($v1)
-/* D3BC80 802416B0 46020001 */  sub.s     $f0, $f0, $f2
-/* D3BC84 802416B4 E460000C */  swc1      $f0, 0xc($v1)
-.L802416B8:
-/* D3BC88 802416B8 8E230070 */  lw        $v1, 0x70($s1)
-/* D3BC8C 802416BC 2463FFFF */  addiu     $v1, $v1, -1
-/* D3BC90 802416C0 000317C3 */  sra       $v0, $v1, 0x1f
-/* D3BC94 802416C4 AE230070 */  sw        $v1, 0x70($s1)
-/* D3BC98 802416C8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D3BC9C 802416CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3BCA0 802416D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BCA4 802416D4 30420002 */  andi      $v0, $v0, 2
-/* D3BCA8 802416D8 03E00008 */  jr        $ra
-/* D3BCAC 802416DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index c6c01e1fc7..fd258c68ec 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 5dc8d5f6cd..95df3d4b0f 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 09ebdc0fa9..e6cb55f900 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -86,9 +86,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 3f6a1212bc..df6da359fe 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -78,9 +78,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index fb4a6ad2a2..184667f85b 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -118,9 +118,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 126fc7b1eb..c2a864f722 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -60,9 +60,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 947070a15b..a50c4fba79 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 1c6e82fb0c..4f871cc5a3 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -70,9 +70,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 2f9dab34c7..bbd39460fc 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index cd479148d1..935c165abb 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -46,9 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index db3265f824..33868e1f5c 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index e9195bf47e..ac73e21084 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -76,9 +76,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index cc74b3b3b1..04af4c9b9b 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -84,9 +84,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index ad4f99f871..ff2304cfef 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 07aef28454..f9daf86071 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -56,9 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241580_CF90F0);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 1cad9e8f54..775fd06542 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -64,9 +64,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 184b1b44f0..df17fb25c7 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241650_D3BC20);
-
-#include "world/common/UnkMoveNpc.inc.c"
+#include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98);
 
diff --git a/src/world/common/UnkMoveNpc.inc.c b/src/world/common/UnkPartnerFuncs.inc.c
similarity index 56%
rename from src/world/common/UnkMoveNpc.inc.c
rename to src/world/common/UnkPartnerFuncs.inc.c
index e77ac52f90..b7f2e7584d 100644
--- a/src/world/common/UnkMoveNpc.inc.c
+++ b/src/world/common/UnkPartnerFuncs.inc.c
@@ -1,6 +1,24 @@
 #include "common.h"
 
-static ApiStatus UnkMoveNpc(ScriptInstance* script, s32 isInitialCall) {
+static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) {
+    Npc* partner = get_npc_unsafe(NpcId_PARTNER);
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 60;
+    }
+
+    partner->yaw += 30.0f;
+    if (partner->yaw >= 360.0f) {
+        partner->yaw -= 360.0f;
+    }
+
+    script->functionTemp[0].s--;
+
+    return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2;
+}
+
+
+static ApiStatus UnkMovePartner(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(NpcId_PARTNER);
 
     if (isInitialCall) {

From b0d5e8ee62cb2f1fb6dc5cb77dacad7b30fa7a9d Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 18:41:04 -0400
Subject: [PATCH 052/101] 3 more

---
 .../dro_01/95B7E0/func_80241FDC_95D1DC.s      | 33 --------------
 .../dro_01/95B7E0/func_80242050_95D250.s      | 44 -------------------
 .../dro_01/95B7E0/func_8024228C_95D48C.s      | 31 -------------
 .../dro_02/9694C0/func_80240E6C_96A02C.s      | 33 --------------
 .../dro_02/9694C0/func_80240EE0_96A0A0.s      | 44 -------------------
 .../dro_02/9694C0/func_8024111C_96A2DC.s      | 31 -------------
 .../hos_03/A1BDB0/func_80243010_A1E110.s      | 33 --------------
 .../hos_03/A1BDB0/func_80243084_A1E184.s      | 44 -------------------
 .../hos_03/A1BDB0/func_802432C0_A1E3C0.s      | 31 -------------
 .../hos_04/A274B0/func_802405E0_A274B0.s      | 33 --------------
 .../jan_02/B2C8A0/func_80242180_B2E5F0.s      | 33 --------------
 .../jan_02/B2C8A0/func_802421F4_B2E664.s      | 44 -------------------
 .../jan_02/B2C8A0/func_80242430_B2E8A0.s      | 31 -------------
 .../jan_03/B34BD0/func_80242708_B372D8.s      | 33 --------------
 .../jan_03/B34BD0/func_8024277C_B3734C.s      | 44 -------------------
 .../jan_03/B34BD0/func_802429B8_B37588.s      | 31 -------------
 .../kmr_02/8B0070/func_80240EFC_8B0F6C.s      | 33 --------------
 .../kmr_02/8B0070/func_80240F70_8B0FE0.s      | 44 -------------------
 .../kmr_02/8B0070/func_802411AC_8B121C.s      | 31 -------------
 .../mac_00/7EB340/func_8024119C_7EBEAC.s      | 33 --------------
 .../mac_00/7EB340/func_80241210_7EBF20.s      | 44 -------------------
 .../mac_00/7EB340/func_8024144C_7EC15C.s      | 31 -------------
 .../mac_01/8017D0/func_80242A7C_8032FC.s      | 33 --------------
 .../mac_01/8017D0/func_80242AF0_803370.s      | 44 -------------------
 .../mac_01/8017D0/func_80242D2C_8035AC.s      | 31 -------------
 .../mac_02/823BF0/func_8024232C_8255EC.s      | 33 --------------
 .../mac_02/823BF0/func_802423A0_825660.s      | 44 -------------------
 .../mac_02/823BF0/func_802425DC_82589C.s      | 31 -------------
 .../mac_03/831B20/func_8024101C_83281C.s      | 33 --------------
 .../mac_03/831B20/func_80241090_832890.s      | 44 -------------------
 .../mac_03/831B20/func_802412CC_832ACC.s      | 31 -------------
 .../mac_04/843030/func_80240FCC_843B9C.s      | 33 --------------
 .../mac_04/843030/func_80241040_843C10.s      | 44 -------------------
 .../mac_04/843030/func_8024127C_843E4C.s      | 31 -------------
 .../mac_05/852170/func_80241E8C_853FFC.s      | 33 --------------
 .../mac_05/852170/func_80241F00_854070.s      | 44 -------------------
 .../mac_05/852170/func_8024213C_8542AC.s      | 31 -------------
 .../nok_01/9C53E0/func_802418D4_9C6CB4.s      | 33 --------------
 .../nok_01/9C53E0/func_80241948_9C6D28.s      | 44 -------------------
 .../nok_01/9C53E0/func_80241B84_9C6F64.s      | 31 -------------
 .../nok_02/9D7AA0/func_8024247C_9D949C.s      | 33 --------------
 .../nok_02/9D7AA0/func_802424F0_9D9510.s      | 44 -------------------
 .../nok_02/9D7AA0/func_8024272C_9D974C.s      | 31 -------------
 .../sam_01/CF7E80/func_8024126C_CF8DDC.s      | 33 --------------
 .../sam_01/CF7E80/func_802412E0_CF8E50.s      | 44 -------------------
 .../sam_01/CF7E80/func_8024151C_CF908C.s      | 31 -------------
 .../sam_02/D05F60/func_80241698_D06DC8.s      | 33 --------------
 .../sam_02/D05F60/func_8024170C_D06E3C.s      | 44 -------------------
 .../sam_02/D05F60/func_80241948_D07078.s      | 31 -------------
 .../sam_11/D3ADA0/func_8024133C_D3B90C.s      | 33 --------------
 .../sam_11/D3ADA0/func_802413B0_D3B980.s      | 44 -------------------
 .../sam_11/D3ADA0/func_802415EC_D3BBBC.s      | 31 -------------
 include/si.h                                  |  2 +-
 src/world/area_dro/dro_01/95B7E0.c            |  6 +--
 src/world/area_dro/dro_02/9694C0.c            |  6 +--
 src/world/area_hos/hos_03/A1BDB0.c            |  6 +--
 src/world/area_hos/hos_04/A274B0.c            |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c            |  6 +--
 src/world/area_jan/jan_03/B34BD0.c            |  6 +--
 src/world/area_kmr/kmr_02/8B0070.c            |  6 +--
 src/world/area_mac/mac_00/7EB340.c            |  6 +--
 src/world/area_mac/mac_01/8017D0.c            |  6 +--
 src/world/area_mac/mac_02/823BF0.c            |  6 +--
 src/world/area_mac/mac_03/831B20.c            |  6 +--
 src/world/area_mac/mac_04/843030.c            |  6 +--
 src/world/area_mac/mac_05/852170.c            |  6 +--
 src/world/area_nok/nok_01/9C53E0.c            |  6 +--
 src/world/area_nok/nok_02/9D7AA0.c            |  6 +--
 src/world/area_sam/sam_01/CF7E80.c            |  6 +--
 src/world/area_sam/sam_02/D05F60.c            |  6 +--
 src/world/area_sam/sam_11/D3ADA0.c            |  6 +--
 src/world/common/GetCamVfov.inc.c             | 10 +++++
 src/world/common/SetCamVfov.inc.c             | 10 +++++
 src/world/common/UnkPartnerFuncs.inc.c        |  1 -
 src/world/common/UnkRotatePlayer.inc.c        | 18 ++++++++
 75 files changed, 91 insertions(+), 1923 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s
 create mode 100644 src/world/common/GetCamVfov.inc.c
 create mode 100644 src/world/common/SetCamVfov.inc.c
 create mode 100644 src/world/common/UnkRotatePlayer.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s
deleted file mode 100644
index 09c67d9c69..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FDC_95D1DC
-/* 95D1DC 80241FDC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95D1E0 80241FE0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D1E4 80241FE4 0080882D */  daddu     $s1, $a0, $zero
-/* 95D1E8 80241FE8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95D1EC 80241FEC AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D1F0 80241FF0 8E30000C */  lw        $s0, 0xc($s1)
-/* 95D1F4 80241FF4 8E050000 */  lw        $a1, ($s0)
-/* 95D1F8 80241FF8 0C0B1EAF */  jal       get_variable
-/* 95D1FC 80241FFC 26100004 */   addiu    $s0, $s0, 4
-/* 95D200 80242000 0220202D */  daddu     $a0, $s1, $zero
-/* 95D204 80242004 8E050000 */  lw        $a1, ($s0)
-/* 95D208 80242008 0C0B210B */  jal       get_float_variable
-/* 95D20C 8024200C 0040802D */   daddu    $s0, $v0, $zero
-/* 95D210 80242010 24020002 */  addiu     $v0, $zero, 2
-/* 95D214 80242014 00501804 */  sllv      $v1, $s0, $v0
-/* 95D218 80242018 00701821 */  addu      $v1, $v1, $s0
-/* 95D21C 8024201C 00431804 */  sllv      $v1, $v1, $v0
-/* 95D220 80242020 00701823 */  subu      $v1, $v1, $s0
-/* 95D224 80242024 000320C0 */  sll       $a0, $v1, 3
-/* 95D228 80242028 00641821 */  addu      $v1, $v1, $a0
-/* 95D22C 8024202C 000318C0 */  sll       $v1, $v1, 3
-/* 95D230 80242030 3C01800B */  lui       $at, 0x800b
-/* 95D234 80242034 00230821 */  addu      $at, $at, $v1
-/* 95D238 80242038 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 95D23C 8024203C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95D240 80242040 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D244 80242044 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D248 80242048 03E00008 */  jr        $ra
-/* 95D24C 8024204C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s
deleted file mode 100644
index 173827e43f..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242050_95D250
-/* 95D250 80242050 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95D254 80242054 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D258 80242058 0080882D */  daddu     $s1, $a0, $zero
-/* 95D25C 8024205C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95D260 80242060 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D264 80242064 8E30000C */  lw        $s0, 0xc($s1)
-/* 95D268 80242068 8E050000 */  lw        $a1, ($s0)
-/* 95D26C 8024206C 0C0B1EAF */  jal       get_variable
-/* 95D270 80242070 26100004 */   addiu    $s0, $s0, 4
-/* 95D274 80242074 00021880 */  sll       $v1, $v0, 2
-/* 95D278 80242078 00621821 */  addu      $v1, $v1, $v0
-/* 95D27C 8024207C 00031880 */  sll       $v1, $v1, 2
-/* 95D280 80242080 00621823 */  subu      $v1, $v1, $v0
-/* 95D284 80242084 000310C0 */  sll       $v0, $v1, 3
-/* 95D288 80242088 00621821 */  addu      $v1, $v1, $v0
-/* 95D28C 8024208C 000318C0 */  sll       $v1, $v1, 3
-/* 95D290 80242090 3C01800B */  lui       $at, 0x800b
-/* 95D294 80242094 00230821 */  addu      $at, $at, $v1
-/* 95D298 80242098 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 95D29C 8024209C 3C014480 */  lui       $at, 0x4480
-/* 95D2A0 802420A0 44810000 */  mtc1      $at, $f0
-/* 95D2A4 802420A4 00000000 */  nop       
-/* 95D2A8 802420A8 46001082 */  mul.s     $f2, $f2, $f0
-/* 95D2AC 802420AC 00000000 */  nop       
-/* 95D2B0 802420B0 3C01CD5B */  lui       $at, 0xcd5b
-/* 95D2B4 802420B4 34215858 */  ori       $at, $at, 0x5858
-/* 95D2B8 802420B8 44810000 */  mtc1      $at, $f0
-/* 95D2BC 802420BC 00000000 */  nop       
-/* 95D2C0 802420C0 46001080 */  add.s     $f2, $f2, $f0
-/* 95D2C4 802420C4 8E050000 */  lw        $a1, ($s0)
-/* 95D2C8 802420C8 4600110D */  trunc.w.s $f4, $f2
-/* 95D2CC 802420CC 44062000 */  mfc1      $a2, $f4
-/* 95D2D0 802420D0 0C0B2026 */  jal       set_variable
-/* 95D2D4 802420D4 0220202D */   daddu    $a0, $s1, $zero
-/* 95D2D8 802420D8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95D2DC 802420DC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D2E0 802420E0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D2E4 802420E4 24020002 */  addiu     $v0, $zero, 2
-/* 95D2E8 802420E8 03E00008 */  jr        $ra
-/* 95D2EC 802420EC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s
deleted file mode 100644
index 7cffdb15ba..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024228C_95D48C
-/* 95D48C 8024228C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 95D490 80242290 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 95D494 80242294 10A00002 */  beqz      $a1, .L802422A0
-/* 95D498 80242298 2402003C */   addiu    $v0, $zero, 0x3c
-/* 95D49C 8024229C AC820070 */  sw        $v0, 0x70($a0)
-.L802422A0:
-/* 95D4A0 802422A0 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 95D4A4 802422A4 3C0141F0 */  lui       $at, 0x41f0
-/* 95D4A8 802422A8 44810000 */  mtc1      $at, $f0
-/* 95D4AC 802422AC 00000000 */  nop       
-/* 95D4B0 802422B0 46001000 */  add.s     $f0, $f2, $f0
-/* 95D4B4 802422B4 3C0143B4 */  lui       $at, 0x43b4
-/* 95D4B8 802422B8 44811000 */  mtc1      $at, $f2
-/* 95D4BC 802422BC 00000000 */  nop       
-/* 95D4C0 802422C0 4600103E */  c.le.s    $f2, $f0
-/* 95D4C4 802422C4 00000000 */  nop       
-/* 95D4C8 802422C8 45000003 */  bc1f      .L802422D8
-/* 95D4CC 802422CC E4600080 */   swc1     $f0, 0x80($v1)
-/* 95D4D0 802422D0 46020001 */  sub.s     $f0, $f0, $f2
-/* 95D4D4 802422D4 E4600080 */  swc1      $f0, 0x80($v1)
-.L802422D8:
-/* 95D4D8 802422D8 8C820070 */  lw        $v0, 0x70($a0)
-/* 95D4DC 802422DC 2442FFFF */  addiu     $v0, $v0, -1
-/* 95D4E0 802422E0 AC820070 */  sw        $v0, 0x70($a0)
-/* 95D4E4 802422E4 000217C3 */  sra       $v0, $v0, 0x1f
-/* 95D4E8 802422E8 03E00008 */  jr        $ra
-/* 95D4EC 802422EC 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s
deleted file mode 100644
index 00eb172992..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E6C_96A02C
-/* 96A02C 80240E6C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96A030 80240E70 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A034 80240E74 0080882D */  daddu     $s1, $a0, $zero
-/* 96A038 80240E78 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 96A03C 80240E7C AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A040 80240E80 8E30000C */  lw        $s0, 0xc($s1)
-/* 96A044 80240E84 8E050000 */  lw        $a1, ($s0)
-/* 96A048 80240E88 0C0B1EAF */  jal       get_variable
-/* 96A04C 80240E8C 26100004 */   addiu    $s0, $s0, 4
-/* 96A050 80240E90 0220202D */  daddu     $a0, $s1, $zero
-/* 96A054 80240E94 8E050000 */  lw        $a1, ($s0)
-/* 96A058 80240E98 0C0B210B */  jal       get_float_variable
-/* 96A05C 80240E9C 0040802D */   daddu    $s0, $v0, $zero
-/* 96A060 80240EA0 24020002 */  addiu     $v0, $zero, 2
-/* 96A064 80240EA4 00501804 */  sllv      $v1, $s0, $v0
-/* 96A068 80240EA8 00701821 */  addu      $v1, $v1, $s0
-/* 96A06C 80240EAC 00431804 */  sllv      $v1, $v1, $v0
-/* 96A070 80240EB0 00701823 */  subu      $v1, $v1, $s0
-/* 96A074 80240EB4 000320C0 */  sll       $a0, $v1, 3
-/* 96A078 80240EB8 00641821 */  addu      $v1, $v1, $a0
-/* 96A07C 80240EBC 000318C0 */  sll       $v1, $v1, 3
-/* 96A080 80240EC0 3C01800B */  lui       $at, 0x800b
-/* 96A084 80240EC4 00230821 */  addu      $at, $at, $v1
-/* 96A088 80240EC8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 96A08C 80240ECC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 96A090 80240ED0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A094 80240ED4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A098 80240ED8 03E00008 */  jr        $ra
-/* 96A09C 80240EDC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s
deleted file mode 100644
index 59a220d8ac..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE0_96A0A0
-/* 96A0A0 80240EE0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96A0A4 80240EE4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A0A8 80240EE8 0080882D */  daddu     $s1, $a0, $zero
-/* 96A0AC 80240EEC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 96A0B0 80240EF0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A0B4 80240EF4 8E30000C */  lw        $s0, 0xc($s1)
-/* 96A0B8 80240EF8 8E050000 */  lw        $a1, ($s0)
-/* 96A0BC 80240EFC 0C0B1EAF */  jal       get_variable
-/* 96A0C0 80240F00 26100004 */   addiu    $s0, $s0, 4
-/* 96A0C4 80240F04 00021880 */  sll       $v1, $v0, 2
-/* 96A0C8 80240F08 00621821 */  addu      $v1, $v1, $v0
-/* 96A0CC 80240F0C 00031880 */  sll       $v1, $v1, 2
-/* 96A0D0 80240F10 00621823 */  subu      $v1, $v1, $v0
-/* 96A0D4 80240F14 000310C0 */  sll       $v0, $v1, 3
-/* 96A0D8 80240F18 00621821 */  addu      $v1, $v1, $v0
-/* 96A0DC 80240F1C 000318C0 */  sll       $v1, $v1, 3
-/* 96A0E0 80240F20 3C01800B */  lui       $at, 0x800b
-/* 96A0E4 80240F24 00230821 */  addu      $at, $at, $v1
-/* 96A0E8 80240F28 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 96A0EC 80240F2C 3C014480 */  lui       $at, 0x4480
-/* 96A0F0 80240F30 44810000 */  mtc1      $at, $f0
-/* 96A0F4 80240F34 00000000 */  nop       
-/* 96A0F8 80240F38 46001082 */  mul.s     $f2, $f2, $f0
-/* 96A0FC 80240F3C 00000000 */  nop       
-/* 96A100 80240F40 3C01CD5B */  lui       $at, 0xcd5b
-/* 96A104 80240F44 34215858 */  ori       $at, $at, 0x5858
-/* 96A108 80240F48 44810000 */  mtc1      $at, $f0
-/* 96A10C 80240F4C 00000000 */  nop       
-/* 96A110 80240F50 46001080 */  add.s     $f2, $f2, $f0
-/* 96A114 80240F54 8E050000 */  lw        $a1, ($s0)
-/* 96A118 80240F58 4600110D */  trunc.w.s $f4, $f2
-/* 96A11C 80240F5C 44062000 */  mfc1      $a2, $f4
-/* 96A120 80240F60 0C0B2026 */  jal       set_variable
-/* 96A124 80240F64 0220202D */   daddu    $a0, $s1, $zero
-/* 96A128 80240F68 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 96A12C 80240F6C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A130 80240F70 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A134 80240F74 24020002 */  addiu     $v0, $zero, 2
-/* 96A138 80240F78 03E00008 */  jr        $ra
-/* 96A13C 80240F7C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s
deleted file mode 100644
index 5e2e262fae..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024111C_96A2DC
-/* 96A2DC 8024111C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 96A2E0 80241120 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 96A2E4 80241124 10A00002 */  beqz      $a1, .L80241130
-/* 96A2E8 80241128 2402003C */   addiu    $v0, $zero, 0x3c
-/* 96A2EC 8024112C AC820070 */  sw        $v0, 0x70($a0)
-.L80241130:
-/* 96A2F0 80241130 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 96A2F4 80241134 3C0141F0 */  lui       $at, 0x41f0
-/* 96A2F8 80241138 44810000 */  mtc1      $at, $f0
-/* 96A2FC 8024113C 00000000 */  nop       
-/* 96A300 80241140 46001000 */  add.s     $f0, $f2, $f0
-/* 96A304 80241144 3C0143B4 */  lui       $at, 0x43b4
-/* 96A308 80241148 44811000 */  mtc1      $at, $f2
-/* 96A30C 8024114C 00000000 */  nop       
-/* 96A310 80241150 4600103E */  c.le.s    $f2, $f0
-/* 96A314 80241154 00000000 */  nop       
-/* 96A318 80241158 45000003 */  bc1f      .L80241168
-/* 96A31C 8024115C E4600080 */   swc1     $f0, 0x80($v1)
-/* 96A320 80241160 46020001 */  sub.s     $f0, $f0, $f2
-/* 96A324 80241164 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241168:
-/* 96A328 80241168 8C820070 */  lw        $v0, 0x70($a0)
-/* 96A32C 8024116C 2442FFFF */  addiu     $v0, $v0, -1
-/* 96A330 80241170 AC820070 */  sw        $v0, 0x70($a0)
-/* 96A334 80241174 000217C3 */  sra       $v0, $v0, 0x1f
-/* 96A338 80241178 03E00008 */  jr        $ra
-/* 96A33C 8024117C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s
deleted file mode 100644
index f5f24adf59..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243010_A1E110
-/* A1E110 80243010 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1E114 80243014 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E118 80243018 0080882D */  daddu     $s1, $a0, $zero
-/* A1E11C 8024301C AFBF0018 */  sw        $ra, 0x18($sp)
-/* A1E120 80243020 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E124 80243024 8E30000C */  lw        $s0, 0xc($s1)
-/* A1E128 80243028 8E050000 */  lw        $a1, ($s0)
-/* A1E12C 8024302C 0C0B1EAF */  jal       get_variable
-/* A1E130 80243030 26100004 */   addiu    $s0, $s0, 4
-/* A1E134 80243034 0220202D */  daddu     $a0, $s1, $zero
-/* A1E138 80243038 8E050000 */  lw        $a1, ($s0)
-/* A1E13C 8024303C 0C0B210B */  jal       get_float_variable
-/* A1E140 80243040 0040802D */   daddu    $s0, $v0, $zero
-/* A1E144 80243044 24020002 */  addiu     $v0, $zero, 2
-/* A1E148 80243048 00501804 */  sllv      $v1, $s0, $v0
-/* A1E14C 8024304C 00701821 */  addu      $v1, $v1, $s0
-/* A1E150 80243050 00431804 */  sllv      $v1, $v1, $v0
-/* A1E154 80243054 00701823 */  subu      $v1, $v1, $s0
-/* A1E158 80243058 000320C0 */  sll       $a0, $v1, 3
-/* A1E15C 8024305C 00641821 */  addu      $v1, $v1, $a0
-/* A1E160 80243060 000318C0 */  sll       $v1, $v1, 3
-/* A1E164 80243064 3C01800B */  lui       $at, 0x800b
-/* A1E168 80243068 00230821 */  addu      $at, $at, $v1
-/* A1E16C 8024306C E4201D98 */  swc1      $f0, 0x1d98($at)
-/* A1E170 80243070 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A1E174 80243074 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E178 80243078 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E17C 8024307C 03E00008 */  jr        $ra
-/* A1E180 80243080 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s
deleted file mode 100644
index 67116b2bc8..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243084_A1E184
-/* A1E184 80243084 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1E188 80243088 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E18C 8024308C 0080882D */  daddu     $s1, $a0, $zero
-/* A1E190 80243090 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A1E194 80243094 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E198 80243098 8E30000C */  lw        $s0, 0xc($s1)
-/* A1E19C 8024309C 8E050000 */  lw        $a1, ($s0)
-/* A1E1A0 802430A0 0C0B1EAF */  jal       get_variable
-/* A1E1A4 802430A4 26100004 */   addiu    $s0, $s0, 4
-/* A1E1A8 802430A8 00021880 */  sll       $v1, $v0, 2
-/* A1E1AC 802430AC 00621821 */  addu      $v1, $v1, $v0
-/* A1E1B0 802430B0 00031880 */  sll       $v1, $v1, 2
-/* A1E1B4 802430B4 00621823 */  subu      $v1, $v1, $v0
-/* A1E1B8 802430B8 000310C0 */  sll       $v0, $v1, 3
-/* A1E1BC 802430BC 00621821 */  addu      $v1, $v1, $v0
-/* A1E1C0 802430C0 000318C0 */  sll       $v1, $v1, 3
-/* A1E1C4 802430C4 3C01800B */  lui       $at, 0x800b
-/* A1E1C8 802430C8 00230821 */  addu      $at, $at, $v1
-/* A1E1CC 802430CC C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* A1E1D0 802430D0 3C014480 */  lui       $at, 0x4480
-/* A1E1D4 802430D4 44810000 */  mtc1      $at, $f0
-/* A1E1D8 802430D8 00000000 */  nop       
-/* A1E1DC 802430DC 46001082 */  mul.s     $f2, $f2, $f0
-/* A1E1E0 802430E0 00000000 */  nop       
-/* A1E1E4 802430E4 3C01CD5B */  lui       $at, 0xcd5b
-/* A1E1E8 802430E8 34215858 */  ori       $at, $at, 0x5858
-/* A1E1EC 802430EC 44810000 */  mtc1      $at, $f0
-/* A1E1F0 802430F0 00000000 */  nop       
-/* A1E1F4 802430F4 46001080 */  add.s     $f2, $f2, $f0
-/* A1E1F8 802430F8 8E050000 */  lw        $a1, ($s0)
-/* A1E1FC 802430FC 4600110D */  trunc.w.s $f4, $f2
-/* A1E200 80243100 44062000 */  mfc1      $a2, $f4
-/* A1E204 80243104 0C0B2026 */  jal       set_variable
-/* A1E208 80243108 0220202D */   daddu    $a0, $s1, $zero
-/* A1E20C 8024310C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A1E210 80243110 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E214 80243114 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E218 80243118 24020002 */  addiu     $v0, $zero, 2
-/* A1E21C 8024311C 03E00008 */  jr        $ra
-/* A1E220 80243120 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s
deleted file mode 100644
index ee127bf8d8..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802432C0_A1E3C0
-/* A1E3C0 802432C0 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* A1E3C4 802432C4 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* A1E3C8 802432C8 10A00002 */  beqz      $a1, .L802432D4
-/* A1E3CC 802432CC 2402003C */   addiu    $v0, $zero, 0x3c
-/* A1E3D0 802432D0 AC820070 */  sw        $v0, 0x70($a0)
-.L802432D4:
-/* A1E3D4 802432D4 C4620080 */  lwc1      $f2, 0x80($v1)
-/* A1E3D8 802432D8 3C0141F0 */  lui       $at, 0x41f0
-/* A1E3DC 802432DC 44810000 */  mtc1      $at, $f0
-/* A1E3E0 802432E0 00000000 */  nop       
-/* A1E3E4 802432E4 46001000 */  add.s     $f0, $f2, $f0
-/* A1E3E8 802432E8 3C0143B4 */  lui       $at, 0x43b4
-/* A1E3EC 802432EC 44811000 */  mtc1      $at, $f2
-/* A1E3F0 802432F0 00000000 */  nop       
-/* A1E3F4 802432F4 4600103E */  c.le.s    $f2, $f0
-/* A1E3F8 802432F8 00000000 */  nop       
-/* A1E3FC 802432FC 45000003 */  bc1f      .L8024330C
-/* A1E400 80243300 E4600080 */   swc1     $f0, 0x80($v1)
-/* A1E404 80243304 46020001 */  sub.s     $f0, $f0, $f2
-/* A1E408 80243308 E4600080 */  swc1      $f0, 0x80($v1)
-.L8024330C:
-/* A1E40C 8024330C 8C820070 */  lw        $v0, 0x70($a0)
-/* A1E410 80243310 2442FFFF */  addiu     $v0, $v0, -1
-/* A1E414 80243314 AC820070 */  sw        $v0, 0x70($a0)
-/* A1E418 80243318 000217C3 */  sra       $v0, $v0, 0x1f
-/* A1E41C 8024331C 03E00008 */  jr        $ra
-/* A1E420 80243320 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s
deleted file mode 100644
index ac1e88224b..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405E0_A274B0
-/* A274B0 802405E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A274B4 802405E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* A274B8 802405E8 0080882D */  daddu     $s1, $a0, $zero
-/* A274BC 802405EC AFBF0018 */  sw        $ra, 0x18($sp)
-/* A274C0 802405F0 AFB00010 */  sw        $s0, 0x10($sp)
-/* A274C4 802405F4 8E30000C */  lw        $s0, 0xc($s1)
-/* A274C8 802405F8 8E050000 */  lw        $a1, ($s0)
-/* A274CC 802405FC 0C0B1EAF */  jal       get_variable
-/* A274D0 80240600 26100004 */   addiu    $s0, $s0, 4
-/* A274D4 80240604 0220202D */  daddu     $a0, $s1, $zero
-/* A274D8 80240608 8E050000 */  lw        $a1, ($s0)
-/* A274DC 8024060C 0C0B210B */  jal       get_float_variable
-/* A274E0 80240610 0040802D */   daddu    $s0, $v0, $zero
-/* A274E4 80240614 24020002 */  addiu     $v0, $zero, 2
-/* A274E8 80240618 00501804 */  sllv      $v1, $s0, $v0
-/* A274EC 8024061C 00701821 */  addu      $v1, $v1, $s0
-/* A274F0 80240620 00431804 */  sllv      $v1, $v1, $v0
-/* A274F4 80240624 00701823 */  subu      $v1, $v1, $s0
-/* A274F8 80240628 000320C0 */  sll       $a0, $v1, 3
-/* A274FC 8024062C 00641821 */  addu      $v1, $v1, $a0
-/* A27500 80240630 000318C0 */  sll       $v1, $v1, 3
-/* A27504 80240634 3C01800B */  lui       $at, 0x800b
-/* A27508 80240638 00230821 */  addu      $at, $at, $v1
-/* A2750C 8024063C E4201D98 */  swc1      $f0, 0x1d98($at)
-/* A27510 80240640 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A27514 80240644 8FB10014 */  lw        $s1, 0x14($sp)
-/* A27518 80240648 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2751C 8024064C 03E00008 */  jr        $ra
-/* A27520 80240650 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s
deleted file mode 100644
index c74d8c0277..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242180_B2E5F0
-/* B2E5F0 80242180 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B2E5F4 80242184 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E5F8 80242188 0080882D */  daddu     $s1, $a0, $zero
-/* B2E5FC 8024218C AFBF0018 */  sw        $ra, 0x18($sp)
-/* B2E600 80242190 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E604 80242194 8E30000C */  lw        $s0, 0xc($s1)
-/* B2E608 80242198 8E050000 */  lw        $a1, ($s0)
-/* B2E60C 8024219C 0C0B1EAF */  jal       get_variable
-/* B2E610 802421A0 26100004 */   addiu    $s0, $s0, 4
-/* B2E614 802421A4 0220202D */  daddu     $a0, $s1, $zero
-/* B2E618 802421A8 8E050000 */  lw        $a1, ($s0)
-/* B2E61C 802421AC 0C0B210B */  jal       get_float_variable
-/* B2E620 802421B0 0040802D */   daddu    $s0, $v0, $zero
-/* B2E624 802421B4 24020002 */  addiu     $v0, $zero, 2
-/* B2E628 802421B8 00501804 */  sllv      $v1, $s0, $v0
-/* B2E62C 802421BC 00701821 */  addu      $v1, $v1, $s0
-/* B2E630 802421C0 00431804 */  sllv      $v1, $v1, $v0
-/* B2E634 802421C4 00701823 */  subu      $v1, $v1, $s0
-/* B2E638 802421C8 000320C0 */  sll       $a0, $v1, 3
-/* B2E63C 802421CC 00641821 */  addu      $v1, $v1, $a0
-/* B2E640 802421D0 000318C0 */  sll       $v1, $v1, 3
-/* B2E644 802421D4 3C01800B */  lui       $at, 0x800b
-/* B2E648 802421D8 00230821 */  addu      $at, $at, $v1
-/* B2E64C 802421DC E4201D98 */  swc1      $f0, 0x1d98($at)
-/* B2E650 802421E0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B2E654 802421E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2E658 802421E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2E65C 802421EC 03E00008 */  jr        $ra
-/* B2E660 802421F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s
deleted file mode 100644
index cd84825001..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421F4_B2E664
-/* B2E664 802421F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B2E668 802421F8 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E66C 802421FC 0080882D */  daddu     $s1, $a0, $zero
-/* B2E670 80242200 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B2E674 80242204 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E678 80242208 8E30000C */  lw        $s0, 0xc($s1)
-/* B2E67C 8024220C 8E050000 */  lw        $a1, ($s0)
-/* B2E680 80242210 0C0B1EAF */  jal       get_variable
-/* B2E684 80242214 26100004 */   addiu    $s0, $s0, 4
-/* B2E688 80242218 00021880 */  sll       $v1, $v0, 2
-/* B2E68C 8024221C 00621821 */  addu      $v1, $v1, $v0
-/* B2E690 80242220 00031880 */  sll       $v1, $v1, 2
-/* B2E694 80242224 00621823 */  subu      $v1, $v1, $v0
-/* B2E698 80242228 000310C0 */  sll       $v0, $v1, 3
-/* B2E69C 8024222C 00621821 */  addu      $v1, $v1, $v0
-/* B2E6A0 80242230 000318C0 */  sll       $v1, $v1, 3
-/* B2E6A4 80242234 3C01800B */  lui       $at, 0x800b
-/* B2E6A8 80242238 00230821 */  addu      $at, $at, $v1
-/* B2E6AC 8024223C C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* B2E6B0 80242240 3C014480 */  lui       $at, 0x4480
-/* B2E6B4 80242244 44810000 */  mtc1      $at, $f0
-/* B2E6B8 80242248 00000000 */  nop       
-/* B2E6BC 8024224C 46001082 */  mul.s     $f2, $f2, $f0
-/* B2E6C0 80242250 00000000 */  nop       
-/* B2E6C4 80242254 3C01CD5B */  lui       $at, 0xcd5b
-/* B2E6C8 80242258 34215858 */  ori       $at, $at, 0x5858
-/* B2E6CC 8024225C 44810000 */  mtc1      $at, $f0
-/* B2E6D0 80242260 00000000 */  nop       
-/* B2E6D4 80242264 46001080 */  add.s     $f2, $f2, $f0
-/* B2E6D8 80242268 8E050000 */  lw        $a1, ($s0)
-/* B2E6DC 8024226C 4600110D */  trunc.w.s $f4, $f2
-/* B2E6E0 80242270 44062000 */  mfc1      $a2, $f4
-/* B2E6E4 80242274 0C0B2026 */  jal       set_variable
-/* B2E6E8 80242278 0220202D */   daddu    $a0, $s1, $zero
-/* B2E6EC 8024227C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B2E6F0 80242280 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2E6F4 80242284 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2E6F8 80242288 24020002 */  addiu     $v0, $zero, 2
-/* B2E6FC 8024228C 03E00008 */  jr        $ra
-/* B2E700 80242290 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s
deleted file mode 100644
index 815c0eddc5..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242430_B2E8A0
-/* B2E8A0 80242430 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* B2E8A4 80242434 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* B2E8A8 80242438 10A00002 */  beqz      $a1, .L80242444
-/* B2E8AC 8024243C 2402003C */   addiu    $v0, $zero, 0x3c
-/* B2E8B0 80242440 AC820070 */  sw        $v0, 0x70($a0)
-.L80242444:
-/* B2E8B4 80242444 C4620080 */  lwc1      $f2, 0x80($v1)
-/* B2E8B8 80242448 3C0141F0 */  lui       $at, 0x41f0
-/* B2E8BC 8024244C 44810000 */  mtc1      $at, $f0
-/* B2E8C0 80242450 00000000 */  nop       
-/* B2E8C4 80242454 46001000 */  add.s     $f0, $f2, $f0
-/* B2E8C8 80242458 3C0143B4 */  lui       $at, 0x43b4
-/* B2E8CC 8024245C 44811000 */  mtc1      $at, $f2
-/* B2E8D0 80242460 00000000 */  nop       
-/* B2E8D4 80242464 4600103E */  c.le.s    $f2, $f0
-/* B2E8D8 80242468 00000000 */  nop       
-/* B2E8DC 8024246C 45000003 */  bc1f      .L8024247C
-/* B2E8E0 80242470 E4600080 */   swc1     $f0, 0x80($v1)
-/* B2E8E4 80242474 46020001 */  sub.s     $f0, $f0, $f2
-/* B2E8E8 80242478 E4600080 */  swc1      $f0, 0x80($v1)
-.L8024247C:
-/* B2E8EC 8024247C 8C820070 */  lw        $v0, 0x70($a0)
-/* B2E8F0 80242480 2442FFFF */  addiu     $v0, $v0, -1
-/* B2E8F4 80242484 AC820070 */  sw        $v0, 0x70($a0)
-/* B2E8F8 80242488 000217C3 */  sra       $v0, $v0, 0x1f
-/* B2E8FC 8024248C 03E00008 */  jr        $ra
-/* B2E900 80242490 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s
deleted file mode 100644
index a050d494b2..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242708_B372D8
-/* B372D8 80242708 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B372DC 8024270C AFB10014 */  sw        $s1, 0x14($sp)
-/* B372E0 80242710 0080882D */  daddu     $s1, $a0, $zero
-/* B372E4 80242714 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B372E8 80242718 AFB00010 */  sw        $s0, 0x10($sp)
-/* B372EC 8024271C 8E30000C */  lw        $s0, 0xc($s1)
-/* B372F0 80242720 8E050000 */  lw        $a1, ($s0)
-/* B372F4 80242724 0C0B1EAF */  jal       get_variable
-/* B372F8 80242728 26100004 */   addiu    $s0, $s0, 4
-/* B372FC 8024272C 0220202D */  daddu     $a0, $s1, $zero
-/* B37300 80242730 8E050000 */  lw        $a1, ($s0)
-/* B37304 80242734 0C0B210B */  jal       get_float_variable
-/* B37308 80242738 0040802D */   daddu    $s0, $v0, $zero
-/* B3730C 8024273C 24020002 */  addiu     $v0, $zero, 2
-/* B37310 80242740 00501804 */  sllv      $v1, $s0, $v0
-/* B37314 80242744 00701821 */  addu      $v1, $v1, $s0
-/* B37318 80242748 00431804 */  sllv      $v1, $v1, $v0
-/* B3731C 8024274C 00701823 */  subu      $v1, $v1, $s0
-/* B37320 80242750 000320C0 */  sll       $a0, $v1, 3
-/* B37324 80242754 00641821 */  addu      $v1, $v1, $a0
-/* B37328 80242758 000318C0 */  sll       $v1, $v1, 3
-/* B3732C 8024275C 3C01800B */  lui       $at, 0x800b
-/* B37330 80242760 00230821 */  addu      $at, $at, $v1
-/* B37334 80242764 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* B37338 80242768 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B3733C 8024276C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B37340 80242770 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37344 80242774 03E00008 */  jr        $ra
-/* B37348 80242778 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s
deleted file mode 100644
index 2e575aa820..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024277C_B3734C
-/* B3734C 8024277C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B37350 80242780 AFB10014 */  sw        $s1, 0x14($sp)
-/* B37354 80242784 0080882D */  daddu     $s1, $a0, $zero
-/* B37358 80242788 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B3735C 8024278C AFB00010 */  sw        $s0, 0x10($sp)
-/* B37360 80242790 8E30000C */  lw        $s0, 0xc($s1)
-/* B37364 80242794 8E050000 */  lw        $a1, ($s0)
-/* B37368 80242798 0C0B1EAF */  jal       get_variable
-/* B3736C 8024279C 26100004 */   addiu    $s0, $s0, 4
-/* B37370 802427A0 00021880 */  sll       $v1, $v0, 2
-/* B37374 802427A4 00621821 */  addu      $v1, $v1, $v0
-/* B37378 802427A8 00031880 */  sll       $v1, $v1, 2
-/* B3737C 802427AC 00621823 */  subu      $v1, $v1, $v0
-/* B37380 802427B0 000310C0 */  sll       $v0, $v1, 3
-/* B37384 802427B4 00621821 */  addu      $v1, $v1, $v0
-/* B37388 802427B8 000318C0 */  sll       $v1, $v1, 3
-/* B3738C 802427BC 3C01800B */  lui       $at, 0x800b
-/* B37390 802427C0 00230821 */  addu      $at, $at, $v1
-/* B37394 802427C4 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* B37398 802427C8 3C014480 */  lui       $at, 0x4480
-/* B3739C 802427CC 44810000 */  mtc1      $at, $f0
-/* B373A0 802427D0 00000000 */  nop       
-/* B373A4 802427D4 46001082 */  mul.s     $f2, $f2, $f0
-/* B373A8 802427D8 00000000 */  nop       
-/* B373AC 802427DC 3C01CD5B */  lui       $at, 0xcd5b
-/* B373B0 802427E0 34215858 */  ori       $at, $at, 0x5858
-/* B373B4 802427E4 44810000 */  mtc1      $at, $f0
-/* B373B8 802427E8 00000000 */  nop       
-/* B373BC 802427EC 46001080 */  add.s     $f2, $f2, $f0
-/* B373C0 802427F0 8E050000 */  lw        $a1, ($s0)
-/* B373C4 802427F4 4600110D */  trunc.w.s $f4, $f2
-/* B373C8 802427F8 44062000 */  mfc1      $a2, $f4
-/* B373CC 802427FC 0C0B2026 */  jal       set_variable
-/* B373D0 80242800 0220202D */   daddu    $a0, $s1, $zero
-/* B373D4 80242804 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B373D8 80242808 8FB10014 */  lw        $s1, 0x14($sp)
-/* B373DC 8024280C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B373E0 80242810 24020002 */  addiu     $v0, $zero, 2
-/* B373E4 80242814 03E00008 */  jr        $ra
-/* B373E8 80242818 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s
deleted file mode 100644
index b6a329e9bc..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802429B8_B37588
-/* B37588 802429B8 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* B3758C 802429BC 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* B37590 802429C0 10A00002 */  beqz      $a1, .L802429CC
-/* B37594 802429C4 2402003C */   addiu    $v0, $zero, 0x3c
-/* B37598 802429C8 AC820070 */  sw        $v0, 0x70($a0)
-.L802429CC:
-/* B3759C 802429CC C4620080 */  lwc1      $f2, 0x80($v1)
-/* B375A0 802429D0 3C0141F0 */  lui       $at, 0x41f0
-/* B375A4 802429D4 44810000 */  mtc1      $at, $f0
-/* B375A8 802429D8 00000000 */  nop       
-/* B375AC 802429DC 46001000 */  add.s     $f0, $f2, $f0
-/* B375B0 802429E0 3C0143B4 */  lui       $at, 0x43b4
-/* B375B4 802429E4 44811000 */  mtc1      $at, $f2
-/* B375B8 802429E8 00000000 */  nop       
-/* B375BC 802429EC 4600103E */  c.le.s    $f2, $f0
-/* B375C0 802429F0 00000000 */  nop       
-/* B375C4 802429F4 45000003 */  bc1f      .L80242A04
-/* B375C8 802429F8 E4600080 */   swc1     $f0, 0x80($v1)
-/* B375CC 802429FC 46020001 */  sub.s     $f0, $f0, $f2
-/* B375D0 80242A00 E4600080 */  swc1      $f0, 0x80($v1)
-.L80242A04:
-/* B375D4 80242A04 8C820070 */  lw        $v0, 0x70($a0)
-/* B375D8 80242A08 2442FFFF */  addiu     $v0, $v0, -1
-/* B375DC 80242A0C AC820070 */  sw        $v0, 0x70($a0)
-/* B375E0 80242A10 000217C3 */  sra       $v0, $v0, 0x1f
-/* B375E4 80242A14 03E00008 */  jr        $ra
-/* B375E8 80242A18 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s
deleted file mode 100644
index 136a29d051..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EFC_8B0F6C
-/* 8B0F6C 80240EFC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B0F70 80240F00 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B0F74 80240F04 0080882D */  daddu     $s1, $a0, $zero
-/* 8B0F78 80240F08 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B0F7C 80240F0C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B0F80 80240F10 8E30000C */  lw        $s0, 0xc($s1)
-/* 8B0F84 80240F14 8E050000 */  lw        $a1, ($s0)
-/* 8B0F88 80240F18 0C0B1EAF */  jal       get_variable
-/* 8B0F8C 80240F1C 26100004 */   addiu    $s0, $s0, 4
-/* 8B0F90 80240F20 0220202D */  daddu     $a0, $s1, $zero
-/* 8B0F94 80240F24 8E050000 */  lw        $a1, ($s0)
-/* 8B0F98 80240F28 0C0B210B */  jal       get_float_variable
-/* 8B0F9C 80240F2C 0040802D */   daddu    $s0, $v0, $zero
-/* 8B0FA0 80240F30 24020002 */  addiu     $v0, $zero, 2
-/* 8B0FA4 80240F34 00501804 */  sllv      $v1, $s0, $v0
-/* 8B0FA8 80240F38 00701821 */  addu      $v1, $v1, $s0
-/* 8B0FAC 80240F3C 00431804 */  sllv      $v1, $v1, $v0
-/* 8B0FB0 80240F40 00701823 */  subu      $v1, $v1, $s0
-/* 8B0FB4 80240F44 000320C0 */  sll       $a0, $v1, 3
-/* 8B0FB8 80240F48 00641821 */  addu      $v1, $v1, $a0
-/* 8B0FBC 80240F4C 000318C0 */  sll       $v1, $v1, 3
-/* 8B0FC0 80240F50 3C01800B */  lui       $at, 0x800b
-/* 8B0FC4 80240F54 00230821 */  addu      $at, $at, $v1
-/* 8B0FC8 80240F58 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 8B0FCC 80240F5C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B0FD0 80240F60 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B0FD4 80240F64 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B0FD8 80240F68 03E00008 */  jr        $ra
-/* 8B0FDC 80240F6C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s
deleted file mode 100644
index c991f90716..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F70_8B0FE0
-/* 8B0FE0 80240F70 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B0FE4 80240F74 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B0FE8 80240F78 0080882D */  daddu     $s1, $a0, $zero
-/* 8B0FEC 80240F7C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B0FF0 80240F80 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B0FF4 80240F84 8E30000C */  lw        $s0, 0xc($s1)
-/* 8B0FF8 80240F88 8E050000 */  lw        $a1, ($s0)
-/* 8B0FFC 80240F8C 0C0B1EAF */  jal       get_variable
-/* 8B1000 80240F90 26100004 */   addiu    $s0, $s0, 4
-/* 8B1004 80240F94 00021880 */  sll       $v1, $v0, 2
-/* 8B1008 80240F98 00621821 */  addu      $v1, $v1, $v0
-/* 8B100C 80240F9C 00031880 */  sll       $v1, $v1, 2
-/* 8B1010 80240FA0 00621823 */  subu      $v1, $v1, $v0
-/* 8B1014 80240FA4 000310C0 */  sll       $v0, $v1, 3
-/* 8B1018 80240FA8 00621821 */  addu      $v1, $v1, $v0
-/* 8B101C 80240FAC 000318C0 */  sll       $v1, $v1, 3
-/* 8B1020 80240FB0 3C01800B */  lui       $at, 0x800b
-/* 8B1024 80240FB4 00230821 */  addu      $at, $at, $v1
-/* 8B1028 80240FB8 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 8B102C 80240FBC 3C014480 */  lui       $at, 0x4480
-/* 8B1030 80240FC0 44810000 */  mtc1      $at, $f0
-/* 8B1034 80240FC4 00000000 */  nop       
-/* 8B1038 80240FC8 46001082 */  mul.s     $f2, $f2, $f0
-/* 8B103C 80240FCC 00000000 */  nop       
-/* 8B1040 80240FD0 3C01CD5B */  lui       $at, 0xcd5b
-/* 8B1044 80240FD4 34215858 */  ori       $at, $at, 0x5858
-/* 8B1048 80240FD8 44810000 */  mtc1      $at, $f0
-/* 8B104C 80240FDC 00000000 */  nop       
-/* 8B1050 80240FE0 46001080 */  add.s     $f2, $f2, $f0
-/* 8B1054 80240FE4 8E050000 */  lw        $a1, ($s0)
-/* 8B1058 80240FE8 4600110D */  trunc.w.s $f4, $f2
-/* 8B105C 80240FEC 44062000 */  mfc1      $a2, $f4
-/* 8B1060 80240FF0 0C0B2026 */  jal       set_variable
-/* 8B1064 80240FF4 0220202D */   daddu    $a0, $s1, $zero
-/* 8B1068 80240FF8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B106C 80240FFC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B1070 80241000 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B1074 80241004 24020002 */  addiu     $v0, $zero, 2
-/* 8B1078 80241008 03E00008 */  jr        $ra
-/* 8B107C 8024100C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s
deleted file mode 100644
index 19895d4bc0..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411AC_8B121C
-/* 8B121C 802411AC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 8B1220 802411B0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 8B1224 802411B4 10A00002 */  beqz      $a1, .L802411C0
-/* 8B1228 802411B8 2402003C */   addiu    $v0, $zero, 0x3c
-/* 8B122C 802411BC AC820070 */  sw        $v0, 0x70($a0)
-.L802411C0:
-/* 8B1230 802411C0 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 8B1234 802411C4 3C0141F0 */  lui       $at, 0x41f0
-/* 8B1238 802411C8 44810000 */  mtc1      $at, $f0
-/* 8B123C 802411CC 00000000 */  nop       
-/* 8B1240 802411D0 46001000 */  add.s     $f0, $f2, $f0
-/* 8B1244 802411D4 3C0143B4 */  lui       $at, 0x43b4
-/* 8B1248 802411D8 44811000 */  mtc1      $at, $f2
-/* 8B124C 802411DC 00000000 */  nop       
-/* 8B1250 802411E0 4600103E */  c.le.s    $f2, $f0
-/* 8B1254 802411E4 00000000 */  nop       
-/* 8B1258 802411E8 45000003 */  bc1f      .L802411F8
-/* 8B125C 802411EC E4600080 */   swc1     $f0, 0x80($v1)
-/* 8B1260 802411F0 46020001 */  sub.s     $f0, $f0, $f2
-/* 8B1264 802411F4 E4600080 */  swc1      $f0, 0x80($v1)
-.L802411F8:
-/* 8B1268 802411F8 8C820070 */  lw        $v0, 0x70($a0)
-/* 8B126C 802411FC 2442FFFF */  addiu     $v0, $v0, -1
-/* 8B1270 80241200 AC820070 */  sw        $v0, 0x70($a0)
-/* 8B1274 80241204 000217C3 */  sra       $v0, $v0, 0x1f
-/* 8B1278 80241208 03E00008 */  jr        $ra
-/* 8B127C 8024120C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s
deleted file mode 100644
index eb859083fc..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024119C_7EBEAC
-/* 7EBEAC 8024119C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7EBEB0 802411A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EBEB4 802411A4 0080882D */  daddu     $s1, $a0, $zero
-/* 7EBEB8 802411A8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7EBEBC 802411AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EBEC0 802411B0 8E30000C */  lw        $s0, 0xc($s1)
-/* 7EBEC4 802411B4 8E050000 */  lw        $a1, ($s0)
-/* 7EBEC8 802411B8 0C0B1EAF */  jal       get_variable
-/* 7EBECC 802411BC 26100004 */   addiu    $s0, $s0, 4
-/* 7EBED0 802411C0 0220202D */  daddu     $a0, $s1, $zero
-/* 7EBED4 802411C4 8E050000 */  lw        $a1, ($s0)
-/* 7EBED8 802411C8 0C0B210B */  jal       get_float_variable
-/* 7EBEDC 802411CC 0040802D */   daddu    $s0, $v0, $zero
-/* 7EBEE0 802411D0 24020002 */  addiu     $v0, $zero, 2
-/* 7EBEE4 802411D4 00501804 */  sllv      $v1, $s0, $v0
-/* 7EBEE8 802411D8 00701821 */  addu      $v1, $v1, $s0
-/* 7EBEEC 802411DC 00431804 */  sllv      $v1, $v1, $v0
-/* 7EBEF0 802411E0 00701823 */  subu      $v1, $v1, $s0
-/* 7EBEF4 802411E4 000320C0 */  sll       $a0, $v1, 3
-/* 7EBEF8 802411E8 00641821 */  addu      $v1, $v1, $a0
-/* 7EBEFC 802411EC 000318C0 */  sll       $v1, $v1, 3
-/* 7EBF00 802411F0 3C01800B */  lui       $at, 0x800b
-/* 7EBF04 802411F4 00230821 */  addu      $at, $at, $v1
-/* 7EBF08 802411F8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 7EBF0C 802411FC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7EBF10 80241200 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EBF14 80241204 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EBF18 80241208 03E00008 */  jr        $ra
-/* 7EBF1C 8024120C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s
deleted file mode 100644
index 7548e188d1..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241210_7EBF20
-/* 7EBF20 80241210 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7EBF24 80241214 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EBF28 80241218 0080882D */  daddu     $s1, $a0, $zero
-/* 7EBF2C 8024121C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7EBF30 80241220 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EBF34 80241224 8E30000C */  lw        $s0, 0xc($s1)
-/* 7EBF38 80241228 8E050000 */  lw        $a1, ($s0)
-/* 7EBF3C 8024122C 0C0B1EAF */  jal       get_variable
-/* 7EBF40 80241230 26100004 */   addiu    $s0, $s0, 4
-/* 7EBF44 80241234 00021880 */  sll       $v1, $v0, 2
-/* 7EBF48 80241238 00621821 */  addu      $v1, $v1, $v0
-/* 7EBF4C 8024123C 00031880 */  sll       $v1, $v1, 2
-/* 7EBF50 80241240 00621823 */  subu      $v1, $v1, $v0
-/* 7EBF54 80241244 000310C0 */  sll       $v0, $v1, 3
-/* 7EBF58 80241248 00621821 */  addu      $v1, $v1, $v0
-/* 7EBF5C 8024124C 000318C0 */  sll       $v1, $v1, 3
-/* 7EBF60 80241250 3C01800B */  lui       $at, 0x800b
-/* 7EBF64 80241254 00230821 */  addu      $at, $at, $v1
-/* 7EBF68 80241258 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 7EBF6C 8024125C 3C014480 */  lui       $at, 0x4480
-/* 7EBF70 80241260 44810000 */  mtc1      $at, $f0
-/* 7EBF74 80241264 00000000 */  nop       
-/* 7EBF78 80241268 46001082 */  mul.s     $f2, $f2, $f0
-/* 7EBF7C 8024126C 00000000 */  nop       
-/* 7EBF80 80241270 3C01CD5B */  lui       $at, 0xcd5b
-/* 7EBF84 80241274 34215858 */  ori       $at, $at, 0x5858
-/* 7EBF88 80241278 44810000 */  mtc1      $at, $f0
-/* 7EBF8C 8024127C 00000000 */  nop       
-/* 7EBF90 80241280 46001080 */  add.s     $f2, $f2, $f0
-/* 7EBF94 80241284 8E050000 */  lw        $a1, ($s0)
-/* 7EBF98 80241288 4600110D */  trunc.w.s $f4, $f2
-/* 7EBF9C 8024128C 44062000 */  mfc1      $a2, $f4
-/* 7EBFA0 80241290 0C0B2026 */  jal       set_variable
-/* 7EBFA4 80241294 0220202D */   daddu    $a0, $s1, $zero
-/* 7EBFA8 80241298 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7EBFAC 8024129C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EBFB0 802412A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EBFB4 802412A4 24020002 */  addiu     $v0, $zero, 2
-/* 7EBFB8 802412A8 03E00008 */  jr        $ra
-/* 7EBFBC 802412AC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s
deleted file mode 100644
index 7d0fd6b7af..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024144C_7EC15C
-/* 7EC15C 8024144C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 7EC160 80241450 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 7EC164 80241454 10A00002 */  beqz      $a1, .L80241460
-/* 7EC168 80241458 2402003C */   addiu    $v0, $zero, 0x3c
-/* 7EC16C 8024145C AC820070 */  sw        $v0, 0x70($a0)
-.L80241460:
-/* 7EC170 80241460 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 7EC174 80241464 3C0141F0 */  lui       $at, 0x41f0
-/* 7EC178 80241468 44810000 */  mtc1      $at, $f0
-/* 7EC17C 8024146C 00000000 */  nop       
-/* 7EC180 80241470 46001000 */  add.s     $f0, $f2, $f0
-/* 7EC184 80241474 3C0143B4 */  lui       $at, 0x43b4
-/* 7EC188 80241478 44811000 */  mtc1      $at, $f2
-/* 7EC18C 8024147C 00000000 */  nop       
-/* 7EC190 80241480 4600103E */  c.le.s    $f2, $f0
-/* 7EC194 80241484 00000000 */  nop       
-/* 7EC198 80241488 45000003 */  bc1f      .L80241498
-/* 7EC19C 8024148C E4600080 */   swc1     $f0, 0x80($v1)
-/* 7EC1A0 80241490 46020001 */  sub.s     $f0, $f0, $f2
-/* 7EC1A4 80241494 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241498:
-/* 7EC1A8 80241498 8C820070 */  lw        $v0, 0x70($a0)
-/* 7EC1AC 8024149C 2442FFFF */  addiu     $v0, $v0, -1
-/* 7EC1B0 802414A0 AC820070 */  sw        $v0, 0x70($a0)
-/* 7EC1B4 802414A4 000217C3 */  sra       $v0, $v0, 0x1f
-/* 7EC1B8 802414A8 03E00008 */  jr        $ra
-/* 7EC1BC 802414AC 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s
deleted file mode 100644
index ce062d8b5f..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A7C_8032FC
-/* 8032FC 80242A7C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803300 80242A80 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803304 80242A84 0080882D */  daddu     $s1, $a0, $zero
-/* 803308 80242A88 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 80330C 80242A8C AFB00010 */  sw        $s0, 0x10($sp)
-/* 803310 80242A90 8E30000C */  lw        $s0, 0xc($s1)
-/* 803314 80242A94 8E050000 */  lw        $a1, ($s0)
-/* 803318 80242A98 0C0B1EAF */  jal       get_variable
-/* 80331C 80242A9C 26100004 */   addiu    $s0, $s0, 4
-/* 803320 80242AA0 0220202D */  daddu     $a0, $s1, $zero
-/* 803324 80242AA4 8E050000 */  lw        $a1, ($s0)
-/* 803328 80242AA8 0C0B210B */  jal       get_float_variable
-/* 80332C 80242AAC 0040802D */   daddu    $s0, $v0, $zero
-/* 803330 80242AB0 24020002 */  addiu     $v0, $zero, 2
-/* 803334 80242AB4 00501804 */  sllv      $v1, $s0, $v0
-/* 803338 80242AB8 00701821 */  addu      $v1, $v1, $s0
-/* 80333C 80242ABC 00431804 */  sllv      $v1, $v1, $v0
-/* 803340 80242AC0 00701823 */  subu      $v1, $v1, $s0
-/* 803344 80242AC4 000320C0 */  sll       $a0, $v1, 3
-/* 803348 80242AC8 00641821 */  addu      $v1, $v1, $a0
-/* 80334C 80242ACC 000318C0 */  sll       $v1, $v1, 3
-/* 803350 80242AD0 3C01800B */  lui       $at, 0x800b
-/* 803354 80242AD4 00230821 */  addu      $at, $at, $v1
-/* 803358 80242AD8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 80335C 80242ADC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 803360 80242AE0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803364 80242AE4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803368 80242AE8 03E00008 */  jr        $ra
-/* 80336C 80242AEC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s
deleted file mode 100644
index fc08cf671d..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242AF0_803370
-/* 803370 80242AF0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803374 80242AF4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803378 80242AF8 0080882D */  daddu     $s1, $a0, $zero
-/* 80337C 80242AFC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 803380 80242B00 AFB00010 */  sw        $s0, 0x10($sp)
-/* 803384 80242B04 8E30000C */  lw        $s0, 0xc($s1)
-/* 803388 80242B08 8E050000 */  lw        $a1, ($s0)
-/* 80338C 80242B0C 0C0B1EAF */  jal       get_variable
-/* 803390 80242B10 26100004 */   addiu    $s0, $s0, 4
-/* 803394 80242B14 00021880 */  sll       $v1, $v0, 2
-/* 803398 80242B18 00621821 */  addu      $v1, $v1, $v0
-/* 80339C 80242B1C 00031880 */  sll       $v1, $v1, 2
-/* 8033A0 80242B20 00621823 */  subu      $v1, $v1, $v0
-/* 8033A4 80242B24 000310C0 */  sll       $v0, $v1, 3
-/* 8033A8 80242B28 00621821 */  addu      $v1, $v1, $v0
-/* 8033AC 80242B2C 000318C0 */  sll       $v1, $v1, 3
-/* 8033B0 80242B30 3C01800B */  lui       $at, 0x800b
-/* 8033B4 80242B34 00230821 */  addu      $at, $at, $v1
-/* 8033B8 80242B38 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 8033BC 80242B3C 3C014480 */  lui       $at, 0x4480
-/* 8033C0 80242B40 44810000 */  mtc1      $at, $f0
-/* 8033C4 80242B44 00000000 */  nop       
-/* 8033C8 80242B48 46001082 */  mul.s     $f2, $f2, $f0
-/* 8033CC 80242B4C 00000000 */  nop       
-/* 8033D0 80242B50 3C01CD5B */  lui       $at, 0xcd5b
-/* 8033D4 80242B54 34215858 */  ori       $at, $at, 0x5858
-/* 8033D8 80242B58 44810000 */  mtc1      $at, $f0
-/* 8033DC 80242B5C 00000000 */  nop       
-/* 8033E0 80242B60 46001080 */  add.s     $f2, $f2, $f0
-/* 8033E4 80242B64 8E050000 */  lw        $a1, ($s0)
-/* 8033E8 80242B68 4600110D */  trunc.w.s $f4, $f2
-/* 8033EC 80242B6C 44062000 */  mfc1      $a2, $f4
-/* 8033F0 80242B70 0C0B2026 */  jal       set_variable
-/* 8033F4 80242B74 0220202D */   daddu    $a0, $s1, $zero
-/* 8033F8 80242B78 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8033FC 80242B7C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803400 80242B80 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803404 80242B84 24020002 */  addiu     $v0, $zero, 2
-/* 803408 80242B88 03E00008 */  jr        $ra
-/* 80340C 80242B8C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s
deleted file mode 100644
index bde9819489..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242D2C_8035AC
-/* 8035AC 80242D2C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 8035B0 80242D30 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 8035B4 80242D34 10A00002 */  beqz      $a1, .L80242D40
-/* 8035B8 80242D38 2402003C */   addiu    $v0, $zero, 0x3c
-/* 8035BC 80242D3C AC820070 */  sw        $v0, 0x70($a0)
-.L80242D40:
-/* 8035C0 80242D40 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 8035C4 80242D44 3C0141F0 */  lui       $at, 0x41f0
-/* 8035C8 80242D48 44810000 */  mtc1      $at, $f0
-/* 8035CC 80242D4C 00000000 */  nop       
-/* 8035D0 80242D50 46001000 */  add.s     $f0, $f2, $f0
-/* 8035D4 80242D54 3C0143B4 */  lui       $at, 0x43b4
-/* 8035D8 80242D58 44811000 */  mtc1      $at, $f2
-/* 8035DC 80242D5C 00000000 */  nop       
-/* 8035E0 80242D60 4600103E */  c.le.s    $f2, $f0
-/* 8035E4 80242D64 00000000 */  nop       
-/* 8035E8 80242D68 45000003 */  bc1f      .L80242D78
-/* 8035EC 80242D6C E4600080 */   swc1     $f0, 0x80($v1)
-/* 8035F0 80242D70 46020001 */  sub.s     $f0, $f0, $f2
-/* 8035F4 80242D74 E4600080 */  swc1      $f0, 0x80($v1)
-.L80242D78:
-/* 8035F8 80242D78 8C820070 */  lw        $v0, 0x70($a0)
-/* 8035FC 80242D7C 2442FFFF */  addiu     $v0, $v0, -1
-/* 803600 80242D80 AC820070 */  sw        $v0, 0x70($a0)
-/* 803604 80242D84 000217C3 */  sra       $v0, $v0, 0x1f
-/* 803608 80242D88 03E00008 */  jr        $ra
-/* 80360C 80242D8C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s
deleted file mode 100644
index 55cf81c536..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024232C_8255EC
-/* 8255EC 8024232C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8255F0 80242330 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8255F4 80242334 0080882D */  daddu     $s1, $a0, $zero
-/* 8255F8 80242338 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8255FC 8024233C AFB00010 */  sw        $s0, 0x10($sp)
-/* 825600 80242340 8E30000C */  lw        $s0, 0xc($s1)
-/* 825604 80242344 8E050000 */  lw        $a1, ($s0)
-/* 825608 80242348 0C0B1EAF */  jal       get_variable
-/* 82560C 8024234C 26100004 */   addiu    $s0, $s0, 4
-/* 825610 80242350 0220202D */  daddu     $a0, $s1, $zero
-/* 825614 80242354 8E050000 */  lw        $a1, ($s0)
-/* 825618 80242358 0C0B210B */  jal       get_float_variable
-/* 82561C 8024235C 0040802D */   daddu    $s0, $v0, $zero
-/* 825620 80242360 24020002 */  addiu     $v0, $zero, 2
-/* 825624 80242364 00501804 */  sllv      $v1, $s0, $v0
-/* 825628 80242368 00701821 */  addu      $v1, $v1, $s0
-/* 82562C 8024236C 00431804 */  sllv      $v1, $v1, $v0
-/* 825630 80242370 00701823 */  subu      $v1, $v1, $s0
-/* 825634 80242374 000320C0 */  sll       $a0, $v1, 3
-/* 825638 80242378 00641821 */  addu      $v1, $v1, $a0
-/* 82563C 8024237C 000318C0 */  sll       $v1, $v1, 3
-/* 825640 80242380 3C01800B */  lui       $at, 0x800b
-/* 825644 80242384 00230821 */  addu      $at, $at, $v1
-/* 825648 80242388 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 82564C 8024238C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 825650 80242390 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825654 80242394 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825658 80242398 03E00008 */  jr        $ra
-/* 82565C 8024239C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s
deleted file mode 100644
index 2c32392843..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802423A0_825660
-/* 825660 802423A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 825664 802423A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 825668 802423A8 0080882D */  daddu     $s1, $a0, $zero
-/* 82566C 802423AC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 825670 802423B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 825674 802423B4 8E30000C */  lw        $s0, 0xc($s1)
-/* 825678 802423B8 8E050000 */  lw        $a1, ($s0)
-/* 82567C 802423BC 0C0B1EAF */  jal       get_variable
-/* 825680 802423C0 26100004 */   addiu    $s0, $s0, 4
-/* 825684 802423C4 00021880 */  sll       $v1, $v0, 2
-/* 825688 802423C8 00621821 */  addu      $v1, $v1, $v0
-/* 82568C 802423CC 00031880 */  sll       $v1, $v1, 2
-/* 825690 802423D0 00621823 */  subu      $v1, $v1, $v0
-/* 825694 802423D4 000310C0 */  sll       $v0, $v1, 3
-/* 825698 802423D8 00621821 */  addu      $v1, $v1, $v0
-/* 82569C 802423DC 000318C0 */  sll       $v1, $v1, 3
-/* 8256A0 802423E0 3C01800B */  lui       $at, 0x800b
-/* 8256A4 802423E4 00230821 */  addu      $at, $at, $v1
-/* 8256A8 802423E8 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 8256AC 802423EC 3C014480 */  lui       $at, 0x4480
-/* 8256B0 802423F0 44810000 */  mtc1      $at, $f0
-/* 8256B4 802423F4 00000000 */  nop       
-/* 8256B8 802423F8 46001082 */  mul.s     $f2, $f2, $f0
-/* 8256BC 802423FC 00000000 */  nop       
-/* 8256C0 80242400 3C01CD5B */  lui       $at, 0xcd5b
-/* 8256C4 80242404 34215858 */  ori       $at, $at, 0x5858
-/* 8256C8 80242408 44810000 */  mtc1      $at, $f0
-/* 8256CC 8024240C 00000000 */  nop       
-/* 8256D0 80242410 46001080 */  add.s     $f2, $f2, $f0
-/* 8256D4 80242414 8E050000 */  lw        $a1, ($s0)
-/* 8256D8 80242418 4600110D */  trunc.w.s $f4, $f2
-/* 8256DC 8024241C 44062000 */  mfc1      $a2, $f4
-/* 8256E0 80242420 0C0B2026 */  jal       set_variable
-/* 8256E4 80242424 0220202D */   daddu    $a0, $s1, $zero
-/* 8256E8 80242428 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8256EC 8024242C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8256F0 80242430 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8256F4 80242434 24020002 */  addiu     $v0, $zero, 2
-/* 8256F8 80242438 03E00008 */  jr        $ra
-/* 8256FC 8024243C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s
deleted file mode 100644
index 3f8c3cae87..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802425DC_82589C
-/* 82589C 802425DC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 8258A0 802425E0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 8258A4 802425E4 10A00002 */  beqz      $a1, .L802425F0
-/* 8258A8 802425E8 2402003C */   addiu    $v0, $zero, 0x3c
-/* 8258AC 802425EC AC820070 */  sw        $v0, 0x70($a0)
-.L802425F0:
-/* 8258B0 802425F0 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 8258B4 802425F4 3C0141F0 */  lui       $at, 0x41f0
-/* 8258B8 802425F8 44810000 */  mtc1      $at, $f0
-/* 8258BC 802425FC 00000000 */  nop       
-/* 8258C0 80242600 46001000 */  add.s     $f0, $f2, $f0
-/* 8258C4 80242604 3C0143B4 */  lui       $at, 0x43b4
-/* 8258C8 80242608 44811000 */  mtc1      $at, $f2
-/* 8258CC 8024260C 00000000 */  nop       
-/* 8258D0 80242610 4600103E */  c.le.s    $f2, $f0
-/* 8258D4 80242614 00000000 */  nop       
-/* 8258D8 80242618 45000003 */  bc1f      .L80242628
-/* 8258DC 8024261C E4600080 */   swc1     $f0, 0x80($v1)
-/* 8258E0 80242620 46020001 */  sub.s     $f0, $f0, $f2
-/* 8258E4 80242624 E4600080 */  swc1      $f0, 0x80($v1)
-.L80242628:
-/* 8258E8 80242628 8C820070 */  lw        $v0, 0x70($a0)
-/* 8258EC 8024262C 2442FFFF */  addiu     $v0, $v0, -1
-/* 8258F0 80242630 AC820070 */  sw        $v0, 0x70($a0)
-/* 8258F4 80242634 000217C3 */  sra       $v0, $v0, 0x1f
-/* 8258F8 80242638 03E00008 */  jr        $ra
-/* 8258FC 8024263C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s
deleted file mode 100644
index 3a04e9fd08..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024101C_83281C
-/* 83281C 8024101C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 832820 80241020 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832824 80241024 0080882D */  daddu     $s1, $a0, $zero
-/* 832828 80241028 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 83282C 8024102C AFB00010 */  sw        $s0, 0x10($sp)
-/* 832830 80241030 8E30000C */  lw        $s0, 0xc($s1)
-/* 832834 80241034 8E050000 */  lw        $a1, ($s0)
-/* 832838 80241038 0C0B1EAF */  jal       get_variable
-/* 83283C 8024103C 26100004 */   addiu    $s0, $s0, 4
-/* 832840 80241040 0220202D */  daddu     $a0, $s1, $zero
-/* 832844 80241044 8E050000 */  lw        $a1, ($s0)
-/* 832848 80241048 0C0B210B */  jal       get_float_variable
-/* 83284C 8024104C 0040802D */   daddu    $s0, $v0, $zero
-/* 832850 80241050 24020002 */  addiu     $v0, $zero, 2
-/* 832854 80241054 00501804 */  sllv      $v1, $s0, $v0
-/* 832858 80241058 00701821 */  addu      $v1, $v1, $s0
-/* 83285C 8024105C 00431804 */  sllv      $v1, $v1, $v0
-/* 832860 80241060 00701823 */  subu      $v1, $v1, $s0
-/* 832864 80241064 000320C0 */  sll       $a0, $v1, 3
-/* 832868 80241068 00641821 */  addu      $v1, $v1, $a0
-/* 83286C 8024106C 000318C0 */  sll       $v1, $v1, 3
-/* 832870 80241070 3C01800B */  lui       $at, 0x800b
-/* 832874 80241074 00230821 */  addu      $at, $at, $v1
-/* 832878 80241078 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 83287C 8024107C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 832880 80241080 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832884 80241084 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832888 80241088 03E00008 */  jr        $ra
-/* 83288C 8024108C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s
deleted file mode 100644
index 80edc7ca7c..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241090_832890
-/* 832890 80241090 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 832894 80241094 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832898 80241098 0080882D */  daddu     $s1, $a0, $zero
-/* 83289C 8024109C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8328A0 802410A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8328A4 802410A4 8E30000C */  lw        $s0, 0xc($s1)
-/* 8328A8 802410A8 8E050000 */  lw        $a1, ($s0)
-/* 8328AC 802410AC 0C0B1EAF */  jal       get_variable
-/* 8328B0 802410B0 26100004 */   addiu    $s0, $s0, 4
-/* 8328B4 802410B4 00021880 */  sll       $v1, $v0, 2
-/* 8328B8 802410B8 00621821 */  addu      $v1, $v1, $v0
-/* 8328BC 802410BC 00031880 */  sll       $v1, $v1, 2
-/* 8328C0 802410C0 00621823 */  subu      $v1, $v1, $v0
-/* 8328C4 802410C4 000310C0 */  sll       $v0, $v1, 3
-/* 8328C8 802410C8 00621821 */  addu      $v1, $v1, $v0
-/* 8328CC 802410CC 000318C0 */  sll       $v1, $v1, 3
-/* 8328D0 802410D0 3C01800B */  lui       $at, 0x800b
-/* 8328D4 802410D4 00230821 */  addu      $at, $at, $v1
-/* 8328D8 802410D8 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 8328DC 802410DC 3C014480 */  lui       $at, 0x4480
-/* 8328E0 802410E0 44810000 */  mtc1      $at, $f0
-/* 8328E4 802410E4 00000000 */  nop       
-/* 8328E8 802410E8 46001082 */  mul.s     $f2, $f2, $f0
-/* 8328EC 802410EC 00000000 */  nop       
-/* 8328F0 802410F0 3C01CD5B */  lui       $at, 0xcd5b
-/* 8328F4 802410F4 34215858 */  ori       $at, $at, 0x5858
-/* 8328F8 802410F8 44810000 */  mtc1      $at, $f0
-/* 8328FC 802410FC 00000000 */  nop       
-/* 832900 80241100 46001080 */  add.s     $f2, $f2, $f0
-/* 832904 80241104 8E050000 */  lw        $a1, ($s0)
-/* 832908 80241108 4600110D */  trunc.w.s $f4, $f2
-/* 83290C 8024110C 44062000 */  mfc1      $a2, $f4
-/* 832910 80241110 0C0B2026 */  jal       set_variable
-/* 832914 80241114 0220202D */   daddu    $a0, $s1, $zero
-/* 832918 80241118 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 83291C 8024111C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832920 80241120 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832924 80241124 24020002 */  addiu     $v0, $zero, 2
-/* 832928 80241128 03E00008 */  jr        $ra
-/* 83292C 8024112C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s
deleted file mode 100644
index 57be333cb8..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412CC_832ACC
-/* 832ACC 802412CC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 832AD0 802412D0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 832AD4 802412D4 10A00002 */  beqz      $a1, .L802412E0
-/* 832AD8 802412D8 2402003C */   addiu    $v0, $zero, 0x3c
-/* 832ADC 802412DC AC820070 */  sw        $v0, 0x70($a0)
-.L802412E0:
-/* 832AE0 802412E0 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 832AE4 802412E4 3C0141F0 */  lui       $at, 0x41f0
-/* 832AE8 802412E8 44810000 */  mtc1      $at, $f0
-/* 832AEC 802412EC 00000000 */  nop       
-/* 832AF0 802412F0 46001000 */  add.s     $f0, $f2, $f0
-/* 832AF4 802412F4 3C0143B4 */  lui       $at, 0x43b4
-/* 832AF8 802412F8 44811000 */  mtc1      $at, $f2
-/* 832AFC 802412FC 00000000 */  nop       
-/* 832B00 80241300 4600103E */  c.le.s    $f2, $f0
-/* 832B04 80241304 00000000 */  nop       
-/* 832B08 80241308 45000003 */  bc1f      .L80241318
-/* 832B0C 8024130C E4600080 */   swc1     $f0, 0x80($v1)
-/* 832B10 80241310 46020001 */  sub.s     $f0, $f0, $f2
-/* 832B14 80241314 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241318:
-/* 832B18 80241318 8C820070 */  lw        $v0, 0x70($a0)
-/* 832B1C 8024131C 2442FFFF */  addiu     $v0, $v0, -1
-/* 832B20 80241320 AC820070 */  sw        $v0, 0x70($a0)
-/* 832B24 80241324 000217C3 */  sra       $v0, $v0, 0x1f
-/* 832B28 80241328 03E00008 */  jr        $ra
-/* 832B2C 8024132C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s
deleted file mode 100644
index c6b64fd369..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FCC_843B9C
-/* 843B9C 80240FCC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 843BA0 80240FD0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843BA4 80240FD4 0080882D */  daddu     $s1, $a0, $zero
-/* 843BA8 80240FD8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 843BAC 80240FDC AFB00010 */  sw        $s0, 0x10($sp)
-/* 843BB0 80240FE0 8E30000C */  lw        $s0, 0xc($s1)
-/* 843BB4 80240FE4 8E050000 */  lw        $a1, ($s0)
-/* 843BB8 80240FE8 0C0B1EAF */  jal       get_variable
-/* 843BBC 80240FEC 26100004 */   addiu    $s0, $s0, 4
-/* 843BC0 80240FF0 0220202D */  daddu     $a0, $s1, $zero
-/* 843BC4 80240FF4 8E050000 */  lw        $a1, ($s0)
-/* 843BC8 80240FF8 0C0B210B */  jal       get_float_variable
-/* 843BCC 80240FFC 0040802D */   daddu    $s0, $v0, $zero
-/* 843BD0 80241000 24020002 */  addiu     $v0, $zero, 2
-/* 843BD4 80241004 00501804 */  sllv      $v1, $s0, $v0
-/* 843BD8 80241008 00701821 */  addu      $v1, $v1, $s0
-/* 843BDC 8024100C 00431804 */  sllv      $v1, $v1, $v0
-/* 843BE0 80241010 00701823 */  subu      $v1, $v1, $s0
-/* 843BE4 80241014 000320C0 */  sll       $a0, $v1, 3
-/* 843BE8 80241018 00641821 */  addu      $v1, $v1, $a0
-/* 843BEC 8024101C 000318C0 */  sll       $v1, $v1, 3
-/* 843BF0 80241020 3C01800B */  lui       $at, 0x800b
-/* 843BF4 80241024 00230821 */  addu      $at, $at, $v1
-/* 843BF8 80241028 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 843BFC 8024102C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 843C00 80241030 8FB10014 */  lw        $s1, 0x14($sp)
-/* 843C04 80241034 8FB00010 */  lw        $s0, 0x10($sp)
-/* 843C08 80241038 03E00008 */  jr        $ra
-/* 843C0C 8024103C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s
deleted file mode 100644
index be23cbb05e..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241040_843C10
-/* 843C10 80241040 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 843C14 80241044 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843C18 80241048 0080882D */  daddu     $s1, $a0, $zero
-/* 843C1C 8024104C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 843C20 80241050 AFB00010 */  sw        $s0, 0x10($sp)
-/* 843C24 80241054 8E30000C */  lw        $s0, 0xc($s1)
-/* 843C28 80241058 8E050000 */  lw        $a1, ($s0)
-/* 843C2C 8024105C 0C0B1EAF */  jal       get_variable
-/* 843C30 80241060 26100004 */   addiu    $s0, $s0, 4
-/* 843C34 80241064 00021880 */  sll       $v1, $v0, 2
-/* 843C38 80241068 00621821 */  addu      $v1, $v1, $v0
-/* 843C3C 8024106C 00031880 */  sll       $v1, $v1, 2
-/* 843C40 80241070 00621823 */  subu      $v1, $v1, $v0
-/* 843C44 80241074 000310C0 */  sll       $v0, $v1, 3
-/* 843C48 80241078 00621821 */  addu      $v1, $v1, $v0
-/* 843C4C 8024107C 000318C0 */  sll       $v1, $v1, 3
-/* 843C50 80241080 3C01800B */  lui       $at, 0x800b
-/* 843C54 80241084 00230821 */  addu      $at, $at, $v1
-/* 843C58 80241088 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 843C5C 8024108C 3C014480 */  lui       $at, 0x4480
-/* 843C60 80241090 44810000 */  mtc1      $at, $f0
-/* 843C64 80241094 00000000 */  nop       
-/* 843C68 80241098 46001082 */  mul.s     $f2, $f2, $f0
-/* 843C6C 8024109C 00000000 */  nop       
-/* 843C70 802410A0 3C01CD5B */  lui       $at, 0xcd5b
-/* 843C74 802410A4 34215858 */  ori       $at, $at, 0x5858
-/* 843C78 802410A8 44810000 */  mtc1      $at, $f0
-/* 843C7C 802410AC 00000000 */  nop       
-/* 843C80 802410B0 46001080 */  add.s     $f2, $f2, $f0
-/* 843C84 802410B4 8E050000 */  lw        $a1, ($s0)
-/* 843C88 802410B8 4600110D */  trunc.w.s $f4, $f2
-/* 843C8C 802410BC 44062000 */  mfc1      $a2, $f4
-/* 843C90 802410C0 0C0B2026 */  jal       set_variable
-/* 843C94 802410C4 0220202D */   daddu    $a0, $s1, $zero
-/* 843C98 802410C8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 843C9C 802410CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 843CA0 802410D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 843CA4 802410D4 24020002 */  addiu     $v0, $zero, 2
-/* 843CA8 802410D8 03E00008 */  jr        $ra
-/* 843CAC 802410DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s
deleted file mode 100644
index 8d546c52ff..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024127C_843E4C
-/* 843E4C 8024127C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 843E50 80241280 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 843E54 80241284 10A00002 */  beqz      $a1, .L80241290
-/* 843E58 80241288 2402003C */   addiu    $v0, $zero, 0x3c
-/* 843E5C 8024128C AC820070 */  sw        $v0, 0x70($a0)
-.L80241290:
-/* 843E60 80241290 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 843E64 80241294 3C0141F0 */  lui       $at, 0x41f0
-/* 843E68 80241298 44810000 */  mtc1      $at, $f0
-/* 843E6C 8024129C 00000000 */  nop       
-/* 843E70 802412A0 46001000 */  add.s     $f0, $f2, $f0
-/* 843E74 802412A4 3C0143B4 */  lui       $at, 0x43b4
-/* 843E78 802412A8 44811000 */  mtc1      $at, $f2
-/* 843E7C 802412AC 00000000 */  nop       
-/* 843E80 802412B0 4600103E */  c.le.s    $f2, $f0
-/* 843E84 802412B4 00000000 */  nop       
-/* 843E88 802412B8 45000003 */  bc1f      .L802412C8
-/* 843E8C 802412BC E4600080 */   swc1     $f0, 0x80($v1)
-/* 843E90 802412C0 46020001 */  sub.s     $f0, $f0, $f2
-/* 843E94 802412C4 E4600080 */  swc1      $f0, 0x80($v1)
-.L802412C8:
-/* 843E98 802412C8 8C820070 */  lw        $v0, 0x70($a0)
-/* 843E9C 802412CC 2442FFFF */  addiu     $v0, $v0, -1
-/* 843EA0 802412D0 AC820070 */  sw        $v0, 0x70($a0)
-/* 843EA4 802412D4 000217C3 */  sra       $v0, $v0, 0x1f
-/* 843EA8 802412D8 03E00008 */  jr        $ra
-/* 843EAC 802412DC 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s
deleted file mode 100644
index 20106558e2..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E8C_853FFC
-/* 853FFC 80241E8C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 854000 80241E90 AFB10014 */  sw        $s1, 0x14($sp)
-/* 854004 80241E94 0080882D */  daddu     $s1, $a0, $zero
-/* 854008 80241E98 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 85400C 80241E9C AFB00010 */  sw        $s0, 0x10($sp)
-/* 854010 80241EA0 8E30000C */  lw        $s0, 0xc($s1)
-/* 854014 80241EA4 8E050000 */  lw        $a1, ($s0)
-/* 854018 80241EA8 0C0B1EAF */  jal       get_variable
-/* 85401C 80241EAC 26100004 */   addiu    $s0, $s0, 4
-/* 854020 80241EB0 0220202D */  daddu     $a0, $s1, $zero
-/* 854024 80241EB4 8E050000 */  lw        $a1, ($s0)
-/* 854028 80241EB8 0C0B210B */  jal       get_float_variable
-/* 85402C 80241EBC 0040802D */   daddu    $s0, $v0, $zero
-/* 854030 80241EC0 24020002 */  addiu     $v0, $zero, 2
-/* 854034 80241EC4 00501804 */  sllv      $v1, $s0, $v0
-/* 854038 80241EC8 00701821 */  addu      $v1, $v1, $s0
-/* 85403C 80241ECC 00431804 */  sllv      $v1, $v1, $v0
-/* 854040 80241ED0 00701823 */  subu      $v1, $v1, $s0
-/* 854044 80241ED4 000320C0 */  sll       $a0, $v1, 3
-/* 854048 80241ED8 00641821 */  addu      $v1, $v1, $a0
-/* 85404C 80241EDC 000318C0 */  sll       $v1, $v1, 3
-/* 854050 80241EE0 3C01800B */  lui       $at, 0x800b
-/* 854054 80241EE4 00230821 */  addu      $at, $at, $v1
-/* 854058 80241EE8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 85405C 80241EEC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 854060 80241EF0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854064 80241EF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854068 80241EF8 03E00008 */  jr        $ra
-/* 85406C 80241EFC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s
deleted file mode 100644
index d757ecc223..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F00_854070
-/* 854070 80241F00 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 854074 80241F04 AFB10014 */  sw        $s1, 0x14($sp)
-/* 854078 80241F08 0080882D */  daddu     $s1, $a0, $zero
-/* 85407C 80241F0C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 854080 80241F10 AFB00010 */  sw        $s0, 0x10($sp)
-/* 854084 80241F14 8E30000C */  lw        $s0, 0xc($s1)
-/* 854088 80241F18 8E050000 */  lw        $a1, ($s0)
-/* 85408C 80241F1C 0C0B1EAF */  jal       get_variable
-/* 854090 80241F20 26100004 */   addiu    $s0, $s0, 4
-/* 854094 80241F24 00021880 */  sll       $v1, $v0, 2
-/* 854098 80241F28 00621821 */  addu      $v1, $v1, $v0
-/* 85409C 80241F2C 00031880 */  sll       $v1, $v1, 2
-/* 8540A0 80241F30 00621823 */  subu      $v1, $v1, $v0
-/* 8540A4 80241F34 000310C0 */  sll       $v0, $v1, 3
-/* 8540A8 80241F38 00621821 */  addu      $v1, $v1, $v0
-/* 8540AC 80241F3C 000318C0 */  sll       $v1, $v1, 3
-/* 8540B0 80241F40 3C01800B */  lui       $at, 0x800b
-/* 8540B4 80241F44 00230821 */  addu      $at, $at, $v1
-/* 8540B8 80241F48 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 8540BC 80241F4C 3C014480 */  lui       $at, 0x4480
-/* 8540C0 80241F50 44810000 */  mtc1      $at, $f0
-/* 8540C4 80241F54 00000000 */  nop       
-/* 8540C8 80241F58 46001082 */  mul.s     $f2, $f2, $f0
-/* 8540CC 80241F5C 00000000 */  nop       
-/* 8540D0 80241F60 3C01CD5B */  lui       $at, 0xcd5b
-/* 8540D4 80241F64 34215858 */  ori       $at, $at, 0x5858
-/* 8540D8 80241F68 44810000 */  mtc1      $at, $f0
-/* 8540DC 80241F6C 00000000 */  nop       
-/* 8540E0 80241F70 46001080 */  add.s     $f2, $f2, $f0
-/* 8540E4 80241F74 8E050000 */  lw        $a1, ($s0)
-/* 8540E8 80241F78 4600110D */  trunc.w.s $f4, $f2
-/* 8540EC 80241F7C 44062000 */  mfc1      $a2, $f4
-/* 8540F0 80241F80 0C0B2026 */  jal       set_variable
-/* 8540F4 80241F84 0220202D */   daddu    $a0, $s1, $zero
-/* 8540F8 80241F88 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8540FC 80241F8C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854100 80241F90 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854104 80241F94 24020002 */  addiu     $v0, $zero, 2
-/* 854108 80241F98 03E00008 */  jr        $ra
-/* 85410C 80241F9C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s
deleted file mode 100644
index bca1515ff1..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024213C_8542AC
-/* 8542AC 8024213C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 8542B0 80242140 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 8542B4 80242144 10A00002 */  beqz      $a1, .L80242150
-/* 8542B8 80242148 2402003C */   addiu    $v0, $zero, 0x3c
-/* 8542BC 8024214C AC820070 */  sw        $v0, 0x70($a0)
-.L80242150:
-/* 8542C0 80242150 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 8542C4 80242154 3C0141F0 */  lui       $at, 0x41f0
-/* 8542C8 80242158 44810000 */  mtc1      $at, $f0
-/* 8542CC 8024215C 00000000 */  nop       
-/* 8542D0 80242160 46001000 */  add.s     $f0, $f2, $f0
-/* 8542D4 80242164 3C0143B4 */  lui       $at, 0x43b4
-/* 8542D8 80242168 44811000 */  mtc1      $at, $f2
-/* 8542DC 8024216C 00000000 */  nop       
-/* 8542E0 80242170 4600103E */  c.le.s    $f2, $f0
-/* 8542E4 80242174 00000000 */  nop       
-/* 8542E8 80242178 45000003 */  bc1f      .L80242188
-/* 8542EC 8024217C E4600080 */   swc1     $f0, 0x80($v1)
-/* 8542F0 80242180 46020001 */  sub.s     $f0, $f0, $f2
-/* 8542F4 80242184 E4600080 */  swc1      $f0, 0x80($v1)
-.L80242188:
-/* 8542F8 80242188 8C820070 */  lw        $v0, 0x70($a0)
-/* 8542FC 8024218C 2442FFFF */  addiu     $v0, $v0, -1
-/* 854300 80242190 AC820070 */  sw        $v0, 0x70($a0)
-/* 854304 80242194 000217C3 */  sra       $v0, $v0, 0x1f
-/* 854308 80242198 03E00008 */  jr        $ra
-/* 85430C 8024219C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s
deleted file mode 100644
index 295e73c133..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418D4_9C6CB4
-/* 9C6CB4 802418D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C6CB8 802418D8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C6CBC 802418DC 0080882D */  daddu     $s1, $a0, $zero
-/* 9C6CC0 802418E0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9C6CC4 802418E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6CC8 802418E8 8E30000C */  lw        $s0, 0xc($s1)
-/* 9C6CCC 802418EC 8E050000 */  lw        $a1, ($s0)
-/* 9C6CD0 802418F0 0C0B1EAF */  jal       get_variable
-/* 9C6CD4 802418F4 26100004 */   addiu    $s0, $s0, 4
-/* 9C6CD8 802418F8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C6CDC 802418FC 8E050000 */  lw        $a1, ($s0)
-/* 9C6CE0 80241900 0C0B210B */  jal       get_float_variable
-/* 9C6CE4 80241904 0040802D */   daddu    $s0, $v0, $zero
-/* 9C6CE8 80241908 24020002 */  addiu     $v0, $zero, 2
-/* 9C6CEC 8024190C 00501804 */  sllv      $v1, $s0, $v0
-/* 9C6CF0 80241910 00701821 */  addu      $v1, $v1, $s0
-/* 9C6CF4 80241914 00431804 */  sllv      $v1, $v1, $v0
-/* 9C6CF8 80241918 00701823 */  subu      $v1, $v1, $s0
-/* 9C6CFC 8024191C 000320C0 */  sll       $a0, $v1, 3
-/* 9C6D00 80241920 00641821 */  addu      $v1, $v1, $a0
-/* 9C6D04 80241924 000318C0 */  sll       $v1, $v1, 3
-/* 9C6D08 80241928 3C01800B */  lui       $at, 0x800b
-/* 9C6D0C 8024192C 00230821 */  addu      $at, $at, $v1
-/* 9C6D10 80241930 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 9C6D14 80241934 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9C6D18 80241938 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C6D1C 8024193C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C6D20 80241940 03E00008 */  jr        $ra
-/* 9C6D24 80241944 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s
deleted file mode 100644
index e693a7580c..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241948_9C6D28
-/* 9C6D28 80241948 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C6D2C 8024194C AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C6D30 80241950 0080882D */  daddu     $s1, $a0, $zero
-/* 9C6D34 80241954 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9C6D38 80241958 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6D3C 8024195C 8E30000C */  lw        $s0, 0xc($s1)
-/* 9C6D40 80241960 8E050000 */  lw        $a1, ($s0)
-/* 9C6D44 80241964 0C0B1EAF */  jal       get_variable
-/* 9C6D48 80241968 26100004 */   addiu    $s0, $s0, 4
-/* 9C6D4C 8024196C 00021880 */  sll       $v1, $v0, 2
-/* 9C6D50 80241970 00621821 */  addu      $v1, $v1, $v0
-/* 9C6D54 80241974 00031880 */  sll       $v1, $v1, 2
-/* 9C6D58 80241978 00621823 */  subu      $v1, $v1, $v0
-/* 9C6D5C 8024197C 000310C0 */  sll       $v0, $v1, 3
-/* 9C6D60 80241980 00621821 */  addu      $v1, $v1, $v0
-/* 9C6D64 80241984 000318C0 */  sll       $v1, $v1, 3
-/* 9C6D68 80241988 3C01800B */  lui       $at, 0x800b
-/* 9C6D6C 8024198C 00230821 */  addu      $at, $at, $v1
-/* 9C6D70 80241990 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 9C6D74 80241994 3C014480 */  lui       $at, 0x4480
-/* 9C6D78 80241998 44810000 */  mtc1      $at, $f0
-/* 9C6D7C 8024199C 00000000 */  nop       
-/* 9C6D80 802419A0 46001082 */  mul.s     $f2, $f2, $f0
-/* 9C6D84 802419A4 00000000 */  nop       
-/* 9C6D88 802419A8 3C01CD5B */  lui       $at, 0xcd5b
-/* 9C6D8C 802419AC 34215858 */  ori       $at, $at, 0x5858
-/* 9C6D90 802419B0 44810000 */  mtc1      $at, $f0
-/* 9C6D94 802419B4 00000000 */  nop       
-/* 9C6D98 802419B8 46001080 */  add.s     $f2, $f2, $f0
-/* 9C6D9C 802419BC 8E050000 */  lw        $a1, ($s0)
-/* 9C6DA0 802419C0 4600110D */  trunc.w.s $f4, $f2
-/* 9C6DA4 802419C4 44062000 */  mfc1      $a2, $f4
-/* 9C6DA8 802419C8 0C0B2026 */  jal       set_variable
-/* 9C6DAC 802419CC 0220202D */   daddu    $a0, $s1, $zero
-/* 9C6DB0 802419D0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9C6DB4 802419D4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C6DB8 802419D8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C6DBC 802419DC 24020002 */  addiu     $v0, $zero, 2
-/* 9C6DC0 802419E0 03E00008 */  jr        $ra
-/* 9C6DC4 802419E4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s
deleted file mode 100644
index e2b0f233ea..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B84_9C6F64
-/* 9C6F64 80241B84 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 9C6F68 80241B88 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 9C6F6C 80241B8C 10A00002 */  beqz      $a1, .L80241B98
-/* 9C6F70 80241B90 2402003C */   addiu    $v0, $zero, 0x3c
-/* 9C6F74 80241B94 AC820070 */  sw        $v0, 0x70($a0)
-.L80241B98:
-/* 9C6F78 80241B98 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 9C6F7C 80241B9C 3C0141F0 */  lui       $at, 0x41f0
-/* 9C6F80 80241BA0 44810000 */  mtc1      $at, $f0
-/* 9C6F84 80241BA4 00000000 */  nop       
-/* 9C6F88 80241BA8 46001000 */  add.s     $f0, $f2, $f0
-/* 9C6F8C 80241BAC 3C0143B4 */  lui       $at, 0x43b4
-/* 9C6F90 80241BB0 44811000 */  mtc1      $at, $f2
-/* 9C6F94 80241BB4 00000000 */  nop       
-/* 9C6F98 80241BB8 4600103E */  c.le.s    $f2, $f0
-/* 9C6F9C 80241BBC 00000000 */  nop       
-/* 9C6FA0 80241BC0 45000003 */  bc1f      .L80241BD0
-/* 9C6FA4 80241BC4 E4600080 */   swc1     $f0, 0x80($v1)
-/* 9C6FA8 80241BC8 46020001 */  sub.s     $f0, $f0, $f2
-/* 9C6FAC 80241BCC E4600080 */  swc1      $f0, 0x80($v1)
-.L80241BD0:
-/* 9C6FB0 80241BD0 8C820070 */  lw        $v0, 0x70($a0)
-/* 9C6FB4 80241BD4 2442FFFF */  addiu     $v0, $v0, -1
-/* 9C6FB8 80241BD8 AC820070 */  sw        $v0, 0x70($a0)
-/* 9C6FBC 80241BDC 000217C3 */  sra       $v0, $v0, 0x1f
-/* 9C6FC0 80241BE0 03E00008 */  jr        $ra
-/* 9C6FC4 80241BE4 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s
deleted file mode 100644
index ca72344204..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024247C_9D949C
-/* 9D949C 8024247C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9D94A0 80242480 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D94A4 80242484 0080882D */  daddu     $s1, $a0, $zero
-/* 9D94A8 80242488 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9D94AC 8024248C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D94B0 80242490 8E30000C */  lw        $s0, 0xc($s1)
-/* 9D94B4 80242494 8E050000 */  lw        $a1, ($s0)
-/* 9D94B8 80242498 0C0B1EAF */  jal       get_variable
-/* 9D94BC 8024249C 26100004 */   addiu    $s0, $s0, 4
-/* 9D94C0 802424A0 0220202D */  daddu     $a0, $s1, $zero
-/* 9D94C4 802424A4 8E050000 */  lw        $a1, ($s0)
-/* 9D94C8 802424A8 0C0B210B */  jal       get_float_variable
-/* 9D94CC 802424AC 0040802D */   daddu    $s0, $v0, $zero
-/* 9D94D0 802424B0 24020002 */  addiu     $v0, $zero, 2
-/* 9D94D4 802424B4 00501804 */  sllv      $v1, $s0, $v0
-/* 9D94D8 802424B8 00701821 */  addu      $v1, $v1, $s0
-/* 9D94DC 802424BC 00431804 */  sllv      $v1, $v1, $v0
-/* 9D94E0 802424C0 00701823 */  subu      $v1, $v1, $s0
-/* 9D94E4 802424C4 000320C0 */  sll       $a0, $v1, 3
-/* 9D94E8 802424C8 00641821 */  addu      $v1, $v1, $a0
-/* 9D94EC 802424CC 000318C0 */  sll       $v1, $v1, 3
-/* 9D94F0 802424D0 3C01800B */  lui       $at, 0x800b
-/* 9D94F4 802424D4 00230821 */  addu      $at, $at, $v1
-/* 9D94F8 802424D8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* 9D94FC 802424DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9D9500 802424E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9504 802424E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9508 802424E8 03E00008 */  jr        $ra
-/* 9D950C 802424EC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s
deleted file mode 100644
index 8de678506b..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802424F0_9D9510
-/* 9D9510 802424F0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9D9514 802424F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D9518 802424F8 0080882D */  daddu     $s1, $a0, $zero
-/* 9D951C 802424FC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9D9520 80242500 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D9524 80242504 8E30000C */  lw        $s0, 0xc($s1)
-/* 9D9528 80242508 8E050000 */  lw        $a1, ($s0)
-/* 9D952C 8024250C 0C0B1EAF */  jal       get_variable
-/* 9D9530 80242510 26100004 */   addiu    $s0, $s0, 4
-/* 9D9534 80242514 00021880 */  sll       $v1, $v0, 2
-/* 9D9538 80242518 00621821 */  addu      $v1, $v1, $v0
-/* 9D953C 8024251C 00031880 */  sll       $v1, $v1, 2
-/* 9D9540 80242520 00621823 */  subu      $v1, $v1, $v0
-/* 9D9544 80242524 000310C0 */  sll       $v0, $v1, 3
-/* 9D9548 80242528 00621821 */  addu      $v1, $v1, $v0
-/* 9D954C 8024252C 000318C0 */  sll       $v1, $v1, 3
-/* 9D9550 80242530 3C01800B */  lui       $at, 0x800b
-/* 9D9554 80242534 00230821 */  addu      $at, $at, $v1
-/* 9D9558 80242538 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* 9D955C 8024253C 3C014480 */  lui       $at, 0x4480
-/* 9D9560 80242540 44810000 */  mtc1      $at, $f0
-/* 9D9564 80242544 00000000 */  nop       
-/* 9D9568 80242548 46001082 */  mul.s     $f2, $f2, $f0
-/* 9D956C 8024254C 00000000 */  nop       
-/* 9D9570 80242550 3C01CD5B */  lui       $at, 0xcd5b
-/* 9D9574 80242554 34215858 */  ori       $at, $at, 0x5858
-/* 9D9578 80242558 44810000 */  mtc1      $at, $f0
-/* 9D957C 8024255C 00000000 */  nop       
-/* 9D9580 80242560 46001080 */  add.s     $f2, $f2, $f0
-/* 9D9584 80242564 8E050000 */  lw        $a1, ($s0)
-/* 9D9588 80242568 4600110D */  trunc.w.s $f4, $f2
-/* 9D958C 8024256C 44062000 */  mfc1      $a2, $f4
-/* 9D9590 80242570 0C0B2026 */  jal       set_variable
-/* 9D9594 80242574 0220202D */   daddu    $a0, $s1, $zero
-/* 9D9598 80242578 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9D959C 8024257C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D95A0 80242580 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D95A4 80242584 24020002 */  addiu     $v0, $zero, 2
-/* 9D95A8 80242588 03E00008 */  jr        $ra
-/* 9D95AC 8024258C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s
deleted file mode 100644
index d25b5fb38c..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024272C_9D974C
-/* 9D974C 8024272C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 9D9750 80242730 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 9D9754 80242734 10A00002 */  beqz      $a1, .L80242740
-/* 9D9758 80242738 2402003C */   addiu    $v0, $zero, 0x3c
-/* 9D975C 8024273C AC820070 */  sw        $v0, 0x70($a0)
-.L80242740:
-/* 9D9760 80242740 C4620080 */  lwc1      $f2, 0x80($v1)
-/* 9D9764 80242744 3C0141F0 */  lui       $at, 0x41f0
-/* 9D9768 80242748 44810000 */  mtc1      $at, $f0
-/* 9D976C 8024274C 00000000 */  nop       
-/* 9D9770 80242750 46001000 */  add.s     $f0, $f2, $f0
-/* 9D9774 80242754 3C0143B4 */  lui       $at, 0x43b4
-/* 9D9778 80242758 44811000 */  mtc1      $at, $f2
-/* 9D977C 8024275C 00000000 */  nop       
-/* 9D9780 80242760 4600103E */  c.le.s    $f2, $f0
-/* 9D9784 80242764 00000000 */  nop       
-/* 9D9788 80242768 45000003 */  bc1f      .L80242778
-/* 9D978C 8024276C E4600080 */   swc1     $f0, 0x80($v1)
-/* 9D9790 80242770 46020001 */  sub.s     $f0, $f0, $f2
-/* 9D9794 80242774 E4600080 */  swc1      $f0, 0x80($v1)
-.L80242778:
-/* 9D9798 80242778 8C820070 */  lw        $v0, 0x70($a0)
-/* 9D979C 8024277C 2442FFFF */  addiu     $v0, $v0, -1
-/* 9D97A0 80242780 AC820070 */  sw        $v0, 0x70($a0)
-/* 9D97A4 80242784 000217C3 */  sra       $v0, $v0, 0x1f
-/* 9D97A8 80242788 03E00008 */  jr        $ra
-/* 9D97AC 8024278C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s
deleted file mode 100644
index 5c5430a400..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024126C_CF8DDC
-/* CF8DDC 8024126C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF8DE0 80241270 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF8DE4 80241274 0080882D */  daddu     $s1, $a0, $zero
-/* CF8DE8 80241278 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF8DEC 8024127C AFB00010 */  sw        $s0, 0x10($sp)
-/* CF8DF0 80241280 8E30000C */  lw        $s0, 0xc($s1)
-/* CF8DF4 80241284 8E050000 */  lw        $a1, ($s0)
-/* CF8DF8 80241288 0C0B1EAF */  jal       get_variable
-/* CF8DFC 8024128C 26100004 */   addiu    $s0, $s0, 4
-/* CF8E00 80241290 0220202D */  daddu     $a0, $s1, $zero
-/* CF8E04 80241294 8E050000 */  lw        $a1, ($s0)
-/* CF8E08 80241298 0C0B210B */  jal       get_float_variable
-/* CF8E0C 8024129C 0040802D */   daddu    $s0, $v0, $zero
-/* CF8E10 802412A0 24020002 */  addiu     $v0, $zero, 2
-/* CF8E14 802412A4 00501804 */  sllv      $v1, $s0, $v0
-/* CF8E18 802412A8 00701821 */  addu      $v1, $v1, $s0
-/* CF8E1C 802412AC 00431804 */  sllv      $v1, $v1, $v0
-/* CF8E20 802412B0 00701823 */  subu      $v1, $v1, $s0
-/* CF8E24 802412B4 000320C0 */  sll       $a0, $v1, 3
-/* CF8E28 802412B8 00641821 */  addu      $v1, $v1, $a0
-/* CF8E2C 802412BC 000318C0 */  sll       $v1, $v1, 3
-/* CF8E30 802412C0 3C01800B */  lui       $at, 0x800b
-/* CF8E34 802412C4 00230821 */  addu      $at, $at, $v1
-/* CF8E38 802412C8 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* CF8E3C 802412CC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF8E40 802412D0 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF8E44 802412D4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF8E48 802412D8 03E00008 */  jr        $ra
-/* CF8E4C 802412DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s
deleted file mode 100644
index 06fac4e40f..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412E0_CF8E50
-/* CF8E50 802412E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF8E54 802412E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF8E58 802412E8 0080882D */  daddu     $s1, $a0, $zero
-/* CF8E5C 802412EC AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF8E60 802412F0 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF8E64 802412F4 8E30000C */  lw        $s0, 0xc($s1)
-/* CF8E68 802412F8 8E050000 */  lw        $a1, ($s0)
-/* CF8E6C 802412FC 0C0B1EAF */  jal       get_variable
-/* CF8E70 80241300 26100004 */   addiu    $s0, $s0, 4
-/* CF8E74 80241304 00021880 */  sll       $v1, $v0, 2
-/* CF8E78 80241308 00621821 */  addu      $v1, $v1, $v0
-/* CF8E7C 8024130C 00031880 */  sll       $v1, $v1, 2
-/* CF8E80 80241310 00621823 */  subu      $v1, $v1, $v0
-/* CF8E84 80241314 000310C0 */  sll       $v0, $v1, 3
-/* CF8E88 80241318 00621821 */  addu      $v1, $v1, $v0
-/* CF8E8C 8024131C 000318C0 */  sll       $v1, $v1, 3
-/* CF8E90 80241320 3C01800B */  lui       $at, 0x800b
-/* CF8E94 80241324 00230821 */  addu      $at, $at, $v1
-/* CF8E98 80241328 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* CF8E9C 8024132C 3C014480 */  lui       $at, 0x4480
-/* CF8EA0 80241330 44810000 */  mtc1      $at, $f0
-/* CF8EA4 80241334 00000000 */  nop       
-/* CF8EA8 80241338 46001082 */  mul.s     $f2, $f2, $f0
-/* CF8EAC 8024133C 00000000 */  nop       
-/* CF8EB0 80241340 3C01CD5B */  lui       $at, 0xcd5b
-/* CF8EB4 80241344 34215858 */  ori       $at, $at, 0x5858
-/* CF8EB8 80241348 44810000 */  mtc1      $at, $f0
-/* CF8EBC 8024134C 00000000 */  nop       
-/* CF8EC0 80241350 46001080 */  add.s     $f2, $f2, $f0
-/* CF8EC4 80241354 8E050000 */  lw        $a1, ($s0)
-/* CF8EC8 80241358 4600110D */  trunc.w.s $f4, $f2
-/* CF8ECC 8024135C 44062000 */  mfc1      $a2, $f4
-/* CF8ED0 80241360 0C0B2026 */  jal       set_variable
-/* CF8ED4 80241364 0220202D */   daddu    $a0, $s1, $zero
-/* CF8ED8 80241368 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF8EDC 8024136C 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF8EE0 80241370 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF8EE4 80241374 24020002 */  addiu     $v0, $zero, 2
-/* CF8EE8 80241378 03E00008 */  jr        $ra
-/* CF8EEC 8024137C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s
deleted file mode 100644
index 50b2d10126..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024151C_CF908C
-/* CF908C 8024151C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* CF9090 80241520 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* CF9094 80241524 10A00002 */  beqz      $a1, .L80241530
-/* CF9098 80241528 2402003C */   addiu    $v0, $zero, 0x3c
-/* CF909C 8024152C AC820070 */  sw        $v0, 0x70($a0)
-.L80241530:
-/* CF90A0 80241530 C4620080 */  lwc1      $f2, 0x80($v1)
-/* CF90A4 80241534 3C0141F0 */  lui       $at, 0x41f0
-/* CF90A8 80241538 44810000 */  mtc1      $at, $f0
-/* CF90AC 8024153C 00000000 */  nop       
-/* CF90B0 80241540 46001000 */  add.s     $f0, $f2, $f0
-/* CF90B4 80241544 3C0143B4 */  lui       $at, 0x43b4
-/* CF90B8 80241548 44811000 */  mtc1      $at, $f2
-/* CF90BC 8024154C 00000000 */  nop       
-/* CF90C0 80241550 4600103E */  c.le.s    $f2, $f0
-/* CF90C4 80241554 00000000 */  nop       
-/* CF90C8 80241558 45000003 */  bc1f      .L80241568
-/* CF90CC 8024155C E4600080 */   swc1     $f0, 0x80($v1)
-/* CF90D0 80241560 46020001 */  sub.s     $f0, $f0, $f2
-/* CF90D4 80241564 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241568:
-/* CF90D8 80241568 8C820070 */  lw        $v0, 0x70($a0)
-/* CF90DC 8024156C 2442FFFF */  addiu     $v0, $v0, -1
-/* CF90E0 80241570 AC820070 */  sw        $v0, 0x70($a0)
-/* CF90E4 80241574 000217C3 */  sra       $v0, $v0, 0x1f
-/* CF90E8 80241578 03E00008 */  jr        $ra
-/* CF90EC 8024157C 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s
deleted file mode 100644
index 7db5c1eb2d..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241698_D06DC8
-/* D06DC8 80241698 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D06DCC 8024169C AFB10014 */  sw        $s1, 0x14($sp)
-/* D06DD0 802416A0 0080882D */  daddu     $s1, $a0, $zero
-/* D06DD4 802416A4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D06DD8 802416A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D06DDC 802416AC 8E30000C */  lw        $s0, 0xc($s1)
-/* D06DE0 802416B0 8E050000 */  lw        $a1, ($s0)
-/* D06DE4 802416B4 0C0B1EAF */  jal       get_variable
-/* D06DE8 802416B8 26100004 */   addiu    $s0, $s0, 4
-/* D06DEC 802416BC 0220202D */  daddu     $a0, $s1, $zero
-/* D06DF0 802416C0 8E050000 */  lw        $a1, ($s0)
-/* D06DF4 802416C4 0C0B210B */  jal       get_float_variable
-/* D06DF8 802416C8 0040802D */   daddu    $s0, $v0, $zero
-/* D06DFC 802416CC 24020002 */  addiu     $v0, $zero, 2
-/* D06E00 802416D0 00501804 */  sllv      $v1, $s0, $v0
-/* D06E04 802416D4 00701821 */  addu      $v1, $v1, $s0
-/* D06E08 802416D8 00431804 */  sllv      $v1, $v1, $v0
-/* D06E0C 802416DC 00701823 */  subu      $v1, $v1, $s0
-/* D06E10 802416E0 000320C0 */  sll       $a0, $v1, 3
-/* D06E14 802416E4 00641821 */  addu      $v1, $v1, $a0
-/* D06E18 802416E8 000318C0 */  sll       $v1, $v1, 3
-/* D06E1C 802416EC 3C01800B */  lui       $at, 0x800b
-/* D06E20 802416F0 00230821 */  addu      $at, $at, $v1
-/* D06E24 802416F4 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* D06E28 802416F8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D06E2C 802416FC 8FB10014 */  lw        $s1, 0x14($sp)
-/* D06E30 80241700 8FB00010 */  lw        $s0, 0x10($sp)
-/* D06E34 80241704 03E00008 */  jr        $ra
-/* D06E38 80241708 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s
deleted file mode 100644
index ec1da9607d..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024170C_D06E3C
-/* D06E3C 8024170C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D06E40 80241710 AFB10014 */  sw        $s1, 0x14($sp)
-/* D06E44 80241714 0080882D */  daddu     $s1, $a0, $zero
-/* D06E48 80241718 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D06E4C 8024171C AFB00010 */  sw        $s0, 0x10($sp)
-/* D06E50 80241720 8E30000C */  lw        $s0, 0xc($s1)
-/* D06E54 80241724 8E050000 */  lw        $a1, ($s0)
-/* D06E58 80241728 0C0B1EAF */  jal       get_variable
-/* D06E5C 8024172C 26100004 */   addiu    $s0, $s0, 4
-/* D06E60 80241730 00021880 */  sll       $v1, $v0, 2
-/* D06E64 80241734 00621821 */  addu      $v1, $v1, $v0
-/* D06E68 80241738 00031880 */  sll       $v1, $v1, 2
-/* D06E6C 8024173C 00621823 */  subu      $v1, $v1, $v0
-/* D06E70 80241740 000310C0 */  sll       $v0, $v1, 3
-/* D06E74 80241744 00621821 */  addu      $v1, $v1, $v0
-/* D06E78 80241748 000318C0 */  sll       $v1, $v1, 3
-/* D06E7C 8024174C 3C01800B */  lui       $at, 0x800b
-/* D06E80 80241750 00230821 */  addu      $at, $at, $v1
-/* D06E84 80241754 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* D06E88 80241758 3C014480 */  lui       $at, 0x4480
-/* D06E8C 8024175C 44810000 */  mtc1      $at, $f0
-/* D06E90 80241760 00000000 */  nop       
-/* D06E94 80241764 46001082 */  mul.s     $f2, $f2, $f0
-/* D06E98 80241768 00000000 */  nop       
-/* D06E9C 8024176C 3C01CD5B */  lui       $at, 0xcd5b
-/* D06EA0 80241770 34215858 */  ori       $at, $at, 0x5858
-/* D06EA4 80241774 44810000 */  mtc1      $at, $f0
-/* D06EA8 80241778 00000000 */  nop       
-/* D06EAC 8024177C 46001080 */  add.s     $f2, $f2, $f0
-/* D06EB0 80241780 8E050000 */  lw        $a1, ($s0)
-/* D06EB4 80241784 4600110D */  trunc.w.s $f4, $f2
-/* D06EB8 80241788 44062000 */  mfc1      $a2, $f4
-/* D06EBC 8024178C 0C0B2026 */  jal       set_variable
-/* D06EC0 80241790 0220202D */   daddu    $a0, $s1, $zero
-/* D06EC4 80241794 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D06EC8 80241798 8FB10014 */  lw        $s1, 0x14($sp)
-/* D06ECC 8024179C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D06ED0 802417A0 24020002 */  addiu     $v0, $zero, 2
-/* D06ED4 802417A4 03E00008 */  jr        $ra
-/* D06ED8 802417A8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s
deleted file mode 100644
index 82bc1f8e14..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241948_D07078
-/* D07078 80241948 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D0707C 8024194C 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D07080 80241950 10A00002 */  beqz      $a1, .L8024195C
-/* D07084 80241954 2402003C */   addiu    $v0, $zero, 0x3c
-/* D07088 80241958 AC820070 */  sw        $v0, 0x70($a0)
-.L8024195C:
-/* D0708C 8024195C C4620080 */  lwc1      $f2, 0x80($v1)
-/* D07090 80241960 3C0141F0 */  lui       $at, 0x41f0
-/* D07094 80241964 44810000 */  mtc1      $at, $f0
-/* D07098 80241968 00000000 */  nop       
-/* D0709C 8024196C 46001000 */  add.s     $f0, $f2, $f0
-/* D070A0 80241970 3C0143B4 */  lui       $at, 0x43b4
-/* D070A4 80241974 44811000 */  mtc1      $at, $f2
-/* D070A8 80241978 00000000 */  nop       
-/* D070AC 8024197C 4600103E */  c.le.s    $f2, $f0
-/* D070B0 80241980 00000000 */  nop       
-/* D070B4 80241984 45000003 */  bc1f      .L80241994
-/* D070B8 80241988 E4600080 */   swc1     $f0, 0x80($v1)
-/* D070BC 8024198C 46020001 */  sub.s     $f0, $f0, $f2
-/* D070C0 80241990 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241994:
-/* D070C4 80241994 8C820070 */  lw        $v0, 0x70($a0)
-/* D070C8 80241998 2442FFFF */  addiu     $v0, $v0, -1
-/* D070CC 8024199C AC820070 */  sw        $v0, 0x70($a0)
-/* D070D0 802419A0 000217C3 */  sra       $v0, $v0, 0x1f
-/* D070D4 802419A4 03E00008 */  jr        $ra
-/* D070D8 802419A8 30420002 */   andi     $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s
deleted file mode 100644
index 5f6c8e24cb..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024133C_D3B90C
-/* D3B90C 8024133C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D3B910 80241340 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3B914 80241344 0080882D */  daddu     $s1, $a0, $zero
-/* D3B918 80241348 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D3B91C 8024134C AFB00010 */  sw        $s0, 0x10($sp)
-/* D3B920 80241350 8E30000C */  lw        $s0, 0xc($s1)
-/* D3B924 80241354 8E050000 */  lw        $a1, ($s0)
-/* D3B928 80241358 0C0B1EAF */  jal       get_variable
-/* D3B92C 8024135C 26100004 */   addiu    $s0, $s0, 4
-/* D3B930 80241360 0220202D */  daddu     $a0, $s1, $zero
-/* D3B934 80241364 8E050000 */  lw        $a1, ($s0)
-/* D3B938 80241368 0C0B210B */  jal       get_float_variable
-/* D3B93C 8024136C 0040802D */   daddu    $s0, $v0, $zero
-/* D3B940 80241370 24020002 */  addiu     $v0, $zero, 2
-/* D3B944 80241374 00501804 */  sllv      $v1, $s0, $v0
-/* D3B948 80241378 00701821 */  addu      $v1, $v1, $s0
-/* D3B94C 8024137C 00431804 */  sllv      $v1, $v1, $v0
-/* D3B950 80241380 00701823 */  subu      $v1, $v1, $s0
-/* D3B954 80241384 000320C0 */  sll       $a0, $v1, 3
-/* D3B958 80241388 00641821 */  addu      $v1, $v1, $a0
-/* D3B95C 8024138C 000318C0 */  sll       $v1, $v1, 3
-/* D3B960 80241390 3C01800B */  lui       $at, 0x800b
-/* D3B964 80241394 00230821 */  addu      $at, $at, $v1
-/* D3B968 80241398 E4201D98 */  swc1      $f0, 0x1d98($at)
-/* D3B96C 8024139C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D3B970 802413A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3B974 802413A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3B978 802413A8 03E00008 */  jr        $ra
-/* D3B97C 802413AC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s
deleted file mode 100644
index 8f479509d9..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413B0_D3B980
-/* D3B980 802413B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D3B984 802413B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3B988 802413B8 0080882D */  daddu     $s1, $a0, $zero
-/* D3B98C 802413BC AFBF0018 */  sw        $ra, 0x18($sp)
-/* D3B990 802413C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3B994 802413C4 8E30000C */  lw        $s0, 0xc($s1)
-/* D3B998 802413C8 8E050000 */  lw        $a1, ($s0)
-/* D3B99C 802413CC 0C0B1EAF */  jal       get_variable
-/* D3B9A0 802413D0 26100004 */   addiu    $s0, $s0, 4
-/* D3B9A4 802413D4 00021880 */  sll       $v1, $v0, 2
-/* D3B9A8 802413D8 00621821 */  addu      $v1, $v1, $v0
-/* D3B9AC 802413DC 00031880 */  sll       $v1, $v1, 2
-/* D3B9B0 802413E0 00621823 */  subu      $v1, $v1, $v0
-/* D3B9B4 802413E4 000310C0 */  sll       $v0, $v1, 3
-/* D3B9B8 802413E8 00621821 */  addu      $v1, $v1, $v0
-/* D3B9BC 802413EC 000318C0 */  sll       $v1, $v1, 3
-/* D3B9C0 802413F0 3C01800B */  lui       $at, 0x800b
-/* D3B9C4 802413F4 00230821 */  addu      $at, $at, $v1
-/* D3B9C8 802413F8 C4221D98 */  lwc1      $f2, 0x1d98($at)
-/* D3B9CC 802413FC 3C014480 */  lui       $at, 0x4480
-/* D3B9D0 80241400 44810000 */  mtc1      $at, $f0
-/* D3B9D4 80241404 00000000 */  nop       
-/* D3B9D8 80241408 46001082 */  mul.s     $f2, $f2, $f0
-/* D3B9DC 8024140C 00000000 */  nop       
-/* D3B9E0 80241410 3C01CD5B */  lui       $at, 0xcd5b
-/* D3B9E4 80241414 34215858 */  ori       $at, $at, 0x5858
-/* D3B9E8 80241418 44810000 */  mtc1      $at, $f0
-/* D3B9EC 8024141C 00000000 */  nop       
-/* D3B9F0 80241420 46001080 */  add.s     $f2, $f2, $f0
-/* D3B9F4 80241424 8E050000 */  lw        $a1, ($s0)
-/* D3B9F8 80241428 4600110D */  trunc.w.s $f4, $f2
-/* D3B9FC 8024142C 44062000 */  mfc1      $a2, $f4
-/* D3BA00 80241430 0C0B2026 */  jal       set_variable
-/* D3BA04 80241434 0220202D */   daddu    $a0, $s1, $zero
-/* D3BA08 80241438 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D3BA0C 8024143C 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3BA10 80241440 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BA14 80241444 24020002 */  addiu     $v0, $zero, 2
-/* D3BA18 80241448 03E00008 */  jr        $ra
-/* D3BA1C 8024144C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s
deleted file mode 100644
index 158301533b..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415EC_D3BBBC
-/* D3BBBC 802415EC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D3BBC0 802415F0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D3BBC4 802415F4 10A00002 */  beqz      $a1, .L80241600
-/* D3BBC8 802415F8 2402003C */   addiu    $v0, $zero, 0x3c
-/* D3BBCC 802415FC AC820070 */  sw        $v0, 0x70($a0)
-.L80241600:
-/* D3BBD0 80241600 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D3BBD4 80241604 3C0141F0 */  lui       $at, 0x41f0
-/* D3BBD8 80241608 44810000 */  mtc1      $at, $f0
-/* D3BBDC 8024160C 00000000 */  nop       
-/* D3BBE0 80241610 46001000 */  add.s     $f0, $f2, $f0
-/* D3BBE4 80241614 3C0143B4 */  lui       $at, 0x43b4
-/* D3BBE8 80241618 44811000 */  mtc1      $at, $f2
-/* D3BBEC 8024161C 00000000 */  nop       
-/* D3BBF0 80241620 4600103E */  c.le.s    $f2, $f0
-/* D3BBF4 80241624 00000000 */  nop       
-/* D3BBF8 80241628 45000003 */  bc1f      .L80241638
-/* D3BBFC 8024162C E4600080 */   swc1     $f0, 0x80($v1)
-/* D3BC00 80241630 46020001 */  sub.s     $f0, $f0, $f2
-/* D3BC04 80241634 E4600080 */  swc1      $f0, 0x80($v1)
-.L80241638:
-/* D3BC08 80241638 8C820070 */  lw        $v0, 0x70($a0)
-/* D3BC0C 8024163C 2442FFFF */  addiu     $v0, $v0, -1
-/* D3BC10 80241640 AC820070 */  sw        $v0, 0x70($a0)
-/* D3BC14 80241644 000217C3 */  sra       $v0, $v0, 0x1f
-/* D3BC18 80241648 03E00008 */  jr        $ra
-/* D3BC1C 8024164C 30420002 */   andi     $v0, $v0, 2
diff --git a/include/si.h b/include/si.h
index 6f34ed928b..9fab7e9dae 100644
--- a/include/si.h
+++ b/include/si.h
@@ -16,7 +16,7 @@ typedef s32 ScriptID;
 #define SI_SAVE_VAR(v) (v - 170000000)
 #define SI_ARRAY(v) (v - 190000000)
 #define SI_ARRAY_FLAG(v) (v - 210000000)
-#define SI_FIXED(v) ((s32)(v * 1024.0f) - 230000000) // See float_to_fixed_var
+#define SI_FIXED(v) ((v * 1024.0f) + -230000000) // See float_to_fixed_var
 
 /* Return type of si_execute_next_command */
 #define SI_CONTINUE 0   /* Continue to next command */
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index fd258c68ec..e932d8d5aa 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 95df3d4b0f..cb9c9474cb 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index e6cb55f900..5480bb6c0b 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -78,13 +78,13 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_hos/hos_04/A274B0.c b/src/world/area_hos/hos_04/A274B0.c
index 9b8e226f14..0811b81fc3 100644
--- a/src/world/area_hos/hos_04/A274B0.c
+++ b/src/world/area_hos/hos_04/A274B0.c
@@ -1,6 +1,6 @@
 #include "hos_04.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802405E0_A274B0);
+#include "world/common/SetCamVfov.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654_A27524);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index df6da359fe..1454a92b7a 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -70,13 +70,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 184667f85b..2a9c7477b3 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -110,13 +110,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index c2a864f722..36c5e9da8e 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -52,13 +52,13 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index a50c4fba79..20fbbc1490 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 4f871cc5a3..843baa05ff 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -62,13 +62,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index bbd39460fc..20595c6eb7 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 935c165abb..badb04a0ac 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -38,13 +38,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 33868e1f5c..bea6733f73 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index ac73e21084..839bf91196 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -68,13 +68,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 04af4c9b9b..36a46e2554 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -76,13 +76,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index ff2304cfef..9dc71cf4d2 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index f9daf86071..3da3677484 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -48,13 +48,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 775fd06542..0521858a9d 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -56,13 +56,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index df17fb25c7..4a11b87a56 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4);
 
 #include "world/common/GetGameStatus75.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C);
+#include "world/common/SetCamVfov.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980);
+#include "world/common/GetCamVfov.inc.c"
 
 #include "world/common/UnkCameraFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC);
+#include "world/common/UnkRotatePlayer.inc.c"
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
diff --git a/src/world/common/GetCamVfov.inc.c b/src/world/common/GetCamVfov.inc.c
new file mode 100644
index 0000000000..38c40d234d
--- /dev/null
+++ b/src/world/common/GetCamVfov.inc.c
@@ -0,0 +1,10 @@
+#include "common.h"
+#include "map.h"
+
+static ApiStatus GetCamVfov(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 cameraID = get_variable(script, *args++);
+
+    set_variable(script, *args++, SI_FIXED(gCameras[cameraID].vfov));
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/SetCamVfov.inc.c b/src/world/common/SetCamVfov.inc.c
new file mode 100644
index 0000000000..c05aec5e1a
--- /dev/null
+++ b/src/world/common/SetCamVfov.inc.c
@@ -0,0 +1,10 @@
+#include "common.h"
+#include "map.h"
+
+static ApiStatus SetCamVfov(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 cameraID = get_variable(script, *args++);
+
+    gCameras[cameraID].vfov = get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkPartnerFuncs.inc.c b/src/world/common/UnkPartnerFuncs.inc.c
index b7f2e7584d..ed90f5612d 100644
--- a/src/world/common/UnkPartnerFuncs.inc.c
+++ b/src/world/common/UnkPartnerFuncs.inc.c
@@ -17,7 +17,6 @@ static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) {
     return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2;
 }
 
-
 static ApiStatus UnkMovePartner(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(NpcId_PARTNER);
 
diff --git a/src/world/common/UnkRotatePlayer.inc.c b/src/world/common/UnkRotatePlayer.inc.c
new file mode 100644
index 0000000000..898906f1ce
--- /dev/null
+++ b/src/world/common/UnkRotatePlayer.inc.c
@@ -0,0 +1,18 @@
+#include "common.h"
+
+static ApiStatus UnkRotatePlayer(ScriptInstance* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 60;
+    }
+
+    playerStatus->targetYaw += 30.0f;
+    if (playerStatus->targetYaw >= 360.0f) {
+        playerStatus->targetYaw -= 360.0f;
+    }
+
+    script->functionTemp[0].s--;
+
+    return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2;
+}

From 51b1c9acfbfc7bfbff28e1906ad25e8a5996836a Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 19:03:29 -0400
Subject: [PATCH 053/101] CheckPartnerFlags1000

---
 .../area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s | 15 ---------------
 .../area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s | 15 ---------------
 .../area_kmr/kmr_04/8CA900/func_80240000_8CA900.s | 15 ---------------
 .../area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s | 15 ---------------
 src/world/area_kmr/kmr_02/8B36B0.c                |  2 +-
 src/world/area_kmr/kmr_03/8C7F90.c                |  2 +-
 src/world/area_kmr/kmr_04/8CA900.c                |  2 +-
 src/world/area_kmr/kmr_04/8CA960.c                |  3 +--
 src/world/common/CheckPartnerFlags1000.inc.c      |  5 +++++
 9 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s
 create mode 100644 src/world/common/CheckPartnerFlags1000.inc.c

diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s
deleted file mode 100644
index 53d1d0587e..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243640_8B36B0
-/* 8B36B0 80243640 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B36B4 80243644 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B36B8 80243648 0C00EABB */  jal       get_npc_unsafe
-/* 8B36BC 8024364C 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B36C0 80243650 8C420000 */  lw        $v0, ($v0)
-/* 8B36C4 80243654 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B36C8 80243658 30421000 */  andi      $v0, $v0, 0x1000
-/* 8B36CC 8024365C 0002102B */  sltu      $v0, $zero, $v0
-/* 8B36D0 80243660 00021040 */  sll       $v0, $v0, 1
-/* 8B36D4 80243664 03E00008 */  jr        $ra
-/* 8B36D8 80243668 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s
deleted file mode 100644
index 5b71f3006b..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240184_8C8114
-/* 8C8114 80240184 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8C8118 80240188 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8C811C 8024018C 0C00EABB */  jal       get_npc_unsafe
-/* 8C8120 80240190 2404FFFC */   addiu    $a0, $zero, -4
-/* 8C8124 80240194 8C420000 */  lw        $v0, ($v0)
-/* 8C8128 80240198 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8C812C 8024019C 30421000 */  andi      $v0, $v0, 0x1000
-/* 8C8130 802401A0 0002102B */  sltu      $v0, $zero, $v0
-/* 8C8134 802401A4 00021040 */  sll       $v0, $v0, 1
-/* 8C8138 802401A8 03E00008 */  jr        $ra
-/* 8C813C 802401AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s
deleted file mode 100644
index 231ffcd1af..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_8CA900
-/* 8CA900 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CA904 80240004 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8CA908 80240008 0C00EABB */  jal       get_npc_unsafe
-/* 8CA90C 8024000C 2404FFFC */   addiu    $a0, $zero, -4
-/* 8CA910 80240010 8C420000 */  lw        $v0, ($v0)
-/* 8CA914 80240014 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8CA918 80240018 30421000 */  andi      $v0, $v0, 0x1000
-/* 8CA91C 8024001C 0002102B */  sltu      $v0, $zero, $v0
-/* 8CA920 80240020 00021040 */  sll       $v0, $v0, 1
-/* 8CA924 80240024 03E00008 */  jr        $ra
-/* 8CA928 80240028 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s
deleted file mode 100644
index c594351fac..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024029C_8CAB9C
-/* 8CAB9C 8024029C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CABA0 802402A0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8CABA4 802402A4 0C00EABB */  jal       get_npc_unsafe
-/* 8CABA8 802402A8 2404FFFC */   addiu    $a0, $zero, -4
-/* 8CABAC 802402AC 8C420000 */  lw        $v0, ($v0)
-/* 8CABB0 802402B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8CABB4 802402B4 30421000 */  andi      $v0, $v0, 0x1000
-/* 8CABB8 802402B8 0002102B */  sltu      $v0, $zero, $v0
-/* 8CABBC 802402BC 00021040 */  sll       $v0, $v0, 1
-/* 8CABC0 802402C0 03E00008 */  jr        $ra
-/* 8CABC4 802402C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c
index dc6524e5e0..3032631199 100644
--- a/src/world/area_kmr/kmr_02/8B36B0.c
+++ b/src/world/area_kmr/kmr_02/8B36B0.c
@@ -1,6 +1,6 @@
 #include "kmr_02.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_80243640_8B36B0);
+#include "world/common/CheckPartnerFlags1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC);
 
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index 6f289df621..ce0c09531c 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240184_8C8114);
+#include "world/common/CheckPartnerFlags1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140);
 
diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c
index 3920cad638..3326b00c98 100644
--- a/src/world/area_kmr/kmr_04/8CA900.c
+++ b/src/world/area_kmr/kmr_04/8CA900.c
@@ -1,5 +1,5 @@
 #include "kmr_04.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_80240000_8CA900);
+#include "world/common/CheckPartnerFlags1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C);
diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c
index 6843ad0c92..fa5c2991fd 100644
--- a/src/world/area_kmr/kmr_04/8CA960.c
+++ b/src/world/area_kmr/kmr_04/8CA960.c
@@ -2,8 +2,7 @@
 
 #include "world/common/SomeMatrixOperations.inc.c"
 
-
-INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C_8CAB9C);
+#include "world/common/CheckPartnerFlags1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8);
 
diff --git a/src/world/common/CheckPartnerFlags1000.inc.c b/src/world/common/CheckPartnerFlags1000.inc.c
new file mode 100644
index 0000000000..f34f84ba9c
--- /dev/null
+++ b/src/world/common/CheckPartnerFlags1000.inc.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+static ApiStatus CheckPartnerFlags1000(ScriptInstance* script, s32 isInitialCall) {
+    return ((get_npc_unsafe(NpcId_PARTNER)->flags & 0x1000) != 0) * ApiStatus_DONE2;
+}

From cff33e37f4218983740b91eff3684b232b29c28b Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 19:11:46 -0400
Subject: [PATCH 054/101] UnkPositionFunc

---
 .../kmr_03/8C7F90/func_802401B0_8C8140.s      | 30 --------
 .../kmr_03/8C7F90/func_80240218_8C81A8.s      | 72 -------------------
 .../mac_01/8017D0/func_802446E0_804F60.s      | 70 ------------------
 include/functions.h                           |  1 +
 src/code_759b0_len_61b0.c                     |  2 +-
 src/world/area_kmr/kmr_03/8C7F90.c            |  9 ++-
 src/world/area_mac/mac_00/7EB340.c            | 20 +-----
 src/world/area_mac/mac_01/8017D0.c            |  2 +-
 src/world/common/UnkPositionFunc.inc.c        | 21 ++++++
 9 files changed, 32 insertions(+), 195 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s
 create mode 100644 src/world/common/UnkPositionFunc.inc.c

diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s
deleted file mode 100644
index be90193e13..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401B0_8C8140
-/* 8C8140 802401B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8C8144 802401B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8C8148 802401B8 0080882D */  daddu     $s1, $a0, $zero
-/* 8C814C 802401BC 0000202D */  daddu     $a0, $zero, $zero
-/* 8C8150 802401C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8C8154 802401C4 0C00EABB */  jal       get_npc_unsafe
-/* 8C8158 802401C8 AFB00010 */   sw       $s0, 0x10($sp)
-/* 8C815C 802401CC 0040802D */  daddu     $s0, $v0, $zero
-/* 8C8160 802401D0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* 8C8164 802401D4 0C038022 */  jal       func_800E0088
-/* 8C8168 802401D8 C60E0040 */   lwc1     $f14, 0x40($s0)
-/* 8C816C 802401DC C6020018 */  lwc1      $f2, 0x18($s0)
-/* 8C8170 802401E0 3C013F4C */  lui       $at, 0x3f4c
-/* 8C8174 802401E4 3421CCCD */  ori       $at, $at, 0xcccd
-/* 8C8178 802401E8 44812000 */  mtc1      $at, $f4
-/* 8C817C 802401EC 46020003 */  div.s     $f0, $f0, $f2
-/* 8C8180 802401F0 46040002 */  mul.s     $f0, $f0, $f4
-/* 8C8184 802401F4 00000000 */  nop       
-/* 8C8188 802401F8 4600018D */  trunc.w.s $f6, $f0
-/* 8C818C 802401FC E6260088 */  swc1      $f6, 0x88($s1)
-/* 8C8190 80240200 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8C8194 80240204 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8C8198 80240208 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8C819C 8024020C 24020002 */  addiu     $v0, $zero, 2
-/* 8C81A0 80240210 03E00008 */  jr        $ra
-/* 8C81A4 80240214 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s
deleted file mode 100644
index 9f3aeef417..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s
+++ /dev/null
@@ -1,72 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240218_8C81A8
-/* 8C81A8 80240218 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 8C81AC 8024021C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8C81B0 80240220 0080882D */  daddu     $s1, $a0, $zero
-/* 8C81B4 80240224 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8C81B8 80240228 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8C81BC 8024022C F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 8C81C0 80240230 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 8C81C4 80240234 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8C81C8 80240238 8E30000C */  lw        $s0, 0xc($s1)
-/* 8C81CC 8024023C 8E050000 */  lw        $a1, ($s0)
-/* 8C81D0 80240240 0C0B1EAF */  jal       get_variable
-/* 8C81D4 80240244 26100004 */   addiu    $s0, $s0, 4
-/* 8C81D8 80240248 8E050000 */  lw        $a1, ($s0)
-/* 8C81DC 8024024C 26100004 */  addiu     $s0, $s0, 4
-/* 8C81E0 80240250 4482C000 */  mtc1      $v0, $f24
-/* 8C81E4 80240254 00000000 */  nop       
-/* 8C81E8 80240258 4680C620 */  cvt.s.w   $f24, $f24
-/* 8C81EC 8024025C 0C0B1EAF */  jal       get_variable
-/* 8C81F0 80240260 0220202D */   daddu    $a0, $s1, $zero
-/* 8C81F4 80240264 8E050000 */  lw        $a1, ($s0)
-/* 8C81F8 80240268 26100004 */  addiu     $s0, $s0, 4
-/* 8C81FC 8024026C 4482B000 */  mtc1      $v0, $f22
-/* 8C8200 80240270 00000000 */  nop       
-/* 8C8204 80240274 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 8C8208 80240278 0C0B1EAF */  jal       get_variable
-/* 8C820C 8024027C 0220202D */   daddu    $a0, $s1, $zero
-/* 8C8210 80240280 8E050000 */  lw        $a1, ($s0)
-/* 8C8214 80240284 4482A000 */  mtc1      $v0, $f20
-/* 8C8218 80240288 00000000 */  nop       
-/* 8C821C 8024028C 4680A520 */  cvt.s.w   $f20, $f20
-/* 8C8220 80240290 0C0B1EAF */  jal       get_variable
-/* 8C8224 80240294 0220202D */   daddu    $a0, $s1, $zero
-/* 8C8228 80240298 44820000 */  mtc1      $v0, $f0
-/* 8C822C 8024029C 00000000 */  nop       
-/* 8C8230 802402A0 46800020 */  cvt.s.w   $f0, $f0
-/* 8C8234 802402A4 46160001 */  sub.s     $f0, $f0, $f22
-/* 8C8238 802402A8 4618A501 */  sub.s     $f20, $f20, $f24
-/* 8C823C 802402AC 46140003 */  div.s     $f0, $f0, $f20
-/* 8C8240 802402B0 46180602 */  mul.s     $f24, $f0, $f24
-/* 8C8244 802402B4 00000000 */  nop       
-/* 8C8248 802402B8 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 8C824C 802402BC 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 8C8250 802402C0 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 8C8254 802402C4 46020002 */  mul.s     $f0, $f0, $f2
-/* 8C8258 802402C8 00000000 */  nop       
-/* 8C825C 802402CC 4618B581 */  sub.s     $f22, $f22, $f24
-/* 8C8260 802402D0 46160000 */  add.s     $f0, $f0, $f22
-/* 8C8264 802402D4 C4420030 */  lwc1      $f2, 0x30($v0)
-/* 8C8268 802402D8 4600103C */  c.lt.s    $f2, $f0
-/* 8C826C 802402DC 00000000 */  nop       
-/* 8C8270 802402E0 45000003 */  bc1f      .L802402F0
-/* 8C8274 802402E4 24020001 */   addiu    $v0, $zero, 1
-/* 8C8278 802402E8 080900BD */  j         .L802402F4
-/* 8C827C 802402EC AE200084 */   sw       $zero, 0x84($s1)
-.L802402F0:
-/* 8C8280 802402F0 AE220084 */  sw        $v0, 0x84($s1)
-.L802402F4:
-/* 8C8284 802402F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8C8288 802402F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8C828C 802402FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8C8290 80240300 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 8C8294 80240304 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 8C8298 80240308 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8C829C 8024030C 24020002 */  addiu     $v0, $zero, 2
-/* 8C82A0 80240310 03E00008 */  jr        $ra
-/* 8C82A4 80240314 27BD0038 */   addiu    $sp, $sp, 0x38
-/* 8C82A8 80240318 00000000 */  nop       
-/* 8C82AC 8024031C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s
deleted file mode 100644
index 5daf4f046b..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802446E0_804F60
-/* 804F60 802446E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 804F64 802446E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 804F68 802446E8 0080882D */  daddu     $s1, $a0, $zero
-/* 804F6C 802446EC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 804F70 802446F0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 804F74 802446F4 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 804F78 802446F8 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 804F7C 802446FC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 804F80 80244700 8E30000C */  lw        $s0, 0xc($s1)
-/* 804F84 80244704 8E050000 */  lw        $a1, ($s0)
-/* 804F88 80244708 0C0B1EAF */  jal       get_variable
-/* 804F8C 8024470C 26100004 */   addiu    $s0, $s0, 4
-/* 804F90 80244710 8E050000 */  lw        $a1, ($s0)
-/* 804F94 80244714 26100004 */  addiu     $s0, $s0, 4
-/* 804F98 80244718 4482C000 */  mtc1      $v0, $f24
-/* 804F9C 8024471C 00000000 */  nop       
-/* 804FA0 80244720 4680C620 */  cvt.s.w   $f24, $f24
-/* 804FA4 80244724 0C0B1EAF */  jal       get_variable
-/* 804FA8 80244728 0220202D */   daddu    $a0, $s1, $zero
-/* 804FAC 8024472C 8E050000 */  lw        $a1, ($s0)
-/* 804FB0 80244730 26100004 */  addiu     $s0, $s0, 4
-/* 804FB4 80244734 4482B000 */  mtc1      $v0, $f22
-/* 804FB8 80244738 00000000 */  nop       
-/* 804FBC 8024473C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 804FC0 80244740 0C0B1EAF */  jal       get_variable
-/* 804FC4 80244744 0220202D */   daddu    $a0, $s1, $zero
-/* 804FC8 80244748 8E050000 */  lw        $a1, ($s0)
-/* 804FCC 8024474C 4482A000 */  mtc1      $v0, $f20
-/* 804FD0 80244750 00000000 */  nop       
-/* 804FD4 80244754 4680A520 */  cvt.s.w   $f20, $f20
-/* 804FD8 80244758 0C0B1EAF */  jal       get_variable
-/* 804FDC 8024475C 0220202D */   daddu    $a0, $s1, $zero
-/* 804FE0 80244760 44820000 */  mtc1      $v0, $f0
-/* 804FE4 80244764 00000000 */  nop       
-/* 804FE8 80244768 46800020 */  cvt.s.w   $f0, $f0
-/* 804FEC 8024476C 46160001 */  sub.s     $f0, $f0, $f22
-/* 804FF0 80244770 4618A501 */  sub.s     $f20, $f20, $f24
-/* 804FF4 80244774 46140003 */  div.s     $f0, $f0, $f20
-/* 804FF8 80244778 46180602 */  mul.s     $f24, $f0, $f24
-/* 804FFC 8024477C 00000000 */  nop       
-/* 805000 80244780 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 805004 80244784 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 805008 80244788 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 80500C 8024478C 46020002 */  mul.s     $f0, $f0, $f2
-/* 805010 80244790 00000000 */  nop       
-/* 805014 80244794 4618B581 */  sub.s     $f22, $f22, $f24
-/* 805018 80244798 46160000 */  add.s     $f0, $f0, $f22
-/* 80501C 8024479C C4420030 */  lwc1      $f2, 0x30($v0)
-/* 805020 802447A0 4600103C */  c.lt.s    $f2, $f0
-/* 805024 802447A4 00000000 */  nop       
-/* 805028 802447A8 45000003 */  bc1f      .L802447B8
-/* 80502C 802447AC 24020001 */   addiu    $v0, $zero, 1
-/* 805030 802447B0 080911EF */  j         .L802447BC
-/* 805034 802447B4 AE200084 */   sw       $zero, 0x84($s1)
-.L802447B8:
-/* 805038 802447B8 AE220084 */  sw        $v0, 0x84($s1)
-.L802447BC:
-/* 80503C 802447BC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 805040 802447C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 805044 802447C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 805048 802447C8 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 80504C 802447CC D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 805050 802447D0 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 805054 802447D4 24020002 */  addiu     $v0, $zero, 2
-/* 805058 802447D8 03E00008 */  jr        $ra
-/* 80505C 802447DC 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/include/functions.h b/include/functions.h
index 7a6b9ed69c..1f3d72256e 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -70,6 +70,7 @@ void set_curtain_fade(f32 scale);
 
 void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
 
+f32 func_800E0088(f32, f32);
 s32 func_800EB168(s32);
 
 // Partner
diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c
index 159fdaedc7..2f827e8efb 100644
--- a/src/code_759b0_len_61b0.c
+++ b/src/code_759b0_len_61b0.c
@@ -74,7 +74,7 @@ INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFF78);
 
 INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFFCC);
 
-INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0088);
+INCLUDE_ASM(f32, "code_759b0_len_61b0", func_800E0088, f32 arg0, f32 arg1);
 
 void enable_player_shadow(void) {
     get_shadow_by_index(D_8010F094)->flags &= ~1;
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index ce0c09531c..99a6c04939 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -4,6 +4,11 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90);
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140);
+ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(0);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240218_8C81A8);
+    script->varTable[1] = (func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed) * 0.8f;
+    return ApiStatus_DONE2;
+}
+
+#include "world/common/UnkPositionFunc.inc.c"
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 20fbbc1490..2678144c2e 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -78,25 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00);
 
-ApiStatus func_80242078_7ECD88(ScriptInstance* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    PlayerStatus* playerStatus = PLAYER_STATUS;
-    f32 var0 = get_variable(script, *args++);
-    f32 var1 = get_variable(script, *args++);
-    f32 var2 = get_variable(script, *args++);
-    f32 var3 = get_variable(script, *args++);
-    f32 temp;
-
-    temp = (var3 - var1) / (var2 - var0);
-
-    if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) {
-        script->varTable[0] = 0;
-    } else {
-        script->varTable[0] = 1;
-    }
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkPositionFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 843baa05ff..464f97b3ee 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -142,7 +142,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0_804C60);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC_804F2C);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446E0_804F60);
+#include "world/common/UnkPositionFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802447E0_805060);
 
diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/UnkPositionFunc.inc.c
new file mode 100644
index 0000000000..e55d810e98
--- /dev/null
+++ b/src/world/common/UnkPositionFunc.inc.c
@@ -0,0 +1,21 @@
+#include "common.h"
+
+static ApiStatus UnkPositionFunc(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+    f32 var0 = get_variable(script, *args++);
+    f32 var1 = get_variable(script, *args++);
+    f32 var2 = get_variable(script, *args++);
+    f32 var3 = get_variable(script, *args++);
+    f32 temp;
+
+    temp = (var3 - var1) / (var2 - var0);
+
+    if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) {
+        script->varTable[0] = 0;
+    } else {
+        script->varTable[0] = 1;
+    }
+
+    return ApiStatus_DONE2;
+}

From a840d81a29279f62346766da84ed293d8e8eb504 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 19:21:00 -0400
Subject: [PATCH 055/101] SetCamera0MoveFlagNeg1

---
 .../flo_21/CE7240/func_80240CD0_CE73D0.s      | 12 -----
 .../hos_01/A11650/func_80240DD0_A11650.s      | 11 ----
 .../kmr_03/8C82B0/func_80240320_8C82B0.s      | 11 ----
 .../kmr_03/8C82B0/func_80240358_8C82E8.s      | 50 -------------------
 .../kpa_08/A4CA20/func_80240000_A4CA20.s      | 11 ----
 .../kpa_09/A4F000/func_80240000_A4F000.s      | 11 ----
 .../kzn_03/C63A10/func_80242D00_C63A10.s      | 11 ----
 .../kzn_23/C9C610/func_80240504_C9C804.s      | 11 ----
 .../obk_01/BBD1A0/func_80240000_BBD1A0.s      | 11 ----
 .../obk_05/BCD060/func_80240000_BCD060.s      | 11 ----
 .../omo_02/D9D4D0/func_80240000_D9D4D0.s      | 11 ----
 .../omo_03/DA5240/func_80240000_DA5240.s      | 12 -----
 .../omo_03/DA5260/func_80240020_DA5260.s      | 11 ----
 .../omo_04/DAD400/func_802402BC_DAD6BC.s      | 11 ----
 .../omo_06/DB7910/func_80240000_DB7910.s      | 11 ----
 .../omo_07/DC01D0/func_802431DC_DC048C.s      | 11 ----
 .../omo_08/DC43D0/func_80240000_DC43D0.s      | 11 ----
 .../omo_10/DD79B0/func_80240000_DD79B0.s      | 11 ----
 .../omo_16/DEBED0/func_80240000_DEBED0.s      | 11 ----
 .../omo_17/DEEEA0/func_80240000_DEEEA0.s      | 11 ----
 .../sam_07/D2BD30/func_80240634_D2C364.s      | 11 ----
 .../sam_11/D3A930/func_80240564_D3AB34.s      | 11 ----
 src/world/area_flo/flo_21/CE7240.c            |  2 +-
 src/world/area_hos/hos_01/A11650.c            |  2 +-
 src/world/area_kmr/kmr_03/8C7F90.c            |  2 +-
 src/world/area_kmr/kmr_03/8C82B0.c            | 14 +++++-
 src/world/area_kpa/kpa_08/A4CA20.c            |  2 +-
 src/world/area_kpa/kpa_09/A4F000.c            |  2 +-
 src/world/area_kzn/kzn_03/C63A10.c            |  2 +-
 src/world/area_kzn/kzn_23/C9C610.c            |  2 +-
 src/world/area_obk/obk_01/BBD1A0.c            |  2 +-
 src/world/area_obk/obk_05/BCD060.c            |  2 +-
 src/world/area_omo/omo_02/D9D4D0.c            |  2 +-
 src/world/area_omo/omo_03/DA5240.c            |  2 +-
 src/world/area_omo/omo_03/DA5260.c            |  2 +-
 src/world/area_omo/omo_04/DAD400.c            |  2 +-
 src/world/area_omo/omo_06/DB7910.c            |  2 +-
 src/world/area_omo/omo_07/DC01D0.c            |  2 +-
 src/world/area_omo/omo_08/DC43D0.c            |  2 +-
 src/world/area_omo/omo_10/DD79B0.c            |  2 +-
 src/world/area_omo/omo_16/DEBED0.c            |  2 +-
 src/world/area_omo/omo_17/DEEEA0.c            |  2 +-
 src/world/area_sam/sam_07/D2BD30.c            |  2 +-
 src/world/area_sam/sam_11/D3A930.c            |  2 +-
 src/world/common/SetCamera0MoveFlagNeg1.inc.c |  8 +++
 45 files changed, 41 insertions(+), 306 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s
 delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s
 delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s
 delete mode 100644 asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s
 delete mode 100644 asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s
 create mode 100644 src/world/common/SetCamera0MoveFlagNeg1.inc.c

diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s
deleted file mode 100644
index b1f5761016..0000000000
--- a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CD0_CE73D0
-/* CE73D0 80240CD0 3C03800B */  lui       $v1, %hi(gCameras)
-/* CE73D4 80240CD4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* CE73D8 80240CD8 94620002 */  lhu       $v0, 2($v1)
-/* CE73DC 80240CDC 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* CE73E0 80240CE0 A4620002 */  sh        $v0, 2($v1)
-/* CE73E4 80240CE4 03E00008 */  jr        $ra
-/* CE73E8 80240CE8 24020002 */   addiu    $v0, $zero, 2
-/* CE73EC 80240CEC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s
deleted file mode 100644
index 73e5a9b404..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240DD0_A11650
-/* A11650 80240DD0 3C03800B */  lui       $v1, %hi(gCameras)
-/* A11654 80240DD4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A11658 80240DD8 94620002 */  lhu       $v0, 2($v1)
-/* A1165C 80240DDC 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* A11660 80240DE0 A4620002 */  sh        $v0, 2($v1)
-/* A11664 80240DE4 03E00008 */  jr        $ra
-/* A11668 80240DE8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s
deleted file mode 100644
index 17e67f0c2b..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240320_8C82B0
-/* 8C82B0 80240320 3C03800B */  lui       $v1, %hi(gCameras)
-/* 8C82B4 80240324 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 8C82B8 80240328 94620002 */  lhu       $v0, 2($v1)
-/* 8C82BC 8024032C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* 8C82C0 80240330 A4620002 */  sh        $v0, 2($v1)
-/* 8C82C4 80240334 03E00008 */  jr        $ra
-/* 8C82C8 80240338 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s
deleted file mode 100644
index effece0d26..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240358_8C82E8
-/* 8C82E8 80240358 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 8C82EC 8024035C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8C82F0 80240360 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* 8C82F4 80240364 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* 8C82F8 80240368 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8C82FC 8024036C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8C8300 80240370 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 8C8304 80240374 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8C8308 80240378 C60C0080 */  lwc1      $f12, 0x80($s0)
-/* 8C830C 8024037C 0C00A8BB */  jal       sin_deg
-/* 8C8310 80240380 0080882D */   daddu    $s1, $a0, $zero
-/* 8C8314 80240384 C6140054 */  lwc1      $f20, 0x54($s0)
-/* 8C8318 80240388 3C0140A0 */  lui       $at, 0x40a0
-/* 8C831C 8024038C 4481B000 */  mtc1      $at, $f22
-/* 8C8320 80240390 00000000 */  nop       
-/* 8C8324 80240394 4616A502 */  mul.s     $f20, $f20, $f22
-/* 8C8328 80240398 00000000 */  nop       
-/* 8C832C 8024039C C60C0080 */  lwc1      $f12, 0x80($s0)
-/* 8C8330 802403A0 4600A502 */  mul.s     $f20, $f20, $f0
-/* 8C8334 802403A4 0C00A8D4 */  jal       cos_deg
-/* 8C8338 802403A8 00000000 */   nop      
-/* 8C833C 802403AC C6040054 */  lwc1      $f4, 0x54($s0)
-/* 8C8340 802403B0 46162102 */  mul.s     $f4, $f4, $f22
-/* 8C8344 802403B4 00000000 */  nop       
-/* 8C8348 802403B8 C6020028 */  lwc1      $f2, 0x28($s0)
-/* 8C834C 802403BC 46141080 */  add.s     $f2, $f2, $f20
-/* 8C8350 802403C0 46000007 */  neg.s     $f0, $f0
-/* 8C8354 802403C4 46002102 */  mul.s     $f4, $f4, $f0
-/* 8C8358 802403C8 00000000 */  nop       
-/* 8C835C 802403CC 4600118D */  trunc.w.s $f6, $f2
-/* 8C8360 802403D0 E6260084 */  swc1      $f6, 0x84($s1)
-/* 8C8364 802403D4 C6000030 */  lwc1      $f0, 0x30($s0)
-/* 8C8368 802403D8 46040000 */  add.s     $f0, $f0, $f4
-/* 8C836C 802403DC 4600018D */  trunc.w.s $f6, $f0
-/* 8C8370 802403E0 E6260088 */  swc1      $f6, 0x88($s1)
-/* 8C8374 802403E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8C8378 802403E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8C837C 802403EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8C8380 802403F0 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 8C8384 802403F4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8C8388 802403F8 24020002 */  addiu     $v0, $zero, 2
-/* 8C838C 802403FC 03E00008 */  jr        $ra
-/* 8C8390 80240400 27BD0030 */   addiu    $sp, $sp, 0x30
-/* 8C8394 80240404 00000000 */  nop       
-/* 8C8398 80240408 00000000 */  nop       
-/* 8C839C 8024040C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s
deleted file mode 100644
index 72e9e5f6cf..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_A4CA20
-/* A4CA20 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* A4CA24 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A4CA28 80240008 94620002 */  lhu       $v0, 2($v1)
-/* A4CA2C 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* A4CA30 80240010 A4620002 */  sh        $v0, 2($v1)
-/* A4CA34 80240014 03E00008 */  jr        $ra
-/* A4CA38 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s
deleted file mode 100644
index da980b58b2..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_A4F000
-/* A4F000 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* A4F004 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A4F008 80240008 94620002 */  lhu       $v0, 2($v1)
-/* A4F00C 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* A4F010 80240010 A4620002 */  sh        $v0, 2($v1)
-/* A4F014 80240014 03E00008 */  jr        $ra
-/* A4F018 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s
deleted file mode 100644
index bd9af1c337..0000000000
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242D00_C63A10
-/* C63A10 80242D00 3C03800B */  lui       $v1, %hi(gCameras)
-/* C63A14 80242D04 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* C63A18 80242D08 94620002 */  lhu       $v0, 2($v1)
-/* C63A1C 80242D0C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* C63A20 80242D10 A4620002 */  sh        $v0, 2($v1)
-/* C63A24 80242D14 03E00008 */  jr        $ra
-/* C63A28 80242D18 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s
deleted file mode 100644
index c63af71641..0000000000
--- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240504_C9C804
-/* C9C804 80240504 3C03800B */  lui       $v1, %hi(gCameras)
-/* C9C808 80240508 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* C9C80C 8024050C 94620002 */  lhu       $v0, 2($v1)
-/* C9C810 80240510 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* C9C814 80240514 A4620002 */  sh        $v0, 2($v1)
-/* C9C818 80240518 03E00008 */  jr        $ra
-/* C9C81C 8024051C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s
deleted file mode 100644
index 55cf04adcc..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_BBD1A0
-/* BBD1A0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* BBD1A4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BBD1A8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* BBD1AC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* BBD1B0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* BBD1B4 80240014 03E00008 */  jr        $ra
-/* BBD1B8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s
deleted file mode 100644
index 26bb939d74..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_BCD060
-/* BCD060 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* BCD064 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BCD068 80240008 94620002 */  lhu       $v0, 2($v1)
-/* BCD06C 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* BCD070 80240010 A4620002 */  sh        $v0, 2($v1)
-/* BCD074 80240014 03E00008 */  jr        $ra
-/* BCD078 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s
deleted file mode 100644
index 6ee826468d..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_D9D4D0
-/* D9D4D0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* D9D4D4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D9D4D8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* D9D4DC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* D9D4E0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* D9D4E4 80240014 03E00008 */  jr        $ra
-/* D9D4E8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s
deleted file mode 100644
index 43fb01848c..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DA5240
-/* DA5240 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DA5244 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DA5248 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DA524C 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DA5250 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DA5254 80240014 03E00008 */  jr        $ra
-/* DA5258 80240018 24020002 */   addiu    $v0, $zero, 2
-/* DA525C 8024001C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s
deleted file mode 100644
index 54c04b44c0..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240020_DA5260
-/* DA5260 80240020 3C03800B */  lui       $v1, %hi(gCameras)
-/* DA5264 80240024 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DA5268 80240028 94620002 */  lhu       $v0, 2($v1)
-/* DA526C 8024002C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DA5270 80240030 A4620002 */  sh        $v0, 2($v1)
-/* DA5274 80240034 03E00008 */  jr        $ra
-/* DA5278 80240038 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s
deleted file mode 100644
index ac128cb628..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402BC_DAD6BC
-/* DAD6BC 802402BC 3C03800B */  lui       $v1, %hi(gCameras)
-/* DAD6C0 802402C0 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DAD6C4 802402C4 94620002 */  lhu       $v0, 2($v1)
-/* DAD6C8 802402C8 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DAD6CC 802402CC A4620002 */  sh        $v0, 2($v1)
-/* DAD6D0 802402D0 03E00008 */  jr        $ra
-/* DAD6D4 802402D4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s
deleted file mode 100644
index 8bc16f1e64..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DB7910
-/* DB7910 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DB7914 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DB7918 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DB791C 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DB7920 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DB7924 80240014 03E00008 */  jr        $ra
-/* DB7928 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s
deleted file mode 100644
index 1d9f7dab27..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431DC_DC048C
-/* DC048C 802431DC 3C03800B */  lui       $v1, %hi(gCameras)
-/* DC0490 802431E0 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DC0494 802431E4 94620002 */  lhu       $v0, 2($v1)
-/* DC0498 802431E8 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DC049C 802431EC A4620002 */  sh        $v0, 2($v1)
-/* DC04A0 802431F0 03E00008 */  jr        $ra
-/* DC04A4 802431F4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s
deleted file mode 100644
index c885b959f2..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DC43D0
-/* DC43D0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DC43D4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DC43D8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DC43DC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DC43E0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DC43E4 80240014 03E00008 */  jr        $ra
-/* DC43E8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s
deleted file mode 100644
index 3a5f09e35f..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DD79B0
-/* DD79B0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DD79B4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DD79B8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DD79BC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DD79C0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DD79C4 80240014 03E00008 */  jr        $ra
-/* DD79C8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s
deleted file mode 100644
index 9620b34659..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DEBED0
-/* DEBED0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DEBED4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DEBED8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DEBEDC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DEBEE0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DEBEE4 80240014 03E00008 */  jr        $ra
-/* DEBEE8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s
deleted file mode 100644
index 240afc7ea8..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DEEEA0
-/* DEEEA0 80240000 3C03800B */  lui       $v1, %hi(gCameras)
-/* DEEEA4 80240004 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DEEEA8 80240008 94620002 */  lhu       $v0, 2($v1)
-/* DEEEAC 8024000C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* DEEEB0 80240010 A4620002 */  sh        $v0, 2($v1)
-/* DEEEB4 80240014 03E00008 */  jr        $ra
-/* DEEEB8 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s
deleted file mode 100644
index 9a25be2d33..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240634_D2C364
-/* D2C364 80240634 3C03800B */  lui       $v1, %hi(gCameras)
-/* D2C368 80240638 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D2C36C 8024063C 94620002 */  lhu       $v0, 2($v1)
-/* D2C370 80240640 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* D2C374 80240644 A4620002 */  sh        $v0, 2($v1)
-/* D2C378 80240648 03E00008 */  jr        $ra
-/* D2C37C 8024064C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s
deleted file mode 100644
index cf8cb93fce..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240564_D3AB34
-/* D3AB34 80240564 3C03800B */  lui       $v1, %hi(gCameras)
-/* D3AB38 80240568 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D3AB3C 8024056C 94620002 */  lhu       $v0, 2($v1)
-/* D3AB40 80240570 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* D3AB44 80240574 A4620002 */  sh        $v0, 2($v1)
-/* D3AB48 80240578 03E00008 */  jr        $ra
-/* D3AB4C 8024057C 24020002 */   addiu    $v0, $zero, 2
diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c
index eb91a1e40f..5ad3269b51 100644
--- a/src/world/area_flo/flo_21/CE7240.c
+++ b/src/world/area_flo/flo_21/CE7240.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240CD0_CE73D0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c
index d7dd3543b5..3c4ac75a90 100644
--- a/src/world/area_hos/hos_01/A11650.c
+++ b/src/world/area_hos/hos_01/A11650.c
@@ -1,5 +1,5 @@
 #include "hos_01.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DD0_A11650);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C);
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index 99a6c04939..1df8fe4a77 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90);
 ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(0);
 
-    script->varTable[1] = (func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed) * 0.8f;
+    script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c
index 9439c357df..f20c700cd1 100644
--- a/src/world/area_kmr/kmr_03/8C82B0.c
+++ b/src/world/area_kmr/kmr_03/8C82B0.c
@@ -1,7 +1,17 @@
 #include "kmr_03.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240320_8C82B0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240358_8C82E8);
+ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+
+    f32 xDelta = playerStatus->currentSpeed * 5.0f * sin_deg(playerStatus->targetYaw);
+    f32 zDelta = playerStatus->currentSpeed * 5.0f * -cos_deg(playerStatus->targetYaw);
+
+    script->varTable[0] = playerStatus->position.x + xDelta;
+    script->varTable[1] = playerStatus->position.z + zDelta;
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c
index 6b5ee573d8..fcf9e782ba 100644
--- a/src/world/area_kpa/kpa_08/A4CA20.c
+++ b/src/world/area_kpa/kpa_08/A4CA20.c
@@ -1,5 +1,5 @@
 #include "kpa_08.h"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_80240000_A4CA20);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C);
diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c
index 3adb5a4a96..1288757674 100644
--- a/src/world/area_kpa/kpa_09/A4F000.c
+++ b/src/world/area_kpa/kpa_09/A4F000.c
@@ -1,5 +1,5 @@
 #include "kpa_09.h"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_80240000_A4F000);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C);
diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c
index 2860ab05a8..0b94192ece 100644
--- a/src/world/area_kzn/kzn_03/C63A10.c
+++ b/src/world/area_kzn/kzn_03/C63A10.c
@@ -1,6 +1,6 @@
 #include "kzn_03.h"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D00_C63A10);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C);
 
diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c
index c021165caf..ab601cd877 100644
--- a/src/world/area_kzn/kzn_23/C9C610.c
+++ b/src/world/area_kzn/kzn_23/C9C610.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240504_C9C804);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820);
diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c
index f5ce2f9247..52d905b650 100644
--- a/src/world/area_obk/obk_01/BBD1A0.c
+++ b/src/world/area_obk/obk_01/BBD1A0.c
@@ -1,6 +1,6 @@
 #include "obk_01.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240000_BBD1A0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC);
 
diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c
index 4b79d59b6a..72a1fba13b 100644
--- a/src/world/area_obk/obk_05/BCD060.c
+++ b/src/world/area_obk/obk_05/BCD060.c
@@ -1,6 +1,6 @@
 #include "obk_05.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240000_BCD060);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C);
 
diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c
index 00d44b5d14..197dc117a8 100644
--- a/src/world/area_omo/omo_02/D9D4D0.c
+++ b/src/world/area_omo/omo_02/D9D4D0.c
@@ -1,5 +1,5 @@
 #include "omo_02.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_80240000_D9D4D0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC);
diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c
index ad3c064d3b..d99f607597 100644
--- a/src/world/area_omo/omo_03/DA5240.c
+++ b/src/world/area_omo/omo_03/DA5240.c
@@ -1,3 +1,3 @@
 #include "omo_03.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5240", func_80240000_DA5240);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c
index 021fb470e8..e8c05a16e4 100644
--- a/src/world/area_omo/omo_03/DA5260.c
+++ b/src/world/area_omo/omo_03/DA5260.c
@@ -1,6 +1,6 @@
 #include "omo_03.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240020_DA5260);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C);
 
diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c
index 1f1b8f5d20..321a498bc0 100644
--- a/src/world/area_omo/omo_04/DAD400.c
+++ b/src/world/area_omo/omo_04/DAD400.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402BC_DAD6BC);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8);
 
diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c
index 1a028b8506..add620ef94 100644
--- a/src/world/area_omo/omo_06/DB7910.c
+++ b/src/world/area_omo/omo_06/DB7910.c
@@ -1,6 +1,6 @@
 #include "omo_06.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240000_DB7910);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C);
 
diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c
index fd8cdb1857..a80b126f1a 100644
--- a/src/world/area_omo/omo_07/DC01D0.c
+++ b/src/world/area_omo/omo_07/DC01D0.c
@@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431DC_DC048C);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8);
diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c
index 7a5f2089f3..2c60cef685 100644
--- a/src/world/area_omo/omo_08/DC43D0.c
+++ b/src/world/area_omo/omo_08/DC43D0.c
@@ -1,6 +1,6 @@
 #include "omo_08.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240000_DC43D0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC);
 
diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c
index 0c29b20e6b..2ebfd8a10d 100644
--- a/src/world/area_omo/omo_10/DD79B0.c
+++ b/src/world/area_omo/omo_10/DD79B0.c
@@ -1,6 +1,6 @@
 #include "omo_10.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240000_DD79B0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC);
 
diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c
index ae24b76952..f154aae5c8 100644
--- a/src/world/area_omo/omo_16/DEBED0.c
+++ b/src/world/area_omo/omo_16/DEBED0.c
@@ -1,6 +1,6 @@
 #include "omo_16.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240000_DEBED0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC);
 
diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c
index 5631685897..a9cd5069d4 100644
--- a/src/world/area_omo/omo_17/DEEEA0.c
+++ b/src/world/area_omo/omo_17/DEEEA0.c
@@ -1,6 +1,6 @@
 #include "omo_17.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240000_DEEEA0);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC);
 
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 9af80c6844..7b334b26a9 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240634_D2C364);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380);
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index 33450ec0ed..ed38a0c603 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -15,7 +15,7 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34);
+#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50);
 
diff --git a/src/world/common/SetCamera0MoveFlagNeg1.inc.c b/src/world/common/SetCamera0MoveFlagNeg1.inc.c
new file mode 100644
index 0000000000..f8e815371a
--- /dev/null
+++ b/src/world/common/SetCamera0MoveFlagNeg1.inc.c
@@ -0,0 +1,8 @@
+#include "common.h"
+
+static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[0];
+
+    camera->moveFlags &= ~1;
+    return ApiStatus_DONE2;
+}

From fc5dcf43ead9159a06b0ddf4eb52c57c0378e952 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 19:25:07 -0400
Subject: [PATCH 056/101] Camera0MoveFlag1

---
 .../area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s  | 11 -----------
 .../area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s  | 11 -----------
 .../area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s  | 11 -----------
 .../area_obk/obk_05/BCD060/func_8024001C_BCD07C.s  | 11 -----------
 .../area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s  | 13 -------------
 .../area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s  | 11 -----------
 .../area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s  | 14 --------------
 .../area_sam/sam_11/D3A930/func_80240580_D3AB50.s  | 11 -----------
 src/world/area_flo/flo_21/CE7240.c                 |  2 +-
 src/world/area_hos/hos_01/A11650.c                 |  2 +-
 src/world/area_kmr/kmr_03/8C82B0.c                 |  4 ++--
 src/world/area_kpa/kpa_08/A4CA20.c                 |  2 +-
 src/world/area_kpa/kpa_09/A4F000.c                 |  2 +-
 src/world/area_kzn/kzn_03/C63A10.c                 |  4 ++--
 src/world/area_kzn/kzn_23/C9C610.c                 |  2 +-
 src/world/area_obk/obk_01/BBD1A0.c                 |  4 ++--
 src/world/area_obk/obk_05/BCD060.c                 |  4 ++--
 src/world/area_omo/omo_02/D9D4D0.c                 |  4 ++--
 src/world/area_omo/omo_03/DA5240.c                 |  2 +-
 src/world/area_omo/omo_03/DA5260.c                 |  2 +-
 src/world/area_omo/omo_04/DAD400.c                 |  4 ++--
 src/world/area_omo/omo_06/DB7910.c                 |  2 +-
 src/world/area_omo/omo_07/DC01D0.c                 |  4 ++--
 src/world/area_omo/omo_08/DC43D0.c                 |  2 +-
 src/world/area_omo/omo_10/DD79B0.c                 |  2 +-
 src/world/area_omo/omo_16/DEBED0.c                 |  2 +-
 src/world/area_omo/omo_17/DEEEA0.c                 |  2 +-
 src/world/area_sam/sam_07/D2BD30.c                 |  2 +-
 src/world/area_sam/sam_11/D3A930.c                 |  4 ++--
 src/world/common/SetCamera0MoveFlag1.inc.c         |  8 ++++++++
 ...eFlagNeg1.inc.c => UnsetCamera0MoveFlag1.inc.c} |  2 +-
 31 files changed, 38 insertions(+), 123 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
 delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
 delete mode 100644 asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
 delete mode 100644 asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
 create mode 100644 src/world/common/SetCamera0MoveFlag1.inc.c
 rename src/world/common/{SetCamera0MoveFlagNeg1.inc.c => UnsetCamera0MoveFlag1.inc.c} (57%)

diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
deleted file mode 100644
index 591712fcff..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024033C_8C82CC
-/* 8C82CC 8024033C 3C03800B */  lui       $v1, %hi(gCameras)
-/* 8C82D0 80240340 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 8C82D4 80240344 94620002 */  lhu       $v0, 2($v1)
-/* 8C82D8 80240348 34420001 */  ori       $v0, $v0, 1
-/* 8C82DC 8024034C A4620002 */  sh        $v0, 2($v1)
-/* 8C82E0 80240350 03E00008 */  jr        $ra
-/* 8C82E4 80240354 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
deleted file mode 100644
index 02d3b3b4da..0000000000
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242D1C_C63A2C
-/* C63A2C 80242D1C 3C03800B */  lui       $v1, %hi(gCameras)
-/* C63A30 80242D20 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* C63A34 80242D24 94620002 */  lhu       $v0, 2($v1)
-/* C63A38 80242D28 34420001 */  ori       $v0, $v0, 1
-/* C63A3C 80242D2C A4620002 */  sh        $v0, 2($v1)
-/* C63A40 80242D30 03E00008 */  jr        $ra
-/* C63A44 80242D34 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
deleted file mode 100644
index a172df636a..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_BBD1BC
-/* BBD1BC 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* BBD1C0 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BBD1C4 80240024 94620002 */  lhu       $v0, 2($v1)
-/* BBD1C8 80240028 34420001 */  ori       $v0, $v0, 1
-/* BBD1CC 8024002C A4620002 */  sh        $v0, 2($v1)
-/* BBD1D0 80240030 03E00008 */  jr        $ra
-/* BBD1D4 80240034 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
deleted file mode 100644
index 49fe2f9e41..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_BCD07C
-/* BCD07C 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* BCD080 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BCD084 80240024 94620002 */  lhu       $v0, 2($v1)
-/* BCD088 80240028 34420001 */  ori       $v0, $v0, 1
-/* BCD08C 8024002C A4620002 */  sh        $v0, 2($v1)
-/* BCD090 80240030 03E00008 */  jr        $ra
-/* BCD094 80240034 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
deleted file mode 100644
index 0b30e39460..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_D9D4EC
-/* D9D4EC 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* D9D4F0 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D9D4F4 80240024 94620002 */  lhu       $v0, 2($v1)
-/* D9D4F8 80240028 34420001 */  ori       $v0, $v0, 1
-/* D9D4FC 8024002C A4620002 */  sh        $v0, 2($v1)
-/* D9D500 80240030 03E00008 */  jr        $ra
-/* D9D504 80240034 24020002 */   addiu    $v0, $zero, 2
-/* D9D508 80240038 00000000 */  nop       
-/* D9D50C 8024003C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
deleted file mode 100644
index 097155a3cd..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402D8_DAD6D8
-/* DAD6D8 802402D8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DAD6DC 802402DC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DAD6E0 802402E0 94620002 */  lhu       $v0, 2($v1)
-/* DAD6E4 802402E4 34420001 */  ori       $v0, $v0, 1
-/* DAD6E8 802402E8 A4620002 */  sh        $v0, 2($v1)
-/* DAD6EC 802402EC 03E00008 */  jr        $ra
-/* DAD6F0 802402F0 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
deleted file mode 100644
index fabc1ad94e..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431F8_DC04A8
-/* DC04A8 802431F8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DC04AC 802431FC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DC04B0 80243200 94620002 */  lhu       $v0, 2($v1)
-/* DC04B4 80243204 34420001 */  ori       $v0, $v0, 1
-/* DC04B8 80243208 A4620002 */  sh        $v0, 2($v1)
-/* DC04BC 8024320C 03E00008 */  jr        $ra
-/* DC04C0 80243210 24020002 */   addiu    $v0, $zero, 2
-/* DC04C4 80243214 00000000 */  nop       
-/* DC04C8 80243218 00000000 */  nop       
-/* DC04CC 8024321C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
deleted file mode 100644
index 96c12a0374..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240580_D3AB50
-/* D3AB50 80240580 3C03800B */  lui       $v1, %hi(gCameras)
-/* D3AB54 80240584 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D3AB58 80240588 94620002 */  lhu       $v0, 2($v1)
-/* D3AB5C 8024058C 34420001 */  ori       $v0, $v0, 1
-/* D3AB60 80240590 A4620002 */  sh        $v0, 2($v1)
-/* D3AB64 80240594 03E00008 */  jr        $ra
-/* D3AB68 80240598 24020002 */   addiu    $v0, $zero, 2
diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c
index 5ad3269b51..404d858ed5 100644
--- a/src/world/area_flo/flo_21/CE7240.c
+++ b/src/world/area_flo/flo_21/CE7240.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c
index 3c4ac75a90..eca5180865 100644
--- a/src/world/area_hos/hos_01/A11650.c
+++ b/src/world/area_hos/hos_01/A11650.c
@@ -1,5 +1,5 @@
 #include "hos_01.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C);
diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c
index f20c700cd1..37ca47412b 100644
--- a/src/world/area_kmr/kmr_03/8C82B0.c
+++ b/src/world/area_kmr/kmr_03/8C82B0.c
@@ -1,8 +1,8 @@
 #include "kmr_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = PLAYER_STATUS;
diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c
index fcf9e782ba..1ad1f9cf82 100644
--- a/src/world/area_kpa/kpa_08/A4CA20.c
+++ b/src/world/area_kpa/kpa_08/A4CA20.c
@@ -1,5 +1,5 @@
 #include "kpa_08.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C);
diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c
index 1288757674..fb3c753774 100644
--- a/src/world/area_kpa/kpa_09/A4F000.c
+++ b/src/world/area_kpa/kpa_09/A4F000.c
@@ -1,5 +1,5 @@
 #include "kpa_09.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C);
diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c
index 0b94192ece..09e3cb7a5c 100644
--- a/src/world/area_kzn/kzn_03/C63A10.c
+++ b/src/world/area_kzn/kzn_03/C63A10.c
@@ -1,8 +1,8 @@
 #include "kzn_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48);
 
diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c
index ab601cd877..33260463f5 100644
--- a/src/world/area_kzn/kzn_23/C9C610.c
+++ b/src/world/area_kzn/kzn_23/C9C610.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820);
diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c
index 52d905b650..0a42262049 100644
--- a/src/world/area_obk/obk_01/BBD1A0.c
+++ b/src/world/area_obk/obk_01/BBD1A0.c
@@ -1,8 +1,8 @@
 #include "obk_01.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8);
 
diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c
index 72a1fba13b..591aaeda32 100644
--- a/src/world/area_obk/obk_05/BCD060.c
+++ b/src/world/area_obk/obk_05/BCD060.c
@@ -1,8 +1,8 @@
 #include "obk_05.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240038_BCD098);
 
diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c
index 197dc117a8..def33b6ba7 100644
--- a/src/world/area_omo/omo_02/D9D4D0.c
+++ b/src/world/area_omo/omo_02/D9D4D0.c
@@ -1,5 +1,5 @@
 #include "omo_02.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c
index d99f607597..37ce7fa294 100644
--- a/src/world/area_omo/omo_03/DA5240.c
+++ b/src/world/area_omo/omo_03/DA5240.c
@@ -1,3 +1,3 @@
 #include "omo_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c
index e8c05a16e4..d0dd112fba 100644
--- a/src/world/area_omo/omo_03/DA5260.c
+++ b/src/world/area_omo/omo_03/DA5260.c
@@ -1,6 +1,6 @@
 #include "omo_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C);
 
diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c
index 321a498bc0..07f629662a 100644
--- a/src/world/area_omo/omo_04/DAD400.c
+++ b/src/world/area_omo/omo_04/DAD400.c
@@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4);
 
diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c
index add620ef94..7450d9241d 100644
--- a/src/world/area_omo/omo_06/DB7910.c
+++ b/src/world/area_omo/omo_06/DB7910.c
@@ -1,6 +1,6 @@
 #include "omo_06.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C);
 
diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c
index a80b126f1a..81540d7fc0 100644
--- a/src/world/area_omo/omo_07/DC01D0.c
+++ b/src/world/area_omo/omo_07/DC01D0.c
@@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c
index 2c60cef685..e0a48b9c0f 100644
--- a/src/world/area_omo/omo_08/DC43D0.c
+++ b/src/world/area_omo/omo_08/DC43D0.c
@@ -1,6 +1,6 @@
 #include "omo_08.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC);
 
diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c
index 2ebfd8a10d..1e90c216c8 100644
--- a/src/world/area_omo/omo_10/DD79B0.c
+++ b/src/world/area_omo/omo_10/DD79B0.c
@@ -1,6 +1,6 @@
 #include "omo_10.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC);
 
diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c
index f154aae5c8..fbf0379bef 100644
--- a/src/world/area_omo/omo_16/DEBED0.c
+++ b/src/world/area_omo/omo_16/DEBED0.c
@@ -1,6 +1,6 @@
 #include "omo_16.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC);
 
diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c
index a9cd5069d4..029d1fc88f 100644
--- a/src/world/area_omo/omo_17/DEEEA0.c
+++ b/src/world/area_omo/omo_17/DEEEA0.c
@@ -1,6 +1,6 @@
 #include "omo_17.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC);
 
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 7b334b26a9..4a0ca9b280 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380);
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index ed38a0c603..a37071aeaf 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -15,9 +15,9 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C);
 
diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/SetCamera0MoveFlag1.inc.c
new file mode 100644
index 0000000000..2f4cb9fd5e
--- /dev/null
+++ b/src/world/common/SetCamera0MoveFlag1.inc.c
@@ -0,0 +1,8 @@
+#include "common.h"
+
+static ApiStatus SetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[0];
+
+    camera->moveFlags |= 1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/SetCamera0MoveFlagNeg1.inc.c b/src/world/common/UnsetCamera0MoveFlag1.inc.c
similarity index 57%
rename from src/world/common/SetCamera0MoveFlagNeg1.inc.c
rename to src/world/common/UnsetCamera0MoveFlag1.inc.c
index f8e815371a..e5ae2007c7 100644
--- a/src/world/common/SetCamera0MoveFlagNeg1.inc.c
+++ b/src/world/common/UnsetCamera0MoveFlag1.inc.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
-static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) {
+static ApiStatus UnsetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
     Camera* camera = &gCameras[0];
 
     camera->moveFlags &= ~1;

From 476701e55201775a310611727eacef227ea94735 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Fri, 30 Oct 2020 23:41:09 +0000
Subject: [PATCH 057/101] rebuild assets.bin when sources.mk changes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 06896b9546..53c762314b 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ $(BUILD_DIR)/bin/assets/%: bin/assets/%.bin
 	@mkdir -p $(shell dirname $@)
 	@cp $< $@
 
-$(ASSETS_BIN): $(ASSET_FILES) $(YAY0_ASSET_FILES)
+$(ASSETS_BIN): sources.mk $(ASSET_FILES) $(YAY0_ASSET_FILES)
 	@mkdir -p $(shell dirname $@)
 	@echo "building $@"
 	@$(PYTHON) tools/build_assets_bin.py $@ $(ASSET_FILES)

From f0c4df447a974f71ec1a771e64e5a7142d37c25a Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Fri, 30 Oct 2020 23:41:49 +0000
Subject: [PATCH 058/101] squash warnings

---
 src/world/world.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/world.c b/src/world/world.c
index e735380720..46153a777a 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -79,7 +79,7 @@ INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* d
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);
 
-#define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), &area##_maps, "area_" #area, jp_name }
+#define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), area##_maps, "area_" #area, jp_name }
 
 #define MAP(map) \
     .id = #map, \

From 90641b1b064ecd0e853827e01d5e3420cd08534e Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 19:42:25 -0400
Subject: [PATCH 059/101] kmr_03

---
 .../kmr_03/8C7F90/func_80240000_8C7F90.s      | 109 ------------------
 src/world/area_kmr/kmr_03/8C7F90.c            |  45 +++++++-
 2 files changed, 44 insertions(+), 110 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s

diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s
deleted file mode 100644
index 28b50c38c4..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_8C7F90
-/* 8C7F90 80240000 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8C7F94 80240004 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8C7F98 80240008 0080902D */  daddu     $s2, $a0, $zero
-/* 8C7F9C 8024000C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8C7FA0 80240010 00A0882D */  daddu     $s1, $a1, $zero
-/* 8C7FA4 80240014 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 8C7FA8 80240018 AFB40020 */  sw        $s4, 0x20($sp)
-/* 8C7FAC 8024001C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8C7FB0 80240020 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8C7FB4 80240024 8E50000C */  lw        $s0, 0xc($s2)
-/* 8C7FB8 80240028 8E050000 */  lw        $a1, ($s0)
-/* 8C7FBC 8024002C 0C0B1EAF */  jal       get_variable
-/* 8C7FC0 80240030 26100004 */   addiu    $s0, $s0, 4
-/* 8C7FC4 80240034 0240202D */  daddu     $a0, $s2, $zero
-/* 8C7FC8 80240038 8E050000 */  lw        $a1, ($s0)
-/* 8C7FCC 8024003C 0C0B1EAF */  jal       get_variable
-/* 8C7FD0 80240040 0040802D */   daddu    $s0, $v0, $zero
-/* 8C7FD4 80240044 0200202D */  daddu     $a0, $s0, $zero
-/* 8C7FD8 80240048 0C00EAD2 */  jal       get_npc_safe
-/* 8C7FDC 8024004C 0040A02D */   daddu    $s4, $v0, $zero
-/* 8C7FE0 80240050 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* 8C7FE4 80240054 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* 8C7FE8 80240058 12200006 */  beqz      $s1, .L80240074
-/* 8C7FEC 8024005C 0040802D */   daddu    $s0, $v0, $zero
-/* 8C7FF0 80240060 82620012 */  lb        $v0, 0x12($s3)
-/* 8C7FF4 80240064 54400003 */  bnel      $v0, $zero, .L80240074
-/* 8C7FF8 80240068 AE400070 */   sw       $zero, 0x70($s2)
-/* 8C7FFC 8024006C 24020002 */  addiu     $v0, $zero, 2
-/* 8C8000 80240070 AE420070 */  sw        $v0, 0x70($s2)
-.L80240074:
-/* 8C8004 80240074 8E430070 */  lw        $v1, 0x70($s2)
-/* 8C8008 80240078 24110001 */  addiu     $s1, $zero, 1
-/* 8C800C 8024007C 10710013 */  beq       $v1, $s1, .L802400CC
-/* 8C8010 80240080 28620002 */   slti     $v0, $v1, 2
-/* 8C8014 80240084 10400005 */  beqz      $v0, .L8024009C
-/* 8C8018 80240088 24020002 */   addiu    $v0, $zero, 2
-/* 8C801C 8024008C 10600009 */  beqz      $v1, .L802400B4
-/* 8C8020 80240090 0000102D */   daddu    $v0, $zero, $zero
-/* 8C8024 80240094 08090059 */  j         .L80240164
-/* 8C8028 80240098 00000000 */   nop      
-.L8024009C:
-/* 8C802C 8024009C 10620013 */  beq       $v1, $v0, .L802400EC
-/* 8C8030 802400A0 24020003 */   addiu    $v0, $zero, 3
-/* 8C8034 802400A4 1062001E */  beq       $v1, $v0, .L80240120
-/* 8C8038 802400A8 0000102D */   daddu    $v0, $zero, $zero
-/* 8C803C 802400AC 08090059 */  j         .L80240164
-/* 8C8040 802400B0 00000000 */   nop      
-.L802400B4:
-/* 8C8044 802400B4 0C03AC5A */  jal       func_800EB168
-/* 8C8048 802400B8 0000202D */   daddu    $a0, $zero, $zero
-/* 8C804C 802400BC 2402001E */  addiu     $v0, $zero, 0x1e
-/* 8C8050 802400C0 AE420074 */  sw        $v0, 0x74($s2)
-/* 8C8054 802400C4 08090058 */  j         .L80240160
-/* 8C8058 802400C8 AE510070 */   sw       $s1, 0x70($s2)
-.L802400CC:
-/* 8C805C 802400CC 8E420074 */  lw        $v0, 0x74($s2)
-/* 8C8060 802400D0 2403FFFF */  addiu     $v1, $zero, -1
-/* 8C8064 802400D4 2442FFFF */  addiu     $v0, $v0, -1
-/* 8C8068 802400D8 14430021 */  bne       $v0, $v1, .L80240160
-/* 8C806C 802400DC AE420074 */   sw       $v0, 0x74($s2)
-/* 8C8070 802400E0 24020002 */  addiu     $v0, $zero, 2
-/* 8C8074 802400E4 08090058 */  j         .L80240160
-/* 8C8078 802400E8 AE420070 */   sw       $v0, 0x70($s2)
-.L802400EC:
-/* 8C807C 802400EC 0200202D */  daddu     $a0, $s0, $zero
-/* 8C8080 802400F0 00141600 */  sll       $v0, $s4, 0x18
-/* 8C8084 802400F4 00021543 */  sra       $v0, $v0, 0x15
-/* 8C8088 802400F8 02621021 */  addu      $v0, $s3, $v0
-/* 8C808C 802400FC A2740012 */  sb        $s4, 0x12($s3)
-/* 8C8090 80240100 0C03BD17 */  jal       clear_partner_move_history
-/* 8C8094 80240104 A0510014 */   sb       $s1, 0x14($v0)
-/* 8C8098 80240108 82640012 */  lb        $a0, 0x12($s3)
-/* 8C809C 8024010C 0C03ACA9 */  jal       func_800EB2A4
-/* 8C80A0 80240110 00000000 */   nop      
-/* 8C80A4 80240114 24020003 */  addiu     $v0, $zero, 3
-/* 8C80A8 80240118 08090058 */  j         .L80240160
-/* 8C80AC 8024011C AE420070 */   sw       $v0, 0x70($s2)
-.L80240120:
-/* 8C80B0 80240120 0C00EAD2 */  jal       get_npc_safe
-/* 8C80B4 80240124 2404FFFC */   addiu    $a0, $zero, -4
-/* 8C80B8 80240128 8E05000C */  lw        $a1, 0xc($s0)
-/* 8C80BC 8024012C 0C00ECD0 */  jal       set_npc_yaw
-/* 8C80C0 80240130 0040202D */   daddu    $a0, $v0, $zero
-/* 8C80C4 80240134 0200202D */  daddu     $a0, $s0, $zero
-/* 8C80C8 80240138 8E020000 */  lw        $v0, ($s0)
-/* 8C80CC 8024013C 2403FFFB */  addiu     $v1, $zero, -5
-/* 8C80D0 80240140 00431024 */  and       $v0, $v0, $v1
-/* 8C80D4 80240144 0C00EAFF */  jal       disable_npc_shadow
-/* 8C80D8 80240148 AE020000 */   sw       $v0, ($s0)
-/* 8C80DC 8024014C 3C01C47A */  lui       $at, 0xc47a
-/* 8C80E0 80240150 44810000 */  mtc1      $at, $f0
-/* 8C80E4 80240154 24020002 */  addiu     $v0, $zero, 2
-/* 8C80E8 80240158 08090059 */  j         .L80240164
-/* 8C80EC 8024015C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240160:
-/* 8C80F0 80240160 0000102D */  daddu     $v0, $zero, $zero
-.L80240164:
-/* 8C80F4 80240164 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 8C80F8 80240168 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8C80FC 8024016C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8C8100 80240170 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8C8104 80240174 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8C8108 80240178 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8C810C 8024017C 03E00008 */  jr        $ra
-/* 8C8110 80240180 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index 1df8fe4a77..dd8ae718af 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -1,6 +1,49 @@
 #include "kmr_03.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90);
+ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerData* playerData = PLAYER_DATA;
+    NpcId npcID = get_variable(script, *args++);
+    PartnerId partnerID = get_variable(script, *args++);
+    Npc* npc = get_npc_safe(npcID);
+
+    if (isInitialCall) {
+        if (gPlayerData.currentPartner == PartnerId_NONE) {
+            script->functionTemp[0].s = 2;
+        } else {
+            script->functionTemp[0].s = 0;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800EB168(0);
+            script->functionTemp[1].s = 30;
+            script->functionTemp[0].s = 1;
+            break;
+        case 1:
+            script->functionTemp[1].s--;
+            if (script->functionTemp[1].s == -1) {
+                script->functionTemp[0].s = 2;
+            }
+            break;
+        case 2:
+            playerData->currentPartner = partnerID;
+            playerData->partners[partnerID].enabled = TRUE;
+            clear_partner_move_history(npc);
+            func_800EB2A4(playerData->currentPartner);
+            script->functionTemp[0].s = 3;
+            break;
+        case 3:
+            set_npc_yaw(get_npc_safe(NpcId_PARTNER), npc->yaw);
+            npc->flags &= ~4;
+            disable_npc_shadow(npc);
+            npc->pos.y = -1000.0f;
+            return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 

From d86cb5cb2773c193c464aec3a5df8d6ea4ebfe56 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 00:14:49 +0000
Subject: [PATCH 060/101] improve disasm_map.py output

---
 tools/disasm_map.py | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/tools/disasm_map.py b/tools/disasm_map.py
index 842912d30b..970d462d96 100755
--- a/tools/disasm_map.py
+++ b/tools/disasm_map.py
@@ -43,14 +43,17 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
                 bytes.read(0x10)
 
                 main,entry_list,entry_count = unpack(">IIi", bytes.read(4 * 3))
-                out += f"    .main = M(Main)\n"
-                out += f"    .entryList = M(entryList)\n"
-                out += f"    .entryCount = {entry_count}, // prefer ENTRY_COUNT(M(entryList)) if it matches\n"
+                out += f"    .main = M(Main),\n"
+                out += f"    .entryList = M(entryList),\n"
+                out += f"    .entryCount = ENTRY_COUNT(M(entryList)),\n"
 
                 bytes.read(0x1C)
 
                 bg,tattle = unpack(">II", bytes.read(4 * 2))
-                out += f"    .background = {'&gBackgroundImage' if bg == 0x80200000 else 'NULL'},\n"
+                if bg == 0x80200000:
+                    out += f"    .background = &gBackgroundImage,\n"
+                elif bg != 0:
+                    raise Exception(f"unknown MapConfig background {bg:X}")
                 out += f"    .tattle = {tattle:X},\n"
 
                 out += f"}};\n"
@@ -63,7 +66,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
                     word = int.from_bytes(bytes.read(4), byteorder="big")
 
                     if word in symbol_map:
-                        out += f" M({symbol_map[word]}),"
+                        out += f" {symbol_map[word]},"
                     else:
                         out += f" 0x{word:08X},"
 
@@ -94,6 +97,7 @@ def parse_midx(file, prefix = ""):
         if len(s) == 5:
             if s[0] == "$Start": continue
             if s[0] == "$End": continue
+
             structs.append({
                 "name": prefix + name_struct(s[0]),
                 "type": s[1],
@@ -134,8 +138,23 @@ def name_struct(s):
     s = s[1:].replace("???", "unk")
 
     # use ThisCase for scripts
-    if s.startswith("$Script"):
-        return s[0].upper() + s[1:]
+    if s.startswith("Script_"):
+        s = s[7].upper() + s[8:]
+
+        # if `s` is hex, prefix it with Script_ again
+        try:
+            int(s, 16)
+            return "Script_" + s
+        except Exception:
+            pass
+
+        if s.startswith("Main"):
+            return "Main"
+
+        return s
+
+    if s.startswith("ASCII"):
+        return s
 
     return s[0].lower() + s[1:]
 
@@ -155,7 +174,7 @@ if __name__ == "__main__":
 
     symbol_map = {}
     for struct in midx:
-        symbol_map[struct["vaddr"]] = struct["name"]
+        symbol_map[struct["vaddr"]] = "M(" + struct["name"] + ")"
 
     bin_dir = f"bin/world/{area_name}/{map_name}"
     src_dir = f"src/world/{area_name}/{map_name}"
@@ -184,5 +203,8 @@ if __name__ == "__main__":
 
         if filetype == "bin":
             with open(f"{bin_dir}/{rom_addr:X}.bin", "rb") as bytes:
-                print(f"// {rom_addr:X}")
-                print(disassemble(bytes, rom_addr - rom_start, midx, symbol_map, map_name))
+                disasm = disassemble(bytes, rom_addr - rom_start, midx, symbol_map, map_name)
+
+                if len(disasm.strip()) > 0:
+                    with open(f"{src_dir}/{rom_addr:X}.bin.c", "w") as f:
+                        f.write(disasm)

From 91f3517b8652c6fb3086a69a355ac8aa0e1bb482 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 00:28:23 +0000
Subject: [PATCH 061/101] parse ASCII structs

---
 tools/disasm_map.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/disasm_map.py b/tools/disasm_map.py
index 970d462d96..6e68c556b4 100755
--- a/tools/disasm_map.py
+++ b/tools/disasm_map.py
@@ -3,7 +3,9 @@
 import sys
 import os
 import yaml
+import json
 from struct import unpack
+
 from disasm_script import disassemble as disassemble_script
 
 def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
@@ -57,6 +59,15 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
                 out += f"    .tattle = {tattle:X},\n"
 
                 out += f"}};\n"
+            elif struct["type"] == "ASCII":
+                string_data = bytes.read(struct["length"]).decode("ascii")
+
+                # strip null terminator(s)
+                while string_data[-1] == "\0":
+                    string_data = string_data[:-1]
+
+                string_literal = json.dumps(string_data)
+                out += f"const char M({struct['name']})[] = {string_literal};"
             else: # unknown type of struct
                 out += f"s32 M({name})[] = {{"
                 for i in range(0, struct["length"], 4):

From 21ab7fed6ca137b576c5e28c974b71b96d8fb31a Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 02:28:18 +0000
Subject: [PATCH 062/101] new dsl syntax

---
 Makefile                    |   4 +-
 tools/compile_dsl_macros.py |  97 +++++-
 tools/disasm_map.py         |  17 +-
 tools/disasm_script.py      | 598 ++++++++++++++++++++++++------------
 4 files changed, 513 insertions(+), 203 deletions(-)

diff --git a/Makefile b/Makefile
index ece296eab5..06a8a51d95 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
-$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
+$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py
 	@mkdir -p $(shell dirname $@)
 	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
@@ -151,7 +151,7 @@ $(BUILD_DIR)/bin/assets/%: bin/assets/%.bin
 	@mkdir -p $(shell dirname $@)
 	@cp $< $@
 
-$(ASSETS_BIN): $(ASSET_FILES) $(YAY0_ASSET_FILES)
+$(ASSETS_BIN): $(ASSET_FILES) $(YAY0_ASSET_FILES) sources.mk
 	@mkdir -p $(shell dirname $@)
 	@echo "building $@"
 	@$(PYTHON) tools/build_assets_bin.py $@ $(ASSET_FILES)
diff --git a/tools/compile_dsl_macros.py b/tools/compile_dsl_macros.py
index d62cab7d29..fa759bd752 100755
--- a/tools/compile_dsl_macros.py
+++ b/tools/compile_dsl_macros.py
@@ -29,17 +29,18 @@ script_parser = Lark(r"""
     block: "{" NEWLINE* (stmt STMT_SEP)* NEWLINE* "}"
 
     ?stmt: call
-         | label ":"            -> label_decl
+         | label ":" [stmt]     -> label_decl
          | "goto" label         -> label_goto
          | if_stmt
          | "return"             -> return_stmt
          | "break"              -> break_stmt
          | "sleep" expr         -> sleep_stmt
+         | "sleep" expr "secs"  -> sleep_secs_stmt
          | "spawn" expr         -> spawn_stmt
          | "await" expr         -> await_stmt
          | lhs "=" "spawn" expr -> spawn_set_stmt
          | lhs set_op expr      -> set_stmt
-         | lhs ":=" expr        -> set_const_stmt
+         | "const" lhs set_op expr -> set_const_stmt
          | bind_stmt
          | bind_set_stmt
          | "unbind"             -> unbind_stmt
@@ -49,12 +50,19 @@ script_parser = Lark(r"""
          | kill_stmt
          | loop_stmt
          | loop_until_stmt
+         | ["await"] block     -> block_stmt
+         | "spawn" block       -> spawn_block_stmt
+         | "parallel" block    -> parallel_block_stmt
 
     call: CNAME "(" [expr ("," expr)* [","]] ")"
 
     if_stmt: "if" expr if_op expr block ["else" block]
     ?if_op: "==" -> if_op_eq
           | "!=" -> if_op_ne
+          | ">" -> if_op_gt
+          | "<" -> if_op_lt
+          | ">=" -> if_op_ge
+          | "<=" -> if_op_le
 
     suspend_stmt: "suspend" control_type expr ("," control_type expr)* [","]
     resume_stmt: "resume" control_type expr ("," control_type expr)* [","]
@@ -84,6 +92,11 @@ script_parser = Lark(r"""
            | "*=" -> set_op_mul
            | "/=" -> set_op_div
            | "%=" -> set_op_mod
+           | "&=" -> set_op_and
+           | "|=" -> set_op_or
+           | ":=" -> set_op_eq_const
+           | ":&=" -> set_op_and_const
+           | ":|=" -> set_op_or_const
 
     c_const_expr: c_const_expr_internal
     c_const_expr_internal: "(" (c_const_expr_internal | NOT_PARENS)+ ")"
@@ -175,6 +188,22 @@ class LoopUntilCtx(CmdCtx):
     def break_opcode(self, meta):
         raise CompileError("breaking out of a loop..until is not supported (hint: use a label)", meta)
 
+class LabelCtx(CmdCtx):
+    def __init__(self, label):
+        super().__init__()
+        self.label = label
+
+    # TODO: implement break_opcode so you can do lbl: loop { break lbl }
+
+class BlockCtx(CmdCtx):
+    pass
+
+class SpawnCtx(CmdCtx):
+    pass
+
+class ParallelCtx(CmdCtx):
+    pass
+
 class CompileError(Exception):
     def __init__(self, message, meta):
         super().__init__(message)
@@ -255,6 +284,10 @@ class Compile(Transformer):
         return [ Cmd(op, a, b, meta=tree.meta), *block, Cmd(0x13) ]
     def if_op_eq(self, tree): return 0x0A
     def if_op_ne(self, tree): return 0x0B
+    def if_op_lt(self, tree): return 0x0C
+    def if_op_gt(self, tree): return 0x0D
+    def if_op_le(self, tree): return 0x0E
+    def if_op_ge(self, tree): return 0x0F
 
     def loop_stmt(self, tree):
         expr = tree.children.pop(0) if len(tree.children) > 1 else 0
@@ -336,6 +369,8 @@ class Compile(Transformer):
 
     def sleep_stmt(self, tree):
         return Cmd(0x08, tree.children[0], meta=tree.meta)
+    def sleep_secs_stmt(self, tree):
+        return Cmd(0x09, tree.children[0], meta=tree.meta)
 
     def bind_stmt(self, tree):
         script, trigger, target = tree.children
@@ -366,12 +401,16 @@ class Compile(Transformer):
                 raise CompileError(f"operation `{opcodes['__op__']}' not supported for ints", tree.meta)
         return Cmd(opcode, lhs, rhs)
     def set_const_stmt(self, tree):
-        lhs, rhs = tree.children
-        return Cmd(0x25, lhs, rhs)
+        lhs, opcodes, rhs = tree.children
+        opcode = opcodes.get("const", None)
+        if not opcode:
+            raise CompileError(f"operation `{opcodes['__op__']}' not supported for consts", tree.meta)
+        return Cmd(opcode, lhs, rhs)
     def set_op_eq(self, tree):
         return {
             "__op__": "=",
             "int": 0x24,
+            "const": 0x25,
             "float": 0x26,
         }
     def set_op_add(self, tree):
@@ -403,10 +442,37 @@ class Compile(Transformer):
             "__op__": "%",
             "int": 0x2B,
         }
+    def set_op_and(self, tree):
+        return {
+            "__op__": "&",
+            "int": 0x3F,
+            "const": 0x41,
+        }
+    def set_op_or(self, tree):
+        return {
+            "__op__": "|",
+            "int": 0x40,
+            "const": 0x42,
+        }
 
     def label_decl(self, tree):
-        label = tree.children[0]
-        return Cmd(0x03, label, meta=tree.meta)
+        if len(tree.children) == 0:
+            label = tree.children[0]
+            return Cmd(0x03, label, meta=tree.meta)
+        else:
+            label, cmd_or_block = tree.children
+
+            if type(cmd_or_block) is not list:
+                cmd_or_block = [cmd_or_block]
+
+            for cmd in cmd_or_block:
+                if isinstance(cmd, BaseCmd):
+                    cmd.add_context(LabelCtx(label))
+
+            return [
+                Cmd(0x03, label, meta=tree.meta),
+                *cmd_or_block
+            ]
     def label_goto(self, tree):
         label = tree.children[0]
         return Cmd(0x04, label, meta=tree.meta)
@@ -416,6 +482,25 @@ class Compile(Transformer):
             return self.alloc.labels.index(name)
         raise CompileError(f"label `{name}' is undeclared", tree.meta)
 
+    def block_stmt(self, tree):
+        block, = tree.children
+        for cmd in block:
+            if isinstance(cmd, BaseCmd):
+                cmd.add_context(BlockCtx())
+        return block
+    def spawn_block_stmt(self, tree):
+        block, = tree.children
+        for cmd in block:
+            if isinstance(cmd, BaseCmd):
+                cmd.add_context(SpawnCtx())
+        return [ Cmd(0x56, meta=tree.meta), *block, Cmd(0x57) ]
+    def parallel_block_stmt(self, tree):
+        block, = tree.children
+        for cmd in block:
+            if isinstance(cmd, BaseCmd):
+                cmd.add_context(ParallelCtx())
+        return [ Cmd(0x58, meta=tree.meta), *block, Cmd(0x59) ]
+
 def compile_script(s):
     tree = script_parser.parse(s)
 
diff --git a/tools/disasm_map.py b/tools/disasm_map.py
index 6e68c556b4..3c3bbb993a 100755
--- a/tools/disasm_map.py
+++ b/tools/disasm_map.py
@@ -6,7 +6,7 @@ import yaml
 import json
 from struct import unpack
 
-from disasm_script import disassemble as disassemble_script
+import disasm_script
 
 def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
     out = ""
@@ -15,6 +15,9 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
     while len(midx) > 0:
         struct = midx.pop(0)
         name = struct["name"]
+
+        print(name)
+
         if name == "Script_Main": name = f"M(Main)"
 
         #print(f"{offset:X} ({name}, start = {struct['start']:X}, len = {struct['length']:X})")
@@ -28,7 +31,12 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
 
             # format struct
             if struct["type"].startswith("Script"):
-                out += disassemble_script(bytes, f"M({name})", symbol_map)
+                pos = bytes.tell()
+                try:
+                    out += disasm_script.ScriptDSLDisassembler(bytes, f"M({name})", symbol_map).disassemble()
+                except disasm_script.UnsupportedScript as e:
+                    bytes.seek(pos)
+                    out += disasm_script.ScriptDisassembler(bytes, f"M({name})", symbol_map).disassemble()
             elif struct["type"] == "Padding":
                 # nops at end of file
                 bytes.seek(offset % 4, 1)
@@ -56,7 +64,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"):
                     out += f"    .background = &gBackgroundImage,\n"
                 elif bg != 0:
                     raise Exception(f"unknown MapConfig background {bg:X}")
-                out += f"    .tattle = {tattle:X},\n"
+                out += f"    .tattle = 0x{tattle:X},\n"
 
                 out += f"}};\n"
             elif struct["type"] == "ASCII":
@@ -218,4 +226,5 @@ if __name__ == "__main__":
 
                 if len(disasm.strip()) > 0:
                     with open(f"{src_dir}/{rom_addr:X}.bin.c", "w") as f:
-                        f.write(disasm)
+                        f.write(f'#include "{map_name}.h"\n\n')
+                        f.write(disasm.rstrip() + "\n")
diff --git a/tools/disasm_script.py b/tools/disasm_script.py
index 33c834df2a..0c5ffc9ac4 100755
--- a/tools/disasm_script.py
+++ b/tools/disasm_script.py
@@ -2,17 +2,19 @@
 
 import sys
 
-_star_rod_lib = None
-def star_rod_lib():
-    global _star_rod_lib
+_script_lib = None
+def script_lib():
+    global _script_lib
 
-    if not _star_rod_lib:
-        _star_rod_lib = {}
+    if not _script_lib:
+        _script_lib = {}
 
         from pathlib import Path
         from os import path
         import re
 
+        # star rod database
+        """
         LIB_LINE_RE = re.compile(r"\s+:\s+")
         NAME_RE = re.compile(r"({[^}]*})?\s*([a-zA-Z0-9_]+)")
 
@@ -28,46 +30,71 @@ def star_rod_lib():
                             if name := NAME_RE.match(parts[2]):
                                 name = name.group(2)
 
-                                _star_rod_lib[vaddr] = name
-
-                                """
-                                if "map" in str(filename):
-                                    if kind == "api":
-                                        print(f"ApiStatus {name}(ScriptInstance* script, s32 isInitialCall);")
-                                    elif kind == "scr":
-                                        print(f"extern Script {name};")
-                                """
+                                _script_lib[vaddr] = name
                         except:
                             pass
+        """
 
-    return _star_rod_lib
+        # symbol_addrs.txt
+        with open(Path(path.dirname(__file__), "symbol_addrs.txt"), "r") as file:
+            for line in file.readlines():
+                s = line.split(";")
+                name = s[0]
+                addr = s[1]
+                _script_lib[int(addr, 16)] = name
 
-def disassemble(bytes, script_name = "script", symbol_map = {}):
-    out = ""
-    prefix = ""
+    return _script_lib
 
-    indent = 1
-    indent_used = False
+class ScriptDisassembler:
+    def __init__(self, bytes, script_name = "script", symbol_map = {}):
+        self.bytes = bytes
+        self.script_name = script_name
+        self.symbol_map = symbol_map
 
-    def write_line(line):
-        nonlocal out, indent, indent_used
-        if indent < 0: indent = 0
-        if indent > 1: indent_used = True
-        out += "    " * indent
-        out += line
-        out += "\n"
-    def prefix_line(line):
-        nonlocal prefix
-        prefix += line
-        prefix += "\n"
+        self.out = ""
+        self.prefix = ""
 
-    def var(arg):
-        if arg in symbol_map:
-            return symbol_map[arg]
+        self.indent = 1
+        self.indent_used = False
+
+        self.done = False
+
+    def disassemble(self):
+        while True:
+            opcode = self.read_word()
+            argc = self.read_word()
+
+            if opcode > 0xFF or argc > 0xFF:
+                raise Exception(f"script '{script_name}' is malformed")
+
+            argv = []
+            for i in range(0, argc):
+                argv.append(self.read_word())
+
+            self.disassemble_command(opcode, argc, argv)
+
+            if self.done:
+                return self.prefix + self.out
+
+    def write_line(self, line):
+        if self.indent < 0: self.indent = 0
+        if self.indent > 1: self.indent_used = True
+
+        self.out += "    " * self.indent
+        self.out += line
+        self.out += "\n"
+
+    def prefix_line(self, line):
+        self.prefix += line
+        self.prefix += "\n"
+
+    def var(self, arg):
+        if arg in self.symbol_map:
+            return self.symbol_map[arg]
 
         v = arg - 2**32 # convert to s32
         if v > -250000000:
-            if v <= -220000000: return f"SI_FIXED({(v + 230000000) / 1024}f)"
+            if v <= -220000000: return f"SI_FIXED({(v + 230000000) / 1024})"
             elif v <= -200000000: return f"SI_ARRAY_FLAG({v + 210000000})"
             elif v <= -180000000: return f"SI_ARRAY({v + 190000000})"
             elif v <= -160000000: return f"SI_SAVE_VAR({v + 170000000})"
@@ -86,12 +113,12 @@ def disassemble(bytes, script_name = "script", symbol_map = {}):
         else:
             return f"{arg}"
 
-    def addr_ref(addr):
-        if addr in symbol_map:
-            return symbol_map[addr]
-        return star_rod_lib().get(addr, f"0x{addr:08X}")
+    def addr_ref(self, addr):
+        if addr in self.symbol_map:
+            return self.symbol_map[addr]
+        return script_lib().get(addr, f"0x{addr:08X}")
 
-    def trigger(trigger):
+    def trigger(self, trigger):
         if trigger == 0x00000080: trigger = "TriggerFlag_FLOOR_TOUCH"
         if trigger == 0x00800000: trigger = "TriggerFlag_FLOOR_ABOVE"
         if trigger == 0x00000800: trigger = "TriggerFlag_FLOOR_INTERACT"
@@ -106,206 +133,391 @@ def disassemble(bytes, script_name = "script", symbol_map = {}):
         if trigger == 0x00100000: trigger = "TriggerFlag_BOMB"
         return trigger
 
-    def read_word():
-        return int.from_bytes(bytes.read(4), byteorder="big")
-
-    while True:
-        opcode = read_word()
-        argc = read_word()
-
-        if opcode > 0xFF or argc > 0xFF:
-            return f"/* malformed script: {script_name} */\n"
-
-        argv = []
-        for i in range(0, argc):
-            argv.append(read_word())
+    def read_word(self):
+        return int.from_bytes(self.bytes.read(4), byteorder="big")
 
+    def disassemble_command(self, opcode, argc, argv):
         if opcode == 0x01:
-            write_line("SI_END(),")
-            indent -= 1
+            self.write_line("SI_END(),")
+            self.indent -= 1
 
-            if indent_used:
-                prefix_line("// *INDENT-OFF*")
-                prefix_line(f"Script {script_name} = {{")
-                write_line("};")
-                write_line("// *INDENT-ON*")
+            if self.indent_used:
+                self.prefix_line("// *INDENT-OFF*")
+                self.prefix_line(f"Script {self.script_name} = {{")
+                self.write_line("};")
+                self.write_line("// *INDENT-ON*")
             else:
-                prefix_line(f"Script {script_name} = {{")
-                write_line("};")
+                self.prefix_line(f"Script {self.script_name} = {{")
+                self.write_line("};")
 
-            return prefix + out
-        elif opcode == 0x02: write_line(f"SI_RETURN(),")
-        elif opcode == 0x03: write_line(f"SI_LABEL({var(argv[0])}),")
-        elif opcode == 0x04: write_line(f"SI_GOTO({var(argv[0])}),")
+            self.done = True
+        elif opcode == 0x02: self.write_line(f"SI_RETURN(),")
+        elif opcode == 0x03: self.write_line(f"SI_LABEL({self.var(argv[0])}),")
+        elif opcode == 0x04: self.write_line(f"SI_GOTO({self.var(argv[0])}),")
         elif opcode == 0x05:
-            write_line(f"SI_LOOP({var(argv[0])}),")
-            indent += 1
+            self.write_line(f"SI_LOOP({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x06:
-            indent -= 1
-            write_line("SI_END_LOOP(),")
-        elif opcode == 0x07: write_line(f"SI_BREAK_LOOP(),")
-        elif opcode == 0x08: write_line(f"SI_WAIT_FRAMES({var(argv[0])}),")
-        elif opcode == 0x09: write_line(f"SI_WAIT_SECS({var(argv[0])}),")
+            self.indent -= 1
+            self.write_line("SI_END_LOOP(),")
+        elif opcode == 0x07: self.write_line(f"SI_BREAK_LOOP(),")
+        elif opcode == 0x08: self.write_line(f"SI_WAIT_FRAMES({self.var(argv[0])}),")
+        elif opcode == 0x09: self.write_line(f"SI_WAIT_SECS({self.var(argv[0])}),")
         elif opcode == 0x0A:
-            write_line(f"SI_IF_EQ({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_EQ({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x0B:
-            write_line(f"SI_IF_NE({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_NE({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x0C:
-            write_line(f"SI_IF_LT({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_LT({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x0D:
-            write_line(f"SI_IF_GT({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_GT({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x0E:
-            write_line(f"SI_IF_LE({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_LE({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x0F:
-            write_line(f"SI_IF_GE({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_GE({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x10:
-            write_line(f"SI_IF_BITS_ON({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
+            self.write_line(f"SI_IF_BITS_ON({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
         elif opcode == 0x11:
-            write_line(f"SI_IF_BITS_OFF({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
-        elif opcode == 0x12: write_line(f"SI_ELSE(),")
+            self.write_line(f"SI_IF_BITS_OFF({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
+        elif opcode == 0x12:
+            self.indent -= 1
+            self.write_line(f"SI_ELSE(),")
+            self.indent += 1
         elif opcode == 0x13:
-            indent -= 1
-            write_line(f"SI_END_IF(),")
+            self.indent -= 1
+            self.write_line(f"SI_END_IF(),")
         elif opcode == 0x14:
-            write_line(f"SI_SWITCH({var(argv[0])}),")
-            indent += 2
+            self.write_line(f"SI_SWITCH({self.var(argv[0])}),")
+            self.indent += 2
         elif opcode == 0x15:
-            write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),")
-            indent += 2
+            self.write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),")
+            self.indent += 2
         elif opcode == 0x16:
-            indent -= 1
-            write_line(f"SI_CASE_EQ({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_EQ({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x17:
-            indent -= 1
-            write_line(f"SI_CASE_NE({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_NE({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x18:
-            indent -= 1
-            write_line(f"SI_CASE_LT({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_LT({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x19:
-            indent -= 1
-            write_line(f"SI_CASE_GT({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_GT({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x1A:
-            indent -= 1
-            write_line(f"SI_CASE_LE({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_LE({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x1B:
-            indent -= 1
-            write_line(f"SI_CASE_GE({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_GE({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x1C:
-            indent -= 1
-            write_line(f"SI_CASE_DEFAULT(),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_DEFAULT(),")
+            self.indent += 1
         elif opcode == 0x1D:
-            indent -= 1
-            write_line(f"SI_CASE_OR_EQ({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_OR_EQ({self.var(argv[0])}),")
+            self.indent += 1
         # opcode 0x1E?
         elif opcode == 0x1F:
-            indent -= 1
-            write_line(f"SI_CASE_BITS_ON({var(argv[0])}),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_CASE_BITS_ON({self.var(argv[0])}),")
+            self.indent += 1
         elif opcode == 0x20:
-            indent -= 1
-            write_line(f"SI_END_MULTI_CASE(),")
-            indent += 1
+            self.indent -= 1
+            self.write_line(f"SI_END_MULTI_CASE(),")
+            self.indent += 1
         elif opcode == 0x21:
-            indent -= 1
-            write_line(f"SI_CASE_RANGE({var(argv[0])}, {var(argv[1])}),")
-            indent += 1
-        elif opcode == 0x22: write_line(f"SI_BREAK_CASE(),")
+            self.indent -= 1
+            self.write_line(f"SI_CASE_RANGE({self.var(argv[0])}, {self.var(argv[1])}),")
+            self.indent += 1
+        elif opcode == 0x22: self.write_line(f"SI_BREAK_CASE(),")
         elif opcode == 0x23:
-            indent -= 2
-            write_line(f"SI_END_SWITCH(),")
-        elif opcode == 0x24: write_line(f"SI_SET({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x25: write_line(f"SI_SET_CONST({var(argv[0])}, 0x{argv[1]:X}),")
-        elif opcode == 0x26: write_line(f"SI_SET_F({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x27: write_line(f"SI_ADD({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x28: write_line(f"SI_SUB({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x29: write_line(f"SI_MUL({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2A: write_line(f"SI_DIV({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2B: write_line(f"SI_MOD({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2C: write_line(f"SI_ADD_F({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2D: write_line(f"SI_SUB_F({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2E: write_line(f"SI_MUL_F({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x2F: write_line(f"SI_DIV_F({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x30: write_line(f"SI_USE_BUFFER({var(argv[0])}),")
+            self.indent -= 2
+            self.write_line(f"SI_END_SWITCH(),")
+        elif opcode == 0x24: self.write_line(f"SI_SET({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x25: self.write_line(f"SI_SET_CONST({self.var(argv[0])}, 0x{argv[1]:X}),")
+        elif opcode == 0x26: self.write_line(f"SI_SET_F({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x27: self.write_line(f"SI_ADD({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x28: self.write_line(f"SI_SUB({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x29: self.write_line(f"SI_MUL({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2A: self.write_line(f"SI_DIV({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2B: self.write_line(f"SI_MOD({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2C: self.write_line(f"SI_ADD_F({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2D: self.write_line(f"SI_SUB_F({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2E: self.write_line(f"SI_MUL_F({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x2F: self.write_line(f"SI_DIV_F({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x30: self.write_line(f"SI_USE_BUFFER({self.var(argv[0])}),")
         # TODO: SI_BUF commands
-        elif opcode == 0x3C: write_line(f"SI_USE_ARRAY({var(argv[0])}),")
-        elif opcode == 0x3D: write_line(f"SI_NEW_ARRAY({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x3E: write_line(f"SI_USE_FLAGS({var(argv[0])}),")
-        elif opcode == 0x3F: write_line(f"SI_AND({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x40: write_line(f"SI_OR({var(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x41: write_line(f"SI_AND_CONST({var(argv[0])}, 0x{argv[1]:X})")
-        elif opcode == 0x42: write_line(f"SI_OR_CONST({var(argv[0])}, 0x{argv[1]:X})")
+        elif opcode == 0x3C: self.write_line(f"SI_USE_ARRAY({self.var(argv[0])}),")
+        elif opcode == 0x3D: self.write_line(f"SI_NEW_ARRAY({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x3E: self.write_line(f"SI_USE_FLAGS({self.var(argv[0])}),")
+        elif opcode == 0x3F: self.write_line(f"SI_AND({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x40: self.write_line(f"SI_OR({self.var(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x41: self.write_line(f"SI_AND_CONST({self.var(argv[0])}, 0x{argv[1]:X})")
+        elif opcode == 0x42: self.write_line(f"SI_OR_CONST({self.var(argv[0])}, 0x{argv[1]:X})")
         elif opcode == 0x43:
             argv_str = ""
             for arg in argv[1:]:
                 argv_str += ", "
-                argv_str += var(arg)
+                argv_str += self.var(arg)
 
-            write_line(f"SI_CALL({addr_ref(argv[0])}{argv_str}),")
-        elif opcode == 0x44: write_line(f"SI_EXEC({addr_ref(argv[0])}),")
-        elif opcode == 0x45: write_line(f"SI_EXEC_GET_ID({addr_ref(argv[0])}, {var(argv[1])}),")
-        elif opcode == 0x46: write_line(f"SI_EXEC_WAIT({addr_ref(argv[0])}),")
+            self.write_line(f"SI_CALL({self.addr_ref(argv[0])}{argv_str}),")
+        elif opcode == 0x44: self.write_line(f"SI_EXEC({self.addr_ref(argv[0])}),")
+        elif opcode == 0x45: self.write_line(f"SI_EXEC_GET_ID({self.addr_ref(argv[0])}, {self.var(argv[1])}),")
+        elif opcode == 0x46: self.write_line(f"SI_EXEC_WAIT({self.addr_ref(argv[0])}),")
         elif opcode == 0x47:
-            if argv[3] != 1:
-                raise "BIND argv[3] != 1"
-
-            write_line(f"SI_BIND({addr_ref(argv[0])}, {trigger(argv[1])}, {var(argv[2])}, {'NULL' if argv[4] == 0 else var(argv[4])}),")
-        elif opcode == 0x48: write_line(f"SI_UNBIND_ME(),")
-        elif opcode == 0x49: write_line(f"SI_KILL({var(argv[0])}),")
-        elif opcode == 0x4A: write_line(f"SI_JUMP({var(argv[0])}),")
-        elif opcode == 0x4B: write_line(f"SI_PRIORITY({var(argv[0])}),")
-        elif opcode == 0x4C: write_line(f"SI_TIMESCALE({var(argv[0])}),")
-        elif opcode == 0x4D: write_line(f"SI_GROUP({var(argv[0])}),")
+            assert argv[3] == 1
+            self.write_line(f"SI_BIND({self.addr_ref(argv[0])}, {self.trigger(argv[1])}, {self.var(argv[2])}, {'NULL' if argv[4] == 0 else self.var(argv[4])}),")
+        elif opcode == 0x48: self.write_line(f"SI_UNBIND_ME(),")
+        elif opcode == 0x49: self.write_line(f"SI_KILL({self.var(argv[0])}),")
+        elif opcode == 0x4A: self.write_line(f"SI_JUMP({self.var(argv[0])}),")
+        elif opcode == 0x4B: self.write_line(f"SI_PRIORITY({self.var(argv[0])}),")
+        elif opcode == 0x4C: self.write_line(f"SI_TIMESCALE({self.var(argv[0])}),")
+        elif opcode == 0x4D: self.write_line(f"SI_GROUP({self.var(argv[0])}),")
         elif opcode == 0x4E:
-            if argv[4] != 0:
-                raise "BIND_PADLOCK argv[4] != NULL"
-            if argv[5] != 1:
-                raise "BIND_PADLOCK argv[5] != 1"
-
-            write_line(f"SI_BIND_PADLOCK({addr_ref(argv[0])}, {trigger(argv[1])}, {var(argv[2])}, {var(argv[3])}),")
-        elif opcode == 0x4F: write_line(f"SI_SUSPEND_GROUP({var(argv[0])}),")
-        elif opcode == 0x50: write_line(f"SI_RESUME_GROUP({var(argv[0])}),")
-        elif opcode == 0x51: write_line(f"SI_SUSPEND_GROUP_NOT_ME({var(argv[0])}),")
-        elif opcode == 0x52: write_line(f"SI_RESUME_GROUP_NOT_ME({var(argv[0])}),")
-        elif opcode == 0x53: write_line(f"SI_SUSPEND({var(argv[0])}),")
-        elif opcode == 0x54: write_line(f"SI_RESUME({var(argv[0])}),")
-        elif opcode == 0x55: write_line(f"SI_EXISTS({var(argv[0])}),")
+            assert argv[4] == 0
+            assert argv[5] == 1
+            self.write_line(f"SI_BIND_PADLOCK({self.addr_ref(argv[0])}, {self.trigger(argv[1])}, {self.var(argv[2])}, {self.var(argv[3])}),")
+        elif opcode == 0x4F: self.write_line(f"SI_SUSPEND_GROUP({self.var(argv[0])}),")
+        elif opcode == 0x50: self.write_line(f"SI_RESUME_GROUP({self.var(argv[0])}),")
+        elif opcode == 0x51: self.write_line(f"SI_SUSPEND_GROUP_NOT_ME({self.var(argv[0])}),")
+        elif opcode == 0x52: self.write_line(f"SI_RESUME_GROUP_NOT_ME({self.var(argv[0])}),")
+        elif opcode == 0x53: self.write_line(f"SI_SUSPEND({self.var(argv[0])}),")
+        elif opcode == 0x54: self.write_line(f"SI_RESUME({self.var(argv[0])}),")
+        elif opcode == 0x55: self.write_line(f"SI_EXISTS({self.var(argv[0])}),")
         elif opcode == 0x56:
-            write_line("SI_THREAD(),")
-            indent += 1
+            self.write_line("SI_THREAD(),")
+            self.indent += 1
         elif opcode == 0x57:
-            indent -= 1
-            write_line("SI_END_THREAD(),")
+            self.indent -= 1
+            self.write_line("SI_END_THREAD(),")
         elif opcode == 0x58:
-            write_line("SI_CHILD_THREAD(),")
-            indent += 1
+            self.write_line("SI_CHILD_THREAD(),")
+            self.indent += 1
         elif opcode == 0x59:
-            indent -= 1
-            write_line("SI_END_CHILD_THREAD(),")
+            self.indent -= 1
+            self.write_line("SI_END_CHILD_THREAD(),")
         else:
             # unknown opcode
             argv_str = ""
             for arg in argv:
                 argv_str += ", "
                 argv_str += f"0x{arg:X}"
-            write_line(f"SI_CMD(0x{opcode:02X}{argv_str}),")
+            self.write_line(f"SI_CMD(0x{opcode:02X}{argv_str}),")
 
-    raise "Reached end of data before END command"
+class UnsupportedScript(Exception):
+    pass
+
+class ScriptDSLDisassembler(ScriptDisassembler):
+    def var(self, arg):
+        if arg in self.symbol_map:
+            return self.symbol_map[arg]
+
+        v = arg - 2**32 # convert to s32
+        if v > -250000000:
+            if v <= -220000000: return str((v + 230000000) / 1024)
+            elif v <= -200000000: return f"SI_ARRAY_FLAG({v + 210000000})"
+            elif v <= -180000000: return f"SI_ARRAY({v + 190000000})"
+            elif v <= -160000000: return f"SI_SAVE_VAR({v + 170000000})"
+            elif v <= -140000000: return f"SI_AREA_VAR({v + 150000000})"
+            elif v <= -120000000: return f"SI_SAVE_FLAG({v + 130000000})"
+            elif v <= -100000000: return f"SI_AREA_FLAG({v + 110000000})"
+            elif v <= -80000000: return f"SI_MAP_FLAG({v + 90000000})"
+            elif v <= -60000000: return f"SI_FLAG({v + 70000000})"
+            elif v <= -40000000: return f"SI_MAP_VAR({v + 50000000})"
+            elif v <= -20000000: return f"SI_VAR({v + 30000000})"
+
+        if arg == 0xFFFFFFFF:
+            return "-1"
+        elif ((arg & 0xFF000000) == 0x80000000) or arg > 10000:
+            return f"0x{arg:X}"
+        else:
+            return f"{arg}"
+
+    def verify_float(self, var):
+        try:
+            float(var)
+        except Exception:
+            # not a float!
+            raise UnsupportedScript("non-float used in float command")
+
+        return var
+
+    def disassemble_command(self, opcode, argc, argv):
+        if opcode == 0x01:
+            if self.out.endswith("return\n"):
+                # implicit return; break
+                self.out = self.out[:-7].rstrip() + "\n"
+            else:
+                self.write_line("break")
+
+            self.indent -= 1
+
+            self.prefix_line(f"Script {self.script_name} = SCRIPT({{")
+            self.write_line("});")
+
+            self.done = True
+        elif opcode == 0x02: self.write_line(f"return")
+        elif opcode == 0x03: self.write_line(f"lbl{self.var(argv[0])}:")
+        elif opcode == 0x04: self.write_line(f"goto lbl{self.var(argv[0])}")
+        elif opcode == 0x05:
+            if argv[0] == 0:
+                self.write_line("loop {")
+            else:
+                self.write_line(f"loop {self.var(argv[0])} {{")
+            self.indent += 1
+        elif opcode == 0x06:
+            self.indent -= 1
+            self.write_line("}")
+        elif opcode == 0x07: self.write_line(f"break")
+        elif opcode == 0x08: self.write_line(f"sleep {self.var(argv[0])}")
+        elif opcode == 0x09: self.write_line(f"sleep {self.var(argv[0])} secs")
+        elif opcode == 0x0A:
+            self.write_line(f"if {self.var(argv[0])} == {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x0B:
+            self.write_line(f"if {self.var(argv[0])} != {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x0C:
+            self.write_line(f"if {self.var(argv[0])} < {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x0D:
+            self.write_line(f"if {self.var(argv[0])} > {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x0E:
+            self.write_line(f"if {self.var(argv[0])} <= {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x0F:
+            self.write_line(f"if {self.var(argv[0])} >= {self.var(argv[1])} {{")
+            self.indent += 1
+        elif opcode == 0x12:
+            self.indent -= 1
+            self.write_line("} else {")
+            self.indent += 1
+        elif opcode == 0x13:
+            self.indent -= 1
+            self.write_line("}")
+        # elif opcode == 0x14:
+        #     self.write_line(f"SI_SWITCH({self.var(argv[0])}),")
+        #     self.indent += 2
+        # elif opcode == 0x15:
+        #     self.write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),")
+        #     self.indent += 2
+        # elif opcode == 0x16:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_EQ({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x17:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_NE({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x18:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_LT({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x19:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_GT({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x1A:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_LE({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x1B:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_GE({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x1C:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_DEFAULT(),")
+        #     self.indent += 1
+        # elif opcode == 0x1D:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_OR_EQ({self.var(argv[0])}),")
+        #     self.indent += 1
+        # # opcode 0x1E?
+        # elif opcode == 0x1F:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_CASE_BITS_ON({self.var(argv[0])}),")
+        #     self.indent += 1
+        # elif opcode == 0x20:
+        #     self.indent -= 1
+        #     self.write_line(f"SI_END_MULTI_CASE(),")
+        #     self.indent += 1
+        # elif opcode == 0x21:
+        #     self.indent -= 1
+        #     self.write_line(f"case {self.var(argv[0])}..{self.var(argv[1])}:")
+        #     self.indent += 1
+        # elif opcode == 0x22: self.write_line("break")
+        # elif opcode == 0x23:
+        #     self.indent -= 2
+        #     self.write_line("}")
+        elif opcode == 0x24: self.write_line(f"{self.var(argv[0])} = {self.var(argv[1])}")
+        elif opcode == 0x25: self.write_line(f"const {self.var(argv[0])} = 0x{argv[1]:X}")
+        elif opcode == 0x26: self.write_line(f"{self.var(argv[0])} = {self.verify_float(self.var(argv[1]))}")
+        elif opcode == 0x27: self.write_line(f"{self.var(argv[0])} += {self.var(argv[1])}")
+        elif opcode == 0x28: self.write_line(f"{self.var(argv[0])} -= {self.var(argv[1])}")
+        elif opcode == 0x29: self.write_line(f"{self.var(argv[0])} *= {self.var(argv[1])}")
+        elif opcode == 0x2A: self.write_line(f"{self.var(argv[0])} /= {self.var(argv[1])}")
+        elif opcode == 0x2B: self.write_line(f"{self.var(argv[0])} %= {self.var(argv[1])}")
+        elif opcode == 0x2C: self.write_line(f"{self.var(argv[0])} += {self.verify_float(self.var(argv[1]))}")
+        elif opcode == 0x2D: self.write_line(f"{self.var(argv[0])} -= {self.verify_float(self.var(argv[1]))}")
+        elif opcode == 0x2E: self.write_line(f"{self.var(argv[0])} *= {self.verify_float(self.var(argv[1]))}")
+        elif opcode == 0x2F: self.write_line(f"{self.var(argv[0])} /= {self.verify_float(self.var(argv[1]))}")
+        elif opcode == 0x3F: self.write_line(f"{self.var(argv[0])} &= {self.var(argv[1])}")
+        elif opcode == 0x40: self.write_line(f"{self.var(argv[0])} |= {self.var(argv[1])}")
+        elif opcode == 0x41: self.write_line(f"const {self.var(argv[0])} &= {argv[1]:X})")
+        elif opcode == 0x42: self.write_line(f"const {self.var(argv[0])} |= {argv[1]:X})")
+        elif opcode == 0x43:
+            argv_str = ", ".join(self.var(arg) for arg in argv[1:])
+            self.write_line(f"{self.addr_ref(argv[0])}({argv_str})")
+        elif opcode == 0x44: self.write_line(f"spawn {self.addr_ref(argv[0])}")
+        elif opcode == 0x45: self.write_line(f"{self.var(argv[1])} = spawn ({self.addr_ref(argv[0])}")
+        elif opcode == 0x46: self.write_line(f"await {self.addr_ref(argv[0])}")
+        elif opcode == 0x47:
+            assert argv[3] == 1
+            if argv[4] != 0:
+                self.write_line(f"{self.var(argv[4])} = bind {self.addr_ref(argv[0])} to {self.trigger(argv[1])} {self.var(argv[2])}")
+            else:
+                self.write_line(f"bind {self.addr_ref(argv[0])} to {self.trigger(argv[1])} {self.var(argv[2])}")
+        elif opcode == 0x48: self.write_line(f"unbind")
+        elif opcode == 0x49: self.write_line(f"kill {self.var(argv[0])}")
+        elif opcode == 0x4D: self.write_line(f"group {self.var(argv[0])}")
+        elif opcode == 0x4F: self.write_line(f"suspend group {self.var(argv[0])}")
+        elif opcode == 0x50: self.write_line(f"resume group {self.var(argv[0])}")
+        elif opcode == 0x51: self.write_line(f"suspend others {self.var(argv[0])}")
+        elif opcode == 0x52: self.write_line(f"resume others {self.var(argv[0])}")
+        elif opcode == 0x53: self.write_line(f"suspend {self.var(argv[0])}")
+        elif opcode == 0x54: self.write_line(f"resume {self.var(argv[0])}")
+        elif opcode == 0x56:
+            self.write_line("spawn {")
+            self.indent += 1
+        elif opcode == 0x57:
+            self.indent -= 1
+            self.write_line("}")
+        elif opcode == 0x58:
+            self.write_line("parallel {")
+            self.indent += 1
+        elif opcode == 0x59:
+            self.indent -= 1
+            self.write_line("}")
+        else:
+            raise UnsupportedScript(f"DSL does not support script opcode {opcode:X}")
 
 if __name__ == "__main__":
     if len(sys.argv) <= 1:
@@ -317,4 +529,8 @@ if __name__ == "__main__":
 
     with open(file, "rb") as f:
         f.seek(offset)
-        print(disassemble(f), end="")
+
+        try:
+            print(ScriptDSLDisassembler(f).disassemble(), end="")
+        except UnsupportedScript:
+            print(ScriptDisassembler(f).disassemble(), end="")

From edfc6e8cf56000e39a9adecacf011047d2419044 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 04:46:57 +0000
Subject: [PATCH 063/101] remove 'this is right'

lol
---
 tools/splat.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/splat.yaml b/tools/splat.yaml
index 12669b66e4..6653b3a659 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -4888,7 +4888,7 @@ segments:
   - name: world/area_dgb/dgb_02/
     type: code
     overlay: True
-    start: 0xC2EBA0 # this is right
+    start: 0xC2EBA0
     vram: 0x80240000
     files:
       - [0xC2EBA0, "c"]

From efc303a70d2d8add93b308bc54f25a3f633f31bf Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 04:49:04 +0000
Subject: [PATCH 064/101] avoid #including all map headers in world.c

---
 src/world/world.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/world/world.c b/src/world/world.c
index 46153a777a..6b3558a438 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -2,9 +2,6 @@
 #include "ld_addrs.h"
 #include "map.h"
 
-#include "world/area_kmr/kmr_12/kmr_12.h"
-#undef MAP_NAME
-
 INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
 
 INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84);
@@ -141,6 +138,7 @@ static Map kgr_maps[] = {
 };
 
 /// Goomba Region
+MapConfig kmr_12_config;
 static Map kmr_maps[] = {
     { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .flags = 1 },
     { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" },

From 0e383a411b2d3b7564c2753e161b117e89c9051e Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 31 Oct 2020 11:44:24 -0400
Subject: [PATCH 065/101] kmr_03 data OK but messy

---
 include/messages.h                 |   1 +
 src/world/area_kmr/kmr_03/8C7F90.c |  26 ++-
 src/world/area_kmr/kmr_03/8C8140.c | 312 +++++++++++++++++++++++++++
 src/world/area_kmr/kmr_03/8C83A0.c | 333 +++++++++++++++++++++++++++++
 src/world/area_kmr/kmr_03/kmr_03.h |   4 +
 tools/splat.yaml                   |  15 +-
 6 files changed, 678 insertions(+), 13 deletions(-)
 create mode 100644 src/world/area_kmr/kmr_03/8C8140.c

diff --git a/include/messages.h b/include/messages.h
index d119c08963..a7fea9666f 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -34,6 +34,7 @@ typedef s32 MessageID;
 // 18 Gossip Bulletin
 
 // 19 Map Tattles
+#define MessageID_TATTLE_KMR_03 MESSAGE_ID(0x19, 0x3B)
 #define MessageID_TATTLE_KMR_12 MESSAGE_ID(0x19, 0x40)
 
 // 1A NPC Tattles
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index dd8ae718af..2a88dc5cc8 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -1,5 +1,7 @@
 #include "kmr_03.h"
 
+Script M(Main);
+
 ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     PlayerData* playerData = PLAYER_DATA;
@@ -47,11 +49,23 @@ ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 
-ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) {
-    Npc* npc = get_npc_unsafe(0);
+// 8C85E0
+EntryList M(entryList) = {
+    { -340.0f, 0.0f, 348.0f, 48.0f },
+    { 480.0f, 0.0f, 0.0f, 270.0f },
+    { -310.0f, 20.0f, -80.0f, 135.0f },
+};
 
-    script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f;
-    return ApiStatus_DONE2;
-}
+MapConfig M(config) = {
+    .main = M(Main),
+    .entryList = M(entryList),
+    .entryCount = ENTRY_COUNT(M(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = MessageID_TATTLE_KMR_03,
+};
 
-#include "world/common/UnkPositionFunc.inc.c"
+Script M(script_802406C0) = {
+    SI_CALL(SetMusicTrack, 0, 17, 0, 8),
+    SI_RETURN(),
+    SI_END(),
+};
diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c
new file mode 100644
index 0000000000..331f63b956
--- /dev/null
+++ b/src/world/area_kmr/kmr_03/8C8140.c
@@ -0,0 +1,312 @@
+#include "kmr_03.h"
+
+s32 M(npcGroupList_80241450)[];
+Script M(script_MakeEntities);
+Script M(script_802422B8);
+Script M(script_80242340);
+
+ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(0);
+
+    script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f;
+    return ApiStatus_DONE2;
+}
+
+#include "world/common/UnkPositionFunc.inc.c"
+
+// 8C8680
+Script M(script_ExitWalk_802406F0) = {
+    SI_GROUP(27),
+    SI_CALL(0x802D216C, 60, 0),
+    SI_EXEC(0x80285CF4),
+    SI_CALL(0x802CA400, "kmr_04", 0),
+    SI_WAIT_FRAMES(100),
+    SI_RETURN(),
+    SI_END(),
+};
+
+Script M(script_ExitWalk_8024074C) = {
+    SI_GROUP(27),
+    SI_CALL(0x802D216C, 60, 1),
+    SI_EXEC(0x80285CF4),
+    SI_CALL(0x802CA400, "kmr_05", 0),
+    SI_WAIT_FRAMES(100),
+    SI_RETURN(),
+    SI_END(),
+};
+
+Script M(script_802407A8) = {
+    SI_BIND(M(script_ExitWalk_802406F0), 524288, 3, NULL),
+    SI_BIND(M(script_ExitWalk_8024074C), 524288, 5, NULL),
+    SI_RETURN(),
+    SI_END(),
+};
+
+// *INDENT-OFF*
+Script M(Main) = {
+    SI_SET(SI_SAVE_VAR(425), 30),
+    SI_CALL(0x802D9700, -1),
+    SI_CALL(0x802CA828, 0, 3, 25, 16, 4096),
+    SI_CALL(0x802CAD98, 0, 0, 0, 0),
+    SI_CALL(0x802CA6C0, 0, 1),
+    SI_CALL(0x802CB680, 0, 0),
+    SI_SET(SI_AREA_FLAG(8), 0),
+    SI_CALL(0x80044298, 0, M(npcGroupList_80241450)),
+    SI_CALL(0x80045640),
+    SI_EXEC_WAIT(M(script_MakeEntities)),
+    SI_EXEC_WAIT(M(script_802422B8)),
+    SI_EXEC(M(script_802406C0)),
+    SI_CALL(0x802CA460, SI_VAR(0)),
+    SI_IF_NE(SI_VAR(0), 2),
+        SI_SET(SI_VAR(0), M(script_802407A8)),
+        SI_EXEC(0x80285960),
+        SI_ELSE(),
+        SI_EXEC(M(script_802407A8)),
+        SI_EXEC(M(script_80242340)),
+    SI_END_IF(),
+    SI_WAIT_FRAMES(1),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+s32 padding[] = {0, 0};
+
+// 8C88E0
+s32 M(npcSettings_80240950)[] = {
+    0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00630010,
+};
+
+// *INDENT-OFF*
+Script M(script_8024097C) = {
+    SI_LABEL(1),
+    SI_IF_EQ(SI_AREA_FLAG(8), 1),
+        SI_LABEL(100),
+        SI_CALL(0x802D4A5C, 294, 123, 170),
+        SI_CALL(0x80044CF0, 0, 0),
+        SI_CALL(0x802D0E28, 1),
+        SI_CALL(0x802CE01C, 0, SI_FIXED(4.0f)),
+        SI_CALL(0x802CE0F4, 0, 0x9D0003),
+        SI_CALL(func_802401B0_8C8140),
+        SI_CALL(0x802D4830, 0, SI_VAR(2)),
+        SI_LOOP(SI_VAR(1)),
+            SI_CALL(0x802CF0F4, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)),
+            SI_CALL(0x802D4B14, SI_VAR(7), SI_VAR(9), SI_FIXED(4.0f), SI_VAR(2)),
+            SI_CALL(0x802CDCB0, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)),
+            SI_WAIT_FRAMES(1),
+        SI_END_LOOP(),
+        SI_CALL(0x802D1B04, 0, 3),
+        SI_CALL(0x802D1024, SI_FIXED(3.0f)),
+        SI_CALL(0x802D1134, 243, 243, 0),
+        SI_CALL(0x80045320, 0, 0, 1),
+        SI_CALL(0x80044CF0, 0, 1),
+        SI_CALL(0x802D0E28, 0),
+        SI_GOTO(100),
+    SI_END_IF(),
+    SI_WAIT_FRAMES(1),
+    SI_GOTO(1),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script M(script_NpcAI_80240B50) = {
+    SI_LABEL(1),
+    SI_SWITCH(SI_SAVE_VAR(0)),
+        SI_CASE_EQ(0xFFFFFF86),
+            SI_LABEL(89),
+            SI_CALL(UnkPositionFunc, 0xFFFFFF8A, 86, 0xFFFFFFBA, 0xFFFFFFF1),
+            SI_WAIT_FRAMES(1),
+            SI_IF_EQ(SI_VAR(0), 0),
+                SI_GOTO(89),
+            SI_END_IF(),
+            SI_CALL(0x802D0E28, 1),
+            SI_CALL(0x80044DA4, 0, 0),
+            SI_CALL(0x802D01AC, 0, 610, 0),
+            SI_CALL(0x802D78A0, 0, 0, 45, 15, 1, 0, 0, 0, 0),
+            SI_WAIT_FRAMES(15),
+            SI_CALL(0x802CECC8, -1, 5),
+            SI_WAIT_FRAMES(10),
+            SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A6),
+            SI_CALL(0x802CB860, 0, 0xFFFFFF24, 20, 0xFFFFFFB8),
+            SI_CALL(0x802CBE2C, 0, 0xFFFFFFEC, 0, 68),
+            SI_CALL(0x802CBB48, 0, SI_FIXED(15.0f), SI_FIXED(-8.5f)),
+            SI_CALL(0x802CBBE4, 0, 275),
+            SI_CALL(0x802CBEF0, 0, SI_FIXED(1.5f)),
+            SI_CALL(0x802CB79C, 0, 0, 1),
+            SI_THREAD(),
+                SI_WAIT_FRAMES(20),
+                SI_CALL(0x802D1024, SI_FIXED(2.0f)),
+                SI_CALL(0x802D1134, 0xFFFFFFDA, 68, 0),
+            SI_END_THREAD(),
+            SI_CALL(0x802CF0F4, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)),
+            SI_CALL(0x802CE01C, 0, SI_FIXED(4.0f)),
+            SI_CALL(0x802CE0F4, 0, 0x9D0003),
+            SI_CALL(0x802CE22C, 0, 0, 70, 0),
+            SI_CALL(0x802CE0F4, 0, 0x9D0001),
+            SI_CALL(0x802CEB04, 0, 276, 20),
+            SI_WAIT_FRAMES(30),
+            SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A7),
+            SI_WAIT_FRAMES(5),
+            SI_CALL(0x802D1084, 0x80007),
+            SI_WAIT_FRAMES(30),
+            SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A8),
+            SI_CALL(func_80240000_8C7F90, 0, 5),
+            SI_SET(SI_SAVE_VAR(0), 0xFFFFFF87),
+            SI_CALL(0x802CB860, 0, 0xFFFFFF24, 20, 0xFFFFFFB8),
+            SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
+            SI_CALL(0x802CB79C, 0, 0, 1),
+            SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+            SI_CALL(0x802CB79C, 0, 0, 0),
+            SI_CALL(0x802CF52C),
+            SI_CALL(0x802D0E28, 0),
+            SI_WAIT_FRAMES(1),
+    SI_END_SWITCH(),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script M(script_Hit_80240F64) = {
+    SI_CALL(0x802CE0F4, -1, 0x9D0007),
+    SI_WAIT_FRAMES(10),
+    SI_CALL(0x802CE0F4, -1, 0x9D0001),
+    SI_ADD(SI_MAP_VAR(0), 1),
+    SI_IF_LT(SI_MAP_VAR(0), 3),
+        SI_CALL(0x80044600, SI_VAR(0)),
+        SI_SWITCH(SI_VAR(0)),
+            SI_CASE_EQ(2),
+                SI_CALL(0x80045320, 0, 0, 1),
+                SI_IF_EQ(SI_AREA_FLAG(6), 1),
+                    SI_ELSE(),
+                    SI_SET(SI_AREA_FLAG(6), 1),
+                    SI_SET(SI_AREA_FLAG(7), 0),
+                SI_END_IF(),
+            SI_CASE_EQ(4),
+                SI_CALL(0x80045320, 0, 0, 1),
+                SI_IF_EQ(SI_AREA_FLAG(7), 1),
+                    SI_ELSE(),
+                    SI_SET(SI_AREA_FLAG(6), 0),
+                    SI_SET(SI_AREA_FLAG(7), 1),
+                SI_END_IF(),
+        SI_END_SWITCH(),
+        SI_WAIT_FRAMES(10),
+        SI_CALL(0x802CE0F4, -1, 0x9D0003),
+        SI_ELSE(),
+        SI_WAIT_FRAMES(10),
+        SI_CALL(0x802CF0F4, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CDCB0, 0xFFFFFFFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CF060, 0xFFFFFFFC, 512, 1),
+        SI_CALL(0x802CDCB0, 0, 0, 0xFFFFFC18, 0),
+        SI_CALL(0x802CF060, 0, 256, 0),
+        SI_CALL(0x802CF52C),
+        SI_CALL(0x80044DA4, -1, M(script_8024097C)),
+        SI_CALL(0x80044A78, -1, M(script_NpcAI_80240B50)),
+    SI_END_IF(),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script M(script_Init_802411A8) = {
+    SI_CALL(0x80044BAC, -1, M(script_NpcAI_80240B50)),
+    SI_CALL(0x80044EB8, -1, M(script_8024097C)),
+    SI_CALL(0x80045140, -1, M(script_Hit_80240F64)),
+    SI_SWITCH(SI_SAVE_VAR(0)),
+        SI_CASE_GE(0xFFFFFF87),
+            SI_CALL(0x802CF060, -1, 512, 0),
+            SI_CALL(0x802CF060, -1, 8, 1),
+            SI_CALL(0x802CDCB0, -1, 0, 0xFFFFFC18, 0),
+    SI_END_SWITCH(),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+s32 M(npcGroup_80241260)[] = {
+    0x00000000, M(npcSettings_80240950), 0xC2480000, 0x00000000, 0x42A00000, 0x00400105, M(script_Init_802411A8), 0x00000000,
+    0x00000000, 0x0000002D, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000,
+    0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003,
+    0x00000000, 0x00000000, 0x00000000, 0x001A0063,
+};
+
+s32 M(npcGroupList_80241450)[] = {
+    0x00000001, M(npcGroup_80241260), 0x00020000, 0x00000000, 0x00000000, 0x00000000,
+};
+
+s32 padding2[] = {0, 0};
+
+// 8C9400
+Script M(script_80241470) = {
+    SI_CALL(0x802C9DCC, 0, 9, 0x7FFFFE00),
+    SI_SET(SI_SAVE_VAR(0), 0xFFFFFF8B),
+    SI_RETURN(),
+    SI_END(),
+};
+
+Script M(script_802414A8) = {
+    SI_SET(SI_SAVE_FLAG(54), 1),
+    SI_RETURN(),
+    SI_END(),
+};
+
+Script M(script_802414C8) = {
+    SI_LABEL(0),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CALL(0x802CAF2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_WAIT_FRAMES(1),
+    SI_GOTO(0),
+    SI_RETURN(),
+    SI_END(),
+};
+
+// *INDENT-OFF*
+Script M(script_MakeEntities) = {
+    SI_IF_LT(SI_SAVE_VAR(0), 0xFFFFFF8B),
+        SI_CALL(0x80111D38, 0x802EA10C, 45, 0, 70, 15, 0x80000000),
+        SI_CALL(0x80111FB0, M(script_80241470)),
+        SI_ELSE(),
+        SI_CALL(0x802C9DCC, 0, 9, 0x7FFFFE00),
+    SI_END_IF(),
+    SI_IF_EQ(SI_SAVE_FLAG(54), 0),
+        SI_CALL(0x80111D38, 0x802EA19C, 230, 0, 310, 15, 0x80000000),
+        SI_CALL(0x80111FB0, M(script_802414A8)),
+    SI_END_IF(),
+    SI_CALL(0x80111D38, 0x802EA588, 230, 60, 310, 15, 151, 0x80000000),
+    SI_CALL(0x8011206C, SI_SAVE_FLAG(52)),
+    SI_CALL(0x80111D38, 0x802EA0C4, 230, 50, 0xFFFFFF60, 15, 0x80000000),
+    SI_CALL(0x80111D38, 0x802EA0C4, 165, 0, 380, 20, 0x80000000),
+    SI_CALL(0x80111D38, 0x802EA564, 0xFFFFFF56, 0, 370, 43, 343, 0x80000000),
+    SI_CALL(0x8011206C, SI_SAVE_FLAG(50)),
+    SI_CALL(0x80111D38, 0x802EAA54, 345, 75, 0xFFFFFF06, 0, 100, 0x80000000),
+    SI_CALL(0x802D6CC0, 343, 345, 205, 0xFFFFFF06, 17, SI_SAVE_FLAG(56)),
+    SI_CALL(0x802D6CC0, 343, 345, 230, 0xFFFFFF06, 17, SI_SAVE_FLAG(57)),
+    SI_CALL(0x802D6CC0, 343, 345, 255, 0xFFFFFF06, 17, SI_SAVE_FLAG(58)),
+    SI_CALL(0x802D6CC0, 343, 345, 280, 0xFFFFFF06, 17, SI_SAVE_FLAG(59)),
+    SI_CALL(0x802D6CC0, 128, 229, 250, 0xFFFFFF64, 17, SI_SAVE_FLAG(49)),
+    SI_CALL(0x80111D38, 0x802EAB04, 300, 0, 150, 0, 18, 0x80000000),
+    SI_CALL(0x80112114, SI_SAVE_FLAG(88)),
+    SI_CALL(0x80111D38, 0x802EA7E0, 130, 60, 0, 0, 0x80000000),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c
index 2b085c7e07..157a7769f1 100644
--- a/src/world/area_kmr/kmr_03/8C83A0.c
+++ b/src/world/area_kmr/kmr_03/8C83A0.c
@@ -2,3 +2,336 @@
 
 #include "world/common/SomeMatrixOperations.inc.c"
 
+// 8C9780
+// *INDENT-OFF*
+Script M(script_SearchBush_802417F0) = {
+    SI_USE_BUFFER(SI_VAR(0)),
+    SI_CMD(0x34, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84),
+    SI_CALL(0x802D1DFC, SI_VAR(5), SI_VAR(15), SI_VAR(7)),
+    SI_THREAD(),
+        SI_SET(SI_FLAG(0), 0),
+        SI_IF_NE(SI_VAR(1), 0),
+            SI_LOOP(5),
+                SI_USE_BUFFER(SI_VAR(1)),
+                SI_CMD(0x31, 0xFE363C82),
+                SI_LOOP(SI_VAR(2)),
+                    SI_CMD(0x31, 0xFE363C83),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), 1, SI_VAR(15), 0),
+                    SI_IF_EQ(SI_FLAG(0), 0),
+                        SI_SET(SI_FLAG(0), 1),
+                        SI_CALL(0x802CA558, SI_VAR(3), 339, 0),
+                    SI_END_IF(),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+                SI_USE_BUFFER(SI_VAR(1)),
+                SI_CMD(0x31, 0xFE363C82),
+                SI_LOOP(SI_VAR(2)),
+                    SI_CMD(0x31, 0xFE363C83),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), -1, SI_VAR(15), 0),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+            SI_END_LOOP(),
+            SI_USE_BUFFER(SI_VAR(1)),
+            SI_CMD(0x31, 0xFE363C82),
+            SI_LOOP(SI_VAR(2)),
+                SI_CMD(0x31, 0xFE363C83),
+                SI_CALL(0x802C8B60, SI_VAR(3), 0, 0, 0),
+            SI_END_LOOP(),
+            SI_WAIT_FRAMES(1),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_THREAD(),
+        SI_IF_NE(SI_VAR(2), 0),
+            SI_USE_BUFFER(SI_VAR(2)),
+            SI_CMD(0x31, 0xFE363C83),
+            SI_LOOP(SI_VAR(3)),
+                SI_CMD(0x31, 0xFE363C84),
+                SI_CMD(0x33, 0xFE363C85, 0xFE363C86, 0xFE363C87),
+                SI_CMD(0x33, 0xFE363C88, 0xFE363C89, 0xFE363C8A),
+                SI_IF_EQ(SI_VAR(10), 0),
+                    SI_CALL(0x802D6DC0, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)),
+                    SI_ELSE(),
+                    SI_CALL(0x802D593C, SI_VAR(10), SI_VAR(11)),
+                    SI_IF_EQ(SI_VAR(11), 0),
+                        SI_CALL(0x802D58E0, SI_VAR(10), 1),
+                        SI_CALL(0x802D6DC0, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)),
+                    SI_END_IF(),
+                SI_END_IF(),
+            SI_END_LOOP(),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_WAIT_FRAMES(15),
+    SI_IF_NE(SI_VAR(4), 0),
+        SI_EXEC_WAIT(0xFE363C84),
+    SI_END_IF(),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script M(script_ShakeTree_80241B50) = {
+    SI_TIMESCALE(SI_FIXED(2.0f)),
+    SI_USE_BUFFER(SI_VAR(0)),
+    SI_CMD(0x34, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84),
+    SI_CMD(0x31, 0xFE363C85),
+    SI_CALL(0x802D1DFC, SI_VAR(6), SI_VAR(15), SI_VAR(8)),
+    SI_CALL(0x802D6150, 357),
+    SI_CALL(0x802D6150, 358),
+    SI_THREAD(),
+        SI_SET(SI_FLAG(0), 0),
+        SI_IF_NE(SI_VAR(1), 0),
+            SI_WAIT_FRAMES(1),
+            SI_LOOP(5),
+                SI_USE_BUFFER(SI_VAR(1)),
+                SI_CMD(0x31, 0xFE363C82),
+                SI_LOOP(SI_VAR(2)),
+                    SI_CMD(0x31, 0xFE363C83),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), SI_FIXED(0.2), SI_VAR(15), 0),
+                    SI_IF_EQ(SI_FLAG(0), 0),
+                        SI_SET(SI_FLAG(0), 1),
+                        SI_CALL(0x802CA558, SI_VAR(3), 358, 0),
+                    SI_END_IF(),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+                SI_USE_BUFFER(SI_VAR(1)),
+                SI_CMD(0x31, 0xFE363C82),
+                SI_LOOP(SI_VAR(2)),
+                    SI_CMD(0x31, 0xFE363C83),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), SI_FIXED(-0.2), SI_VAR(15), 0),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+            SI_END_LOOP(),
+            SI_USE_BUFFER(SI_VAR(1)),
+            SI_CMD(0x31, 0xFE363C82),
+            SI_LOOP(SI_VAR(2)),
+                SI_CMD(0x31, 0xFE363C83),
+                SI_CALL(0x802C8B60, SI_VAR(3), 0, 0, 0),
+            SI_END_LOOP(),
+            SI_WAIT_FRAMES(1),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_THREAD(),
+        SI_SET(SI_FLAG(0), 0),
+        SI_IF_NE(SI_VAR(2), 0),
+            SI_LOOP(5),
+                SI_USE_BUFFER(SI_VAR(2)),
+                SI_CMD(0x31, 0xFE363C83),
+                SI_LOOP(SI_VAR(3)),
+                    SI_CMD(0x31, 0xFE363C84),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1), SI_FIXED(0.2), SI_VAR(15), 0),
+                    SI_IF_EQ(SI_FLAG(0), 0),
+                        SI_SET(SI_FLAG(0), 1),
+                        SI_CALL(0x802CA558, SI_VAR(4), 357, 0),
+                    SI_END_IF(),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+                SI_USE_BUFFER(SI_VAR(2)),
+                SI_CMD(0x31, 0xFE363C83),
+                SI_LOOP(SI_VAR(3)),
+                    SI_CMD(0x31, 0xFE363C84),
+                    SI_CALL(SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1), SI_FIXED(-0.2), SI_VAR(15), 0),
+                SI_END_LOOP(),
+                SI_WAIT_FRAMES(1),
+            SI_END_LOOP(),
+            SI_USE_BUFFER(SI_VAR(2)),
+            SI_CMD(0x31, 0xFE363C83),
+            SI_LOOP(SI_VAR(3)),
+                SI_CMD(0x31, 0xFE363C84),
+                SI_CALL(0x802C8B60, SI_VAR(4), 0, 0, 0),
+            SI_END_LOOP(),
+            SI_WAIT_FRAMES(1),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_THREAD(),
+        SI_IF_NE(SI_VAR(3), 0),
+            SI_USE_BUFFER(SI_VAR(3)),
+            SI_CMD(0x31, 0xFE363C84),
+            SI_LOOP(SI_VAR(4)),
+                SI_CMD(0x31, 0xFE363C85),
+                SI_CMD(0x33, 0xFE363C86, 0xFE363C87, 0xFE363C88),
+                SI_CMD(0x33, 0xFE363C89, 0xFE363C8A, 0xFE363C8B),
+                SI_IF_EQ(SI_VAR(11), 0),
+                    SI_CALL(0x802D6DC0, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)),
+                    SI_ELSE(),
+                    SI_CALL(0x802D593C, SI_VAR(11), SI_VAR(12)),
+                    SI_IF_EQ(SI_VAR(12), 0),
+                        SI_CALL(0x802D58E0, SI_VAR(11), 1),
+                        SI_CALL(0x802D6DC0, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)),
+                    SI_END_IF(),
+                SI_END_IF(),
+            SI_END_LOOP(),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_THREAD(),
+        SI_IF_NE(SI_VAR(4), 0),
+            SI_USE_BUFFER(SI_VAR(4)),
+            SI_CMD(0x31, 0xFE363C85),
+            SI_LOOP(SI_VAR(5)),
+                SI_CMD(0x33, 0xFE363C86, 0xFE363C87, 0xFE363C88),
+                SI_CALL(0x802D829C, 20, 0, SI_VAR(6), SI_VAR(7), SI_VAR(8), 100, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_END_LOOP(),
+        SI_END_IF(),
+    SI_END_THREAD(),
+    SI_IF_NE(SI_VAR(5), 0),
+        SI_EXEC_WAIT(0xFE363C85),
+    SI_END_IF(),
+    SI_WAIT_FRAMES(15),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+s32 M(treeModelList_Bush1_Bush)[] = {
+    0x00000001, 0x00000040,
+};
+
+s32 M(treeEffectVectors_Bush1)[] = {
+    0x00000001, 0x0000008F, 0x00000010, 0x000001CE,
+};
+
+s32 M(searchBushEvent_Bush1)[] = {
+    M(treeModelList_Bush1_Bush), 0x00000000, M(treeEffectVectors_Bush1), 0x00000000,
+};
+
+s32 M(treeModelList_Tree1_Leaves)[] = {
+    0x00000001, 0x0000003E,
+};
+
+s32 M(treeModelList_Tree1_Trunk)[] = {
+    0x00000001, 0x0000003D,
+};
+
+s32 M(treeEffectVectors_Tree1)[] = {
+    0x00000002, 0xFFFFFFB0, 0x00000082, 0x00000012, 0x0000001C, 0x00000082, 0x00000027,
+};
+
+// *INDENT-OFF*
+Script M(script_Tree1_Callback) = {
+    SI_IF_EQ(SI_SAVE_FLAG(53), 1),
+        SI_RETURN(),
+    SI_END_IF(),
+    SI_IF_EQ(SI_MAP_FLAG(10), 1),
+        SI_RETURN(),
+    SI_END_IF(),
+    SI_WAIT_FRAMES(10),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_IF_LT(SI_VAR(0), 0xFFFFFFE2),
+        SI_CALL(0x802D6CC0, 138, 0xFFFFFFE9, 100, 35, 13, SI_SAVE_FLAG(53)),
+        SI_ELSE(),
+        SI_CALL(0x802D6CC0, 138, 0xFFFFFFAB, 100, 16, 13, SI_SAVE_FLAG(53)),
+    SI_END_IF(),
+    SI_SET(SI_MAP_FLAG(10), 1),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
+
+s32 M(shakeTreeEvent_Tree1)[] = {
+    M(treeModelList_Tree1_Leaves), M(treeModelList_Tree1_Trunk), 0x00000000, M(treeEffectVectors_Tree1), M(script_Tree1_Callback),
+};
+
+s32 M(triggerCoord_802422A8)[] = {
+    0xC2280000, 0x00000000, 0xC1500000, 0x00000000,
+};
+
+Script M(script_802422B8) = {
+    SI_SET(SI_VAR(0), M(searchBushEvent_Bush1)),
+    SI_BIND(M(script_SearchBush_802417F0), TriggerFlag_WALL_INTERACT, 53, NULL),
+    SI_SET(SI_VAR(0), M(shakeTreeEvent_Tree1)),
+    SI_BIND(M(script_ShakeTree_80241B50), TriggerFlag_WALL_HAMMER, 52, NULL),
+    SI_BIND(M(script_ShakeTree_80241B50), TriggerFlag_BOMB, M(triggerCoord_802422A8), NULL),
+    SI_RETURN(),
+    SI_END(),
+};
+
+s32 padding3[] = {0};
+
+// 8CA2D0
+// *INDENT-OFF*
+Script M(script_80242340) = {
+    SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
+    SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
+    SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)),
+    SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)),
+    SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89),
+        SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0),
+        SI_CALL(0x802D0E28, 1),
+        SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0),
+        SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0),
+        SI_WAIT_FRAMES(20),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
+        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+        SI_CALL(0x802CB79C, 0, 0, 0),
+        SI_CALL(0x802D0E28, 0),
+        SI_RETURN(),
+    SI_END_IF(),
+    SI_CALL(0x802D0E28, 1),
+    SI_CALL(0x802D0DE4, 1),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)),
+    SI_WAIT_FRAMES(30),
+    SI_CALL(0x802CBBE4, 0, 220),
+    SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)),
+    SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+    SI_THREAD(),
+        SI_WAIT_FRAMES(18),
+        SI_CALL(0x802D2CD8, 373, 0),
+        SI_WAIT_FRAMES(30),
+        SI_CALL(0x802D2CD8, 374, 0),
+        SI_WAIT_FRAMES(28),
+        SI_CALL(0x802D2CD8, 373, 0),
+    SI_END_THREAD(),
+    SI_CALL(0x802D0DA0, 1),
+    SI_CALL(0x802D1084, 0x10002),
+    SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0),
+    SI_CALL(0x802D193C, 90, 0),
+    SI_LABEL(0),
+    SI_WAIT_FRAMES(1),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_ADD(SI_VAR(1), 0xFFFFFFFE),
+    SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_IF_GT(SI_VAR(1), 86),
+        SI_GOTO(0),
+    SI_END_IF(),
+    SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0),
+    SI_THREAD(),
+        SI_WAIT_FRAMES(20),
+        SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_END_THREAD(),
+    SI_CALL(0x802D286C, 0x2800),
+    SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0),
+    SI_WAIT_FRAMES(100),
+    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+    SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0),
+    SI_CALL(0x802D0DA0, 0),
+    SI_CALL(0x802D1084, 0x10006),
+    SI_WAIT_FRAMES(10),
+    SI_CALL(0x802D1084, 0x10007),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CALL(0x802D1054, SI_FIXED(1.0f)),
+    SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10),
+    SI_CALL(0x802D1084, 0x10002),
+    SI_THREAD(),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
+        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+        SI_CALL(0x802CB79C, 0, 0, 0),
+    SI_END_THREAD(),
+    SI_WAIT_FRAMES(30),
+    SI_CALL(0x802D0DE4, 0),
+    SI_CALL(0x802D0E28, 0),
+    SI_RETURN(),
+    SI_END(),
+};
diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h
index b813b64200..2e655ab085 100644
--- a/src/world/area_kmr/kmr_03/kmr_03.h
+++ b/src/world/area_kmr/kmr_03/kmr_03.h
@@ -2,3 +2,7 @@
 #include "map.h"
 
 #define MAP_NAME kmr_03
+
+ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall);
+Script M(Main);
+Script M(script_802406C0);
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 68395935ff..6bdebe26ff 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -1359,15 +1359,16 @@ segments:
     vram: 0x80240000
     files:
       - [0x8C7F90, "c"]
+      - [0x8C8140, "c"]
       - [0x8C82B0, "c"]
       - [0x8C83A0, "c"]
-      - [0x8C85E0, "bin"]
-      - [0x8C8680, "bin"]
-      - [0x8C88E0, "bin"]
-      - [0x8C9400, "bin"]
-      - [0x8C9780, "bin"]
-      - [0x8CA2D0, "bin"]
-      - [0x8CA8F0, "bin"] # rodata
+      - [0x8C85E0, ".data", "world/area_kmr/kmr_03/8C7F90"]
+      - [0x8C8680, ".data", "world/area_kmr/kmr_03/8C8140"]
+      - [0x8C88E0, ".data", "world/area_kmr/kmr_03/8C82B0"]
+      # - [0x8C9400, "bin"]
+      - [0x8C9780, ".data", "world/area_kmr/kmr_03/8C83A0"]
+      # - [0x8CA2D0, "bin"]
+      - [0x8CA8F0, ".rodata", "world/area_kmr/kmr_03/8C8140"]
   - name: world/area_kmr/kmr_04/
     type: code
     overlay: True

From 44fd38f4f80fbb70f2b8c0735839be8101d6923f Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 18:30:16 +0000
Subject: [PATCH 066/101] add image splits

---
 .gitignore             |   1 +
 .vscode/settings.json  |   1 -
 Makefile               |  50 +++++++++--
 requirements.txt       |   1 +
 sources.mk             |   3 +
 tools/convert_image.py | 193 +++++++++++++++++++++++++++++++++++++++++
 tools/n64splat         |   2 +-
 tools/splat.yaml       |  69 ++++++++++++++-
 8 files changed, 309 insertions(+), 11 deletions(-)
 create mode 100755 tools/convert_image.py

diff --git a/.gitignore b/.gitignore
index e08969475e..3600fdfb40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ settings.mk
 *.i
 *.Yay0
 bin/
+img/
 build/
 docs/doxygen/
 include/ld_addrs.h
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b9a9ded7bd..c2b3c50402 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,7 +10,6 @@
         "-D_LANGUAGE_C",
         "-DSCRIPT(...)={}",
     ],
-    "python.pythonPath": "/usr/bin/python3",
     "git.ignoreLimitWarning": true,
     "search.exclude": {
         "build": true,
diff --git a/Makefile b/Makefile
index ece296eab5..fcdcdbf959 100644
--- a/Makefile
+++ b/Makefile
@@ -98,14 +98,14 @@ submodules:
 	git submodule update --init --recursive
 
 split:
-	rm -rf bin
-	$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS
+	rm -rf bin img
+	$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8
 
-split-bin:
-	$(SPLAT) --modes ld bin
+split-%:
+	$(SPLAT) --modes ld $*
 
 split-all:
-	rm -rf bin
+	rm -rf bin img
 	$(SPLAT) --modes all
 
 test: $(ROM)
@@ -137,13 +137,51 @@ $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s
 	@mkdir -p $(shell dirname $@)
 	$(AS) $(ASFLAGS) -o $@ $<
 
+# Images
+$(BUILD_DIR)/%.png.o: $(BUILD_DIR)/%.png
+	$(LD) -r -b binary -o $@ $<
+$(BUILD_DIR)/%.rgba16.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py rgba16 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.rgba32.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py rgba32 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ci8.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ci8palette.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ci4.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ci4palette.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ia4.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ia8.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ia8 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.ia16.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py ia16 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.i4.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py i4 $< $@ $(IMG_FLAGS)
+$(BUILD_DIR)/%.i8.png: %.png
+	@mkdir -p $(shell dirname $@)
+	$(PYTHON) tools/convert_image.py i8 $< $@ $(IMG_FLAGS)
+
+
 ASSET_FILES := $(foreach asset, $(ASSETS), $(BUILD_DIR)/bin/assets/$(asset))
 YAY0_ASSET_FILES := $(foreach asset, $(filter-out %_tex, $(ASSET_FILES)), $(asset).Yay0)
 
diff --git a/requirements.txt b/requirements.txt
index 361a2122c4..450238e89e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 capstone
 PyYAML
 lark-parser
+pypng
diff --git a/sources.mk b/sources.mk
index 47d7169a4c..f2c0e86888 100644
--- a/sources.mk
+++ b/sources.mk
@@ -55,3 +55,6 @@ ASSETS := \
 	kmr_bg nok_bg sbk_bg sbk3_bg iwa_bg hos_bg arn_bg obk_bg omo_bg yos_bg jan_bg fla_bg flb_bg sra_bg yki_bg sam_bg kpa_bg title_bg \
 	title_data \
 	party_kurio party_kameki party_pinki party_pareta party_resa party_akari party_opuku party_pokopi
+
+# Image settings
+$(BUILD_DIR)/img/battle/text_action_command_ratings.ia4.png: IMG_FLAGS = --flip-y
diff --git a/tools/convert_image.py b/tools/convert_image.py
new file mode 100755
index 0000000000..afc92d94bc
--- /dev/null
+++ b/tools/convert_image.py
@@ -0,0 +1,193 @@
+#! /usr/bin/python3
+
+from sys import argv, stderr
+from math import floor, ceil
+from itertools import zip_longest
+import png
+
+def unpack_color(s):
+    r = (s >> 11) & 0x1F
+    g = (s >>  6) & 0x1F
+    b = (s >>  1) & 0x1F
+    a = (s &   1) * 0xFF
+
+    r = ceil(0xFF * (r / 31))
+    g = ceil(0xFF * (g / 31))
+    b = ceil(0xFF * (b / 31))
+
+    return r, g, b, a
+
+def pack_color(r, g, b, a):
+    r = floor(31 * (r / 255))
+    g = floor(31 * (g / 255))
+    b = floor(31 * (b / 255))
+
+    s = round(a / 0xFF)
+    s |= (r & 0x1F) << 11
+    s |= (g & 0x1F) << 6
+    s |= (b & 0x1F) << 1
+
+    return s
+
+def rgb_to_intensity(r, g, b):
+    return round(r * 0.2126 + g * 0.7152 + 0.0722 * b)
+
+def iter_in_groups(iterable, n, fillvalue=None):
+    args = [iter(iterable)] * n
+    return zip_longest(*args, fillvalue=fillvalue)
+
+
+
+def reversed_if(iterator, cond):
+    if cond:
+        return reversed(list(iterator))
+    else:
+        return iterator
+
+class Converter():
+    def __init__(self, mode, infile, outfile, *argv):
+        self.mode = mode
+        self.infile = infile
+        self.outfile = outfile
+        self.flip_y = "--flip-y" in argv
+
+        self.warned = False
+
+    def warn(self, msg):
+        if not self.warned:
+            self.warned = True
+            print(self.infile + ": warning: " + msg, file=stderr)
+
+    def convert(self):
+        img = png.Reader(self.infile)
+
+        if self.mode == "rgba32":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    f.write(row)
+        elif self.mode == "rgba16":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for rgba in iter_in_groups(row, 4):
+                        if rgba[3] not in (0, 0xFF):
+                            self.warn("alpha mask mode but translucent pixels used")
+
+                        color = pack_color(*rgba)
+                        f.write(color.to_bytes(2, byteorder="big"))
+        elif self.mode == "ci8":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.read()[2], self.flip_y):
+                    f.write(row)
+        elif self.mode == "ci4":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.read()[2], self.flip_y):
+                    for a, b in iter_in_groups(row, 2):
+                        byte = (a << 4) | b
+                        f.write(byte.to_bytes(1, byteorder="big"))
+        elif self.mode == "ci8palette" or self.mode == "ci4palette":
+            img.preamble(True)
+            palette = img.palette(alpha="force")
+
+            with open(self.outfile, "wb") as f:
+                for rgba in palette:
+                    if rgba[3] not in (0, 0xFF):
+                        self.warn("alpha mask mode but translucent pixels used")
+
+                    color = pack_color(*rgba)
+                    f.write(color.to_bytes(2, byteorder="big"))
+        elif self.mode == "ia4":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for c1, c2 in iter_in_groups(iter_in_groups(row, 4), 2):
+                        i1 = rgb_to_intensity(*c1[:3])
+                        a1 = c1[3]
+
+                        i2 = rgb_to_intensity(*c2[:3])
+                        a2 = c2[3]
+
+                        i1 = floor(7 * (i1 / 0xFF))
+                        i2 = floor(7 * (i2 / 0xFF))
+
+                        if a1 not in (0, 0xFF) or a2 not in (0, 0xFF):
+                            self.warn("alpha mask mode but translucent pixels used")
+                        if c1[0] != c1[1] != c1[2]:
+                            self.warn("grayscale mode but image is not")
+                        if c2[0] != c2[1] != c2[2]:
+                            self.warn("grayscale mode but image is not")
+
+                        a1 = 1 if a1 > 128 else 0
+                        a2 = 1 if a2 > 128 else 0
+
+                        h = (i1 << 1) | a1
+                        l = (i2 << 1) | a2
+
+                        byte = (h << 4) | l
+                        f.write(byte.to_bytes(1, byteorder="big"))
+        elif self.mode == "ia8":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for rgba in iter_in_groups(row, 4):
+                        i = rgb_to_intensity(*rgba[:3])
+                        a = rgba[3]
+
+                        i = floor(15 * (i / 0xFF))
+                        a = floor(15 * (a / 0xFF))
+
+                        if rgba[0] != rgba[1] != rgba[2]:
+                            self.warn("grayscale mode but image is not")
+
+                        byte = (i << 4) | a
+                        f.write(byte.to_bytes(1, byteorder="big"))
+        elif self.mode == "ia16":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for rgba in iter_in_groups(row, 4):
+                        i = rgb_to_intensity(*rgba[:3])
+                        a = rgba[3]
+
+                        if rgba[0] != rgba[1] != rgba[2]:
+                            self.warn("grayscale mode but image is not")
+
+                        f.write(bytes((i, a)))
+        elif self.mode == "i4":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for c1, c2 in iter_in_groups(iter_in_groups(row, 4), 2):
+                        if c1[3] != 0xFF or c2[3] != 0xFF:
+                            self.warn("discarding alpha channel")
+
+                        i1 = rgb_to_intensity(*c1[:3])
+                        i2 = rgb_to_intensity(*c2[:3])
+
+                        i1 = floor(15 * (i1 / 0xFF))
+                        i2 = floor(15 * (i2 / 0xFF))
+
+                        if c1[0] != c1[1] != c1[2]:
+                            self.warn("grayscale mode but image is not")
+                        if c2[0] != c2[1] != c2[2]:
+                            self.warn("grayscale mode but image is not")
+
+                        byte = (i1 << 4) | i2
+                        f.write(byte.to_bytes(1, byteorder="big"))
+        elif self.mode == "i8":
+            with open(self.outfile, "wb") as f:
+                for row in reversed_if(img.asRGBA()[2], self.flip_y):
+                    for rgba in iter_in_groups(row, 4):
+                        if rgba[3] != 0xFF or rgba[3] != 0xFF:
+                            self.warn("discarding alpha channel")
+                        if rgba[0] != rgba[1] != rgba[2]:
+                            self.warn("grayscale mode but image is not")
+
+                        i = rgb_to_intensity(*rgba[:3])
+                        f.write(i.to_bytes(1, byteorder="big"))
+        else:
+            print("unsupported mode", file=stderr)
+            exit(1)
+
+
+if __name__ == "__main__":
+    if len(argv) < 4:
+        print("usage: convert_image.py MODE INFILE OUTFILE [--flip-y]")
+        exit(1)
+
+    Converter(*argv[1:]).convert()
diff --git a/tools/n64splat b/tools/n64splat
index 037d80e00c..6443fba42f 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 037d80e00cb3aeae37bdad77bfac871036982456
+Subproject commit 6443fba42f530ef99187a79cd93b9e5d95161ef7
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 68395935ff..61fc4ee65e 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -212,6 +212,14 @@ segments:
     - [0x8a860, "c", "code_8a860_len_3f30"]
     - [0x8e790, "c", "code_8e790_len_2850"]
     - [0x90fe0, "bin"]
+  - [0x93CD0, ci4,        ui/hammer, 32, 32]
+  - [0x93ED0, ci4palette, ui/hammer]
+  - [0x93EF0, ci4palette, ui/hammer.disabled]
+  - [0x93FF0, bin]
+  - [0x9D658, rgba32,     ui/stat_heart, 16, 16]
+  - [0x9DA58, bin]
+  - [0x9DA60, rgba32,     ui/stat_flower, 16, 16]
+  - [0x9DE60, bin]
   - type: code
     start: 0xA5DD0
     vram: 0x8010F6D0
@@ -268,8 +276,17 @@ segments:
     - [0x1086a0, "c", "code_1086a0_len_fc0"]
     - [0x109660, "c", "code_109660_len_1270"]
     - [0x10A8D0, "c", "code_10A8D0"]
-  - [0x10A9F0, "bin"] # todo split this further
-  - [0x131340, "bin"] # 0x8023E000
+  - [0x10A9F0, i4,         shadow/square, 16, 16]
+  - [0x10AA70, i4,         shadow/circle, 16, 16]
+  - [0x10AAF0, bin]
+  - [0x10AB70, i4,         shadow/10AB70, 32, 32]
+  - [0x10AD70, i4,         shadow/10AD70, 32, 32]
+  - [0x10AF70, bin] # TODO
+  - [0x1164B8, ci8,        peach_letter, 150, 105]
+  - [0x11A23E, bin]
+  - [0x11A240, ci8palette, peach_letter]
+  - [0x11A440, bin]
+  - [0x131340, bin]
   - type: code
     start: 0x135EE0
     vram: 0x80242BA0
@@ -280,6 +297,28 @@ segments:
     - [0x140C70, "c"]
     - [0x1421C0, "c"]
     - [0x1422A0, "bin"]
+  - [0x1443F0, ci8,        pause/world_map, 320, 320]
+  - [0x15D3F0, ci8palette, pause/world_map]
+  - [0x15D5F0, ci4,        pause/spirits_bg, 128, 110]
+  - [0x15F170, ci4palette, pause/spirits_bg]
+  - [0x15F270, bin]
+  - [0x15F970, ci4,        pause/banner_hp, 64, 16]
+  - [0x15FB70, ci4palette, pause/banner_hp]
+  - [0x15FD70, ci4,        pause/banner_fp, 64, 16]
+  - [0x15FF70, ci4palette, pause/banner_fp]
+  - [0x160170, ci4,        pause/banner_bp, 64, 16]
+  - [0x160370, ci4palette, pause/banner_bp]
+  - [0x160570, ci4,        pause/banner_boots, 48, 16]
+  - [0x1606F0, ci4palette, pause/banner_boots]
+  - [0x1608F0, ci4,        pause/banner_hammer, 48, 16]
+  - [0x160A70, ci4palette, pause/banner_hammer]
+  - [0x160C70, ci4,        pause/banner_star_energy, 48, 16]
+  - [0x160DF0, ci4palette, pause/banner_star_energy]
+  - [0x160FF0, ci4,        pause/available, 64, 16]
+  - [0x1611F0, ci4palette, pause/available]
+  - [0x1613F0, ci4,        pause/prompt_check_abilities, 128, 16]
+  - [0x1617F0, ci4palette, pause/prompt_check_abilities]
+  - [0x1619F0, bin]
   - type: code
     start: 0x163400
     vram: 0x80242BA0
@@ -313,6 +352,21 @@ segments:
     - [0x1AF230, "c"]
     - [0x1AF2D0, "bin"]
   - [0x1CC310, "bin"] # icon images and palettes, vram unknown
+  - [0x1FE1B0, rgba16,     title/logo_n64, 128, 112]
+  - [0x2051B0, rgba16,     title/logo_is, 256, 122]
+  - [0x2131B0, rgba16,     title/logo_nintendo, 256, 48]
+  - [0x2191B0, ci8,        title/bg_1, 264, 162]
+  - [0x2238C0, ci8palette, title/bg_1]
+  - [0x223AC0, ci8,        title/bg_2, 264, 162]
+  - [0x22E1D0, ci8palette, title/bg_2]
+  - [0x22E3D0, ci8,        title/bg_3, 264, 162]
+  - [0x238AE0, ci8palette, title/bg_3]
+  - [0x238CE0, ci8,        title/bg_4, 264, 162]
+  - [0x2433F0, ci8palette, title/bg_4]
+  - [0x2435F0, ia8,        title/tape, 128, 128]
+  - [0x2475F0, ci8,        title/bowser_silhouette, 128, 128]
+  - [0x24B5F0, ci8palette, title/bowser_silhouette]
+  - [0x24B7F0, bin]
   - type: code
     start: 0x3169F0
     vram: 0x80200000
@@ -482,13 +536,13 @@ segments:
     files:
       - [0x33CDF0, "c"]
       - [0x33d5d0, "bin"]
+  - [0x33D610, "bin"]
   - type: code
     start: 0x33E8C0
     vram: 0xE002A000
     files:
       - [0x33E8C0, "c"]
       - [0x33efe0, "bin"]
-  - [0x33D610, "bin"]
   - type: code
     start: 0x33FE80
     vram: 0xE002C000
@@ -731,6 +785,13 @@ segments:
       - [0x38F900, "c"]
       - [0x390340, "bin"]
   - [0x3903D0, "bin"]
+  - start: 0x390810
+    type: ia4
+    name: battle/text_action_command_ratings
+    width: 64
+    height: 125
+    flip: vertical
+  - [0x3917B0, bin]
   - type: code
     start: 0x391D30
     vram: 0xE0092000
@@ -814,6 +875,8 @@ segments:
     - [0x3BA030, "c"]
     - [0x3BAC60, "bin"]
   - [0x3BAEA0, "bin"] # todo split this further ADD STUFF AFTER HERE
+  - [0x3ED4E0, "ia8", "world/text_chapter", 128, 38]
+  - [0x3EE7E0, "bin"]
   - type: code
     start: 0x415D90
     vram: 0x802A1000

From ca4c4b0507b5163449eee55726664886de3626e4 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 18:50:00 +0000
Subject: [PATCH 067/101] bump splat

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 6443fba42f..c8b324cdc0 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 6443fba42f530ef99187a79cd93b9e5d95161ef7
+Subproject commit c8b324cdc0072724ed78b90d2008f36c238b1a76

From bfbae5e26a7d1524947375ecf872a83cf0d7cea4 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 31 Oct 2020 15:04:45 -0400
Subject: [PATCH 068/101] remove padding3

---
 src/world/area_kmr/kmr_03/8C83A0.c | 92 ------------------------------
 src/world/area_kmr/kmr_03/8C85E0.c | 90 +++++++++++++++++++++++++++++
 tools/splat.yaml                   |  3 +-
 3 files changed, 92 insertions(+), 93 deletions(-)
 create mode 100644 src/world/area_kmr/kmr_03/8C85E0.c

diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c
index 157a7769f1..de44b33c5e 100644
--- a/src/world/area_kmr/kmr_03/8C83A0.c
+++ b/src/world/area_kmr/kmr_03/8C83A0.c
@@ -2,7 +2,6 @@
 
 #include "world/common/SomeMatrixOperations.inc.c"
 
-// 8C9780
 // *INDENT-OFF*
 Script M(script_SearchBush_802417F0) = {
     SI_USE_BUFFER(SI_VAR(0)),
@@ -244,94 +243,3 @@ Script M(script_802422B8) = {
     SI_RETURN(),
     SI_END(),
 };
-
-s32 padding3[] = {0};
-
-// 8CA2D0
-// *INDENT-OFF*
-Script M(script_80242340) = {
-    SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
-    SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
-    SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)),
-    SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)),
-    SI_CALL(0x802CB79C, 0, 0, 1),
-    SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89),
-        SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0),
-        SI_CALL(0x802D0E28, 1),
-        SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0),
-        SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0),
-        SI_WAIT_FRAMES(20),
-        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
-        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CB79C, 0, 0, 1),
-        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
-        SI_CALL(0x802CB79C, 0, 0, 0),
-        SI_CALL(0x802D0E28, 0),
-        SI_RETURN(),
-    SI_END_IF(),
-    SI_CALL(0x802D0E28, 1),
-    SI_CALL(0x802D0DE4, 1),
-    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-    SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)),
-    SI_WAIT_FRAMES(30),
-    SI_CALL(0x802CBBE4, 0, 220),
-    SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)),
-    SI_CALL(0x802CB79C, 0, 0, 1),
-    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
-    SI_THREAD(),
-        SI_WAIT_FRAMES(18),
-        SI_CALL(0x802D2CD8, 373, 0),
-        SI_WAIT_FRAMES(30),
-        SI_CALL(0x802D2CD8, 374, 0),
-        SI_WAIT_FRAMES(28),
-        SI_CALL(0x802D2CD8, 373, 0),
-    SI_END_THREAD(),
-    SI_CALL(0x802D0DA0, 1),
-    SI_CALL(0x802D1084, 0x10002),
-    SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0),
-    SI_CALL(0x802D193C, 90, 0),
-    SI_LABEL(0),
-    SI_WAIT_FRAMES(1),
-    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-    SI_ADD(SI_VAR(1), 0xFFFFFFFE),
-    SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-    SI_IF_GT(SI_VAR(1), 86),
-        SI_GOTO(0),
-    SI_END_IF(),
-    SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0),
-    SI_THREAD(),
-        SI_WAIT_FRAMES(20),
-        SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0),
-        SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)),
-        SI_CALL(0x802CB79C, 0, 0, 1),
-    SI_END_THREAD(),
-    SI_CALL(0x802D286C, 0x2800),
-    SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0),
-    SI_WAIT_FRAMES(100),
-    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
-    SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0),
-    SI_CALL(0x802D0DA0, 0),
-    SI_CALL(0x802D1084, 0x10006),
-    SI_WAIT_FRAMES(10),
-    SI_CALL(0x802D1084, 0x10007),
-    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-    SI_CALL(0x802D1054, SI_FIXED(1.0f)),
-    SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10),
-    SI_CALL(0x802D1084, 0x10002),
-    SI_THREAD(),
-        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
-        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
-        SI_CALL(0x802CB79C, 0, 0, 1),
-        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
-        SI_CALL(0x802CB79C, 0, 0, 0),
-    SI_END_THREAD(),
-    SI_WAIT_FRAMES(30),
-    SI_CALL(0x802D0DE4, 0),
-    SI_CALL(0x802D0E28, 0),
-    SI_RETURN(),
-    SI_END(),
-};
diff --git a/src/world/area_kmr/kmr_03/8C85E0.c b/src/world/area_kmr/kmr_03/8C85E0.c
new file mode 100644
index 0000000000..b2a4a3b6b1
--- /dev/null
+++ b/src/world/area_kmr/kmr_03/8C85E0.c
@@ -0,0 +1,90 @@
+#include "kmr_03.h"
+
+// *INDENT-OFF*
+Script M(script_80242340) = {
+    SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
+    SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0),
+    SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)),
+    SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)),
+    SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89),
+        SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0),
+        SI_CALL(0x802D0E28, 1),
+        SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0),
+        SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0),
+        SI_WAIT_FRAMES(20),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
+        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+        SI_CALL(0x802CB79C, 0, 0, 0),
+        SI_CALL(0x802D0E28, 0),
+        SI_RETURN(),
+    SI_END_IF(),
+    SI_CALL(0x802D0E28, 1),
+    SI_CALL(0x802D0DE4, 1),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)),
+    SI_WAIT_FRAMES(30),
+    SI_CALL(0x802CBBE4, 0, 220),
+    SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)),
+    SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+    SI_THREAD(),
+        SI_WAIT_FRAMES(18),
+        SI_CALL(0x802D2CD8, 373, 0),
+        SI_WAIT_FRAMES(30),
+        SI_CALL(0x802D2CD8, 374, 0),
+        SI_WAIT_FRAMES(28),
+        SI_CALL(0x802D2CD8, 373, 0),
+    SI_END_THREAD(),
+    SI_CALL(0x802D0DA0, 1),
+    SI_CALL(0x802D1084, 0x10002),
+    SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0),
+    SI_CALL(0x802D193C, 90, 0),
+    SI_LABEL(0),
+    SI_WAIT_FRAMES(1),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_ADD(SI_VAR(1), 0xFFFFFFFE),
+    SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_IF_GT(SI_VAR(1), 86),
+        SI_GOTO(0),
+    SI_END_IF(),
+    SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0),
+    SI_THREAD(),
+        SI_WAIT_FRAMES(20),
+        SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+    SI_END_THREAD(),
+    SI_CALL(0x802D286C, 0x2800),
+    SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0),
+    SI_WAIT_FRAMES(100),
+    SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+    SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0),
+    SI_CALL(0x802D0DA0, 0),
+    SI_CALL(0x802D1084, 0x10006),
+    SI_WAIT_FRAMES(10),
+    SI_CALL(0x802D1084, 0x10007),
+    SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CALL(0x802D1054, SI_FIXED(1.0f)),
+    SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10),
+    SI_CALL(0x802D1084, 0x10002),
+    SI_THREAD(),
+        SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)),
+        SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CALL(0x802CB79C, 0, 0, 1),
+        SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)),
+        SI_CALL(0x802CB79C, 0, 0, 0),
+    SI_END_THREAD(),
+    SI_WAIT_FRAMES(30),
+    SI_CALL(0x802D0DE4, 0),
+    SI_CALL(0x802D0E28, 0),
+    SI_RETURN(),
+    SI_END(),
+};
+// *INDENT-ON*
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 6bdebe26ff..12d0deebb3 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -1362,12 +1362,13 @@ segments:
       - [0x8C8140, "c"]
       - [0x8C82B0, "c"]
       - [0x8C83A0, "c"]
+      - [0x8C85E0, "c"]
       - [0x8C85E0, ".data", "world/area_kmr/kmr_03/8C7F90"]
       - [0x8C8680, ".data", "world/area_kmr/kmr_03/8C8140"]
       - [0x8C88E0, ".data", "world/area_kmr/kmr_03/8C82B0"]
       # - [0x8C9400, "bin"]
       - [0x8C9780, ".data", "world/area_kmr/kmr_03/8C83A0"]
-      # - [0x8CA2D0, "bin"]
+      - [0x8CA2D0, ".data", "world/area_kmr/kmr_03/8C85E0"]
       - [0x8CA8F0, ".rodata", "world/area_kmr/kmr_03/8C8140"]
   - name: world/area_kmr/kmr_04/
     type: code

From 0f3d65f7c9d283ecf1bca0a7409ca6a26f0d287d Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 31 Oct 2020 15:34:10 -0400
Subject: [PATCH 069/101] cleanup

---
 src/world/area_sam/sam_11/D3A930.c   | 6 +-----
 src/world/common/Set80151310.inc.c   | 5 +----
 src/world/common/Set80151310_0.inc.c | 6 ++++++
 3 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 src/world/common/Set80151310_0.inc.c

diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index a37071aeaf..cd04c7a33d 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -4,16 +4,12 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC);
 
-// Almost the same as Set80151310, but we're setting it to 2 in the first func instead of 1
 static ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) {
     D_80151310 = 2;
     return ApiStatus_DONE2;
 }
 
-static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
-    D_80151310 = 0;
-    return ApiStatus_DONE2;
-}
+#include "world/common/Set80151310_0.inc.c"
 
 #include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
diff --git a/src/world/common/Set80151310.inc.c b/src/world/common/Set80151310.inc.c
index 2223ab43f6..0f8f7d53a3 100644
--- a/src/world/common/Set80151310.inc.c
+++ b/src/world/common/Set80151310.inc.c
@@ -5,7 +5,4 @@ static ApiStatus Set80151310_1(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
-    D_80151310 = 0;
-    return ApiStatus_DONE2;
-}
+#include "world/common/Set80151310_0.inc.c"
diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310_0.inc.c
new file mode 100644
index 0000000000..953e1f4232
--- /dev/null
+++ b/src/world/common/Set80151310_0.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
+    D_80151310 = 0;
+    return ApiStatus_DONE2;
+}

From 9151bf2fe420a0d1a1b1f894c25a8d7070986c46 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 31 Oct 2020 15:35:43 -0400
Subject: [PATCH 070/101] NotDoesScriptExist -> AwaitScriptComplete

---
 src/world/area_dro/dro_02/9694C0.c                              | 2 +-
 src/world/area_hos/hos_03/A1BDB0.c                              | 2 +-
 src/world/area_jan/jan_03/B34BD0.c                              | 2 +-
 src/world/area_kkj/kkj_20/AFDE00.c                              | 2 +-
 src/world/area_kmr/kmr_02/8B30E0.c                              | 2 +-
 src/world/area_kmr/kmr_20/8ED0C0.c                              | 2 +-
 src/world/area_kpa/kpa_91/A86A50.c                              | 2 +-
 src/world/area_kpa/kpa_95/A8CB60.c                              | 2 +-
 src/world/area_mac/mac_01/8017D0.c                              | 2 +-
 src/world/area_nok/nok_01/9C53E0.c                              | 2 +-
 src/world/area_sam/sam_02/D05F60.c                              | 2 +-
 src/world/area_sam/sam_06/D203E0.c                              | 2 +-
 .../{NotDoesScriptExist.inc.c => AwaitScriptComplete.inc.c}     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 rename src/world/common/{NotDoesScriptExist.inc.c => AwaitScriptComplete.inc.c} (58%)

diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index cb9c9474cb..3dbe234741 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -92,7 +92,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 5480bb6c0b..3149046f86 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 2a9c7477b3..716aa12127 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 5ec4549dae..04b34342c3 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index 894052300a..7c2ab8a71e 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index a273cad41b..69399becad 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index f7bdac79c3..65cb2e7b8f 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index 44daaa48f2..7e68509226 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 464f97b3ee..c3ad2a45a0 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -98,7 +98,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_80
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 36a46e2554..8747b47e2d 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 0521858a9d..630152cf2d 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 699d01bcfe..6f1be57830 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4);
 
-#include "world/common/NotDoesScriptExist.inc.c"
+#include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
diff --git a/src/world/common/NotDoesScriptExist.inc.c b/src/world/common/AwaitScriptComplete.inc.c
similarity index 58%
rename from src/world/common/NotDoesScriptExist.inc.c
rename to src/world/common/AwaitScriptComplete.inc.c
index cdd6ce8750..7716e501f0 100644
--- a/src/world/common/NotDoesScriptExist.inc.c
+++ b/src/world/common/AwaitScriptComplete.inc.c
@@ -1,5 +1,5 @@
 #include "common.h"
 
-static ApiStatus NotDoesScriptExist(ScriptInstance* script, s32 isInitialCall) {
+static ApiStatus AwaitScriptComplete(ScriptInstance* script, s32 isInitialCall) {
     return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2;
 }

From 82a5b59d274c835153b836d47885e8a29376a609 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 19:57:37 +0000
Subject: [PATCH 071/101] bump splat

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index c8b324cdc0..e7a811adf8 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit c8b324cdc0072724ed78b90d2008f36c238b1a76
+Subproject commit e7a811adf8e9cc5505c0992d0e73e9589c6ccd2e

From abcda77e2c34794f1424f7634f3d0513a50b4103 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Sat, 31 Oct 2020 20:04:33 +0000
Subject: [PATCH 072/101] MapInitialiser -> MapInit

---
 include/map.h     |   4 +-
 src/world/world.c | 122 +++++++++++++++++++++++-----------------------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/include/map.h b/include/map.h
index 7336be6331..17c78e59ac 100644
--- a/include/map.h
+++ b/include/map.h
@@ -33,7 +33,7 @@ typedef struct MapConfig {
     } tattle;
 } MapConfig; // size = 0x40
 
-typedef s32 MapInitialiser(void);
+typedef s32 MapInit(void);
 
 #define MAP_ID_MAX_LEN 7 ///< "xxx_yyy" excluding null terminator.
 typedef struct Map {
@@ -43,7 +43,7 @@ typedef struct Map {
     /* 0x0C */ void* dmaEnd;
     /* 0x10 */ void* dmaDest;
     /* 0x14 */ char* bgName;
-    /* 0x18 */ MapInitialiser* init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
+    /* 0x18 */ MapInit* init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
     /* 0x1C */ s16 unk_1C; // Unused?
     /* 0x1E */ s8 songVariation; ///< 0 or 1. @see get_song_variation_override_for_cur_map
     /* 0x1F */ s8 flags;
diff --git a/src/world/world.c b/src/world/world.c
index 6b3558a438..caa2f6e98e 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -100,7 +100,7 @@ static Map mac_maps[] = {
     { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" },
     { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" },
     { MAP_UNSPLIT(mac_03, 0x802428B0), .bgName = "nok_bg" },
-    { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" },
     { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" },
 };
@@ -127,7 +127,7 @@ static Map tik_maps[] = {
     { MAP_UNSPLIT(tik_21, 0x80240990), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(tik_22, 0x802409D0), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(tik_23, 0x80241160), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(tik_24, 0x80240ED0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(tik_24, 0x80240ED0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(tik_25, 0x802407D0), .songVariation = 1, .flags = 2 },
 };
 
@@ -152,10 +152,10 @@ static Map kmr_maps[] = {
     { MAP_UNSPLIT(kmr_11, 0x80241180), .bgName = "kmr_bg" },
     { MAP(kmr_12), .bgName = "kmr_bg" },
     { MAP_UNSPLIT(kmr_20, 0x80242C00), .bgName = "kmr_bg" }, // Mario's House
-    { MAP_UNSPLIT(kmr_21, 0x802402F0), .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kmr_22, 0x80240DA0), .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kmr_23, 0x80241150), .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kmr_24, 0x80240120), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kmr_21, 0x802402F0), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_22, 0x80240DA0), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_23, 0x80241150), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_24, 0x80240120), .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kmr_30, 0x802404F0) },
 };
 
@@ -281,14 +281,14 @@ static Map nok_maps[] = {
 
 /// Star Region
 static Map hos_maps[] = {
-    { MAP_UNSPLIT(hos_00, 0x80240D50), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(hos_00, 0x80240D50), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(hos_01, 0x80240E40), .bgName = "hos_bg" },
     { MAP_UNSPLIT(hos_02, 0x80242B90), .bgName = "hos_bg" },
     { MAP_UNSPLIT(hos_03, 0x802435F0), .bgName = "hos_bg" },
     { MAP_UNSPLIT(hos_04, 0x80240EE0), .bgName = "hos_bg" },
     { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(hos_06, 0x80242570), .bgName = "hos_bg" },
-    { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(hos_20, 0x80240390), .bgName = "hos_bg" },
 };
 
@@ -312,29 +312,29 @@ static Map kpa_maps[] = {
     { MAP_UNSPLIT(kpa_40,  0x80240040), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_41,  0x80240040), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_50,  0x80241A40), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_51,  0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_51,  0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kpa_52,  0x80241360), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kpa_53,  0x80240190), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_53,  0x80240190), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kpa_60,  0x80240450), .bgName = "kpa_bg" },
     { MAP_UNSPLIT(kpa_61,  0x80242360), .bgName = "kpa_bg" },
     { MAP_UNSPLIT(kpa_62,  0x80240430), .bgName = "kpa_bg" },
     { MAP_UNSPLIT(kpa_63,  0x802401B0), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_70,  0x80240B10), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_81,  0x80240480), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_82,  0x80240460), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_83,  0x80240090), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_81,  0x80240480), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_82,  0x80240460), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_83,  0x80240090), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kpa_90,  0x80240020), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_91,  0x80241920), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_94,  0x80240020), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_95,  0x80241920), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_96,  0x80240040), .songVariation = 1, .flags = 1 },
-    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .flags = 3 },
-    { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .flags = 1 },
@@ -349,24 +349,24 @@ static Map kpa_maps[] = {
 /// Peach's Castle Grounds
 static Map osr_maps[] = {
     { MAP_UNSPLIT(osr_00, 0x802407E0), .bgName = "nok_bg" },
-    { MAP_UNSPLIT(osr_01, 0x80240B00), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(osr_02, 0x80240170), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(osr_03, 0x802403F0), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(osr_04, 0x802400D0), .bgName = "nok_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(osr_01, 0x80240B00), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_02, 0x80240170), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_03, 0x802403F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_04, 0x802400D0), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
 };
 
 /// Peach's Castle
 /// @bug There are two entries for kkj_26; the latter is unreachable.
 static Map kkj_maps[] = {
-    { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .songVariation = 1, .flags = 3, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .flags = 2 },
-    { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .flags = 3, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .flags = 3, .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .flags = 3 },
     { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .flags = 3, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kkj_15, 0x80240640) },
     { MAP_UNSPLIT(kkj_16, 0x80241090), .flags = 0x1 },
     { MAP_UNSPLIT(kkj_17, 0x802405B0) },
@@ -375,9 +375,9 @@ static Map kkj_maps[] = {
     { MAP_UNSPLIT(kkj_20, 0x80240600) },
     { MAP_UNSPLIT(kkj_21, 0x80240010), .flags = 0x1 },
     { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
-    { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" },
     { MAP_UNSPLIT(kkj_26, 0x80240070), .flags = 0x2 },
     { MAP_UNSPLIT(kkj_27, 0x802404C0), .flags = 0x1 },
@@ -457,7 +457,7 @@ static Map arn_maps[] = {
 
 /// Tubba Blubba's Castle
 static Map dgb_maps[] = {
-    { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInit*)0x80240000 },
     { MAP_UNSPLIT(dgb_01, 0x80243460), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(dgb_02, 0x80241470), .songVariation = 1, .flags = 2 },
     { MAP_UNSPLIT(dgb_03, 0x80242830), .songVariation = 1, .flags = 2 },
@@ -541,38 +541,38 @@ static Map sam_maps[] = {
 
 /// Crystal Palace
 static Map pra_maps[] = {
-    { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .flags = 1, .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
 };
 
 /// Shy Guy's Toy Box
@@ -611,8 +611,8 @@ static Map tst_maps[] = {
 
 /// Credits
 static Map end_maps[] = {
-    { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInitialiser*)0x80240000 },
-    { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInitialiser*)0x80240000 },
+    { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInit*)0x80240000 },
 };
 
 /// Toad Town Playroom

From b6bc2fb604aa3c215e088e2dfc5b83cb8a36a86f Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 17:36:59 -0500
Subject: [PATCH 073/101] asm refresh + new splat / symbol_addrs format

---
 asm/boot.s                                    |  100 +-
 .../code_2e230_len_2190/func_800533D0.s       |    4 +-
 .../code_303c0_len_3e10/func_80055068.s       |    4 +-
 .../code_303c0_len_3e10/func_8005591C.s       |    4 +-
 .../code_303c0_len_3e10/func_80055970.s       |    4 +-
 .../code_303c0_len_3e10/func_80055A18.s       |    4 +-
 .../code_303c0_len_3e10/func_80055A6C.s       |    4 +-
 .../code_303c0_len_3e10/func_80055B28.s       |    4 +-
 .../code_341d0_len_20d0/get_map_IDs_by_name.s |   12 +-
 .../code_e0b30_len_b80/func_8014A548.s        |   34 +-
 .../code_e0b30_len_b80/func_8014AC94.s        |   10 +-
 .../code_e0b30_len_b80/func_8014AD40.s        |    4 +-
 .../code_e0b30_len_b80/func_8014ADA4.s        |    4 +-
 .../code_e0b30_len_b80/func_8014ADF8.s        |    4 +-
 .../code_e0b30_len_b80/func_8014AE6C.s        |    4 +-
 .../code_e0b30_len_b80/func_8014AEF8.s        |    4 +-
 .../code_fa4c0_len_3bf0/func_802D5EE0.s       |    4 +-
 .../end_01/E07C20/func_802428C0_E07C20.s      |   20 +
 .../end_01/E07C20/func_80242900_E07C60.s      |   37 +
 .../end_01/E07C20/func_80242978_E07CD8.s      |   67 +
 .../end_01/E07C20/func_80242A68_E07DC8.s      |   69 +
 .../end_01/E07C20/func_80242B68_E07EC8.s      |   69 +
 .../end_01/E07C20/func_80242C68_E07FC8.s      |   15 +
 .../end_01/E07C20/func_80242C94_E07FF4.s      |   27 +
 src/world/area_end/end_01/E05390.c            |   14 -
 src/world/area_end/end_01/E07C20.c            |   15 +
 tools/sort_symbol_addrs.py                    |   26 +
 tools/splat.yaml                              |    3 +-
 tools/symbol_addrs.txt                        | 3816 ++++++++---------
 29 files changed, 2358 insertions(+), 2028 deletions(-)
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
 create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
 create mode 100644 src/world/area_end/end_01/E07C20.c
 create mode 100644 tools/sort_symbol_addrs.py

diff --git a/asm/boot.s b/asm/boot.s
index e78799c793..ec8fe6588d 100644
--- a/asm/boot.s
+++ b/asm/boot.s
@@ -15,7 +15,7 @@ glabel func_A4000040
 /* 50 A4000050 25080000 */  addiu     $t0, $t0, 0
 /* 54 A4000054 8D09000C */  lw        $t1, 0xc($t0)
 /* 58 A4000058 152000ED */  bnez      $t1, .LA4000410
-/* 5C A400005C 00000000 */   nop
+/* 5C A400005C 00000000 */   nop      
 /* 60 A4000060 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 64 A4000064 AFB30000 */  sw        $s3, ($sp)
 /* 68 A4000068 AFB40004 */  sw        $s4, 4($sp)
@@ -32,20 +32,20 @@ glabel func_A4000040
 /* 94 A4000094 AD090004 */  sw        $t1, 4($t0)
 /* 98 A4000098 24112260 */  addiu     $s1, $zero, 0x2260
 .LA400009C:
-/* 9C A400009C 00000000 */  nop
+/* 9C A400009C 00000000 */  nop       
 /* A0 A40000A0 2231FFFF */  addi      $s1, $s1, -1
 /* A4 A40000A4 1620FFFD */  bnez      $s1, .LA400009C
-/* A8 A40000A8 00000000 */   nop
+/* A8 A40000A8 00000000 */   nop      
 /* AC A40000AC AD000008 */  sw        $zero, 8($t0)
 /* B0 A40000B0 34090014 */  ori       $t1, $zero, 0x14
 /* B4 A40000B4 AD09000C */  sw        $t1, 0xc($t0)
 /* B8 A40000B8 AD000000 */  sw        $zero, ($t0)
 /* BC A40000BC 24110004 */  addiu     $s1, $zero, 4
 .LA40000C0:
-/* C0 A40000C0 00000000 */  nop
+/* C0 A40000C0 00000000 */  nop       
 /* C4 A40000C4 2231FFFF */  addi      $s1, $s1, -1
 /* C8 A40000C8 1620FFFD */  bnez      $s1, .LA40000C0
-/* CC A40000CC 00000000 */   nop
+/* CC A40000CC 00000000 */   nop      
 /* D0 A40000D0 3409000E */  ori       $t1, $zero, 0xe
 /* D4 A40000D4 AD090000 */  sw        $t1, ($t0)
 /* D8 A40000D8 24110020 */  addiu     $s1, $zero, 0x20
@@ -78,11 +78,11 @@ glabel func_A4000040
 /* 140 A4000140 3C110101 */  lui       $s1, 0x101
 /* 144 A4000144 26310101 */  addiu     $s1, $s1, 0x101
 /* 148 A4000148 16110005 */  bne       $s0, $s1, .LA4000160
-/* 14C A400014C 00000000 */   nop
+/* 14C A400014C 00000000 */   nop      
 /* 150 A4000150 24100200 */  addiu     $s0, $zero, 0x200
 /* 154 A4000154 35714000 */  ori       $s1, $t3, 0x4000
 /* 158 A4000158 10000003 */  b         .LA4000168
-/* 15C A400015C 00000000 */   nop
+/* 15C A400015C 00000000 */   nop      
 .LA4000160:
 /* 160 A4000160 24100400 */  addiu     $s0, $zero, 0x400
 /* 164 A4000164 35718000 */  ori       $s1, $t3, 0x8000
@@ -90,9 +90,9 @@ glabel func_A4000040
 /* 168 A4000168 AE2E0004 */  sw        $t6, 4($s1)
 /* 16C A400016C 25F5000C */  addiu     $s5, $t7, 0xc
 /* 170 A4000170 0D0001DB */  jal       func_A400076C
-/* 174 A4000174 00000000 */   nop
+/* 174 A4000174 00000000 */   nop      
 /* 178 A4000178 10400038 */  beqz      $v0, .LA400025C
-/* 17C A400017C 00000000 */   nop
+/* 17C A400017C 00000000 */   nop      
 /* 180 A4000180 AFA20000 */  sw        $v0, ($sp)
 /* 184 A4000184 24092000 */  addiu     $t1, $zero, 0x2000
 /* 188 A4000188 AD890000 */  sw        $t1, ($t4)
@@ -105,7 +105,7 @@ glabel func_A4000040
 /* 1A4 A40001A4 AD890000 */  sw        $t1, ($t4)
 /* 1A8 A40001A8 3C08B019 */  lui       $t0, 0xb019
 /* 1AC A40001AC 1568000C */  bne       $t3, $t0, .LA40001E0
-/* 1B0 A40001B0 00000000 */   nop
+/* 1B0 A40001B0 00000000 */   nop      
 /* 1B4 A40001B4 3C080800 */  lui       $t0, 0x800
 /* 1B8 A40001B8 0308C020 */  add       $t8, $t8, $t0
 /* 1BC A40001BC 0330C820 */  add       $t9, $t9, $s0
@@ -116,7 +116,7 @@ glabel func_A4000040
 /* 1D0 A40001D0 00129040 */  sll       $s2, $s2, 1
 /* 1D4 A40001D4 22520001 */  addi      $s2, $s2, 1
 /* 1D8 A40001D8 10000003 */  b         .LA40001E8
-/* 1DC A40001DC 00000000 */   nop
+/* 1DC A40001DC 00000000 */   nop      
 .LA40001E0:
 /* 1E0 A40001E0 3C080010 */  lui       $t0, 0x10
 /* 1E4 A40001E4 0288A020 */  add       $s4, $s4, $t0
@@ -130,11 +130,11 @@ glabel func_A4000040
 /* 200 A4000200 3129FFFF */  andi      $t1, $t1, 0xffff
 /* 204 A4000204 24080500 */  addiu     $t0, $zero, 0x500
 /* 208 A4000208 15280009 */  bne       $t1, $t0, .LA4000230
-/* 20C A400020C 00000000 */   nop
+/* 20C A400020C 00000000 */   nop      
 /* 210 A4000210 3C1B0100 */  lui       $k1, 0x100
 /* 214 A4000214 035BD024 */  and       $k0, $k0, $k1
 /* 218 A4000218 17400005 */  bnez      $k0, .LA4000230
-/* 21C A400021C 00000000 */   nop
+/* 21C A400021C 00000000 */   nop      
 /* 220 A4000220 3C08101C */  lui       $t0, 0x101c
 /* 224 A4000224 35080A04 */  ori       $t0, $t0, 0xa04
 /* 228 A4000228 ADE80018 */  sw        $t0, 0x18($t7)
@@ -151,7 +151,7 @@ glabel func_A4000040
 /* 24C A400024C 25AD0001 */  addiu     $t5, $t5, 1
 /* 250 A4000250 2DA80008 */  sltiu     $t0, $t5, 8
 /* 254 A4000254 1500FFC4 */  bnez      $t0, .LA4000168
-/* 258 A4000258 00000000 */   nop
+/* 258 A4000258 00000000 */   nop      
 .LA400025C:
 /* 25C A400025C 3C08C400 */  lui       $t0, 0xc400
 /* 260 A4000260 AD48000C */  sw        $t0, 0xc($t2)
@@ -163,14 +163,14 @@ glabel func_A4000040
 /* 274 A4000274 8FA90004 */  lw        $t1, 4($sp)
 /* 278 A4000278 3C08B009 */  lui       $t0, 0xb009
 /* 27C A400027C 15280016 */  bne       $t1, $t0, .LA40002D8
-/* 280 A4000280 00000000 */   nop
+/* 280 A4000280 00000000 */   nop      
 /* 284 A4000284 AE380004 */  sw        $t8, 4($s1)
 /* 288 A4000288 2735000C */  addiu     $s5, $t9, 0xc
 /* 28C A400028C 8FA40000 */  lw        $a0, ($sp)
 /* 290 A4000290 23BD0008 */  addi      $sp, $sp, 8
 /* 294 A4000294 24050001 */  addiu     $a1, $zero, 1
 /* 298 A4000298 0D00028D */  jal       func_A4000A34
-/* 29C A400029C 00000000 */   nop
+/* 29C A400029C 00000000 */   nop      
 /* 2A0 A40002A0 8EC80000 */  lw        $t0, ($s6)
 /* 2A4 A40002A4 3C080008 */  lui       $t0, 8
 /* 2A8 A40002A8 01164020 */  add       $t0, $t0, $s6
@@ -192,7 +192,7 @@ glabel func_A4000040
 /* 2E4 A40002E4 23BD0008 */  addi      $sp, $sp, 8
 /* 2E8 A40002E8 24050001 */  addiu     $a1, $zero, 1
 /* 2EC A40002EC 0D00028D */  jal       func_A4000A34
-/* 2F0 A40002F0 00000000 */   nop
+/* 2F0 A40002F0 00000000 */   nop      
 /* 2F4 A40002F4 8CE80000 */  lw        $t0, ($a3)
 /* 2F8 A40002F8 3C080008 */  lui       $t0, 8
 /* 2FC A40002FC 01074020 */  add       $t0, $t0, $a3
@@ -223,7 +223,7 @@ glabel func_A4000040
 /* 35C A400035C 24630001 */  addiu     $v1, $v1, 1
 /* 360 A4000360 006D402A */  slt       $t0, $v1, $t5
 /* 364 A4000364 1500FFC3 */  bnez      $t0, .LA4000274
-/* 368 A4000368 00000000 */   nop
+/* 368 A4000368 00000000 */   nop      
 /* 36C A400036C 3C0AA470 */  lui       $t2, 0xa470
 /* 370 A4000370 001294C0 */  sll       $s2, $s2, 0x13
 /* 374 A4000374 3C090006 */  lui       $t1, 6
@@ -266,7 +266,7 @@ glabel func_A4000040
 /* 400 A4000400 1420FFFD */  bnez      $at, .LA40003F8
 /* 404 A4000404 25080010 */   addiu    $t0, $t0, 0x10
 /* 408 A4000408 10000013 */  b         .LA4000458
-/* 40C A400040C 00000000 */   nop
+/* 40C A400040C 00000000 */   nop      
 .LA4000410:
 /* 410 A4000410 3C088000 */  lui       $t0, 0x8000
 /* 414 A4000414 25080000 */  addiu     $t0, $t0, 0
@@ -315,7 +315,7 @@ glabel func_A4000040
 /* 4B0 A40004B0 3C0C8000 */  lui       $t4, 0x8000
 /* 4B4 A40004B4 258C0000 */  addiu     $t4, $t4, 0
 /* 4B8 A40004B8 01800008 */  jr        $t4
-/* 4BC A40004BC 00000000 */   nop
+/* 4BC A40004BC 00000000 */   nop      
 
 glabel func_A40004C0
 /* 4C0 A40004C0 3C0BB000 */  lui       $t3, 0xb000
@@ -343,23 +343,23 @@ glabel func_A40004C0
 /* 514 A4000514 3C01A460 */  lui       $at, 0xa460
 /* 518 A4000518 AC2A000C */  sw        $t2, 0xc($at)
 .LA400051C:
-/* 51C A400051C 00000000 */  nop
-/* 520 A4000520 00000000 */  nop
-/* 524 A4000524 00000000 */  nop
-/* 528 A4000528 00000000 */  nop
-/* 52C A400052C 00000000 */  nop
-/* 530 A4000530 00000000 */  nop
-/* 534 A4000534 00000000 */  nop
-/* 538 A4000538 00000000 */  nop
-/* 53C A400053C 00000000 */  nop
-/* 540 A4000540 00000000 */  nop
-/* 544 A4000544 00000000 */  nop
-/* 548 A4000548 00000000 */  nop
+/* 51C A400051C 00000000 */  nop       
+/* 520 A4000520 00000000 */  nop       
+/* 524 A4000524 00000000 */  nop       
+/* 528 A4000528 00000000 */  nop       
+/* 52C A400052C 00000000 */  nop       
+/* 530 A4000530 00000000 */  nop       
+/* 534 A4000534 00000000 */  nop       
+/* 538 A4000538 00000000 */  nop       
+/* 53C A400053C 00000000 */  nop       
+/* 540 A4000540 00000000 */  nop       
+/* 544 A4000544 00000000 */  nop       
+/* 548 A4000548 00000000 */  nop       
 /* 54C A400054C 3C0BA460 */  lui       $t3, 0xa460
 /* 550 A4000550 8D6B0010 */  lw        $t3, 0x10($t3)
 /* 554 A4000554 316B0001 */  andi      $t3, $t3, 1
 /* 558 A4000558 1560FFF0 */  bnez      $t3, .LA400051C
-/* 55C A400055C 00000000 */   nop
+/* 55C A400055C 00000000 */   nop      
 /* 560 A4000560 3C0BB000 */  lui       $t3, 0xb000
 /* 564 A4000564 8D640008 */  lw        $a0, 8($t3)
 /* 568 A4000568 3C010010 */  lui       $at, 0x10
@@ -420,15 +420,15 @@ glabel func_A40004C0
 /* 634 A4000634 3C0BB000 */  lui       $t3, 0xb000
 /* 638 A4000638 8D680010 */  lw        $t0, 0x10($t3)
 /* 63C A400063C 14E80006 */  bne       $a3, $t0, .LA4000658
-/* 640 A4000640 00000000 */   nop
+/* 640 A4000640 00000000 */   nop      
 /* 644 A4000644 8D680014 */  lw        $t0, 0x14($t3)
 /* 648 A4000648 16080003 */  bne       $s0, $t0, .LA4000658
-/* 64C A400064C 00000000 */   nop
+/* 64C A400064C 00000000 */   nop      
 /* 650 A4000650 04110003 */  bal       .LA4000660
-/* 654 A4000654 00000000 */   nop
+/* 654 A4000654 00000000 */   nop      
 .LA4000658:
 /* 658 A4000658 0411FFFF */  bal       .LA4000658
-/* 65C A400065C 00000000 */   nop
+/* 65C A400065C 00000000 */   nop      
 .LA4000660:
 /* 660 A4000660 3C09A408 */  lui       $t1, 0xa408
 /* 664 A4000664 8D290000 */  lw        $t1, ($t1)
@@ -500,8 +500,8 @@ glabel func_A40004C0
 /* 758 A4000758 3C010010 */  lui       $at, 0x10
 /* 75C A400075C 01214823 */  subu      $t1, $t1, $at
 /* 760 A4000760 01200008 */  jr        $t1
-/* 764 A4000764 00000000 */   nop
-/* 768 A4000768 00000000 */  nop
+/* 764 A4000764 00000000 */   nop      
+/* 768 A4000768 00000000 */  nop       
 
 glabel func_A400076C
 /* 76C A400076C 27BDFF60 */  addiu     $sp, $sp, -0xa0
@@ -535,7 +535,7 @@ glabel func_A400076C
 /* 7DC A40007DC AFBF0064 */  sw        $ra, 0x64($sp)
 .LA40007E0:
 /* 7E0 A40007E0 0D00021D */  jal       func_A4000874
-/* 7E4 A40007E4 00000000 */   nop
+/* 7E4 A40007E4 00000000 */   nop      
 /* 7E8 A40007E8 26100001 */  addiu     $s0, $s0, 1
 /* 7EC A40007EC 2A090004 */  slti      $t1, $s0, 4
 /* 7F0 A40007F0 1520FFFB */  bnez      $t1, .LA40007E0
@@ -591,7 +591,7 @@ glabel func_A4000874
 /* 8AC A40008AC 00404825 */  or        $t1, $v0, $zero
 /* 8B0 A40008B0 0000D012 */  mflo      $k0
 /* 8B4 A40008B4 017A5821 */  addu      $t3, $t3, $k0
-/* 8B8 A40008B8 00000000 */  nop
+/* 8B8 A40008B8 00000000 */  nop       
 /* 8BC A40008BC 293A0050 */  slti      $k0, $t1, 0x50
 .LA40008C0:
 /* 8C0 A40008C0 1740FFF1 */  bnez      $k0, .LA4000888
@@ -611,7 +611,7 @@ glabel func_A4000874
 .LA40008F4:
 /* 8F4 A40008F4 27BD0020 */  addiu     $sp, $sp, 0x20
 /* 8F8 A40008F8 03E00008 */  jr        $ra
-/* 8FC A40008FC 00000000 */   nop
+/* 8FC A40008FC 00000000 */   nop      
 
 glabel func_A4000900
 /* 900 A4000900 27BDFFD8 */  addiu     $sp, $sp, -0x28
@@ -645,7 +645,7 @@ glabel func_A4000900
 /* 964 A4000964 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 968 A4000968 27BD0028 */  addiu     $sp, $sp, 0x28
 /* 96C A400096C 03E00008 */  jr        $ra
-/* 970 A4000970 00000000 */   nop
+/* 970 A4000970 00000000 */   nop      
 
 glabel func_A4000974
 /* 974 A4000974 27BDFFD8 */  addiu     $sp, $sp, -0x28
@@ -701,7 +701,7 @@ glabel func_A4000974
 /* A24 A4000A24 8FBF001C */  lw        $ra, 0x1c($sp)
 /* A28 A4000A28 27BD0028 */  addiu     $sp, $sp, 0x28
 /* A2C A4000A2C 03E00008 */  jr        $ra
-/* A30 A4000A30 00000000 */   nop
+/* A30 A4000A30 00000000 */   nop      
 
 glabel func_A4000A34
 /* A34 A4000A34 27BDFFD8 */  addiu     $sp, $sp, -0x28
@@ -741,7 +741,7 @@ glabel func_A4000A34
 /* AB4 A4000AB4 8FBF001C */  lw        $ra, 0x1c($sp)
 /* AB8 A4000AB8 27BD0028 */  addiu     $sp, $sp, 0x28
 /* ABC A4000ABC 03E00008 */  jr        $ra
-/* AC0 A4000AC0 00000000 */   nop
+/* AC0 A4000AC0 00000000 */   nop      
 
 glabel func_A4000AC4
 /* AC4 A4000AC4 27BDFFD8 */  addiu     $sp, $sp, -0x28
@@ -782,8 +782,8 @@ glabel func_A4000AC4
 /* B50 A4000B50 8FBF001C */  lw        $ra, 0x1c($sp)
 /* B54 A4000B54 27BD0028 */  addiu     $sp, $sp, 0x28
 /* B58 A4000B58 03E00008 */  jr        $ra
-/* B5C A4000B5C 00000000 */   nop
-/* B60 A4000B60 00000000 */  nop
-/* B64 A4000B64 00000000 */  nop
-/* B68 A4000B68 00000000 */  nop
-/* B6C A4000B6C 00000000 */  nop
+/* B5C A4000B5C 00000000 */   nop      
+/* B60 A4000B60 00000000 */  nop       
+/* B64 A4000B64 00000000 */  nop       
+/* B68 A4000B68 00000000 */  nop       
+/* B6C A4000B6C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s
index dfdcd1d7c9..5182d4911d 100644
--- a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s
+++ b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s
@@ -48,8 +48,8 @@ glabel func_800533D0
 /* 2E874 80053474 AE22003C */   sw       $v0, 0x3c($s1)
 /* 2E878 80053478 A62200BA */  sh        $v0, 0xba($s1)
 .L8005347C:
-/* 2E87C 8005347C 3C118008 */  lui       $s1, 0x8008
-/* 2E880 80053480 26318DB0 */  addiu     $s1, $s1, -0x7250
+/* 2E87C 8005347C 3C118008 */  lui       $s1, %hi(D_80078DB0)
+/* 2E880 80053480 26318DB0 */  addiu     $s1, $s1, %lo(D_80078DB0)
 /* 2E884 80053484 8E220000 */  lw        $v0, ($s1)
 /* 2E888 80053488 14400045 */  bnez      $v0, .L800535A0
 /* 2E88C 8005348C 00000000 */   nop      
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s
index 8c619d4066..ae25ec354e 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s
@@ -6,8 +6,8 @@ glabel func_80055068
 /* 3046C 8005506C AFB00010 */  sw        $s0, 0x10($sp)
 /* 30470 80055070 0080802D */  daddu     $s0, $a0, $zero
 /* 30474 80055074 3203000F */  andi      $v1, $s0, 0xf
-/* 30478 80055078 3C048008 */  lui       $a0, 0x8008
-/* 3047C 8005507C 94848DB4 */  lhu       $a0, -0x724c($a0)
+/* 30478 80055078 3C048008 */  lui       $a0, %hi(D_80078DB4)
+/* 3047C 8005507C 94848DB4 */  lhu       $a0, %lo(D_80078DB4)($a0)
 /* 30480 80055080 24020001 */  addiu     $v0, $zero, 1
 /* 30484 80055084 1482001E */  bne       $a0, $v0, .L80055100
 /* 30488 80055088 AFBF0014 */   sw       $ra, 0x14($sp)
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s
index 92b5a6d646..b3a1ba0c2b 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s
@@ -4,8 +4,8 @@
 glabel func_8005591C
 /* 30D1C 8005591C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 30D20 80055920 AFB00030 */  sw        $s0, 0x30($sp)
-/* 30D24 80055924 3C108008 */  lui       $s0, 0x8008
-/* 30D28 80055928 26108DB0 */  addiu     $s0, $s0, -0x7250
+/* 30D24 80055924 3C108008 */  lui       $s0, %hi(D_80078DB0)
+/* 30D28 80055928 26108DB0 */  addiu     $s0, $s0, %lo(D_80078DB0)
 /* 30D2C 8005592C 24020001 */  addiu     $v0, $zero, 1
 /* 30D30 80055930 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 30D34 80055934 AE020000 */  sw        $v0, ($s0)
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s
index 66ef33b09c..c30632e25b 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s
@@ -4,8 +4,8 @@
 glabel func_80055970
 /* 30D70 80055970 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 30D74 80055974 AFB00030 */  sw        $s0, 0x30($sp)
-/* 30D78 80055978 3C108008 */  lui       $s0, 0x8008
-/* 30D7C 8005597C 26108DB0 */  addiu     $s0, $s0, -0x7250
+/* 30D78 80055978 3C108008 */  lui       $s0, %hi(D_80078DB0)
+/* 30D7C 8005597C 26108DB0 */  addiu     $s0, $s0, %lo(D_80078DB0)
 /* 30D80 80055980 24020001 */  addiu     $v0, $zero, 1
 /* 30D84 80055984 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 30D88 80055988 AE020000 */  sw        $v0, ($s0)
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s
index c80517b7e1..b5c7716d90 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s
@@ -4,8 +4,8 @@
 glabel func_80055A18
 /* 30E18 80055A18 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 30E1C 80055A1C AFB00030 */  sw        $s0, 0x30($sp)
-/* 30E20 80055A20 3C108008 */  lui       $s0, 0x8008
-/* 30E24 80055A24 26108DB0 */  addiu     $s0, $s0, -0x7250
+/* 30E20 80055A20 3C108008 */  lui       $s0, %hi(D_80078DB0)
+/* 30E24 80055A24 26108DB0 */  addiu     $s0, $s0, %lo(D_80078DB0)
 /* 30E28 80055A28 8FA30048 */  lw        $v1, 0x48($sp)
 /* 30E2C 80055A2C 24020001 */  addiu     $v0, $zero, 1
 /* 30E30 80055A30 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s
index b9c26e6092..33f13df2da 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s
@@ -4,8 +4,8 @@
 glabel func_80055A6C
 /* 30E6C 80055A6C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 30E70 80055A70 AFB00030 */  sw        $s0, 0x30($sp)
-/* 30E74 80055A74 3C108008 */  lui       $s0, 0x8008
-/* 30E78 80055A78 26108DB0 */  addiu     $s0, $s0, -0x7250
+/* 30E74 80055A74 3C108008 */  lui       $s0, %hi(D_80078DB0)
+/* 30E78 80055A78 26108DB0 */  addiu     $s0, $s0, %lo(D_80078DB0)
 /* 30E7C 80055A7C 24020001 */  addiu     $v0, $zero, 1
 /* 30E80 80055A80 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 30E84 80055A84 AE020000 */  sw        $v0, ($s0)
diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s
index ba578d490a..1489541c05 100644
--- a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s
+++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s
@@ -4,8 +4,8 @@
 glabel func_80055B28
 /* 30F28 80055B28 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 30F2C 80055B2C AFB00030 */  sw        $s0, 0x30($sp)
-/* 30F30 80055B30 3C108008 */  lui       $s0, 0x8008
-/* 30F34 80055B34 26108DB0 */  addiu     $s0, $s0, -0x7250
+/* 30F30 80055B30 3C108008 */  lui       $s0, %hi(D_80078DB0)
+/* 30F34 80055B34 26108DB0 */  addiu     $s0, $s0, %lo(D_80078DB0)
 /* 30F38 80055B38 24030001 */  addiu     $v1, $zero, 1
 /* 30F3C 80055B3C 240207D0 */  addiu     $v0, $zero, 0x7d0
 /* 30F40 80055B40 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
index 06dcf05b20..72e6bb7711 100644
--- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
+++ b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
@@ -9,8 +9,8 @@ glabel get_map_IDs_by_name
 /* 36008 8005AC08 00A0B02D */  daddu     $s6, $a1, $zero
 /* 3600C 8005AC0C AFB7002C */  sw        $s7, 0x2c($sp)
 /* 36010 8005AC10 00C0B82D */  daddu     $s7, $a2, $zero
-/* 36014 8005AC14 3C028009 */  lui       $v0, 0x8009
-/* 36018 8005AC18 244234F0 */  addiu     $v0, $v0, 0x34f0
+/* 36014 8005AC14 3C028009 */  lui       $v0, %hi(gAreas)
+/* 36018 8005AC18 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
 /* 3601C 8005AC1C AFBF0030 */  sw        $ra, 0x30($sp)
 /* 36020 8005AC20 AFB40020 */  sw        $s4, 0x20($sp)
 /* 36024 8005AC24 AFB3001C */  sw        $s3, 0x1c($sp)
@@ -26,8 +26,8 @@ glabel get_map_IDs_by_name
 /* 36048 8005AC48 8C420000 */  lw        $v0, ($v0)
 /* 3604C 8005AC4C 18400012 */  blez      $v0, .L8005AC98
 /* 36050 8005AC50 0000802D */   daddu    $s0, $zero, $zero
-/* 36054 8005AC54 3C028009 */  lui       $v0, 0x8009
-/* 36058 8005AC58 244234F0 */  addiu     $v0, $v0, 0x34f0
+/* 36054 8005AC54 3C028009 */  lui       $v0, %hi(gAreas)
+/* 36058 8005AC58 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
 /* 3605C 8005AC5C 02429821 */  addu      $s3, $s2, $v0
 /* 36060 8005AC60 0080882D */  daddu     $s1, $a0, $zero
 .L8005AC64:
@@ -50,8 +50,8 @@ glabel get_map_IDs_by_name
 /* 3609C 8005AC9C 3C048009 */  lui       $a0, 0x8009
 /* 360A0 8005ACA0 00922021 */  addu      $a0, $a0, $s2
 /* 360A4 8005ACA4 8C8434F4 */  lw        $a0, 0x34f4($a0)
-/* 360A8 8005ACA8 3C028009 */  lui       $v0, 0x8009
-/* 360AC 8005ACAC 244234F0 */  addiu     $v0, $v0, 0x34f0
+/* 360A8 8005ACA8 3C028009 */  lui       $v0, %hi(gAreas)
+/* 360AC 8005ACAC 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
 /* 360B0 8005ACB0 1480FFE4 */  bnez      $a0, .L8005AC44
 /* 360B4 8005ACB4 26940001 */   addiu    $s4, $s4, 1
 .L8005ACB8:
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
index c9dbd5c772..644c582471 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s
@@ -4,8 +4,8 @@
 glabel func_8014A548
 /* E0C48 8014A548 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* E0C4C 8014A54C AFB1001C */  sw        $s1, 0x1c($sp)
-/* E0C50 8014A550 3C118016 */  lui       $s1, 0x8016
-/* E0C54 8014A554 26319AF0 */  addiu     $s1, $s1, -0x6510
+/* E0C50 8014A550 3C118016 */  lui       $s1, %hi(gMusicPlayers)
+/* E0C54 8014A554 26319AF0 */  addiu     $s1, $s1, %lo(gMusicPlayers)
 /* E0C58 8014A558 AFB20020 */  sw        $s2, 0x20($sp)
 /* E0C5C 8014A55C 0000902D */  daddu     $s2, $zero, $zero
 /* E0C60 8014A560 AFB30024 */  sw        $s3, 0x24($sp)
@@ -27,7 +27,7 @@ glabel func_8014A548
 /* E0C9C 8014A59C 00220821 */  addu      $at, $at, $v0
 /* E0CA0 8014A5A0 8C221290 */  lw        $v0, 0x1290($at)
 /* E0CA4 8014A5A4 00400008 */  jr        $v0
-/* E0CA8 8014A5A8 00000000 */   nop
+/* E0CA8 8014A5A8 00000000 */   nop      
 /* E0CAC 8014A5AC 96230000 */  lhu       $v1, ($s1)
 /* E0CB0 8014A5B0 30620001 */  andi      $v0, $v1, 1
 /* E0CB4 8014A5B4 1040001D */  beqz      $v0, .L8014A62C
@@ -37,24 +37,24 @@ glabel func_8014A548
 /* E0CC4 8014A5C4 1040000B */  beqz      $v0, .L8014A5F4
 /* E0CC8 8014A5C8 30620004 */   andi     $v0, $v1, 4
 /* E0CCC 8014A5CC 14400005 */  bnez      $v0, .L8014A5E4
-/* E0CD0 8014A5D0 00000000 */   nop
+/* E0CD0 8014A5D0 00000000 */   nop      
 /* E0CD4 8014A5D4 0C015671 */  jal       func_800559C4
 /* E0CD8 8014A5D8 8E040016 */   lw       $a0, 0x16($s0)
 /* E0CDC 8014A5DC 08052987 */  j         .L8014A61C
-/* E0CE0 8014A5E0 00000000 */   nop
+/* E0CE0 8014A5E0 00000000 */   nop      
 .L8014A5E4:
 /* E0CE4 8014A5E4 0C0156BC */  jal       func_80055AF0
 /* E0CE8 8014A5E8 8E040016 */   lw       $a0, 0x16($s0)
 /* E0CEC 8014A5EC 08052987 */  j         .L8014A61C
-/* E0CF0 8014A5F0 00000000 */   nop
+/* E0CF0 8014A5F0 00000000 */   nop      
 .L8014A5F4:
 /* E0CF4 8014A5F4 14400006 */  bnez      $v0, .L8014A610
-/* E0CF8 8014A5F8 00000000 */   nop
+/* E0CF8 8014A5F8 00000000 */   nop      
 /* E0CFC 8014A5FC 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D00 8014A600 0C0156AF */  jal       func_80055ABC
 /* E0D04 8014A604 0000302D */   daddu    $a2, $zero, $zero
 /* E0D08 8014A608 08052987 */  j         .L8014A61C
-/* E0D0C 8014A60C 00000000 */   nop
+/* E0D0C 8014A60C 00000000 */   nop      
 .L8014A610:
 /* E0D10 8014A610 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D14 8014A614 0C0156EE */  jal       func_80055BB8
@@ -82,7 +82,7 @@ glabel func_8014A548
 /* E0D5C 8014A65C A6220000 */   sh       $v0, ($s1)
 /* E0D60 8014A660 8E040016 */  lw        $a0, 0x16($s0)
 /* E0D64 8014A664 0C01567F */  jal       func_800559FC
-/* E0D68 8014A668 00000000 */   nop
+/* E0D68 8014A668 00000000 */   nop      
 /* E0D6C 8014A66C 5440004D */  bnel      $v0, $zero, .L8014A7A4
 /* E0D70 8014A670 26520001 */   addiu    $s2, $s2, 1
 /* E0D74 8014A674 96220000 */  lhu       $v0, ($s1)
@@ -100,7 +100,7 @@ glabel func_8014A548
 /* E0DA4 8014A6A4 30620010 */   andi     $v0, $v1, 0x10
 /* E0DA8 8014A6A8 8E04000E */  lw        $a0, 0xe($s0)
 /* E0DAC 8014A6AC 04810003 */  bgez      $a0, .L8014A6BC
-/* E0DB0 8014A6B0 00000000 */   nop
+/* E0DB0 8014A6B0 00000000 */   nop      
 /* E0DB4 8014A6B4 080529E8 */  j         .L8014A7A0
 /* E0DB8 8014A6B8 A6000000 */   sh       $zero, ($s0)
 .L8014A6BC:
@@ -113,7 +113,7 @@ glabel func_8014A548
 /* E0DD4 8014A6D4 96220000 */  lhu       $v0, ($s1)
 /* E0DD8 8014A6D8 30420020 */  andi      $v0, $v0, 0x20
 /* E0DDC 8014A6DC 1040000C */  beqz      $v0, .L8014A710
-/* E0DE0 8014A6E0 00000000 */   nop
+/* E0DE0 8014A6E0 00000000 */   nop      
 /* E0DE4 8014A6E4 8602000C */  lh        $v0, 0xc($s0)
 /* E0DE8 8014A6E8 8607000A */  lh        $a3, 0xa($s0)
 /* E0DEC 8014A6EC AFA20010 */  sw        $v0, 0x10($sp)
@@ -126,10 +126,10 @@ glabel func_8014A548
 /* E0E08 8014A708 080529C8 */  j         .L8014A720
 /* E0E0C 8014A70C A6220000 */   sh       $v0, ($s1)
 .L8014A710:
-/* E0E10 8014A710 3C048016 */  lui       $a0, 0x8016
-/* E0E14 8014A714 84849AE0 */  lh        $a0, -0x6520($a0)
+/* E0E10 8014A710 3C048016 */  lui       $a0, %hi(gMusicUnkVolume)
+/* E0E14 8014A714 84849AE0 */  lh        $a0, %lo(gMusicUnkVolume)($a0)
 /* E0E18 8014A718 0C052B21 */  jal       transition_music_volume_to
-/* E0E1C 8014A71C 00000000 */   nop
+/* E0E1C 8014A71C 00000000 */   nop      
 .L8014A720:
 /* E0E20 8014A720 8E040016 */  lw        $a0, 0x16($s0)
 /* E0E24 8014A724 0C01565C */  jal       func_80055970
@@ -143,7 +143,7 @@ glabel func_8014A548
 /* E0E44 8014A744 A6000000 */   sh       $zero, ($s0)
 .L8014A748:
 /* E0E48 8014A748 10400005 */  beqz      $v0, .L8014A760
-/* E0E4C 8014A74C 00000000 */   nop
+/* E0E4C 8014A74C 00000000 */   nop      
 /* E0E50 8014A750 A6000000 */  sh        $zero, ($s0)
 /* E0E54 8014A754 96220000 */  lhu       $v0, ($s1)
 /* E0E58 8014A758 080529E7 */  j         .L8014A79C
@@ -151,7 +151,7 @@ glabel func_8014A548
 .L8014A760:
 /* E0E60 8014A760 8E04002A */  lw        $a0, 0x2a($s0)
 /* E0E64 8014A764 0C0156CA */  jal       func_80055B28
-/* E0E68 8014A768 00000000 */   nop
+/* E0E68 8014A768 00000000 */   nop      
 /* E0E6C 8014A76C 5440000D */  bnel      $v0, $zero, .L8014A7A4
 /* E0E70 8014A770 26520001 */   addiu    $s2, $s2, 1
 /* E0E74 8014A774 8E020022 */  lw        $v0, 0x22($s0)
@@ -174,7 +174,7 @@ glabel func_8014A548
 /* E0EAC 8014A7AC 1440FF75 */  bnez      $v0, .L8014A584
 /* E0EB0 8014A7B0 26310030 */   addiu    $s1, $s1, 0x30
 /* E0EB4 8014A7B4 0C052B25 */  jal       func_8014AC94
-/* E0EB8 8014A7B8 00000000 */   nop
+/* E0EB8 8014A7B8 00000000 */   nop      
 /* E0EBC 8014A7BC 8FBF0030 */  lw        $ra, 0x30($sp)
 /* E0EC0 8014A7C0 8FB5002C */  lw        $s5, 0x2c($sp)
 /* E0EC4 8014A7C4 8FB40028 */  lw        $s4, 0x28($sp)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
index f1b97ef67a..1ce886b843 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s
@@ -25,8 +25,8 @@ glabel func_8014AC94
 /* E13E0 8014ACE0 54400001 */  bnel      $v0, $zero, .L8014ACE8
 /* E13E4 8014ACE4 0060202D */   daddu    $a0, $v1, $zero
 .L8014ACE8:
-/* E13E8 8014ACE8 3C058016 */  lui       $a1, 0x8016
-/* E13EC 8014ACEC 24A59AE6 */  addiu     $a1, $a1, -0x651a
+/* E13E8 8014ACE8 3C058016 */  lui       $a1, %hi(gMusicCurrentVolume)
+/* E13EC 8014ACEC 24A59AE6 */  addiu     $a1, $a1, %lo(gMusicCurrentVolume)
 /* E13F0 8014ACF0 00041400 */  sll       $v0, $a0, 0x10
 /* E13F4 8014ACF4 00022403 */  sra       $a0, $v0, 0x10
 /* E13F8 8014ACF8 84A20000 */  lh        $v0, ($a1)
@@ -38,10 +38,10 @@ glabel func_8014AC94
 /* E1410 8014AD10 2462FFFF */  addiu     $v0, $v1, -1
 .L8014AD14:
 /* E1414 8014AD14 A4A20000 */  sh        $v0, ($a1)
-/* E1418 8014AD18 3C048016 */  lui       $a0, 0x8016
-/* E141C 8014AD1C 84849AE6 */  lh        $a0, -0x651a($a0)
+/* E1418 8014AD18 3C048016 */  lui       $a0, %hi(gMusicCurrentVolume)
+/* E141C 8014AD1C 84849AE6 */  lh        $a0, %lo(gMusicCurrentVolume)($a0)
 /* E1420 8014AD20 0C015869 */  jal       func_800561A4
-/* E1424 8014AD24 00000000 */   nop
+/* E1424 8014AD24 00000000 */   nop      
 /* E1428 8014AD28 24020003 */  addiu     $v0, $zero, 3
 /* E142C 8014AD2C 3C018015 */  lui       $at, 0x8015
 /* E1430 8014AD30 A422F738 */  sh        $v0, -0x8c8($at)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s
index 065caa040d..843f7eb11e 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s
@@ -4,8 +4,8 @@
 glabel func_8014AD40
 /* E1440 8014AD40 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* E1444 8014AD44 AFB00010 */  sw        $s0, 0x10($sp)
-/* E1448 8014AD48 3C108016 */  lui       $s0, 0x8016
-/* E144C 8014AD4C 26109AF0 */  addiu     $s0, $s0, -0x6510
+/* E1448 8014AD48 3C108016 */  lui       $s0, %hi(gMusicPlayers)
+/* E144C 8014AD4C 26109AF0 */  addiu     $s0, $s0, %lo(gMusicPlayers)
 /* E1450 8014AD50 AFB10014 */  sw        $s1, 0x14($sp)
 /* E1454 8014AD54 0000882D */  daddu     $s1, $zero, $zero
 /* E1458 8014AD58 AFBF0018 */  sw        $ra, 0x18($sp)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s
index 138ee65425..3b03167cb0 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s
@@ -7,8 +7,8 @@ glabel func_8014ADA4
 /* E14AC 8014ADAC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* E14B0 8014ADB0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* E14B4 8014ADB4 80420071 */  lb        $v0, 0x71($v0)
-/* E14B8 8014ADB8 3C068016 */  lui       $a2, 0x8016
-/* E14BC 8014ADBC 24C69AF0 */  addiu     $a2, $a2, -0x6510
+/* E14B8 8014ADB8 3C068016 */  lui       $a2, %hi(gMusicPlayers)
+/* E14BC 8014ADBC 24C69AF0 */  addiu     $a2, $a2, %lo(gMusicPlayers)
 /* E14C0 8014ADC0 1440000A */  bnez      $v0, .L8014ADEC
 /* E14C4 8014ADC4 24030008 */   addiu    $v1, $zero, 8
 /* E14C8 8014ADC8 94C20000 */  lhu       $v0, ($a2)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s
index 7b9f6bc0ed..80ead6d3be 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s
@@ -8,8 +8,8 @@ glabel func_8014ADF8
 /* E1504 8014AE04 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* E1508 8014AE08 AFBF0018 */  sw        $ra, 0x18($sp)
 /* E150C 8014AE0C 80420071 */  lb        $v0, 0x71($v0)
-/* E1510 8014AE10 3C078016 */  lui       $a3, 0x8016
-/* E1514 8014AE14 24E79AF0 */  addiu     $a3, $a3, -0x6510
+/* E1510 8014AE10 3C078016 */  lui       $a3, %hi(gMusicPlayers)
+/* E1514 8014AE14 24E79AF0 */  addiu     $a3, $a3, %lo(gMusicPlayers)
 /* E1518 8014AE18 14400011 */  bnez      $v0, .L8014AE60
 /* E151C 8014AE1C 00A0482D */   daddu    $t1, $a1, $zero
 /* E1520 8014AE20 8CE40010 */  lw        $a0, 0x10($a3)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s
index 9030224ef6..d0cb92e4bb 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s
@@ -7,8 +7,8 @@ glabel func_8014AE6C
 /* E1574 8014AE74 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* E1578 8014AE78 AFBF0018 */  sw        $ra, 0x18($sp)
 /* E157C 8014AE7C 80420071 */  lb        $v0, 0x71($v0)
-/* E1580 8014AE80 3C068016 */  lui       $a2, 0x8016
-/* E1584 8014AE84 24C69AF0 */  addiu     $a2, $a2, -0x6510
+/* E1580 8014AE80 3C068016 */  lui       $a2, %hi(gMusicPlayers)
+/* E1584 8014AE84 24C69AF0 */  addiu     $a2, $a2, %lo(gMusicPlayers)
 /* E1588 8014AE88 14400018 */  bnez      $v0, .L8014AEEC
 /* E158C 8014AE8C 3C020002 */   lui      $v0, 2
 /* E1590 8014AE90 3C04800A */  lui       $a0, %hi(D_8009A650)
diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s
index ed3cbbc650..066759add0 100644
--- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s
+++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s
@@ -8,8 +8,8 @@ glabel func_8014AEF8
 /* E1604 8014AF04 AFBF001C */  sw        $ra, 0x1c($sp)
 /* E1608 8014AF08 AFB00018 */  sw        $s0, 0x18($sp)
 /* E160C 8014AF0C 80420071 */  lb        $v0, 0x71($v0)
-/* E1610 8014AF10 3C108016 */  lui       $s0, 0x8016
-/* E1614 8014AF14 26109AF0 */  addiu     $s0, $s0, -0x6510
+/* E1610 8014AF10 3C108016 */  lui       $s0, %hi(gMusicPlayers)
+/* E1614 8014AF14 26109AF0 */  addiu     $s0, $s0, %lo(gMusicPlayers)
 /* E1618 8014AF18 14400018 */  bnez      $v0, .L8014AF7C
 /* E161C 8014AF1C 3C030002 */   lui      $v1, 2
 /* E1620 8014AF20 3C02800A */  lui       $v0, %hi(D_8009A650)
diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s
index e4ce3a143a..552becea95 100644
--- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s
+++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s
@@ -7,8 +7,8 @@ glabel func_802D5EE0
 /* FA898 802D5EE8 8C82000C */  lw        $v0, 0xc($a0)
 /* FA89C 802D5EEC 0C0B1EAF */  jal       get_variable
 /* FA8A0 802D5EF0 8C450000 */   lw       $a1, ($v0)
-/* FA8A4 802D5EF4 3C048016 */  lui       $a0, 0x8016
-/* FA8A8 802D5EF8 24849AF0 */  addiu     $a0, $a0, -0x6510
+/* FA8A4 802D5EF4 3C048016 */  lui       $a0, %hi(gMusicPlayers)
+/* FA8A8 802D5EF8 24849AF0 */  addiu     $a0, $a0, %lo(gMusicPlayers)
 /* FA8AC 802D5EFC 00021840 */  sll       $v1, $v0, 1
 /* FA8B0 802D5F00 00621821 */  addu      $v1, $v1, $v0
 /* FA8B4 802D5F04 00031900 */  sll       $v1, $v1, 4
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s
new file mode 100644
index 0000000000..954b3db869
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s
@@ -0,0 +1,20 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802428C0_E07C20
+/* E07C20 802428C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* E07C24 802428C4 2404005B */  addiu     $a0, $zero, 0x5b
+/* E07C28 802428C8 2405FFFF */  addiu     $a1, $zero, -1
+/* E07C2C 802428CC 24060001 */  addiu     $a2, $zero, 1
+/* E07C30 802428D0 AFBF0010 */  sw        $ra, 0x10($sp)
+/* E07C34 802428D4 0C046E54 */  jal       func_8011B950
+/* E07C38 802428D8 0000382D */   daddu    $a3, $zero, $zero
+/* E07C3C 802428DC 0000202D */  daddu     $a0, $zero, $zero
+/* E07C40 802428E0 0080282D */  daddu     $a1, $a0, $zero
+/* E07C44 802428E4 0080302D */  daddu     $a2, $a0, $zero
+/* E07C48 802428E8 0C046F97 */  jal       set_background_color_blend
+/* E07C4C 802428EC 240700FF */   addiu    $a3, $zero, 0xff
+/* E07C50 802428F0 8FBF0010 */  lw        $ra, 0x10($sp)
+/* E07C54 802428F4 24020002 */  addiu     $v0, $zero, 2
+/* E07C58 802428F8 03E00008 */  jr        $ra
+/* E07C5C 802428FC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s
new file mode 100644
index 0000000000..f658cae9bb
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s
@@ -0,0 +1,37 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242900_E07C60
+/* E07C60 80242900 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* E07C64 80242904 AFB00010 */  sw        $s0, 0x10($sp)
+/* E07C68 80242908 0080802D */  daddu     $s0, $a0, $zero
+/* E07C6C 8024290C 10A00003 */  beqz      $a1, .L8024291C
+/* E07C70 80242910 AFBF0014 */   sw       $ra, 0x14($sp)
+/* E07C74 80242914 240200FF */  addiu     $v0, $zero, 0xff
+/* E07C78 80242918 AE020074 */  sw        $v0, 0x74($s0)
+.L8024291C:
+/* E07C7C 8024291C 8E020074 */  lw        $v0, 0x74($s0)
+/* E07C80 80242920 2442FFF6 */  addiu     $v0, $v0, -0xa
+/* E07C84 80242924 04410002 */  bgez      $v0, .L80242930
+/* E07C88 80242928 AE020074 */   sw       $v0, 0x74($s0)
+/* E07C8C 8024292C AE000074 */  sw        $zero, 0x74($s0)
+.L80242930:
+/* E07C90 80242930 0000202D */  daddu     $a0, $zero, $zero
+/* E07C94 80242934 0080282D */  daddu     $a1, $a0, $zero
+/* E07C98 80242938 92070077 */  lbu       $a3, 0x77($s0)
+/* E07C9C 8024293C 0C046F97 */  jal       set_background_color_blend
+/* E07CA0 80242940 0080302D */   daddu    $a2, $a0, $zero
+/* E07CA4 80242944 8E020074 */  lw        $v0, 0x74($s0)
+/* E07CA8 80242948 14400007 */  bnez      $v0, .L80242968
+/* E07CAC 8024294C 0000102D */   daddu    $v0, $zero, $zero
+/* E07CB0 80242950 2404005B */  addiu     $a0, $zero, 0x5b
+/* E07CB4 80242954 2405FFFF */  addiu     $a1, $zero, -1
+/* E07CB8 80242958 0000302D */  daddu     $a2, $zero, $zero
+/* E07CBC 8024295C 0C046E54 */  jal       func_8011B950
+/* E07CC0 80242960 00C0382D */   daddu    $a3, $a2, $zero
+/* E07CC4 80242964 24020002 */  addiu     $v0, $zero, 2
+.L80242968:
+/* E07CC8 80242968 8FBF0014 */  lw        $ra, 0x14($sp)
+/* E07CCC 8024296C 8FB00010 */  lw        $s0, 0x10($sp)
+/* E07CD0 80242970 03E00008 */  jr        $ra
+/* E07CD4 80242974 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s
new file mode 100644
index 0000000000..125c322ce3
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s
@@ -0,0 +1,67 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242978_E07CD8
+/* E07CD8 80242978 27BDFFD0 */  addiu     $sp, $sp, -0x30
+/* E07CDC 8024297C AFB20020 */  sw        $s2, 0x20($sp)
+/* E07CE0 80242980 AFBF0024 */  sw        $ra, 0x24($sp)
+/* E07CE4 80242984 AFB1001C */  sw        $s1, 0x1c($sp)
+/* E07CE8 80242988 AFB00018 */  sw        $s0, 0x18($sp)
+/* E07CEC 8024298C F7B40028 */  sdc1      $f20, 0x28($sp)
+/* E07CF0 80242990 10A00006 */  beqz      $a1, .L802429AC
+/* E07CF4 80242994 0080902D */   daddu    $s2, $a0, $zero
+/* E07CF8 80242998 8E4400AC */  lw        $a0, 0xac($s2)
+/* E07CFC 8024299C 0C00EAD2 */  jal       get_npc_safe
+/* E07D00 802429A0 00000000 */   nop      
+/* E07D04 802429A4 AE420078 */  sw        $v0, 0x78($s2)
+/* E07D08 802429A8 AE400070 */  sw        $zero, 0x70($s2)
+.L802429AC:
+/* E07D0C 802429AC 3C05444A */  lui       $a1, 0x444a
+/* E07D10 802429B0 34A58000 */  ori       $a1, $a1, 0x8000
+/* E07D14 802429B4 8E510078 */  lw        $s1, 0x78($s2)
+/* E07D18 802429B8 4480A000 */  mtc1      $zero, $f20
+/* E07D1C 802429BC 2410002D */  addiu     $s0, $zero, 0x2d
+/* E07D20 802429C0 AFB00010 */  sw        $s0, 0x10($sp)
+/* E07D24 802429C4 8E470070 */  lw        $a3, 0x70($s2)
+/* E07D28 802429C8 4406A000 */  mfc1      $a2, $f20
+/* E07D2C 802429CC 0C00A8ED */  jal       update_lerp
+/* E07D30 802429D0 24040004 */   addiu    $a0, $zero, 4
+/* E07D34 802429D4 4405A000 */  mfc1      $a1, $f20
+/* E07D38 802429D8 3C06437F */  lui       $a2, 0x437f
+/* E07D3C 802429DC E6200048 */  swc1      $f0, 0x48($s1)
+/* E07D40 802429E0 AFB00010 */  sw        $s0, 0x10($sp)
+/* E07D44 802429E4 8E470070 */  lw        $a3, 0x70($s2)
+/* E07D48 802429E8 0C00A8ED */  jal       update_lerp
+/* E07D4C 802429EC 24040004 */   addiu    $a0, $zero, 4
+/* E07D50 802429F0 3C014F00 */  lui       $at, 0x4f00
+/* E07D54 802429F4 44811000 */  mtc1      $at, $f2
+/* E07D58 802429F8 00000000 */  nop       
+/* E07D5C 802429FC 4600103E */  c.le.s    $f2, $f0
+/* E07D60 80242A00 00000000 */  nop       
+/* E07D64 80242A04 45010005 */  bc1t      .L80242A1C
+/* E07D68 80242A08 263100AC */   addiu    $s1, $s1, 0xac
+/* E07D6C 80242A0C 4600010D */  trunc.w.s $f4, $f0
+/* E07D70 80242A10 44032000 */  mfc1      $v1, $f4
+/* E07D74 80242A14 08090A8E */  j         .L80242A38
+/* E07D78 80242A18 A2230000 */   sb       $v1, ($s1)
+.L80242A1C:
+/* E07D7C 80242A1C 46020001 */  sub.s     $f0, $f0, $f2
+/* E07D80 80242A20 3C028000 */  lui       $v0, 0x8000
+/* E07D84 80242A24 4600010D */  trunc.w.s $f4, $f0
+/* E07D88 80242A28 44032000 */  mfc1      $v1, $f4
+/* E07D8C 80242A2C 00000000 */  nop       
+/* E07D90 80242A30 00621825 */  or        $v1, $v1, $v0
+/* E07D94 80242A34 A2230000 */  sb        $v1, ($s1)
+.L80242A38:
+/* E07D98 80242A38 8E430070 */  lw        $v1, 0x70($s2)
+/* E07D9C 80242A3C 24630001 */  addiu     $v1, $v1, 1
+/* E07DA0 80242A40 2862002E */  slti      $v0, $v1, 0x2e
+/* E07DA4 80242A44 AE430070 */  sw        $v1, 0x70($s2)
+/* E07DA8 80242A48 8FBF0024 */  lw        $ra, 0x24($sp)
+/* E07DAC 80242A4C 8FB20020 */  lw        $s2, 0x20($sp)
+/* E07DB0 80242A50 8FB1001C */  lw        $s1, 0x1c($sp)
+/* E07DB4 80242A54 8FB00018 */  lw        $s0, 0x18($sp)
+/* E07DB8 80242A58 D7B40028 */  ldc1      $f20, 0x28($sp)
+/* E07DBC 80242A5C 38420001 */  xori      $v0, $v0, 1
+/* E07DC0 80242A60 03E00008 */  jr        $ra
+/* E07DC4 80242A64 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s
new file mode 100644
index 0000000000..63b94e3d1c
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s
@@ -0,0 +1,69 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242A68_E07DC8
+/* E07DC8 80242A68 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* E07DCC 80242A6C AFB10014 */  sw        $s1, 0x14($sp)
+/* E07DD0 80242A70 0080882D */  daddu     $s1, $a0, $zero
+/* E07DD4 80242A74 AFBF0018 */  sw        $ra, 0x18($sp)
+/* E07DD8 80242A78 AFB00010 */  sw        $s0, 0x10($sp)
+/* E07DDC 80242A7C 8E22000C */  lw        $v0, 0xc($s1)
+/* E07DE0 80242A80 00A0802D */  daddu     $s0, $a1, $zero
+/* E07DE4 80242A84 0C0B1EAF */  jal       get_variable
+/* E07DE8 80242A88 8C450000 */   lw       $a1, ($v0)
+/* E07DEC 80242A8C 1200000C */  beqz      $s0, .L80242AC0
+/* E07DF0 80242A90 0220202D */   daddu    $a0, $s1, $zero
+/* E07DF4 80242A94 0C0B36B0 */  jal       resolve_npc
+/* E07DF8 80242A98 0040282D */   daddu    $a1, $v0, $zero
+/* E07DFC 80242A9C AE220074 */  sw        $v0, 0x74($s1)
+/* E07E00 80242AA0 C4420038 */  lwc1      $f2, 0x38($v0)
+/* E07E04 80242AA4 3C014334 */  lui       $at, 0x4334
+/* E07E08 80242AA8 44810000 */  mtc1      $at, $f0
+/* E07E0C 80242AAC 24020048 */  addiu     $v0, $zero, 0x48
+/* E07E10 80242AB0 AE220070 */  sw        $v0, 0x70($s1)
+/* E07E14 80242AB4 4600110D */  trunc.w.s $f4, $f2
+/* E07E18 80242AB8 E6240078 */  swc1      $f4, 0x78($s1)
+/* E07E1C 80242ABC E620007C */  swc1      $f0, 0x7c($s1)
+.L80242AC0:
+/* E07E20 80242AC0 C620007C */  lwc1      $f0, 0x7c($s1)
+/* E07E24 80242AC4 3C0140A0 */  lui       $at, 0x40a0
+/* E07E28 80242AC8 44816000 */  mtc1      $at, $f12
+/* E07E2C 80242ACC 8E300074 */  lw        $s0, 0x74($s1)
+/* E07E30 80242AD0 0C00A6C9 */  jal       clamp_angle
+/* E07E34 80242AD4 460C0301 */   sub.s    $f12, $f0, $f12
+/* E07E38 80242AD8 46000306 */  mov.s     $f12, $f0
+/* E07E3C 80242ADC 0C00A8D4 */  jal       cos_deg
+/* E07E40 80242AE0 E62C007C */   swc1     $f12, 0x7c($s1)
+/* E07E44 80242AE4 3C0140C0 */  lui       $at, 0x40c0
+/* E07E48 80242AE8 44811000 */  mtc1      $at, $f2
+/* E07E4C 80242AEC 00000000 */  nop       
+/* E07E50 80242AF0 46020002 */  mul.s     $f0, $f0, $f2
+/* E07E54 80242AF4 00000000 */  nop       
+/* E07E58 80242AF8 C6020038 */  lwc1      $f2, 0x38($s0)
+/* E07E5C 80242AFC 46001080 */  add.s     $f2, $f2, $f0
+/* E07E60 80242B00 E6020038 */  swc1      $f2, 0x38($s0)
+/* E07E64 80242B04 0C00A8BB */  jal       sin_deg
+/* E07E68 80242B08 C62C007C */   lwc1     $f12, 0x7c($s1)
+/* E07E6C 80242B0C 3C014020 */  lui       $at, 0x4020
+/* E07E70 80242B10 44811000 */  mtc1      $at, $f2
+/* E07E74 80242B14 00000000 */  nop       
+/* E07E78 80242B18 46020002 */  mul.s     $f0, $f0, $f2
+/* E07E7C 80242B1C 00000000 */  nop       
+/* E07E80 80242B20 C6020040 */  lwc1      $f2, 0x40($s0)
+/* E07E84 80242B24 46001080 */  add.s     $f2, $f2, $f0
+/* E07E88 80242B28 3C014334 */  lui       $at, 0x4334
+/* E07E8C 80242B2C 44816000 */  mtc1      $at, $f12
+/* E07E90 80242B30 E6020040 */  swc1      $f2, 0x40($s0)
+/* E07E94 80242B34 C620007C */  lwc1      $f0, 0x7c($s1)
+/* E07E98 80242B38 0C00A6C9 */  jal       clamp_angle
+/* E07E9C 80242B3C 46006301 */   sub.s    $f12, $f12, $f0
+/* E07EA0 80242B40 E6000034 */  swc1      $f0, 0x34($s0)
+/* E07EA4 80242B44 8E230070 */  lw        $v1, 0x70($s1)
+/* E07EA8 80242B48 2463FFFF */  addiu     $v1, $v1, -1
+/* E07EAC 80242B4C AE230070 */  sw        $v1, 0x70($s1)
+/* E07EB0 80242B50 8FBF0018 */  lw        $ra, 0x18($sp)
+/* E07EB4 80242B54 8FB10014 */  lw        $s1, 0x14($sp)
+/* E07EB8 80242B58 8FB00010 */  lw        $s0, 0x10($sp)
+/* E07EBC 80242B5C 2C620001 */  sltiu     $v0, $v1, 1
+/* E07EC0 80242B60 03E00008 */  jr        $ra
+/* E07EC4 80242B64 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s
new file mode 100644
index 0000000000..b6d654c039
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s
@@ -0,0 +1,69 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242B68_E07EC8
+/* E07EC8 80242B68 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* E07ECC 80242B6C AFB10014 */  sw        $s1, 0x14($sp)
+/* E07ED0 80242B70 0080882D */  daddu     $s1, $a0, $zero
+/* E07ED4 80242B74 AFBF0018 */  sw        $ra, 0x18($sp)
+/* E07ED8 80242B78 AFB00010 */  sw        $s0, 0x10($sp)
+/* E07EDC 80242B7C 8E22000C */  lw        $v0, 0xc($s1)
+/* E07EE0 80242B80 00A0802D */  daddu     $s0, $a1, $zero
+/* E07EE4 80242B84 0C0B1EAF */  jal       get_variable
+/* E07EE8 80242B88 8C450000 */   lw       $a1, ($v0)
+/* E07EEC 80242B8C 1200000C */  beqz      $s0, .L80242BC0
+/* E07EF0 80242B90 0220202D */   daddu    $a0, $s1, $zero
+/* E07EF4 80242B94 0C0B36B0 */  jal       resolve_npc
+/* E07EF8 80242B98 0040282D */   daddu    $a1, $v0, $zero
+/* E07EFC 80242B9C AE220074 */  sw        $v0, 0x74($s1)
+/* E07F00 80242BA0 C4420038 */  lwc1      $f2, 0x38($v0)
+/* E07F04 80242BA4 3C014334 */  lui       $at, 0x4334
+/* E07F08 80242BA8 44810000 */  mtc1      $at, $f0
+/* E07F0C 80242BAC 24020048 */  addiu     $v0, $zero, 0x48
+/* E07F10 80242BB0 AE220070 */  sw        $v0, 0x70($s1)
+/* E07F14 80242BB4 4600110D */  trunc.w.s $f4, $f2
+/* E07F18 80242BB8 E6240078 */  swc1      $f4, 0x78($s1)
+/* E07F1C 80242BBC E620007C */  swc1      $f0, 0x7c($s1)
+.L80242BC0:
+/* E07F20 80242BC0 C620007C */  lwc1      $f0, 0x7c($s1)
+/* E07F24 80242BC4 3C0140A0 */  lui       $at, 0x40a0
+/* E07F28 80242BC8 44816000 */  mtc1      $at, $f12
+/* E07F2C 80242BCC 8E300074 */  lw        $s0, 0x74($s1)
+/* E07F30 80242BD0 0C00A6C9 */  jal       clamp_angle
+/* E07F34 80242BD4 460C0300 */   add.s    $f12, $f0, $f12
+/* E07F38 80242BD8 46000306 */  mov.s     $f12, $f0
+/* E07F3C 80242BDC 0C00A8D4 */  jal       cos_deg
+/* E07F40 80242BE0 E62C007C */   swc1     $f12, 0x7c($s1)
+/* E07F44 80242BE4 3C0140C0 */  lui       $at, 0x40c0
+/* E07F48 80242BE8 44811000 */  mtc1      $at, $f2
+/* E07F4C 80242BEC 00000000 */  nop       
+/* E07F50 80242BF0 46020002 */  mul.s     $f0, $f0, $f2
+/* E07F54 80242BF4 00000000 */  nop       
+/* E07F58 80242BF8 C6020038 */  lwc1      $f2, 0x38($s0)
+/* E07F5C 80242BFC 46001080 */  add.s     $f2, $f2, $f0
+/* E07F60 80242C00 E6020038 */  swc1      $f2, 0x38($s0)
+/* E07F64 80242C04 0C00A8BB */  jal       sin_deg
+/* E07F68 80242C08 C62C007C */   lwc1     $f12, 0x7c($s1)
+/* E07F6C 80242C0C 3C014020 */  lui       $at, 0x4020
+/* E07F70 80242C10 44811000 */  mtc1      $at, $f2
+/* E07F74 80242C14 00000000 */  nop       
+/* E07F78 80242C18 46020002 */  mul.s     $f0, $f0, $f2
+/* E07F7C 80242C1C 00000000 */  nop       
+/* E07F80 80242C20 C6020040 */  lwc1      $f2, 0x40($s0)
+/* E07F84 80242C24 46001080 */  add.s     $f2, $f2, $f0
+/* E07F88 80242C28 3C014334 */  lui       $at, 0x4334
+/* E07F8C 80242C2C 44816000 */  mtc1      $at, $f12
+/* E07F90 80242C30 E6020040 */  swc1      $f2, 0x40($s0)
+/* E07F94 80242C34 C620007C */  lwc1      $f0, 0x7c($s1)
+/* E07F98 80242C38 0C00A6C9 */  jal       clamp_angle
+/* E07F9C 80242C3C 46006301 */   sub.s    $f12, $f12, $f0
+/* E07FA0 80242C40 E6000034 */  swc1      $f0, 0x34($s0)
+/* E07FA4 80242C44 8E230070 */  lw        $v1, 0x70($s1)
+/* E07FA8 80242C48 2463FFFF */  addiu     $v1, $v1, -1
+/* E07FAC 80242C4C AE230070 */  sw        $v1, 0x70($s1)
+/* E07FB0 80242C50 8FBF0018 */  lw        $ra, 0x18($sp)
+/* E07FB4 80242C54 8FB10014 */  lw        $s1, 0x14($sp)
+/* E07FB8 80242C58 8FB00010 */  lw        $s0, 0x10($sp)
+/* E07FBC 80242C5C 2C620001 */  sltiu     $v0, $v1, 1
+/* E07FC0 80242C60 03E00008 */  jr        $ra
+/* E07FC4 80242C64 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
new file mode 100644
index 0000000000..cc8a7a58d1
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
@@ -0,0 +1,15 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242C68_E07FC8
+/* E07FC8 80242C68 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* E07FCC 80242C6C AFBF0010 */  sw        $ra, 0x10($sp)
+/* E07FD0 80242C70 8C82000C */  lw        $v0, 0xc($a0)
+/* E07FD4 80242C74 0C0B1EAF */  jal       get_variable
+/* E07FD8 80242C78 8C450000 */   lw       $a1, ($v0)
+/* E07FDC 80242C7C 8FBF0010 */  lw        $ra, 0x10($sp)
+/* E07FE0 80242C80 3C018024 */  lui       $at, 0x8024
+/* E07FE4 80242C84 AC225D34 */  sw        $v0, 0x5d34($at)
+/* E07FE8 80242C88 24020002 */  addiu     $v0, $zero, 2
+/* E07FEC 80242C8C 03E00008 */  jr        $ra
+/* E07FF0 80242C90 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
new file mode 100644
index 0000000000..b21718ceab
--- /dev/null
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
@@ -0,0 +1,27 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80242C94_E07FF4
+/* E07FF4 80242C94 3C06FC12 */  lui       $a2, 0xfc12
+/* E07FF8 80242C98 34C64624 */  ori       $a2, $a2, 0x4624
+/* E07FFC 80242C9C 3C05FF8F */  lui       $a1, 0xff8f
+/* E08000 80242CA0 3C04800A */  lui       $a0, 0x800a
+/* E08004 80242CA4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* E08008 80242CA8 8C820000 */  lw        $v0, ($a0)
+/* E0800C 80242CAC 34A5FFFF */  ori       $a1, $a1, 0xffff
+/* E08010 80242CB0 0040182D */  daddu     $v1, $v0, $zero
+/* E08014 80242CB4 24420008 */  addiu     $v0, $v0, 8
+/* E08018 80242CB8 AC820000 */  sw        $v0, ($a0)
+/* E0801C 80242CBC AC660000 */  sw        $a2, ($v1)
+/* E08020 80242CC0 AC650004 */  sw        $a1, 4($v1)
+/* E08024 80242CC4 24430008 */  addiu     $v1, $v0, 8
+/* E08028 80242CC8 AC830000 */  sw        $v1, ($a0)
+/* E0802C 80242CCC 3C048024 */  lui       $a0, 0x8024
+/* E08030 80242CD0 90845D37 */  lbu       $a0, 0x5d37($a0)
+/* E08034 80242CD4 3C03FA00 */  lui       $v1, 0xfa00
+/* E08038 80242CD8 AC430000 */  sw        $v1, ($v0)
+/* E0803C 80242CDC 03E00008 */  jr        $ra
+/* E08040 80242CE0 AC440004 */   sw       $a0, 4($v0)
+/* E08044 80242CE4 00000000 */  nop       
+/* E08048 80242CE8 00000000 */  nop       
+/* E0804C 80242CEC 00000000 */  nop       
diff --git a/src/world/area_end/end_01/E05390.c b/src/world/area_end/end_01/E05390.c
index 94107c3521..a2979d96c7 100644
--- a/src/world/area_end/end_01/E05390.c
+++ b/src/world/area_end/end_01/E05390.c
@@ -47,17 +47,3 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8_E07B48);
 INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840_E07BA0);
 
 INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C_E07BFC);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0_E07C20);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242900_E07C60);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242978_E07CD8);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242A68_E07DC8);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68_E07EC8);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68_E07FC8);
-
-INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94_E07FF4);
diff --git a/src/world/area_end/end_01/E07C20.c b/src/world/area_end/end_01/E07C20.c
new file mode 100644
index 0000000000..8b2f6350ad
--- /dev/null
+++ b/src/world/area_end/end_01/E07C20.c
@@ -0,0 +1,15 @@
+#include "end_01.h"
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_802428C0_E07C20);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242900_E07C60);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242978_E07CD8);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242A68_E07DC8);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242B68_E07EC8);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C68_E07FC8);
+
+INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C94_E07FF4);
diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py
new file mode 100644
index 0000000000..071c20706a
--- /dev/null
+++ b/tools/sort_symbol_addrs.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python3
+
+from collections import OrderedDict
+import os
+import sys
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+
+syms = {}
+
+file_path = os.path.join(script_dir, "symbol_addrs.txt")
+
+with open(file_path) as f:
+    symbol_lines = f.readlines()
+
+for line in symbol_lines:
+    addr_text = line.split(" = ")[1][:10]
+    addr = int(addr_text, 0)
+    if addr in syms:
+        print("Duplicate address: " + addr_text)
+        sys.exit(55)
+    syms[addr] = line
+
+with open("test.txt", newline="\n", mode="w") as f:
+    for addr in sorted(syms):
+        f.write(syms[addr])
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 12d0deebb3..ea63745321 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -488,7 +488,7 @@ segments:
     files:
       - [0x33E8C0, "c"]
       - [0x33efe0, "bin"]
-  - [0x33D610, "bin"]
+  - [0x33F210, "bin"]
   - type: code
     start: 0x33FE80
     vram: 0xE002C000
@@ -6436,6 +6436,7 @@ segments:
       - [0xE05360, "c"]
       - [0xE05370, "c"]
       - [0xE05390, "c"]
+      - [0xE07C20, "c"]
       - [0xE08050, "c"]
       - [0xE08350, "bin"]
       - [0xE08470, "bin"]
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 3db8a5f395..dddb3344c8 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1,1909 +1,1907 @@
-ActorExists;0x8026DE5C
-ActorSpeak;0x80252F30
-AddActorDecoration;0x8026EE88
-AddActorPos;0x8026B92C
-AddActorVar;0x8026C0D4
-AddBadge;0x802D6FF8
-AddBattleCamOffsetZ;0x8024EA98
-AddBattleCamZoom;0x8024ECAC
-AddCoin;0x802D7278
-AddGoalPos;0x8026A748
-AddItem;0x802D6A98
-AddKeyItem;0x802D68C8
-AddPartDispOffset;0x8026BD88
-AddPartMovementVar;0x8026C2E8
-AddStarPieces;0x802D72F0
-AddStarPoints;0x802D72B4
-AddVectorPolar;0x802D4B14
-AdjustCam;0x802CC660
-AfflictActor;0x8027D67C
-ApplyShrinkFromOwner;0x80254198
-AssignAreaFlag;0x80111FF8
-AssignBlockFlag;0x8011206C
-AssignCrateFlag;0x80112170
-AssignFlag;0x801120B8
-AssignPanelFlag;0x80112114
-AssignScript;0x80111FB0
-AwaitPlayerApproach;0x802D48AC
-AwaitPlayerLeave;0x802D4A5C
-BattleCamTargetActor;0x8024EB24
-BindHandleEvent;0x80278C20
-BindIdle;0x80278A94
-BindNextTurn;0x80278C94
-BindNpcAI;0x80044A78
-BindNpcAux;0x80044EB8
-BindNpcDefeat;0x800451DC
-BindNpcHit;0x80045140
-BindNpcIdle;0x80044BAC
-BindNpcInteract;0x800450A4
-BindTakeTurn;0x80278930
-BoostAttack;0x8026FCD4
-BoostDefense;0x80270174
-BringPartnerOut;0x802CF5B8
-BtlBringPartnerOut;0x80280B6C
-BtlPutPartnerAway;0x80280A34
-CancelMessage;0x802D0C20
-CancelMessageAndBlock;0x802D0C48
-CancelablePlayerRunToGoal;0x80273EFC
-ChangeModelAnimation;0x802CCF6C
-CheckActionState;0x802831DC
-CheckButtonDown;0x8026E108
-CheckButtonHeld;0x8026E0D0
-CheckButtonPress;0x8026E098
-ChooseNextTarget;0x8026E414
-ClampAngleFloat;0x802D5AB4
-ClampAngleInt;0x802D5A58
-ClearAmbientSounds;0x802D60E8
-ClearDefeatedEnemies;0x80045640
-ClearPartnerMoveHistory;0x802CF370
-ClearStatusEffects;0x8027DDA0
-CloneModel;0x802C8F28
-CloseActionCommandInfo;0x80269410
-CloseChoice;0x802D0BF8
-CloseMessage;0x802D0A98
-ContinueSpeech;0x802D02E8
-CopyBuffs;0x80271160
-CopyStatusEffects;0x8027DCBC
-CountFortressKeys;0x802D6C4C
-CountPlayerTargets;0x8026A14C
-CreateNpc;0x802CDBA4
-CreatePartShadow;0x8026F52C
-CreatePushBlockGrid;0x802832E0
-DeleteNpc;0x802CDC1C
-DeletePartner;0x802807A8
-DeleteTrigger;0x802C6824
-DemoJoystickRadial;0x802D9B64
-DemoJoystickXY;0x802D9C10
-DemoPressButton;0x802D9AC0
-DemoReleaseButton;0x802D9AF8
-DemoSetButtons;0x802D9B34
-DidActionSucceed;0x80276EB4
-Disable8bitMario;0x802D2B88
-DisablePartner;0x802D1F38
-DisablePartnerAI;0x802CF4E8
-DisablePartnerBlur;0x802456D8
-DisablePlayerInput;0x802D0E28
-DisablePlayerPhysics;0x802D0DE4
-DisablePulseStone;0x802D2AA8
-DispatchDamageEvent;0x8027D1BC
-DispatchDamagePlayerEvent;0x8027491C
-DispatchEvent;0x8027D264
-DoAirLift;0x8029C37C
-DoBasicAI;0x8004A47C
-DoBlowAway;0x8029C4A8
-DoBurnHit;0x8029A0D0
-DoDeath;0x8029AEC0
-DoDizzyAttack;0x8028907C
-DoDizzyHit;0x802945FC
-DoFreezeHit;0x8029466C
-DoImmune;0x8029AC70
-DoJumpBack;0x8029BD70
-DoNormalHit;0x80299044
-DoNpcDefeat;0x8004462C
-DoParalyzeHit;0x80294618
-DoPoisonHit;0x80294634
-DoRecover;0x8029BFA0
-DoReturnHome;0x8029BEB8
-DoScareAway;0x8029B22C
-DoShinkHit;0x802946B8
-DoShockHit;0x8029A6FC
-DoSleepHit;0x802945E0
-DoSpinSmashHit;0x8029B998
-DoStopHit;0x80294650
-DropItemEntity;0x802D6DC0
-DropItemEntityB;0x802D6EC0
-DropStarPoints;0x8027C8A4
-ElectrifyActor;0x8027095C
-EnableActorBlur;0x8027D57C
-EnableActorGlow;0x8027DBA4
-EnableGroup;0x802C9B98
-EnableIdleScript;0x80278B4C
-EnableModel;0x802C9288
-EnableNpcAI;0x80044CF0
-EnableNpcAux;0x80044FF0
-EnableNpcBlur;0x802CF2EC
-EnableNpcShadow;0x802CF268
-EnablePartner;0x802D1EFC
-EnablePartnerAI;0x802CF52C
-EnablePartnerBlur;0x802456B8
-EnablePlayerBlur;0x80274978
-EnableSpriteShading;0x802D9A3C
-EnableStatusMenu;0x802D5998
-EnableTexPanning;0x802C9208
-EndActorSpeech;0x802532D0
-EndSpeech;0x802D02CC
-EnemyCreateTargetList;0x8026E310
-EnemyDamageTarget;0x8027CCB4
-EnemyFollowupAfflictTarget;0x8027CED4
-EnemyTestTarget;0x8027CFB8
-EnterDoubleDoor;0x80285E74
-EnterSavePoint;0x80285CB0
-EnterSingleDoor;0x80285DD4
-EnterWalk;0x80285960
-EnterWalkShort;0x80285A60
-ExitDoubleDoor;0x80285E4C
-ExitSingleDoor;0x80285DAC
-ExitWalk;0x80285CF4
-FXRecoverFP;0x80261C68
-FXRecoverHP;0x80261BA8
-FadeBackgroundToBlack;0x8003EF00
-FadeInMusic;0x802D5DF4
-FadeOutMusic;0x802D5CE0
-FallPartTo;0x8027A854
-FallToGoal;0x80279BEC
-FindItem;0x802D6B18
-FindKeyItem;0x802D6A14
-FlyPartTo;0x8027BF38
-FlyToGoal;0x8027B624
-ForceCloseMessageBox;0x802513F0
-ForceHomePos;0x8026A1EC
-ForceNextTarget;0x80298BF0
-FreezeBattleCam;0x8024ED78
-FullyRestoreHPandFP;0x802D1EC0
-FullyRestoreSP;0x802D1EE0
-GetActionSuccess;0x80269294
-GetActionSuccessCopy;0x802694F8
-GetActorAttackBoost;0x8026FC04
-GetActorDefenseBoost;0x8026FC6C
-GetActorFlags;0x8026CF20
-GetActorHP;0x8027C6A0
-GetActorLevel;0x8027FD48
-GetActorPos;0x8026AAA8
-GetActorRotation;0x8026C56C
-GetActorScale;0x8026CA84
-GetActorSize;0x8027D8E0
-GetActorVar;0x8026BFB4
-GetActorYaw;0x8026B3C8
-GetAngleBetweenNPCs;0x802D4708
-GetAngleToNPC;0x802D47B4
-GetAngleToPlayer;0x802D4830
-GetAnimation;0x8026B238
-GetBattleFlags;0x8026CD10
-GetBattleFlags2;0x8026CDA0
-GetBattleOutcome;0x8004457C
-GetBattlePhase;0x80269E28
-GetBattleState;0x8026E140
-GetBattleVar;0x8026F694
-GetBlockResult;0x8026957C
-GetCamDistance;0x802CC084
-GetCamLookAtObjVector;0x8003F398
-GetCamPitch;0x802CBFF4
-GetCamPosA;0x802CC0F4
-GetCamPosB;0x802CC184
-GetCamPosC;0x802CC214
-GetCamPosition;0x802CC2A4
-GetCamType;0x802CBF64
-GetColliderCenter;0x802CA0AC
-GetCurrentActorType;0x8027DAD4
-GetCurrentPartner;0x802D2B0C
-GetCurrentPartnerID;0x802CFC74
-GetDamageIntensity;0x80280840
-GetDemoState;0x802D9A90
-GetDist2D;0x802D5770
-GetDistanceToGoal;0x8026E9FC
-GetEncounterState;0x8027D7C4
-GetEnemyMaxHP;0x8027C748
-GetEntryID;0x802CA460
-GetGoalPos;0x8026A820
-GetGridIndexFromPos;0x802836B8
-GetHomePos;0x8026AD74
-GetIdleGoal;0x8026A8EC
-GetIndexFromHome;0x8026A0D4
-GetIndexFromPos;0x8026A05C
-GetItemPower;0x802D732C
-GetLastDamage;0x8027DB3C
-GetLastElement;0x80269E54
-GetLastEvent;0x8027C4E0
-GetLoadType;0x802CA4C0
-GetMapID;0x802CA490
-GetMenuSelection;0x802733C4
-GetModelCenter;0x802C8F80
-GetModelIndex;0x802C8E8C
-GetNextPathPos;0x802D5524
-GetNpcAnimation;0x802CE160
-GetNpcPointer;0x802CDC58
-GetNpcPos;0x802CF0F4
-GetNpcVar;0x800453BC
-GetNpcYaw;0x802CEA10
-GetOriginalActorType;0x8027DA68
-GetOwnerEncounterTrigger;0x80044600
-GetOwnerID;0x8026DE00
-GetOwnerTarget;0x8026E8AC
-GetPartDispOffset;0x8026BAE8
-GetPartEventFlags;0x8026D488
-GetPartFlags;0x8026D218
-GetPartMovementVar;0x8026C170
-GetPartOffset;0x8026AB74
-GetPartPos;0x8026AC88
-GetPartRotation;0x8026C828
-GetPartScale;0x8026CC34
-GetPartTarget;0x8026A9B8
-GetPartTargetFlags;0x8026D2AC
-GetPartYaw;0x8026B4C0
-GetPartnerPos;0x802CF438
-GetPlayerActionState;0x802D1DD0
-GetAttackerActorID;0x8026E974
-GetPlayerAnimation;0x802D1E94
-GetPlayerHP;0x80274234
-GetPlayerPos;0x802D1DFC
-GetPlayerTargetYaw;0x802D1D28
-GetPushBlock;0x802835C0
-GetSelfAnimationFromTable;0x80045734
-GetSelfNpcID;0x80045614
-GetSelfVar;0x800452C0
-GetStatusFlags;0x8026F230
-GetTargetListLength;0x8026E864
-GetValueByRef;0x802D593C
-GotoMap;0x802CA400
-GotoMapByID;0x802CA440
-GotoMapSpecial;0x802CA420
-HPBarToCurrent;0x8026D7A8
-HPBarToHome;0x8026D664
-HasKeyItem;0x802D699C
-HasMerleeCasts;0x8003F3F4
-HasMerleeCastsLeft;0x802619C8
-HealActor;0x80270CA4
-HidePlayerShadow;0x802D0DA0
-IdleFlyToGoal;0x8027BBB8
-IdleJumpToGoal;0x8027910C
-IdleRunToGoal;0x8027A264
-IncrementPlayerFP;0x80261D60
-IncrementPlayerHP;0x80261D28
-InitTargetIterator;0x8026E354
-InterpNpcYaw;0x802CEB04
-InterpPlayerYaw;0x802D193C
-IsMessageBoxDisplayed;0x80251384
-IsPlayerWithin;0x802D4964
-ItemAfflictEnemy;0x80252924
-ItemCheckHit;0x80252D40
-ItemDamageEnemy;0x80252728
-JumpPartTo;0x8027A4E4
-JumpToGoal;0x80278D08
-JumpWithBounce;0x80279728
-LandJump;0x80279AD4
-LoadActionCommand;0x802681C0
-LoadBattleDmaData;0x80253624
-LoadBattleSection;0x80269DE4
-LoadDemoBattle;0x80044264
-LoadFreeItemScript;0x8026801C
-LoadItemScript;0x80267ED0
-LoadModelAnimation;0x802CCCEC
-LoadMoveScript;0x80268130
-LoadPath;0x802D5430
-LoadSettings;0x802CB9F8
-LoadStarPowerScript;0x80280950
-MakeDoorAdvanced;0x80281CAC
-MakeEntity;0x80111D38
-MakeItemEntity;0x802D6CC0
-MakeLerp;0x802D45B0
-MakeNpcs;0x80044298
-MakeOwnerTargetIndex;0x8027FBB8
-MakeShop;0x80281860
-MakeShopOwner;0x80281BD8
-MakeStatusField;0x80253B94
-MarioEnterStage;0x80284A40
-MerleeAttackBonus;0x80288400
-MerleeDefenseBonus;0x8028870C
-MerleeExpBonus;0x80288A58
-MerleeRunOut;0x80288398
-ModifyActorDecoration;0x8026EFF0
-ModifyColliderFlags;0x802C9DCC
-MoveBattleCamOver;0x8024EC08
-MultiplyByActorScale;0x80253FDC
-MultiplyVec2ByActorScale;0x80254048
-MultiplyVec3ByActorScale;0x802540DC
-NOP_npc_callback;0x80038470
-NOP_state;0x80112B90
-NpcFaceNpc;0x802CEE80
-NpcFacePlayer;0x802CECC8
-NpcFlyTo;0x802CE6FC
-NpcJump0;0x802CE6C4
-NpcJump1;0x802CE6E0
-NpcMoveTo;0x802CE22C
-OnDefeatEnemy;0x8003F580
-OnFleeBattleDrops;0x8003F6E8
-OverrideBattleDmaDest;0x802535F8
-PanToTarget;0x802CB79C
-ParentColliderToModel;0x802CA114
-PartnerAfflictEnemy;0x80280004
-PartnerCanUseAbility;0x802CFCA0
-PartnerDamageEnemy;0x8027FDB4
-PartnerIsFlying;0x802CFCE8
-PartnerPowerBounceEnemy;0x80280270
-PartnerTestEnemy;0x802804D0
-PauseTakeTurn;0x802789A4
-PeachEnterStage;0x80284D04
-PlayAmbientSounds;0x802D611C
-PlayDrinkFX;0x80287948
-PlayEatFX;0x802878D0
-PlayEffect;0x802D829C
-PlayLoopingSoundAtActor;0x80253974
-PlayModelAnimation;0x802CCE6C
-PlaySound;0x802D6150
-PlaySoundAt;0x802D61DC
-PlaySoundAtActor;0x8025385C
-PlaySoundAtCollider;0x802CA614
-PlaySoundAtF;0x802D636C
-PlaySoundAtModel;0x802CA558
-PlaySoundAtNpc;0x802D01AC
-PlaySoundAtPart;0x802538D0
-PlaySoundAtPlayer;0x802D2CD8
-PlayerCreateTargetList;0x8026E2CC
-PlayerDamageEnemy;0x80274260
-PlayerFaceNpc;0x802D1B04
-PlayerFallToGoal;0x80273894
-PlayerFirstStrike;0x802851FC
-PlayerHappy;0x80288D64
-PlayerJump;0x802D18E8
-PlayerJump1;0x802D1904
-PlayerJump2;0x802D1920
-PlayerLandJump;0x80273B04
-PlayerMoveTo;0x802D1134
-PlayerPowerBounceEnemy;0x802744A0
-PlayerRunToGoal;0x80273C64
-PlayerTestEnemy;0x802746F0
-PutPartnerAway;0x802CF988
-RandInt;0x802D46B0
-RegainAbility;0x80289110
-RemoveActor;0x8027C7B0
-RemoveActorDecoration;0x8026EF4C
-RemoveBadge;0x802D7050
-RemoveEffect;0x802D7AE4
-RemoveEncounter;0x80044478
-RemoveFortressKeys;0x802D6C94
-RemoveItem;0x802D6B9C
-RemoveItemAt;0x802D688C
-RemoveItemEntity;0x802D6FCC
-RemoveKeyItemAt;0x802D6858
-RemoveNpc;0x80044340
-RemovePartShadow;0x8026F59C
-RemovePlayerBuffs;0x8026F44C
-ResetActorSounds;0x8026F838
-ResetAllActorSounds;0x8026F6EC
-ResetCam;0x802CC8C8
-ResetFromLava;0x802C9ED8
-RestartNpcAI;0x80044C2C
-RestartNpcAux;0x80044F38
-ResumeTakeTurn;0x80278A1C
-RotateGroup;0x802C98D8
-RotateModel;0x802C8C64
-RunAwayFail;0x80287078
-RunAwayReset;0x80287128
-RunAwayStart;0x802868BC
-RunPartTo;0x8027ACAC
-RunToGoal;0x80279E64
-ScaleGroup;0x802C9A1C
-ScaleModel;0x802C8D88
-SetActionSuccess;0x802692C0
-SetActorDispOffset;0x8026BA04
-SetActorFlagBits;0x8026CE8C
-SetActorFlags;0x8026CE30
-SetActorIdleJumpGravity;0x8026B5D8
-SetActorIdleSpeed;0x8026B6D0
-SetActorJumpGravity;0x8026B55C
-SetActorPos;0x8026AE40
-SetActorRotation;0x8026C3AC
-SetActorRotationOffset;0x8026C4AC
-SetActorScale;0x8026C904
-SetActorScaleModifier;0x8026C9C4
-SetActorSize;0x8027D810
-SetActorSounds;0x8026F740
-SetActorSpeed;0x8026B654
-SetActorType;0x8026FB20
-SetActorVar;0x8026C044
-SetActorYaw;0x8026B358
-SetAnimation;0x8026B1B0
-SetAnimationRate;0x8026B2D0
-SetBattleCamOffsetZ;0x8024EA58
-SetBattleCamTarget;0x8024E90C
-SetBattleCamYaw;0x8024EAE4
-SetBattleCamZoom;0x8024EC6C
-SetBattleFlagBits;0x8026CD3C
-SetBattleFlagBits2;0x8026CDCC
-SetBattleInputButtons;0x8026E068
-SetBattleInputMask;0x8026E050
-SetBattleMusic;0x80044A38
-SetBattleVar;0x8026F638
-SetCamBGColor;0x802CAD98
-SetCamDistance;0x802CBBE4
-SetCamEnabled;0x802CA6C0
-SetCamFlag80;0x802CA774
-SetCamLeadPlayer;0x802CB680
-SetCamPerspective;0x802CA828
-SetCamPitch;0x802CBB48
-SetCamPosA;0x802CBC58
-SetCamPosB;0x802CBCF4
-SetCamPosC;0x802CBD90
-SetCamProperties;0x802CC3EC
-SetCamSpeed;0x802CBEF0
-SetCamTarget;0x802CAF2C
-SetCamType;0x802CBAB4
-SetCamViewport;0x802CAB18
-SetDefenseTable;0x8027CA74
-SetEncounterStatusFlags;0x80044180
-SetEnemyFlagBits;0x80045688
-SetEnemyHP;0x8027C5C8
-SetEnemyTargetOffset;0x8026B0A0
-SetForegroundModelsVisible;0x80253AEC
-SetGameMode;0x802D5A28
-SetGoalPos;0x8026A510
-SetGoalToFirstTarget;0x8026A49C
-SetGoalToHome;0x80269EC4
-SetGoalToIndex;0x80269F94
-SetGoalToTarget;0x8026A3A8
-SetGroupEnabled;0x802C9308
-SetHomePos;0x8026A2D0
-SetIdleAnimations;0x8027CB7C
-SetIdleGoal;0x8026A62C
-SetIdleGoalToHome;0x80269F2C
-SetItemFlags;0x802D7194
-SetItemPos;0x802D70D0
-SetJumpAnimations;0x8026B88C
-SetMessageBoxDuration;0x80251408
-SetMessageImages;0x802D0C70
-SetMessageString;0x802D0CEC
-SetMessageValue;0x802D0D44
-SetModelFlag10;0x802C907C
-SetModelFlags;0x802C9518
-SetMusicTrack;0x802D5D4C
-SetNpcAnimation;0x802CE0F4
-SetNpcAnimationSpeed;0x802CE1C0
-SetNpcAux;0x80044DA4
-SetNpcCollisionSize;0x802CDF8C
-SetNpcEffect;0x802D0118
-SetNpcFlagBits;0x802CF060
-SetNpcJumpscale;0x802CE088
-SetNpcPos;0x802CDCB0
-SetNpcRotation;0x802CDDB0
-SetNpcScale;0x802CDED4
-SetNpcSpeed;0x802CE01C
-SetNpcVar;0x80045320
-SetNpcYaw;0x802CEA84
-SetOwnerID;0x8026DE28
-SetOwnerTarget;0x8026E3A8
-SetPanTarget;0x802CBE2C
-SetPartAlpha;0x8026F470
-SetPartDispOffset;0x8026BC38
-SetPartEventBits;0x8026D3C8
-SetPartEventFlags;0x8026D340
-SetPartFlagBits;0x8026D010
-SetPartFlags;0x8026CF88
-SetPartGoalToTarget;0x8026A404
-SetPartJumpGravity;0x8026B74C
-SetPartMoveSpeed;0x8026B7EC
-SetPartMovementVar;0x8026C22C
-SetPartPos;0x8026AF18
-SetPartRotation;0x8026C634
-SetPartRotationOffset;0x8026C740
-SetPartScale;0x8026CB4C
-SetPartSize;0x8027D970
-SetPartSounds;0x8026FA00
-SetPartTargetFlagBits;0x8026D158
-SetPartTargetFlags;0x8026D0D0
-SetPartYaw;0x8026B438
-SetPlayerActionState;0x802D10D8
-SetPlayerAnimation;0x802D1084
-SetPlayerAnimationSpeed;0x802D1104
-SetPlayerCollisionSize;0x802D0FB0
-SetPlayerFlagBits;0x802D1D60
-SetPlayerJumpscale;0x802D1054
-SetPlayerPos;0x802D0EF0
-SetPlayerSpeed;0x802D1024
-SetPushBlock;0x8028347C
-SetPushBlockFallEffect;0x802837AC
-SetRenderMode;0x802CA4F4
-SetSelfEnemyFlagBits;0x80045524
-SetSelfEnemyFlags;0x8004550C
-SetSelfRotation;0x8004545C
-SetSelfVar;0x8004525C
-SetSpriteShading;0x802D9700
-SetStatusTable;0x8027CB08
-SetTargetActor;0x8027C548
-SetTargetOffset;0x8027D380
-SetTexPanOffset;0x802C9364
-SetTexPanner;0x802C9000
-SetValueByRef;0x802D58E0
-SetZoneEnabled;0x802CA254
-ShakeCam;0x802CB2A8
-ShakeCam1;0x802D9CB0
-ShakeCamX;0x802D9CE8
-ShowBattleChoice;0x80253538
-ShowChoice;0x802D0B6C
-ShowCoinCounter;0x800E96F8
-ShowEmote;0x802D78A0
-ShowGotItem;0x802D73A4
-ShowMessageAtScreenPos;0x802D0894
-ShowMessageAtWorldPos;0x802D095C
-ShowMessageBox;0x802512B4
-ShowShockEffect;0x8026FBB0
-ShowSleepBubble;0x802D8028
-ShowStatusMenu;0x802D59DC
-ShowVariableMessageBox;0x8025130C
-SpeakToNpc;0x802D0304
-SpeakToPlayer;0x802D02B0
-StartBattle;0x80044840
-StartBattleWith;0x80044860
-StartBossBattle;0x8004489C
-StartDefend;0x802852B8
-StartRumble;0x80254218
-StartRumbleWithParams;0x80267D9C
-StopLoopingSoundAtActor;0x80253A18
-StopSound;0x802D62B8
-SummonEnemy;0x8026DB64
-SwitchMessage;0x802D0AFC
-TeleportPartnerToPlayer;0x8028387C
-TranslateGroup;0x802C97B4
-TranslateModel;0x802C8B60
-UnfadeBackgroundFromBlack;0x8003EF98
-UpdateColliderTransform;0x802CA188
-UpdateLerp;0x802D462C
-UseCamPreset;0x8024E61C
-UseDoorSounds;0x802D6314
-UseEntryHeading;0x802D1F70
-UseExitHeading;0x802D216C
-UseIdleAnimation;0x8026F0EC
-UseLifeShroom;0x802879C0
-UseMystery;0x80293E40
-UseSettingsFrom;0x802CB860
-VanishActor;0x80270614
-WaitForBuffDone;0x8027114C
-WaitForCam;0x802CC354
-WaitForMessageBoxDone;0x802513CC
-WasStatusInflicted;0x8027DC68
-YieldTurn;0x8027D7F0
-_Genld;0x8006C0B4
-_Ldtob;0x8006BBD0
-_Ldunscale;0x8006C01C
-_Litob;0x8006B980
-_Printf;0x80064AA0
-_Putfld;0x80065020
-_add_hit_vert_to_buffer;0x8005B9A0
-_bound_script_trigger_handler;0x802C667C
-_create_npc;0x80038598
-_draw_message_box;0x8012CC08
-_get_hit_vert_index_from_buffer;0x8005B9F4
-_heap_create;0x80029030
-_heap_free;0x8002921C
-_heap_malloc;0x8002906C
-_heap_malloc_tail;0x80029164
-_heap_realloc;0x800292C4
-_load_model_textures;0x80115B44
-_load_string;0x8012591C
-_npc_jump_to;0x802CE434
-_play_sound;0x80149AB8
-_remove_part_decoration;0x8025D03C
-_set_game_mode;0x80112CA8
-_set_music_track;0x8014A7E0
-_show_message;0x802D0320
-_spr_sign_extend_12bit;0x802DD0DC
-_spr_sign_extend_16bit;0x802DD0FC
-_update_message;0x80123898
-_wrap_trig_lookup_value;0x8002A034
-activate_defend_command;0x80260B04
-add_SP;0x800EA1F4
-add_actor_decoration;0x80267190
-add_badge;0x800E773C
-add_cam_zoom;0x8024E5B4
-add_coins;0x800EA0C0
-add_fortress_keys;0x800EA398
-add_item;0x800E7574
-add_part_decoration;0x80267114
-add_star_pieces;0x800EA170
-add_star_points;0x800EA128
-add_vec2D_polar;0x80029F9C
-add_xz_vec3f;0x80264128
-add_xz_vec3f_copy1;0x802641C0
-add_xz_vec3f_copy2;0x80264258
-ai;0x8006AD64
-alAudioFrame;0x800565C0
-alHeapAlloc;0x80057F90
-alLink;0x8004B3EC
-alUnlink;0x8004B40C
-al_CopyFileTableEntry;0x8005447C
-al_CopyWords;0x80054F74
-al_DmaCopy;0x80054E00
-al_LoadBKHeaders;0x80054FC0
-al_LoadBank;0x800547C8
-al_LoadINIT;0x800542BC
-al_LoadPER;0x800544F8
-al_LoadPRG;0x800545B4
-allocate_hit_tables;0x8005AEA0
-appedGfx_npc_blur;0x8003AE38
-appendGfx_item_entity;0x801321A4
-appendGfx_model;0x80113090
-appendGfx_model_group;0x80117C94
-appendGfx_npc;0x80039FD0
-appendGfx_player;0x800E12F4
-appendGfx_player_spin;0x800E1704
-atan2;0x80029C80
-battle_heap_create;0x8002ACA0
-bcmp;0x8006B870
-bcopy;0x80064650
-begin_battle;0x80241218
-begin_state_battle;0x800338D0
-begin_state_init;0x80033540
-begin_state_intro;0x80036650
-begin_state_logos;0x80033E70
-begin_state_pause_menu;0x80034940
-begin_state_title_screen;0x80036DF0
-begin_state_world;0x80035D30
-bind_dynamic_entity_3;0x80123158
-bind_dynamic_entity_7;0x8012323C
-bind_dynamic_entity_B;0x80123320
-bind_enemy_ai;0x8003E94C
-bind_enemy_aux;0x8003E9B4
-bind_enemy_interact;0x8003EA1C
-bind_npc_ai;0x8003EA84
-bind_npc_aux;0x8003EB50
-bind_npc_interact;0x8003EC1C
-boot_idle;0x8005E90C
-boot_main;0x80025F70
-!bzero;0x80064970
-calc_enemy_damage_target;0x8027742C
-calc_enemy_test_target;0x802771F8
-calc_item_check_hit;0x802515D0
-calc_item_damage_enemy;0x802516E8
-calc_partner_damage_enemy;0x8027E328
-calc_partner_test_enemy;0x8027DF7C
-calc_player_damage_enemy;0x80271944
-calc_player_test_enemy;0x80271754
-calculate_model_sizes;0x8011612C
-cam_target_actor;0x8024E43C
-can_pause;0x800E69DC
-can_switch_to_player;0x802A5818
-cancel_message;0x80125B08
-check_block_input;0x80268ECC
-check_input_hammer;0x800E60E0
-check_input_jump;0x800E6160
-check_input_midair_jump;0x800E4FCC
-check_input_open_menus;0x800E6CE4
-check_input_spin;0x800E6268
-check_input_status_menu;0x800E728C
-check_input_use_partner;0x800DFA00
-clamp_angle;0x80029B24
-clamp_printer_coords;0x80125AB8
-clear_area_flag;0x8014554C
-clear_area_flags;0x80145390
-clear_character_set;0x80123660
-clear_dynamic_entity_list;0x801230B8
-clear_encounter_status;0x8003E400
-clear_entity_data;0x80110CB8
-clear_global_flag;0x801453E0
-clear_icon_flags;0x80144A2C
-clear_item_entity_data;0x80130FF0
-clear_item_entity_flags;0x80134188
-clear_model_data;0x80115D44
-clear_npcs;0x800384BC
-clear_partner_move_history;0x800EF45C
-clear_player_data;0x800E73A0
-clear_player_status;0x800DFC50
-clear_printers;0x80123674
-clear_saved_variables;0x80145320
-clear_script_flags;0x802C4880
-clear_script_list;0x802C31DC
-clear_trigger_data;0x80145680
-clear_virtual_models;0x80120BB0
-clone_model;0x8011B6F0
-close_action_command_instruction_popup;0x8024FB0C
-close_message;0x80125C70
-coin_counter_draw_content;0x800E92D8
-collision_check_above;0x800DE7E4
-collision_check_player_intersecting_world;0x800E4308
-collision_heap_create;0x8002AD74
-collision_heap_free;0x8002ADF4
-collision_heap_malloc;0x8002ADB0
-collision_main_above;0x800E27E0
-collision_main_lateral;0x800E363C
-contPakFileDelete;0x8005F864
-contPakFileNum;0x8005F8D0
-contPakFileOpen;0x8005F7B0
-contPakFileReadWrite;0x8005F770
-contPakFileState;0x8005F8A4
-contPakFree;0x8005F748
-contPakOpen;0x8005F6F8
-contPakRepairId;0x8005F8FC
-contQuery;0x80060870
-contReadData;0x80060738
-contReadNW;0x800607B4
-contRetrace;0x8006065C
-contRmbCheckMesg;0x8005FD10
-contRmbForceStopEndMesg;0x8005FE54
-contRmbForceStopMesg;0x8005FE0C
-contRmbStartMesg;0x8005FD58
-contRmbStopMesg;0x8005FDE4
-copy_matrix;0x80029720
-corrupted;0x8006D1D8
-corrupted_init;0x8006D080
-cos_deg;0x8002A350
-cos_rad;0x8002A1D0
-cosine;0x800293D4
-coss;0x80061F00
-count_power_plus;0x80263B10
-count_targets;0x80269660
-crash_create_monitor;0x8002C8B0
-crash_delay_msec;0x8002BF40
-crash_monitor_thread;0x8002C81C
-crash_print_fpr;0x8002C2B8
-crash_printf_string;0x8002C208
-crash_show_handler;0x8002C3B0
-create_actor;0x802653A4
-create_basic_npc;0x80038844
-create_cameras_a;0x8002DEF4
-create_cameras_b;0x8002E038
-create_entity;0x801118C4
-create_entity_shadow;0x801121CC
-create_icon;0x801414A4
-create_npcs;0x800436B0
-create_part_shadow;0x8026731C
-create_partner_npc;0x80038880
-create_popup;0x8024EF68
-create_shadow_callback;0x802E0D90
-create_shadow_from_data;0x80111BD8
-create_shadow_type;0x80112260
-create_standard_npc;0x80038864
-create_target_list;0x80262240
-create_trigger;0x8014576C
-decode_yay0;0x8006EDF0
-decrement_status_menu_disabled;0x800E9B30
-deduct_current_move_fp;0x80263BC8
-default_trigger_function_handler;0x80145670
-delete_actor;0x80240BBC
-delete_entity;0x801106D0
-delete_entity_and_unload_data;0x80110790
-delete_player_actor;0x80240D68
-delete_trigger;0x80145BF4
-disable_actor_blur;0x8025455C
-disable_entity_fog;0x80123000
-disable_npc_blur;0x8003ADAC
-disable_npc_shadow;0x8003ABFC
-disable_partner_blur;0x80254668
-disable_player_blur;0x80254914
-disable_player_input;0x800E0178
-disable_player_shadow;0x800E00E4
-disable_player_static_collisions;0x800E0114
-disable_world_fog;0x8011BB64
-dispatch_damage_event_actor;0x802786D4
-dispatch_damage_event_actor_0;0x802788F8
-dispatch_damage_event_actor_1;0x80278914
-dispatch_damage_event_partner;0x8027F9CC
-dispatch_damage_event_partner_0;0x8027FB80
-dispatch_damage_event_partner_1;0x8027FB9C
-dispatch_damage_event_player;0x802731BC
-dispatch_damage_event_player_0;0x8027337C
-dispatch_damage_event_player_1;0x802733A8
-dispatch_event_actor;0x80277160
-dispatch_event_general;0x80276F8C
-dispatch_event_partner;0x8027DE80
-dispatch_event_partner_continue_turn;0x8027DF0C
-dispatch_event_player;0x80271658
-dispatch_event_player_continue_turn;0x802716E4
-dist2D;0x80029ED4
-dist3D;0x80029F2C
-dma_copy;0x8002973C
-dma_load_string;0x80125804
-do_camera_type_0;0x8002F850
-do_camera_type_1;0x8002F290
-do_camera_type_2;0x8002ECF8
-do_camera_type_3;0x80031494
-do_camera_type_4;0x8002E910
-do_camera_type_5;0x80030000
-do_camera_type_6;0x8002F990
-do_camera_type_unused;0x8002FCE0
-do_lateral_collision;0x800DEC04
-does_script_exist;0x802C4164
-does_script_exist_by_ref;0x802C41A4
-dp;0x8006AE0C
-draw_battle_wheel;0x802A1C54
-draw_box;0x800F52E0
-draw_coin_sparkles;0x80130B0C
-draw_digit;0x801274C0
-draw_enemy_health_bars;0x8023FFA0
-draw_icon_0;0x801447A8
-draw_icon_1;0x801447C4
-draw_icon_2;0x801447E0
-draw_item_entities;0x80132C80
-draw_main_battle_ui;0x8023EA7C
-draw_number;0x8012769C
-draw_shop_items;0x80281524
-draw_status_ui;0x800E973C
-draw_string;0x801264EC
-enable_actor_blur;0x802542CC
-enable_entity_fog;0x80122FEC
-enable_npc_blur;0x8003AD24
-enable_npc_shadow;0x8003ABA0
-enable_partner_ai;0x800EF328
-enable_partner_blur;0x80254644
-enable_partner_flying;0x800ED310
-enable_partner_walking;0x800EB8A8
-enable_player_blur;0x802546D4
-enable_player_input;0x800E01A4
-enable_player_shadow;0x800E00B0
-enable_player_static_collisions;0x800E0140
-enable_world_fog;0x8011BB50
-end_battle;0x80244A50
-enemy_create_target_list;0x80263048
-enforce_hpfp_limits;0x800E786C
-entity_get_collision_flags;0x801108B8
-entity_init_BlueSwitch;0x802E2380
-entity_init_Chest;0x802E7D84
-entity_init_Hammer1Block_normal;0x802E3E00
-entity_init_Hammer23Block_normal;0x802E36E4
-entity_init_HammerBlock_small;0x802E3E30
-entity_init_HugeBlueSwitch;0x802E2408
-entry_point;0x80025C00
-exec_ShakeCam1;0x802CB56C
-exec_ShakeCamX;0x802CB5C8
-find_item;0x800E7644
-find_script_labels;0x802C3148
-fio_calc_file_checksum;0x8002B0D0
-fio_calc_header_checksum;0x8002AF40
-fio_deserialize_state;0x8002B490
-fio_erase_flash;0x8002BA1C
-fio_erase_game;0x8002B42C
-fio_fetch_saved_file_info;0x8002B154
-fio_init_flash;0x8002B84C
-fio_load_game;0x8002B2D0
-fio_read_flash;0x8002B868
-fio_save_game;0x8002B374
-fio_serialize_state;0x8002B630
-fio_validate_file_checksum;0x8002B0F8
-fio_validate_header_checksums;0x8002AF70
-fio_write_flash;0x8002B948
-fixed_var_to_float;0x802C4920
-float_to_fixed_var;0x802C496C
-free_icon;0x801448F4
-free_npc;0x800389CC
-free_npc_by_index;0x800388A0
-fx_emote;0x8006FE90
-fx_sleep_bubble;0x800707F0
-fx_sweat;0x80070790
-fx_walk_large;0x8006FAD0
-fx_walk_normal;0x8006FB30
-general_heap_create;0x8002AC00
-general_heap_free;0x8002AC78
-general_heap_malloc;0x8002AC28
-general_heap_malloc_tail;0x8002AC50
-get_actor;0x80269D6C
-get_actor_part;0x8026445C
-get_area_byte;0x80145650
-get_area_flag;0x801455F0
-get_asset_offset;0x8005ADD0
-get_background_color_blend;0x8011BE80
-get_cam_viewport;0x8002E4E8
-get_char_width;0x80125DF4
-get_clamped_angle_diff;0x80029C28
-get_coin_drop_amount;0x80048D50
-get_collider_center;0x8005BE10
-get_collider_type_by_id;0x8005BDA8
-get_current_map_config;0x8005ABD8
-get_current_map_header;0x8005ABE8
-get_current_partner_id;0x800E5088
-get_default_variation_for_song;0x8014A430
-get_defeated;0x8003EDF0
-get_defense;0x802662BC
-get_dpad_input_radial;0x8023E000
-get_dynamic_entity;0x8012363C
-get_enemy;0x8003ECE8
-get_enemy_safe;0x8003ED68
-get_entity_by_index;0x801105E8
-get_entity_fog_color;0x8012307C
-get_entity_fog_distance;0x80123060
-get_entity_list;0x80110620
-get_entity_type;0x801106A4
-get_float_variable;0x802C842C
-get_fortress_key_count;0x800EA3E4
-get_game_mode;0x80033528
-get_global_byte;0x80145538
-get_global_flag;0x801454BC
-get_global_timespace;0x802C420C
-get_icon_render_pos;0x801449AC
-get_item_count;0x800E75EC
-get_item_empty_count;0x800E7620
-get_item_entity;0x80130F58
-get_map_IDs_by_name;0x8005ABF8
-get_menu_icon;0x801448D4
-get_menu_icon_script;0x801448B0
-get_model_center_and_size;0x8011B0EC
-get_model_from_list_index;0x8011AD30
-get_model_list_index_from_tree_index;0x8011B010
-get_model_property;0x80115B0C
-get_nearest_home_index;0x80269698
-get_npc_by_index;0x80038ADC
-get_npc_pos;0x8005DE10
-get_npc_safe;0x8003AB48
-get_npc_unsafe;0x8003AAEC
-get_player_data;0x800E7564
-get_player_normal_pitch;0x80029E50
-get_player_normal_yaw;0x80029E20
-get_screen_coords;0x8002E538
-get_script_by_id;0x802C47A8
-get_script_by_index;0x802C4790
-get_shadow_by_index;0x80110604
-get_shadow_list;0x8011064C
-get_spirits_rescued;0x8002AE40
-get_stored_count;0x800E7814
-get_stored_empty_count;0x800E7848
-get_string_properties;0x80125F68
-get_string_width;0x80126474
-get_trigger_by_id;0x80145CD0
-get_variable;0x802C7ABC
-get_variable_index;0x802C7DA8
-get_variable_index_alt;0x802C7F20
-get_world_fog_color;0x8011BBD8
-get_world_fog_distance;0x8011BBB4
-gfxPreNMI_Callback;0x8002670C
-!gfxRetrace_Callback;0x8002605C
-gfx_draw_frame;0x80026B08
-goto_map;0x802CA304
-gravity_use_fall_parms;0x800E306C
-gravity_use_jump_parms;0x800E2FD0
-guFrustum;0x80062060
-guFrustumF;0x80061F30
-guLookAt;0x80062530
-guLookAtF;0x800621B0
-guLookAtHilite;0x80063244
-guLookAtHiliteF;0x800628C0
-guLookAtReflect;0x80063898
-guLookAtReflectF;0x80063320
-guMtxCat;0x80067960
-guMtxCatF;0x80067600
-guMtxF2L;0x80067500
-guMtxIdent;0x80067440
-guMtxIdentF;0x800674A0
-guMtxL2F;0x80067580
-guMtxXFMF;0x80067A70
-guMtxXFML;0x800679E0
-guNormalize;0x8006CBC0
-guOrtho;0x80063A40
-guOrthoF;0x80063910
-guPerspective;0x80063D40
-guPerspectiveF;0x80063B90
-guPosition;0x800640E8
-guPositionF;0x80063F10
-guRotate;0x80067C80
-guRotateAngles;0x80064458
-guRotateAnglesF;0x800642D0
-guRotateF;0x80067B20
-guScale;0x80067700
-guScaleF;0x800677C0
-guTranslate;0x80067820
-guTranslateF;0x80067900
-has_full_fp;0x800EA37C
-has_full_hp;0x800EA360
-heap_free;0x8002AD2C
-heap_malloc;0x8002ACE4
-heroes_is_ability_active;0x802672AC
-hide_coin_counter;0x800E9698
-hide_foreground_models;0x80267CB4
-hide_foreground_models_unsafe;0x80267BDC
-icon_set_opacity;0x80144EB0
-icon_set_tint;0x80144EFC
-increment_max_SP;0x800EA1B4
-increment_status_menu_disabled;0x800E9B54
-inflict_partner_ko;0x80266254
-inflict_status;0x80265F40
-inflict_status_set_duration;0x80266CF0
-init_demo_data;0x80038080
-init_dynamic_entity_list;0x80123114
-init_got_item;0x80131B00
-init_item_entity_list;0x801310CC
-init_menu_icon_list;0x80141300
-init_model_data;0x80115FE8
-init_npc_list;0x8003852C
-init_script_list;0x802C32EC
-init_trigger_list;0x80145728
-init_virtual_models;0x80120C58
-initialize_battle;0x8023E130
-initialize_collision;0x8005AF94
-initialize_curtains;0x8002BA40
-initialize_next_camera;0x8002E16C
-initialize_printer;0x801256A4
-initialize_status_menu;0x800E7934
-input_to_move_vector;0x800E2304
-int_to_string;0x800294C4
-integrate_gravity;0x800E3448
-intro_logos_fade_in;0x800337F8
-intro_logos_fade_out;0x80033830
-intro_logos_set_fade_alpha;0x800337D0
-intro_logos_set_fade_color;0x800337E0
-intro_logos_update_fade;0x80033874
-is_ability_active;0x800E9D48
-is_actor_hp_bar_visible;0x80253C20
-is_actortype_hpbar_visible;0x80253C9C
-is_current_partner_flying;0x800EA5A4
-!is_entity_data_loaded;0x8011115C
-is_entity_fog_enabled;0x80123050
-is_partner_ability_active;0x800EA0B8
-is_player_action_state;0x80110BB0
-is_point_within_region;0x80048FD4
-is_popup_displayed;0x8024FAB4
-is_status_menu_visible;0x800E9910
-is_trigger_bound;0x80145C6C
-is_world_fog_enabled;0x8011BBA4
-kill_all_scripts;0x802C4114
-kill_encounter;0x8003E730
-kill_enemy;0x8003E7AC
-kill_script;0x802C3F3C
-kill_script_by_ID;0x802C40AC
-ldiv;0x8006D620
-length2D;0x80028FF0
-lldiv;0x8006D6A4
-load_area_specific_entity_data;0x80110C14
-load_asset_by_name;0x8005ACE8
-load_battle;0x80072C90
-load_collision;0x8005B058
-load_data_for_models;0x8011AD48
-load_demo_battle;0x80072E14
-load_engine_data;0x80026DDC
-load_font;0x80123734
-load_font_data;0x80123708
-load_hit_asset;0x8005AFC0
-load_hit_data;0x8005B23C
-load_map_bg;0x80145D70
-load_map_by_IDs;0x8005A6F4
-load_map_script_lib;0x8005A6C0
-load_message_to_buffer;0x8012588C
-load_message_to_printer;0x80125A68
-load_model_textures;0x80115C24
-load_model_transforms;0x8011ADC8
-load_partner_actor;0x80264B74
-load_player_actor;0x802644A4
-load_simple_entity_data;0x801112A4
-load_split_entity_data;0x80111408
-load_sprite;0x802DEB0C
-load_stage_collision;0x8005B1A0
-load_string;0x80125900
-load_tattle_flags;0x80253E78
-load_tile_header;0x80114D6C
-load_virtual_model;0x80120CE0
-lookup_defense;0x80265E44
-lookup_status_chance;0x80265E98
-lookup_status_duration_mod;0x80265EEC
-make_disguise_npc;0x800E657C
-make_item_entity;0x801313F4
-make_item_entity_delayed;0x80131AC8
-make_item_entity_nodelay;0x80131A94
-make_npcs;0x8003E678
-mem_clear;0x80029600
-memcpy;0x80064A74
-memset;0x8006EDB0
-modify_collider_family_flags;0x802C9CE8
-move_cam_over;0x8024E4D8
-move_player;0x800E2778
-mtx_ident_mirror_y;0x80038478
-mtx_mirror_y;0x80254288
-next_demo_scene;0x800380F4
-npc_do_other_npc_collision;0x8003900C
-npc_do_player_collision;0x800392D8
-npc_do_world_collision;0x80038AFC
-npc_move_heading;0x8003AA54
-nuAuCleanDMABuffers;0x8004B268
-!nuAuDmaCallBack;0x8004B074
-nuAuDmaNew;0x8004B224
-nuBoot;0x8005E8B0
-nuContDataClose;0x8006060C
-nuContDataGet;0x8005F650
-nuContDataLock;0x800608C0
-nuContDataOpen;0x80060634
-nuContDataUnLock;0x800608F0
-nuContInit;0x8005F610
-nuContMgrInit;0x80060510
-nuContMgrRemove;0x800605E8
-nuContPakMgrInit;0x8005F6B0
-nuContPakMgrRemove;0x8005F6D4
-nuContQueryRead;0x80060920
-nuContRmbCheck;0x8005FEF0
-nuContRmbForceStop;0x800600A0
-nuContRmbForceStopEnd;0x800600C0
-nuContRmbMgrInit;0x8005FC8C
-nuContRmbMgrRemove;0x8005FCEC
-nuContRmbModeSet;0x8005FF90
-nuContRmbStart;0x8005FE90
-nuGfxDisplayOff;0x8005F400
-nuGfxDisplayOn;0x8005F430
-nuGfxFuncSet;0x8005F250
-nuGfxInitEX2;0x8005F560
-nuGfxPreNMIFuncSet;0x8005F290
-nuGfxRetraceWait;0x80060370
-nuGfxSetCfb;0x8005F2F0
-nuGfxSwapCfb;0x80060350
-nuGfxSwapCfbFuncSet;0x80060310
-nuGfxTaskAllEndWait;0x8005F2D0
-nuGfxTaskMgr;0x8002CA40
-!nuGfxTaskMgrInit;0x8002CB38
-nuGfxTaskStart;0x8002CCC4
-nuGfxThread;0x80060248
-nuGfxThreadStart;0x800601F0
-nuPiInit;0x8005F450
-nuPiReadRom;0x8005F490
-nuPiReadRomOverlay;0x800600E0
-!nuScAddClient;0x8005EE30
-nuScCreateScheduler;0x8005E9B0
-!nuScEventBroadcast;0x8005F0C0
-nuScEventHandler;0x8005EFA8
-nuScExecuteAudio;0x8005EBE0
-!nuScExecuteGraphics;0x8005ED14
-nuScGetAudioMQ;0x8005EF84
-nuScGetFrameRate;0x8005EF9C
-nuScGetGfxMQ;0x8005EF78
-nuScRemoveClient;0x8005EEBC
-nuScResetClientMesgType;0x8005EF38
-nuScSetFrameBufferNum;0x8005EF90
-nuScWaitTaskReady;0x8005F120
-nuSiCallBackAdd;0x800603F0
-nuSiCallBackRemove;0x80060490
-nuSiMgrInit;0x8002CE30
-nuSiMgrRestart;0x8002CFAC
-nuSiMgrStop;0x8002CF8C
-nuSiMgrThread;0x8002CFD0
-nuSiSendMesg;0x8002CF28
-open_status_menu_long;0x800E9760
-open_status_menu_short;0x800E978C
-osAfterPreNMI;0x8006A630
-osAiDeviceBusy;0x8006B850
-osAiGetLength;0x80061540
-osAiGetStatus;0x80061550
-osAiSetFrequency;0x80061560
-osAiSetNextBuffer;0x80061680
-osCartRomInit;0x80060F10
-osCheckId;0x80069DD4
-osCheckPackId;0x80069AA4
-osContAddressCrc;0x8006C860
-osContDataCrc;0x8006C8CC
-osContGetInitData;0x80061D1C
-osContGetQuery;0x80061980
-osContGetReadData;0x80061A28
-osContInit;0x80061B80
-osContRamRead;0x8006A1D0
-osContRamWrite;0x8006A3C0
-osContStartQuery;0x80061900
-osContStartReadData;0x800619A0
-osCreateMesgQueue;0x80065580
-osCreatePiManager;0x800609E0
-osCreateThread;0x80065E60
-osCreateViManager;0x80066A70
-osDequeueThread;0x80066200
-osDestroyThread;0x8006C950
-osDevMgrMain;0x80061090
-__osDisableInt;0x8006B360
-osDispatchThreadSave;0x8006B1F4
-osEPiLinkHandle;0x80060EC0
-osEPiRawReadIo;0x8006B570
-osEPiRawStartDma;0x80060B70
-osEPiRawWriteIo;0x8006B6E0
-osEPiReadIo;0x80060DC0
-osEPiStartDma;0x80060E20
-osEPiWriteIo;0x80060D60
-osExceptionPreamble;0x8006AA00
-osFlashAllErase;0x8006F308
-osFlashClearStatus;0x8006F29C
-osFlashInit;0x8006EF68
-osFlashReadArray;0x8006F75C
-osFlashReadId;0x8006F184
-osFlashReadStatus;0x8006F0B8
-osFlashSectorErase;0x8006F424
-osFlashWriteArray;0x8006F61C
-osFlashWriteBuffer;0x8006F550
-osGetActiveQueue;0x80066290
-osGetCause;0x8006C660
-osGetCount;0x80065A00
-osGetId;0x80069C08
-osGetSR;0x8006C670
-osGetThreadPri;0x80065F30
-osGetTime;0x800662A0
-osIdCheckSum;0x80069774
-osInitialize;0x8006A708
-osInsertTimer;0x80066690
-osInvalDCache;0x80061720
-osInvalICache;0x800617D0
-osJamMesg;0x800655B0
-osMapTLB;0x800667A0
-osMapTLBRdb;0x8006CA30
-__osMotorAccess;0x80067E00
-osMotorInit;0x80067F44
-contRmbControl;0x8005F920
-osPackReadData;0x80061AC4
-osPackRequestData;0x80061DD0
-osPfsAllocateFile;0x80068190
-osPfsCheckRamArea;0x80069388
-osPfsChecker;0x8006CC20
-osPfsDeclearPage;0x8006849C
-osPfsDeleteFile;0x800685C0
-osPfsFileState;0x80068C20
-osPfsFindFile;0x80068DC0
-osPfsFreeBlocks;0x80068F80
-osPfsGetInitData;0x8006D560
-osPfsGetOneChannelData;0x80069644
-osPfsGetStatus;0x800694C0
-osPfsInitPak;0x80069190
-osPfsIsPlug;0x8006D340
-osPfsNumFiles;0x80069090
-osPfsRWInode;0x80069E8C
-osPfsReadWriteFile;0x800687E0
-osPfsReleasePages;0x8006876C
-osPfsRepairId;0x80069460
-osPfsRequestData;0x8006D4BC
-osPfsRequestOneChannel;0x800695B0
-osPfsSelectBank;0x800696D0
-osPiCreateAccessQueue;0x80061450
-osPiGetAccess;0x800614A4
-osPiGetCmdQueue;0x8006B550
-osPiRawStartDma;0x8006B480
-osPiRelAccess;0x80061510
-osProbeTLB;0x80066860
-osRecvMesg;0x800656F0
-osRepairPackId;0x800697B8
-osResetGlobalIntMask;0x8006B430
-__osRestoreInt;0x8006B3D0
-osSendMesg;0x80065820
-osSetCompare;0x8006C680
-osSetEventMesg;0x80065950
-osSetFpcCsr;0x8006C690
-osSetGlobalIntMask;0x8006B3F0
-osSetIntMask;0x80060940
-osSetSR;0x8006C6A0
-osSetThreadPri;0x80065F50
-osSetTime;0x80066330
-osSetTimer;0x80066350
-osSetTimerIntr;0x80066610
-osSetWatchLo;0x8006C6B0
-osSiCreateAccessQueue;0x80065D70
-osSiDeviceBusy;0x8006D7E0
-osSiGetAccess;0x80065DC4
-osSiRawReadIo;0x8006C7C0
-osSiRawStartDma;0x80065CC0
-osSiRawWriteIo;0x8006C810
-osSiRelAccess;0x80065E30
-osSpDeviceBusy;0x8006C6C0
-osSpGetStatus;0x8006C6E0
-osSpRawStartDma;0x8006C730
-osSpSetPc;0x8006C700
-osSpSetStatus;0x8006C6F0
-osSpTaskLoad;0x80065A10
-osSpTaskStartGo;0x80065C1C
-osSpTaskYield;0x80065C50
-osSpTaskYielded;0x80065C70
-osStartThread;0x80066020
-osStopThread;0x80066140
-osSumcalc;0x80069740
-osTimerInterrupt;0x800664D4
-osTimerServicesInit;0x80066480
-osUnmapTLB;0x80066920
-osUnmapTLBAll;0x80066960
-osViBlack;0x80067380
-osViGetCurrentContext;0x8006CBA0
-osViGetCurrentFramebuffer;0x800669B0
-osViGetCurrentMode;0x80066A30
-osViGetNextFramebuffer;0x800669F0
-osViInit;0x8006CA90
-osViRepeatLine;0x800673E0
-osViSetEvent;0x80066DB0
-osViSetMode;0x80066E10
-osViSetSpecialFeatures;0x80066E60
-osViSetYScale;0x80066FD0
-osViSwapBuffer;0x80067020
-osViSwapContext;0x80067070
-osVirtualToPhysical;0x80061E90
-osWritebackDCache;0x80061850
-osWritebackDCacheAll;0x800618D0
-osYieldThread;0x80066240
-parent_collider_to_model;0x8005B780
-partner_can_use_ability;0x800EB42C
-partner_get_ride_script;0x800EB638
-partner_handle_after_battle;0x800EB6C4
-partner_handle_before_battle;0x800EB658
-partner_initialize_data;0x800EB580
-partner_kill_ability_script;0x800EB7CC
-partner_player_can_pause;0x800EB3E0
-partner_reset_data;0x800EB474
-partner_resume_ability_script;0x800EB860
-partner_suspend_ability_script;0x800EB818
-partner_test_enemy_collision;0x800EB5E4
-partner_use_ability;0x800EB314
-pause_badges_cleanup;0x80249758
-pause_badges_comparator;0x80246FE0
-pause_badges_count_all;0x80247054
-pause_badges_count_equipped;0x802470B0
-pause_badges_draw_bp_orbs;0x80247458
-pause_badges_draw_contents;0x80247508
-pause_badges_get_column;0x802471D8
-pause_badges_get_pos_x;0x8024710C
-pause_badges_get_pos_y;0x80247168
-pause_badges_get_row;0x80247220
-pause_badges_handle_input;0x802490A8
-pause_badges_init;0x80248FC0
-pause_badges_is_visible;0x80247270
-pause_badges_load_badges;0x80248D8C
-pause_badges_scroll_offset_x;0x802472A8
-pause_badges_scroll_offset_y;0x80247298
-pause_badges_try_equip;0x80247338
-pause_badges_try_remove;0x802472B0
-pause_badges_update;0x8024961C
-pause_cleanup;0x80244708;0x135EE0
-pause_draw_menu_label;0x8024EE94
-pause_draw_rect;0x80244858
-pause_get_menu_string;0x8024EE80
-pause_get_total_equipped_bp_cost;0x802447F4
-pause_handle_input;0x80244424
-pause_init;0x80244060
-pause_interp_cursor;0x80242E6C
-pause_interp_text_scroll;0x80243418
-pause_interp_vertical_scroll;0x8024346C
-pause_items_cleanup;0x8024AD90
-pause_items_comparator;0x802497B0
-pause_items_draw_contents;0x80249970
-pause_items_get_column;0x80249898
-pause_items_get_pos_x;0x802497D0
-pause_items_get_pos_y;0x80249828
-pause_items_get_row;0x802498E0
-pause_items_handle_input;0x8024A7D8
-pause_items_init;0x8024A714
-pause_items_is_visible;0x80249930
-pause_items_load_items;0x8024A4DC
-pause_items_scroll_offset_x;0x80249968
-pause_items_scroll_offset_y;0x80249958
-pause_items_update;0x8024AC54
-pause_map_cleanup;0x8024EE2C
-pause_map_draw_border_arrows;0x8024DA28
-pause_map_draw_contents;0x8024DB1C
-pause_map_draw_title;0x8024E54C
-pause_map_handle_input;0x8024E878
-pause_map_init;0x8024E604
-pause_map_update;0x8024ECB0
-pause_partners_cleanup;0x8024C984
-pause_partners_draw_contents;0x8024AEF8
-pause_partners_draw_movelist;0x8024BD38
-pause_partners_draw_movelist_flower;0x8024C0A0
-pause_partners_draw_movelist_title;0x8024C048
-pause_partners_draw_title;0x8024BBAC
-pause_partners_handle_input;0x8024C338
-pause_partners_init;0x8024C0E0
-pause_partners_load_portrait;0x8024ADE0
-pause_partners_update;0x8024C7A4
-pause_set_cursor_opacity;0x80242BA0;0x135EE0
-pause_sort_item_list;0x80244A4C
-pause_spirits_cleanup;0x8024D8D8
-pause_spirits_draw_contents;0x8024CA00
-pause_spirits_draw_title;0x8024D294
-pause_spirits_handle_input;0x8024D44C
-pause_spirits_init;0x8024D360
-pause_spirits_update;0x8024D800
-pause_stats_cleanup;0x80246F94
-pause_stats_draw_contents;0x80245980
-pause_stats_handle_input;0x80246B74
-pause_stats_init;0x80246AC8
-pause_tabs_cleanup;0x80245930
-pause_tabs_draw_badges;0x80244CC0
-pause_tabs_draw_invis;0x80244B90
-pause_tabs_draw_items;0x80244DE8
-pause_tabs_draw_map;0x80245160
-pause_tabs_draw_party;0x80244F10
-pause_tabs_draw_spirits;0x80245038
-pause_tabs_draw_stats;0x80244B98
-pause_tabs_handle_input;0x80245354
-pause_tabs_init;0x80245288
-pause_tabs_update;0x802455BC
-pause_textbox_draw_contents;0x80243570
-pause_tutorial_draw_contents;0x802437F4
-pause_tutorial_input;0x802442A0
-pause_update_cursor;0x802434DC;0x135EE0
-phys_player_land;0x800E3278
-play_ambient_sounds;0x80147368
-play_effect;0x8005A564
-play_hit_sound;0x80277004
-play_model_animation;0x80120148
-play_movement_dust_effects;0x802642F0
-play_sound;0x80149CB4
-play_sound_at_npc;0x80149D08
-play_sound_at_player;0x80149CD8
-play_sound_at_position;0x80149D5C
-player_create_target_list;0x8026302C
-player_enter_blue_pipe;0x802E8CCC
-player_jump;0x802D14E0
-poll_rumble;0x80028EE0
-proutSprintf;0x80065548
-push_entity_matrix;0x802E8E4C
-queue_render_task;0x8011D910
-rand_int;0x800299FC
-read_background_size;0x80145E28
-recover_fp;0x800EA264
-recover_hp;0x800EA2CC
-remove_actor_decoration;0x80267234
-remove_all_effects;0x8005A4E0
-remove_consumable;0x800EA47C
-remove_effect;0x8005A450
-remove_item_entity_by_index;0x801339FC
-remove_item_entity_by_reference;0x80133930
-remove_part_decoration;0x80267218
-remove_part_shadow;0x802673A0
-create_part_shadow_by_ref;0x802673E4
-remove_player_buffs;0x80267454
-render_curtains;0x8002BA80
-render_dynamic_entities;0x80123470
-render_effects;0x80059EF4
-render_entities;0x8010FEB4
-render_frame;0x8002D73C
-render_item_entities;0x80132E54
-render_menu_icon;0x80142BFC
-render_menu_icons;0x801436B4
-render_messages;0x80124204
-render_models;0x80116B90
-render_npcs;0x8003A7F0
-render_player;0x800E1138
-render_player_model;0x800E1168
-render_shadows;0x801100CC
-render_sprite;0x802DDC40
-render_ui;0x80112F58
-reset_actor_blur;0x802545AC
-reset_all_actor_sounds;0x80267A9C
-reset_partner_blur;0x8025468C
-reset_status_menu;0x800E9BB0
-resolve_npc;0x802CDAC0
-restart_script;0x802C3D04
-resume_all_group;0x802C4648
-resume_all_script;0x802C448C
-resume_group_others;0x802C471C
-resume_group_script;0x802C437C
-resume_group_script_index;0x802C4570
-round;0x80029AC4
-save_game_at_player_position;0x802E11A0
-save_ground_pos;0x800E54E0
-save_tattle_flags;0x80253D10
-set_action_state;0x800E5DA4
-set_actor_current_position;0x80269C24
-set_actor_home_position;0x80269D20
-set_actor_yaw;0x80263F68
-set_anim_timescale;0x802DD88C
-set_animation;0x80263CFC
-set_animation_rate;0x80263EB8
-set_area_byte;0x80145638
-set_area_flag;0x801455A0
-set_aux_pan_u;0x8011BC4C
-set_aux_pan_v;0x8011BC64
-set_background_color_blend;0x8011BE5C
-set_background_size;0x80145E70
-set_cam_target_pos;0x8024E520
-set_cam_viewport;0x8002E314
-set_cam_zoffset;0x8024E5E0
-set_cam_zoom;0x8024E594
-set_curtain_draw_callback;0x8002BF04
-set_curtain_fade;0x8002BF24
-set_curtain_fade_goal;0x8002BF14
-set_curtain_scale;0x8002BEEC
-set_curtain_scale_goal;0x8002BEDC
-set_defeated;0x8003EE40
-set_entity_fog_color;0x80123028
-set_entity_fog_dist;0x80123010
-set_float_variable;0x802C8640
-set_game_mode;0x800334F0
-set_global_byte;0x80145520
-set_global_flag;0x80145450
-set_global_timespace;0x802C4200
-set_goal_pos_to_part;0x80269754
-set_icon_flags;0x80144A00
-set_icon_render_pos;0x80144984
-set_item_entity_flags;0x80134148
-set_item_entity_position;0x8013420C
-set_main_pan_u;0x8011BC1C
-set_main_pan_v;0x8011BC34
-set_map_transition_effect;0x801382A0
-set_max_SP;0x800EA1D8
-set_menu_icon_script;0x801447FC
-set_message_images;0x80125B2C
-set_message_string;0x80125B3C
-set_message_value;0x80125BE8
-set_music_track;0x8014A918
-set_npc_animation;0x802CDB0C
-set_npc_shadow_scale;0x80112900
-set_npc_yaw;0x8003B340
-set_part_absolute_position;0x80269C70
-set_part_goal_to_actor_part;0x802699D8
-set_part_yaw;0x80263F9C
-set_peach_shadow_scale;0x801129D4
-set_popup_duration;0x8024FAC4
-set_script_flags;0x802C47E8
-set_script_group;0x802C4218
-set_script_priority;0x802C41D8
-set_script_timescale;0x802C41E0
-set_standard_shadow_scale;0x8011285C
-set_tex_panner;0x8011BC14
-set_ui_panel_properties;0x80147CC8
-set_variable;0x802C8098
-set_world_fog_color;0x8011BB88
-set_world_fog_dist;0x8011BB74
-set_zone_enabled;0x802CA1B8
-setup_demo_player;0x80072D2C
-setup_item_popup;0x800E6C44
-setup_partner_popup;0x800E6B78
-setup_path_data;0x802D4DAC
-show_battle_message;0x8024F960
-show_coin_counter;0x800E9518
-show_damage_popup;0x802665AC
-show_first_strike_message;0x80041C5C
-show_foreground_models;0x80267D28
-show_foreground_models_unsafe;0x80267C48
-show_message_popup;0x80250EA4
-show_variable_battle_message;0x8024FA04
-si;0x8006AD90
-si_execute_next_command;0x802C7404
-si_find_label;0x802C8890
-!si_goto_end_case;0x802C89E4
-si_goto_end_loop;0x802C8AE4
-si_goto_next_case;0x802C8A60
-si_handle_AND;0x802C6270
-si_handle_AND_const;0x802C62D4
-si_handle_OR;0x802C632C
-si_handle_OR_const;0x802C6390
-si_handle_add;0x802C5804
-si_handle_addF;0x802C5A84
-si_handle_allocate_array;0x802C6214
-si_handle_bind;0x802C6714
-si_handle_bind_lock;0x802C6B54
-si_handle_break_case;0x802C56D4
-si_handle_break_loop;0x802C4B0C
-si_handle_call;0x802C63E8
-si_handle_case_AND;0x802C549C
-si_handle_case_default;0x802C5444
-si_handle_case_equal;0x802C5030
-si_handle_case_equal_AND;0x802C55B8
-si_handle_case_equal_OR;0x802C5518
-si_handle_case_greater;0x802C5268
-si_handle_case_greater_equal;0x802C52F8
-si_handle_case_less;0x802C5148
-si_handle_case_less_equal;0x802C51D8
-si_handle_case_not_equal;0x802C50BC
-si_handle_case_range;0x802C5388
-si_handle_child_thread;0x802C6D6C
-si_handle_divide;0x802C5934
-si_handle_divideF;0x802C5BC0
-si_handle_does_script_exist;0x802C6A78
-si_handle_else;0x802C4F40
-si_handle_end_case_group;0x802C565C
-si_handle_end_child_thread;0x802C6DF4
-si_handle_end_if;0x802C4F6C
-si_handle_end_loop;0x802C4A48
-si_handle_end_switch;0x802C5718
-si_handle_end_thread;0x802C6D4C
-si_handle_exec1;0x802C646C
-si_handle_exec2;0x802C6524
-si_handle_exec_wait;0x802C65FC
-si_handle_get_1_float;0x802C5EB4
-si_handle_get_1_word;0x802C5C90
-si_handle_get_2_float;0x802C5F0C
-si_handle_get_2_word;0x802C5CC4
-si_handle_get_3_float;0x802C5F9C
-si_handle_get_3_word;0x802C5D2C
-si_handle_get_4_float;0x802C605C
-si_handle_get_4_word;0x802C5DB4
-si_handle_get_Nth_float;0x802C614C
-si_handle_get_Nth_word;0x802C5E5C
-si_handle_goto;0x802C49C0
-si_handle_if_AND;0x802C4E90
-si_handle_if_equal;0x802C4C40
-si_handle_if_greater;0x802C4D64
-si_handle_if_greater_equal;0x802C4E2C
-si_handle_if_less;0x802C4D00
-si_handle_if_less_equal;0x802C4DC8
-si_handle_if_not_AND;0x802C4EE8
-si_handle_if_not_equal;0x802C4CA0
-si_handle_jump;0x802C6640
-si_handle_kill;0x802C6870
-si_handle_label;0x802C49B8
-si_handle_loop;0x802C4A00
-si_handle_mod;0x802C59BC
-si_handle_multiply;0x802C58CC
-si_handle_multiplyF;0x802C5B54
-si_handle_print_debug_var;0x802C6E1C
-si_handle_resume;0x802C6A4C
-si_handle_resume_all;0x802C697C
-si_handle_resume_others;0x802C69E4
-si_handle_return;0x802C4998
-si_handle_set_array;0x802C61AC
-si_handle_set_const;0x802C5790
-si_handle_set_flag_array;0x802C61E0
-si_handle_set_float;0x802C57B8
-si_handle_set_float_buffer_ptr;0x802C5C5C
-si_handle_set_group;0x802C6914
-si_handle_set_int_buffer_ptr;0x802C5C28
-si_handle_set_priority;0x802C689C
-si_handle_set_timescale;0x802C68D8
-si_handle_set_var;0x802C5744
-si_handle_subtract;0x802C5868
-si_handle_subtractF;0x802C5AEC
-si_handle_suspend;0x802C6A20
-si_handle_suspend_all;0x802C6950
-si_handle_suspend_others;0x802C69A8
-si_handle_switch;0x802C4F74
-si_handle_switch_const;0x802C4FE4
-si_handle_thread;0x802C6C78
-si_handle_unbind;0x802C6850
-si_handle_wait;0x802C4B5C
-si_handle_wait_seconds;0x802C4BB8
-si_skip_else;0x802C8978
-si_skip_if;0x802C88FC
-si_standard_trigger_executor;0x802C6AD0
-sign;0x800294B0
-signF;0x80029A7C
-sin_cos_deg;0x8002A234
-sin_cos_rad;0x8002A0B4
-sin_deg;0x8002A2EC
-sin_rad;0x8002A16C
-sins;0x800645F0
-sort_items;0x800E76CC
-sort_scripts;0x802C3000
-spawn_drops;0x80048280
-spr_appendMDL_component;0x802DC8F4
-spr_draw_component;0x802DCEDC
-spr_transform_point;0x802DCD00
-sprintf;0x800654F0
-sqrtf;0x80061EF0
-start_battle;0x800446B4
-start_bounce_a;0x800E6034
-start_bounce_b;0x800E608C
-start_child_script;0x802C37C8
-start_falling;0x800E5FD0
-start_rumble;0x80028F08
-start_rumble_type;0x80267DF4
-start_script;0x802C33E0
-start_script_in_group;0x802C35D0
-status_menu_draw_number;0x800E7CA4
-status_menu_draw_stat;0x800E7E34
-status_menu_start_blinking_coins;0x800E99F4
-status_menu_start_blinking_fp;0x800E998C
-status_menu_start_blinking_hp;0x800E9920
-status_menu_start_blinking_sp;0x800E9A60
-status_menu_start_blinking_sp_bars;0x800E9AB8
-status_menu_start_blinking_starpoints;0x800E9AE4
-status_menu_stop_blinking_coins;0x800E9A38
-status_menu_stop_blinking_fp;0x800E99D0
-status_menu_stop_blinking_hp;0x800E9964
-status_menu_stop_blinking_sp;0x800E9A94
-status_menu_stop_blinking_starpoints;0x800E9B0C
-step_battle;0x800338E4
-step_current_game_mode;0x80112E78
-step_game_loop;0x80026740
-step_init_state;0x80033568
-step_intro;0x80036854
-step_logos;0x800340A4
-step_pause_menu;0x8003497C
-step_title_screen;0x800370B4
-step_world;0x80035D54
-stop_sound;0x80149C6C
-store_item;0x800E77C4
-strchr;0x80064A10
-strcmp;0x8006ED70
-strcpy;0x8006ED40
-strlen;0x80064A50
-stub_dynamic_entity_delegate;0x801230B0
-subtract_fortress_keys;0x800EA3B8
-subtract_hp;0x800EA334
-suspend_all_group;0x802C45E8
-suspend_all_script;0x802C4420
-suspend_group_others;0x802C46A8
-suspend_group_script;0x802C42D8
-suspend_group_script_index;0x802C44F8
-switch_order;0x80243918
-switch_to_partner;0x80242F00
-switch_to_player;0x80242AC8
-sync_status_menu;0x800E9B6C
-test_below_player;0x800DDFD0
-test_down_ray_triangle;0x8005C49C
-test_item_player_collision;0x80133B0C
-test_player_entity_aabb;0x80110AAC
-test_player_lateral;0x800DF460
-test_ray_colliders;0x8005CCD0
-test_ray_entities;0x8005D448
-test_ray_triangle_general;0x8005BE84
-test_ray_zone_aabb;0x80030458
-test_ray_zones;0x8005D124
-test_up_ray_collider;0x8005D2DC
-test_up_ray_triangle;0x8005C7A4
-trace_above_player;0x800DEA08
-trace_below_player;0x800DE54C
-transform_point;0x80029620
-try_inflict_status;0x80266B78
-unfreeze_cam;0x8024E600
-update_actor_shadow;0x802559BC
-update_actor_shadows;0x8023E404
-update_battle_state;0x8023E438
-update_cameras;0x8002D400
-update_coin_counter;0x800E93DC
-update_collider_transform;0x8005BA24
-update_component;0x802DD11C
-update_curtains;0x8002BA78
-update_dynamic_entities;0x80123404
-update_end_player_turn;0x80242BB0
-update_enemy_action;0x80247570
-update_enemy_change_turn;0x802472AC
-update_enemy_shadows;0x80255F5C
-update_entities;0x8010F6D0
-update_entity_inverse_rotation_matrix;0x801104A4
-update_entity_transform_matrix;0x8011022C
-update_fall_state;0x800E2D18
-update_hero_shadows;0x80255FAC
-update_heroes_start_turn;0x80242024
-update_input;0x80028874
-update_item_entities;0x80131EEC
-update_item_entity_collectable;0x80134250
-update_item_entity_static;0x80135658
-update_item_entity_temp;0x801356DC
-update_lerp;0x8002A3B4
-update_lerp_battle;0x8027B0DC
-update_locomotion_state;0x800E5F68
-update_menu_icons;0x80141610
-update_messages;0x801237D8
-update_npc_blur;0x8003ADF8
-update_npcs;0x80039930
-update_partner_action;0x80246B34
-update_partner_menu;0x802A81C8
-update_player;0x800DF740
-update_player_action;0x80245AD0
-update_player_actor_shadow;0x80257BAC
-update_player_change_turn;0x80246450
-update_player_input;0x800E1F90
-update_player_menu;0x802A5988
-update_player_move_history;0x800ED4B8
-update_player_shadow;0x800E1BC4
-update_run_away;0x80244F00
-update_scripts;0x802C3D74
-update_shadow_transform_matrix;0x80110374
-update_shadows;0x8010FA98
-update_starpoints_display;0x802403BC
-update_status_menu;0x800E80B4
-update_swap_partner;0x802456F8
-update_targeting_enemies;0x802AA688
-update_triggers;0x80145860
-use_cam_preset;0x8024CF34
-use_consumable;0x800EA400
-viMgrMain;0x80066C10
-ActorAddMovePos;0x80280880
-PlayerScriptDispatcher;0x80284EBC
-PeachScriptDispatcher;0x80285010
-ExecutePlayerAction;0x8028505C
-ExecutePeachAction;0x80285174
-HandleEvent_Player;0x802852D4
-SetForegroundModelsVisibleUnsafe;0x80253AA8
-JumpToGoalSimple2;0x80279420
-LandJumpPart;0x8027AB5C
-_advance_rng;0x80029900
-fio_has_valid_backup;0x8002AFD8
-fio_flush_backups;0x8002B04C
-COPY_set_defeated;0x8003E2E0
-GetCamLookAtObjVector;0x8003F398
-draw_submenu_title;0x800F4648
-AssignScript;0x80111FB0
-draw_menu_icon;0x80144298
-bind_trigger;0x802C4220
-bind_trigger_1;0x802C42A8
-draw_anim_models;0x802CCB18
-SetAnimModelPosition;0x802CCFE4
-GetAnimModelPosition;0x802CD090
-AddAnimModelPosition;0x802CD12C
-SetAnimModelRotation;0x802CD1F0
-SetAnimModelScale;0x802CD29C
-NpcSetHomePosToCurrent;0x802CF3BC
-!func_8002D160;0x8002D160
-!func_8002C890;0x8002C890
-func_802A91F8;0x802A91F8
-func_802A9208;0x802A9208
-func_802A9228;0x802A9228
-func_802A9234;0x802A9234
-func_802A9254;0x802A9254
-func_802A9278;0x802A9278
-func_802A928C;0x802A928C
-func_802A9294;0x802A9294
-func_802A9298;0x802A9298
-func_802A92A0;0x802A92A0
-func_802A92D4;0x802A92D4
-func_802A92DC;0x802A92DC
-func_802A92F0;0x802A92F0
-func_802A9310;0x802A9310
-func_802A936C;0x802A936C
-func_802A9378;0x802A9378
-func_802A948C;0x802A948C
-func_802A94A4;0x802A94A4
-func_802A94D8;0x802A94D8
-func_802A9544;0x802A9544
-func_802A955C;0x802A955C
-func_802A9590;0x802A9590
-func_802A959C;0x802A959C
-func_802A9634;0x802A9634
-func_802A963C;0x802A963C
-func_802A9664;0x802A9664
-func_802A96B8;0x802A96B8
-func_802A96DC;0x802A96DC
-func_802A96EC;0x802A96EC
-func_802A96F4;0x802A96F4
-func_802A9708;0x802A9708
-func_802A9718;0x802A9718
-func_802A9720;0x802A9720
-func_802A973C;0x802A973C
-func_802A9744;0x802A9744
-func_802A9764;0x802A9764
-func_802A97AC;0x802A97AC
-func_802A97BC;0x802A97BC
-func_802A97CC;0x802A97CC
-func_802A97F8;0x802A97F8
-func_802A97FC;0x802A97FC
-func_802A9810;0x802A9810
-func_802A981C;0x802A981C
-func_802A9834;0x802A9834
-func_802A984C;0x802A984C
-func_802A9894;0x802A9894
-func_802A9898;0x802A9898
-func_802A98B0;0x802A98B0
-func_802A98D0;0x802A98D0
-func_802A98DC;0x802A98DC
-func_802A98E0;0x802A98E0
-func_802A9914;0x802A9914
-func_802A992C;0x802A992C
-func_802A9990;0x802A9990
-func_802A99D4;0x802A99D4
-func_802A9A30;0x802A9A30
-func_802A9A54;0x802A9A54
-func_802AA014;0x802AA014
-func_802AA0D8;0x802AA0D8
-func_802AB330;0x802AB330
-func_802AB338;0x802AB338
-func_802B71D4;0x802B71D4
-func_802B71E8;0x802B71E8
-func_802BD7DC;0x802BD7DC
-func_802BE070;0x802BE070
-!func_8006AA34;0x8006AA34
-SetTattleString;0x80045A58
-!osEnqueueAndYield;0x8006B06C
-!osPopThread;0x8006B1BC
-!osDispatchThread;0x8006B1D4
-!osEnqueueThread;0x8006B174
-!send_mesg;0x8006AF7C
-!handle_CPU;0x8006B038
-gPauseMenuStrings;0x8026F778
-gEffectTable;0x8007F214
-gMoveScriptTable;0x80293E80
-gStaticScriptCounter;0x802D9CA0
-D_80156954;0x80156954
-D_802D9CA4;0x802D9CA4
-gCollisionStatus;0x8015A550
-gGlobalTimeSpace;0x802D9CA8
-gBattleState;0x800DC068
-gBattleDmaDest;0x80284000
-gDialogueState;0x8029FA60
-gSpeakingActorPrintCtx;0x8029FA60
-gSpeakingActorPrintIsDone;0x8029FA68
-gSpeakingActorTalkAnim;0x8029FA6C
-gSpeakingActorIdleAnim;0x8029FA70
-gSpeakingActor;0x8029FA74
-gSpeakingActorPart;0x8029FA78
-EnterWalk;0x80285960
-EnemyNpcHit;0x80077F70
-EnemyNpcDefeat;0x8007809C
-D_80078DB0;0x80078DB0
-D_80078DB4;0x80078DB4
-gMusicPlayers;0x80159AF0
-gMusicUnkVolume;0x80159AE0
-gMusicUnkVolume2;0x80159AE4
-gMusicTargetVolume;0x80159AE2
-gMusicCurrentVolume;0x80159AE6
-gAreas;0x800934F0
-gSongArray;0x8014F720
-D_802D9D50;0x802D9D50
+entry_point = 0x80025C00;
+boot_main = 0x80025F70;
+gfxRetrace_Callback = 0x8002605C; // !
+gfxPreNMI_Callback = 0x8002670C;
+step_game_loop = 0x80026740;
+gfx_draw_frame = 0x80026B08;
+load_engine_data = 0x80026DDC;
+update_input = 0x80028874;
+poll_rumble = 0x80028EE0;
+start_rumble = 0x80028F08;
+length2D = 0x80028FF0;
+_heap_create = 0x80029030;
+_heap_malloc = 0x8002906C;
+_heap_malloc_tail = 0x80029164;
+_heap_free = 0x8002921C;
+_heap_realloc = 0x800292C4;
+cosine = 0x800293D4;
+sign = 0x800294B0;
+int_to_string = 0x800294C4;
+mem_clear = 0x80029600;
+transform_point = 0x80029620;
+copy_matrix = 0x80029720;
+dma_copy = 0x8002973C;
+_advance_rng = 0x80029900;
+rand_int = 0x800299FC;
+signF = 0x80029A7C;
+round = 0x80029AC4;
+clamp_angle = 0x80029B24;
+get_clamped_angle_diff = 0x80029C28;
+atan2 = 0x80029C80;
+get_player_normal_yaw = 0x80029E20;
+get_player_normal_pitch = 0x80029E50;
+dist2D = 0x80029ED4;
+dist3D = 0x80029F2C;
+add_vec2D_polar = 0x80029F9C;
+_wrap_trig_lookup_value = 0x8002A034;
+sin_cos_rad = 0x8002A0B4;
+sin_rad = 0x8002A16C;
+cos_rad = 0x8002A1D0;
+sin_cos_deg = 0x8002A234;
+sin_deg = 0x8002A2EC;
+cos_deg = 0x8002A350;
+update_lerp = 0x8002A3B4;
+general_heap_create = 0x8002AC00;
+general_heap_malloc = 0x8002AC28;
+general_heap_malloc_tail = 0x8002AC50;
+general_heap_free = 0x8002AC78;
+battle_heap_create = 0x8002ACA0;
+heap_malloc = 0x8002ACE4;
+heap_free = 0x8002AD2C;
+collision_heap_create = 0x8002AD74;
+collision_heap_malloc = 0x8002ADB0;
+collision_heap_free = 0x8002ADF4;
+get_spirits_rescued = 0x8002AE40;
+fio_calc_header_checksum = 0x8002AF40;
+fio_validate_header_checksums = 0x8002AF70;
+fio_has_valid_backup = 0x8002AFD8;
+fio_flush_backups = 0x8002B04C;
+fio_calc_file_checksum = 0x8002B0D0;
+fio_validate_file_checksum = 0x8002B0F8;
+fio_fetch_saved_file_info = 0x8002B154;
+fio_load_game = 0x8002B2D0;
+fio_save_game = 0x8002B374;
+fio_erase_game = 0x8002B42C;
+fio_deserialize_state = 0x8002B490;
+fio_serialize_state = 0x8002B630;
+fio_init_flash = 0x8002B84C;
+fio_read_flash = 0x8002B868;
+fio_write_flash = 0x8002B948;
+fio_erase_flash = 0x8002BA1C;
+initialize_curtains = 0x8002BA40;
+update_curtains = 0x8002BA78;
+render_curtains = 0x8002BA80;
+set_curtain_scale_goal = 0x8002BEDC;
+set_curtain_scale = 0x8002BEEC;
+set_curtain_draw_callback = 0x8002BF04;
+set_curtain_fade_goal = 0x8002BF14;
+set_curtain_fade = 0x8002BF24;
+crash_delay_msec = 0x8002BF40;
+crash_printf_string = 0x8002C208;
+crash_print_fpr = 0x8002C2B8;
+crash_show_handler = 0x8002C3B0;
+crash_monitor_thread = 0x8002C81C;
+func_8002C890 = 0x8002C890; // !
+crash_create_monitor = 0x8002C8B0;
+nuGfxTaskMgr = 0x8002CA40;
+nuGfxTaskMgrInit = 0x8002CB38; // !
+nuGfxTaskStart = 0x8002CCC4;
+nuSiMgrInit = 0x8002CE30;
+nuSiSendMesg = 0x8002CF28;
+nuSiMgrStop = 0x8002CF8C;
+nuSiMgrRestart = 0x8002CFAC;
+nuSiMgrThread = 0x8002CFD0;
+func_8002D160 = 0x8002D160; // !
+update_cameras = 0x8002D400;
+render_frame = 0x8002D73C;
+create_cameras_a = 0x8002DEF4;
+create_cameras_b = 0x8002E038;
+initialize_next_camera = 0x8002E16C;
+set_cam_viewport = 0x8002E314;
+get_cam_viewport = 0x8002E4E8;
+get_screen_coords = 0x8002E538;
+do_camera_type_4 = 0x8002E910;
+do_camera_type_2 = 0x8002ECF8;
+do_camera_type_1 = 0x8002F290;
+do_camera_type_0 = 0x8002F850;
+do_camera_type_6 = 0x8002F990;
+do_camera_type_unused = 0x8002FCE0;
+do_camera_type_5 = 0x80030000;
+test_ray_zone_aabb = 0x80030458;
+do_camera_type_3 = 0x80031494;
+set_game_mode = 0x800334F0;
+get_game_mode = 0x80033528;
+begin_state_init = 0x80033540;
+step_init_state = 0x80033568;
+intro_logos_set_fade_alpha = 0x800337D0;
+intro_logos_set_fade_color = 0x800337E0;
+intro_logos_fade_in = 0x800337F8;
+intro_logos_fade_out = 0x80033830;
+intro_logos_update_fade = 0x80033874;
+begin_state_battle = 0x800338D0;
+step_battle = 0x800338E4;
+begin_state_logos = 0x80033E70;
+step_logos = 0x800340A4;
+begin_state_pause_menu = 0x80034940;
+step_pause_menu = 0x8003497C;
+begin_state_world = 0x80035D30;
+step_world = 0x80035D54;
+begin_state_intro = 0x80036650;
+step_intro = 0x80036854;
+begin_state_title_screen = 0x80036DF0;
+step_title_screen = 0x800370B4;
+init_demo_data = 0x80038080;
+next_demo_scene = 0x800380F4;
+NOP_npc_callback = 0x80038470;
+mtx_ident_mirror_y = 0x80038478;
+clear_npcs = 0x800384BC;
+init_npc_list = 0x8003852C;
+_create_npc = 0x80038598;
+create_basic_npc = 0x80038844;
+create_standard_npc = 0x80038864;
+create_partner_npc = 0x80038880;
+free_npc_by_index = 0x800388A0;
+free_npc = 0x800389CC;
+get_npc_by_index = 0x80038ADC;
+npc_do_world_collision = 0x80038AFC;
+npc_do_other_npc_collision = 0x8003900C;
+npc_do_player_collision = 0x800392D8;
+update_npcs = 0x80039930;
+appendGfx_npc = 0x80039FD0;
+render_npcs = 0x8003A7F0;
+npc_move_heading = 0x8003AA54;
+get_npc_unsafe = 0x8003AAEC;
+get_npc_safe = 0x8003AB48;
+enable_npc_shadow = 0x8003ABA0;
+disable_npc_shadow = 0x8003ABFC;
+enable_npc_blur = 0x8003AD24;
+disable_npc_blur = 0x8003ADAC;
+update_npc_blur = 0x8003ADF8;
+appedGfx_npc_blur = 0x8003AE38;
+set_npc_yaw = 0x8003B340;
+COPY_set_defeated = 0x8003E2E0;
+clear_encounter_status = 0x8003E400;
+make_npcs = 0x8003E678;
+kill_encounter = 0x8003E730;
+kill_enemy = 0x8003E7AC;
+bind_enemy_ai = 0x8003E94C;
+bind_enemy_aux = 0x8003E9B4;
+bind_enemy_interact = 0x8003EA1C;
+bind_npc_ai = 0x8003EA84;
+bind_npc_aux = 0x8003EB50;
+bind_npc_interact = 0x8003EC1C;
+get_enemy = 0x8003ECE8;
+get_enemy_safe = 0x8003ED68;
+get_defeated = 0x8003EDF0;
+set_defeated = 0x8003EE40;
+FadeBackgroundToBlack = 0x8003EF00;
+UnfadeBackgroundFromBlack = 0x8003EF98;
+GetCamLookAtObjVector = 0x8003F398;
+HasMerleeCasts = 0x8003F3F4;
+OnDefeatEnemy = 0x8003F580;
+OnFleeBattleDrops = 0x8003F6E8;
+show_first_strike_message = 0x80041C5C;
+create_npcs = 0x800436B0;
+SetEncounterStatusFlags = 0x80044180;
+LoadDemoBattle = 0x80044264;
+MakeNpcs = 0x80044298;
+RemoveNpc = 0x80044340;
+RemoveEncounter = 0x80044478;
+GetBattleOutcome = 0x8004457C;
+GetOwnerEncounterTrigger = 0x80044600;
+DoNpcDefeat = 0x8004462C;
+start_battle = 0x800446B4;
+StartBattle = 0x80044840;
+StartBattleWith = 0x80044860;
+StartBossBattle = 0x8004489C;
+SetBattleMusic = 0x80044A38;
+BindNpcAI = 0x80044A78;
+BindNpcIdle = 0x80044BAC;
+RestartNpcAI = 0x80044C2C;
+EnableNpcAI = 0x80044CF0;
+SetNpcAux = 0x80044DA4;
+BindNpcAux = 0x80044EB8;
+RestartNpcAux = 0x80044F38;
+EnableNpcAux = 0x80044FF0;
+BindNpcInteract = 0x800450A4;
+BindNpcHit = 0x80045140;
+BindNpcDefeat = 0x800451DC;
+SetSelfVar = 0x8004525C;
+GetSelfVar = 0x800452C0;
+SetNpcVar = 0x80045320;
+GetNpcVar = 0x800453BC;
+SetSelfRotation = 0x8004545C;
+SetSelfEnemyFlags = 0x8004550C;
+SetSelfEnemyFlagBits = 0x80045524;
+GetSelfNpcID = 0x80045614;
+ClearDefeatedEnemies = 0x80045640;
+SetEnemyFlagBits = 0x80045688;
+GetSelfAnimationFromTable = 0x80045734;
+SetTattleString = 0x80045A58;
+spawn_drops = 0x80048280;
+get_coin_drop_amount = 0x80048D50;
+is_point_within_region = 0x80048FD4;
+DoBasicAI = 0x8004A47C;
+nuAuDmaCallBack = 0x8004B074; // !
+nuAuDmaNew = 0x8004B224;
+nuAuCleanDMABuffers = 0x8004B268;
+alLink = 0x8004B3EC;
+alUnlink = 0x8004B40C;
+al_LoadINIT = 0x800542BC;
+al_CopyFileTableEntry = 0x8005447C;
+al_LoadPER = 0x800544F8;
+al_LoadPRG = 0x800545B4;
+al_LoadBank = 0x800547C8;
+al_DmaCopy = 0x80054E00;
+al_CopyWords = 0x80054F74;
+al_LoadBKHeaders = 0x80054FC0;
+alAudioFrame = 0x800565C0;
+alHeapAlloc = 0x80057F90;
+render_effects = 0x80059EF4;
+remove_effect = 0x8005A450;
+remove_all_effects = 0x8005A4E0;
+play_effect = 0x8005A564;
+load_map_script_lib = 0x8005A6C0;
+load_map_by_IDs = 0x8005A6F4;
+get_current_map_config = 0x8005ABD8;
+get_current_map_header = 0x8005ABE8;
+get_map_IDs_by_name = 0x8005ABF8;
+load_asset_by_name = 0x8005ACE8;
+get_asset_offset = 0x8005ADD0;
+allocate_hit_tables = 0x8005AEA0;
+initialize_collision = 0x8005AF94;
+load_hit_asset = 0x8005AFC0;
+load_collision = 0x8005B058;
+load_stage_collision = 0x8005B1A0;
+load_hit_data = 0x8005B23C;
+parent_collider_to_model = 0x8005B780;
+_add_hit_vert_to_buffer = 0x8005B9A0;
+_get_hit_vert_index_from_buffer = 0x8005B9F4;
+update_collider_transform = 0x8005BA24;
+get_collider_type_by_id = 0x8005BDA8;
+get_collider_center = 0x8005BE10;
+test_ray_triangle_general = 0x8005BE84;
+test_down_ray_triangle = 0x8005C49C;
+test_up_ray_triangle = 0x8005C7A4;
+test_ray_colliders = 0x8005CCD0;
+test_ray_zones = 0x8005D124;
+test_up_ray_collider = 0x8005D2DC;
+test_ray_entities = 0x8005D448;
+get_npc_pos = 0x8005DE10;
+nuBoot = 0x8005E8B0;
+boot_idle = 0x8005E90C;
+nuScCreateScheduler = 0x8005E9B0;
+nuScExecuteAudio = 0x8005EBE0;
+nuScExecuteGraphics = 0x8005ED14; // !
+nuScAddClient = 0x8005EE30; // !
+nuScRemoveClient = 0x8005EEBC;
+nuScResetClientMesgType = 0x8005EF38;
+nuScGetGfxMQ = 0x8005EF78;
+nuScGetAudioMQ = 0x8005EF84;
+nuScSetFrameBufferNum = 0x8005EF90;
+nuScGetFrameRate = 0x8005EF9C;
+nuScEventHandler = 0x8005EFA8;
+nuScEventBroadcast = 0x8005F0C0; // !
+nuScWaitTaskReady = 0x8005F120;
+nuGfxFuncSet = 0x8005F250;
+nuGfxPreNMIFuncSet = 0x8005F290;
+nuGfxTaskAllEndWait = 0x8005F2D0;
+nuGfxSetCfb = 0x8005F2F0;
+nuGfxDisplayOff = 0x8005F400;
+nuGfxDisplayOn = 0x8005F430;
+nuPiInit = 0x8005F450;
+nuPiReadRom = 0x8005F490;
+nuGfxInitEX2 = 0x8005F560;
+nuContInit = 0x8005F610;
+nuContDataGet = 0x8005F650;
+nuContPakMgrInit = 0x8005F6B0;
+nuContPakMgrRemove = 0x8005F6D4;
+contPakOpen = 0x8005F6F8;
+contPakFree = 0x8005F748;
+contPakFileReadWrite = 0x8005F770;
+contPakFileOpen = 0x8005F7B0;
+contPakFileDelete = 0x8005F864;
+contPakFileState = 0x8005F8A4;
+contPakFileNum = 0x8005F8D0;
+contPakRepairId = 0x8005F8FC;
+contRmbControl = 0x8005F920;
+contRmbRetrace = 0x8005FB20;
+nuContRmbMgrInit = 0x8005FC8C;
+nuContRmbMgrRemove = 0x8005FCEC;
+contRmbCheckMesg = 0x8005FD10;
+contRmbStartMesg = 0x8005FD58;
+contRmbStopMesg = 0x8005FDE4;
+contRmbForceStopMesg = 0x8005FE0C;
+contRmbForceStopEndMesg = 0x8005FE54;
+nuContRmbStart = 0x8005FE90;
+nuContRmbCheck = 0x8005FEF0;
+nuContRmbModeSet = 0x8005FF90;
+nuContRmbForceStop = 0x800600A0;
+nuContRmbForceStopEnd = 0x800600C0;
+nuPiReadRomOverlay = 0x800600E0;
+nuGfxThreadStart = 0x800601F0;
+nuGfxThread = 0x80060248;
+nuGfxSwapCfbFuncSet = 0x80060310;
+nuGfxSwapCfb = 0x80060350;
+nuGfxRetraceWait = 0x80060370;
+nuSiCallBackAdd = 0x800603F0;
+nuSiCallBackRemove = 0x80060490;
+nuContMgrInit = 0x80060510;
+nuContMgrRemove = 0x800605E8;
+nuContDataClose = 0x8006060C;
+nuContDataOpen = 0x80060634;
+contRetrace = 0x8006065C;
+contReadData = 0x80060738;
+contReadNW = 0x800607B4;
+contQuery = 0x80060870;
+nuContDataLock = 0x800608C0;
+nuContDataUnLock = 0x800608F0;
+nuContQueryRead = 0x80060920;
+osSetIntMask = 0x80060940;
+osCreatePiManager = 0x800609E0;
+osEPiRawStartDma = 0x80060B70;
+osEPiWriteIo = 0x80060D60;
+osEPiReadIo = 0x80060DC0;
+osEPiStartDma = 0x80060E20;
+osEPiLinkHandle = 0x80060EC0;
+osCartRomInit = 0x80060F10;
+osDevMgrMain = 0x80061090;
+osPiCreateAccessQueue = 0x80061450;
+osPiGetAccess = 0x800614A4;
+osPiRelAccess = 0x80061510;
+osAiGetLength = 0x80061540;
+osAiGetStatus = 0x80061550;
+osAiSetFrequency = 0x80061560;
+osAiSetNextBuffer = 0x80061680;
+osInvalDCache = 0x80061720;
+osInvalICache = 0x800617D0;
+osWritebackDCache = 0x80061850;
+osWritebackDCacheAll = 0x800618D0;
+osContStartQuery = 0x80061900;
+osContGetQuery = 0x80061980;
+osContStartReadData = 0x800619A0;
+osContGetReadData = 0x80061A28;
+osPackReadData = 0x80061AC4;
+osContInit = 0x80061B80;
+osContGetInitData = 0x80061D1C;
+osPackRequestData = 0x80061DD0;
+osVirtualToPhysical = 0x80061E90;
+sqrtf = 0x80061EF0;
+coss = 0x80061F00;
+guFrustumF = 0x80061F30;
+guFrustum = 0x80062060;
+guLookAtF = 0x800621B0;
+guLookAt = 0x80062530;
+guLookAtHiliteF = 0x800628C0;
+guLookAtHilite = 0x80063244;
+guLookAtReflectF = 0x80063320;
+guLookAtReflect = 0x80063898;
+guOrthoF = 0x80063910;
+guOrtho = 0x80063A40;
+guPerspectiveF = 0x80063B90;
+guPerspective = 0x80063D40;
+guPositionF = 0x80063F10;
+guPosition = 0x800640E8;
+guRotateAnglesF = 0x800642D0;
+guRotateAngles = 0x80064458;
+sins = 0x800645F0;
+bcopy = 0x80064650;
+bzero = 0x80064970; // !
+strchr = 0x80064A10;
+strlen = 0x80064A50;
+memcpy = 0x80064A74;
+_Printf = 0x80064AA0;
+_Putfld = 0x80065020;
+sprintf = 0x800654F0;
+proutSprintf = 0x80065548;
+osCreateMesgQueue = 0x80065580;
+osJamMesg = 0x800655B0;
+osRecvMesg = 0x800656F0;
+osSendMesg = 0x80065820;
+osSetEventMesg = 0x80065950;
+osGetCount = 0x80065A00;
+osSpTaskLoad = 0x80065A10;
+osSpTaskStartGo = 0x80065C1C;
+osSpTaskYield = 0x80065C50;
+osSpTaskYielded = 0x80065C70;
+osSiRawStartDma = 0x80065CC0;
+osSiCreateAccessQueue = 0x80065D70;
+osSiGetAccess = 0x80065DC4;
+osSiRelAccess = 0x80065E30;
+osCreateThread = 0x80065E60;
+osGetThreadPri = 0x80065F30;
+osSetThreadPri = 0x80065F50;
+osStartThread = 0x80066020;
+osStopThread = 0x80066140;
+osDequeueThread = 0x80066200;
+osYieldThread = 0x80066240;
+osGetActiveQueue = 0x80066290;
+osGetTime = 0x800662A0;
+osSetTime = 0x80066330;
+osSetTimer = 0x80066350;
+osTimerServicesInit = 0x80066480;
+osTimerInterrupt = 0x800664D4;
+osSetTimerIntr = 0x80066610;
+osInsertTimer = 0x80066690;
+osMapTLB = 0x800667A0;
+osProbeTLB = 0x80066860;
+osUnmapTLB = 0x80066920;
+osUnmapTLBAll = 0x80066960;
+osViGetCurrentFramebuffer = 0x800669B0;
+osViGetNextFramebuffer = 0x800669F0;
+osViGetCurrentMode = 0x80066A30;
+osCreateViManager = 0x80066A70;
+viMgrMain = 0x80066C10;
+osViSetEvent = 0x80066DB0;
+osViSetMode = 0x80066E10;
+osViSetSpecialFeatures = 0x80066E60;
+osViSetYScale = 0x80066FD0;
+osViSwapBuffer = 0x80067020;
+osViSwapContext = 0x80067070;
+osViBlack = 0x80067380;
+osViRepeatLine = 0x800673E0;
+guMtxIdent = 0x80067440;
+guMtxIdentF = 0x800674A0;
+guMtxF2L = 0x80067500;
+guMtxL2F = 0x80067580;
+guMtxCatF = 0x80067600;
+guScale = 0x80067700;
+guScaleF = 0x800677C0;
+guTranslate = 0x80067820;
+guTranslateF = 0x80067900;
+guMtxCat = 0x80067960;
+guMtxXFML = 0x800679E0;
+guMtxXFMF = 0x80067A70;
+guRotateF = 0x80067B20;
+guRotate = 0x80067C80;
+__osMotorAccess = 0x80067E00;
+osMotorInit = 0x80067F44;
+osPfsAllocateFile = 0x80068190;
+osPfsDeclearPage = 0x8006849C;
+osPfsDeleteFile = 0x800685C0;
+osPfsReleasePages = 0x8006876C;
+osPfsReadWriteFile = 0x800687E0;
+osPfsFileState = 0x80068C20;
+osPfsFindFile = 0x80068DC0;
+osPfsFreeBlocks = 0x80068F80;
+osPfsNumFiles = 0x80069090;
+osPfsInitPak = 0x80069190;
+osPfsCheckRamArea = 0x80069388;
+osPfsRepairId = 0x80069460;
+osPfsGetStatus = 0x800694C0;
+osPfsRequestOneChannel = 0x800695B0;
+osPfsGetOneChannelData = 0x80069644;
+osPfsSelectBank = 0x800696D0;
+osSumcalc = 0x80069740;
+osIdCheckSum = 0x80069774;
+osRepairPackId = 0x800697B8;
+osCheckPackId = 0x80069AA4;
+osGetId = 0x80069C08;
+osCheckId = 0x80069DD4;
+osPfsRWInode = 0x80069E8C;
+osContRamRead = 0x8006A1D0;
+osContRamWrite = 0x8006A3C0;
+osAfterPreNMI = 0x8006A630;
+osInitialize = 0x8006A708;
+osExceptionPreamble = 0x8006AA00;
+func_8006AA34 = 0x8006AA34; // !
+ai = 0x8006AD64;
+si = 0x8006AD90;
+dp = 0x8006AE0C;
+send_mesg = 0x8006AF7C; // !
+handle_CPU = 0x8006B038; // !
+osEnqueueAndYield = 0x8006B06C; // !
+osEnqueueThread = 0x8006B174; // !
+osPopThread = 0x8006B1BC; // !
+osDispatchThread = 0x8006B1D4; // !
+osDispatchThreadSave = 0x8006B1F4;
+__osDisableInt = 0x8006B360;
+__osRestoreInt = 0x8006B3D0;
+osSetGlobalIntMask = 0x8006B3F0;
+osResetGlobalIntMask = 0x8006B430;
+osPiRawStartDma = 0x8006B480;
+osPiGetCmdQueue = 0x8006B550;
+osEPiRawReadIo = 0x8006B570;
+osEPiRawWriteIo = 0x8006B6E0;
+osAiDeviceBusy = 0x8006B850;
+bcmp = 0x8006B870;
+_Litob = 0x8006B980;
+_Ldtob = 0x8006BBD0;
+_Ldunscale = 0x8006C01C;
+_Genld = 0x8006C0B4;
+osGetCause = 0x8006C660;
+osGetSR = 0x8006C670;
+osSetCompare = 0x8006C680;
+osSetFpcCsr = 0x8006C690;
+osSetSR = 0x8006C6A0;
+osSetWatchLo = 0x8006C6B0;
+osSpDeviceBusy = 0x8006C6C0;
+osSpGetStatus = 0x8006C6E0;
+osSpSetStatus = 0x8006C6F0;
+osSpSetPc = 0x8006C700;
+osSpRawStartDma = 0x8006C730;
+osSiRawReadIo = 0x8006C7C0;
+osSiRawWriteIo = 0x8006C810;
+osContAddressCrc = 0x8006C860;
+osContDataCrc = 0x8006C8CC;
+osDestroyThread = 0x8006C950;
+osMapTLBRdb = 0x8006CA30;
+osViInit = 0x8006CA90;
+osViGetCurrentContext = 0x8006CBA0;
+guNormalize = 0x8006CBC0;
+osPfsChecker = 0x8006CC20;
+corrupted_init = 0x8006D080;
+corrupted = 0x8006D1D8;
+osPfsIsPlug = 0x8006D340;
+osPfsRequestData = 0x8006D4BC;
+osPfsGetInitData = 0x8006D560;
+ldiv = 0x8006D620;
+lldiv = 0x8006D6A4;
+osSiDeviceBusy = 0x8006D7E0;
+strcpy = 0x8006ED40;
+strcmp = 0x8006ED70;
+memset = 0x8006EDB0;
+decode_yay0 = 0x8006EDF0;
+osFlashInit = 0x8006EF68;
+osFlashReadStatus = 0x8006F0B8;
+osFlashReadId = 0x8006F184;
+osFlashClearStatus = 0x8006F29C;
+osFlashAllErase = 0x8006F308;
+osFlashSectorErase = 0x8006F424;
+osFlashWriteBuffer = 0x8006F550;
+osFlashWriteArray = 0x8006F61C;
+osFlashReadArray = 0x8006F75C;
+fx_walk_large = 0x8006FAD0;
+fx_walk_normal = 0x8006FB30;
+fx_emote = 0x8006FE90;
+fx_sweat = 0x80070790;
+fx_sleep_bubble = 0x800707F0;
+load_battle = 0x80072C90;
+setup_demo_player = 0x80072D2C;
+load_demo_battle = 0x80072E14;
+EnemyNpcHit = 0x80077F70;
+EnemyNpcDefeat = 0x8007809C;
+D_80078DB0 = 0x80078DB0;
+D_80078DB4 = 0x80078DB4;
+gEffectTable = 0x8007F214;
+gAreas = 0x800934F0;
+gBattleState = 0x800DC068;
+test_below_player = 0x800DDFD0;
+trace_below_player = 0x800DE54C;
+collision_check_above = 0x800DE7E4;
+trace_above_player = 0x800DEA08;
+do_lateral_collision = 0x800DEC04;
+test_player_lateral = 0x800DF460;
+update_player = 0x800DF740;
+check_input_use_partner = 0x800DFA00;
+clear_player_status = 0x800DFC50;
+enable_player_shadow = 0x800E00B0;
+disable_player_shadow = 0x800E00E4;
+disable_player_static_collisions = 0x800E0114;
+enable_player_static_collisions = 0x800E0140;
+disable_player_input = 0x800E0178;
+enable_player_input = 0x800E01A4;
+render_player = 0x800E1138;
+render_player_model = 0x800E1168;
+appendGfx_player = 0x800E12F4;
+appendGfx_player_spin = 0x800E1704;
+update_player_shadow = 0x800E1BC4;
+update_player_input = 0x800E1F90;
+input_to_move_vector = 0x800E2304;
+move_player = 0x800E2778;
+collision_main_above = 0x800E27E0;
+update_fall_state = 0x800E2D18;
+gravity_use_jump_parms = 0x800E2FD0;
+gravity_use_fall_parms = 0x800E306C;
+phys_player_land = 0x800E3278;
+integrate_gravity = 0x800E3448;
+collision_main_lateral = 0x800E363C;
+collision_check_player_intersecting_world = 0x800E4308;
+check_input_midair_jump = 0x800E4FCC;
+get_current_partner_id = 0x800E5088;
+save_ground_pos = 0x800E54E0;
+set_action_state = 0x800E5DA4;
+update_locomotion_state = 0x800E5F68;
+start_falling = 0x800E5FD0;
+start_bounce_a = 0x800E6034;
+start_bounce_b = 0x800E608C;
+check_input_hammer = 0x800E60E0;
+check_input_jump = 0x800E6160;
+check_input_spin = 0x800E6268;
+make_disguise_npc = 0x800E657C;
+can_pause = 0x800E69DC;
+setup_partner_popup = 0x800E6B78;
+setup_item_popup = 0x800E6C44;
+check_input_open_menus = 0x800E6CE4;
+check_input_status_menu = 0x800E728C;
+clear_player_data = 0x800E73A0;
+get_player_data = 0x800E7564;
+add_item = 0x800E7574;
+get_item_count = 0x800E75EC;
+get_item_empty_count = 0x800E7620;
+find_item = 0x800E7644;
+sort_items = 0x800E76CC;
+add_badge = 0x800E773C;
+store_item = 0x800E77C4;
+get_stored_count = 0x800E7814;
+get_stored_empty_count = 0x800E7848;
+enforce_hpfp_limits = 0x800E786C;
+initialize_status_menu = 0x800E7934;
+status_menu_draw_number = 0x800E7CA4;
+status_menu_draw_stat = 0x800E7E34;
+update_status_menu = 0x800E80B4;
+coin_counter_draw_content = 0x800E92D8;
+update_coin_counter = 0x800E93DC;
+show_coin_counter = 0x800E9518;
+hide_coin_counter = 0x800E9698;
+ShowCoinCounter = 0x800E96F8;
+draw_status_ui = 0x800E973C;
+open_status_menu_long = 0x800E9760;
+open_status_menu_short = 0x800E978C;
+is_status_menu_visible = 0x800E9910;
+status_menu_start_blinking_hp = 0x800E9920;
+status_menu_stop_blinking_hp = 0x800E9964;
+status_menu_start_blinking_fp = 0x800E998C;
+status_menu_stop_blinking_fp = 0x800E99D0;
+status_menu_start_blinking_coins = 0x800E99F4;
+status_menu_stop_blinking_coins = 0x800E9A38;
+status_menu_start_blinking_sp = 0x800E9A60;
+status_menu_stop_blinking_sp = 0x800E9A94;
+status_menu_start_blinking_sp_bars = 0x800E9AB8;
+status_menu_start_blinking_starpoints = 0x800E9AE4;
+status_menu_stop_blinking_starpoints = 0x800E9B0C;
+decrement_status_menu_disabled = 0x800E9B30;
+increment_status_menu_disabled = 0x800E9B54;
+sync_status_menu = 0x800E9B6C;
+reset_status_menu = 0x800E9BB0;
+is_ability_active = 0x800E9D48;
+is_partner_ability_active = 0x800EA0B8;
+add_coins = 0x800EA0C0;
+add_star_points = 0x800EA128;
+add_star_pieces = 0x800EA170;
+increment_max_SP = 0x800EA1B4;
+set_max_SP = 0x800EA1D8;
+add_SP = 0x800EA1F4;
+recover_fp = 0x800EA264;
+recover_hp = 0x800EA2CC;
+subtract_hp = 0x800EA334;
+has_full_hp = 0x800EA360;
+has_full_fp = 0x800EA37C;
+add_fortress_keys = 0x800EA398;
+subtract_fortress_keys = 0x800EA3B8;
+get_fortress_key_count = 0x800EA3E4;
+use_consumable = 0x800EA400;
+remove_consumable = 0x800EA47C;
+is_current_partner_flying = 0x800EA5A4;
+partner_use_ability = 0x800EB314;
+partner_player_can_pause = 0x800EB3E0;
+partner_can_use_ability = 0x800EB42C;
+partner_reset_data = 0x800EB474;
+partner_initialize_data = 0x800EB580;
+partner_test_enemy_collision = 0x800EB5E4;
+partner_get_ride_script = 0x800EB638;
+partner_handle_before_battle = 0x800EB658;
+partner_handle_after_battle = 0x800EB6C4;
+partner_kill_ability_script = 0x800EB7CC;
+partner_suspend_ability_script = 0x800EB818;
+partner_resume_ability_script = 0x800EB860;
+enable_partner_walking = 0x800EB8A8;
+enable_partner_flying = 0x800ED310;
+update_player_move_history = 0x800ED4B8;
+enable_partner_ai = 0x800EF328;
+clear_partner_move_history = 0x800EF45C;
+draw_submenu_title = 0x800F4648;
+draw_box = 0x800F52E0;
+update_entities = 0x8010F6D0;
+update_shadows = 0x8010FA98;
+render_entities = 0x8010FEB4;
+render_shadows = 0x801100CC;
+update_entity_transform_matrix = 0x8011022C;
+update_shadow_transform_matrix = 0x80110374;
+update_entity_inverse_rotation_matrix = 0x801104A4;
+get_entity_by_index = 0x801105E8;
+get_shadow_by_index = 0x80110604;
+get_entity_list = 0x80110620;
+get_shadow_list = 0x8011064C;
+get_entity_type = 0x801106A4;
+delete_entity = 0x801106D0;
+delete_entity_and_unload_data = 0x80110790;
+entity_get_collision_flags = 0x801108B8;
+test_player_entity_aabb = 0x80110AAC;
+is_player_action_state = 0x80110BB0;
+load_area_specific_entity_data = 0x80110C14;
+clear_entity_data = 0x80110CB8;
+is_entity_data_loaded = 0x8011115C; // !
+load_simple_entity_data = 0x801112A4;
+load_split_entity_data = 0x80111408;
+create_entity = 0x801118C4;
+create_shadow_from_data = 0x80111BD8;
+MakeEntity = 0x80111D38;
+AssignScript = 0x80111FB0;
+AssignAreaFlag = 0x80111FF8;
+AssignBlockFlag = 0x8011206C;
+AssignFlag = 0x801120B8;
+AssignPanelFlag = 0x80112114;
+AssignCrateFlag = 0x80112170;
+create_entity_shadow = 0x801121CC;
+create_shadow_type = 0x80112260;
+set_standard_shadow_scale = 0x8011285C;
+set_npc_shadow_scale = 0x80112900;
+set_peach_shadow_scale = 0x801129D4;
+NOP_state = 0x80112B90;
+_set_game_mode = 0x80112CA8;
+step_current_game_mode = 0x80112E78;
+render_ui = 0x80112F58;
+appendGfx_model = 0x80113090;
+load_tile_header = 0x80114D6C;
+get_model_property = 0x80115B0C;
+_load_model_textures = 0x80115B44;
+load_model_textures = 0x80115C24;
+clear_model_data = 0x80115D44;
+init_model_data = 0x80115FE8;
+calculate_model_sizes = 0x8011612C;
+render_models = 0x80116B90;
+appendGfx_model_group = 0x80117C94;
+get_model_from_list_index = 0x8011AD30;
+load_data_for_models = 0x8011AD48;
+load_model_transforms = 0x8011ADC8;
+get_model_list_index_from_tree_index = 0x8011B010;
+get_model_center_and_size = 0x8011B0EC;
+clone_model = 0x8011B6F0;
+enable_world_fog = 0x8011BB50;
+disable_world_fog = 0x8011BB64;
+set_world_fog_dist = 0x8011BB74;
+set_world_fog_color = 0x8011BB88;
+is_world_fog_enabled = 0x8011BBA4;
+get_world_fog_distance = 0x8011BBB4;
+get_world_fog_color = 0x8011BBD8;
+set_tex_panner = 0x8011BC14;
+set_main_pan_u = 0x8011BC1C;
+set_main_pan_v = 0x8011BC34;
+set_aux_pan_u = 0x8011BC4C;
+set_aux_pan_v = 0x8011BC64;
+set_background_color_blend = 0x8011BE5C;
+get_background_color_blend = 0x8011BE80;
+queue_render_task = 0x8011D910;
+play_model_animation = 0x80120148;
+clear_virtual_models = 0x80120BB0;
+init_virtual_models = 0x80120C58;
+load_virtual_model = 0x80120CE0;
+enable_entity_fog = 0x80122FEC;
+disable_entity_fog = 0x80123000;
+set_entity_fog_dist = 0x80123010;
+set_entity_fog_color = 0x80123028;
+is_entity_fog_enabled = 0x80123050;
+get_entity_fog_distance = 0x80123060;
+get_entity_fog_color = 0x8012307C;
+stub_dynamic_entity_delegate = 0x801230B0;
+clear_dynamic_entity_list = 0x801230B8;
+init_dynamic_entity_list = 0x80123114;
+bind_dynamic_entity_3 = 0x80123158;
+bind_dynamic_entity_7 = 0x8012323C;
+bind_dynamic_entity_B = 0x80123320;
+update_dynamic_entities = 0x80123404;
+render_dynamic_entities = 0x80123470;
+get_dynamic_entity = 0x8012363C;
+clear_character_set = 0x80123660;
+clear_printers = 0x80123674;
+load_font_data = 0x80123708;
+load_font = 0x80123734;
+update_messages = 0x801237D8;
+_update_message = 0x80123898;
+render_messages = 0x80124204;
+initialize_printer = 0x801256A4;
+dma_load_string = 0x80125804;
+load_message_to_buffer = 0x8012588C;
+load_string = 0x80125900;
+_load_string = 0x8012591C;
+load_message_to_printer = 0x80125A68;
+clamp_printer_coords = 0x80125AB8;
+cancel_message = 0x80125B08;
+set_message_images = 0x80125B2C;
+set_message_string = 0x80125B3C;
+set_message_value = 0x80125BE8;
+close_message = 0x80125C70;
+get_char_width = 0x80125DF4;
+get_string_properties = 0x80125F68;
+get_string_width = 0x80126474;
+draw_string = 0x801264EC;
+draw_digit = 0x801274C0;
+draw_number = 0x8012769C;
+_draw_message_box = 0x8012CC08;
+draw_coin_sparkles = 0x80130B0C;
+get_item_entity = 0x80130F58;
+clear_item_entity_data = 0x80130FF0;
+init_item_entity_list = 0x801310CC;
+make_item_entity = 0x801313F4;
+make_item_entity_nodelay = 0x80131A94;
+make_item_entity_delayed = 0x80131AC8;
+init_got_item = 0x80131B00;
+update_item_entities = 0x80131EEC;
+appendGfx_item_entity = 0x801321A4;
+draw_item_entities = 0x80132C80;
+render_item_entities = 0x80132E54;
+remove_item_entity_by_reference = 0x80133930;
+remove_item_entity_by_index = 0x801339FC;
+test_item_player_collision = 0x80133B0C;
+set_item_entity_flags = 0x80134148;
+clear_item_entity_flags = 0x80134188;
+set_item_entity_position = 0x8013420C;
+update_item_entity_collectable = 0x80134250;
+update_item_entity_static = 0x80135658;
+update_item_entity_temp = 0x801356DC;
+set_map_transition_effect = 0x801382A0;
+init_menu_icon_list = 0x80141300;
+create_icon = 0x801414A4;
+update_menu_icons = 0x80141610;
+render_menu_icon = 0x80142BFC;
+render_menu_icons = 0x801436B4;
+draw_menu_icon = 0x80144298;
+draw_icon_0 = 0x801447A8;
+draw_icon_1 = 0x801447C4;
+draw_icon_2 = 0x801447E0;
+set_menu_icon_script = 0x801447FC;
+get_menu_icon_script = 0x801448B0;
+get_menu_icon = 0x801448D4;
+free_icon = 0x801448F4;
+set_icon_render_pos = 0x80144984;
+get_icon_render_pos = 0x801449AC;
+set_icon_flags = 0x80144A00;
+clear_icon_flags = 0x80144A2C;
+icon_set_opacity = 0x80144EB0;
+icon_set_tint = 0x80144EFC;
+clear_saved_variables = 0x80145320;
+clear_area_flags = 0x80145390;
+clear_global_flag = 0x801453E0;
+set_global_flag = 0x80145450;
+get_global_flag = 0x801454BC;
+set_global_byte = 0x80145520;
+get_global_byte = 0x80145538;
+clear_area_flag = 0x8014554C;
+set_area_flag = 0x801455A0;
+get_area_flag = 0x801455F0;
+set_area_byte = 0x80145638;
+get_area_byte = 0x80145650;
+default_trigger_function_handler = 0x80145670;
+clear_trigger_data = 0x80145680;
+init_trigger_list = 0x80145728;
+create_trigger = 0x8014576C;
+update_triggers = 0x80145860;
+delete_trigger = 0x80145BF4;
+is_trigger_bound = 0x80145C6C;
+get_trigger_by_id = 0x80145CD0;
+load_map_bg = 0x80145D70;
+read_background_size = 0x80145E28;
+set_background_size = 0x80145E70;
+play_ambient_sounds = 0x80147368;
+set_ui_panel_properties = 0x80147CC8;
+_play_sound = 0x80149AB8;
+stop_sound = 0x80149C6C;
+play_sound = 0x80149CB4;
+play_sound_at_player = 0x80149CD8;
+play_sound_at_npc = 0x80149D08;
+play_sound_at_position = 0x80149D5C;
+get_default_variation_for_song = 0x8014A430;
+_set_music_track = 0x8014A7E0;
+set_music_track = 0x8014A918;
+transition_music_volume_to = 0x8014AC84;
+gSongArray = 0x8014F720;
+D_80156954 = 0x80156954;
+gMusicUnkVolume = 0x80159AE0;
+gMusicTargetVolume = 0x80159AE2;
+gMusicUnkVolume2 = 0x80159AE4;
+gMusicCurrentVolume = 0x80159AE6;
+gMusicPlayers = 0x80159AF0;
+gCollisionStatus = 0x8015A550;
+get_dpad_input_radial = 0x8023E000;
+initialize_battle = 0x8023E130;
+update_actor_shadows = 0x8023E404;
+update_battle_state = 0x8023E438;
+draw_main_battle_ui = 0x8023EA7C;
+draw_enemy_health_bars = 0x8023FFA0;
+update_starpoints_display = 0x802403BC;
+delete_actor = 0x80240BBC;
+delete_player_actor = 0x80240D68;
+begin_battle = 0x80241218;
+update_heroes_start_turn = 0x80242024;
+switch_to_player = 0x80242AC8;
+pause_set_cursor_opacity = 0x80242BA0; // seg_rom:0x135EE0
+update_end_player_turn = 0x80242BB0;
+pause_interp_cursor = 0x80242E6C;
+switch_to_partner = 0x80242F00;
+pause_interp_text_scroll = 0x80243418;
+pause_interp_vertical_scroll = 0x8024346C;
+pause_update_cursor = 0x802434DC; // seg_rom:0x135EE0
+pause_textbox_draw_contents = 0x80243570;
+pause_tutorial_draw_contents = 0x802437F4;
+switch_order = 0x80243918;
+pause_init = 0x80244060;
+pause_tutorial_input = 0x802442A0;
+pause_handle_input = 0x80244424;
+pause_cleanup = 0x80244708; // seg_rom:0x135EE0
+pause_get_total_equipped_bp_cost = 0x802447F4;
+pause_draw_rect = 0x80244858;
+pause_sort_item_list = 0x80244A4C;
+end_battle = 0x80244A50;
+pause_tabs_draw_invis = 0x80244B90;
+pause_tabs_draw_stats = 0x80244B98;
+pause_tabs_draw_badges = 0x80244CC0;
+pause_tabs_draw_items = 0x80244DE8;
+update_run_away = 0x80244F00;
+pause_tabs_draw_party = 0x80244F10;
+pause_tabs_draw_spirits = 0x80245038;
+pause_tabs_draw_map = 0x80245160;
+pause_tabs_init = 0x80245288;
+pause_tabs_handle_input = 0x80245354;
+pause_tabs_update = 0x802455BC;
+EnablePartnerBlur = 0x802456B8;
+DisablePartnerBlur = 0x802456D8;
+update_swap_partner = 0x802456F8;
+pause_tabs_cleanup = 0x80245930;
+pause_stats_draw_contents = 0x80245980;
+update_player_action = 0x80245AD0;
+update_player_change_turn = 0x80246450;
+pause_stats_init = 0x80246AC8;
+update_partner_action = 0x80246B34;
+pause_stats_handle_input = 0x80246B74;
+pause_stats_cleanup = 0x80246F94;
+pause_badges_comparator = 0x80246FE0;
+pause_badges_count_all = 0x80247054;
+pause_badges_count_equipped = 0x802470B0;
+pause_badges_get_pos_x = 0x8024710C;
+pause_badges_get_pos_y = 0x80247168;
+pause_badges_get_column = 0x802471D8;
+pause_badges_get_row = 0x80247220;
+pause_badges_is_visible = 0x80247270;
+pause_badges_scroll_offset_y = 0x80247298;
+pause_badges_scroll_offset_x = 0x802472A8;
+update_enemy_change_turn = 0x802472AC;
+pause_badges_try_remove = 0x802472B0;
+pause_badges_try_equip = 0x80247338;
+pause_badges_draw_bp_orbs = 0x80247458;
+pause_badges_draw_contents = 0x80247508;
+update_enemy_action = 0x80247570;
+pause_badges_load_badges = 0x80248D8C;
+pause_badges_init = 0x80248FC0;
+pause_badges_handle_input = 0x802490A8;
+pause_badges_update = 0x8024961C;
+pause_badges_cleanup = 0x80249758;
+pause_items_comparator = 0x802497B0;
+pause_items_get_pos_x = 0x802497D0;
+pause_items_get_pos_y = 0x80249828;
+pause_items_get_column = 0x80249898;
+pause_items_get_row = 0x802498E0;
+pause_items_is_visible = 0x80249930;
+pause_items_scroll_offset_y = 0x80249958;
+pause_items_scroll_offset_x = 0x80249968;
+pause_items_draw_contents = 0x80249970;
+pause_items_load_items = 0x8024A4DC;
+pause_items_init = 0x8024A714;
+pause_items_handle_input = 0x8024A7D8;
+pause_items_update = 0x8024AC54;
+pause_items_cleanup = 0x8024AD90;
+pause_partners_load_portrait = 0x8024ADE0;
+pause_partners_draw_contents = 0x8024AEF8;
+pause_partners_draw_title = 0x8024BBAC;
+pause_partners_draw_movelist = 0x8024BD38;
+pause_partners_draw_movelist_title = 0x8024C048;
+pause_partners_draw_movelist_flower = 0x8024C0A0;
+pause_partners_init = 0x8024C0E0;
+pause_partners_handle_input = 0x8024C338;
+pause_partners_update = 0x8024C7A4;
+pause_partners_cleanup = 0x8024C984;
+pause_spirits_draw_contents = 0x8024CA00;
+use_cam_preset = 0x8024CF34;
+pause_spirits_draw_title = 0x8024D294;
+pause_spirits_init = 0x8024D360;
+pause_spirits_handle_input = 0x8024D44C;
+pause_spirits_update = 0x8024D800;
+pause_spirits_cleanup = 0x8024D8D8;
+pause_map_draw_border_arrows = 0x8024DA28;
+pause_map_draw_contents = 0x8024DB1C;
+cam_target_actor = 0x8024E43C;
+move_cam_over = 0x8024E4D8;
+set_cam_target_pos = 0x8024E520;
+pause_map_draw_title = 0x8024E54C;
+set_cam_zoom = 0x8024E594;
+add_cam_zoom = 0x8024E5B4;
+set_cam_zoffset = 0x8024E5E0;
+unfreeze_cam = 0x8024E600;
+pause_map_init = 0x8024E604;
+UseCamPreset = 0x8024E61C;
+pause_map_handle_input = 0x8024E878;
+SetBattleCamTarget = 0x8024E90C;
+SetBattleCamOffsetZ = 0x8024EA58;
+AddBattleCamOffsetZ = 0x8024EA98;
+SetBattleCamYaw = 0x8024EAE4;
+BattleCamTargetActor = 0x8024EB24;
+MoveBattleCamOver = 0x8024EC08;
+SetBattleCamZoom = 0x8024EC6C;
+AddBattleCamZoom = 0x8024ECAC;
+pause_map_update = 0x8024ECB0;
+FreezeBattleCam = 0x8024ED78;
+pause_map_cleanup = 0x8024EE2C;
+pause_get_menu_string = 0x8024EE80;
+pause_draw_menu_label = 0x8024EE94;
+create_popup = 0x8024EF68;
+show_battle_message = 0x8024F960;
+show_variable_battle_message = 0x8024FA04;
+is_popup_displayed = 0x8024FAB4;
+set_popup_duration = 0x8024FAC4;
+close_action_command_instruction_popup = 0x8024FB0C;
+show_message_popup = 0x80250EA4;
+ShowMessageBox = 0x802512B4;
+ShowVariableMessageBox = 0x8025130C;
+IsMessageBoxDisplayed = 0x80251384;
+WaitForMessageBoxDone = 0x802513CC;
+ForceCloseMessageBox = 0x802513F0;
+SetMessageBoxDuration = 0x80251408;
+calc_item_check_hit = 0x802515D0;
+calc_item_damage_enemy = 0x802516E8;
+ItemDamageEnemy = 0x80252728;
+ItemAfflictEnemy = 0x80252924;
+ItemCheckHit = 0x80252D40;
+ActorSpeak = 0x80252F30;
+EndActorSpeech = 0x802532D0;
+ShowBattleChoice = 0x80253538;
+OverrideBattleDmaDest = 0x802535F8;
+LoadBattleDmaData = 0x80253624;
+PlaySoundAtActor = 0x8025385C;
+PlaySoundAtPart = 0x802538D0;
+PlayLoopingSoundAtActor = 0x80253974;
+StopLoopingSoundAtActor = 0x80253A18;
+SetForegroundModelsVisibleUnsafe = 0x80253AA8;
+SetForegroundModelsVisible = 0x80253AEC;
+MakeStatusField = 0x80253B94;
+is_actor_hp_bar_visible = 0x80253C20;
+is_actortype_hpbar_visible = 0x80253C9C;
+save_tattle_flags = 0x80253D10;
+load_tattle_flags = 0x80253E78;
+MultiplyByActorScale = 0x80253FDC;
+MultiplyVec2ByActorScale = 0x80254048;
+MultiplyVec3ByActorScale = 0x802540DC;
+ApplyShrinkFromOwner = 0x80254198;
+StartRumble = 0x80254218;
+mtx_mirror_y = 0x80254288;
+enable_actor_blur = 0x802542CC;
+disable_actor_blur = 0x8025455C;
+reset_actor_blur = 0x802545AC;
+enable_partner_blur = 0x80254644;
+disable_partner_blur = 0x80254668;
+reset_partner_blur = 0x8025468C;
+enable_player_blur = 0x802546D4;
+disable_player_blur = 0x80254914;
+update_actor_shadow = 0x802559BC;
+update_enemy_shadows = 0x80255F5C;
+update_hero_shadows = 0x80255FAC;
+update_player_actor_shadow = 0x80257BAC;
+_remove_part_decoration = 0x8025D03C;
+activate_defend_command = 0x80260B04;
+HasMerleeCastsLeft = 0x802619C8;
+FXRecoverHP = 0x80261BA8;
+FXRecoverFP = 0x80261C68;
+IncrementPlayerHP = 0x80261D28;
+IncrementPlayerFP = 0x80261D60;
+create_target_list = 0x80262240;
+player_create_target_list = 0x8026302C;
+enemy_create_target_list = 0x80263048;
+count_power_plus = 0x80263B10;
+deduct_current_move_fp = 0x80263BC8;
+set_animation = 0x80263CFC;
+set_animation_rate = 0x80263EB8;
+set_actor_yaw = 0x80263F68;
+set_part_yaw = 0x80263F9C;
+add_xz_vec3f = 0x80264128;
+add_xz_vec3f_copy1 = 0x802641C0;
+add_xz_vec3f_copy2 = 0x80264258;
+play_movement_dust_effects = 0x802642F0;
+get_actor_part = 0x8026445C;
+load_player_actor = 0x802644A4;
+load_partner_actor = 0x80264B74;
+create_actor = 0x802653A4;
+lookup_defense = 0x80265E44;
+lookup_status_chance = 0x80265E98;
+lookup_status_duration_mod = 0x80265EEC;
+inflict_status = 0x80265F40;
+inflict_partner_ko = 0x80266254;
+get_defense = 0x802662BC;
+show_damage_popup = 0x802665AC;
+try_inflict_status = 0x80266B78;
+inflict_status_set_duration = 0x80266CF0;
+add_part_decoration = 0x80267114;
+add_actor_decoration = 0x80267190;
+remove_part_decoration = 0x80267218;
+remove_actor_decoration = 0x80267234;
+heroes_is_ability_active = 0x802672AC;
+create_part_shadow = 0x8026731C;
+remove_part_shadow = 0x802673A0;
+create_part_shadow_by_ref = 0x802673E4;
+remove_player_buffs = 0x80267454;
+reset_all_actor_sounds = 0x80267A9C;
+hide_foreground_models_unsafe = 0x80267BDC;
+show_foreground_models_unsafe = 0x80267C48;
+hide_foreground_models = 0x80267CB4;
+show_foreground_models = 0x80267D28;
+StartRumbleWithParams = 0x80267D9C;
+start_rumble_type = 0x80267DF4;
+LoadItemScript = 0x80267ED0;
+LoadFreeItemScript = 0x8026801C;
+LoadMoveScript = 0x80268130;
+LoadActionCommand = 0x802681C0;
+check_block_input = 0x80268ECC;
+GetActionSuccess = 0x80269294;
+SetActionSuccess = 0x802692C0;
+CloseActionCommandInfo = 0x80269410;
+GetActionSuccessCopy = 0x802694F8;
+GetBlockResult = 0x8026957C;
+count_targets = 0x80269660;
+get_nearest_home_index = 0x80269698;
+set_goal_pos_to_part = 0x80269754;
+set_part_goal_to_actor_part = 0x802699D8;
+set_actor_current_position = 0x80269C24;
+set_part_absolute_position = 0x80269C70;
+set_actor_home_position = 0x80269D20;
+get_actor = 0x80269D6C;
+LoadBattleSection = 0x80269DE4;
+GetBattlePhase = 0x80269E28;
+GetLastElement = 0x80269E54;
+SetGoalToHome = 0x80269EC4;
+SetIdleGoalToHome = 0x80269F2C;
+SetGoalToIndex = 0x80269F94;
+GetIndexFromPos = 0x8026A05C;
+GetIndexFromHome = 0x8026A0D4;
+CountPlayerTargets = 0x8026A14C;
+ForceHomePos = 0x8026A1EC;
+SetHomePos = 0x8026A2D0;
+SetGoalToTarget = 0x8026A3A8;
+SetPartGoalToTarget = 0x8026A404;
+SetGoalToFirstTarget = 0x8026A49C;
+SetGoalPos = 0x8026A510;
+SetIdleGoal = 0x8026A62C;
+AddGoalPos = 0x8026A748;
+GetGoalPos = 0x8026A820;
+GetIdleGoal = 0x8026A8EC;
+GetPartTarget = 0x8026A9B8;
+GetActorPos = 0x8026AAA8;
+GetPartOffset = 0x8026AB74;
+GetPartPos = 0x8026AC88;
+GetHomePos = 0x8026AD74;
+SetActorPos = 0x8026AE40;
+SetPartPos = 0x8026AF18;
+SetEnemyTargetOffset = 0x8026B0A0;
+SetAnimation = 0x8026B1B0;
+GetAnimation = 0x8026B238;
+SetAnimationRate = 0x8026B2D0;
+SetActorYaw = 0x8026B358;
+GetActorYaw = 0x8026B3C8;
+SetPartYaw = 0x8026B438;
+GetPartYaw = 0x8026B4C0;
+SetActorJumpGravity = 0x8026B55C;
+SetActorIdleJumpGravity = 0x8026B5D8;
+SetActorSpeed = 0x8026B654;
+SetActorIdleSpeed = 0x8026B6D0;
+SetPartJumpGravity = 0x8026B74C;
+SetPartMoveSpeed = 0x8026B7EC;
+SetJumpAnimations = 0x8026B88C;
+AddActorPos = 0x8026B92C;
+SetActorDispOffset = 0x8026BA04;
+GetPartDispOffset = 0x8026BAE8;
+SetPartDispOffset = 0x8026BC38;
+AddPartDispOffset = 0x8026BD88;
+GetActorVar = 0x8026BFB4;
+SetActorVar = 0x8026C044;
+AddActorVar = 0x8026C0D4;
+GetPartMovementVar = 0x8026C170;
+SetPartMovementVar = 0x8026C22C;
+AddPartMovementVar = 0x8026C2E8;
+SetActorRotation = 0x8026C3AC;
+SetActorRotationOffset = 0x8026C4AC;
+GetActorRotation = 0x8026C56C;
+SetPartRotation = 0x8026C634;
+SetPartRotationOffset = 0x8026C740;
+GetPartRotation = 0x8026C828;
+SetActorScale = 0x8026C904;
+SetActorScaleModifier = 0x8026C9C4;
+GetActorScale = 0x8026CA84;
+SetPartScale = 0x8026CB4C;
+GetPartScale = 0x8026CC34;
+GetBattleFlags = 0x8026CD10;
+SetBattleFlagBits = 0x8026CD3C;
+GetBattleFlags2 = 0x8026CDA0;
+SetBattleFlagBits2 = 0x8026CDCC;
+SetActorFlags = 0x8026CE30;
+SetActorFlagBits = 0x8026CE8C;
+GetActorFlags = 0x8026CF20;
+SetPartFlags = 0x8026CF88;
+SetPartFlagBits = 0x8026D010;
+SetPartTargetFlags = 0x8026D0D0;
+SetPartTargetFlagBits = 0x8026D158;
+GetPartFlags = 0x8026D218;
+GetPartTargetFlags = 0x8026D2AC;
+SetPartEventFlags = 0x8026D340;
+SetPartEventBits = 0x8026D3C8;
+GetPartEventFlags = 0x8026D488;
+HPBarToHome = 0x8026D664;
+HPBarToCurrent = 0x8026D7A8;
+SummonEnemy = 0x8026DB64;
+GetOwnerID = 0x8026DE00;
+SetOwnerID = 0x8026DE28;
+ActorExists = 0x8026DE5C;
+SetBattleInputMask = 0x8026E050;
+SetBattleInputButtons = 0x8026E068;
+CheckButtonPress = 0x8026E098;
+CheckButtonHeld = 0x8026E0D0;
+CheckButtonDown = 0x8026E108;
+GetBattleState = 0x8026E140;
+PlayerCreateTargetList = 0x8026E2CC;
+EnemyCreateTargetList = 0x8026E310;
+InitTargetIterator = 0x8026E354;
+SetOwnerTarget = 0x8026E3A8;
+ChooseNextTarget = 0x8026E414;
+GetTargetListLength = 0x8026E864;
+GetOwnerTarget = 0x8026E8AC;
+GetAttackerActorID = 0x8026E974;
+GetDistanceToGoal = 0x8026E9FC;
+AddActorDecoration = 0x8026EE88;
+RemoveActorDecoration = 0x8026EF4C;
+ModifyActorDecoration = 0x8026EFF0;
+UseIdleAnimation = 0x8026F0EC;
+GetStatusFlags = 0x8026F230;
+RemovePlayerBuffs = 0x8026F44C;
+SetPartAlpha = 0x8026F470;
+CreatePartShadow = 0x8026F52C;
+RemovePartShadow = 0x8026F59C;
+SetBattleVar = 0x8026F638;
+GetBattleVar = 0x8026F694;
+ResetAllActorSounds = 0x8026F6EC;
+SetActorSounds = 0x8026F740;
+gPauseMenuStrings = 0x8026F778;
+ResetActorSounds = 0x8026F838;
+SetPartSounds = 0x8026FA00;
+SetActorType = 0x8026FB20;
+ShowShockEffect = 0x8026FBB0;
+GetActorAttackBoost = 0x8026FC04;
+GetActorDefenseBoost = 0x8026FC6C;
+BoostAttack = 0x8026FCD4;
+BoostDefense = 0x80270174;
+VanishActor = 0x80270614;
+ElectrifyActor = 0x8027095C;
+HealActor = 0x80270CA4;
+WaitForBuffDone = 0x8027114C;
+CopyBuffs = 0x80271160;
+dispatch_event_player = 0x80271658;
+dispatch_event_player_continue_turn = 0x802716E4;
+calc_player_test_enemy = 0x80271754;
+calc_player_damage_enemy = 0x80271944;
+dispatch_damage_event_player = 0x802731BC;
+dispatch_damage_event_player_0 = 0x8027337C;
+dispatch_damage_event_player_1 = 0x802733A8;
+GetMenuSelection = 0x802733C4;
+PlayerFallToGoal = 0x80273894;
+PlayerLandJump = 0x80273B04;
+PlayerRunToGoal = 0x80273C64;
+CancelablePlayerRunToGoal = 0x80273EFC;
+GetPlayerHP = 0x80274234;
+PlayerDamageEnemy = 0x80274260;
+PlayerPowerBounceEnemy = 0x802744A0;
+PlayerTestEnemy = 0x802746F0;
+DispatchDamagePlayerEvent = 0x8027491C;
+EnablePlayerBlur = 0x80274978;
+DidActionSucceed = 0x80276EB4;
+dispatch_event_general = 0x80276F8C;
+play_hit_sound = 0x80277004;
+dispatch_event_actor = 0x80277160;
+calc_enemy_test_target = 0x802771F8;
+calc_enemy_damage_target = 0x8027742C;
+dispatch_damage_event_actor = 0x802786D4;
+dispatch_damage_event_actor_0 = 0x802788F8;
+dispatch_damage_event_actor_1 = 0x80278914;
+BindTakeTurn = 0x80278930;
+PauseTakeTurn = 0x802789A4;
+ResumeTakeTurn = 0x80278A1C;
+BindIdle = 0x80278A94;
+EnableIdleScript = 0x80278B4C;
+BindHandleEvent = 0x80278C20;
+BindNextTurn = 0x80278C94;
+JumpToGoal = 0x80278D08;
+IdleJumpToGoal = 0x8027910C;
+JumpToGoalSimple2 = 0x80279420;
+JumpWithBounce = 0x80279728;
+LandJump = 0x80279AD4;
+FallToGoal = 0x80279BEC;
+RunToGoal = 0x80279E64;
+IdleRunToGoal = 0x8027A264;
+JumpPartTo = 0x8027A4E4;
+FallPartTo = 0x8027A854;
+LandJumpPart = 0x8027AB5C;
+RunPartTo = 0x8027ACAC;
+update_lerp_battle = 0x8027B0DC;
+FlyToGoal = 0x8027B624;
+IdleFlyToGoal = 0x8027BBB8;
+FlyPartTo = 0x8027BF38;
+GetLastEvent = 0x8027C4E0;
+SetTargetActor = 0x8027C548;
+SetEnemyHP = 0x8027C5C8;
+GetActorHP = 0x8027C6A0;
+GetEnemyMaxHP = 0x8027C748;
+RemoveActor = 0x8027C7B0;
+DropStarPoints = 0x8027C8A4;
+SetDefenseTable = 0x8027CA74;
+SetStatusTable = 0x8027CB08;
+SetIdleAnimations = 0x8027CB7C;
+EnemyDamageTarget = 0x8027CCB4;
+EnemyFollowupAfflictTarget = 0x8027CED4;
+EnemyTestTarget = 0x8027CFB8;
+DispatchDamageEvent = 0x8027D1BC;
+DispatchEvent = 0x8027D264;
+SetTargetOffset = 0x8027D380;
+EnableActorBlur = 0x8027D57C;
+AfflictActor = 0x8027D67C;
+GetEncounterState = 0x8027D7C4;
+YieldTurn = 0x8027D7F0;
+SetActorSize = 0x8027D810;
+GetActorSize = 0x8027D8E0;
+SetPartSize = 0x8027D970;
+GetOriginalActorType = 0x8027DA68;
+GetCurrentActorType = 0x8027DAD4;
+GetLastDamage = 0x8027DB3C;
+EnableActorGlow = 0x8027DBA4;
+WasStatusInflicted = 0x8027DC68;
+CopyStatusEffects = 0x8027DCBC;
+ClearStatusEffects = 0x8027DDA0;
+dispatch_event_partner = 0x8027DE80;
+dispatch_event_partner_continue_turn = 0x8027DF0C;
+calc_partner_test_enemy = 0x8027DF7C;
+calc_partner_damage_enemy = 0x8027E328;
+dispatch_damage_event_partner = 0x8027F9CC;
+dispatch_damage_event_partner_0 = 0x8027FB80;
+dispatch_damage_event_partner_1 = 0x8027FB9C;
+MakeOwnerTargetIndex = 0x8027FBB8;
+GetActorLevel = 0x8027FD48;
+PartnerDamageEnemy = 0x8027FDB4;
+PartnerAfflictEnemy = 0x80280004;
+PartnerPowerBounceEnemy = 0x80280270;
+PartnerTestEnemy = 0x802804D0;
+DeletePartner = 0x802807A8;
+GetDamageIntensity = 0x80280840;
+ActorAddMovePos = 0x80280880;
+LoadStarPowerScript = 0x80280950;
+BtlPutPartnerAway = 0x80280A34;
+BtlBringPartnerOut = 0x80280B6C;
+draw_shop_items = 0x80281524;
+MakeShop = 0x80281860;
+MakeShopOwner = 0x80281BD8;
+MakeDoorAdvanced = 0x80281CAC;
+CheckActionState = 0x802831DC;
+CreatePushBlockGrid = 0x802832E0;
+SetPushBlock = 0x8028347C;
+GetPushBlock = 0x802835C0;
+GetGridIndexFromPos = 0x802836B8;
+SetPushBlockFallEffect = 0x802837AC;
+TeleportPartnerToPlayer = 0x8028387C;
+gBattleDmaDest = 0x80284000;
+MarioEnterStage = 0x80284A40;
+PeachEnterStage = 0x80284D04;
+PlayerScriptDispatcher = 0x80284EBC;
+PeachScriptDispatcher = 0x80285010;
+ExecutePlayerAction = 0x8028505C;
+ExecutePeachAction = 0x80285174;
+PlayerFirstStrike = 0x802851FC;
+StartDefend = 0x802852B8;
+HandleEvent_Player = 0x802852D4;
+EnterWalk = 0x80285960;
+EnterWalkShort = 0x80285A60;
+EnterSavePoint = 0x80285CB0;
+ExitWalk = 0x80285CF4;
+ExitSingleDoor = 0x80285DAC;
+EnterSingleDoor = 0x80285DD4;
+ExitDoubleDoor = 0x80285E4C;
+EnterDoubleDoor = 0x80285E74;
+RunAwayStart = 0x802868BC;
+RunAwayFail = 0x80287078;
+RunAwayReset = 0x80287128;
+PlayEatFX = 0x802878D0;
+PlayDrinkFX = 0x80287948;
+UseLifeShroom = 0x802879C0;
+MerleeRunOut = 0x80288398;
+MerleeAttackBonus = 0x80288400;
+MerleeDefenseBonus = 0x8028870C;
+MerleeExpBonus = 0x80288A58;
+PlayerHappy = 0x80288D64;
+DoDizzyAttack = 0x8028907C;
+RegainAbility = 0x80289110;
+UseMystery = 0x80293E40;
+gMoveScriptTable = 0x80293E80;
+DoSleepHit = 0x802945E0;
+DoDizzyHit = 0x802945FC;
+DoParalyzeHit = 0x80294618;
+DoPoisonHit = 0x80294634;
+DoStopHit = 0x80294650;
+DoFreezeHit = 0x8029466C;
+DoShinkHit = 0x802946B8;
+ForceNextTarget = 0x80298BF0;
+DoNormalHit = 0x80299044;
+DoBurnHit = 0x8029A0D0;
+DoShockHit = 0x8029A6FC;
+DoImmune = 0x8029AC70;
+DoDeath = 0x8029AEC0;
+DoScareAway = 0x8029B22C;
+DoSpinSmashHit = 0x8029B998;
+DoJumpBack = 0x8029BD70;
+DoReturnHome = 0x8029BEB8;
+DoRecover = 0x8029BFA0;
+DoAirLift = 0x8029C37C;
+DoBlowAway = 0x8029C4A8;
+gSpeakingActorPrintCtx = 0x8029FA60;
+gSpeakingActorPrintIsDone = 0x8029FA68;
+gSpeakingActorTalkAnim = 0x8029FA6C;
+gSpeakingActorIdleAnim = 0x8029FA70;
+gSpeakingActor = 0x8029FA74;
+gSpeakingActorPart = 0x8029FA78;
+draw_battle_wheel = 0x802A1C54;
+can_switch_to_player = 0x802A5818;
+update_player_menu = 0x802A5988;
+update_partner_menu = 0x802A81C8;
+func_802A91F8 = 0x802A91F8;
+func_802A9208 = 0x802A9208;
+func_802A9228 = 0x802A9228;
+func_802A9234 = 0x802A9234;
+func_802A9254 = 0x802A9254;
+func_802A9278 = 0x802A9278;
+func_802A928C = 0x802A928C;
+func_802A9294 = 0x802A9294;
+func_802A9298 = 0x802A9298;
+func_802A92A0 = 0x802A92A0;
+func_802A92D4 = 0x802A92D4;
+func_802A92DC = 0x802A92DC;
+func_802A92F0 = 0x802A92F0;
+func_802A9310 = 0x802A9310;
+func_802A936C = 0x802A936C;
+func_802A9378 = 0x802A9378;
+func_802A948C = 0x802A948C;
+func_802A94A4 = 0x802A94A4;
+func_802A94D8 = 0x802A94D8;
+func_802A9544 = 0x802A9544;
+func_802A955C = 0x802A955C;
+func_802A9590 = 0x802A9590;
+func_802A959C = 0x802A959C;
+func_802A9634 = 0x802A9634;
+func_802A963C = 0x802A963C;
+func_802A9664 = 0x802A9664;
+func_802A96B8 = 0x802A96B8;
+func_802A96DC = 0x802A96DC;
+func_802A96EC = 0x802A96EC;
+func_802A96F4 = 0x802A96F4;
+func_802A9708 = 0x802A9708;
+func_802A9718 = 0x802A9718;
+func_802A9720 = 0x802A9720;
+func_802A973C = 0x802A973C;
+func_802A9744 = 0x802A9744;
+func_802A9764 = 0x802A9764;
+func_802A97AC = 0x802A97AC;
+func_802A97BC = 0x802A97BC;
+func_802A97CC = 0x802A97CC;
+func_802A97F8 = 0x802A97F8;
+func_802A97FC = 0x802A97FC;
+func_802A9810 = 0x802A9810;
+func_802A981C = 0x802A981C;
+func_802A9834 = 0x802A9834;
+func_802A984C = 0x802A984C;
+func_802A9894 = 0x802A9894;
+func_802A9898 = 0x802A9898;
+func_802A98B0 = 0x802A98B0;
+func_802A98D0 = 0x802A98D0;
+func_802A98DC = 0x802A98DC;
+func_802A98E0 = 0x802A98E0;
+func_802A9914 = 0x802A9914;
+func_802A992C = 0x802A992C;
+func_802A9990 = 0x802A9990;
+func_802A99D4 = 0x802A99D4;
+func_802A9A30 = 0x802A9A30;
+func_802A9A54 = 0x802A9A54;
+func_802AA014 = 0x802AA014;
+func_802AA0D8 = 0x802AA0D8;
+update_targeting_enemies = 0x802AA688;
+func_802AB330 = 0x802AB330;
+func_802AB338 = 0x802AB338;
+func_802B71D4 = 0x802B71D4;
+func_802B71E8 = 0x802B71E8;
+func_802BD7DC = 0x802BD7DC;
+func_802BE070 = 0x802BE070;
+sort_scripts = 0x802C3000;
+find_script_labels = 0x802C3148;
+clear_script_list = 0x802C31DC;
+init_script_list = 0x802C32EC;
+start_script = 0x802C33E0;
+start_script_in_group = 0x802C35D0;
+start_child_script = 0x802C37C8;
+restart_script = 0x802C3D04;
+update_scripts = 0x802C3D74;
+kill_script = 0x802C3F3C;
+kill_script_by_ID = 0x802C40AC;
+kill_all_scripts = 0x802C4114;
+does_script_exist = 0x802C4164;
+does_script_exist_by_ref = 0x802C41A4;
+set_script_priority = 0x802C41D8;
+set_script_timescale = 0x802C41E0;
+set_global_timespace = 0x802C4200;
+get_global_timespace = 0x802C420C;
+set_script_group = 0x802C4218;
+bind_trigger = 0x802C4220;
+bind_trigger_1 = 0x802C42A8;
+suspend_group_script = 0x802C42D8;
+resume_group_script = 0x802C437C;
+suspend_all_script = 0x802C4420;
+resume_all_script = 0x802C448C;
+suspend_group_script_index = 0x802C44F8;
+resume_group_script_index = 0x802C4570;
+suspend_all_group = 0x802C45E8;
+resume_all_group = 0x802C4648;
+suspend_group_others = 0x802C46A8;
+resume_group_others = 0x802C471C;
+get_script_by_index = 0x802C4790;
+get_script_by_id = 0x802C47A8;
+set_script_flags = 0x802C47E8;
+clear_script_flags = 0x802C4880;
+fixed_var_to_float = 0x802C4920;
+float_to_fixed_var = 0x802C496C;
+si_handle_return = 0x802C4998;
+si_handle_label = 0x802C49B8;
+si_handle_goto = 0x802C49C0;
+si_handle_loop = 0x802C4A00;
+si_handle_end_loop = 0x802C4A48;
+si_handle_break_loop = 0x802C4B0C;
+si_handle_wait = 0x802C4B5C;
+si_handle_wait_seconds = 0x802C4BB8;
+si_handle_if_equal = 0x802C4C40;
+si_handle_if_not_equal = 0x802C4CA0;
+si_handle_if_less = 0x802C4D00;
+si_handle_if_greater = 0x802C4D64;
+si_handle_if_less_equal = 0x802C4DC8;
+si_handle_if_greater_equal = 0x802C4E2C;
+si_handle_if_AND = 0x802C4E90;
+si_handle_if_not_AND = 0x802C4EE8;
+si_handle_else = 0x802C4F40;
+si_handle_end_if = 0x802C4F6C;
+si_handle_switch = 0x802C4F74;
+si_handle_switch_const = 0x802C4FE4;
+si_handle_case_equal = 0x802C5030;
+si_handle_case_not_equal = 0x802C50BC;
+si_handle_case_less = 0x802C5148;
+si_handle_case_less_equal = 0x802C51D8;
+si_handle_case_greater = 0x802C5268;
+si_handle_case_greater_equal = 0x802C52F8;
+si_handle_case_range = 0x802C5388;
+si_handle_case_default = 0x802C5444;
+si_handle_case_AND = 0x802C549C;
+si_handle_case_equal_OR = 0x802C5518;
+si_handle_case_equal_AND = 0x802C55B8;
+si_handle_end_case_group = 0x802C565C;
+si_handle_break_case = 0x802C56D4;
+si_handle_end_switch = 0x802C5718;
+si_handle_set_var = 0x802C5744;
+si_handle_set_const = 0x802C5790;
+si_handle_set_float = 0x802C57B8;
+si_handle_add = 0x802C5804;
+si_handle_subtract = 0x802C5868;
+si_handle_multiply = 0x802C58CC;
+si_handle_divide = 0x802C5934;
+si_handle_mod = 0x802C59BC;
+si_handle_addF = 0x802C5A84;
+si_handle_subtractF = 0x802C5AEC;
+si_handle_multiplyF = 0x802C5B54;
+si_handle_divideF = 0x802C5BC0;
+si_handle_set_int_buffer_ptr = 0x802C5C28;
+si_handle_set_float_buffer_ptr = 0x802C5C5C;
+si_handle_get_1_word = 0x802C5C90;
+si_handle_get_2_word = 0x802C5CC4;
+si_handle_get_3_word = 0x802C5D2C;
+si_handle_get_4_word = 0x802C5DB4;
+si_handle_get_Nth_word = 0x802C5E5C;
+si_handle_get_1_float = 0x802C5EB4;
+si_handle_get_2_float = 0x802C5F0C;
+si_handle_get_3_float = 0x802C5F9C;
+si_handle_get_4_float = 0x802C605C;
+si_handle_get_Nth_float = 0x802C614C;
+si_handle_set_array = 0x802C61AC;
+si_handle_set_flag_array = 0x802C61E0;
+si_handle_allocate_array = 0x802C6214;
+si_handle_AND = 0x802C6270;
+si_handle_AND_const = 0x802C62D4;
+si_handle_OR = 0x802C632C;
+si_handle_OR_const = 0x802C6390;
+si_handle_call = 0x802C63E8;
+si_handle_exec1 = 0x802C646C;
+si_handle_exec2 = 0x802C6524;
+si_handle_exec_wait = 0x802C65FC;
+si_handle_jump = 0x802C6640;
+_bound_script_trigger_handler = 0x802C667C;
+si_handle_bind = 0x802C6714;
+DeleteTrigger = 0x802C6824;
+si_handle_unbind = 0x802C6850;
+si_handle_kill = 0x802C6870;
+si_handle_set_priority = 0x802C689C;
+si_handle_set_timescale = 0x802C68D8;
+si_handle_set_group = 0x802C6914;
+si_handle_suspend_all = 0x802C6950;
+si_handle_resume_all = 0x802C697C;
+si_handle_suspend_others = 0x802C69A8;
+si_handle_resume_others = 0x802C69E4;
+si_handle_suspend = 0x802C6A20;
+si_handle_resume = 0x802C6A4C;
+si_handle_does_script_exist = 0x802C6A78;
+si_standard_trigger_executor = 0x802C6AD0;
+si_handle_bind_lock = 0x802C6B54;
+si_handle_thread = 0x802C6C78;
+si_handle_end_thread = 0x802C6D4C;
+si_handle_child_thread = 0x802C6D6C;
+si_handle_end_child_thread = 0x802C6DF4;
+si_handle_print_debug_var = 0x802C6E1C;
+si_execute_next_command = 0x802C7404;
+get_variable = 0x802C7ABC;
+get_variable_index = 0x802C7DA8;
+get_variable_index_alt = 0x802C7F20;
+set_variable = 0x802C8098;
+get_float_variable = 0x802C842C;
+set_float_variable = 0x802C8640;
+si_find_label = 0x802C8890;
+si_skip_if = 0x802C88FC;
+si_skip_else = 0x802C8978;
+si_goto_end_case = 0x802C89E4; // !
+si_goto_next_case = 0x802C8A60;
+si_goto_end_loop = 0x802C8AE4;
+TranslateModel = 0x802C8B60;
+RotateModel = 0x802C8C64;
+ScaleModel = 0x802C8D88;
+GetModelIndex = 0x802C8E8C;
+CloneModel = 0x802C8F28;
+GetModelCenter = 0x802C8F80;
+SetTexPanner = 0x802C9000;
+SetModelFlag10 = 0x802C907C;
+EnableTexPanning = 0x802C9208;
+EnableModel = 0x802C9288;
+SetGroupEnabled = 0x802C9308;
+SetTexPanOffset = 0x802C9364;
+SetModelFlags = 0x802C9518;
+TranslateGroup = 0x802C97B4;
+RotateGroup = 0x802C98D8;
+ScaleGroup = 0x802C9A1C;
+EnableGroup = 0x802C9B98;
+modify_collider_family_flags = 0x802C9CE8;
+ModifyColliderFlags = 0x802C9DCC;
+ResetFromLava = 0x802C9ED8;
+GetColliderCenter = 0x802CA0AC;
+ParentColliderToModel = 0x802CA114;
+UpdateColliderTransform = 0x802CA188;
+set_zone_enabled = 0x802CA1B8;
+SetZoneEnabled = 0x802CA254;
+goto_map = 0x802CA304;
+GotoMap = 0x802CA400;
+GotoMapSpecial = 0x802CA420;
+GotoMapByID = 0x802CA440;
+GetEntryID = 0x802CA460;
+GetMapID = 0x802CA490;
+GetLoadType = 0x802CA4C0;
+SetRenderMode = 0x802CA4F4;
+PlaySoundAtModel = 0x802CA558;
+PlaySoundAtCollider = 0x802CA614;
+SetCamEnabled = 0x802CA6C0;
+SetCamFlag80 = 0x802CA774;
+SetCamPerspective = 0x802CA828;
+SetCamViewport = 0x802CAB18;
+SetCamBGColor = 0x802CAD98;
+SetCamTarget = 0x802CAF2C;
+ShakeCam = 0x802CB2A8;
+exec_ShakeCam1 = 0x802CB56C;
+exec_ShakeCamX = 0x802CB5C8;
+SetCamLeadPlayer = 0x802CB680;
+PanToTarget = 0x802CB79C;
+UseSettingsFrom = 0x802CB860;
+LoadSettings = 0x802CB9F8;
+SetCamType = 0x802CBAB4;
+SetCamPitch = 0x802CBB48;
+SetCamDistance = 0x802CBBE4;
+SetCamPosA = 0x802CBC58;
+SetCamPosB = 0x802CBCF4;
+SetCamPosC = 0x802CBD90;
+SetPanTarget = 0x802CBE2C;
+SetCamSpeed = 0x802CBEF0;
+GetCamType = 0x802CBF64;
+GetCamPitch = 0x802CBFF4;
+GetCamDistance = 0x802CC084;
+GetCamPosA = 0x802CC0F4;
+GetCamPosB = 0x802CC184;
+GetCamPosC = 0x802CC214;
+GetCamPosition = 0x802CC2A4;
+WaitForCam = 0x802CC354;
+SetCamProperties = 0x802CC3EC;
+AdjustCam = 0x802CC660;
+ResetCam = 0x802CC8C8;
+draw_anim_models = 0x802CCB18;
+LoadModelAnimation = 0x802CCCEC;
+PlayModelAnimation = 0x802CCE6C;
+ChangeModelAnimation = 0x802CCF6C;
+SetAnimModelPosition = 0x802CCFE4;
+GetAnimModelPosition = 0x802CD090;
+AddAnimModelPosition = 0x802CD12C;
+SetAnimModelRotation = 0x802CD1F0;
+SetAnimModelScale = 0x802CD29C;
+resolve_npc = 0x802CDAC0;
+set_npc_animation = 0x802CDB0C;
+CreateNpc = 0x802CDBA4;
+DeleteNpc = 0x802CDC1C;
+GetNpcPointer = 0x802CDC58;
+SetNpcPos = 0x802CDCB0;
+SetNpcRotation = 0x802CDDB0;
+SetNpcScale = 0x802CDED4;
+SetNpcCollisionSize = 0x802CDF8C;
+SetNpcSpeed = 0x802CE01C;
+SetNpcJumpscale = 0x802CE088;
+SetNpcAnimation = 0x802CE0F4;
+GetNpcAnimation = 0x802CE160;
+SetNpcAnimationSpeed = 0x802CE1C0;
+NpcMoveTo = 0x802CE22C;
+_npc_jump_to = 0x802CE434;
+NpcJump0 = 0x802CE6C4;
+NpcJump1 = 0x802CE6E0;
+NpcFlyTo = 0x802CE6FC;
+GetNpcYaw = 0x802CEA10;
+SetNpcYaw = 0x802CEA84;
+InterpNpcYaw = 0x802CEB04;
+NpcFacePlayer = 0x802CECC8;
+NpcFaceNpc = 0x802CEE80;
+SetNpcFlagBits = 0x802CF060;
+GetNpcPos = 0x802CF0F4;
+EnableNpcShadow = 0x802CF268;
+EnableNpcBlur = 0x802CF2EC;
+ClearPartnerMoveHistory = 0x802CF370;
+NpcSetHomePosToCurrent = 0x802CF3BC;
+GetPartnerPos = 0x802CF438;
+DisablePartnerAI = 0x802CF4E8;
+EnablePartnerAI = 0x802CF52C;
+BringPartnerOut = 0x802CF5B8;
+PutPartnerAway = 0x802CF988;
+GetCurrentPartnerID = 0x802CFC74;
+PartnerCanUseAbility = 0x802CFCA0;
+PartnerIsFlying = 0x802CFCE8;
+SetNpcEffect = 0x802D0118;
+PlaySoundAtNpc = 0x802D01AC;
+SpeakToPlayer = 0x802D02B0;
+EndSpeech = 0x802D02CC;
+ContinueSpeech = 0x802D02E8;
+SpeakToNpc = 0x802D0304;
+_show_message = 0x802D0320;
+ShowMessageAtScreenPos = 0x802D0894;
+ShowMessageAtWorldPos = 0x802D095C;
+CloseMessage = 0x802D0A98;
+SwitchMessage = 0x802D0AFC;
+ShowChoice = 0x802D0B6C;
+CloseChoice = 0x802D0BF8;
+CancelMessage = 0x802D0C20;
+CancelMessageAndBlock = 0x802D0C48;
+SetMessageImages = 0x802D0C70;
+SetMessageString = 0x802D0CEC;
+SetMessageValue = 0x802D0D44;
+HidePlayerShadow = 0x802D0DA0;
+DisablePlayerPhysics = 0x802D0DE4;
+DisablePlayerInput = 0x802D0E28;
+SetPlayerPos = 0x802D0EF0;
+SetPlayerCollisionSize = 0x802D0FB0;
+SetPlayerSpeed = 0x802D1024;
+SetPlayerJumpscale = 0x802D1054;
+SetPlayerAnimation = 0x802D1084;
+SetPlayerActionState = 0x802D10D8;
+SetPlayerAnimationSpeed = 0x802D1104;
+PlayerMoveTo = 0x802D1134;
+player_jump = 0x802D14E0;
+PlayerJump = 0x802D18E8;
+PlayerJump1 = 0x802D1904;
+PlayerJump2 = 0x802D1920;
+InterpPlayerYaw = 0x802D193C;
+PlayerFaceNpc = 0x802D1B04;
+GetPlayerTargetYaw = 0x802D1D28;
+SetPlayerFlagBits = 0x802D1D60;
+GetPlayerActionState = 0x802D1DD0;
+GetPlayerPos = 0x802D1DFC;
+GetPlayerAnimation = 0x802D1E94;
+FullyRestoreHPandFP = 0x802D1EC0;
+FullyRestoreSP = 0x802D1EE0;
+EnablePartner = 0x802D1EFC;
+DisablePartner = 0x802D1F38;
+UseEntryHeading = 0x802D1F70;
+UseExitHeading = 0x802D216C;
+DisablePulseStone = 0x802D2AA8;
+GetCurrentPartner = 0x802D2B0C;
+Disable8bitMario = 0x802D2B88;
+PlaySoundAtPlayer = 0x802D2CD8;
+MakeLerp = 0x802D45B0;
+UpdateLerp = 0x802D462C;
+RandInt = 0x802D46B0;
+GetAngleBetweenNPCs = 0x802D4708;
+GetAngleToNPC = 0x802D47B4;
+GetAngleToPlayer = 0x802D4830;
+AwaitPlayerApproach = 0x802D48AC;
+IsPlayerWithin = 0x802D4964;
+AwaitPlayerLeave = 0x802D4A5C;
+AddVectorPolar = 0x802D4B14;
+setup_path_data = 0x802D4DAC;
+LoadPath = 0x802D5430;
+GetNextPathPos = 0x802D5524;
+GetDist2D = 0x802D5770;
+SetValueByRef = 0x802D58E0;
+GetValueByRef = 0x802D593C;
+EnableStatusMenu = 0x802D5998;
+ShowStatusMenu = 0x802D59DC;
+SetGameMode = 0x802D5A28;
+ClampAngleInt = 0x802D5A58;
+ClampAngleFloat = 0x802D5AB4;
+FadeOutMusic = 0x802D5CE0;
+SetMusicTrack = 0x802D5D4C;
+FadeInMusic = 0x802D5DF4;
+ClearAmbientSounds = 0x802D60E8;
+PlayAmbientSounds = 0x802D611C;
+PlaySound = 0x802D6150;
+PlaySoundAt = 0x802D61DC;
+StopSound = 0x802D62B8;
+UseDoorSounds = 0x802D6314;
+PlaySoundAtF = 0x802D636C;
+RemoveKeyItemAt = 0x802D6858;
+RemoveItemAt = 0x802D688C;
+AddKeyItem = 0x802D68C8;
+HasKeyItem = 0x802D699C;
+FindKeyItem = 0x802D6A14;
+AddItem = 0x802D6A98;
+FindItem = 0x802D6B18;
+RemoveItem = 0x802D6B9C;
+CountFortressKeys = 0x802D6C4C;
+RemoveFortressKeys = 0x802D6C94;
+MakeItemEntity = 0x802D6CC0;
+DropItemEntity = 0x802D6DC0;
+DropItemEntityB = 0x802D6EC0;
+RemoveItemEntity = 0x802D6FCC;
+AddBadge = 0x802D6FF8;
+RemoveBadge = 0x802D7050;
+SetItemPos = 0x802D70D0;
+SetItemFlags = 0x802D7194;
+AddCoin = 0x802D7278;
+AddStarPoints = 0x802D72B4;
+AddStarPieces = 0x802D72F0;
+GetItemPower = 0x802D732C;
+ShowGotItem = 0x802D73A4;
+ShowEmote = 0x802D78A0;
+RemoveEffect = 0x802D7AE4;
+ShowSleepBubble = 0x802D8028;
+PlayEffect = 0x802D829C;
+SetSpriteShading = 0x802D9700;
+EnableSpriteShading = 0x802D9A3C;
+GetDemoState = 0x802D9A90;
+DemoPressButton = 0x802D9AC0;
+DemoReleaseButton = 0x802D9AF8;
+DemoSetButtons = 0x802D9B34;
+DemoJoystickRadial = 0x802D9B64;
+DemoJoystickXY = 0x802D9C10;
+gStaticScriptCounter = 0x802D9CA0;
+D_802D9CA4 = 0x802D9CA4;
+gGlobalTimeSpace = 0x802D9CA8;
+ShakeCam1 = 0x802D9CB0;
+ShakeCamX = 0x802D9CE8;
+D_802D9D50 = 0x802D9D50;
+spr_appendMDL_component = 0x802DC8F4;
+spr_transform_point = 0x802DCD00;
+spr_draw_component = 0x802DCEDC;
+_spr_sign_extend_12bit = 0x802DD0DC;
+_spr_sign_extend_16bit = 0x802DD0FC;
+update_component = 0x802DD11C;
+set_anim_timescale = 0x802DD88C;
+render_sprite = 0x802DDC40;
+load_sprite = 0x802DEB0C;
+create_shadow_callback = 0x802E0D90;
+save_game_at_player_position = 0x802E11A0;
+entity_init_BlueSwitch = 0x802E2380;
+entity_init_HugeBlueSwitch = 0x802E2408;
+entity_init_Hammer23Block_normal = 0x802E36E4;
+entity_init_Hammer1Block_normal = 0x802E3E00;
+entity_init_HammerBlock_small = 0x802E3E30;
+entity_init_Chest = 0x802E7D84;
+player_enter_blue_pipe = 0x802E8CCC;
+push_entity_matrix = 0x802E8E4C;

From 5d160b9f080b6d45e6b8530bc65f69d8913589fe Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 18:28:44 -0500
Subject: [PATCH 074/101] gPlayerData offsets

---
 .../code_102610_len_2330/func_802E1660.s      |  4 +-
 .../code_104940_len_dc0/func_802E3BA4.s       | 12 +--
 .../code_105700_len_2130/func_802E54CC.s      |  4 +-
 .../code_1086a0_len_fc0/func_802E7AE4.s       |  8 +-
 .../code_135EE0/pause_badges_draw_contents.s  | 20 ++---
 .../code_135EE0/pause_badges_try_remove.s     |  4 +-
 .../code_135EE0/pause_stats_draw_contents.s   | 44 +++++-----
 asm/nonmatchings/code_182B30/func_80255FE0.s  |  4 +-
 asm/nonmatchings/code_190B20/func_80263464.s  |  4 +-
 .../code_1A5830/calc_enemy_damage_target.s    |  8 +-
 .../code_1a1f0_len_5390/func_8003F7CC.s       | 12 +--
 .../code_20ec0_len_5040/spawn_drops.s         | 16 ++--
 .../code_7E3700/TeleportPartnerToPlayer.s     |  4 +-
 asm/nonmatchings/code_7E3700/func_80283908.s  |  4 +-
 .../code_80850_len_3060/update_status_menu.s  | 84 +++++++++----------
 .../code_838b0_len_5900/partner_reset_data.s  |  4 +-
 .../code_838b0_len_5900/use_consumable.s      |  4 +-
 .../dgb_04/C36530/func_802424F0_C38A20.s      |  4 +-
 .../dgb_04/C36530/func_80242818_C38D48.s      |  4 +-
 .../flo_08/CAED40/func_80240120_CAEE60.s      |  4 +-
 .../flo_08/CAED40/func_80240448_CAF188.s      |  4 +-
 .../flo_14/CCB310/func_802403D4_CCB6E4.s      |  4 +-
 .../flo_16/CD1F10/func_80240200_CD2030.s      |  4 +-
 .../flo_16/CD1F10/func_80240528_CD2358.s      |  4 +-
 .../hos_00/A0C4B0/func_802407C0_A0C4B0.s      |  4 +-
 .../hos_00/A0C4E0/func_80240908_A0C5F8.s      |  4 +-
 .../hos_06/A397F0/func_80240A68_A39F48.s      |  4 +-
 .../hos_06/A3A230/func_802417EC_A3ACCC.s      |  4 +-
 .../hos_10/A3FEB0/func_80240BEC_A4032C.s      |  4 +-
 .../isk_10/988B60/func_80240120_988C80.s      |  4 +-
 .../isk_10/988B60/func_80240448_988FA8.s      |  4 +-
 .../iwa_10/91E6D0/func_80240410_91E980.s      |  4 +-
 .../iwa_10/91E6D0/func_80240738_91ECA8.s      |  4 +-
 .../jan_08/B5E910/func_80240780_B5EA30.s      |  4 +-
 .../jan_08/B5E910/func_80240AA8_B5ED58.s      |  4 +-
 .../kkj_14/ADAEF0/func_8024035C_ADB1FC.s      |  4 +-
 .../kkj_15/AE5590/func_8024030C_AE589C.s      |  4 +-
 .../kkj_16/AED410/func_80240000_AED410.s      |  4 +-
 .../kkj_18/AF2CA0/func_8024030C_AF2FAC.s      |  4 +-
 .../kkj_23/B028A0/func_80240020_B028A0.s      |  4 +-
 .../kkj_26/B13120/func_80240000_B13120.s      |  4 +-
 .../kkj_29/B150B0/func_80240000_B150B0.s      |  4 +-
 .../kmr_02/8B0070/func_80242788_8B27F8.s      |  4 +-
 .../kmr_04/8CA960/func_80240434_8CAD34.s      |  4 +-
 .../kmr_20/8EBE50/func_802406C8_8EC4E8.s      |  4 +-
 .../kpa_12/A54CA0/func_8024037C_A54CCC.s      |  4 +-
 .../kpa_13/A56270/func_8024037C_A5629C.s      |  4 +-
 .../kpa_14/A57830/func_8024073C_A57BEC.s      |  4 +-
 .../kpa_96/A927C0/func_80240000_A927C0.s      |  4 +-
 .../kzn_02/C5AA50/func_802403DC_C5AB1C.s      |  4 +-
 .../kzn_04/C68440/func_80240430_C68560.s      |  4 +-
 .../kzn_04/C68440/func_80240758_C68888.s      |  4 +-
 .../kzn_09/C76CE0/func_80240120_C76E00.s      |  4 +-
 .../kzn_09/C76CE0/func_80240448_C77128.s      |  4 +-
 .../kzn_11/C804B0/func_80240310_C804B0.s      |  4 +-
 .../mac_00/7EB340/func_80242224_7ECF34.s      |  4 +-
 .../mgm_01/E12930/func_802416CC_E13E2C.s      |  4 +-
 .../mgm_02/E15D80/func_80242314_E18094.s      |  4 +-
 .../nok_11/9F4A40/func_80241F08_9F6948.s      |  4 +-
 .../omo_11/DDCFC0/func_802408B0_DDD0E0.s      |  4 +-
 .../omo_11/DDCFC0/func_80240BD8_DDD408.s      |  4 +-
 .../sam_08/D2FC80/func_80240120_D2FDA0.s      |  4 +-
 .../sam_08/D2FC80/func_80240448_D300C8.s      |  4 +-
 .../sbk_56/953FC0/func_802401A0_954160.s      |  4 +-
 .../sbk_56/953FC0/func_802404C8_954488.s      |  4 +-
 .../tik_07/879BE0/func_80240400_879FE0.s      |  4 +-
 .../tik_07/879BE0/func_80240728_87A308.s      |  4 +-
 .../tik_10/8866D0/func_802407A0_886B60.s      |  4 +-
 .../tik_10/8866D0/func_80240AC8_886E88.s      |  4 +-
 .../tik_12/8891C0/func_80240D3C_88990C.s      |  4 +-
 .../tik_12/8891C0/func_80241064_889C34.s      |  4 +-
 .../tik_15/890190/func_80240AD0_890670.s      |  4 +-
 .../tik_17/892A50/func_80240150_892B70.s      |  4 +-
 .../tik_17/892A50/func_80240478_892E98.s      |  4 +-
 .../tik_19/897BD0/func_80240710_897CF0.s      |  4 +-
 .../tik_19/897BD0/func_80240A38_898018.s      |  4 +-
 .../trd_10/9C3130/func_80240820_9C3130.s      |  4 +-
 requirements.txt                              |  1 +
 tools/symbol_addrs.txt                        |  1 +
 79 files changed, 242 insertions(+), 240 deletions(-)

diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s
index 194061e592..080da0f3c1 100644
--- a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s
+++ b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s
@@ -22,8 +22,8 @@ glabel func_802E1660
 /* 102F24 802E16A4 822300B4 */  lb        $v1, 0xb4($s1)
 /* 102F28 802E16A8 14620009 */  bne       $v1, $v0, .L802E16D0
 /* 102F2C 802E16AC 2402000D */   addiu    $v0, $zero, 0xd
-/* 102F30 802E16B0 3C028011 */  lui       $v0, 0x8011
-/* 102F34 802E16B4 8042F291 */  lb        $v0, -0xd6f($v0)
+/* 102F30 802E16B0 3C028011 */  lui       $v0, %hi(gPlayerData+0x1)
+/* 102F34 802E16B4 8042F291 */  lb        $v0, %lo(gPlayerData+0x1)($v0)
 /* 102F38 802E16B8 0440001A */  bltz      $v0, .L802E1724
 /* 102F3C 802E16BC 00000000 */   nop      
 /* 102F40 802E16C0 080B85C2 */  j         .L802E1708
diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
index a58bef3f9d..ac142e5bf1 100644
--- a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
+++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s
@@ -97,8 +97,8 @@ glabel func_802E3BA4
 /* 105570 802E3CF0 080B8F42 */  j         .L802E3D08
 /* 105574 802E3CF4 00000000 */   nop      
 .L802E3CF8:
-/* 105578 802E3CF8 3C028011 */  lui       $v0, 0x8011
-/* 10557C 802E3CFC 8042F291 */  lb        $v0, -0xd6f($v0)
+/* 105578 802E3CF8 3C028011 */  lui       $v0, %hi(gPlayerData+0x1)
+/* 10557C 802E3CFC 8042F291 */  lb        $v0, %lo(gPlayerData+0x1)($v0)
 /* 105580 802E3D00 04430001 */  bgezl     $v0, .L802E3D08
 /* 105584 802E3D04 24100001 */   addiu    $s0, $zero, 1
 .L802E3D08:
@@ -121,8 +121,8 @@ glabel func_802E3BA4
 /* 1055C8 802E3D48 080B8F58 */  j         .L802E3D60
 /* 1055CC 802E3D4C 00000000 */   nop      
 .L802E3D50:
-/* 1055D0 802E3D50 3C028011 */  lui       $v0, 0x8011
-/* 1055D4 802E3D54 8042F291 */  lb        $v0, -0xd6f($v0)
+/* 1055D0 802E3D50 3C028011 */  lui       $v0, %hi(gPlayerData+0x1)
+/* 1055D4 802E3D54 8042F291 */  lb        $v0, %lo(gPlayerData+0x1)($v0)
 /* 1055D8 802E3D58 5C400001 */  bgtzl     $v0, .L802E3D60
 /* 1055DC 802E3D5C 24100001 */   addiu    $s0, $zero, 1
 .L802E3D60:
@@ -135,8 +135,8 @@ glabel func_802E3BA4
 /* 1055F8 802E3D78 C6200050 */  lwc1      $f0, 0x50($s1)
 /* 1055FC 802E3D7C 080B8F6C */  j         .L802E3DB0
 /* 105600 802E3D80 24040150 */   addiu    $a0, $zero, 0x150
-/* 105604 802E3D84 3C028011 */  lui       $v0, 0x8011
-/* 105608 802E3D88 8042F291 */  lb        $v0, -0xd6f($v0)
+/* 105604 802E3D84 3C028011 */  lui       $v0, %hi(gPlayerData+0x1)
+/* 105608 802E3D88 8042F291 */  lb        $v0, %lo(gPlayerData+0x1)($v0)
 /* 10560C 802E3D8C 28420002 */  slti      $v0, $v0, 2
 /* 105610 802E3D90 14400015 */  bnez      $v0, .L802E3DE8
 /* 105614 802E3D94 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s
index 77c53f1b52..cc83ebeea2 100644
--- a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802E54CC
-/* 106D4C 802E54CC 3C028011 */  lui       $v0, 0x8011
-/* 106D50 802E54D0 9042F2AC */  lbu       $v0, -0xd54($v0)
+/* 106D4C 802E54CC 3C028011 */  lui       $v0, %hi(gPlayerData+0x1C)
+/* 106D50 802E54D0 9042F2AC */  lbu       $v0, %lo(gPlayerData+0x1C)($v0)
 /* 106D54 802E54D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 106D58 802E54D8 AFB00010 */  sw        $s0, 0x10($sp)
 /* 106D5C 802E54DC 0080802D */  daddu     $s0, $a0, $zero
diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s
index a3dc79dc42..b84b2c3964 100644
--- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s
+++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s
@@ -34,16 +34,16 @@ glabel func_802E7AE4
 /* 1093D8 802E7B58 A022F290 */  sb        $v0, %lo(gPlayerData)($at)
 /* 1093DC 802E7B5C 080B9EE2 */  j         .L802E7B88
 /* 1093E0 802E7B60 00000000 */   nop      
-/* 1093E4 802E7B64 3C018011 */  lui       $at, 0x8011
-/* 1093E8 802E7B68 A020F291 */  sb        $zero, -0xd6f($at)
+/* 1093E4 802E7B64 3C018011 */  lui       $at, %hi(gPlayerData+0x1)
+/* 1093E8 802E7B68 A020F291 */  sb        $zero, %lo(gPlayerData+0x1)($at)
 /* 1093EC 802E7B6C 080B9EE2 */  j         .L802E7B88
 /* 1093F0 802E7B70 00000000 */   nop      
 /* 1093F4 802E7B74 080B9EE0 */  j         .L802E7B80
 /* 1093F8 802E7B78 24020001 */   addiu    $v0, $zero, 1
 /* 1093FC 802E7B7C 24020002 */  addiu     $v0, $zero, 2
 .L802E7B80:
-/* 109400 802E7B80 3C018011 */  lui       $at, 0x8011
-/* 109404 802E7B84 A022F291 */  sb        $v0, -0xd6f($at)
+/* 109400 802E7B80 3C018011 */  lui       $at, %hi(gPlayerData+0x1)
+/* 109404 802E7B84 A022F291 */  sb        $v0, %lo(gPlayerData+0x1)($at)
 .L802E7B88:
 /* 109408 802E7B88 8E020010 */  lw        $v0, 0x10($s0)
 /* 10940C 802E7B8C 10400027 */  beqz      $v0, .L802E7C2C
diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s
index 5f0ccdd553..16a96ab4e8 100644
--- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s
+++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s
@@ -60,8 +60,8 @@ glabel pause_badges_draw_contents
 /* 13A91C 802475DC 00005810 */  mfhi      $t3
 /* 13A920 802475E0 24040004 */  addiu     $a0, $zero, 4
 /* 13A924 802475E4 8FA700C8 */  lw        $a3, 0xc8($sp)
-/* 13A928 802475E8 3C088011 */  lui       $t0, 0x8011
-/* 13A92C 802475EC 8108F298 */  lb        $t0, -0xd68($t0)
+/* 13A928 802475E8 3C088011 */  lui       $t0, %hi(gPlayerData+0x8)
+/* 13A92C 802475EC 8108F298 */  lb        $t0, %lo(gPlayerData+0x8)($t0)
 /* 13A930 802475F0 3C058027 */  lui       $a1, 0x8027
 /* 13A934 802475F4 24A5FC48 */  addiu     $a1, $a1, -0x3b8
 /* 13A938 802475F8 AFA00010 */  sw        $zero, 0x10($sp)
@@ -211,8 +211,8 @@ glabel pause_badges_draw_contents
 /* 13AB60 80247820 AFAA0094 */  sw        $t2, 0x94($sp)
 .L80247824:
 /* 13AB64 80247824 8FAB0078 */  lw        $t3, 0x78($sp)
-/* 13AB68 80247828 3C128011 */  lui       $s2, 0x8011
-/* 13AB6C 8024782C 2652F498 */  addiu     $s2, $s2, -0xb68
+/* 13AB68 80247828 3C128011 */  lui       $s2, %hi(gPlayerData+0x208)
+/* 13AB6C 8024782C 2652F498 */  addiu     $s2, $s2, %lo(gPlayerData+0x208)
 /* 13AB70 80247830 AFA00084 */  sw        $zero, 0x84($sp)
 /* 13AB74 80247834 8D620004 */  lw        $v0, 4($t3)
 /* 13AB78 80247838 24037FFF */  addiu     $v1, $zero, 0x7fff
@@ -1012,8 +1012,8 @@ glabel pause_badges_draw_contents
 /* 13B734 802483F4 24070001 */  addiu     $a3, $zero, 1
 /* 13B738 802483F8 241500FF */  addiu     $s5, $zero, 0xff
 /* 13B73C 802483FC 8FAB00C4 */  lw        $t3, 0xc4($sp)
-/* 13B740 80248400 3C048011 */  lui       $a0, 0x8011
-/* 13B744 80248404 8084F298 */  lb        $a0, -0xd68($a0)
+/* 13B740 80248400 3C048011 */  lui       $a0, %hi(gPlayerData+0x8)
+/* 13B744 80248404 8084F298 */  lb        $a0, %lo(gPlayerData+0x8)($a0)
 /* 13B748 80248408 24140003 */  addiu     $s4, $zero, 3
 /* 13B74C 8024840C AFB30010 */  sw        $s3, 0x10($sp)
 /* 13B750 80248410 AFB50014 */  sw        $s5, 0x14($sp)
@@ -1023,8 +1023,8 @@ glabel pause_badges_draw_contents
 /* 13B760 80248420 0C0911FD */  jal       pause_get_total_equipped_bp_cost
 /* 13B764 80248424 0000902D */   daddu    $s2, $zero, $zero
 /* 13B768 80248428 3C056666 */  lui       $a1, 0x6666
-/* 13B76C 8024842C 3C048011 */  lui       $a0, 0x8011
-/* 13B770 80248430 8084F298 */  lb        $a0, -0xd68($a0)
+/* 13B76C 8024842C 3C048011 */  lui       $a0, %hi(gPlayerData+0x8)
+/* 13B770 80248430 8084F298 */  lb        $a0, %lo(gPlayerData+0x8)($a0)
 /* 13B774 80248434 34A56667 */  ori       $a1, $a1, 0x6667
 /* 13B778 80248438 2483FFFF */  addiu     $v1, $a0, -1
 /* 13B77C 8024843C 00650018 */  mult      $v1, $a1
@@ -1068,8 +1068,8 @@ glabel pause_badges_draw_contents
 /* 13B810 802484D0 0060202D */  daddu     $a0, $v1, $zero
 /* 13B814 802484D4 24630008 */  addiu     $v1, $v1, 8
 /* 13B818 802484D8 ACC30000 */  sw        $v1, ($a2)
-/* 13B81C 802484DC 3C108011 */  lui       $s0, 0x8011
-/* 13B820 802484E0 8210F298 */  lb        $s0, -0xd68($s0)
+/* 13B81C 802484DC 3C108011 */  lui       $s0, %hi(gPlayerData+0x8)
+/* 13B820 802484E0 8210F298 */  lb        $s0, %lo(gPlayerData+0x8)($s0)
 /* 13B824 802484E4 241E0064 */  addiu     $fp, $zero, 0x64
 /* 13B828 802484E8 AC820000 */  sw        $v0, ($a0)
 /* 13B82C 802484EC 3C028027 */  lui       $v0, 0x8027
diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s
index e4973f8e35..d1916c5b06 100644
--- a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s
+++ b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel pause_badges_try_remove
-/* 13A5F0 802472B0 3C068011 */  lui       $a2, 0x8011
-/* 13A5F4 802472B4 24C6F498 */  addiu     $a2, $a2, -0xb68
+/* 13A5F0 802472B0 3C068011 */  lui       $a2, %hi(gPlayerData+0x208)
+/* 13A5F4 802472B4 24C6F498 */  addiu     $a2, $a2, %lo(gPlayerData+0x208)
 /* 13A5F8 802472B8 00C0182D */  daddu     $v1, $a2, $zero
 /* 13A5FC 802472BC 00042400 */  sll       $a0, $a0, 0x10
 /* 13A600 802472C0 00042403 */  sra       $a0, $a0, 0x10
diff --git a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s
index e7d909e93b..27f6124019 100644
--- a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s
+++ b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s
@@ -44,8 +44,8 @@ glabel pause_stats_draw_contents
 /* 138D5C 80245A1C 0200302D */  daddu     $a2, $s0, $zero
 /* 138D60 80245A20 24070001 */  addiu     $a3, $zero, 1
 /* 138D64 80245A24 8FA80084 */  lw        $t0, 0x84($sp)
-/* 138D68 80245A28 3C048011 */  lui       $a0, 0x8011
-/* 138D6C 80245A2C 8484F29C */  lh        $a0, -0xd64($a0)
+/* 138D68 80245A28 3C048011 */  lui       $a0, %hi(gPlayerData+0xC)
+/* 138D6C 80245A2C 8484F29C */  lh        $a0, %lo(gPlayerData+0xC)($a0)
 /* 138D70 80245A30 24120003 */  addiu     $s2, $zero, 3
 /* 138D74 80245A34 AFB20018 */  sw        $s2, 0x18($sp)
 /* 138D78 80245A38 25140119 */  addiu     $s4, $t0, 0x119
@@ -85,8 +85,8 @@ glabel pause_stats_draw_contents
 /* 138E00 80245AC0 0280282D */  daddu     $a1, $s4, $zero
 /* 138E04 80245AC4 0200302D */  daddu     $a2, $s0, $zero
 /* 138E08 80245AC8 24070001 */  addiu     $a3, $zero, 1
-/* 138E0C 80245ACC 3C048011 */  lui       $a0, 0x8011
-/* 138E10 80245AD0 8084F2A0 */  lb        $a0, -0xd60($a0)
+/* 138E0C 80245ACC 3C048011 */  lui       $a0, %hi(gPlayerData+0x10)
+/* 138E10 80245AD0 8084F2A0 */  lb        $a0, %lo(gPlayerData+0x10)($a0)
 /* 138E14 80245AD4 2408000A */  addiu     $t0, $zero, 0xa
 /* 138E18 80245AD8 AFA80010 */  sw        $t0, 0x10($sp)
 /* 138E1C 80245ADC 240800FF */  addiu     $t0, $zero, 0xff
@@ -121,8 +121,8 @@ glabel pause_stats_draw_contents
 /* 138E90 80245B50 0280282D */  daddu     $a1, $s4, $zero
 /* 138E94 80245B54 0200302D */  daddu     $a2, $s0, $zero
 /* 138E98 80245B58 24070001 */  addiu     $a3, $zero, 1
-/* 138E9C 80245B5C 3C048011 */  lui       $a0, 0x8011
-/* 138EA0 80245B60 9084F29F */  lbu       $a0, -0xd61($a0)
+/* 138E9C 80245B5C 3C048011 */  lui       $a0, %hi(gPlayerData+0xF)
+/* 138EA0 80245B60 9084F29F */  lbu       $a0, %lo(gPlayerData+0xF)($a0)
 /* 138EA4 80245B64 2408000A */  addiu     $t0, $zero, 0xa
 /* 138EA8 80245B68 AFA80010 */  sw        $t0, 0x10($sp)
 /* 138EAC 80245B6C 240800FF */  addiu     $t0, $zero, 0xff
@@ -165,8 +165,8 @@ glabel pause_stats_draw_contents
 /* 138F40 80245C00 AFA80014 */   sw       $t0, 0x14($sp)
 /* 138F44 80245C04 0200302D */  daddu     $a2, $s0, $zero
 /* 138F48 80245C08 8FA80084 */  lw        $t0, 0x84($sp)
-/* 138F4C 80245C0C 3C048011 */  lui       $a0, 0x8011
-/* 138F50 80245C10 8084F292 */  lb        $a0, -0xd6e($a0)
+/* 138F4C 80245C0C 3C048011 */  lui       $a0, %hi(gPlayerData+0x2)
+/* 138F50 80245C10 8084F292 */  lb        $a0, %lo(gPlayerData+0x2)($a0)
 /* 138F54 80245C14 24070001 */  addiu     $a3, $zero, 1
 /* 138F58 80245C18 AFA00010 */  sw        $zero, 0x10($sp)
 /* 138F5C 80245C1C AFB20018 */  sw        $s2, 0x18($sp)
@@ -187,8 +187,8 @@ glabel pause_stats_draw_contents
 /* 138F98 80245C58 AFA80014 */   sw       $t0, 0x14($sp)
 /* 138F9C 80245C5C 0200302D */  daddu     $a2, $s0, $zero
 /* 138FA0 80245C60 8FA80084 */  lw        $t0, 0x84($sp)
-/* 138FA4 80245C64 3C048011 */  lui       $a0, 0x8011
-/* 138FA8 80245C68 8084F293 */  lb        $a0, -0xd6d($a0)
+/* 138FA4 80245C64 3C048011 */  lui       $a0, %hi(gPlayerData+0x3)
+/* 138FA8 80245C68 8084F293 */  lb        $a0, %lo(gPlayerData+0x3)($a0)
 /* 138FAC 80245C6C 24070001 */  addiu     $a3, $zero, 1
 /* 138FB0 80245C70 AFA00010 */  sw        $zero, 0x10($sp)
 /* 138FB4 80245C74 AFB20018 */  sw        $s2, 0x18($sp)
@@ -221,8 +221,8 @@ glabel pause_stats_draw_contents
 /* 139020 80245CE0 0260282D */  daddu     $a1, $s3, $zero
 /* 139024 80245CE4 0200302D */  daddu     $a2, $s0, $zero
 /* 139028 80245CE8 24070001 */  addiu     $a3, $zero, 1
-/* 13902C 80245CEC 3C048011 */  lui       $a0, 0x8011
-/* 139030 80245CF0 8084F295 */  lb        $a0, -0xd6b($a0)
+/* 13902C 80245CEC 3C048011 */  lui       $a0, %hi(gPlayerData+0x5)
+/* 139030 80245CF0 8084F295 */  lb        $a0, %lo(gPlayerData+0x5)($a0)
 /* 139034 80245CF4 240800FF */  addiu     $t0, $zero, 0xff
 /* 139038 80245CF8 AFA00010 */  sw        $zero, 0x10($sp)
 /* 13903C 80245CFC AFA80014 */  sw        $t0, 0x14($sp)
@@ -241,8 +241,8 @@ glabel pause_stats_draw_contents
 /* 139070 80245D30 02E0282D */  daddu     $a1, $s7, $zero
 /* 139074 80245D34 0200302D */  daddu     $a2, $s0, $zero
 /* 139078 80245D38 24070001 */  addiu     $a3, $zero, 1
-/* 13907C 80245D3C 3C048011 */  lui       $a0, 0x8011
-/* 139080 80245D40 8084F296 */  lb        $a0, -0xd6a($a0)
+/* 13907C 80245D3C 3C048011 */  lui       $a0, %hi(gPlayerData+0x6)
+/* 139080 80245D40 8084F296 */  lb        $a0, %lo(gPlayerData+0x6)($a0)
 /* 139084 80245D44 240800FF */  addiu     $t0, $zero, 0xff
 /* 139088 80245D48 AFA00010 */  sw        $zero, 0x10($sp)
 /* 13908C 80245D4C AFA80014 */  sw        $t0, 0x14($sp)
@@ -272,8 +272,8 @@ glabel pause_stats_draw_contents
 /* 1390EC 80245DAC 0260282D */  daddu     $a1, $s3, $zero
 /* 1390F0 80245DB0 0200302D */  daddu     $a2, $s0, $zero
 /* 1390F4 80245DB4 24070001 */  addiu     $a3, $zero, 1
-/* 1390F8 80245DB8 3C048011 */  lui       $a0, 0x8011
-/* 1390FC 80245DBC 8084F298 */  lb        $a0, -0xd68($a0)
+/* 1390F8 80245DB8 3C048011 */  lui       $a0, %hi(gPlayerData+0x8)
+/* 1390FC 80245DBC 8084F298 */  lb        $a0, %lo(gPlayerData+0x8)($a0)
 /* 139100 80245DC0 240800FF */  addiu     $t0, $zero, 0xff
 /* 139104 80245DC4 AFA00010 */  sw        $zero, 0x10($sp)
 /* 139108 80245DC8 AFA80014 */  sw        $t0, 0x14($sp)
@@ -298,8 +298,8 @@ glabel pause_stats_draw_contents
 /* 139154 80245E14 0C04993B */  jal       draw_string
 /* 139158 80245E18 AFA80014 */   sw       $t0, 0x14($sp)
 /* 13915C 80245E1C 3C020149 */  lui       $v0, 0x149
-/* 139160 80245E20 3C148011 */  lui       $s4, 0x8011
-/* 139164 80245E24 8E94F54C */  lw        $s4, -0xab4($s4)
+/* 139160 80245E20 3C148011 */  lui       $s4, %hi(gPlayerData+0x2BC)
+/* 139164 80245E24 8E94F54C */  lw        $s4, %lo(gPlayerData+0x2BC)($s4)
 /* 139168 80245E28 344296FF */  ori       $v0, $v0, 0x96ff
 /* 13916C 80245E2C 0054102A */  slt       $v0, $v0, $s4
 /* 139170 80245E30 10400003 */  beqz      $v0, .L80245E40
@@ -423,8 +423,8 @@ glabel pause_stats_draw_contents
 /* 139344 80246004 00442023 */   subu     $a0, $v0, $a0
 /* 139348 80246008 3C028011 */  lui       $v0, %hi(gPlayerData)
 /* 13934C 8024600C 9042F290 */  lbu       $v0, %lo(gPlayerData)($v0)
-/* 139350 80246010 3C038011 */  lui       $v1, 0x8011
-/* 139354 80246014 9063F291 */  lbu       $v1, -0xd6f($v1)
+/* 139350 80246010 3C038011 */  lui       $v1, %hi(gPlayerData+0x1)
+/* 139354 80246014 9063F291 */  lbu       $v1, %lo(gPlayerData+0x1)($v1)
 /* 139358 80246018 8FA80084 */  lw        $t0, 0x84($sp)
 /* 13935C 8024601C 27C7000C */  addiu     $a3, $fp, 0xc
 /* 139360 80246020 AFA00010 */  sw        $zero, 0x10($sp)
@@ -432,8 +432,8 @@ glabel pause_stats_draw_contents
 /* 139368 80246028 00029603 */  sra       $s2, $v0, 0x18
 /* 13936C 8024602C 00031E00 */  sll       $v1, $v1, 0x18
 /* 139370 80246030 00039E03 */  sra       $s3, $v1, 0x18
-/* 139374 80246034 3C028011 */  lui       $v0, 0x8011
-/* 139378 80246038 9042F299 */  lbu       $v0, -0xd67($v0)
+/* 139374 80246034 3C028011 */  lui       $v0, %hi(gPlayerData+0x9)
+/* 139378 80246038 9042F299 */  lbu       $v0, %lo(gPlayerData+0x9)($v0)
 /* 13937C 8024603C 00021600 */  sll       $v0, $v0, 0x18
 /* 139380 80246040 0002A603 */  sra       $s4, $v0, 0x18
 /* 139384 80246044 0280102D */  daddu     $v0, $s4, $zero
diff --git a/asm/nonmatchings/code_182B30/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s
index 8a6421b9ed..58297a1373 100644
--- a/asm/nonmatchings/code_182B30/func_80255FE0.s
+++ b/asm/nonmatchings/code_182B30/func_80255FE0.s
@@ -658,8 +658,8 @@ glabel func_80255FE0
 .L802569B0:
 /* 185290 802569B0 1100000B */  beqz      $t0, .L802569E0
 /* 185294 802569B4 24020006 */   addiu    $v0, $zero, 6
-/* 185298 802569B8 3C038011 */  lui       $v1, 0x8011
-/* 18529C 802569BC 8063F2A2 */  lb        $v1, -0xd5e($v1)
+/* 185298 802569B8 3C038011 */  lui       $v1, %hi(gPlayerData+0x12)
+/* 18529C 802569BC 8063F2A2 */  lb        $v1, %lo(gPlayerData+0x12)($v1)
 /* 1852A0 802569C0 14620007 */  bne       $v1, $v0, .L802569E0
 /* 1852A4 802569C4 00000000 */   nop      
 /* 1852A8 802569C8 16000005 */  bnez      $s0, .L802569E0
diff --git a/asm/nonmatchings/code_190B20/func_80263464.s b/asm/nonmatchings/code_190B20/func_80263464.s
index 574798d6fd..521e4d14c4 100644
--- a/asm/nonmatchings/code_190B20/func_80263464.s
+++ b/asm/nonmatchings/code_190B20/func_80263464.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80263464
-/* 191D44 80263464 3C028011 */  lui       $v0, 0x8011
-/* 191D48 80263468 8042F292 */  lb        $v0, -0xd6e($v0)
+/* 191D44 80263464 3C028011 */  lui       $v0, %hi(gPlayerData+0x2)
+/* 191D48 80263468 8042F292 */  lb        $v0, %lo(gPlayerData+0x2)($v0)
 /* 191D4C 8026346C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 191D50 80263470 1C40000D */  bgtz      $v0, .L802634A8
 /* 191D54 80263474 AFBF0010 */   sw       $ra, 0x10($sp)
diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
index f6181bec33..48e88bc850 100644
--- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
+++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s
@@ -56,8 +56,8 @@ glabel calc_enemy_damage_target
 /* 1A5DCC 802774EC 00000000 */   nop      
 /* 1A5DD0 802774F0 16C00007 */  bnez      $s6, .L80277510
 /* 1A5DD4 802774F4 00000000 */   nop      
-/* 1A5DD8 802774F8 3C028011 */  lui       $v0, 0x8011
-/* 1A5DDC 802774FC 9042F292 */  lbu       $v0, -0xd6e($v0)
+/* 1A5DD8 802774F8 3C028011 */  lui       $v0, %hi(gPlayerData+0x2)
+/* 1A5DDC 802774FC 9042F292 */  lbu       $v0, %lo(gPlayerData+0x2)($v0)
 /* 1A5DE0 80277500 0809DD44 */  j         .L80277510
 /* 1A5DE4 80277504 A26201B8 */   sb       $v0, 0x1b8($s3)
 .L80277508:
@@ -513,8 +513,8 @@ glabel calc_enemy_damage_target
 /* 1A6458 80277B78 00501021 */  addu      $v0, $v0, $s0
 /* 1A645C 80277B7C A282007B */  sb        $v0, 0x7b($s4)
 /* 1A6460 80277B80 926201B8 */  lbu       $v0, 0x1b8($s3)
-/* 1A6464 80277B84 3C018011 */  lui       $at, 0x8011
-/* 1A6468 80277B88 A022F292 */  sb        $v0, -0xd6e($at)
+/* 1A6464 80277B84 3C018011 */  lui       $at, %hi(gPlayerData+0x2)
+/* 1A6468 80277B88 A022F292 */  sb        $v0, %lo(gPlayerData+0x2)($at)
 .L80277B8C:
 /* 1A646C 80277B8C 3C02800E */  lui       $v0, %hi(gBattleStatus)
 /* 1A6470 80277B90 8C42C070 */  lw        $v0, %lo(gBattleStatus)($v0)
diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s
index 7a5a543e63..b1957f3e01 100644
--- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s
+++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s
@@ -759,8 +759,8 @@ glabel func_8003F7CC
 /* 1B6FC 800402FC 0000282D */  daddu     $a1, $zero, $zero
 /* 1B700 80040300 0C052757 */  jal       play_sound_at_position
 /* 1B704 80040304 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 1B708 80040308 3C038011 */  lui       $v1, 0x8011
-/* 1B70C 8004030C 9063F291 */  lbu       $v1, -0xd6f($v1)
+/* 1B708 80040308 3C038011 */  lui       $v1, %hi(gPlayerData+0x1)
+/* 1B70C 8004030C 9063F291 */  lbu       $v1, %lo(gPlayerData+0x1)($v1)
 /* 1B710 80040310 24020004 */  addiu     $v0, $zero, 4
 /* 1B714 80040314 A2620005 */  sb        $v0, 5($s3)
 /* 1B718 80040318 0801015F */  j         .L8004057C
@@ -1030,8 +1030,8 @@ glabel func_8003F7CC
 /* 1BB14 80040714 1040000A */  beqz      $v0, .L80040740
 /* 1BB18 80040718 00000000 */   nop      
 /* 1BB1C 8004071C 8E220018 */  lw        $v0, 0x18($s1)
-/* 1BB20 80040720 3C038011 */  lui       $v1, 0x8011
-/* 1BB24 80040724 8063F299 */  lb        $v1, -0xd67($v1)
+/* 1BB20 80040720 3C038011 */  lui       $v1, %hi(gPlayerData+0x9)
+/* 1BB24 80040724 8063F299 */  lb        $v1, %lo(gPlayerData+0x9)($v1)
 /* 1BB28 80040728 84420028 */  lh        $v0, 0x28($v0)
 /* 1BB2C 8004072C 0062182A */  slt       $v1, $v1, $v0
 /* 1BB30 80040730 14600003 */  bnez      $v1, .L80040740
@@ -1126,8 +1126,8 @@ glabel func_8003F7CC
 /* 1BC80 80040880 5040001C */  beql      $v0, $zero, .L800408F4
 /* 1BC84 80040884 A2700004 */   sb       $s0, 4($s3)
 /* 1BC88 80040888 8E220018 */  lw        $v0, 0x18($s1)
-/* 1BC8C 8004088C 3C038011 */  lui       $v1, 0x8011
-/* 1BC90 80040890 8063F299 */  lb        $v1, -0xd67($v1)
+/* 1BC8C 8004088C 3C038011 */  lui       $v1, %hi(gPlayerData+0x9)
+/* 1BC90 80040890 8063F299 */  lb        $v1, %lo(gPlayerData+0x9)($v1)
 /* 1BC94 80040894 84420028 */  lh        $v0, 0x28($v0)
 /* 1BC98 80040898 0062182A */  slt       $v1, $v1, $v0
 /* 1BC9C 8004089C 54600015 */  bnel      $v1, $zero, .L800408F4
diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
index 7b4c785996..ae5a24ac34 100644
--- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
@@ -245,10 +245,10 @@ glabel spawn_drops
 /* 23A10 80048610 4481D000 */  mtc1      $at, $f26
 /* 23A14 80048614 3C0142C8 */  lui       $at, 0x42c8
 /* 23A18 80048618 4481E000 */  mtc1      $at, $f28
-/* 23A1C 8004861C 3C028011 */  lui       $v0, 0x8011
-/* 23A20 80048620 8042F292 */  lb        $v0, -0xd6e($v0)
-/* 23A24 80048624 3C038011 */  lui       $v1, 0x8011
-/* 23A28 80048628 8063F293 */  lb        $v1, -0xd6d($v1)
+/* 23A1C 8004861C 3C028011 */  lui       $v0, %hi(gPlayerData+0x2)
+/* 23A20 80048620 8042F292 */  lb        $v0, %lo(gPlayerData+0x2)($v0)
+/* 23A24 80048624 3C038011 */  lui       $v1, %hi(gPlayerData+0x3)
+/* 23A28 80048628 8063F293 */  lb        $v1, %lo(gPlayerData+0x3)($v1)
 /* 23A2C 8004862C 24130002 */  addiu     $s3, $zero, 2
 /* 23A30 80048630 AFA00030 */  sw        $zero, 0x30($sp)
 /* 23A34 80048634 44821000 */  mtc1      $v0, $f2
@@ -431,10 +431,10 @@ glabel spawn_drops
 /* 23CC0 800488C0 4481D000 */  mtc1      $at, $f26
 /* 23CC4 800488C4 3C0142C8 */  lui       $at, 0x42c8
 /* 23CC8 800488C8 4481E000 */  mtc1      $at, $f28
-/* 23CCC 800488CC 3C028011 */  lui       $v0, 0x8011
-/* 23CD0 800488D0 8042F295 */  lb        $v0, -0xd6b($v0)
-/* 23CD4 800488D4 3C038011 */  lui       $v1, 0x8011
-/* 23CD8 800488D8 8063F296 */  lb        $v1, -0xd6a($v1)
+/* 23CCC 800488CC 3C028011 */  lui       $v0, %hi(gPlayerData+0x5)
+/* 23CD0 800488D0 8042F295 */  lb        $v0, %lo(gPlayerData+0x5)($v0)
+/* 23CD4 800488D4 3C038011 */  lui       $v1, %hi(gPlayerData+0x6)
+/* 23CD8 800488D8 8063F296 */  lb        $v1, %lo(gPlayerData+0x6)($v1)
 /* 23CDC 800488DC 24130002 */  addiu     $s3, $zero, 2
 /* 23CE0 800488E0 AFA00030 */  sw        $zero, 0x30($sp)
 /* 23CE4 800488E4 44821000 */  mtc1      $v0, $f2
diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
index 140cbadd07..3af1e3c00a 100644
--- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
+++ b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel TeleportPartnerToPlayer
-/* 7E46FC 8028387C 3C028011 */  lui       $v0, 0x8011
-/* 7E4700 80283880 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 7E46FC 8028387C 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 7E4700 80283880 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 7E4704 80283884 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 7E4708 80283888 AFB10014 */  sw        $s1, 0x14($sp)
 /* 7E470C 8028388C 3C118011 */  lui       $s1, %hi(gPlayerStatus)
diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s
index 6e6e927ccb..e00af2cf6e 100644
--- a/asm/nonmatchings/code_7E3700/func_80283908.s
+++ b/asm/nonmatchings/code_7E3700/func_80283908.s
@@ -38,8 +38,8 @@ glabel func_80283908
 /* 7E480C 8028398C 00431021 */  addu      $v0, $v0, $v1
 /* 7E4810 80283990 000210C0 */  sll       $v0, $v0, 3
 /* 7E4814 80283994 E6000030 */  swc1      $f0, 0x30($s0)
-/* 7E4818 80283998 3C038011 */  lui       $v1, 0x8011
-/* 7E481C 8028399C 8063F2A2 */  lb        $v1, -0xd5e($v1)
+/* 7E4818 80283998 3C038011 */  lui       $v1, %hi(gPlayerData+0x12)
+/* 7E481C 8028399C 8063F2A2 */  lb        $v1, %lo(gPlayerData+0x12)($v1)
 /* 7E4820 802839A0 10600022 */  beqz      $v1, .L80283A2C
 /* 7E4824 802839A4 00449021 */   addu     $s2, $v0, $a0
 /* 7E4828 802839A8 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
index 1db095db11..1316ee7478 100644
--- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
+++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s
@@ -40,16 +40,16 @@ glabel update_status_menu
 /* 815F0 800E8140 80420070 */  lb        $v0, 0x70($v0)
 /* 815F4 800E8144 14400008 */  bnez      $v0, .L800E8168
 /* 815F8 800E8148 00000000 */   nop      
-/* 815FC 800E814C 3C038011 */  lui       $v1, 0x8011
-/* 81600 800E8150 8463F29C */  lh        $v1, -0xd64($v1)
+/* 815FC 800E814C 3C038011 */  lui       $v1, %hi(gPlayerData+0xC)
+/* 81600 800E8150 8463F29C */  lh        $v1, %lo(gPlayerData+0xC)($v1)
 /* 81604 800E8154 86620040 */  lh        $v0, 0x40($s3)
 /* 81608 800E8158 10620007 */  beq       $v1, $v0, .L800E8178
 /* 8160C 800E815C 00628023 */   subu     $s0, $v1, $v0
 /* 81610 800E8160 0C03A67D */  jal       status_menu_start_blinking_coins
 /* 81614 800E8164 00000000 */   nop      
 .L800E8168:
-/* 81618 800E8168 3C038011 */  lui       $v1, 0x8011
-/* 8161C 800E816C 8463F29C */  lh        $v1, -0xd64($v1)
+/* 81618 800E8168 3C038011 */  lui       $v1, %hi(gPlayerData+0xC)
+/* 8161C 800E816C 8463F29C */  lh        $v1, %lo(gPlayerData+0xC)($v1)
 /* 81620 800E8170 86620040 */  lh        $v0, 0x40($s3)
 /* 81624 800E8174 00628023 */  subu      $s0, $v1, $v0
 .L800E8178:
@@ -69,8 +69,8 @@ glabel update_status_menu
 /* 81654 800E81A4 00628023 */  subu      $s0, $v1, $v0
 /* 81658 800E81A8 96620040 */  lhu       $v0, 0x40($s3)
 /* 8165C 800E81AC 8264003D */  lb        $a0, 0x3d($s3)
-/* 81660 800E81B0 3C038011 */  lui       $v1, 0x8011
-/* 81664 800E81B4 8063F292 */  lb        $v1, -0xd6e($v1)
+/* 81660 800E81B0 3C038011 */  lui       $v1, %hi(gPlayerData+0x2)
+/* 81664 800E81B4 8063F292 */  lb        $v1, %lo(gPlayerData+0x2)($v1)
 /* 81668 800E81B8 00501021 */  addu      $v0, $v0, $s0
 /* 8166C 800E81BC 1083000C */  beq       $a0, $v1, .L800E81F0
 /* 81670 800E81C0 A6620040 */   sh       $v0, 0x40($s3)
@@ -88,8 +88,8 @@ glabel update_status_menu
 /* 8169C 800E81EC A6620038 */  sh        $v0, 0x38($s3)
 .L800E81F0:
 /* 816A0 800E81F0 8263003E */  lb        $v1, 0x3e($s3)
-/* 816A4 800E81F4 3C028011 */  lui       $v0, 0x8011
-/* 816A8 800E81F8 8042F295 */  lb        $v0, -0xd6b($v0)
+/* 816A4 800E81F4 3C028011 */  lui       $v0, %hi(gPlayerData+0x5)
+/* 816A8 800E81F8 8042F295 */  lb        $v0, %lo(gPlayerData+0x5)($v0)
 /* 816AC 800E81FC 1062000C */  beq       $v1, $v0, .L800E8230
 /* 816B0 800E8200 00000000 */   nop      
 /* 816B4 800E8204 82620044 */  lb        $v0, 0x44($s3)
@@ -106,8 +106,8 @@ glabel update_status_menu
 /* 816DC 800E822C A6620038 */  sh        $v0, 0x38($s3)
 .L800E8230:
 /* 816E0 800E8230 86630048 */  lh        $v1, 0x48($s3)
-/* 816E4 800E8234 3C028011 */  lui       $v0, 0x8011
-/* 816E8 800E8238 8442F520 */  lh        $v0, -0xae0($v0)
+/* 816E4 800E8234 3C028011 */  lui       $v0, %hi(gPlayerData+0x290)
+/* 816E8 800E8238 8442F520 */  lh        $v0, %lo(gPlayerData+0x290)($v0)
 /* 816EC 800E823C 1062000C */  beq       $v1, $v0, .L800E8270
 /* 816F0 800E8240 00000000 */   nop      
 /* 816F4 800E8244 82620044 */  lb        $v0, 0x44($s3)
@@ -124,8 +124,8 @@ glabel update_status_menu
 /* 8171C 800E826C A6620038 */  sh        $v0, 0x38($s3)
 .L800E8270:
 /* 81720 800E8270 8264003D */  lb        $a0, 0x3d($s3)
-/* 81724 800E8274 3C038011 */  lui       $v1, 0x8011
-/* 81728 800E8278 8063F292 */  lb        $v1, -0xd6e($v1)
+/* 81724 800E8274 3C038011 */  lui       $v1, %hi(gPlayerData+0x2)
+/* 81728 800E8278 8063F292 */  lb        $v1, %lo(gPlayerData+0x2)($v1)
 /* 8172C 800E827C 1083002E */  beq       $a0, $v1, .L800E8338
 /* 81730 800E8280 00000000 */   nop      
 /* 81734 800E8284 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
@@ -139,8 +139,8 @@ glabel update_status_menu
 /* 81754 800E82A4 00000000 */   nop      
 .L800E82A8:
 /* 81758 800E82A8 8262003D */  lb        $v0, 0x3d($s3)
-/* 8175C 800E82AC 3C038011 */  lui       $v1, 0x8011
-/* 81760 800E82B0 8063F292 */  lb        $v1, -0xd6e($v1)
+/* 8175C 800E82AC 3C038011 */  lui       $v1, %hi(gPlayerData+0x2)
+/* 81760 800E82B0 8063F292 */  lb        $v1, %lo(gPlayerData+0x2)($v1)
 /* 81764 800E82B4 0043102A */  slt       $v0, $v0, $v1
 /* 81768 800E82B8 10400018 */  beqz      $v0, .L800E831C
 /* 8176C 800E82BC 9263003D */   lbu      $v1, 0x3d($s3)
@@ -178,8 +178,8 @@ glabel update_status_menu
 /* 817E4 800E8334 A262003D */  sb        $v0, 0x3d($s3)
 .L800E8338:
 /* 817E8 800E8338 8264003E */  lb        $a0, 0x3e($s3)
-/* 817EC 800E833C 3C038011 */  lui       $v1, 0x8011
-/* 817F0 800E8340 8063F295 */  lb        $v1, -0xd6b($v1)
+/* 817EC 800E833C 3C038011 */  lui       $v1, %hi(gPlayerData+0x5)
+/* 817F0 800E8340 8063F295 */  lb        $v1, %lo(gPlayerData+0x5)($v1)
 /* 817F4 800E8344 1083002E */  beq       $a0, $v1, .L800E8400
 /* 817F8 800E8348 00000000 */   nop      
 /* 817FC 800E834C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
@@ -193,8 +193,8 @@ glabel update_status_menu
 /* 8181C 800E836C 00000000 */   nop      
 .L800E8370:
 /* 81820 800E8370 8262003E */  lb        $v0, 0x3e($s3)
-/* 81824 800E8374 3C038011 */  lui       $v1, 0x8011
-/* 81828 800E8378 8063F295 */  lb        $v1, -0xd6b($v1)
+/* 81824 800E8374 3C038011 */  lui       $v1, %hi(gPlayerData+0x5)
+/* 81828 800E8378 8063F295 */  lb        $v1, %lo(gPlayerData+0x5)($v1)
 /* 8182C 800E837C 0043102A */  slt       $v0, $v0, $v1
 /* 81830 800E8380 10400018 */  beqz      $v0, .L800E83E4
 /* 81834 800E8384 9263003E */   lbu      $v1, 0x3e($s3)
@@ -232,8 +232,8 @@ glabel update_status_menu
 /* 818AC 800E83FC A262003E */  sb        $v0, 0x3e($s3)
 .L800E8400:
 /* 818B0 800E8400 86620048 */  lh        $v0, 0x48($s3)
-/* 818B4 800E8404 3C048011 */  lui       $a0, 0x8011
-/* 818B8 800E8408 8484F520 */  lh        $a0, -0xae0($a0)
+/* 818B4 800E8404 3C048011 */  lui       $a0, %hi(gPlayerData+0x290)
+/* 818B8 800E8408 8484F520 */  lh        $a0, %lo(gPlayerData+0x290)($a0)
 /* 818BC 800E840C 96630048 */  lhu       $v1, 0x48($s3)
 /* 818C0 800E8410 1044001A */  beq       $v0, $a0, .L800E847C
 /* 818C4 800E8414 0044102A */   slt      $v0, $v0, $a0
@@ -241,12 +241,12 @@ glabel update_status_menu
 /* 818CC 800E841C 2462000A */   addiu    $v0, $v1, 0xa
 /* 818D0 800E8420 A6620048 */  sh        $v0, 0x48($s3)
 /* 818D4 800E8424 00021400 */  sll       $v0, $v0, 0x10
-/* 818D8 800E8428 3C038011 */  lui       $v1, 0x8011
-/* 818DC 800E842C 8463F520 */  lh        $v1, -0xae0($v1)
+/* 818D8 800E8428 3C038011 */  lui       $v1, %hi(gPlayerData+0x290)
+/* 818DC 800E842C 8463F520 */  lh        $v1, %lo(gPlayerData+0x290)($v1)
 /* 818E0 800E8430 00021403 */  sra       $v0, $v0, 0x10
 /* 818E4 800E8434 0062182A */  slt       $v1, $v1, $v0
-/* 818E8 800E8438 3C028011 */  lui       $v0, 0x8011
-/* 818EC 800E843C 9442F520 */  lhu       $v0, -0xae0($v0)
+/* 818E8 800E8438 3C028011 */  lui       $v0, %hi(gPlayerData+0x290)
+/* 818EC 800E843C 9442F520 */  lhu       $v0, %lo(gPlayerData+0x290)($v0)
 /* 818F0 800E8440 5460000E */  bnel      $v1, $zero, .L800E847C
 /* 818F4 800E8444 A6620048 */   sh       $v0, 0x48($s3)
 /* 818F8 800E8448 0803A11F */  j         .L800E847C
@@ -255,12 +255,12 @@ glabel update_status_menu
 /* 81900 800E8450 2462FFF6 */  addiu     $v0, $v1, -0xa
 /* 81904 800E8454 A6620048 */  sh        $v0, 0x48($s3)
 /* 81908 800E8458 00021400 */  sll       $v0, $v0, 0x10
-/* 8190C 800E845C 3C038011 */  lui       $v1, 0x8011
-/* 81910 800E8460 8463F520 */  lh        $v1, -0xae0($v1)
+/* 8190C 800E845C 3C038011 */  lui       $v1, %hi(gPlayerData+0x290)
+/* 81910 800E8460 8463F520 */  lh        $v1, %lo(gPlayerData+0x290)($v1)
 /* 81914 800E8464 00021403 */  sra       $v0, $v0, 0x10
 /* 81918 800E8468 0043102A */  slt       $v0, $v0, $v1
-/* 8191C 800E846C 3C038011 */  lui       $v1, 0x8011
-/* 81920 800E8470 9463F520 */  lhu       $v1, -0xae0($v1)
+/* 8191C 800E846C 3C038011 */  lui       $v1, %hi(gPlayerData+0x290)
+/* 81920 800E8470 9463F520 */  lhu       $v1, %lo(gPlayerData+0x290)($v1)
 /* 81924 800E8474 54400001 */  bnel      $v0, $zero, .L800E847C
 /* 81928 800E8478 A6630048 */   sh       $v1, 0x48($s3)
 .L800E847C:
@@ -492,8 +492,8 @@ glabel update_status_menu
 /* 81C78 800E87C8 86650034 */  lh        $a1, 0x34($s3)
 /* 81C7C 800E87CC 86660036 */  lh        $a2, 0x36($s3)
 /* 81C80 800E87D0 8267003D */  lb        $a3, 0x3d($s3)
-/* 81C84 800E87D4 3C028011 */  lui       $v0, 0x8011
-/* 81C88 800E87D8 8042F293 */  lb        $v0, -0xd6d($v0)
+/* 81C84 800E87D4 3C028011 */  lui       $v0, %hi(gPlayerData+0x3)
+/* 81C88 800E87D8 8042F293 */  lb        $v0, %lo(gPlayerData+0x3)($v0)
 /* 81C8C 800E87DC 24A50030 */  addiu     $a1, $a1, 0x30
 /* 81C90 800E87E0 24C60008 */  addiu     $a2, $a2, 8
 /* 81C94 800E87E4 0C039F8D */  jal       status_menu_draw_stat
@@ -550,20 +550,20 @@ glabel update_status_menu
 /* 81D50 800E88A0 86650034 */  lh        $a1, 0x34($s3)
 /* 81D54 800E88A4 86660036 */  lh        $a2, 0x36($s3)
 /* 81D58 800E88A8 8267003E */  lb        $a3, 0x3e($s3)
-/* 81D5C 800E88AC 3C028011 */  lui       $v0, 0x8011
-/* 81D60 800E88B0 8042F296 */  lb        $v0, -0xd6a($v0)
+/* 81D5C 800E88AC 3C028011 */  lui       $v0, %hi(gPlayerData+0x6)
+/* 81D60 800E88B0 8042F296 */  lb        $v0, %lo(gPlayerData+0x6)($v0)
 /* 81D64 800E88B4 24A50088 */  addiu     $a1, $a1, 0x88
 /* 81D68 800E88B8 24C60008 */  addiu     $a2, $a2, 8
 /* 81D6C 800E88BC 0C039F8D */  jal       status_menu_draw_stat
 /* 81D70 800E88C0 AFA20010 */   sw       $v0, 0x10($sp)
 .L800E88C4:
-/* 81D74 800E88C4 3C028011 */  lui       $v0, 0x8011
-/* 81D78 800E88C8 8042F299 */  lb        $v0, -0xd67($v0)
+/* 81D74 800E88C4 3C028011 */  lui       $v0, %hi(gPlayerData+0x9)
+/* 81D78 800E88C8 8042F299 */  lb        $v0, %lo(gPlayerData+0x9)($v0)
 /* 81D7C 800E88CC 2842001B */  slti      $v0, $v0, 0x1b
 /* 81D80 800E88D0 14400003 */  bnez      $v0, .L800E88E0
 /* 81D84 800E88D4 00000000 */   nop      
-/* 81D88 800E88D8 3C018011 */  lui       $at, 0x8011
-/* 81D8C 800E88DC A020F2A0 */  sb        $zero, -0xd60($at)
+/* 81D88 800E88D8 3C018011 */  lui       $at, %hi(gPlayerData+0x10)
+/* 81D8C 800E88DC A020F2A0 */  sb        $zero, %lo(gPlayerData+0x10)($at)
 .L800E88E0:
 /* 81D90 800E88E0 82620052 */  lb        $v0, 0x52($s3)
 /* 81D94 800E88E4 1040000B */  beqz      $v0, .L800E8914
@@ -605,8 +605,8 @@ glabel update_status_menu
 /* 81E1C 800E896C 24020002 */  addiu     $v0, $zero, 2
 /* 81E20 800E8970 AFA20010 */  sw        $v0, 0x10($sp)
 /* 81E24 800E8974 86660036 */  lh        $a2, 0x36($s3)
-/* 81E28 800E8978 3C078011 */  lui       $a3, 0x8011
-/* 81E2C 800E897C 80E7F2A0 */  lb        $a3, -0xd60($a3)
+/* 81E28 800E8978 3C078011 */  lui       $a3, %hi(gPlayerData+0x10)
+/* 81E2C 800E897C 80E7F2A0 */  lb        $a3, %lo(gPlayerData+0x10)($a3)
 /* 81E30 800E8980 24A500C8 */  addiu     $a1, $a1, 0xc8
 /* 81E34 800E8984 0C039F29 */  jal       status_menu_draw_number
 /* 81E38 800E8988 24C60008 */   addiu    $a2, $a2, 8
@@ -711,8 +711,8 @@ glabel update_status_menu
 /* 81FA0 800E8AF0 24020001 */  addiu     $v0, $zero, 1
 /* 81FA4 800E8AF4 1462002B */  bne       $v1, $v0, .L800E8BA4
 /* 81FA8 800E8AF8 00000000 */   nop      
-/* 81FAC 800E8AFC 3C038011 */  lui       $v1, 0x8011
-/* 81FB0 800E8B00 8463F520 */  lh        $v1, -0xae0($v1)
+/* 81FAC 800E8AFC 3C038011 */  lui       $v1, %hi(gPlayerData+0x290)
+/* 81FB0 800E8B00 8463F520 */  lh        $v1, %lo(gPlayerData+0x290)($v1)
 /* 81FB4 800E8B04 04610002 */  bgez      $v1, .L800E8B10
 /* 81FB8 800E8B08 0060102D */   daddu    $v0, $v1, $zero
 /* 81FBC 800E8B0C 246200FF */  addiu     $v0, $v1, 0xff
@@ -1064,8 +1064,8 @@ glabel update_status_menu
 /* 824C8 800E9018 3C16800F */  lui       $s6, 0x800f
 /* 824CC 800E901C 26D67FE8 */  addiu     $s6, $s6, 0x7fe8
 /* 824D0 800E9020 8FA90050 */  lw        $t1, 0x50($sp)
-/* 824D4 800E9024 3C048011 */  lui       $a0, 0x8011
-/* 824D8 800E9028 8084F51E */  lb        $a0, -0xae2($a0)
+/* 824D4 800E9024 3C048011 */  lui       $a0, %hi(gPlayerData+0x28E)
+/* 824D8 800E9028 8084F51E */  lb        $a0, %lo(gPlayerData+0x28E)($a0)
 /* 824DC 800E902C 00091080 */  sll       $v0, $t1, 2
 /* 824E0 800E9030 00491021 */  addu      $v0, $v0, $t1
 /* 824E4 800E9034 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s
index 6441e053df..ffe2fa71ae 100644
--- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s
+++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s
@@ -8,8 +8,8 @@ glabel partner_reset_data
 /* 84930 800EB480 2631EBB0 */  addiu     $s1, $s1, %lo(D_8010EBB0)
 /* 84934 800EB484 0220202D */  daddu     $a0, $s1, $zero
 /* 84938 800EB488 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8493C 800EB48C 3C108011 */  lui       $s0, 0x8011
-/* 84940 800EB490 8210F2A2 */  lb        $s0, -0xd5e($s0)
+/* 8493C 800EB48C 3C108011 */  lui       $s0, %hi(gPlayerData+0x12)
+/* 84940 800EB490 8210F2A2 */  lb        $s0, %lo(gPlayerData+0x12)($s0)
 /* 84944 800EB494 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 84948 800EB498 0C00A580 */  jal       mem_clear
 /* 8494C 800EB49C 24050360 */   addiu    $a1, $zero, 0x360
diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s
index c341840e85..4ce96bddbf 100644
--- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s
+++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s
@@ -16,9 +16,9 @@ glabel use_consumable
 /* 838DC 800EA42C 00111040 */  sll       $v0, $s1, 1
 /* 838E0 800EA430 3C018011 */  lui       $at, %hi(D_8010CD20)
 /* 838E4 800EA434 AC31CD20 */  sw        $s1, %lo(D_8010CD20)($at)
-/* 838E8 800EA438 3C118011 */  lui       $s1, 0x8011
+/* 838E8 800EA438 3C118011 */  lui       $s1, %hi(gPlayerData+0x1B4)
 /* 838EC 800EA43C 02228821 */  addu      $s1, $s1, $v0
-/* 838F0 800EA440 8631F444 */  lh        $s1, -0xbbc($s1)
+/* 838F0 800EA440 8631F444 */  lh        $s1, %lo(gPlayerData+0x1B4)($s1)
 /* 838F4 800EA444 0C00A5CF */  jal       dma_copy
 /* 838F8 800EA448 00000000 */   nop      
 /* 838FC 800EA44C 24050001 */  addiu     $a1, $zero, 1
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s
index 9c04bc7950..6a5639e28f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s
@@ -12,8 +12,8 @@ glabel func_802424F0_C38A20
 /* C38A3C 8024250C AFB50024 */  sw        $s5, 0x24($sp)
 /* C38A40 80242510 0200A82D */  daddu     $s5, $s0, $zero
 /* C38A44 80242514 AFB10014 */  sw        $s1, 0x14($sp)
-/* C38A48 80242518 3C118011 */  lui       $s1, 0x8011
-/* C38A4C 8024251C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* C38A48 80242518 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* C38A4C 8024251C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* C38A50 80242520 AFBF0028 */  sw        $ra, 0x28($sp)
 /* C38A54 80242524 AFB20018 */  sw        $s2, 0x18($sp)
 /* C38A58 80242528 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
index 431c983a4e..474b20ce22 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242818_C38D48
-/* C38D48 80242818 3C028011 */  lui       $v0, 0x8011
-/* C38D4C 8024281C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* C38D48 80242818 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* C38D4C 8024281C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* C38D50 80242820 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C38D54 80242824 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C38D58 80242828 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s
index d258a5b4c0..fda576323c 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s
@@ -12,8 +12,8 @@ glabel func_80240120_CAEE60
 /* CAEE7C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
 /* CAEE80 80240140 0200A82D */  daddu     $s5, $s0, $zero
 /* CAEE84 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* CAEE88 80240148 3C118011 */  lui       $s1, 0x8011
-/* CAEE8C 8024014C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* CAEE88 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* CAEE8C 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* CAEE90 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
 /* CAEE94 80240154 AFB20018 */  sw        $s2, 0x18($sp)
 /* CAEE98 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
index 78f957404c..a19c129a53 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240448_CAF188
-/* CAF188 80240448 3C028011 */  lui       $v0, 0x8011
-/* CAF18C 8024044C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* CAF188 80240448 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* CAF18C 8024044C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* CAF190 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* CAF194 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CAF198 80240458 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s
index 316b599ad3..6f5aee6437 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s
@@ -3,8 +3,8 @@
 
 glabel func_802403D4_CCB6E4
 /* CCB6E4 802403D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCB6E8 802403D8 3C028011 */  lui       $v0, 0x8011
-/* CCB6EC 802403DC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* CCB6E8 802403D8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* CCB6EC 802403DC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* CCB6F0 802403E0 0080182D */  daddu     $v1, $a0, $zero
 /* CCB6F4 802403E4 1040000C */  beqz      $v0, .L80240418
 /* CCB6F8 802403E8 AFBF0010 */   sw       $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s
index 49186a69c3..6543d3568a 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s
@@ -12,8 +12,8 @@ glabel func_80240200_CD2030
 /* CD204C 8024021C AFB50024 */  sw        $s5, 0x24($sp)
 /* CD2050 80240220 0200A82D */  daddu     $s5, $s0, $zero
 /* CD2054 80240224 AFB10014 */  sw        $s1, 0x14($sp)
-/* CD2058 80240228 3C118011 */  lui       $s1, 0x8011
-/* CD205C 8024022C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* CD2058 80240228 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* CD205C 8024022C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* CD2060 80240230 AFBF0028 */  sw        $ra, 0x28($sp)
 /* CD2064 80240234 AFB20018 */  sw        $s2, 0x18($sp)
 /* CD2068 80240238 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
index aca75a6bbd..8c9e36a0d3 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240528_CD2358
-/* CD2358 80240528 3C028011 */  lui       $v0, 0x8011
-/* CD235C 8024052C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* CD2358 80240528 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* CD235C 8024052C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* CD2360 80240530 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* CD2364 80240534 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CD2368 80240538 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s
index 8a35eb943d..231a5b2a96 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s
@@ -8,8 +8,8 @@ glabel func_802407C0_A0C4B0
 /* A0C4BC 802407CC 0C0B1EAF */  jal       get_variable
 /* A0C4C0 802407D0 8C450000 */   lw       $a1, ($v0)
 /* A0C4C4 802407D4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A0C4C8 802407D8 3C018011 */  lui       $at, 0x8011
-/* A0C4CC 802407DC A022F2A2 */  sb        $v0, -0xd5e($at)
+/* A0C4C8 802407D8 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* A0C4CC 802407DC A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* A0C4D0 802407E0 24020002 */  addiu     $v0, $zero, 2
 /* A0C4D4 802407E4 03E00008 */  jr        $ra
 /* A0C4D8 802407E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s
index 33ee37042b..a48de861df 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s
@@ -3,7 +3,7 @@
 
 glabel func_80240908_A0C5F8
 /* A0C5F8 80240908 24020001 */  addiu     $v0, $zero, 1
-/* A0C5FC 8024090C 3C018011 */  lui       $at, 0x8011
-/* A0C600 80240910 A022F29A */  sb        $v0, -0xd66($at)
+/* A0C5FC 8024090C 3C018011 */  lui       $at, %hi(gPlayerData+0xA)
+/* A0C600 80240910 A022F29A */  sb        $v0, %lo(gPlayerData+0xA)($at)
 /* A0C604 80240914 03E00008 */  jr        $ra
 /* A0C608 80240918 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s
index 08a17c7972..20cbc0e829 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s
@@ -5,8 +5,8 @@ glabel func_80240A68_A39F48
 /* A39F48 80240A68 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* A39F4C 80240A6C AFBF0010 */  sw        $ra, 0x10($sp)
 /* A39F50 80240A70 8C82000C */  lw        $v0, 0xc($a0)
-/* A39F54 80240A74 3C068011 */  lui       $a2, 0x8011
-/* A39F58 80240A78 90C6F29F */  lbu       $a2, -0xd61($a2)
+/* A39F54 80240A74 3C068011 */  lui       $a2, %hi(gPlayerData+0xF)
+/* A39F58 80240A78 90C6F29F */  lbu       $a2, %lo(gPlayerData+0xF)($a2)
 /* A39F5C 80240A7C 0C0B2026 */  jal       set_variable
 /* A39F60 80240A80 8C450000 */   lw       $a1, ($v0)
 /* A39F64 80240A84 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
index deb496c038..0a3e0f9ec6 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
@@ -11,8 +11,8 @@ glabel func_802417EC_A3ACCC
 /* A3ACE4 80241804 8E050000 */  lw        $a1, ($s0)
 /* A3ACE8 80241808 0C0B1EAF */  jal       get_variable
 /* A3ACEC 8024180C 26100004 */   addiu    $s0, $s0, 4
-/* A3ACF0 80241810 3C038011 */  lui       $v1, 0x8011
-/* A3ACF4 80241814 8463F29C */  lh        $v1, -0xd64($v1)
+/* A3ACF0 80241810 3C038011 */  lui       $v1, %hi(gPlayerData+0xC)
+/* A3ACF4 80241814 8463F29C */  lh        $v1, %lo(gPlayerData+0xC)($v1)
 /* A3ACF8 80241818 3C018024 */  lui       $at, 0x8024
 /* A3ACFC 8024181C 00220821 */  addu      $at, $at, $v0
 /* A3AD00 80241820 902247D0 */  lbu       $v0, 0x47d0($at)
diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s
index 71cf0b78e9..3405093595 100644
--- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s
+++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240BEC_A4032C
-/* A4032C 80240BEC 3C018011 */  lui       $at, 0x8011
-/* A40330 80240BF0 A020F2A2 */  sb        $zero, -0xd5e($at)
+/* A4032C 80240BEC 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* A40330 80240BF0 A020F2A2 */  sb        $zero, %lo(gPlayerData+0x12)($at)
 /* A40334 80240BF4 03E00008 */  jr        $ra
 /* A40338 80240BF8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s
index 0918131edf..d25a33d76e 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s
@@ -12,8 +12,8 @@ glabel func_80240120_988C80
 /* 988C9C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
 /* 988CA0 80240140 0200A82D */  daddu     $s5, $s0, $zero
 /* 988CA4 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* 988CA8 80240148 3C118011 */  lui       $s1, 0x8011
-/* 988CAC 8024014C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 988CA8 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 988CAC 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 988CB0 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 988CB4 80240154 AFB20018 */  sw        $s2, 0x18($sp)
 /* 988CB8 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
index 62065d9373..09a3bfe846 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240448_988FA8
-/* 988FA8 80240448 3C028011 */  lui       $v0, 0x8011
-/* 988FAC 8024044C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 988FA8 80240448 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 988FAC 8024044C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 988FB0 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 988FB4 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 988FB8 80240458 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s
index 8bd8afd955..f2b96dfb38 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s
@@ -12,8 +12,8 @@ glabel func_80240410_91E980
 /* 91E99C 8024042C AFB50024 */  sw        $s5, 0x24($sp)
 /* 91E9A0 80240430 0200A82D */  daddu     $s5, $s0, $zero
 /* 91E9A4 80240434 AFB10014 */  sw        $s1, 0x14($sp)
-/* 91E9A8 80240438 3C118011 */  lui       $s1, 0x8011
-/* 91E9AC 8024043C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 91E9A8 80240438 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 91E9AC 8024043C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 91E9B0 80240440 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 91E9B4 80240444 AFB20018 */  sw        $s2, 0x18($sp)
 /* 91E9B8 80240448 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
index 4077c47e03..51476c406b 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240738_91ECA8
-/* 91ECA8 80240738 3C028011 */  lui       $v0, 0x8011
-/* 91ECAC 8024073C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 91ECA8 80240738 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 91ECAC 8024073C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 91ECB0 80240740 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 91ECB4 80240744 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 91ECB8 80240748 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s
index d1c7f51216..e4c639c610 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s
@@ -12,8 +12,8 @@ glabel func_80240780_B5EA30
 /* B5EA4C 8024079C AFB50024 */  sw        $s5, 0x24($sp)
 /* B5EA50 802407A0 0200A82D */  daddu     $s5, $s0, $zero
 /* B5EA54 802407A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* B5EA58 802407A8 3C118011 */  lui       $s1, 0x8011
-/* B5EA5C 802407AC 2631F298 */  addiu     $s1, $s1, -0xd68
+/* B5EA58 802407A8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* B5EA5C 802407AC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* B5EA60 802407B0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* B5EA64 802407B4 AFB20018 */  sw        $s2, 0x18($sp)
 /* B5EA68 802407B8 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
index 5ad0aa5525..a92c7dc2dd 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240AA8_B5ED58
-/* B5ED58 80240AA8 3C028011 */  lui       $v0, 0x8011
-/* B5ED5C 80240AAC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* B5ED58 80240AA8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* B5ED5C 80240AAC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* B5ED60 80240AB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B5ED64 80240AB4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B5ED68 80240AB8 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s
index bb07a690db..92d6421284 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s
@@ -8,7 +8,7 @@ glabel func_8024035C_ADB1FC
 /* ADB208 80240368 306300FE */  andi      $v1, $v1, 0xfe
 /* ADB20C 8024036C A043007E */  sb        $v1, 0x7e($v0)
 /* ADB210 80240370 90820087 */  lbu       $v0, 0x87($a0)
-/* ADB214 80240374 3C018011 */  lui       $at, 0x8011
-/* ADB218 80240378 A022F2A2 */  sb        $v0, -0xd5e($at)
+/* ADB214 80240374 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* ADB218 80240378 A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* ADB21C 8024037C 03E00008 */  jr        $ra
 /* ADB220 80240380 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s
index 83eeebf918..a10ef85d26 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s
@@ -8,8 +8,8 @@ glabel func_8024030C_AE589C
 /* AE58A8 80240318 306300FE */  andi      $v1, $v1, 0xfe
 /* AE58AC 8024031C A043007E */  sb        $v1, 0x7e($v0)
 /* AE58B0 80240320 90820087 */  lbu       $v0, 0x87($a0)
-/* AE58B4 80240324 3C018011 */  lui       $at, 0x8011
-/* AE58B8 80240328 A022F2A2 */  sb        $v0, -0xd5e($at)
+/* AE58B4 80240324 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* AE58B8 80240328 A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* AE58BC 8024032C 03E00008 */  jr        $ra
 /* AE58C0 80240330 24020002 */   addiu    $v0, $zero, 2
 /* AE58C4 80240334 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s
index 026a624c18..820eae1f4a 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s
@@ -8,7 +8,7 @@ glabel func_80240000_AED410
 /* AED41C 8024000C 306300FE */  andi      $v1, $v1, 0xfe
 /* AED420 80240010 A043007E */  sb        $v1, 0x7e($v0)
 /* AED424 80240014 90820087 */  lbu       $v0, 0x87($a0)
-/* AED428 80240018 3C018011 */  lui       $at, 0x8011
-/* AED42C 8024001C A022F2A2 */  sb        $v0, -0xd5e($at)
+/* AED428 80240018 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* AED42C 8024001C A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* AED430 80240020 03E00008 */  jr        $ra
 /* AED434 80240024 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s
index a5f8b01d5f..440e2f628a 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s
@@ -8,8 +8,8 @@ glabel func_8024030C_AF2FAC
 /* AF2FB8 80240318 306300FE */  andi      $v1, $v1, 0xfe
 /* AF2FBC 8024031C A043007E */  sb        $v1, 0x7e($v0)
 /* AF2FC0 80240320 90820087 */  lbu       $v0, 0x87($a0)
-/* AF2FC4 80240324 3C018011 */  lui       $at, 0x8011
-/* AF2FC8 80240328 A022F2A2 */  sb        $v0, -0xd5e($at)
+/* AF2FC4 80240324 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* AF2FC8 80240328 A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* AF2FCC 8024032C 03E00008 */  jr        $ra
 /* AF2FD0 80240330 24020002 */   addiu    $v0, $zero, 2
 /* AF2FD4 80240334 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s
index 37e564b43e..556262f71c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s
@@ -8,7 +8,7 @@ glabel func_80240020_B028A0
 /* B028AC 8024002C 306300FE */  andi      $v1, $v1, 0xfe
 /* B028B0 80240030 A043007E */  sb        $v1, 0x7e($v0)
 /* B028B4 80240034 90820087 */  lbu       $v0, 0x87($a0)
-/* B028B8 80240038 3C018011 */  lui       $at, 0x8011
-/* B028BC 8024003C A022F2A2 */  sb        $v0, -0xd5e($at)
+/* B028B8 80240038 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* B028BC 8024003C A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* B028C0 80240040 03E00008 */  jr        $ra
 /* B028C4 80240044 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s
index 8245428187..76b334fb4d 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s
@@ -8,8 +8,8 @@ glabel func_80240000_B13120
 /* B1312C 8024000C 306300FE */  andi      $v1, $v1, 0xfe
 /* B13130 80240010 A043007E */  sb        $v1, 0x7e($v0)
 /* B13134 80240014 90820087 */  lbu       $v0, 0x87($a0)
-/* B13138 80240018 3C018011 */  lui       $at, 0x8011
-/* B1313C 8024001C A022F2A2 */  sb        $v0, -0xd5e($at)
+/* B13138 80240018 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* B1313C 8024001C A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* B13140 80240020 03E00008 */  jr        $ra
 /* B13144 80240024 24020002 */   addiu    $v0, $zero, 2
 /* B13148 80240028 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s
index eb90b313f0..a398faff3c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s
@@ -8,8 +8,8 @@ glabel func_80240000_B150B0
 /* B150BC 8024000C 306300FE */  andi      $v1, $v1, 0xfe
 /* B150C0 80240010 A043007E */  sb        $v1, 0x7e($v0)
 /* B150C4 80240014 90820087 */  lbu       $v0, 0x87($a0)
-/* B150C8 80240018 3C018011 */  lui       $at, 0x8011
-/* B150CC 8024001C A022F2A2 */  sb        $v0, -0xd5e($at)
+/* B150C8 80240018 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
+/* B150CC 8024001C A022F2A2 */  sb        $v0, %lo(gPlayerData+0x12)($at)
 /* B150D0 80240020 03E00008 */  jr        $ra
 /* B150D4 80240024 24020002 */   addiu    $v0, $zero, 2
 /* B150D8 80240028 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s
index 28e2cc6a96..421fff4889 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s
@@ -4,8 +4,8 @@
 glabel func_80242788_8B27F8
 /* 8B27F8 80242788 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 8B27FC 8024278C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2800 80242790 3C018011 */  lui       $at, 0x8011
-/* 8B2804 80242794 A020F2CC */  sb        $zero, -0xd34($at)
+/* 8B2800 80242790 3C018011 */  lui       $at, %hi(gPlayerData+0x3C)
+/* 8B2804 80242794 A020F2CC */  sb        $zero, %lo(gPlayerData+0x3C)($at)
 /* 8B2808 80242798 0C03ACA9 */  jal       func_800EB2A4
 /* 8B280C 8024279C 0000202D */   daddu    $a0, $zero, $zero
 /* 8B2810 802427A0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
index 8096c27b8f..03e5caf0ac 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240434_8CAD34
-/* 8CAD34 80240434 3C018011 */  lui       $at, 0x8011
-/* 8CAD38 80240438 A020F291 */  sb        $zero, -0xd6f($at)
+/* 8CAD34 80240434 3C018011 */  lui       $at, %hi(gPlayerData+0x1)
+/* 8CAD38 80240438 A020F291 */  sb        $zero, %lo(gPlayerData+0x1)($at)
 /* 8CAD3C 8024043C 03E00008 */  jr        $ra
 /* 8CAD40 80240440 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
index 49b7180b4b..c3b167fe1c 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
@@ -51,8 +51,8 @@ glabel func_802406C8_8EC4E8
 /* 8EC590 80240770 2402FFFF */  addiu     $v0, $zero, -1
 /* 8EC594 80240774 1602001F */  bne       $s0, $v0, .L802407F4
 /* 8EC598 80240778 0000202D */   daddu    $a0, $zero, $zero
-/* 8EC59C 8024077C 3C028011 */  lui       $v0, 0x8011
-/* 8EC5A0 80240780 9442F552 */  lhu       $v0, -0xaae($v0)
+/* 8EC59C 8024077C 3C028011 */  lui       $v0, %hi(gPlayerData+0x2C2)
+/* 8EC5A0 80240780 9442F552 */  lhu       $v0, %lo(gPlayerData+0x2C2)($v0)
 /* 8EC5A4 80240784 10400021 */  beqz      $v0, .L8024080C
 /* 8EC5A8 80240788 00000000 */   nop      
 /* 8EC5AC 8024078C 08090203 */  j         .L8024080C
diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s
index e3900f6019..6a65e7a67c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s
@@ -32,8 +32,8 @@ glabel func_8024037C_A54CCC
 /* A54D34 802403E4 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* A54D38 802403E8 E440001C */  swc1      $f0, 0x1c($v0)
 .L802403EC:
-/* A54D3C 802403EC 3C028011 */  lui       $v0, 0x8011
-/* A54D40 802403F0 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* A54D3C 802403EC 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* A54D40 802403F0 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* A54D44 802403F4 1040000D */  beqz      $v0, .L8024042C
 /* A54D48 802403F8 00000000 */   nop      
 /* A54D4C 802403FC 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s
index 986383060d..286ddccde5 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s
@@ -32,8 +32,8 @@ glabel func_8024037C_A5629C
 /* A56304 802403E4 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* A56308 802403E8 E440001C */  swc1      $f0, 0x1c($v0)
 .L802403EC:
-/* A5630C 802403EC 3C028011 */  lui       $v0, 0x8011
-/* A56310 802403F0 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* A5630C 802403EC 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* A56310 802403F0 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* A56314 802403F4 1040000D */  beqz      $v0, .L8024042C
 /* A56318 802403F8 00000000 */   nop      
 /* A5631C 802403FC 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s
index 58774ad020..4060728c1e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s
@@ -46,8 +46,8 @@ glabel func_8024073C_A57BEC
 /* A57C8C 802407DC 46800020 */  cvt.s.w   $f0, $f0
 /* A57C90 802407E0 E4A0001C */  swc1      $f0, 0x1c($a1)
 .L802407E4:
-/* A57C94 802407E4 3C028011 */  lui       $v0, 0x8011
-/* A57C98 802407E8 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* A57C94 802407E4 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* A57C98 802407E8 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* A57C9C 802407EC 1040000D */  beqz      $v0, .L80240824
 /* A57CA0 802407F0 00000000 */   nop      
 /* A57CA4 802407F4 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s
index fe9c426885..5648433c0f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240000_A927C0
-/* A927C0 80240000 3C028011 */  lui       $v0, 0x8011
-/* A927C4 80240004 8442F29C */  lh        $v0, -0xd64($v0)
+/* A927C0 80240000 3C028011 */  lui       $v0, %hi(gPlayerData+0xC)
+/* A927C4 80240004 8442F29C */  lh        $v0, %lo(gPlayerData+0xC)($v0)
 /* A927C8 80240008 18400003 */  blez      $v0, .L80240018
 /* A927CC 8024000C 24020001 */   addiu    $v0, $zero, 1
 /* A927D0 80240010 08090007 */  j         .L8024001C
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s
index 80c68ebcfc..22b6850ea0 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s
@@ -42,8 +42,8 @@ glabel func_802403DC_C5AB1C
 /* C5ABAC 8024046C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* C5ABB0 80240470 E440001C */  swc1      $f0, 0x1c($v0)
 .L80240474:
-/* C5ABB4 80240474 3C028011 */  lui       $v0, 0x8011
-/* C5ABB8 80240478 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* C5ABB4 80240474 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* C5ABB8 80240478 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* C5ABBC 8024047C 1040000E */  beqz      $v0, .L802404B8
 /* C5ABC0 80240480 00000000 */   nop      
 /* C5ABC4 80240484 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s
index ae3cc022c2..91f5ce6c99 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s
@@ -12,8 +12,8 @@ glabel func_80240430_C68560
 /* C6857C 8024044C AFB50024 */  sw        $s5, 0x24($sp)
 /* C68580 80240450 0200A82D */  daddu     $s5, $s0, $zero
 /* C68584 80240454 AFB10014 */  sw        $s1, 0x14($sp)
-/* C68588 80240458 3C118011 */  lui       $s1, 0x8011
-/* C6858C 8024045C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* C68588 80240458 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* C6858C 8024045C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* C68590 80240460 AFBF0028 */  sw        $ra, 0x28($sp)
 /* C68594 80240464 AFB20018 */  sw        $s2, 0x18($sp)
 /* C68598 80240468 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
index 72cceee892..bfe0eaa7e8 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240758_C68888
-/* C68888 80240758 3C028011 */  lui       $v0, 0x8011
-/* C6888C 8024075C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* C68888 80240758 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* C6888C 8024075C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* C68890 80240760 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C68894 80240764 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C68898 80240768 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s
index 4dc454419d..595e9bc7eb 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s
@@ -12,8 +12,8 @@ glabel func_80240120_C76E00
 /* C76E1C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
 /* C76E20 80240140 0200A82D */  daddu     $s5, $s0, $zero
 /* C76E24 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* C76E28 80240148 3C118011 */  lui       $s1, 0x8011
-/* C76E2C 8024014C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* C76E28 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* C76E2C 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* C76E30 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
 /* C76E34 80240154 AFB20018 */  sw        $s2, 0x18($sp)
 /* C76E38 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
index 0508dc7eed..82da4bb2f8 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240448_C77128
-/* C77128 80240448 3C028011 */  lui       $v0, 0x8011
-/* C7712C 8024044C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* C77128 80240448 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* C7712C 8024044C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* C77130 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C77134 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C77138 80240458 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s
index 5fc4cae48e..83315e428b 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s
@@ -42,8 +42,8 @@ glabel func_80240310_C804B0
 /* C80540 802403A0 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* C80544 802403A4 E440001C */  swc1      $f0, 0x1c($v0)
 .L802403A8:
-/* C80548 802403A8 3C028011 */  lui       $v0, 0x8011
-/* C8054C 802403AC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* C80548 802403A8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* C8054C 802403AC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* C80550 802403B0 1040000E */  beqz      $v0, .L802403EC
 /* C80554 802403B4 00000000 */   nop      
 /* C80558 802403B8 0C00EABB */  jal       get_npc_unsafe
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s
index 34b66ddccc..f5db5f7529 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s
@@ -5,8 +5,8 @@ glabel func_80242224_7ECF34
 /* 7ECF34 80242224 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 7ECF38 80242228 24020001 */  addiu     $v0, $zero, 1
 /* 7ECF3C 8024222C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7ECF40 80242230 3C018011 */  lui       $at, 0x8011
-/* 7ECF44 80242234 A022F292 */  sb        $v0, -0xd6e($at)
+/* 7ECF40 80242230 3C018011 */  lui       $at, %hi(gPlayerData+0x2)
+/* 7ECF44 80242234 A022F292 */  sb        $v0, %lo(gPlayerData+0x2)($at)
 /* 7ECF48 80242238 0C03A6DB */  jal       sync_status_menu
 /* 7ECF4C 8024223C 00000000 */   nop      
 /* 7ECF50 80242240 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s
index 9fe30cc31d..9ab507f9fd 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s
@@ -4,8 +4,8 @@
 glabel func_802416CC_E13E2C
 /* E13E2C 802416CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E13E30 802416D0 3C05FE36 */  lui       $a1, 0xfe36
-/* E13E34 802416D4 3C068011 */  lui       $a2, 0x8011
-/* E13E38 802416D8 84C6F29C */  lh        $a2, -0xd64($a2)
+/* E13E34 802416D4 3C068011 */  lui       $a2, %hi(gPlayerData+0xC)
+/* E13E38 802416D8 84C6F29C */  lh        $a2, %lo(gPlayerData+0xC)($a2)
 /* E13E3C 802416DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* E13E40 802416E0 0C0B2026 */  jal       set_variable
 /* E13E44 802416E4 34A53C8A */   ori      $a1, $a1, 0x3c8a
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s
index 11f9e63790..9ec8c4b87f 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s
@@ -4,8 +4,8 @@
 glabel func_80242314_E18094
 /* E18094 80242314 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E18098 80242318 3C05FE36 */  lui       $a1, 0xfe36
-/* E1809C 8024231C 3C068011 */  lui       $a2, 0x8011
-/* E180A0 80242320 84C6F29C */  lh        $a2, -0xd64($a2)
+/* E1809C 8024231C 3C068011 */  lui       $a2, %hi(gPlayerData+0xC)
+/* E180A0 80242320 84C6F29C */  lh        $a2, %lo(gPlayerData+0xC)($a2)
 /* E180A4 80242324 AFBF0010 */  sw        $ra, 0x10($sp)
 /* E180A8 80242328 0C0B2026 */  jal       set_variable
 /* E180AC 8024232C 34A53C8A */   ori      $a1, $a1, 0x3c8a
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s
index f53c31221c..edc2d8a84b 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241F08_9F6948
-/* 9F6948 80241F08 3C028011 */  lui       $v0, 0x8011
-/* 9F694C 80241F0C 8442F29C */  lh        $v0, -0xd64($v0)
+/* 9F6948 80241F08 3C028011 */  lui       $v0, %hi(gPlayerData+0xC)
+/* 9F694C 80241F0C 8442F29C */  lh        $v0, %lo(gPlayerData+0xC)($v0)
 /* 9F6950 80241F10 28420064 */  slti      $v0, $v0, 0x64
 /* 9F6954 80241F14 14400003 */  bnez      $v0, .L80241F24
 /* 9F6958 80241F18 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s
index bdd6db4f0b..8395e83a4f 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s
@@ -12,8 +12,8 @@ glabel func_802408B0_DDD0E0
 /* DDD0FC 802408CC AFB50024 */  sw        $s5, 0x24($sp)
 /* DDD100 802408D0 0200A82D */  daddu     $s5, $s0, $zero
 /* DDD104 802408D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* DDD108 802408D8 3C118011 */  lui       $s1, 0x8011
-/* DDD10C 802408DC 2631F298 */  addiu     $s1, $s1, -0xd68
+/* DDD108 802408D8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* DDD10C 802408DC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* DDD110 802408E0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* DDD114 802408E4 AFB20018 */  sw        $s2, 0x18($sp)
 /* DDD118 802408E8 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
index 9f71ad3c2a..fcf58055c1 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240BD8_DDD408
-/* DDD408 80240BD8 3C028011 */  lui       $v0, 0x8011
-/* DDD40C 80240BDC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* DDD408 80240BD8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* DDD40C 80240BDC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* DDD410 80240BE0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* DDD414 80240BE4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DDD418 80240BE8 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s
index 992bb5f768..1ca8e08a15 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s
@@ -12,8 +12,8 @@ glabel func_80240120_D2FDA0
 /* D2FDBC 8024013C AFB50024 */  sw        $s5, 0x24($sp)
 /* D2FDC0 80240140 0200A82D */  daddu     $s5, $s0, $zero
 /* D2FDC4 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* D2FDC8 80240148 3C118011 */  lui       $s1, 0x8011
-/* D2FDCC 8024014C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* D2FDC8 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* D2FDCC 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* D2FDD0 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
 /* D2FDD4 80240154 AFB20018 */  sw        $s2, 0x18($sp)
 /* D2FDD8 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
index 0847937065..4b92b691f8 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240448_D300C8
-/* D300C8 80240448 3C028011 */  lui       $v0, 0x8011
-/* D300CC 8024044C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* D300C8 80240448 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* D300CC 8024044C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* D300D0 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D300D4 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D300D8 80240458 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s
index dfcc790296..f8c1b51d98 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s
@@ -12,8 +12,8 @@ glabel func_802401A0_954160
 /* 95417C 802401BC AFB50024 */  sw        $s5, 0x24($sp)
 /* 954180 802401C0 0200A82D */  daddu     $s5, $s0, $zero
 /* 954184 802401C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 954188 802401C8 3C118011 */  lui       $s1, 0x8011
-/* 95418C 802401CC 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 954188 802401C8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 95418C 802401CC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 954190 802401D0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 954194 802401D4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 954198 802401D8 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
index 8bf79961fa..44ffb326cc 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802404C8_954488
-/* 954488 802404C8 3C028011 */  lui       $v0, 0x8011
-/* 95448C 802404CC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 954488 802404C8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 95448C 802404CC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 954490 802404D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 954494 802404D4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 954498 802404D8 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s
index f012d08dc5..0456b51d0e 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s
@@ -12,8 +12,8 @@ glabel func_80240400_879FE0
 /* 879FFC 8024041C AFB50024 */  sw        $s5, 0x24($sp)
 /* 87A000 80240420 0200A82D */  daddu     $s5, $s0, $zero
 /* 87A004 80240424 AFB10014 */  sw        $s1, 0x14($sp)
-/* 87A008 80240428 3C118011 */  lui       $s1, 0x8011
-/* 87A00C 8024042C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 87A008 80240428 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 87A00C 8024042C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 87A010 80240430 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 87A014 80240434 AFB20018 */  sw        $s2, 0x18($sp)
 /* 87A018 80240438 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
index 882caca4b4..31dd9f6013 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240728_87A308
-/* 87A308 80240728 3C028011 */  lui       $v0, 0x8011
-/* 87A30C 8024072C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 87A308 80240728 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 87A30C 8024072C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 87A310 80240730 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 87A314 80240734 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 87A318 80240738 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s
index baf65714b0..4316a071b1 100644
--- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s
+++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s
@@ -12,8 +12,8 @@ glabel func_802407A0_886B60
 /* 886B7C 802407BC AFB50024 */  sw        $s5, 0x24($sp)
 /* 886B80 802407C0 0200A82D */  daddu     $s5, $s0, $zero
 /* 886B84 802407C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 886B88 802407C8 3C118011 */  lui       $s1, 0x8011
-/* 886B8C 802407CC 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 886B88 802407C8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 886B8C 802407CC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 886B90 802407D0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 886B94 802407D4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 886B98 802407D8 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
index ccdcc41a3c..848ec6f9a2 100644
--- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
+++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240AC8_886E88
-/* 886E88 80240AC8 3C028011 */  lui       $v0, 0x8011
-/* 886E8C 80240ACC 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 886E88 80240AC8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 886E8C 80240ACC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 886E90 80240AD0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 886E94 80240AD4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 886E98 80240AD8 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s
index f175cb7772..3b5c3812b5 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s
@@ -12,8 +12,8 @@ glabel func_80240D3C_88990C
 /* 889928 80240D58 AFB50024 */  sw        $s5, 0x24($sp)
 /* 88992C 80240D5C 0200A82D */  daddu     $s5, $s0, $zero
 /* 889930 80240D60 AFB10014 */  sw        $s1, 0x14($sp)
-/* 889934 80240D64 3C118011 */  lui       $s1, 0x8011
-/* 889938 80240D68 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 889934 80240D64 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 889938 80240D68 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 88993C 80240D6C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 889940 80240D70 AFB20018 */  sw        $s2, 0x18($sp)
 /* 889944 80240D74 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
index 0a9d47f416..1d3b0c3706 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241064_889C34
-/* 889C34 80241064 3C028011 */  lui       $v0, 0x8011
-/* 889C38 80241068 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 889C34 80241064 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 889C38 80241068 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 889C3C 8024106C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 889C40 80241070 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 889C44 80241074 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s
index 6af3cd00aa..71b84ffbed 100644
--- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s
+++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240AD0_890670
-/* 890670 80240AD0 3C068011 */  lui       $a2, 0x8011
-/* 890674 80240AD4 84C6F29C */  lh        $a2, -0xd64($a2)
+/* 890670 80240AD0 3C068011 */  lui       $a2, %hi(gPlayerData+0xC)
+/* 890674 80240AD4 84C6F29C */  lh        $a2, %lo(gPlayerData+0xC)($a2)
 /* 890678 80240AD8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 89067C 80240ADC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 890680 80240AE0 8C82000C */  lw        $v0, 0xc($a0)
diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s
index 809235df88..c35cdb854f 100644
--- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s
+++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s
@@ -12,8 +12,8 @@ glabel func_80240150_892B70
 /* 892B8C 8024016C AFB50024 */  sw        $s5, 0x24($sp)
 /* 892B90 80240170 0200A82D */  daddu     $s5, $s0, $zero
 /* 892B94 80240174 AFB10014 */  sw        $s1, 0x14($sp)
-/* 892B98 80240178 3C118011 */  lui       $s1, 0x8011
-/* 892B9C 8024017C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 892B98 80240178 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 892B9C 8024017C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 892BA0 80240180 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 892BA4 80240184 AFB20018 */  sw        $s2, 0x18($sp)
 /* 892BA8 80240188 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
index fc1c5daadf..fa7adf807c 100644
--- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
+++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240478_892E98
-/* 892E98 80240478 3C028011 */  lui       $v0, 0x8011
-/* 892E9C 8024047C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 892E98 80240478 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 892E9C 8024047C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 892EA0 80240480 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 892EA4 80240484 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 892EA8 80240488 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s
index b4830cf40d..9d6fab67d9 100644
--- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s
+++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s
@@ -12,8 +12,8 @@ glabel func_80240710_897CF0
 /* 897D0C 8024072C AFB50024 */  sw        $s5, 0x24($sp)
 /* 897D10 80240730 0200A82D */  daddu     $s5, $s0, $zero
 /* 897D14 80240734 AFB10014 */  sw        $s1, 0x14($sp)
-/* 897D18 80240738 3C118011 */  lui       $s1, 0x8011
-/* 897D1C 8024073C 2631F298 */  addiu     $s1, $s1, -0xd68
+/* 897D18 80240738 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
+/* 897D1C 8024073C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
 /* 897D20 80240740 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 897D24 80240744 AFB20018 */  sw        $s2, 0x18($sp)
 /* 897D28 80240748 8E6200B4 */  lw        $v0, 0xb4($s3)
diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
index b70f6286fe..5e8d297207 100644
--- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
+++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240A38_898018
-/* 898018 80240A38 3C028011 */  lui       $v0, 0x8011
-/* 89801C 80240A3C 8042F2A2 */  lb        $v0, -0xd5e($v0)
+/* 898018 80240A38 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 89801C 80240A3C 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
 /* 898020 80240A40 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 898024 80240A44 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 898028 80240A48 00021100 */  sll       $v0, $v0, 4
diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s
index 2ec406ce53..b9206ebf5f 100644
--- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s
+++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240820_9C3130
-/* 9C3130 80240820 3C038011 */  lui       $v1, 0x8011
-/* 9C3134 80240824 8063F2A2 */  lb        $v1, -0xd5e($v1)
+/* 9C3130 80240820 3C038011 */  lui       $v1, %hi(gPlayerData+0x12)
+/* 9C3134 80240824 8063F2A2 */  lb        $v1, %lo(gPlayerData+0x12)($v1)
 /* 9C3138 80240828 24020003 */  addiu     $v0, $zero, 3
 /* 9C313C 8024082C 54620003 */  bnel      $v1, $v0, .L8024083C
 /* 9C3140 80240830 AC800084 */   sw       $zero, 0x84($a0)
diff --git a/requirements.txt b/requirements.txt
index 361a2122c4..679782c268 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 capstone
 PyYAML
 lark-parser
+python-ranges
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index dddb3344c8..7026becfac 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -692,6 +692,7 @@ enable_partner_ai = 0x800EF328;
 clear_partner_move_history = 0x800EF45C;
 draw_submenu_title = 0x800F4648;
 draw_box = 0x800F52E0;
+gPlayerData = 0x8010F290; // size:0x340
 update_entities = 0x8010F6D0;
 update_shadows = 0x8010FA98;
 render_entities = 0x8010FEB4;

From 3a134d6a7d5f5fb2166708e365e528ba4f3579f7 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 18:37:28 -0500
Subject: [PATCH 075/101] gPlayerStatus offsets

---
 asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s         | 4 ++--
 asm/nonmatchings/code_FBE10/ShowEmote.s                       | 4 ++--
 .../world/area_isk/isk_10/988B60/func_80240D38_989898.s       | 4 ++--
 .../world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s       | 4 ++--
 .../world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s       | 4 ++--
 .../world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s       | 4 ++--
 .../world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s       | 4 ++--
 .../world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s       | 4 ++--
 .../world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s       | 4 ++--
 .../world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s       | 4 ++--
 .../world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s       | 4 ++--
 .../world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s       | 4 ++--
 .../world/area_kkj/kkj_16/AED410/func_80240028_AED438.s       | 4 ++--
 .../world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s       | 4 ++--
 .../world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s       | 4 ++--
 .../world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s       | 4 ++--
 .../world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s       | 4 ++--
 .../world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s       | 4 ++--
 .../world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s       | 4 ++--
 .../world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s       | 4 ++--
 .../world/area_osr/osr_02/AB2190/func_80240020_AB2190.s       | 4 ++--
 .../world/area_osr/osr_02/AB2290/func_80240120_AB2290.s       | 4 ++--
 .../world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s       | 4 ++--
 tools/symbol_addrs.txt                                        | 1 +
 24 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s
index e87865cbe0..ba61951dcc 100644
--- a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802E3E9C
-/* 10571C 802E3E9C 3C028011 */  lui       $v0, 0x8011
-/* 105720 802E3EA0 8C42EFCC */  lw        $v0, -0x1034($v0)
+/* 10571C 802E3E9C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x4)
+/* 105720 802E3EA0 8C42EFCC */  lw        $v0, %lo(gPlayerStatus+0x4)($v0)
 /* 105724 802E3EA4 9083000B */  lbu       $v1, 0xb($a0)
 /* 105728 802E3EA8 30420001 */  andi      $v0, $v0, 1
 /* 10572C 802E3EAC 50400007 */  beql      $v0, $zero, .L802E3ECC
diff --git a/asm/nonmatchings/code_FBE10/ShowEmote.s b/asm/nonmatchings/code_FBE10/ShowEmote.s
index 1d1d874dae..d78e090254 100644
--- a/asm/nonmatchings/code_FBE10/ShowEmote.s
+++ b/asm/nonmatchings/code_FBE10/ShowEmote.s
@@ -66,8 +66,8 @@ glabel ShowEmote
 /* FC344 802D7994 080B5E9E */  j         .L802D7A78
 /* FC348 802D7998 4600B106 */   mov.s    $f4, $f22
 .L802D799C:
-/* FC34C 802D799C 3C028011 */  lui       $v0, 0x8011
-/* FC350 802D79A0 9442F078 */  lhu       $v0, -0xf88($v0)
+/* FC34C 802D799C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0xB0)
+/* FC350 802D79A0 9442F078 */  lhu       $v0, %lo(gPlayerStatus+0xB0)($v0)
 /* FC354 802D79A4 34A55556 */  ori       $a1, $a1, 0x5556
 /* FC358 802D79A8 00021400 */  sll       $v0, $v0, 0x10
 /* FC35C 802D79AC 00022403 */  sra       $a0, $v0, 0x10
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
index 8021cc8534..02b81e54e7 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
@@ -3,8 +3,8 @@
 
 glabel func_80240D38_989898
 /* 989898 80240D38 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 98989C 80240D3C 3C028011 */  lui       $v0, 0x8011
-/* 9898A0 80240D40 8442EFE0 */  lh        $v0, -0x1020($v0)
+/* 98989C 80240D3C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x18)
+/* 9898A0 80240D40 8442EFE0 */  lh        $v0, %lo(gPlayerStatus+0x18)($v0)
 /* 9898A4 80240D44 3C018024 */  lui       $at, 0x8024
 /* 9898A8 80240D48 D4201EA0 */  ldc1      $f0, 0x1ea0($at)
 /* 9898AC 80240D4C 2406FFFF */  addiu     $a2, $zero, -1
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s
index 0cc6c4b83c..3e46faef59 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s
@@ -3,8 +3,8 @@
 
 glabel func_802402BC_918E6C
 /* 918E6C 802402BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 918E70 802402C0 3C028011 */  lui       $v0, 0x8011
-/* 918E74 802402C4 8442EFE0 */  lh        $v0, -0x1020($v0)
+/* 918E70 802402C0 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x18)
+/* 918E74 802402C4 8442EFE0 */  lh        $v0, %lo(gPlayerStatus+0x18)($v0)
 /* 918E78 802402C8 3C014069 */  lui       $at, 0x4069
 /* 918E7C 802402CC 44810800 */  mtc1      $at, $f1
 /* 918E80 802402D0 44800000 */  mtc1      $zero, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s
index 330f487e77..81b2d5b654 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s
@@ -3,8 +3,8 @@
 
 glabel func_80240000_91B8E0
 /* 91B8E0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 91B8E4 80240004 3C028011 */  lui       $v0, 0x8011
-/* 91B8E8 80240008 8442EFE0 */  lh        $v0, -0x1020($v0)
+/* 91B8E4 80240004 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x18)
+/* 91B8E8 80240008 8442EFE0 */  lh        $v0, %lo(gPlayerStatus+0x18)($v0)
 /* 91B8EC 8024000C 3C01C059 */  lui       $at, 0xc059
 /* 91B8F0 80240010 44810800 */  mtc1      $at, $f1
 /* 91B8F4 80240014 44800000 */  mtc1      $zero, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s
index 3a055bd399..a3d711160f 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s
@@ -11,8 +11,8 @@ glabel func_80240034_ACAB54
 /* ACAB6C 8024004C 4600008D */  trunc.w.s $f2, $f0
 /* ACAB70 80240050 44021000 */  mfc1      $v0, $f2
 /* ACAB74 80240054 00000000 */  nop       
-/* ACAB78 80240058 3C018011 */  lui       $at, 0x8011
-/* ACAB7C 8024005C A022EFD5 */  sb        $v0, -0x102b($at)
+/* ACAB78 80240058 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* ACAB7C 8024005C A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* ACAB80 80240060 24020002 */  addiu     $v0, $zero, 2
 /* ACAB84 80240064 03E00008 */  jr        $ra
 /* ACAB88 80240068 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s
index 9d39c1729e..a1a360bf0d 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s
@@ -5,8 +5,8 @@ glabel func_80240F18_ACBA38
 /* ACBA38 80240F18 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* ACBA3C 80240F1C AFBF0010 */  sw        $ra, 0x10($sp)
 /* ACBA40 80240F20 8C82000C */  lw        $v0, 0xc($a0)
-/* ACBA44 80240F24 3C068011 */  lui       $a2, 0x8011
-/* ACBA48 80240F28 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* ACBA44 80240F24 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* ACBA48 80240F28 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* ACBA4C 80240F2C 0C0B2026 */  jal       set_variable
 /* ACBA50 80240F30 8C450000 */   lw       $a1, ($v0)
 /* ACBA54 80240F34 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s
index e47bcd0f46..e1c1fc0aec 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s
@@ -11,8 +11,8 @@ glabel func_80240034_ACE174
 /* ACE18C 8024004C 4600008D */  trunc.w.s $f2, $f0
 /* ACE190 80240050 44021000 */  mfc1      $v0, $f2
 /* ACE194 80240054 00000000 */  nop       
-/* ACE198 80240058 3C018011 */  lui       $at, 0x8011
-/* ACE19C 8024005C A022EFD5 */  sb        $v0, -0x102b($at)
+/* ACE198 80240058 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* ACE19C 8024005C A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* ACE1A0 80240060 24020002 */  addiu     $v0, $zero, 2
 /* ACE1A4 80240064 03E00008 */  jr        $ra
 /* ACE1A8 80240068 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s
index 175d6c8e95..2efc6d90e5 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s
@@ -5,8 +5,8 @@ glabel func_80240F18_ACF058
 /* ACF058 80240F18 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* ACF05C 80240F1C AFBF0010 */  sw        $ra, 0x10($sp)
 /* ACF060 80240F20 8C82000C */  lw        $v0, 0xc($a0)
-/* ACF064 80240F24 3C068011 */  lui       $a2, 0x8011
-/* ACF068 80240F28 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* ACF064 80240F24 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* ACF068 80240F28 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* ACF06C 80240F2C 0C0B2026 */  jal       set_variable
 /* ACF070 80240F30 8C450000 */   lw       $a1, ($v0)
 /* ACF074 80240F34 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s
index 11f07f8482..bef78bbf6a 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s
@@ -11,8 +11,8 @@ glabel func_80240034_AD40C4
 /* AD40DC 8024004C 4600008D */  trunc.w.s $f2, $f0
 /* AD40E0 80240050 44021000 */  mfc1      $v0, $f2
 /* AD40E4 80240054 00000000 */  nop       
-/* AD40E8 80240058 3C018011 */  lui       $at, 0x8011
-/* AD40EC 8024005C A022EFD5 */  sb        $v0, -0x102b($at)
+/* AD40E8 80240058 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* AD40EC 8024005C A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* AD40F0 80240060 24020002 */  addiu     $v0, $zero, 2
 /* AD40F4 80240064 03E00008 */  jr        $ra
 /* AD40F8 80240068 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s
index cb509ba3dc..bd512fcc47 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s
@@ -5,8 +5,8 @@ glabel func_802406E8_AD4778
 /* AD4778 802406E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AD477C 802406EC AFBF0010 */  sw        $ra, 0x10($sp)
 /* AD4780 802406F0 8C82000C */  lw        $v0, 0xc($a0)
-/* AD4784 802406F4 3C068011 */  lui       $a2, 0x8011
-/* AD4788 802406F8 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* AD4784 802406F4 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* AD4788 802406F8 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* AD478C 802406FC 0C0B2026 */  jal       set_variable
 /* AD4790 80240700 8C450000 */   lw       $a1, ($v0)
 /* AD4794 80240704 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s
index 864f81aff4..808e385b3b 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s
@@ -5,8 +5,8 @@ glabel func_802403A0_ADB240
 /* ADB240 802403A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* ADB244 802403A4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* ADB248 802403A8 8C82000C */  lw        $v0, 0xc($a0)
-/* ADB24C 802403AC 3C068011 */  lui       $a2, 0x8011
-/* ADB250 802403B0 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* ADB24C 802403AC 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* ADB250 802403B0 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* ADB254 802403B4 0C0B2026 */  jal       set_variable
 /* ADB258 802403B8 8C450000 */   lw       $a1, ($v0)
 /* ADB25C 802403BC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s
index 7b606c7ce4..95c3f3ba12 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s
@@ -11,8 +11,8 @@ glabel func_80240028_AED438
 /* AED450 80240040 4600008D */  trunc.w.s $f2, $f0
 /* AED454 80240044 44021000 */  mfc1      $v0, $f2
 /* AED458 80240048 00000000 */  nop       
-/* AED45C 8024004C 3C018011 */  lui       $at, 0x8011
-/* AED460 80240050 A022EFD5 */  sb        $v0, -0x102b($at)
+/* AED45C 8024004C 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* AED460 80240050 A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* AED464 80240054 24020002 */  addiu     $v0, $zero, 2
 /* AED468 80240058 03E00008 */  jr        $ra
 /* AED46C 8024005C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s
index 2a22d7bf22..dcb61015b5 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s
@@ -5,8 +5,8 @@ glabel func_80240EC8_AEE2D8
 /* AEE2D8 80240EC8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AEE2DC 80240ECC AFBF0010 */  sw        $ra, 0x10($sp)
 /* AEE2E0 80240ED0 8C82000C */  lw        $v0, 0xc($a0)
-/* AEE2E4 80240ED4 3C068011 */  lui       $a2, 0x8011
-/* AEE2E8 80240ED8 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* AEE2E4 80240ED4 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* AEE2E8 80240ED8 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* AEE2EC 80240EDC 0C0B2026 */  jal       set_variable
 /* AEE2F0 80240EE0 8C450000 */   lw       $a1, ($v0)
 /* AEE2F4 80240EE4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s
index 52f74b189e..12097d8f4f 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s
@@ -12,8 +12,8 @@ glabel func_80240730_AF33D0
 /* AF33EC 8024074C 4600008D */  trunc.w.s $f2, $f0
 /* AF33F0 80240750 44021000 */  mfc1      $v0, $f2
 /* AF33F4 80240754 00000000 */  nop       
-/* AF33F8 80240758 3C018011 */  lui       $at, 0x8011
-/* AF33FC 8024075C A022F08C */  sb        $v0, -0xf74($at)
+/* AF33F8 80240758 3C018011 */  lui       $at, %hi(gPlayerStatus+0xC4)
+/* AF33FC 8024075C A022F08C */  sb        $v0, %lo(gPlayerStatus+0xC4)($at)
 /* AF3400 80240760 A0620080 */  sb        $v0, 0x80($v1)
 /* AF3404 80240764 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AF3408 80240768 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s
index 0256e6abbd..43ea5d1890 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s
@@ -10,8 +10,8 @@ glabel func_80240C10_AF8560
 /* AF8574 80240C24 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
 /* AF8578 80240C28 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
 /* AF857C 80240C2C 0040182D */  daddu     $v1, $v0, $zero
-/* AF8580 80240C30 3C018011 */  lui       $at, 0x8011
-/* AF8584 80240C34 A023F08C */  sb        $v1, -0xf74($at)
+/* AF8580 80240C30 3C018011 */  lui       $at, %hi(gPlayerStatus+0xC4)
+/* AF8584 80240C34 A023F08C */  sb        $v1, %lo(gPlayerStatus+0xC4)($at)
 /* AF8588 80240C38 A0830080 */  sb        $v1, 0x80($a0)
 /* AF858C 80240C3C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AF8590 80240C40 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s
index 139246b4ac..e2880bba27 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s
@@ -5,8 +5,8 @@ glabel func_802405BC_AFE0FC
 /* AFE0FC 802405BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AFE100 802405C0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AFE104 802405C4 8C82000C */  lw        $v0, 0xc($a0)
-/* AFE108 802405C8 3C068011 */  lui       $a2, 0x8011
-/* AFE10C 802405CC 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* AFE108 802405C8 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* AFE10C 802405CC 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* AFE110 802405D0 0C0B2026 */  jal       set_variable
 /* AFE114 802405D4 8C450000 */   lw       $a1, ($v0)
 /* AFE118 802405D8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s
index d6223aa13a..888e49bad5 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s
@@ -11,8 +11,8 @@ glabel func_80240048_B028C8
 /* B028E0 80240060 4600008D */  trunc.w.s $f2, $f0
 /* B028E4 80240064 44021000 */  mfc1      $v0, $f2
 /* B028E8 80240068 00000000 */  nop       
-/* B028EC 8024006C 3C018011 */  lui       $at, 0x8011
-/* B028F0 80240070 A022EFD5 */  sb        $v0, -0x102b($at)
+/* B028EC 8024006C 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* B028F0 80240070 A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* B028F4 80240074 24020002 */  addiu     $v0, $zero, 2
 /* B028F8 80240078 03E00008 */  jr        $ra
 /* B028FC 8024007C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s
index 3669829815..d829944e67 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s
@@ -5,8 +5,8 @@ glabel func_80240758_B02FD8
 /* B02FD8 80240758 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B02FDC 8024075C AFBF0010 */  sw        $ra, 0x10($sp)
 /* B02FE0 80240760 8C82000C */  lw        $v0, 0xc($a0)
-/* B02FE4 80240764 3C068011 */  lui       $a2, 0x8011
-/* B02FE8 80240768 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* B02FE4 80240764 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* B02FE8 80240768 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* B02FEC 8024076C 0C0B2026 */  jal       set_variable
 /* B02FF0 80240770 8C450000 */   lw       $a1, ($v0)
 /* B02FF4 80240774 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
index a16bbd1a0c..4107d94080 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
@@ -3,8 +3,8 @@
 
 glabel func_80242D38_C63A48
 /* C63A48 80242D38 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C63A4C 80242D3C 3C028011 */  lui       $v0, 0x8011
-/* C63A50 80242D40 8442EFE0 */  lh        $v0, -0x1020($v0)
+/* C63A4C 80242D3C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x18)
+/* C63A50 80242D40 8442EFE0 */  lh        $v0, %lo(gPlayerStatus+0x18)($v0)
 /* C63A54 80242D44 3C014089 */  lui       $at, 0x4089
 /* C63A58 80242D48 44810800 */  mtc1      $at, $f1
 /* C63A5C 80242D4C 44800000 */  mtc1      $zero, $f0
diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s
index c5260c8342..661b45cb0c 100644
--- a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s
+++ b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s
@@ -11,8 +11,8 @@ glabel func_80240020_AB2190
 /* AB21A8 80240038 4600008D */  trunc.w.s $f2, $f0
 /* AB21AC 8024003C 44021000 */  mfc1      $v0, $f2
 /* AB21B0 80240040 00000000 */  nop       
-/* AB21B4 80240044 3C018011 */  lui       $at, 0x8011
-/* AB21B8 80240048 A022EFD5 */  sb        $v0, -0x102b($at)
+/* AB21B4 80240044 3C018011 */  lui       $at, %hi(gPlayerStatus+0xD)
+/* AB21B8 80240048 A022EFD5 */  sb        $v0, %lo(gPlayerStatus+0xD)($at)
 /* AB21BC 8024004C 24020002 */  addiu     $v0, $zero, 2
 /* AB21C0 80240050 03E00008 */  jr        $ra
 /* AB21C4 80240054 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s
index ffdeabcd3f..e2a05b2af3 100644
--- a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s
+++ b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s
@@ -5,8 +5,8 @@ glabel func_80240120_AB2290
 /* AB2290 80240120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AB2294 80240124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AB2298 80240128 8C82000C */  lw        $v0, 0xc($a0)
-/* AB229C 8024012C 3C068011 */  lui       $a2, 0x8011
-/* AB22A0 80240130 80C6EFD4 */  lb        $a2, -0x102c($a2)
+/* AB229C 8024012C 3C068011 */  lui       $a2, %hi(gPlayerStatus+0xC)
+/* AB22A0 80240130 80C6EFD4 */  lb        $a2, %lo(gPlayerStatus+0xC)($a2)
 /* AB22A4 80240134 0C0B2026 */  jal       set_variable
 /* AB22A8 80240138 8C450000 */   lw       $a1, ($v0)
 /* AB22AC 8024013C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
index fe2a36ff96..9107c8a9ef 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
@@ -23,8 +23,8 @@ glabel func_80240508_9AEC08
 /* 9AEC50 80240550 44103000 */  mfc1      $s0, $f6
 /* 9AEC54 80240554 0C0B210B */  jal       get_float_variable
 /* 9AEC58 80240558 0220202D */   daddu    $a0, $s1, $zero
-/* 9AEC5C 8024055C 3C028011 */  lui       $v0, 0x8011
-/* 9AEC60 80240560 8442F078 */  lh        $v0, -0xf88($v0)
+/* 9AEC5C 8024055C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0xB0)
+/* 9AEC60 80240560 8442F078 */  lh        $v0, %lo(gPlayerStatus+0xB0)($v0)
 /* 9AEC64 80240564 3C018024 */  lui       $at, 0x8024
 /* 9AEC68 80240568 D4223078 */  ldc1      $f2, 0x3078($at)
 /* 9AEC6C 8024056C 44822000 */  mtc1      $v0, $f4
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 7026becfac..30190c2498 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -692,6 +692,7 @@ enable_partner_ai = 0x800EF328;
 clear_partner_move_history = 0x800EF45C;
 draw_submenu_title = 0x800F4648;
 draw_box = 0x800F52E0;
+gPlayerStatus = 0x8010EFC8; // size:0x288
 gPlayerData = 0x8010F290; // size:0x340
 update_entities = 0x8010F6D0;
 update_shadows = 0x8010FA98;

From 43245322cc33ba61d673a02687e20c4a645cdd3b Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 18:43:23 -0500
Subject: [PATCH 076/101] splat update

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 037d80e00c..8430b327b1 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 037d80e00cb3aeae37bdad77bfac871036982456
+Subproject commit 8430b327b1839c3b805c4e70784023175605d26d

From b545f6fc51399af830730580848a71638a35c491 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 19:03:20 -0500
Subject: [PATCH 077/101] splat bump

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 8430b327b1..bf5e3719d1 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 8430b327b1839c3b805c4e70784023175605d26d
+Subproject commit bf5e3719d154d850e92a66029220ae0d6f547b75

From d6fbf1d71ea9665584a707125892e0a745d518da Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Nov 2020 19:10:41 -0500
Subject: [PATCH 078/101] splat bump2

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index bf5e3719d1..3c85092045 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit bf5e3719d154d850e92a66029220ae0d6f547b75
+Subproject commit 3c8509204537026d863002e88af9014b4ed0c5c1

From 81a672b268630876806fb15a47b853b65926714b Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 00:32:18 -0500
Subject: [PATCH 079/101] trying to fix a bug

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 3c85092045..41e1c8c74a 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 3c8509204537026d863002e88af9014b4ed0c5c1
+Subproject commit 41e1c8c74aaf40313a44f2197bd0284543d44109

From 8a614385bfb37082cd0a5dabaa8c1223b486bb22 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 00:37:04 -0500
Subject: [PATCH 080/101] trying to fix bug (2)

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 41e1c8c74a..34487bb623 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 41e1c8c74aaf40313a44f2197bd0284543d44109
+Subproject commit 34487bb6230f2fa6afa4b1c3845da4b479276337

From cee95c6d92b3a7f028c708192b523b4690f68e95 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 00:58:08 -0500
Subject: [PATCH 081/101] (3)

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 34487bb623..094d6cc622 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 34487bb6230f2fa6afa4b1c3845da4b479276337
+Subproject commit 094d6cc62212f59a375f070f09e4380736526abd

From f88b57873dd8b93217dce936f71e1875de105057 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 11:05:38 -0500
Subject: [PATCH 082/101] 4

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 094d6cc622..bc9b7e9f0e 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 094d6cc62212f59a375f070f09e4380736526abd
+Subproject commit bc9b7e9f0ef0afab6a28e4faa7ab0c43cf045d83

From 134fcbfa44aeba1a2498d4e43b289b872041de67 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 11:08:20 -0500
Subject: [PATCH 083/101] PR comment

---
 tools/sort_symbol_addrs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py
index 071c20706a..0e4ed32e8b 100644
--- a/tools/sort_symbol_addrs.py
+++ b/tools/sort_symbol_addrs.py
@@ -21,6 +21,6 @@ for line in symbol_lines:
         sys.exit(55)
     syms[addr] = line
 
-with open("test.txt", newline="\n", mode="w") as f:
+with open(file_path, newline="\n", mode="w") as f:
     for addr in sorted(syms):
         f.write(syms[addr])

From b4a19e09e5595270f07e9caed0df21fb767278fe Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 16:39:29 +0000
Subject: [PATCH 084/101] fix splat issues

---
 Makefile               |  9 ++----
 tools/convert_image.py |  2 +-
 tools/n64splat         |  2 +-
 tools/splat.yaml       | 70 +++++++++++++++++++++---------------------
 4 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index 326fe78c20..1b38d467bd 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ submodules:
 
 split:
 	rm -rf bin img
-	$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8
+	$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS img
 
 split-%:
 	$(SPLAT) --modes ld $*
@@ -156,15 +156,12 @@ $(BUILD_DIR)/%.rgba32.png: %.png
 $(BUILD_DIR)/%.ci8.png: %.png
 	@mkdir -p $(shell dirname $@)
 	$(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS)
-$(BUILD_DIR)/%.ci8palette.png: %.png
-	@mkdir -p $(shell dirname $@)
-	$(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS)
 $(BUILD_DIR)/%.ci4.png: %.png
 	@mkdir -p $(shell dirname $@)
 	$(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS)
-$(BUILD_DIR)/%.ci4palette.png: %.png
+$(BUILD_DIR)/%.palette.png: %.png
 	@mkdir -p $(shell dirname $@)
-	$(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS)
+	$(PYTHON) tools/convert_image.py palette $< $@ $(IMG_FLAGS)
 $(BUILD_DIR)/%.ia4.png: %.png
 	@mkdir -p $(shell dirname $@)
 	$(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS)
diff --git a/tools/convert_image.py b/tools/convert_image.py
index afc92d94bc..d9fc14a4d7 100755
--- a/tools/convert_image.py
+++ b/tools/convert_image.py
@@ -84,7 +84,7 @@ class Converter():
                     for a, b in iter_in_groups(row, 2):
                         byte = (a << 4) | b
                         f.write(byte.to_bytes(1, byteorder="big"))
-        elif self.mode == "ci8palette" or self.mode == "ci4palette":
+        elif self.mode == "palette":
             img.preamble(True)
             palette = img.palette(alpha="force")
 
diff --git a/tools/n64splat b/tools/n64splat
index bc9b7e9f0e..23a4ba2652 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit bc9b7e9f0ef0afab6a28e4faa7ab0c43cf045d83
+Subproject commit 23a4ba2652f929a71e5e6b2ff759ae63304b24aa
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 5c3c04deb6..0d94d576d5 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -212,13 +212,13 @@ segments:
     - [0x8a860, "c", "code_8a860_len_3f30"]
     - [0x8e790, "c", "code_8e790_len_2850"]
     - [0x90fe0, "bin"]
-  - [0x93CD0, ci4,        ui/hammer, 32, 32]
-  - [0x93ED0, ci4palette, ui/hammer]
-  - [0x93EF0, ci4palette, ui/hammer.disabled]
+  - [0x93CD0, ci4,     ui/hammer, 32, 32]
+  - [0x93ED0, palette, ui/hammer]
+  - [0x93EF0, palette, ui/hammer.disabled]
   - [0x93FF0, bin]
-  - [0x9D658, rgba32,     ui/stat_heart, 16, 16]
+  - [0x9D658, rgba32,  ui/stat_heart, 16, 16]
   - [0x9DA58, bin]
-  - [0x9DA60, rgba32,     ui/stat_flower, 16, 16]
+  - [0x9DA60, rgba32,  ui/stat_flower, 16, 16]
   - [0x9DE60, bin]
   - type: code
     start: 0xA5DD0
@@ -276,15 +276,15 @@ segments:
     - [0x1086a0, "c", "code_1086a0_len_fc0"]
     - [0x109660, "c", "code_109660_len_1270"]
     - [0x10A8D0, "c", "code_10A8D0"]
-  - [0x10A9F0, i4,         shadow/square, 16, 16]
-  - [0x10AA70, i4,         shadow/circle, 16, 16]
+  - [0x10A9F0, i4,      shadow/square, 16, 16]
+  - [0x10AA70, i4,      shadow/circle, 16, 16]
   - [0x10AAF0, bin]
-  - [0x10AB70, i4,         shadow/10AB70, 32, 32]
-  - [0x10AD70, i4,         shadow/10AD70, 32, 32]
+  - [0x10AB70, i4,      shadow/10AB70, 32, 32]
+  - [0x10AD70, i4,      shadow/10AD70, 32, 32]
   - [0x10AF70, bin] # TODO
-  - [0x1164B8, ci8,        peach_letter, 150, 105]
+  - [0x1164B8, ci8,     peach_letter, 150, 105]
   - [0x11A23E, bin]
-  - [0x11A240, ci8palette, peach_letter]
+  - [0x11A240, palette, peach_letter]
   - [0x11A440, bin]
   - [0x131340, bin]
   - type: code
@@ -298,26 +298,26 @@ segments:
     - [0x1421C0, "c"]
     - [0x1422A0, "bin"]
   - [0x1443F0, ci8,        pause/world_map, 320, 320]
-  - [0x15D3F0, ci8palette, pause/world_map]
+  - [0x15D3F0, palette,    pause/world_map]
   - [0x15D5F0, ci4,        pause/spirits_bg, 128, 110]
-  - [0x15F170, ci4palette, pause/spirits_bg]
+  - [0x15F170, palette,    pause/spirits_bg]
   - [0x15F270, bin]
   - [0x15F970, ci4,        pause/banner_hp, 64, 16]
-  - [0x15FB70, ci4palette, pause/banner_hp]
+  - [0x15FB70, palette,    pause/banner_hp]
   - [0x15FD70, ci4,        pause/banner_fp, 64, 16]
-  - [0x15FF70, ci4palette, pause/banner_fp]
+  - [0x15FF70, palette,    pause/banner_fp]
   - [0x160170, ci4,        pause/banner_bp, 64, 16]
-  - [0x160370, ci4palette, pause/banner_bp]
+  - [0x160370, palette,    pause/banner_bp]
   - [0x160570, ci4,        pause/banner_boots, 48, 16]
-  - [0x1606F0, ci4palette, pause/banner_boots]
+  - [0x1606F0, palette,    pause/banner_boots]
   - [0x1608F0, ci4,        pause/banner_hammer, 48, 16]
-  - [0x160A70, ci4palette, pause/banner_hammer]
+  - [0x160A70, palette,    pause/banner_hammer]
   - [0x160C70, ci4,        pause/banner_star_energy, 48, 16]
-  - [0x160DF0, ci4palette, pause/banner_star_energy]
+  - [0x160DF0, palette,    pause/banner_star_energy]
   - [0x160FF0, ci4,        pause/available, 64, 16]
-  - [0x1611F0, ci4palette, pause/available]
+  - [0x1611F0, palette,    pause/available]
   - [0x1613F0, ci4,        pause/prompt_check_abilities, 128, 16]
-  - [0x1617F0, ci4palette, pause/prompt_check_abilities]
+  - [0x1617F0, palette,    pause/prompt_check_abilities]
   - [0x1619F0, bin]
   - type: code
     start: 0x163400
@@ -352,20 +352,20 @@ segments:
     - [0x1AF230, "c"]
     - [0x1AF2D0, "bin"]
   - [0x1CC310, "bin"] # icon images and palettes, vram unknown
-  - [0x1FE1B0, rgba16,     title/logo_n64, 128, 112]
-  - [0x2051B0, rgba16,     title/logo_is, 256, 122]
-  - [0x2131B0, rgba16,     title/logo_nintendo, 256, 48]
-  - [0x2191B0, ci8,        title/bg_1, 264, 162]
-  - [0x2238C0, ci8palette, title/bg_1]
-  - [0x223AC0, ci8,        title/bg_2, 264, 162]
-  - [0x22E1D0, ci8palette, title/bg_2]
-  - [0x22E3D0, ci8,        title/bg_3, 264, 162]
-  - [0x238AE0, ci8palette, title/bg_3]
-  - [0x238CE0, ci8,        title/bg_4, 264, 162]
-  - [0x2433F0, ci8palette, title/bg_4]
-  - [0x2435F0, ia8,        title/tape, 128, 128]
-  - [0x2475F0, ci8,        title/bowser_silhouette, 128, 128]
-  - [0x24B5F0, ci8palette, title/bowser_silhouette]
+  - [0x1FE1B0, rgba16,  title/logo_n64, 128, 112]
+  - [0x2051B0, rgba16,  title/logo_is, 256, 122]
+  - [0x2131B0, rgba16,  title/logo_nintendo, 256, 48]
+  - [0x2191B0, ci8,     title/bg_1, 264, 162]
+  - [0x2238C0, palette, title/bg_1]
+  - [0x223AC0, ci8,     title/bg_2, 264, 162]
+  - [0x22E1D0, palette, title/bg_2]
+  - [0x22E3D0, ci8,     title/bg_3, 264, 162]
+  - [0x238AE0, palette, title/bg_3]
+  - [0x238CE0, ci8,     title/bg_4, 264, 162]
+  - [0x2433F0, palette, title/bg_4]
+  - [0x2435F0, ia8,     title/tape, 128, 128]
+  - [0x2475F0, ci8,     title/bowser_silhouette, 128, 128]
+  - [0x24B5F0, palette, title/bowser_silhouette]
   - [0x24B7F0, bin]
   - type: code
     start: 0x3169F0

From 0c0780821ed3eecbf465d6a9ffdb871b1342745e Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 16:55:38 +0000
Subject: [PATCH 085/101] bump splat

---
 tools/n64splat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/n64splat b/tools/n64splat
index 23a4ba2652..42c5f587eb 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 23a4ba2652f929a71e5e6b2ff759ae63304b24aa
+Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3

From dd2eb476dc3194ea532e3c1a1d79492188b3c882 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 17:16:26 +0000
Subject: [PATCH 086/101] remove sinful ld_addrs usage

---
 src/world/world.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/world.c b/src/world/world.c
index caa2f6e98e..378d91329e 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -81,17 +81,17 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);
 #define MAP(map) \
     .id = #map, \
     .config = &map##_config, \
-    .dmaStart = (void*)LD_code_##map##_ROM_START, \
-    .dmaEnd = (void*)LD_code_##map##_ROM_END, \
-    .dmaDest = (void*)LD_code_##map##_VRAM \
+    .dmaStart = &code_##map##_ROM_START, \
+    .dmaEnd = &code_##map##_ROM_END, \
+    .dmaDest = &code_##map##_VRAM \
 
 // Should be removed once the data section containing .init and .config of all maps have been disassembled
 #define MAP_UNSPLIT(map, configVRAM) \
     .id = #map, \
     .config = (MapConfig*)(configVRAM), \
-    .dmaStart = (void*)LD_code_##map##_ROM_START, \
-    .dmaEnd = (void*)LD_code_##map##_ROM_END, \
-    .dmaDest = (void*)LD_code_##map##_VRAM \
+    .dmaStart = &code_##map##_ROM_START, \
+    .dmaEnd = &code_##map##_ROM_END, \
+    .dmaDest = &code_##map##_VRAM \
 
 /// Toad Town
 static Map mac_maps[] = {

From 7828969e61cada2228c6995a1135bd811a0c1dea Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 19:18:21 +0000
Subject: [PATCH 087/101] generate ld_addrs.h without splat

---
 Makefile       | 2 ++
 tools/n64splat | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 735667c976..dac0d3fb0e 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,8 @@ $(BUILD_DIR)/$(TARGET).elf: $(BUILD_DIR)/$(LD_SCRIPT) $(OBJECTS)
 $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) $< $@ -O binary
 
+include/ld_addrs.h: $(BUILD_DIR)/$(LD_SCRIPT)
+	grep -E "[^ ]+ =" $< -o | sed 's/^/extern void* /; s/ =/;/' > $@
 
 ### Make Settings ###
 
diff --git a/tools/n64splat b/tools/n64splat
index 42c5f587eb..c78e4fe9d8 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3
+Subproject commit c78e4fe9d863d4b3fa203af5f8b7179bb1c7c82f

From 0df7ef28a3b00c2d7160e131078a79bd3ecfd191 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 14:21:58 -0500
Subject: [PATCH 088/101] gCurrentEncounter offsets + some funcs

---
 .../code_13870_len_6980/func_8003E514.s       |   4 +-
 .../code_13870_len_6980/kill_encounter.s      |   4 +-
 .../code_13870_len_6980/kill_enemy.s          |   4 +-
 asm/nonmatchings/code_16F740/func_80244D90.s  |   4 +-
 asm/nonmatchings/code_181810/func_80253FB0.s  |   4 +-
 .../code_1a1f0_len_5390/create_npcs.s         |  56 +-
 .../code_1a1f0_len_5390/func_800431DC.s       |  24 +-
 .../code_20ec0_len_5040/spawn_drops.s         |  28 +-
 asm/nonmatchings/code_317E50/func_802BD758.s  |   4 +-
 asm/nonmatchings/code_319670/func_802BD660.s  |   4 +-
 asm/nonmatchings/code_31B120/func_802BD638.s  |   4 +-
 .../code_362a0_len_2f70/func_8005DDF0.s       |   4 +-
 .../iwa_01/90FBD0/func_8024228C_91193C.s      |   4 +-
 .../kmr_00/8ABF90/func_80240584_8AC514.s      |  13 -
 .../kmr_00/8ABF90/func_802405A8_8AC538.s      |  13 -
 .../kmr_00/8ABF90/func_802405CC_8AC55C.s      |  13 -
 .../kpa_03/A48720/func_80241DC4_A4A384.s      |   4 +-
 .../kpa_08/A4CAC0/func_8024141C_A4DE3C.s      |   4 +-
 .../kpa_09/A4F0A0/func_802412B4_A502B4.s      |   4 +-
 .../kpa_102/A93A50/func_80241524_A94C64.s     |   4 +-
 .../kpa_102/A93A50/func_80243504_A96C44.s     |   4 +-
 .../kpa_111/A99590/func_80241384_A9A914.s     |   4 +-
 .../kpa_115/A9ED40/func_80241384_AA00C4.s     |   4 +-
 .../kpa_50/A609D0/func_80241214_A61BE4.s      |   4 +-
 .../kpa_51/A640E0/func_802413CC_A6545C.s      |   4 +-
 .../kpa_52/A671E0/func_802412F4_A683F4.s      |   4 +-
 .../kpa_61/A6E6F0/func_802422B8_A70698.s      |   4 +-
 .../kzn_04/C69180/func_80241050_C69180.s      |   4 +-
 .../kzn_11/C80600/func_80241F4C_C820EC.s      |   4 +-
 .../mac_00/7EB340/func_80242178_7ECE88.s      |   4 +-
 .../omo_02/D9D510/func_80242B70_DA0040.s      |   4 +-
 .../omo_09/DCD6B0/func_80243580_DD0250.s      |   4 +-
 .../omo_17/DEF400/func_802436D4_DF2574.s      |   4 +-
 .../tik_01/869EE0/func_80240A30_869EE0.s      |   4 +-
 .../tik_02/86CD10/func_80240940_86D080.s      |   4 +-
 .../tik_08/87F820/func_80240A5C_87F84C.s      |   4 +-
 .../trd_08/9BB5B0/func_80240310_9BB5B0.s      |   4 +-
 .../world/script_api/7E0E80/MakeShop.s        | 233 +++++++
 .../world/script_api/7E0E80/MakeShopOwner.s   |  22 +
 .../world/script_api/7E0E80/draw_shop_items.s | 221 +++++++
 .../world/script_api/7E0E80/func_80280000.s   |  38 ++
 .../world/script_api/7E0E80/func_80280088.s   |  68 ++
 .../world/script_api/7E0E80/func_8028017C.s   |  39 ++
 .../world/script_api/7E0E80/func_80280208.s   |  55 ++
 .../world/script_api/7E0E80/func_802802D0.s   |  39 ++
 .../world/script_api/7E0E80/func_8028035C.s   |  31 +
 .../world/script_api/7E0E80/func_802803C8.s   |  24 +
 .../world/script_api/7E0E80/func_80280410.s   |  73 +++
 .../world/script_api/7E0E80/func_8028051C.s   | 297 +++++++++
 .../world/script_api/7E0E80/func_80280954.s   | 104 +++
 .../world/script_api/7E0E80/func_80280AC4.s   |  40 ++
 .../world/script_api/7E0E80/func_80280B44.s   |  17 +
 .../world/script_api/7E0E80/func_80280B78.s   |  29 +
 .../world/script_api/7E0E80/func_80280BD0.s   | 604 ++++++++++++++++++
 .../world/script_api/7E0E80/func_80281434.s   |  43 ++
 .../world/script_api/7E0E80/func_802814D0.s   |  25 +
 .../script_api/7E2AA0/MakeDoorAdvanced.s      | 394 ++++++++++++
 .../world/script_api/7E2AA0/func_802822A8.s   |  31 +
 .../world/script_api/7E2AA0/func_8028236C.s   |  21 +
 .../world/script_api/7E2AA0/func_802823B0.s   |  29 +
 .../world/script_api/7E2AA0/func_80282414.s   | 105 +++
 .../world/script_api/7E2AA0/func_80282634.s   |  60 ++
 .../world/script_api/7E2AA0/func_80282700.s   |  36 ++
 .../script_api/7E3700/CreatePushBlockGrid.s   | 112 ++++
 .../script_api/7E3700/GetGridIndexFromPos.s   |  65 ++
 .../world/script_api/7E3700/GetPushBlock.s    |  70 ++
 .../world/script_api/7E3700/SetPushBlock.s    |  86 +++
 .../7E3700/SetPushBlockFallEffect.s           |  29 +
 .../7E3700/TeleportPartnerToPlayer.s          |  41 ++
 .../world/script_api/7E3700/func_80282880.s   |  27 +
 .../world/script_api/7E3700/func_802828DC.s   | 224 +++++++
 .../world/script_api/7E3700/func_80282C40.s   | 133 ++++
 .../world/script_api/7E3700/func_80282E30.s   | 160 +++++
 .../world/script_api/7E3700/func_80283080.s   |  65 ++
 .../world/script_api/7E3700/func_80283174.s   |  33 +
 .../world/script_api/7E3700/func_80283240.s   |  48 ++
 .../world/script_api/7E3700/func_80283810.s   |  33 +
 .../world/script_api/7E3700/func_80283908.s   |  88 +++
 .../world/script_api/7E3700/func_80283A50.s   |  85 +++
 .../world/script_api/7E3700/func_80283B88.s   |  14 +
 .../world/script_api/7E3700/func_80283BB0.s   |  12 +
 .../world/script_api/7E3700/func_80283BD0.s   |  30 +
 .../world/script_api/7E3700/func_80283C34.s   |  55 ++
 .../world/script_api/7E3700/func_80283D00.s   |  33 +
 .../world/script_api/7E3700/func_80283D6C.s   |  39 ++
 .../world/script_api/7E3700/func_80283DF0.s   |  19 +
 .../world/script_api/7E3700/func_80283E2C.s   |  25 +
 asm/nonmatchings/world/world/func_80058DD0.s  |  51 ++
 asm/nonmatchings/world/world/func_80058E84.s  |  70 ++
 asm/nonmatchings/world/world/func_80058F88.s  |  36 ++
 asm/nonmatchings/world/world/func_80059008.s  |  23 +
 asm/nonmatchings/world/world/func_8005904C.s  | 191 ++++++
 asm/nonmatchings/world/world/func_80059310.s  | 375 +++++++++++
 asm/nonmatchings/world/world/func_800598A0.s  | 140 ++++
 asm/nonmatchings/world/world/func_80059AB8.s  |  77 +++
 asm/nonmatchings/world/world/func_80059BD4.s  |  50 ++
 asm/nonmatchings/world/world/func_80059C88.s  |   9 +
 asm/nonmatchings/world/world/func_80059C9C.s  |  49 ++
 asm/nonmatchings/world/world/func_80059D50.s  | 121 ++++
 asm/nonmatchings/world/world/func_80059F94.s  | 211 ++++++
 asm/nonmatchings/world/world/func_8005A2BC.s  | 122 ++++
 .../world/world/get_asset_offset.s            |  58 ++
 .../world/world/get_current_map_config.s      |   8 +
 .../world/world/get_current_map_header.s      |   8 +
 .../world/world/get_map_IDs_by_name.s         |  70 ++
 .../world/world/load_asset_by_name.s          |  64 ++
 .../world/world/load_map_by_IDs.s             | 333 ++++++++++
 asm/nonmatchings/world/world/play_effect.s    | 101 +++
 .../world/world/remove_all_effects.s          |  40 ++
 asm/nonmatchings/world/world/remove_effect.s  |  45 ++
 asm/nonmatchings/world/world/render_effects.s |  48 ++
 src/world/area_kmr/kmr_00/8ABF90.c            |  15 +-
 tools/symbol_addrs.txt                        |   3 +-
 113 files changed, 6634 insertions(+), 159 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80281434.s
 create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s
 create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282880.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282E30.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283080.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283174.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283240.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283810.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283908.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283A50.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283B88.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283C34.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
 create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
 create mode 100644 asm/nonmatchings/world/world/func_80058DD0.s
 create mode 100644 asm/nonmatchings/world/world/func_80058E84.s
 create mode 100644 asm/nonmatchings/world/world/func_80058F88.s
 create mode 100644 asm/nonmatchings/world/world/func_80059008.s
 create mode 100644 asm/nonmatchings/world/world/func_8005904C.s
 create mode 100644 asm/nonmatchings/world/world/func_80059310.s
 create mode 100644 asm/nonmatchings/world/world/func_800598A0.s
 create mode 100644 asm/nonmatchings/world/world/func_80059AB8.s
 create mode 100644 asm/nonmatchings/world/world/func_80059BD4.s
 create mode 100644 asm/nonmatchings/world/world/func_80059C88.s
 create mode 100644 asm/nonmatchings/world/world/func_80059C9C.s
 create mode 100644 asm/nonmatchings/world/world/func_80059D50.s
 create mode 100644 asm/nonmatchings/world/world/func_80059F94.s
 create mode 100644 asm/nonmatchings/world/world/func_8005A2BC.s
 create mode 100644 asm/nonmatchings/world/world/get_asset_offset.s
 create mode 100644 asm/nonmatchings/world/world/get_current_map_config.s
 create mode 100644 asm/nonmatchings/world/world/get_current_map_header.s
 create mode 100644 asm/nonmatchings/world/world/get_map_IDs_by_name.s
 create mode 100644 asm/nonmatchings/world/world/load_asset_by_name.s
 create mode 100644 asm/nonmatchings/world/world/load_map_by_IDs.s
 create mode 100644 asm/nonmatchings/world/world/play_effect.s
 create mode 100644 asm/nonmatchings/world/world/remove_all_effects.s
 create mode 100644 asm/nonmatchings/world/world/remove_effect.s
 create mode 100644 asm/nonmatchings/world/world/render_effects.s

diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s
index 0ebe33a68e..7749f68b28 100644
--- a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s
+++ b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8003E514
-/* 19914 8003E514 3C01800B */  lui       $at, 0x800b
-/* 19918 8003E518 A0240F18 */  sb        $a0, 0xf18($at)
+/* 19914 8003E514 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x8)
+/* 19918 8003E518 A0240F18 */  sb        $a0, %lo(gCurrentEncounter+0x8)($at)
 /* 1991C 8003E51C 03E00008 */  jr        $ra
 /* 19920 8003E520 00000000 */   nop      
diff --git a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s
index 9fa4ce7827..8c3fed029e 100644
--- a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s
+++ b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s
@@ -9,9 +9,9 @@ glabel kill_encounter
 /* 19B40 8003E740 AFB00010 */  sw        $s0, 0x10($sp)
 /* 19B44 8003E744 80820004 */  lb        $v0, 4($a0)
 /* 19B48 8003E748 00021080 */  sll       $v0, $v0, 2
-/* 19B4C 8003E74C 3C12800B */  lui       $s2, 0x800b
+/* 19B4C 8003E74C 3C12800B */  lui       $s2, %hi(gCurrentEncounter+0x28)
 /* 19B50 8003E750 02429021 */  addu      $s2, $s2, $v0
-/* 19B54 8003E754 8E520F38 */  lw        $s2, 0xf38($s2)
+/* 19B54 8003E754 8E520F38 */  lw        $s2, %lo(gCurrentEncounter+0x28)($s2)
 /* 19B58 8003E758 8E420000 */  lw        $v0, ($s2)
 /* 19B5C 8003E75C 1840000D */  blez      $v0, .L8003E794
 /* 19B60 8003E760 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s
index dd06b054b2..f735ff9372 100644
--- a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s
+++ b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s
@@ -11,9 +11,9 @@ glabel kill_enemy
 /* 19BC4 8003E7C4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 19BC8 8003E7C8 82020004 */  lb        $v0, 4($s0)
 /* 19BCC 8003E7CC 00021080 */  sll       $v0, $v0, 2
-/* 19BD0 8003E7D0 3C13800B */  lui       $s3, 0x800b
+/* 19BD0 8003E7D0 3C13800B */  lui       $s3, %hi(gCurrentEncounter+0x28)
 /* 19BD4 8003E7D4 02629821 */  addu      $s3, $s3, $v0
-/* 19BD8 8003E7D8 8E730F38 */  lw        $s3, 0xf38($s3)
+/* 19BD8 8003E7D8 8E730F38 */  lw        $s3, %lo(gCurrentEncounter+0x28)($s3)
 /* 19BDC 8003E7DC 8E640000 */  lw        $a0, ($s3)
 /* 19BE0 8003E7E0 3C12800B */  lui       $s2, %hi(gCurrentEncounter)
 /* 19BE4 8003E7E4 26520F10 */  addiu     $s2, $s2, %lo(gCurrentEncounter)
diff --git a/asm/nonmatchings/code_16F740/func_80244D90.s b/asm/nonmatchings/code_16F740/func_80244D90.s
index 0b30f27ad5..6a7a1c2487 100644
--- a/asm/nonmatchings/code_16F740/func_80244D90.s
+++ b/asm/nonmatchings/code_16F740/func_80244D90.s
@@ -16,8 +16,8 @@ glabel func_80244D90
 /* 17369C 80244DBC 00431021 */  addu      $v0, $v0, $v1
 /* 1736A0 80244DC0 000210C0 */  sll       $v0, $v0, 3
 /* 1736A4 80244DC4 00443021 */  addu      $a2, $v0, $a0
-/* 1736A8 80244DC8 3C03800B */  lui       $v1, 0x800b
-/* 1736AC 80244DCC 80630F19 */  lb        $v1, 0xf19($v1)
+/* 1736A8 80244DC8 3C03800B */  lui       $v1, %hi(gCurrentEncounter+0x9)
+/* 1736AC 80244DCC 80630F19 */  lb        $v1, %lo(gCurrentEncounter+0x9)($v1)
 /* 1736B0 80244DD0 24020001 */  addiu     $v0, $zero, 1
 /* 1736B4 80244DD4 1462000E */  bne       $v1, $v0, .L80244E10
 /* 1736B8 80244DD8 3C030080 */   lui      $v1, 0x80
diff --git a/asm/nonmatchings/code_181810/func_80253FB0.s b/asm/nonmatchings/code_181810/func_80253FB0.s
index 9659441959..3b756fb9c0 100644
--- a/asm/nonmatchings/code_181810/func_80253FB0.s
+++ b/asm/nonmatchings/code_181810/func_80253FB0.s
@@ -5,8 +5,8 @@ glabel func_80253FB0
 /* 182890 80253FB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 182894 80253FB4 24020003 */  addiu     $v0, $zero, 3
 /* 182898 80253FB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 18289C 80253FBC 3C01800B */  lui       $at, 0x800b
-/* 1828A0 80253FC0 A0220F19 */  sb        $v0, 0xf19($at)
+/* 18289C 80253FBC 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x9)
+/* 1828A0 80253FC0 A0220F19 */  sb        $v0, %lo(gCurrentEncounter+0x9)($at)
 /* 1828A4 80253FC4 0C090464 */  jal       func_80241190
 /* 1828A8 80253FC8 24040020 */   addiu    $a0, $zero, 0x20
 /* 1828AC 80253FCC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s
index eae68e1603..9fef79a944 100644
--- a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s
+++ b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s
@@ -5,12 +5,12 @@ glabel create_npcs
 /* 1EAB0 800436B0 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 1EAB4 800436B4 AFBE0058 */  sw        $fp, 0x58($sp)
 /* 1EAB8 800436B8 27BE0010 */  addiu     $fp, $sp, 0x10
-/* 1EABC 800436BC 3C07800B */  lui       $a3, 0x800b
-/* 1EAC0 800436C0 8CE70F34 */  lw        $a3, 0xf34($a3)
+/* 1EABC 800436BC 3C07800B */  lui       $a3, %hi(gCurrentEncounter+0x24)
+/* 1EAC0 800436C0 8CE70F34 */  lw        $a3, %lo(gCurrentEncounter+0x24)($a3)
 /* 1EAC4 800436C4 3C03800A */  lui       $v1, 0x800a
 /* 1EAC8 800436C8 8C63A5D0 */  lw        $v1, -0x5a30($v1)
-/* 1EACC 800436CC 3C08800B */  lui       $t0, 0x800b
-/* 1EAD0 800436D0 81080F30 */  lb        $t0, 0xf30($t0)
+/* 1EACC 800436CC 3C08800B */  lui       $t0, %hi(gCurrentEncounter+0x20)
+/* 1EAD0 800436D0 81080F30 */  lb        $t0, %lo(gCurrentEncounter+0x20)($t0)
 /* 1EAD4 800436D4 24040001 */  addiu     $a0, $zero, 1
 /* 1EAD8 800436D8 AFBF005C */  sw        $ra, 0x5c($sp)
 /* 1EADC 800436DC AFB70054 */  sw        $s7, 0x54($sp)
@@ -37,8 +37,8 @@ glabel create_npcs
 /* 1EB2C 8004372C 08011044 */  j         .L80044110
 /* 1EB30 80043730 00000000 */   nop      
 .L80043734:
-/* 1EB34 80043734 3C02800B */  lui       $v0, 0x800b
-/* 1EB38 80043738 80420F31 */  lb        $v0, 0xf31($v0)
+/* 1EB34 80043734 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x21)
+/* 1EB38 80043738 80420F31 */  lb        $v0, %lo(gCurrentEncounter+0x21)($v0)
 /* 1EB3C 8004373C 1044002A */  beq       $v0, $a0, .L800437E8
 /* 1EB40 80043740 00000000 */   nop      
 /* 1EB44 80043744 0000982D */  daddu     $s3, $zero, $zero
@@ -479,16 +479,16 @@ glabel create_npcs
 /* 1F178 80043D78 AFA7002C */   sw       $a3, 0x2c($sp)
 .L80043D7C:
 /* 1F17C 80043D7C 24020001 */  addiu     $v0, $zero, 1
-/* 1F180 80043D80 3C01800B */  lui       $at, 0x800b
-/* 1F184 80043D84 A0360F2C */  sb        $s6, 0xf2c($at)
+/* 1F180 80043D80 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x1C)
+/* 1F184 80043D84 A0360F2C */  sb        $s6, %lo(gCurrentEncounter+0x1C)($at)
 /* 1F188 80043D88 3C01800A */  lui       $at, 0x800a
 /* 1F18C 80043D8C AC22A5D0 */  sw        $v0, -0x5a30($at)
 /* 1F190 80043D90 08011044 */  j         .L80044110
 /* 1F194 80043D94 00000000 */   nop      
 .L80043D98:
 /* 1F198 80043D98 0000A82D */  daddu     $s5, $zero, $zero
-/* 1F19C 80043D9C 3C02800B */  lui       $v0, 0x800b
-/* 1F1A0 80043DA0 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F19C 80043D9C 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F1A0 80043DA0 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F1A4 80043DA4 1840001F */  blez      $v0, .L80043E24
 /* 1F1A8 80043DA8 02A0B02D */   daddu    $s6, $s5, $zero
 /* 1F1AC 80043DAC 3C12800B */  lui       $s2, %hi(gCurrentEncounter)
@@ -519,8 +519,8 @@ glabel create_npcs
 /* 1F204 80043E04 1440FFF2 */  bnez      $v0, .L80043DD0
 /* 1F208 80043E08 26310004 */   addiu    $s1, $s1, 4
 .L80043E0C:
-/* 1F20C 80043E0C 3C02800B */  lui       $v0, 0x800b
-/* 1F210 80043E10 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F20C 80043E0C 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F210 80043E10 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F214 80043E14 26D60001 */  addiu     $s6, $s6, 1
 /* 1F218 80043E18 02C2102A */  slt       $v0, $s6, $v0
 /* 1F21C 80043E1C 1440FFE5 */  bnez      $v0, .L80043DB4
@@ -528,8 +528,8 @@ glabel create_npcs
 .L80043E24:
 /* 1F224 80043E24 16A000BA */  bnez      $s5, .L80044110
 /* 1F228 80043E28 00000000 */   nop      
-/* 1F22C 80043E2C 3C02800B */  lui       $v0, 0x800b
-/* 1F230 80043E30 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F22C 80043E2C 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F230 80043E30 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F234 80043E34 18400026 */  blez      $v0, .L80043ED0
 /* 1F238 80043E38 0000B02D */   daddu    $s6, $zero, $zero
 /* 1F23C 80043E3C 3C12800B */  lui       $s2, %hi(gCurrentEncounter)
@@ -567,8 +567,8 @@ glabel create_npcs
 /* 1F2B0 80043EB0 1440FFEB */  bnez      $v0, .L80043E60
 /* 1F2B4 80043EB4 26310004 */   addiu    $s1, $s1, 4
 .L80043EB8:
-/* 1F2B8 80043EB8 3C02800B */  lui       $v0, 0x800b
-/* 1F2BC 80043EBC 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F2B8 80043EB8 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F2BC 80043EBC 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F2C0 80043EC0 26D60001 */  addiu     $s6, $s6, 1
 /* 1F2C4 80043EC4 02C2102A */  slt       $v0, $s6, $v0
 /* 1F2C8 80043EC8 1440FFDE */  bnez      $v0, .L80043E44
@@ -580,8 +580,8 @@ glabel create_npcs
 /* 1F2DC 80043EDC 08011044 */  j         .L80044110
 /* 1F2E0 80043EE0 00000000 */   nop      
 .L80043EE4:
-/* 1F2E4 80043EE4 3C02800B */  lui       $v0, 0x800b
-/* 1F2E8 80043EE8 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F2E4 80043EE4 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F2E8 80043EE8 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F2EC 80043EEC 18400020 */  blez      $v0, .L80043F70
 /* 1F2F0 80043EF0 02A0B02D */   daddu    $s6, $s5, $zero
 /* 1F2F4 80043EF4 3C12800B */  lui       $s2, %hi(gCurrentEncounter)
@@ -613,8 +613,8 @@ glabel create_npcs
 /* 1F350 80043F50 1440FFF1 */  bnez      $v0, .L80043F18
 /* 1F354 80043F54 26310004 */   addiu    $s1, $s1, 4
 .L80043F58:
-/* 1F358 80043F58 3C02800B */  lui       $v0, 0x800b
-/* 1F35C 80043F5C 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F358 80043F58 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F35C 80043F5C 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F360 80043F60 26D60001 */  addiu     $s6, $s6, 1
 /* 1F364 80043F64 02C2102A */  slt       $v0, $s6, $v0
 /* 1F368 80043F68 1440FFE4 */  bnez      $v0, .L80043EFC
@@ -622,8 +622,8 @@ glabel create_npcs
 .L80043F70:
 /* 1F370 80043F70 16A00067 */  bnez      $s5, .L80044110
 /* 1F374 80043F74 00000000 */   nop      
-/* 1F378 80043F78 3C02800B */  lui       $v0, 0x800b
-/* 1F37C 80043F7C 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F378 80043F78 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F37C 80043F7C 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F380 80043F80 1840002E */  blez      $v0, .L8004403C
 /* 1F384 80043F84 0000B02D */   daddu    $s6, $zero, $zero
 /* 1F388 80043F88 24150064 */  addiu     $s5, $zero, 0x64
@@ -667,14 +667,14 @@ glabel create_npcs
 /* 1F414 80044014 1440FFE6 */  bnez      $v0, .L80043FB0
 /* 1F418 80044018 26310004 */   addiu    $s1, $s1, 4
 .L8004401C:
-/* 1F41C 8004401C 3C02800B */  lui       $v0, 0x800b
-/* 1F420 80044020 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F41C 8004401C 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F420 80044020 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F424 80044024 26D60001 */  addiu     $s6, $s6, 1
 /* 1F428 80044028 02C2102A */  slt       $v0, $s6, $v0
 /* 1F42C 8004402C 1440FFD9 */  bnez      $v0, .L80043F94
 /* 1F430 80044030 26520004 */   addiu    $s2, $s2, 4
-/* 1F434 80044034 3C02800B */  lui       $v0, 0x800b
-/* 1F438 80044038 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F434 80044034 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F438 80044038 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 .L8004403C:
 /* 1F43C 8004403C 1840002A */  blez      $v0, .L800440E8
 /* 1F440 80044040 0000B02D */   daddu    $s6, $zero, $zero
@@ -717,8 +717,8 @@ glabel create_npcs
 /* 1F4C8 800440C8 1440FFE7 */  bnez      $v0, .L80044068
 /* 1F4CC 800440CC 26310004 */   addiu    $s1, $s1, 4
 .L800440D0:
-/* 1F4D0 800440D0 3C02800B */  lui       $v0, 0x800b
-/* 1F4D4 800440D4 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1F4D0 800440D0 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1F4D4 800440D4 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1F4D8 800440D8 26D60001 */  addiu     $s6, $s6, 1
 /* 1F4DC 800440DC 02C2102A */  slt       $v0, $s6, $v0
 /* 1F4E0 800440E0 1440FFDA */  bnez      $v0, .L8004404C
diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s
index fa8ec26815..749025b275 100644
--- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s
+++ b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s
@@ -65,8 +65,8 @@ glabel func_800431DC
 /* 1E6CC 800432CC E7A60038 */   swc1     $f6, 0x38($sp)
 /* 1E6D0 800432D0 0000F02D */  daddu     $fp, $zero, $zero
 /* 1E6D4 800432D4 03C0A82D */  daddu     $s5, $fp, $zero
-/* 1E6D8 800432D8 3C02800B */  lui       $v0, 0x800b
-/* 1E6DC 800432DC 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1E6D8 800432D8 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1E6DC 800432DC 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1E6E0 800432E0 3C01477F */  lui       $at, 0x477f
 /* 1E6E4 800432E4 3421FF00 */  ori       $at, $at, 0xff00
 /* 1E6E8 800432E8 44814000 */  mtc1      $at, $f8
@@ -260,8 +260,8 @@ glabel func_800431DC
 /* 1E9B8 800435B8 1440FF5B */  bnez      $v0, .L80043328
 /* 1E9BC 800435BC 00121080 */   sll      $v0, $s2, 2
 .L800435C0:
-/* 1E9C0 800435C0 3C02800B */  lui       $v0, 0x800b
-/* 1E9C4 800435C4 80420F2C */  lb        $v0, 0xf2c($v0)
+/* 1E9C0 800435C0 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x1C)
+/* 1E9C4 800435C4 80420F2C */  lb        $v0, %lo(gCurrentEncounter+0x1C)($v0)
 /* 1E9C8 800435C8 26B50001 */  addiu     $s5, $s5, 1
 /* 1E9CC 800435CC 02A2102A */  slt       $v0, $s5, $v0
 /* 1E9D0 800435D0 1440FF4B */  bnez      $v0, .L80043300
@@ -289,17 +289,17 @@ glabel func_800431DC
 /* 1EA24 80043624 00000000 */   nop      
 /* 1EA28 80043628 24020001 */  addiu     $v0, $zero, 1
 /* 1EA2C 8004362C 24030005 */  addiu     $v1, $zero, 5
-/* 1EA30 80043630 3C01800B */  lui       $at, 0x800b
-/* 1EA34 80043634 A0230F15 */  sb        $v1, 0xf15($at)
+/* 1EA30 80043630 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x5)
+/* 1EA34 80043634 A0230F15 */  sb        $v1, %lo(gCurrentEncounter+0x5)($at)
 /* 1EA38 80043638 A2C30005 */  sb        $v1, 5($s6)
 /* 1EA3C 8004363C 8FA8002C */  lw        $t0, 0x2c($sp)
 /* 1EA40 80043640 0040182D */  daddu     $v1, $v0, $zero
-/* 1EA44 80043644 3C01800B */  lui       $at, 0x800b
-/* 1EA48 80043648 AC360F9C */  sw        $s6, 0xf9c($at)
-/* 1EA4C 8004364C 3C01800B */  lui       $at, 0x800b
-/* 1EA50 80043650 A0230F14 */  sb        $v1, 0xf14($at)
-/* 1EA54 80043654 3C01800B */  lui       $at, 0x800b
-/* 1EA58 80043658 AC280F98 */  sw        $t0, 0xf98($at)
+/* 1EA44 80043644 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x8C)
+/* 1EA48 80043648 AC360F9C */  sw        $s6, %lo(gCurrentEncounter+0x8C)($at)
+/* 1EA4C 8004364C 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x4)
+/* 1EA50 80043650 A0230F14 */  sb        $v1, %lo(gCurrentEncounter+0x4)($at)
+/* 1EA54 80043654 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x88)
+/* 1EA58 80043658 AC280F98 */  sw        $t0, %lo(gCurrentEncounter+0x88)($at)
 /* 1EA5C 8004365C 08010D9A */  j         .L80043668
 /* 1EA60 80043660 00000000 */   nop      
 .L80043664:
diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
index ae5a24ac34..031fe72248 100644
--- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s
@@ -192,8 +192,8 @@ glabel spawn_drops
 /* 23948 80048548 0C051514 */  jal       set_global_flag
 /* 2394C 8004854C 24840715 */   addiu    $a0, $a0, 0x715
 .L80048550:
-/* 23950 80048550 3C02800B */  lui       $v0, 0x800b
-/* 23954 80048554 80420F23 */  lb        $v0, 0xf23($v0)
+/* 23950 80048550 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x13)
+/* 23954 80048554 80420F23 */  lb        $v0, %lo(gCurrentEncounter+0x13)($v0)
 /* 23958 80048558 10400026 */  beqz      $v0, .L800485F4
 /* 2395C 8004855C 24040093 */   addiu    $a0, $zero, 0x93
 /* 23960 80048560 24020004 */  addiu     $v0, $zero, 4
@@ -208,8 +208,8 @@ glabel spawn_drops
 /* 23984 80048584 4407F000 */  mfc1      $a3, $f30
 /* 23988 80048588 8FA80024 */  lw        $t0, 0x24($sp)
 /* 2398C 8004858C 02C21021 */  addu      $v0, $s6, $v0
-/* 23990 80048590 3C01800B */  lui       $at, 0x800b
-/* 23994 80048594 A0200F23 */  sb        $zero, 0xf23($at)
+/* 23990 80048590 3C01800B */  lui       $at, %hi(gCurrentEncounter+0x13)
+/* 23994 80048594 A0200F23 */  sb        $zero, %lo(gCurrentEncounter+0x13)($at)
 /* 23998 80048598 AFA20018 */  sw        $v0, 0x18($sp)
 /* 2399C 8004859C AFA0001C */  sw        $zero, 0x1c($sp)
 /* 239A0 800485A0 0C04C4FD */  jal       make_item_entity
@@ -636,26 +636,26 @@ glabel spawn_drops
 /* 23FA8 80048BA8 06220001 */  bltzl     $s1, .L80048BB0
 /* 23FAC 80048BAC 0000882D */   daddu    $s1, $zero, $zero
 .L80048BB0:
-/* 23FB0 80048BB0 3C02800B */  lui       $v0, 0x800b
-/* 23FB4 80048BB4 84420F1E */  lh        $v0, 0xf1e($v0)
+/* 23FB0 80048BB0 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0xE)
+/* 23FB4 80048BB4 84420F1E */  lh        $v0, %lo(gCurrentEncounter+0xE)($v0)
 /* 23FB8 80048BB8 24040019 */  addiu     $a0, $zero, 0x19
 /* 23FBC 80048BBC 0C03A752 */  jal       is_ability_active
 /* 23FC0 80048BC0 02228821 */   addu     $s1, $s1, $v0
 /* 23FC4 80048BC4 10400007 */  beqz      $v0, .L80048BE4
 /* 23FC8 80048BC8 00000000 */   nop      
-/* 23FCC 80048BCC 3C02800B */  lui       $v0, 0x800b
-/* 23FD0 80048BD0 90420F1C */  lbu       $v0, 0xf1c($v0)
-/* 23FD4 80048BD4 3C01800B */  lui       $at, 0x800b
-/* 23FD8 80048BD8 A0200F1C */  sb        $zero, 0xf1c($at)
+/* 23FCC 80048BCC 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0xC)
+/* 23FD0 80048BD0 90420F1C */  lbu       $v0, %lo(gCurrentEncounter+0xC)($v0)
+/* 23FD4 80048BD4 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xC)
+/* 23FD8 80048BD8 A0200F1C */  sb        $zero, %lo(gCurrentEncounter+0xC)($at)
 /* 23FDC 80048BDC 00021042 */  srl       $v0, $v0, 1
 /* 23FE0 80048BE0 02228821 */  addu      $s1, $s1, $v0
 .L80048BE4:
-/* 23FE4 80048BE4 3C02800B */  lui       $v0, 0x800b
-/* 23FE8 80048BE8 80420F1B */  lb        $v0, 0xf1b($v0)
+/* 23FE4 80048BE4 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0xB)
+/* 23FE8 80048BE8 80420F1B */  lb        $v0, %lo(gCurrentEncounter+0xB)($v0)
 /* 23FEC 80048BEC 10400004 */  beqz      $v0, .L80048C00
 /* 23FF0 80048BF0 00111040 */   sll      $v0, $s1, 1
-/* 23FF4 80048BF4 3C01800B */  lui       $at, 0x800b
-/* 23FF8 80048BF8 A0200F1B */  sb        $zero, 0xf1b($at)
+/* 23FF4 80048BF4 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xB)
+/* 23FF8 80048BF8 A0200F1B */  sb        $zero, %lo(gCurrentEncounter+0xB)($at)
 /* 23FFC 80048BFC 02228821 */  addu      $s1, $s1, $v0
 .L80048C00:
 /* 24000 80048C00 0C03A752 */  jal       is_ability_active
diff --git a/asm/nonmatchings/code_317E50/func_802BD758.s b/asm/nonmatchings/code_317E50/func_802BD758.s
index 96df531688..3613a3a96b 100644
--- a/asm/nonmatchings/code_317E50/func_802BD758.s
+++ b/asm/nonmatchings/code_317E50/func_802BD758.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802BD758
-/* 3184A8 802BD758 3C02800B */  lui       $v0, 0x800b
-/* 3184AC 802BD75C 80420F18 */  lb        $v0, 0xf18($v0)
+/* 3184A8 802BD758 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
+/* 3184AC 802BD75C 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
 /* 3184B0 802BD760 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3184B4 802BD764 AFB20038 */  sw        $s2, 0x38($sp)
 /* 3184B8 802BD768 0080902D */  daddu     $s2, $a0, $zero
diff --git a/asm/nonmatchings/code_319670/func_802BD660.s b/asm/nonmatchings/code_319670/func_802BD660.s
index 60464d1e94..6711f880f2 100644
--- a/asm/nonmatchings/code_319670/func_802BD660.s
+++ b/asm/nonmatchings/code_319670/func_802BD660.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802BD660
-/* 319BD0 802BD660 3C02800B */  lui       $v0, 0x800b
-/* 319BD4 802BD664 80420F18 */  lb        $v0, 0xf18($v0)
+/* 319BD0 802BD660 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
+/* 319BD4 802BD664 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
 /* 319BD8 802BD668 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 319BDC 802BD66C AFB20040 */  sw        $s2, 0x40($sp)
 /* 319BE0 802BD670 0080902D */  daddu     $s2, $a0, $zero
diff --git a/asm/nonmatchings/code_31B120/func_802BD638.s b/asm/nonmatchings/code_31B120/func_802BD638.s
index 5790f6fb82..eb39dddfb6 100644
--- a/asm/nonmatchings/code_31B120/func_802BD638.s
+++ b/asm/nonmatchings/code_31B120/func_802BD638.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802BD638
-/* 31B658 802BD638 3C02800B */  lui       $v0, 0x800b
-/* 31B65C 802BD63C 80420F18 */  lb        $v0, 0xf18($v0)
+/* 31B658 802BD638 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
+/* 31B65C 802BD63C 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
 /* 31B660 802BD640 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 31B664 802BD644 AFB50044 */  sw        $s5, 0x44($sp)
 /* 31B668 802BD648 0080A82D */  daddu     $s5, $a0, $zero
diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s
index 0d471f39fc..9569fa17a3 100644
--- a/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s
+++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8005DDF0
-/* 391F0 8005DDF0 3C02800B */  lui       $v0, 0x800b
-/* 391F4 8005DDF4 80420F18 */  lb        $v0, 0xf18($v0)
+/* 391F0 8005DDF0 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
+/* 391F4 8005DDF4 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
 /* 391F8 8005DDF8 00021027 */  nor       $v0, $zero, $v0
 /* 391FC 8005DDFC 03E00008 */  jr        $ra
 /* 39200 8005DE00 0002102B */   sltu     $v0, $zero, $v0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s
index 380bfad5c4..0807b080c8 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s
@@ -6,8 +6,8 @@ glabel func_8024228C_91193C
 /* 911940 80242290 3C05FE36 */  lui       $a1, 0xfe36
 /* 911944 80242294 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 911948 80242298 8C820148 */  lw        $v0, 0x148($a0)
-/* 91194C 8024229C 3C06800B */  lui       $a2, 0x800b
-/* 911950 802422A0 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* 91194C 8024229C 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* 911950 802422A0 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* 911954 802422A4 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* 911958 802422A8 00C23026 */  xor       $a2, $a2, $v0
 /* 91195C 802422AC 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s
deleted file mode 100644
index 6118f6f058..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240584_8AC514
-/* 8AC514 80240584 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8AC518 80240588 0000202D */  daddu     $a0, $zero, $zero
-/* 8AC51C 8024058C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8AC520 80240590 0C01554F */  jal       func_8005553C
-/* 8AC524 80240594 240507D0 */   addiu    $a1, $zero, 0x7d0
-/* 8AC528 80240598 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8AC52C 8024059C 24020002 */  addiu     $v0, $zero, 2
-/* 8AC530 802405A0 03E00008 */  jr        $ra
-/* 8AC534 802405A4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s
deleted file mode 100644
index c88ac530ac..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405A8_8AC538
-/* 8AC538 802405A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8AC53C 802405AC 0000202D */  daddu     $a0, $zero, $zero
-/* 8AC540 802405B0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8AC544 802405B4 0C015564 */  jal       func_80055590
-/* 8AC548 802405B8 240507D0 */   addiu    $a1, $zero, 0x7d0
-/* 8AC54C 802405BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8AC550 802405C0 24020002 */  addiu     $v0, $zero, 2
-/* 8AC554 802405C4 03E00008 */  jr        $ra
-/* 8AC558 802405C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s
deleted file mode 100644
index e16eb9d325..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405CC_8AC55C
-/* 8AC55C 802405CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8AC560 802405D0 0000202D */  daddu     $a0, $zero, $zero
-/* 8AC564 802405D4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8AC568 802405D8 0C01553A */  jal       func_800554E8
-/* 8AC56C 802405DC 240503E8 */   addiu    $a1, $zero, 0x3e8
-/* 8AC570 802405E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8AC574 802405E4 24020002 */  addiu     $v0, $zero, 2
-/* 8AC578 802405E8 03E00008 */  jr        $ra
-/* 8AC57C 802405EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s
index 17a0ee80ea..fc4c63b986 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s
@@ -6,8 +6,8 @@ glabel func_80241DC4_A4A384
 /* A4A388 80241DC8 3C05FE36 */  lui       $a1, 0xfe36
 /* A4A38C 80241DCC AFBF0010 */  sw        $ra, 0x10($sp)
 /* A4A390 80241DD0 8C820148 */  lw        $v0, 0x148($a0)
-/* A4A394 80241DD4 3C06800B */  lui       $a2, 0x800b
-/* A4A398 80241DD8 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A4A394 80241DD4 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A4A398 80241DD8 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A4A39C 80241DDC 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A4A3A0 80241DE0 00C23026 */  xor       $a2, $a2, $v0
 /* A4A3A4 80241DE4 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s
index 04075a251d..210996abf8 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s
@@ -6,8 +6,8 @@ glabel func_8024141C_A4DE3C
 /* A4DE40 80241420 3C05FE36 */  lui       $a1, 0xfe36
 /* A4DE44 80241424 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A4DE48 80241428 8C820148 */  lw        $v0, 0x148($a0)
-/* A4DE4C 8024142C 3C06800B */  lui       $a2, 0x800b
-/* A4DE50 80241430 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A4DE4C 8024142C 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A4DE50 80241430 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A4DE54 80241434 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A4DE58 80241438 00C23026 */  xor       $a2, $a2, $v0
 /* A4DE5C 8024143C 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s
index c0ac05a300..e123baebee 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s
@@ -6,8 +6,8 @@ glabel func_802412B4_A502B4
 /* A502B8 802412B8 3C05FE36 */  lui       $a1, 0xfe36
 /* A502BC 802412BC AFBF0010 */  sw        $ra, 0x10($sp)
 /* A502C0 802412C0 8C820148 */  lw        $v0, 0x148($a0)
-/* A502C4 802412C4 3C06800B */  lui       $a2, 0x800b
-/* A502C8 802412C8 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A502C4 802412C4 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A502C8 802412C8 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A502CC 802412CC 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A502D0 802412D0 00C23026 */  xor       $a2, $a2, $v0
 /* A502D4 802412D4 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s
index d207d590a6..2c0932f688 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s
@@ -6,8 +6,8 @@ glabel func_80241524_A94C64
 /* A94C68 80241528 3C05FE36 */  lui       $a1, 0xfe36
 /* A94C6C 8024152C AFBF0010 */  sw        $ra, 0x10($sp)
 /* A94C70 80241530 8C820148 */  lw        $v0, 0x148($a0)
-/* A94C74 80241534 3C06800B */  lui       $a2, 0x800b
-/* A94C78 80241538 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A94C74 80241534 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A94C78 80241538 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A94C7C 8024153C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A94C80 80241540 00C23026 */  xor       $a2, $a2, $v0
 /* A94C84 80241544 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s
index 3c386d2a3b..4e840b1c7a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s
@@ -6,8 +6,8 @@ glabel func_80243504_A96C44
 /* A96C48 80243508 3C05FE36 */  lui       $a1, 0xfe36
 /* A96C4C 8024350C AFBF0010 */  sw        $ra, 0x10($sp)
 /* A96C50 80243510 8C820148 */  lw        $v0, 0x148($a0)
-/* A96C54 80243514 3C06800B */  lui       $a2, 0x800b
-/* A96C58 80243518 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A96C54 80243514 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A96C58 80243518 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A96C5C 8024351C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A96C60 80243520 00C23026 */  xor       $a2, $a2, $v0
 /* A96C64 80243524 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s
index 698e374971..4aff6c4dfa 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s
@@ -6,8 +6,8 @@ glabel func_80241384_A9A914
 /* A9A918 80241388 3C05FE36 */  lui       $a1, 0xfe36
 /* A9A91C 8024138C AFBF0010 */  sw        $ra, 0x10($sp)
 /* A9A920 80241390 8C820148 */  lw        $v0, 0x148($a0)
-/* A9A924 80241394 3C06800B */  lui       $a2, 0x800b
-/* A9A928 80241398 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A9A924 80241394 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A9A928 80241398 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A9A92C 8024139C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A9A930 802413A0 00C23026 */  xor       $a2, $a2, $v0
 /* A9A934 802413A4 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s
index e4c0d0d364..6446b26c99 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s
@@ -6,8 +6,8 @@ glabel func_80241384_AA00C4
 /* AA00C8 80241388 3C05FE36 */  lui       $a1, 0xfe36
 /* AA00CC 8024138C AFBF0010 */  sw        $ra, 0x10($sp)
 /* AA00D0 80241390 8C820148 */  lw        $v0, 0x148($a0)
-/* AA00D4 80241394 3C06800B */  lui       $a2, 0x800b
-/* AA00D8 80241398 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* AA00D4 80241394 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* AA00D8 80241398 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* AA00DC 8024139C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* AA00E0 802413A0 00C23026 */  xor       $a2, $a2, $v0
 /* AA00E4 802413A4 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s
index dd0c30bb0c..8bc4b14a03 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s
@@ -6,8 +6,8 @@ glabel func_80241214_A61BE4
 /* A61BE8 80241218 3C05FE36 */  lui       $a1, 0xfe36
 /* A61BEC 8024121C AFBF0010 */  sw        $ra, 0x10($sp)
 /* A61BF0 80241220 8C820148 */  lw        $v0, 0x148($a0)
-/* A61BF4 80241224 3C06800B */  lui       $a2, 0x800b
-/* A61BF8 80241228 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A61BF4 80241224 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A61BF8 80241228 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A61BFC 8024122C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A61C00 80241230 00C23026 */  xor       $a2, $a2, $v0
 /* A61C04 80241234 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s
index 7d73155db4..614677514b 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s
@@ -6,8 +6,8 @@ glabel func_802413CC_A6545C
 /* A65460 802413D0 3C05FE36 */  lui       $a1, 0xfe36
 /* A65464 802413D4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A65468 802413D8 8C820148 */  lw        $v0, 0x148($a0)
-/* A6546C 802413DC 3C06800B */  lui       $a2, 0x800b
-/* A65470 802413E0 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A6546C 802413DC 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A65470 802413E0 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A65474 802413E4 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A65478 802413E8 00C23026 */  xor       $a2, $a2, $v0
 /* A6547C 802413EC 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s
index b62c620db6..2b4c656970 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s
@@ -6,8 +6,8 @@ glabel func_802412F4_A683F4
 /* A683F8 802412F8 3C05FE36 */  lui       $a1, 0xfe36
 /* A683FC 802412FC AFBF0010 */  sw        $ra, 0x10($sp)
 /* A68400 80241300 8C820148 */  lw        $v0, 0x148($a0)
-/* A68404 80241304 3C06800B */  lui       $a2, 0x800b
-/* A68408 80241308 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A68404 80241304 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A68408 80241308 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A6840C 8024130C 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A68410 80241310 00C23026 */  xor       $a2, $a2, $v0
 /* A68414 80241314 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s
index cb6166a364..5a1b21582d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s
@@ -6,8 +6,8 @@ glabel func_802422B8_A70698
 /* A7069C 802422BC 3C05FE36 */  lui       $a1, 0xfe36
 /* A706A0 802422C0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A706A4 802422C4 8C820148 */  lw        $v0, 0x148($a0)
-/* A706A8 802422C8 3C06800B */  lui       $a2, 0x800b
-/* A706AC 802422CC 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* A706A8 802422C8 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* A706AC 802422CC 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* A706B0 802422D0 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* A706B4 802422D4 00C23026 */  xor       $a2, $a2, $v0
 /* A706B8 802422D8 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
index 7c54ad6355..42740fe5b5 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
@@ -301,8 +301,8 @@ glabel func_80241050_C69180
 /* C695F8 802414C8 0C052757 */  jal       play_sound_at_position
 /* C695FC 802414CC E7A00010 */   swc1     $f0, 0x10($sp)
 /* C69600 802414D0 2402002D */  addiu     $v0, $zero, 0x2d
-/* C69604 802414D4 3C01800B */  lui       $at, 0x800b
-/* C69608 802414D8 A0220F1A */  sb        $v0, 0xf1a($at)
+/* C69604 802414D4 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
+/* C69608 802414D8 A0220F1A */  sb        $v0, %lo(gCurrentEncounter+0xA)($at)
 /* C6960C 802414DC C6600028 */  lwc1      $f0, 0x28($s3)
 /* C69610 802414E0 C6620030 */  lwc1      $f2, 0x30($s3)
 /* C69614 802414E4 2402002D */  addiu     $v0, $zero, 0x2d
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
index 155f31cbe9..1720787c8e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
@@ -301,8 +301,8 @@ glabel func_80241F4C_C820EC
 /* C82564 802423C4 0C052757 */  jal       play_sound_at_position
 /* C82568 802423C8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* C8256C 802423CC 2402002D */  addiu     $v0, $zero, 0x2d
-/* C82570 802423D0 3C01800B */  lui       $at, 0x800b
-/* C82574 802423D4 A0220F1A */  sb        $v0, 0xf1a($at)
+/* C82570 802423D0 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
+/* C82574 802423D4 A0220F1A */  sb        $v0, %lo(gCurrentEncounter+0xA)($at)
 /* C82578 802423D8 C6600028 */  lwc1      $f0, 0x28($s3)
 /* C8257C 802423DC C6620030 */  lwc1      $f2, 0x30($s3)
 /* C82580 802423E0 2402002D */  addiu     $v0, $zero, 0x2d
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
index b57040463b..07727a23ba 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
@@ -12,9 +12,9 @@ glabel func_80242178_7ECE88
 /* 7ECEA4 80242194 82030004 */  lb        $v1, 4($s0)
 /* 7ECEA8 80242198 00021080 */  sll       $v0, $v0, 2
 /* 7ECEAC 8024219C 00031880 */  sll       $v1, $v1, 2
-/* 7ECEB0 802421A0 3C04800B */  lui       $a0, 0x800b
+/* 7ECEB0 802421A0 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 7ECEB4 802421A4 00832021 */  addu      $a0, $a0, $v1
-/* 7ECEB8 802421A8 8C840F38 */  lw        $a0, 0xf38($a0)
+/* 7ECEB8 802421A8 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
 /* 7ECEBC 802421AC 3C038025 */  lui       $v1, 0x8025
 /* 7ECEC0 802421B0 00621821 */  addu      $v1, $v1, $v0
 /* 7ECEC4 802421B4 9463A632 */  lhu       $v1, -0x59ce($v1)
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s
index 5eaa0dbc89..434e29bc59 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s
@@ -6,8 +6,8 @@ glabel func_80242B70_DA0040
 /* DA0044 80242B74 3C05FE36 */  lui       $a1, 0xfe36
 /* DA0048 80242B78 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DA004C 80242B7C 8C820148 */  lw        $v0, 0x148($a0)
-/* DA0050 80242B80 3C06800B */  lui       $a2, 0x800b
-/* DA0054 80242B84 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* DA0050 80242B80 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* DA0054 80242B84 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* DA0058 80242B88 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* DA005C 80242B8C 00C23026 */  xor       $a2, $a2, $v0
 /* DA0060 80242B90 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s
index 3d833e26e1..f7a949c140 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s
@@ -6,8 +6,8 @@ glabel func_80243580_DD0250
 /* DD0254 80243584 3C05FE36 */  lui       $a1, 0xfe36
 /* DD0258 80243588 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DD025C 8024358C 8C820148 */  lw        $v0, 0x148($a0)
-/* DD0260 80243590 3C06800B */  lui       $a2, 0x800b
-/* DD0264 80243594 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* DD0260 80243590 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* DD0264 80243594 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* DD0268 80243598 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* DD026C 8024359C 00C23026 */  xor       $a2, $a2, $v0
 /* DD0270 802435A0 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s
index 951f2cf354..770626c909 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s
@@ -6,8 +6,8 @@ glabel func_802436D4_DF2574
 /* DF2578 802436D8 3C05FE36 */  lui       $a1, 0xfe36
 /* DF257C 802436DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* DF2580 802436E0 8C820148 */  lw        $v0, 0x148($a0)
-/* DF2584 802436E4 3C06800B */  lui       $a2, 0x800b
-/* DF2588 802436E8 8CC60F9C */  lw        $a2, 0xf9c($a2)
+/* DF2584 802436E4 3C06800B */  lui       $a2, %hi(gCurrentEncounter+0x8C)
+/* DF2588 802436E8 8CC60F9C */  lw        $a2, %lo(gCurrentEncounter+0x8C)($a2)
 /* DF258C 802436EC 34A53C80 */  ori       $a1, $a1, 0x3c80
 /* DF2590 802436F0 00C23026 */  xor       $a2, $a2, $v0
 /* DF2594 802436F4 0C0B2026 */  jal       set_variable
diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
index b168610476..a304b0b80f 100644
--- a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
+++ b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
@@ -12,9 +12,9 @@ glabel func_80240A30_869EE0
 /* 869EFC 80240A4C 82030004 */  lb        $v1, 4($s0)
 /* 869F00 80240A50 00021080 */  sll       $v0, $v0, 2
 /* 869F04 80240A54 00031880 */  sll       $v1, $v1, 2
-/* 869F08 80240A58 3C04800B */  lui       $a0, 0x800b
+/* 869F08 80240A58 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 869F0C 80240A5C 00832021 */  addu      $a0, $a0, $v1
-/* 869F10 80240A60 8C840F38 */  lw        $a0, 0xf38($a0)
+/* 869F10 80240A60 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
 /* 869F14 80240A64 3C038024 */  lui       $v1, 0x8024
 /* 869F18 80240A68 00621821 */  addu      $v1, $v1, $v0
 /* 869F1C 80240A6C 94632B7E */  lhu       $v1, 0x2b7e($v1)
diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
index c9d206cdd5..e6b187648d 100644
--- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
+++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
@@ -12,9 +12,9 @@ glabel func_80240940_86D080
 /* 86D09C 8024095C 82030004 */  lb        $v1, 4($s0)
 /* 86D0A0 80240960 00021080 */  sll       $v0, $v0, 2
 /* 86D0A4 80240964 00031880 */  sll       $v1, $v1, 2
-/* 86D0A8 80240968 3C04800B */  lui       $a0, 0x800b
+/* 86D0A8 80240968 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 86D0AC 8024096C 00832021 */  addu      $a0, $a0, $v1
-/* 86D0B0 80240970 8C840F38 */  lw        $a0, 0xf38($a0)
+/* 86D0B0 80240970 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
 /* 86D0B4 80240974 3C038024 */  lui       $v1, 0x8024
 /* 86D0B8 80240978 00621821 */  addu      $v1, $v1, $v0
 /* 86D0BC 8024097C 94631BAE */  lhu       $v1, 0x1bae($v1)
diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
index a057ce03b6..be91c4398a 100644
--- a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
+++ b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
@@ -12,9 +12,9 @@ glabel func_80240A5C_87F84C
 /* 87F868 80240A78 82030004 */  lb        $v1, 4($s0)
 /* 87F86C 80240A7C 00021080 */  sll       $v0, $v0, 2
 /* 87F870 80240A80 00031880 */  sll       $v1, $v1, 2
-/* 87F874 80240A84 3C04800B */  lui       $a0, 0x800b
+/* 87F874 80240A84 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 87F878 80240A88 00832021 */  addu      $a0, $a0, $v1
-/* 87F87C 80240A8C 8C840F38 */  lw        $a0, 0xf38($a0)
+/* 87F87C 80240A8C 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
 /* 87F880 80240A90 3C038024 */  lui       $v1, 0x8024
 /* 87F884 80240A94 00621821 */  addu      $v1, $v1, $v0
 /* 87F888 80240A98 94632C0E */  lhu       $v1, 0x2c0e($v1)
diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
index 3734e8eab1..c2ac3c39df 100644
--- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
+++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
@@ -301,8 +301,8 @@ glabel func_80240310_9BB5B0
 /* 9BBA28 80240788 0C052757 */  jal       play_sound_at_position
 /* 9BBA2C 8024078C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9BBA30 80240790 2402002D */  addiu     $v0, $zero, 0x2d
-/* 9BBA34 80240794 3C01800B */  lui       $at, 0x800b
-/* 9BBA38 80240798 A0220F1A */  sb        $v0, 0xf1a($at)
+/* 9BBA34 80240794 3C01800B */  lui       $at, %hi(gCurrentEncounter+0xA)
+/* 9BBA38 80240798 A0220F1A */  sb        $v0, %lo(gCurrentEncounter+0xA)($at)
 /* 9BBA3C 8024079C C6600028 */  lwc1      $f0, 0x28($s3)
 /* 9BBA40 802407A0 C6620030 */  lwc1      $f2, 0x30($s3)
 /* 9BBA44 802407A4 2402002D */  addiu     $v0, $zero, 0x2d
diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
new file mode 100644
index 0000000000..a65ddabbd8
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
@@ -0,0 +1,233 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel MakeShop
+/* 7E26E0 80281860 27BDFF98 */  addiu     $sp, $sp, -0x68
+/* 7E26E4 80281864 AFB10044 */  sw        $s1, 0x44($sp)
+/* 7E26E8 80281868 0080882D */  daddu     $s1, $a0, $zero
+/* 7E26EC 8028186C AFBF0064 */  sw        $ra, 0x64($sp)
+/* 7E26F0 80281870 AFBE0060 */  sw        $fp, 0x60($sp)
+/* 7E26F4 80281874 AFB7005C */  sw        $s7, 0x5c($sp)
+/* 7E26F8 80281878 AFB60058 */  sw        $s6, 0x58($sp)
+/* 7E26FC 8028187C AFB50054 */  sw        $s5, 0x54($sp)
+/* 7E2700 80281880 AFB40050 */  sw        $s4, 0x50($sp)
+/* 7E2704 80281884 AFB3004C */  sw        $s3, 0x4c($sp)
+/* 7E2708 80281888 AFB20048 */  sw        $s2, 0x48($sp)
+/* 7E270C 8028188C AFB00040 */  sw        $s0, 0x40($sp)
+/* 7E2710 80281890 8E30000C */  lw        $s0, 0xc($s1)
+/* 7E2714 80281894 8E050000 */  lw        $a1, ($s0)
+/* 7E2718 80281898 0C0B1EAF */  jal       get_variable
+/* 7E271C 8028189C 26100004 */   addiu    $s0, $s0, 4
+/* 7E2720 802818A0 8E050000 */  lw        $a1, ($s0)
+/* 7E2724 802818A4 26100004 */  addiu     $s0, $s0, 4
+/* 7E2728 802818A8 0220202D */  daddu     $a0, $s1, $zero
+/* 7E272C 802818AC 0C0B1EAF */  jal       get_variable
+/* 7E2730 802818B0 0040A82D */   daddu    $s5, $v0, $zero
+/* 7E2734 802818B4 8E050000 */  lw        $a1, ($s0)
+/* 7E2738 802818B8 26100004 */  addiu     $s0, $s0, 4
+/* 7E273C 802818BC 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2740 802818C0 0C0B1EAF */  jal       get_variable
+/* 7E2744 802818C4 0040982D */   daddu    $s3, $v0, $zero
+/* 7E2748 802818C8 0220202D */  daddu     $a0, $s1, $zero
+/* 7E274C 802818CC 8E050000 */  lw        $a1, ($s0)
+/* 7E2750 802818D0 0C0B1EAF */  jal       get_variable
+/* 7E2754 802818D4 0040882D */   daddu    $s1, $v0, $zero
+/* 7E2758 802818D8 2404035C */  addiu     $a0, $zero, 0x35c
+/* 7E275C 802818DC 0C00AB39 */  jal       heap_malloc
+/* 7E2760 802818E0 0040802D */   daddu    $s0, $v0, $zero
+/* 7E2764 802818E4 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 7E2768 802818E8 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 7E276C 802818EC 0040A02D */  daddu     $s4, $v0, $zero
+/* 7E2770 802818F0 AC740144 */  sw        $s4, 0x144($v1)
+/* 7E2774 802818F4 AE950014 */  sw        $s5, 0x14($s4)
+/* 7E2778 802818F8 AE930018 */  sw        $s3, 0x18($s4)
+/* 7E277C 802818FC AE91001C */  sw        $s1, 0x1c($s4)
+/* 7E2780 80281900 AE900024 */  sw        $s0, 0x24($s4)
+/* 7E2784 80281904 8E620000 */  lw        $v0, ($s3)
+/* 7E2788 80281908 10400005 */  beqz      $v0, .L80281920
+/* 7E278C 8028190C 0000902D */   daddu    $s2, $zero, $zero
+.L80281910:
+/* 7E2790 80281910 2673000C */  addiu     $s3, $s3, 0xc
+/* 7E2794 80281914 8E620000 */  lw        $v0, ($s3)
+/* 7E2798 80281918 1440FFFD */  bnez      $v0, .L80281910
+/* 7E279C 8028191C 26520001 */   addiu    $s2, $s2, 1
+.L80281920:
+/* 7E27A0 80281920 A6920002 */  sh        $s2, 2($s4)
+/* 7E27A4 80281924 12200008 */  beqz      $s1, .L80281948
+/* 7E27A8 80281928 0000902D */   daddu    $s2, $zero, $zero
+/* 7E27AC 8028192C 8E220000 */  lw        $v0, ($s1)
+/* 7E27B0 80281930 10400005 */  beqz      $v0, .L80281948
+/* 7E27B4 80281934 00000000 */   nop      
+.L80281938:
+/* 7E27B8 80281938 2631000C */  addiu     $s1, $s1, 0xc
+/* 7E27BC 8028193C 8E220000 */  lw        $v0, ($s1)
+/* 7E27C0 80281940 1440FFFD */  bnez      $v0, .L80281938
+/* 7E27C4 80281944 26520001 */   addiu    $s2, $s2, 1
+.L80281948:
+/* 7E27C8 80281948 86840002 */  lh        $a0, 2($s4)
+/* 7E27CC 8028194C 18800006 */  blez      $a0, .L80281968
+/* 7E27D0 80281950 A6920004 */   sh       $s2, 4($s4)
+/* 7E27D4 80281954 0C00AB39 */  jal       heap_malloc
+/* 7E27D8 80281958 00042100 */   sll      $a0, $a0, 4
+/* 7E27DC 8028195C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 7E27E0 80281960 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 7E27E4 80281964 AC620140 */  sw        $v0, 0x140($v1)
+.L80281968:
+/* 7E27E8 80281968 8E930018 */  lw        $s3, 0x18($s4)
+/* 7E27EC 8028196C 8E620000 */  lw        $v0, ($s3)
+/* 7E27F0 80281970 8E950014 */  lw        $s5, 0x14($s4)
+/* 7E27F4 80281974 10400055 */  beqz      $v0, .L80281ACC
+/* 7E27F8 80281978 0000902D */   daddu    $s2, $zero, $zero
+/* 7E27FC 8028197C 3C1E8007 */  lui       $fp, %hi(gGameStatusPtr)
+/* 7E2800 80281980 27DE419C */  addiu     $fp, $fp, %lo(gGameStatusPtr)
+/* 7E2804 80281984 3C178028 */  lui       $s7, 0x8028
+/* 7E2808 80281988 26F73F58 */  addiu     $s7, $s7, 0x3f58
+/* 7E280C 8028198C 24160003 */  addiu     $s6, $zero, 3
+/* 7E2810 80281990 26B10002 */  addiu     $s1, $s5, 2
+.L80281994:
+/* 7E2814 80281994 27A50028 */  addiu     $a1, $sp, 0x28
+/* 7E2818 80281998 27A6002C */  addiu     $a2, $sp, 0x2c
+/* 7E281C 8028199C 27A70030 */  addiu     $a3, $sp, 0x30
+/* 7E2820 802819A0 96A40000 */  lhu       $a0, ($s5)
+/* 7E2824 802819A4 27A20034 */  addiu     $v0, $sp, 0x34
+/* 7E2828 802819A8 AFA20010 */  sw        $v0, 0x10($sp)
+/* 7E282C 802819AC 27A20038 */  addiu     $v0, $sp, 0x38
+/* 7E2830 802819B0 AFA20014 */  sw        $v0, 0x14($sp)
+/* 7E2834 802819B4 27A2003C */  addiu     $v0, $sp, 0x3c
+/* 7E2838 802819B8 0C046C3B */  jal       get_model_center_and_size
+/* 7E283C 802819BC AFA20018 */   sw       $v0, 0x18($sp)
+/* 7E2840 802819C0 00128100 */  sll       $s0, $s2, 4
+/* 7E2844 802819C4 C7A2002C */  lwc1      $f2, 0x2c($sp)
+/* 7E2848 802819C8 8FC30000 */  lw        $v1, ($fp)
+/* 7E284C 802819CC 3C0140C0 */  lui       $at, 0x40c0
+/* 7E2850 802819D0 44812000 */  mtc1      $at, $f4
+/* 7E2854 802819D4 C7A00028 */  lwc1      $f0, 0x28($sp)
+/* 7E2858 802819D8 8C620140 */  lw        $v0, 0x140($v1)
+/* 7E285C 802819DC 46041080 */  add.s     $f2, $f2, $f4
+/* 7E2860 802819E0 02021021 */  addu      $v0, $s0, $v0
+/* 7E2864 802819E4 E4400004 */  swc1      $f0, 4($v0)
+/* 7E2868 802819E8 8C620140 */  lw        $v0, 0x140($v1)
+/* 7E286C 802819EC 02021021 */  addu      $v0, $s0, $v0
+/* 7E2870 802819F0 E4420008 */  swc1      $f2, 8($v0)
+/* 7E2874 802819F4 8C620140 */  lw        $v0, 0x140($v1)
+/* 7E2878 802819F8 C7A00030 */  lwc1      $f0, 0x30($sp)
+/* 7E287C 802819FC 02021021 */  addu      $v0, $s0, $v0
+/* 7E2880 80281A00 E440000C */  swc1      $f0, 0xc($v0)
+/* 7E2884 80281A04 96A40000 */  lhu       $a0, ($s5)
+/* 7E2888 80281A08 0C046C04 */  jal       get_model_list_index_from_tree_index
+/* 7E288C 80281A0C E7A2002C */   swc1     $f2, 0x2c($sp)
+/* 7E2890 80281A10 0C046B4C */  jal       get_model_from_list_index
+/* 7E2894 80281A14 0040202D */   daddu    $a0, $v0, $zero
+/* 7E2898 80281A18 C7A00028 */  lwc1      $f0, 0x28($sp)
+/* 7E289C 80281A1C C7A2002C */  lwc1      $f2, 0x2c($sp)
+/* 7E28A0 80281A20 94430000 */  lhu       $v1, ($v0)
+/* 7E28A4 80281A24 44050000 */  mfc1      $a1, $f0
+/* 7E28A8 80281A28 44061000 */  mfc1      $a2, $f2
+/* 7E28AC 80281A2C C7A00030 */  lwc1      $f0, 0x30($sp)
+/* 7E28B0 80281A30 34630004 */  ori       $v1, $v1, 4
+/* 7E28B4 80281A34 A4430000 */  sh        $v1, ($v0)
+/* 7E28B8 80281A38 8E630000 */  lw        $v1, ($s3)
+/* 7E28BC 80281A3C 8E840024 */  lw        $a0, 0x24($s4)
+/* 7E28C0 80281A40 24020001 */  addiu     $v0, $zero, 1
+/* 7E28C4 80281A44 AFA20010 */  sw        $v0, 0x10($sp)
+/* 7E28C8 80281A48 AFA00014 */  sw        $zero, 0x14($sp)
+/* 7E28CC 80281A4C 44070000 */  mfc1      $a3, $f0
+/* 7E28D0 80281A50 0C04C6A5 */  jal       make_item_entity_nodelay
+/* 7E28D4 80281A54 00642025 */   or       $a0, $v1, $a0
+/* 7E28D8 80281A58 8FC40000 */  lw        $a0, ($fp)
+/* 7E28DC 80281A5C 8C830140 */  lw        $v1, 0x140($a0)
+/* 7E28E0 80281A60 26B50004 */  addiu     $s5, $s5, 4
+/* 7E28E4 80281A64 02031821 */  addu      $v1, $s0, $v1
+/* 7E28E8 80281A68 AC620000 */  sw        $v0, ($v1)
+/* 7E28EC 80281A6C 8C820140 */  lw        $v0, 0x140($a0)
+/* 7E28F0 80281A70 2673000C */  addiu     $s3, $s3, 0xc
+/* 7E28F4 80281A74 02028021 */  addu      $s0, $s0, $v0
+/* 7E28F8 80281A78 8E040000 */  lw        $a0, ($s0)
+/* 7E28FC 80281A7C 0C04D052 */  jal       set_item_entity_flags
+/* 7E2900 80281A80 24054000 */   addiu    $a1, $zero, 0x4000
+/* 7E2904 80281A84 02E0202D */  daddu     $a0, $s7, $zero
+/* 7E2908 80281A88 24050080 */  addiu     $a1, $zero, 0x80
+/* 7E290C 80281A8C 96260000 */  lhu       $a2, ($s1)
+/* 7E2910 80281A90 0240382D */  daddu     $a3, $s2, $zero
+/* 7E2914 80281A94 AFA00010 */  sw        $zero, 0x10($sp)
+/* 7E2918 80281A98 0C0B10AA */  jal       bind_trigger_1
+/* 7E291C 80281A9C AFB60014 */   sw       $s6, 0x14($sp)
+/* 7E2920 80281AA0 02E0202D */  daddu     $a0, $s7, $zero
+/* 7E2924 80281AA4 24050800 */  addiu     $a1, $zero, 0x800
+/* 7E2928 80281AA8 0240382D */  daddu     $a3, $s2, $zero
+/* 7E292C 80281AAC 96260000 */  lhu       $a2, ($s1)
+/* 7E2930 80281AB0 26310004 */  addiu     $s1, $s1, 4
+/* 7E2934 80281AB4 AFA00010 */  sw        $zero, 0x10($sp)
+/* 7E2938 80281AB8 0C0B10AA */  jal       bind_trigger_1
+/* 7E293C 80281ABC AFB60014 */   sw       $s6, 0x14($sp)
+/* 7E2940 80281AC0 8E620000 */  lw        $v0, ($s3)
+/* 7E2944 80281AC4 1440FFB3 */  bnez      $v0, .L80281994
+/* 7E2948 80281AC8 26520001 */   addiu    $s2, $s2, 1
+.L80281ACC:
+/* 7E294C 80281ACC 3C048008 */  lui       $a0, 0x8008
+/* 7E2950 80281AD0 24840868 */  addiu     $a0, $a0, 0x868
+/* 7E2954 80281AD4 0C050529 */  jal       create_icon
+/* 7E2958 80281AD8 2410FFFF */   addiu    $s0, $zero, -1
+/* 7E295C 80281ADC 0040202D */  daddu     $a0, $v0, $zero
+/* 7E2960 80281AE0 24050080 */  addiu     $a1, $zero, 0x80
+/* 7E2964 80281AE4 0C051280 */  jal       set_icon_flags
+/* 7E2968 80281AE8 AE840020 */   sw       $a0, 0x20($s4)
+/* 7E296C 80281AEC 8E840020 */  lw        $a0, 0x20($s4)
+/* 7E2970 80281AF0 0C05128B */  jal       clear_icon_flags
+/* 7E2974 80281AF4 34058000 */   ori      $a1, $zero, 0x8000
+/* 7E2978 80281AF8 3C058028 */  lui       $a1, %hi(draw_shop_items)
+/* 7E297C 80281AFC 24A51524 */  addiu     $a1, $a1, %lo(draw_shop_items)
+/* 7E2980 80281B00 0C048C8F */  jal       bind_dynamic_entity_7
+/* 7E2984 80281B04 0000202D */   daddu    $a0, $zero, $zero
+/* 7E2988 80281B08 0C048D8F */  jal       get_dynamic_entity
+/* 7E298C 80281B0C 0040202D */   daddu    $a0, $v0, $zero
+/* 7E2990 80281B10 2404000A */  addiu     $a0, $zero, 0xa
+/* 7E2994 80281B14 24050064 */  addiu     $a1, $zero, 0x64
+/* 7E2998 80281B18 24060042 */  addiu     $a2, $zero, 0x42
+/* 7E299C 80281B1C 24070078 */  addiu     $a3, $zero, 0x78
+/* 7E29A0 80281B20 2402001C */  addiu     $v0, $zero, 0x1c
+/* 7E29A4 80281B24 AFA20010 */  sw        $v0, 0x10($sp)
+/* 7E29A8 80281B28 3C028028 */  lui       $v0, 0x8028
+/* 7E29AC 80281B2C 24421434 */  addiu     $v0, $v0, 0x1434
+/* 7E29B0 80281B30 AFA00014 */  sw        $zero, 0x14($sp)
+/* 7E29B4 80281B34 AFA20018 */  sw        $v0, 0x18($sp)
+/* 7E29B8 80281B38 AFA0001C */  sw        $zero, 0x1c($sp)
+/* 7E29BC 80281B3C 0C051F32 */  jal       set_ui_panel_properties
+/* 7E29C0 80281B40 AFB00020 */   sw       $s0, 0x20($sp)
+/* 7E29C4 80281B44 2404000B */  addiu     $a0, $zero, 0xb
+/* 7E29C8 80281B48 24050020 */  addiu     $a1, $zero, 0x20
+/* 7E29CC 80281B4C 240600B8 */  addiu     $a2, $zero, 0xb8
+/* 7E29D0 80281B50 24070100 */  addiu     $a3, $zero, 0x100
+/* 7E29D4 80281B54 00A0102D */  daddu     $v0, $a1, $zero
+/* 7E29D8 80281B58 AFA20010 */  sw        $v0, 0x10($sp)
+/* 7E29DC 80281B5C 24020001 */  addiu     $v0, $zero, 1
+/* 7E29E0 80281B60 AFA20014 */  sw        $v0, 0x14($sp)
+/* 7E29E4 80281B64 3C028028 */  lui       $v0, 0x8028
+/* 7E29E8 80281B68 244214D0 */  addiu     $v0, $v0, 0x14d0
+/* 7E29EC 80281B6C AFA20018 */  sw        $v0, 0x18($sp)
+/* 7E29F0 80281B70 AFA0001C */  sw        $zero, 0x1c($sp)
+/* 7E29F4 80281B74 0C051F32 */  jal       set_ui_panel_properties
+/* 7E29F8 80281B78 AFB00020 */   sw       $s0, 0x20($sp)
+/* 7E29FC 80281B7C 3C048015 */  lui       $a0, 0x8015
+/* 7E2A00 80281B80 2484F150 */  addiu     $a0, $a0, -0xeb0
+/* 7E2A04 80281B84 24030009 */  addiu     $v1, $zero, 9
+/* 7E2A08 80281B88 AC830028 */  sw        $v1, 0x28($a0)
+/* 7E2A0C 80281B8C 24030003 */  addiu     $v1, $zero, 3
+/* 7E2A10 80281B90 AC83002C */  sw        $v1, 0x2c($a0)
+/* 7E2A14 80281B94 AE800008 */  sw        $zero, 8($s4)
+/* 7E2A18 80281B98 AE80000C */  sw        $zero, 0xc($s4)
+/* 7E2A1C 80281B9C A6800000 */  sh        $zero, ($s4)
+/* 7E2A20 80281BA0 AE800010 */  sw        $zero, 0x10($s4)
+/* 7E2A24 80281BA4 8FBF0064 */  lw        $ra, 0x64($sp)
+/* 7E2A28 80281BA8 8FBE0060 */  lw        $fp, 0x60($sp)
+/* 7E2A2C 80281BAC 8FB7005C */  lw        $s7, 0x5c($sp)
+/* 7E2A30 80281BB0 8FB60058 */  lw        $s6, 0x58($sp)
+/* 7E2A34 80281BB4 8FB50054 */  lw        $s5, 0x54($sp)
+/* 7E2A38 80281BB8 8FB40050 */  lw        $s4, 0x50($sp)
+/* 7E2A3C 80281BBC 8FB3004C */  lw        $s3, 0x4c($sp)
+/* 7E2A40 80281BC0 8FB20048 */  lw        $s2, 0x48($sp)
+/* 7E2A44 80281BC4 8FB10044 */  lw        $s1, 0x44($sp)
+/* 7E2A48 80281BC8 8FB00040 */  lw        $s0, 0x40($sp)
+/* 7E2A4C 80281BCC 24020002 */  addiu     $v0, $zero, 2
+/* 7E2A50 80281BD0 03E00008 */  jr        $ra
+/* 7E2A54 80281BD4 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s
new file mode 100644
index 0000000000..f2774454e3
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s
@@ -0,0 +1,22 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel MakeShopOwner
+/* 7E2A58 80281BD8 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E2A5C 80281BDC AFBF0014 */  sw        $ra, 0x14($sp)
+/* 7E2A60 80281BE0 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E2A64 80281BE4 8C82000C */  lw        $v0, 0xc($a0)
+/* 7E2A68 80281BE8 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 7E2A6C 80281BEC 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 7E2A70 80281BF0 8C450000 */  lw        $a1, ($v0)
+/* 7E2A74 80281BF4 0C0B1EAF */  jal       get_variable
+/* 7E2A78 80281BF8 8C700144 */   lw       $s0, 0x144($v1)
+/* 7E2A7C 80281BFC AE020010 */  sw        $v0, 0x10($s0)
+/* 7E2A80 80281C00 8FBF0014 */  lw        $ra, 0x14($sp)
+/* 7E2A84 80281C04 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E2A88 80281C08 24020002 */  addiu     $v0, $zero, 2
+/* 7E2A8C 80281C0C 03E00008 */  jr        $ra
+/* 7E2A90 80281C10 27BD0018 */   addiu    $sp, $sp, 0x18
+/* 7E2A94 80281C14 00000000 */  nop       
+/* 7E2A98 80281C18 00000000 */  nop       
+/* 7E2A9C 80281C1C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s
new file mode 100644
index 0000000000..89553acca3
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s
@@ -0,0 +1,221 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel draw_shop_items
+/* 7E23A4 80281524 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E23A8 80281528 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E23AC 8028152C 27BDFF90 */  addiu     $sp, $sp, -0x70
+/* 7E23B0 80281530 AFBF005C */  sw        $ra, 0x5c($sp)
+/* 7E23B4 80281534 AFBE0058 */  sw        $fp, 0x58($sp)
+/* 7E23B8 80281538 AFB70054 */  sw        $s7, 0x54($sp)
+/* 7E23BC 8028153C AFB60050 */  sw        $s6, 0x50($sp)
+/* 7E23C0 80281540 AFB5004C */  sw        $s5, 0x4c($sp)
+/* 7E23C4 80281544 AFB40048 */  sw        $s4, 0x48($sp)
+/* 7E23C8 80281548 AFB30044 */  sw        $s3, 0x44($sp)
+/* 7E23CC 8028154C AFB20040 */  sw        $s2, 0x40($sp)
+/* 7E23D0 80281550 AFB1003C */  sw        $s1, 0x3c($sp)
+/* 7E23D4 80281554 AFB00038 */  sw        $s0, 0x38($sp)
+/* 7E23D8 80281558 F7B60068 */  sdc1      $f22, 0x68($sp)
+/* 7E23DC 8028155C F7B40060 */  sdc1      $f20, 0x60($sp)
+/* 7E23E0 80281560 8C520144 */  lw        $s2, 0x144($v0)
+/* 7E23E4 80281564 96420000 */  lhu       $v0, ($s2)
+/* 7E23E8 80281568 30420001 */  andi      $v0, $v0, 1
+/* 7E23EC 8028156C 10400005 */  beqz      $v0, .L80281584
+/* 7E23F0 80281570 2404000A */   addiu    $a0, $zero, 0xa
+/* 7E23F4 80281574 3C108014 */  lui       $s0, %hi(D_80147474)
+/* 7E23F8 80281578 26107474 */  addiu     $s0, $s0, %lo(D_80147474)
+/* 7E23FC 8028157C 080A0563 */  j         .L8028158C
+/* 7E2400 80281580 00000000 */   nop      
+.L80281584:
+/* 7E2404 80281584 3C108014 */  lui       $s0, %hi(D_80147574)
+/* 7E2408 80281588 26107574 */  addiu     $s0, $s0, %lo(D_80147574)
+.L8028158C:
+/* 7E240C 8028158C 0C051F9F */  jal       func_80147E7C
+/* 7E2410 80281590 0200282D */   daddu    $a1, $s0, $zero
+/* 7E2414 80281594 2404000B */  addiu     $a0, $zero, 0xb
+/* 7E2418 80281598 0C051F9F */  jal       func_80147E7C
+/* 7E241C 8028159C 0200282D */   daddu    $a1, $s0, $zero
+/* 7E2420 802815A0 96420000 */  lhu       $v0, ($s2)
+/* 7E2424 802815A4 30420001 */  andi      $v0, $v0, 1
+/* 7E2428 802815A8 10400096 */  beqz      $v0, .L80281804
+/* 7E242C 802815AC 00000000 */   nop      
+/* 7E2430 802815B0 3C04800B */  lui       $a0, %hi(gCameras)
+/* 7E2434 802815B4 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
+/* 7E2438 802815B8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E243C 802815BC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E2440 802815C0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 7E2444 802815C4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 7E2448 802815C8 8C5E0140 */  lw        $fp, 0x140($v0)
+/* 7E244C 802815CC 00031080 */  sll       $v0, $v1, 2
+/* 7E2450 802815D0 00431021 */  addu      $v0, $v0, $v1
+/* 7E2454 802815D4 00021080 */  sll       $v0, $v0, 2
+/* 7E2458 802815D8 00431023 */  subu      $v0, $v0, $v1
+/* 7E245C 802815DC 000218C0 */  sll       $v1, $v0, 3
+/* 7E2460 802815E0 00431021 */  addu      $v0, $v0, $v1
+/* 7E2464 802815E4 000210C0 */  sll       $v0, $v0, 3
+/* 7E2468 802815E8 0044A821 */  addu      $s5, $v0, $a0
+/* 7E246C 802815EC 86420002 */  lh        $v0, 2($s2)
+/* 7E2470 802815F0 8E440018 */  lw        $a0, 0x18($s2)
+/* 7E2474 802815F4 18400083 */  blez      $v0, .L80281804
+/* 7E2478 802815F8 0000B82D */   daddu    $s7, $zero, $zero
+/* 7E247C 802815FC 27D4000C */  addiu     $s4, $fp, 0xc
+/* 7E2480 80281600 24960004 */  addiu     $s6, $a0, 4
+/* 7E2484 80281604 3C013F80 */  lui       $at, 0x3f80
+/* 7E2488 80281608 4481B000 */  mtc1      $at, $f22
+/* 7E248C 8028160C 3C013FE0 */  lui       $at, 0x3fe0
+/* 7E2490 80281610 4481A800 */  mtc1      $at, $f21
+/* 7E2494 80281614 4480A000 */  mtc1      $zero, $f20
+.L80281618:
+/* 7E2498 80281618 26A400D4 */  addiu     $a0, $s5, 0xd4
+/* 7E249C 8028161C C686FFF8 */  lwc1      $f6, -8($s4)
+/* 7E24A0 80281620 C682FFFC */  lwc1      $f2, -4($s4)
+/* 7E24A4 80281624 C6840000 */  lwc1      $f4, ($s4)
+/* 7E24A8 80281628 3C0141F0 */  lui       $at, 0x41f0
+/* 7E24AC 8028162C 44810000 */  mtc1      $at, $f0
+/* 7E24B0 80281630 27A20028 */  addiu     $v0, $sp, 0x28
+/* 7E24B4 80281634 AFA20014 */  sw        $v0, 0x14($sp)
+/* 7E24B8 80281638 27A2002C */  addiu     $v0, $sp, 0x2c
+/* 7E24BC 8028163C AFA20018 */  sw        $v0, 0x18($sp)
+/* 7E24C0 80281640 27A20030 */  addiu     $v0, $sp, 0x30
+/* 7E24C4 80281644 AFA2001C */  sw        $v0, 0x1c($sp)
+/* 7E24C8 80281648 46001080 */  add.s     $f2, $f2, $f0
+/* 7E24CC 8028164C 44053000 */  mfc1      $a1, $f6
+/* 7E24D0 80281650 44072000 */  mfc1      $a3, $f4
+/* 7E24D4 80281654 44061000 */  mfc1      $a2, $f2
+/* 7E24D8 80281658 27A20034 */  addiu     $v0, $sp, 0x34
+/* 7E24DC 8028165C E7B60010 */  swc1      $f22, 0x10($sp)
+/* 7E24E0 80281660 0C00A588 */  jal       transform_point
+/* 7E24E4 80281664 AFA20020 */   sw       $v0, 0x20($sp)
+/* 7E24E8 80281668 C7A60034 */  lwc1      $f6, 0x34($sp)
+/* 7E24EC 8028166C C7A00030 */  lwc1      $f0, 0x30($sp)
+/* 7E24F0 80281670 4606B183 */  div.s     $f6, $f22, $f6
+/* 7E24F4 80281674 46060002 */  mul.s     $f0, $f0, $f6
+/* 7E24F8 80281678 00000000 */  nop       
+/* 7E24FC 8028167C 46160000 */  add.s     $f0, $f0, $f22
+/* 7E2500 80281680 46000021 */  cvt.d.s   $f0, $f0
+/* 7E2504 80281684 46340002 */  mul.d     $f0, $f0, $f20
+/* 7E2508 80281688 00000000 */  nop       
+/* 7E250C 8028168C C7A20028 */  lwc1      $f2, 0x28($sp)
+/* 7E2510 80281690 46061202 */  mul.s     $f8, $f2, $f6
+/* 7E2514 80281694 00000000 */  nop       
+/* 7E2518 80281698 C7A4002C */  lwc1      $f4, 0x2c($sp)
+/* 7E251C 8028169C 46003087 */  neg.s     $f2, $f6
+/* 7E2520 802816A0 46022282 */  mul.s     $f10, $f4, $f2
+/* 7E2524 802816A4 00000000 */  nop       
+/* 7E2528 802816A8 44801000 */  mtc1      $zero, $f2
+/* 7E252C 802816AC E7A60034 */  swc1      $f6, 0x34($sp)
+/* 7E2530 802816B0 E7A80028 */  swc1      $f8, 0x28($sp)
+/* 7E2534 802816B4 E7AA002C */  swc1      $f10, 0x2c($sp)
+/* 7E2538 802816B8 46200020 */  cvt.s.d   $f0, $f0
+/* 7E253C 802816BC 4600103C */  c.lt.s    $f2, $f0
+/* 7E2540 802816C0 00000000 */  nop       
+/* 7E2544 802816C4 45000048 */  bc1f      .L802817E8
+/* 7E2548 802816C8 E7A00030 */   swc1     $f0, 0x30($sp)
+/* 7E254C 802816CC 4616003C */  c.lt.s    $f0, $f22
+/* 7E2550 802816D0 00000000 */  nop       
+/* 7E2554 802816D4 45020045 */  bc1fl     .L802817EC
+/* 7E2558 802816D8 26F70001 */   addiu    $s7, $s7, 1
+/* 7E255C 802816DC 86A2000A */  lh        $v0, 0xa($s5)
+/* 7E2560 802816E0 44820000 */  mtc1      $v0, $f0
+/* 7E2564 802816E4 00000000 */  nop       
+/* 7E2568 802816E8 46800020 */  cvt.s.w   $f0, $f0
+/* 7E256C 802816EC 46004102 */  mul.s     $f4, $f8, $f0
+/* 7E2570 802816F0 00000000 */  nop       
+/* 7E2574 802816F4 46002100 */  add.s     $f4, $f4, $f0
+/* 7E2578 802816F8 46002121 */  cvt.d.s   $f4, $f4
+/* 7E257C 802816FC 46342102 */  mul.d     $f4, $f4, $f20
+/* 7E2580 80281700 00000000 */  nop       
+/* 7E2584 80281704 86A2000C */  lh        $v0, 0xc($s5)
+/* 7E2588 80281708 44820000 */  mtc1      $v0, $f0
+/* 7E258C 8028170C 00000000 */  nop       
+/* 7E2590 80281710 46800020 */  cvt.s.w   $f0, $f0
+/* 7E2594 80281714 46005082 */  mul.s     $f2, $f10, $f0
+/* 7E2598 80281718 00000000 */  nop       
+/* 7E259C 8028171C 46001080 */  add.s     $f2, $f2, $f0
+/* 7E25A0 80281720 460010A1 */  cvt.d.s   $f2, $f2
+/* 7E25A4 80281724 46341082 */  mul.d     $f2, $f2, $f20
+/* 7E25A8 80281728 00000000 */  nop       
+/* 7E25AC 8028172C 86A2000E */  lh        $v0, 0xe($s5)
+/* 7E25B0 80281730 44820000 */  mtc1      $v0, $f0
+/* 7E25B4 80281734 00000000 */  nop       
+/* 7E25B8 80281738 46800021 */  cvt.d.w   $f0, $f0
+/* 7E25BC 8028173C 86A20010 */  lh        $v0, 0x10($s5)
+/* 7E25C0 80281740 46202100 */  add.d     $f4, $f4, $f0
+/* 7E25C4 80281744 44820000 */  mtc1      $v0, $f0
+/* 7E25C8 80281748 00000000 */  nop       
+/* 7E25CC 8028174C 46800021 */  cvt.d.w   $f0, $f0
+/* 7E25D0 80281750 8EC20000 */  lw        $v0, ($s6)
+/* 7E25D4 80281754 46201080 */  add.d     $f2, $f2, $f0
+/* 7E25D8 80281758 28420064 */  slti      $v0, $v0, 0x64
+/* 7E25DC 8028175C 4620230D */  trunc.w.d $f12, $f4
+/* 7E25E0 80281760 44116000 */  mfc1      $s1, $f12
+/* 7E25E4 80281764 4620130D */  trunc.w.d $f12, $f2
+/* 7E25E8 80281768 44136000 */  mfc1      $s3, $f12
+/* 7E25EC 8028176C 10400002 */  beqz      $v0, .L80281778
+/* 7E25F0 80281770 0000802D */   daddu    $s0, $zero, $zero
+/* 7E25F4 80281774 2410FFFC */  addiu     $s0, $zero, -4
+.L80281778:
+/* 7E25F8 80281778 0C04C3D6 */  jal       get_item_entity
+/* 7E25FC 8028177C 8FC40000 */   lw       $a0, ($fp)
+/* 7E2600 80281780 8C420000 */  lw        $v0, ($v0)
+/* 7E2604 80281784 30420040 */  andi      $v0, $v0, 0x40
+/* 7E2608 80281788 14400009 */  bnez      $v0, .L802817B0
+/* 7E260C 8028178C 02302821 */   addu     $a1, $s1, $s0
+/* 7E2610 80281790 0260302D */  daddu     $a2, $s3, $zero
+/* 7E2614 80281794 240200FF */  addiu     $v0, $zero, 0xff
+/* 7E2618 80281798 AFA00010 */  sw        $zero, 0x10($sp)
+/* 7E261C 8028179C AFA20014 */  sw        $v0, 0x14($sp)
+/* 7E2620 802817A0 AFA00018 */  sw        $zero, 0x18($sp)
+/* 7E2624 802817A4 8EC40000 */  lw        $a0, ($s6)
+/* 7E2628 802817A8 0C049DA7 */  jal       draw_number
+/* 7E262C 802817AC 24070001 */   addiu    $a3, $zero, 1
+.L802817B0:
+/* 7E2630 802817B0 8E420008 */  lw        $v0, 8($s2)
+/* 7E2634 802817B4 56E2000D */  bnel      $s7, $v0, .L802817EC
+/* 7E2638 802817B8 26F70001 */   addiu    $s7, $s7, 1
+/* 7E263C 802817BC 02302821 */  addu      $a1, $s1, $s0
+/* 7E2640 802817C0 24A5FFFA */  addiu     $a1, $a1, -6
+/* 7E2644 802817C4 8E440020 */  lw        $a0, 0x20($s2)
+/* 7E2648 802817C8 0C051261 */  jal       set_icon_render_pos
+/* 7E264C 802817CC 26660005 */   addiu    $a2, $s3, 5
+/* 7E2650 802817D0 8E440020 */  lw        $a0, 0x20($s2)
+/* 7E2654 802817D4 3C053F33 */  lui       $a1, 0x3f33
+/* 7E2658 802817D8 0C051308 */  jal       func_80144C20
+/* 7E265C 802817DC 34A53333 */   ori      $a1, $a1, 0x3333
+/* 7E2660 802817E0 0C0511EA */  jal       draw_icon_0
+/* 7E2664 802817E4 8E440020 */   lw       $a0, 0x20($s2)
+.L802817E8:
+/* 7E2668 802817E8 26F70001 */  addiu     $s7, $s7, 1
+.L802817EC:
+/* 7E266C 802817EC 26D6000C */  addiu     $s6, $s6, 0xc
+/* 7E2670 802817F0 26940010 */  addiu     $s4, $s4, 0x10
+/* 7E2674 802817F4 86420002 */  lh        $v0, 2($s2)
+/* 7E2678 802817F8 02E2102A */  slt       $v0, $s7, $v0
+/* 7E267C 802817FC 1440FF86 */  bnez      $v0, .L80281618
+/* 7E2680 80281800 27DE0010 */   addiu    $fp, $fp, 0x10
+.L80281804:
+/* 7E2684 80281804 8E420358 */  lw        $v0, 0x358($s2)
+/* 7E2688 80281808 18400003 */  blez      $v0, .L80281818
+/* 7E268C 8028180C 2442FFFF */   addiu    $v0, $v0, -1
+/* 7E2690 80281810 080A060A */  j         .L80281828
+/* 7E2694 80281814 AE420358 */   sw       $v0, 0x358($s2)
+.L80281818:
+/* 7E2698 80281818 96420000 */  lhu       $v0, ($s2)
+/* 7E269C 8028181C 3042FFFE */  andi      $v0, $v0, 0xfffe
+/* 7E26A0 80281820 0C03A640 */  jal       func_800E9900
+/* 7E26A4 80281824 A6420000 */   sh       $v0, ($s2)
+.L80281828:
+/* 7E26A8 80281828 8FBF005C */  lw        $ra, 0x5c($sp)
+/* 7E26AC 8028182C 8FBE0058 */  lw        $fp, 0x58($sp)
+/* 7E26B0 80281830 8FB70054 */  lw        $s7, 0x54($sp)
+/* 7E26B4 80281834 8FB60050 */  lw        $s6, 0x50($sp)
+/* 7E26B8 80281838 8FB5004C */  lw        $s5, 0x4c($sp)
+/* 7E26BC 8028183C 8FB40048 */  lw        $s4, 0x48($sp)
+/* 7E26C0 80281840 8FB30044 */  lw        $s3, 0x44($sp)
+/* 7E26C4 80281844 8FB20040 */  lw        $s2, 0x40($sp)
+/* 7E26C8 80281848 8FB1003C */  lw        $s1, 0x3c($sp)
+/* 7E26CC 8028184C 8FB00038 */  lw        $s0, 0x38($sp)
+/* 7E26D0 80281850 D7B60068 */  ldc1      $f22, 0x68($sp)
+/* 7E26D4 80281854 D7B40060 */  ldc1      $f20, 0x60($sp)
+/* 7E26D8 80281858 03E00008 */  jr        $ra
+/* 7E26DC 8028185C 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
new file mode 100644
index 0000000000..ce58438f1d
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
@@ -0,0 +1,38 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280000
+/* 7E0E80 80280000 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E0E84 80280004 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E0E88 80280008 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E0E8C 8028000C AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E0E90 80280010 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E0E94 80280014 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E0E98 80280018 8C510144 */  lw        $s1, 0x144($v0)
+/* 7E0E9C 8028001C 24050001 */  addiu     $a1, $zero, 1
+/* 7E0EA0 80280020 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E0EA4 80280024 8C430018 */  lw        $v1, 0x18($v0)
+/* 7E0EA8 80280028 00041080 */  sll       $v0, $a0, 2
+/* 7E0EAC 8028002C 3C048028 */  lui       $a0, 0x8028
+/* 7E0EB0 80280030 24843E80 */  addiu     $a0, $a0, 0x3e80
+/* 7E0EB4 80280034 00431021 */  addu      $v0, $v0, $v1
+/* 7E0EB8 80280038 8C500000 */  lw        $s0, ($v0)
+/* 7E0EBC 8028003C 0C0B0CF8 */  jal       start_script
+/* 7E0EC0 80280040 0000302D */   daddu    $a2, $zero, $zero
+/* 7E0EC4 80280044 0040202D */  daddu     $a0, $v0, $zero
+/* 7E0EC8 80280048 AC900084 */  sw        $s0, 0x84($a0)
+/* 7E0ECC 8028004C 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E0ED0 80280050 8C420000 */  lw        $v0, ($v0)
+/* 7E0ED4 80280054 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E0ED8 80280058 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E0EDC 8028005C 8C420008 */  lw        $v0, 8($v0)
+/* 7E0EE0 80280060 AC82008C */  sw        $v0, 0x8c($a0)
+/* 7E0EE4 80280064 8E230010 */  lw        $v1, 0x10($s1)
+/* 7E0EE8 80280068 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E0EEC 8028006C 8C630004 */  lw        $v1, 4($v1)
+/* 7E0EF0 80280070 AC830090 */  sw        $v1, 0x90($a0)
+/* 7E0EF4 80280074 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E0EF8 80280078 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E0EFC 8028007C 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E0F00 80280080 03E00008 */  jr        $ra
+/* 7E0F04 80280084 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
new file mode 100644
index 0000000000..4a75caa116
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
@@ -0,0 +1,68 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280088
+/* 7E0F08 80280088 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E0F0C 8028008C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E0F10 80280090 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E0F14 80280094 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E0F18 80280098 00C0902D */  daddu     $s2, $a2, $zero
+/* 7E0F1C 8028009C AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E0F20 802800A0 00E0882D */  daddu     $s1, $a3, $zero
+/* 7E0F24 802800A4 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E0F28 802800A8 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E0F2C 802800AC AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E0F30 802800B0 8C500144 */  lw        $s0, 0x144($v0)
+/* 7E0F34 802800B4 00041080 */  sll       $v0, $a0, 2
+/* 7E0F38 802800B8 8E030010 */  lw        $v1, 0x10($s0)
+/* 7E0F3C 802800BC 00A0202D */  daddu     $a0, $a1, $zero
+/* 7E0F40 802800C0 8C630018 */  lw        $v1, 0x18($v1)
+/* 7E0F44 802800C4 00431021 */  addu      $v0, $v0, $v1
+/* 7E0F48 802800C8 8C530000 */  lw        $s3, ($v0)
+/* 7E0F4C 802800CC 0C0496CF */  jal       set_message_string
+/* 7E0F50 802800D0 0000282D */   daddu    $a1, $zero, $zero
+/* 7E0F54 802800D4 0240202D */  daddu     $a0, $s2, $zero
+/* 7E0F58 802800D8 0C0496FA */  jal       set_message_value
+/* 7E0F5C 802800DC 24050001 */   addiu    $a1, $zero, 1
+/* 7E0F60 802800E0 1A200005 */  blez      $s1, .L802800F8
+/* 7E0F64 802800E4 0220202D */   daddu    $a0, $s1, $zero
+/* 7E0F68 802800E8 0C0496FA */  jal       set_message_value
+/* 7E0F6C 802800EC 24050002 */   addiu    $a1, $zero, 2
+/* 7E0F70 802800F0 080A0047 */  j         .L8028011C
+/* 7E0F74 802800F4 00000000 */   nop      
+.L802800F8:
+/* 7E0F78 802800F8 3C048015 */  lui       $a0, 0x8015
+/* 7E0F7C 802800FC 2484C290 */  addiu     $a0, $a0, -0x3d70
+/* 7E0F80 80280100 24020001 */  addiu     $v0, $zero, 1
+/* 7E0F84 80280104 16420003 */  bne       $s2, $v0, .L80280114
+/* 7E0F88 80280108 00000000 */   nop      
+/* 7E0F8C 8028010C 3C048015 */  lui       $a0, 0x8015
+/* 7E0F90 80280110 2484C294 */  addiu     $a0, $a0, -0x3d6c
+.L80280114:
+/* 7E0F94 80280114 0C0496CF */  jal       set_message_string
+/* 7E0F98 80280118 24050002 */   addiu    $a1, $zero, 2
+.L8028011C:
+/* 7E0F9C 8028011C 3C048028 */  lui       $a0, 0x8028
+/* 7E0FA0 80280120 24843E80 */  addiu     $a0, $a0, 0x3e80
+/* 7E0FA4 80280124 24050001 */  addiu     $a1, $zero, 1
+/* 7E0FA8 80280128 0C0B0CF8 */  jal       start_script
+/* 7E0FAC 8028012C 0000302D */   daddu    $a2, $zero, $zero
+/* 7E0FB0 80280130 0040202D */  daddu     $a0, $v0, $zero
+/* 7E0FB4 80280134 AC930084 */  sw        $s3, 0x84($a0)
+/* 7E0FB8 80280138 8E020010 */  lw        $v0, 0x10($s0)
+/* 7E0FBC 8028013C 8C420000 */  lw        $v0, ($v0)
+/* 7E0FC0 80280140 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E0FC4 80280144 8E020010 */  lw        $v0, 0x10($s0)
+/* 7E0FC8 80280148 8C420008 */  lw        $v0, 8($v0)
+/* 7E0FCC 8028014C AC82008C */  sw        $v0, 0x8c($a0)
+/* 7E0FD0 80280150 8E030010 */  lw        $v1, 0x10($s0)
+/* 7E0FD4 80280154 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E0FD8 80280158 8C630004 */  lw        $v1, 4($v1)
+/* 7E0FDC 8028015C AC830090 */  sw        $v1, 0x90($a0)
+/* 7E0FE0 80280160 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E0FE4 80280164 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E0FE8 80280168 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E0FEC 8028016C 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E0FF0 80280170 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E0FF4 80280174 03E00008 */  jr        $ra
+/* 7E0FF8 80280178 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
new file mode 100644
index 0000000000..9095827655
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
@@ -0,0 +1,39 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8028017C
+/* 7E0FFC 8028017C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E1000 80280180 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E1004 80280184 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E1008 80280188 AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E100C 8028018C AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E1010 80280190 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E1014 80280194 8C510144 */  lw        $s1, 0x144($v0)
+/* 7E1018 80280198 24050001 */  addiu     $a1, $zero, 1
+/* 7E101C 8028019C 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E1020 802801A0 8C430018 */  lw        $v1, 0x18($v0)
+/* 7E1024 802801A4 00041080 */  sll       $v0, $a0, 2
+/* 7E1028 802801A8 3C048028 */  lui       $a0, 0x8028
+/* 7E102C 802801AC 24843EB0 */  addiu     $a0, $a0, 0x3eb0
+/* 7E1030 802801B0 00431021 */  addu      $v0, $v0, $v1
+/* 7E1034 802801B4 8C500000 */  lw        $s0, ($v0)
+/* 7E1038 802801B8 0C0B0CF8 */  jal       start_script
+/* 7E103C 802801BC 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1040 802801C0 0040202D */  daddu     $a0, $v0, $zero
+/* 7E1044 802801C4 AC900084 */  sw        $s0, 0x84($a0)
+/* 7E1048 802801C8 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E104C 802801CC 8C420000 */  lw        $v0, ($v0)
+/* 7E1050 802801D0 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E1054 802801D4 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E1058 802801D8 8C420008 */  lw        $v0, 8($v0)
+/* 7E105C 802801DC AC82008C */  sw        $v0, 0x8c($a0)
+/* 7E1060 802801E0 8E230010 */  lw        $v1, 0x10($s1)
+/* 7E1064 802801E4 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E1068 802801E8 8C630004 */  lw        $v1, 4($v1)
+/* 7E106C 802801EC AC830090 */  sw        $v1, 0x90($a0)
+/* 7E1070 802801F0 AC83007C */  sw        $v1, 0x7c($a0)
+/* 7E1074 802801F4 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E1078 802801F8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E107C 802801FC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E1080 80280200 03E00008 */  jr        $ra
+/* 7E1084 80280204 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
new file mode 100644
index 0000000000..46bbd922c6
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
@@ -0,0 +1,55 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280208
+/* 7E1088 80280208 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E108C 8028020C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E1090 80280210 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E1094 80280214 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E1098 80280218 00A0802D */  daddu     $s0, $a1, $zero
+/* 7E109C 8028021C AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E10A0 80280220 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E10A4 80280224 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E10A8 80280228 8C510144 */  lw        $s1, 0x144($v0)
+/* 7E10AC 8028022C 0000282D */  daddu     $a1, $zero, $zero
+/* 7E10B0 80280230 8E230010 */  lw        $v1, 0x10($s1)
+/* 7E10B4 80280234 00041080 */  sll       $v0, $a0, 2
+/* 7E10B8 80280238 8C630018 */  lw        $v1, 0x18($v1)
+/* 7E10BC 8028023C 00431021 */  addu      $v0, $v0, $v1
+/* 7E10C0 80280240 8C520000 */  lw        $s2, ($v0)
+/* 7E10C4 80280244 0C0496FA */  jal       set_message_value
+/* 7E10C8 80280248 0200202D */   daddu    $a0, $s0, $zero
+/* 7E10CC 8028024C 3C048015 */  lui       $a0, 0x8015
+/* 7E10D0 80280250 2484C290 */  addiu     $a0, $a0, -0x3d70
+/* 7E10D4 80280254 24020001 */  addiu     $v0, $zero, 1
+/* 7E10D8 80280258 16020003 */  bne       $s0, $v0, .L80280268
+/* 7E10DC 8028025C 00000000 */   nop      
+/* 7E10E0 80280260 3C048015 */  lui       $a0, 0x8015
+/* 7E10E4 80280264 2484C294 */  addiu     $a0, $a0, -0x3d6c
+.L80280268:
+/* 7E10E8 80280268 0C0496CF */  jal       set_message_string
+/* 7E10EC 8028026C 24050001 */   addiu    $a1, $zero, 1
+/* 7E10F0 80280270 3C048028 */  lui       $a0, 0x8028
+/* 7E10F4 80280274 24843EB0 */  addiu     $a0, $a0, 0x3eb0
+/* 7E10F8 80280278 24050001 */  addiu     $a1, $zero, 1
+/* 7E10FC 8028027C 0C0B0CF8 */  jal       start_script
+/* 7E1100 80280280 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1104 80280284 0040202D */  daddu     $a0, $v0, $zero
+/* 7E1108 80280288 AC920084 */  sw        $s2, 0x84($a0)
+/* 7E110C 8028028C 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E1110 80280290 8C420000 */  lw        $v0, ($v0)
+/* 7E1114 80280294 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E1118 80280298 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E111C 8028029C 8C420008 */  lw        $v0, 8($v0)
+/* 7E1120 802802A0 AC82008C */  sw        $v0, 0x8c($a0)
+/* 7E1124 802802A4 8E230010 */  lw        $v1, 0x10($s1)
+/* 7E1128 802802A8 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E112C 802802AC 8C630004 */  lw        $v1, 4($v1)
+/* 7E1130 802802B0 AC830090 */  sw        $v1, 0x90($a0)
+/* 7E1134 802802B4 AC83007C */  sw        $v1, 0x7c($a0)
+/* 7E1138 802802B8 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E113C 802802BC 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E1140 802802C0 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E1144 802802C4 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E1148 802802C8 03E00008 */  jr        $ra
+/* 7E114C 802802CC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
new file mode 100644
index 0000000000..906857ef51
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
@@ -0,0 +1,39 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802802D0
+/* 7E1150 802802D0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E1154 802802D4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E1158 802802D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E115C 802802DC AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E1160 802802E0 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E1164 802802E4 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E1168 802802E8 8C510144 */  lw        $s1, 0x144($v0)
+/* 7E116C 802802EC 24050001 */  addiu     $a1, $zero, 1
+/* 7E1170 802802F0 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E1174 802802F4 8C430018 */  lw        $v1, 0x18($v0)
+/* 7E1178 802802F8 00041080 */  sll       $v0, $a0, 2
+/* 7E117C 802802FC 3C048028 */  lui       $a0, 0x8028
+/* 7E1180 80280300 24843EE0 */  addiu     $a0, $a0, 0x3ee0
+/* 7E1184 80280304 00431021 */  addu      $v0, $v0, $v1
+/* 7E1188 80280308 8C500000 */  lw        $s0, ($v0)
+/* 7E118C 8028030C 0C0B0CF8 */  jal       start_script
+/* 7E1190 80280310 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1194 80280314 0040202D */  daddu     $a0, $v0, $zero
+/* 7E1198 80280318 AC900084 */  sw        $s0, 0x84($a0)
+/* 7E119C 8028031C 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E11A0 80280320 8C420000 */  lw        $v0, ($v0)
+/* 7E11A4 80280324 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E11A8 80280328 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E11AC 8028032C 8C420008 */  lw        $v0, 8($v0)
+/* 7E11B0 80280330 AC82008C */  sw        $v0, 0x8c($a0)
+/* 7E11B4 80280334 8E230010 */  lw        $v1, 0x10($s1)
+/* 7E11B8 80280338 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E11BC 8028033C 8C630004 */  lw        $v1, 4($v1)
+/* 7E11C0 80280340 AC830090 */  sw        $v1, 0x90($a0)
+/* 7E11C4 80280344 AC83007C */  sw        $v1, 0x7c($a0)
+/* 7E11C8 80280348 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E11CC 8028034C 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E11D0 80280350 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E11D4 80280354 03E00008 */  jr        $ra
+/* 7E11D8 80280358 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
new file mode 100644
index 0000000000..148c98a96a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
@@ -0,0 +1,31 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8028035C
+/* 7E11DC 8028035C 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E11E0 80280360 3C048028 */  lui       $a0, 0x8028
+/* 7E11E4 80280364 24843F2C */  addiu     $a0, $a0, 0x3f2c
+/* 7E11E8 80280368 24050001 */  addiu     $a1, $zero, 1
+/* 7E11EC 8028036C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E11F0 80280370 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E11F4 80280374 AFBF0014 */  sw        $ra, 0x14($sp)
+/* 7E11F8 80280378 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E11FC 8028037C 8C500144 */  lw        $s0, 0x144($v0)
+/* 7E1200 80280380 0C0B0CF8 */  jal       start_script
+/* 7E1204 80280384 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1208 80280388 8E030010 */  lw        $v1, 0x10($s0)
+/* 7E120C 8028038C 8C630000 */  lw        $v1, ($v1)
+/* 7E1210 80280390 0040202D */  daddu     $a0, $v0, $zero
+/* 7E1214 80280394 AC830084 */  sw        $v1, 0x84($a0)
+/* 7E1218 80280398 8E020010 */  lw        $v0, 0x10($s0)
+/* 7E121C 8028039C 8C420008 */  lw        $v0, 8($v0)
+/* 7E1220 802803A0 AC820088 */  sw        $v0, 0x88($a0)
+/* 7E1224 802803A4 8E030010 */  lw        $v1, 0x10($s0)
+/* 7E1228 802803A8 8C820144 */  lw        $v0, 0x144($a0)
+/* 7E122C 802803AC 8C630004 */  lw        $v1, 4($v1)
+/* 7E1230 802803B0 AC83008C */  sw        $v1, 0x8c($a0)
+/* 7E1234 802803B4 AC83007C */  sw        $v1, 0x7c($a0)
+/* 7E1238 802803B8 8FBF0014 */  lw        $ra, 0x14($sp)
+/* 7E123C 802803BC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E1240 802803C0 03E00008 */  jr        $ra
+/* 7E1244 802803C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s b/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s
new file mode 100644
index 0000000000..64650b0886
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s
@@ -0,0 +1,24 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802803C8
+/* 7E1248 802803C8 3C058011 */  lui       $a1, %hi(gPlayerStatus)
+/* 7E124C 802803CC 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
+/* 7E1250 802803D0 AC80008C */  sw        $zero, 0x8c($a0)
+/* 7E1254 802803D4 80A300B4 */  lb        $v1, 0xb4($a1)
+/* 7E1258 802803D8 24020004 */  addiu     $v0, $zero, 4
+/* 7E125C 802803DC 10620008 */  beq       $v1, $v0, .L80280400
+/* 7E1260 802803E0 24020008 */   addiu    $v0, $zero, 8
+/* 7E1264 802803E4 10620006 */  beq       $v1, $v0, .L80280400
+/* 7E1268 802803E8 00000000 */   nop      
+/* 7E126C 802803EC 8CA20000 */  lw        $v0, ($a1)
+/* 7E1270 802803F0 30420100 */  andi      $v0, $v0, 0x100
+/* 7E1274 802803F4 14400004 */  bnez      $v0, .L80280408
+/* 7E1278 802803F8 24020001 */   addiu    $v0, $zero, 1
+/* 7E127C 802803FC AC82008C */  sw        $v0, 0x8c($a0)
+.L80280400:
+/* 7E1280 80280400 03E00008 */  jr        $ra
+/* 7E1284 80280404 24020002 */   addiu    $v0, $zero, 2
+.L80280408:
+/* 7E1288 80280408 03E00008 */  jr        $ra
+/* 7E128C 8028040C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
new file mode 100644
index 0000000000..72a3308614
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
@@ -0,0 +1,73 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280410
+/* 7E1290 80280410 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E1294 80280414 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E1298 80280418 3C128007 */  lui       $s2, %hi(gGameStatusPtr)
+/* 7E129C 8028041C 2652419C */  addiu     $s2, $s2, %lo(gGameStatusPtr)
+/* 7E12A0 80280420 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E12A4 80280424 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E12A8 80280428 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E12AC 8028042C 8C82000C */  lw        $v0, 0xc($a0)
+/* 7E12B0 80280430 8E430000 */  lw        $v1, ($s2)
+/* 7E12B4 80280434 8C450000 */  lw        $a1, ($v0)
+/* 7E12B8 80280438 0C0B1EAF */  jal       get_variable
+/* 7E12BC 8028043C 8C700144 */   lw       $s0, 0x144($v1)
+/* 7E12C0 80280440 96030000 */  lhu       $v1, ($s0)
+/* 7E12C4 80280444 30630008 */  andi      $v1, $v1, 8
+/* 7E12C8 80280448 14600022 */  bnez      $v1, .L802804D4
+/* 7E12CC 8028044C 0040882D */   daddu    $s1, $v0, $zero
+/* 7E12D0 80280450 96020000 */  lhu       $v0, ($s0)
+/* 7E12D4 80280454 AE110008 */  sw        $s1, 8($s0)
+/* 7E12D8 80280458 34420001 */  ori       $v0, $v0, 1
+/* 7E12DC 8028045C 0C03A63B */  jal       func_800E98EC
+/* 7E12E0 80280460 A6020000 */   sh       $v0, ($s0)
+/* 7E12E4 80280464 8E430000 */  lw        $v1, ($s2)
+/* 7E12E8 80280468 24020005 */  addiu     $v0, $zero, 5
+/* 7E12EC 8028046C AE020358 */  sw        $v0, 0x358($s0)
+/* 7E12F0 80280470 8C620010 */  lw        $v0, 0x10($v1)
+/* 7E12F4 80280474 30428000 */  andi      $v0, $v0, 0x8000
+/* 7E12F8 80280478 10400022 */  beqz      $v0, .L80280504
+/* 7E12FC 8028047C 24020002 */   addiu    $v0, $zero, 2
+/* 7E1300 80280480 0C03805E */  jal       disable_player_input
+/* 7E1304 80280484 00000000 */   nop      
+/* 7E1308 80280488 0C038045 */  jal       disable_player_static_collisions
+/* 7E130C 8028048C 00000000 */   nop      
+/* 7E1310 80280490 3C048028 */  lui       $a0, 0x8028
+/* 7E1314 80280494 24844034 */  addiu     $a0, $a0, 0x4034
+/* 7E1318 80280498 24050001 */  addiu     $a1, $zero, 1
+/* 7E131C 8028049C 0C0B0CF8 */  jal       start_script
+/* 7E1320 802804A0 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1324 802804A4 0040182D */  daddu     $v1, $v0, $zero
+/* 7E1328 802804A8 8C650144 */  lw        $a1, 0x144($v1)
+/* 7E132C 802804AC AC710084 */  sw        $s1, 0x84($v1)
+/* 7E1330 802804B0 96040000 */  lhu       $a0, ($s0)
+/* 7E1334 802804B4 0000102D */  daddu     $v0, $zero, $zero
+/* 7E1338 802804B8 3C018028 */  lui       $at, 0x8028
+/* 7E133C 802804BC AC236520 */  sw        $v1, 0x6520($at)
+/* 7E1340 802804C0 34840008 */  ori       $a0, $a0, 8
+/* 7E1344 802804C4 3C018028 */  lui       $at, 0x8028
+/* 7E1348 802804C8 AC256524 */  sw        $a1, 0x6524($at)
+/* 7E134C 802804CC 080A0141 */  j         .L80280504
+/* 7E1350 802804D0 A6040000 */   sh       $a0, ($s0)
+.L802804D4:
+/* 7E1354 802804D4 3C048028 */  lui       $a0, 0x8028
+/* 7E1358 802804D8 0C0B1059 */  jal       does_script_exist
+/* 7E135C 802804DC 8C846524 */   lw       $a0, 0x6524($a0)
+/* 7E1360 802804E0 54400008 */  bnel      $v0, $zero, .L80280504
+/* 7E1364 802804E4 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1368 802804E8 96020000 */  lhu       $v0, ($s0)
+/* 7E136C 802804EC 3042FFF7 */  andi      $v0, $v0, 0xfff7
+/* 7E1370 802804F0 0C038050 */  jal       enable_player_static_collisions
+/* 7E1374 802804F4 A6020000 */   sh       $v0, ($s0)
+/* 7E1378 802804F8 0C038069 */  jal       enable_player_input
+/* 7E137C 802804FC 00000000 */   nop      
+/* 7E1380 80280500 24020002 */  addiu     $v0, $zero, 2
+.L80280504:
+/* 7E1384 80280504 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E1388 80280508 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E138C 8028050C 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E1390 80280510 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E1394 80280514 03E00008 */  jr        $ra
+/* 7E1398 80280518 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
new file mode 100644
index 0000000000..404aecf0a1
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
@@ -0,0 +1,297 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8028051C
+/* 7E139C 8028051C 27BDFFD0 */  addiu     $sp, $sp, -0x30
+/* 7E13A0 80280520 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E13A4 80280524 0080982D */  daddu     $s3, $a0, $zero
+/* 7E13A8 80280528 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E13AC 8028052C 00A0802D */  daddu     $s0, $a1, $zero
+/* 7E13B0 80280530 AFB60028 */  sw        $s6, 0x28($sp)
+/* 7E13B4 80280534 3C168011 */  lui       $s6, %hi(gPlayerData)
+/* 7E13B8 80280538 26D6F290 */  addiu     $s6, $s6, %lo(gPlayerData)
+/* 7E13BC 8028053C AFBF002C */  sw        $ra, 0x2c($sp)
+/* 7E13C0 80280540 AFB50024 */  sw        $s5, 0x24($sp)
+/* 7E13C4 80280544 AFB40020 */  sw        $s4, 0x20($sp)
+/* 7E13C8 80280548 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E13CC 8028054C AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E13D0 80280550 8E750084 */  lw        $s5, 0x84($s3)
+/* 7E13D4 80280554 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 7E13D8 80280558 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 7E13DC 8028055C 00151040 */  sll       $v0, $s5, 1
+/* 7E13E0 80280560 8C740144 */  lw        $s4, 0x144($v1)
+/* 7E13E4 80280564 00551021 */  addu      $v0, $v0, $s5
+/* 7E13E8 80280568 8E830018 */  lw        $v1, 0x18($s4)
+/* 7E13EC 8028056C 00021080 */  sll       $v0, $v0, 2
+/* 7E13F0 80280570 00629021 */  addu      $s2, $v1, $v0
+/* 7E13F4 80280574 96820000 */  lhu       $v0, ($s4)
+/* 7E13F8 80280578 8E430000 */  lw        $v1, ($s2)
+/* 7E13FC 8028057C 3042FFFE */  andi      $v0, $v0, 0xfffe
+/* 7E1400 80280580 A6820000 */  sh        $v0, ($s4)
+/* 7E1404 80280584 3C028008 */  lui       $v0, %hi(gItemTable)
+/* 7E1408 80280588 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
+/* 7E140C 8028058C 00031940 */  sll       $v1, $v1, 5
+/* 7E1410 80280590 0C03A640 */  jal       func_800E9900
+/* 7E1414 80280594 00628821 */   addu     $s1, $v1, $v0
+/* 7E1418 80280598 1200001B */  beqz      $s0, .L80280608
+/* 7E141C 8028059C 00000000 */   nop      
+/* 7E1420 802805A0 96220018 */  lhu       $v0, 0x18($s1)
+/* 7E1424 802805A4 3C018028 */  lui       $at, 0x8028
+/* 7E1428 802805A8 AC206530 */  sw        $zero, 0x6530($at)
+/* 7E142C 802805AC 3C018028 */  lui       $at, 0x8028
+/* 7E1430 802805B0 AC206534 */  sw        $zero, 0x6534($at)
+/* 7E1434 802805B4 30420040 */  andi      $v0, $v0, 0x40
+/* 7E1438 802805B8 10400008 */  beqz      $v0, .L802805DC
+/* 7E143C 802805BC 2407FFFF */   addiu    $a3, $zero, -1
+/* 7E1440 802805C0 9223001A */  lbu       $v1, 0x1a($s1)
+/* 7E1444 802805C4 00031080 */  sll       $v0, $v1, 2
+/* 7E1448 802805C8 00431021 */  addu      $v0, $v0, $v1
+/* 7E144C 802805CC 00021080 */  sll       $v0, $v0, 2
+/* 7E1450 802805D0 3C078009 */  lui       $a3, 0x8009
+/* 7E1454 802805D4 00E23821 */  addu      $a3, $a3, $v0
+/* 7E1458 802805D8 80E7F072 */  lb        $a3, -0xf8e($a3)
+.L802805DC:
+/* 7E145C 802805DC 8E250000 */  lw        $a1, ($s1)
+/* 7E1460 802805E0 8E460004 */  lw        $a2, 4($s2)
+/* 7E1464 802805E4 0C0A0022 */  jal       func_80280088
+/* 7E1468 802805E8 0000202D */   daddu    $a0, $zero, $zero
+/* 7E146C 802805EC AE620074 */  sw        $v0, 0x74($s3)
+/* 7E1470 802805F0 0C03A6D5 */  jal       increment_status_menu_disabled
+/* 7E1474 802805F4 AE600070 */   sw       $zero, 0x70($s3)
+/* 7E1478 802805F8 0C03A640 */  jal       func_800E9900
+/* 7E147C 802805FC 00000000 */   nop      
+/* 7E1480 80280600 0C03A546 */  jal       show_coin_counter
+/* 7E1484 80280604 00000000 */   nop      
+.L80280608:
+/* 7E1488 80280608 8E630070 */  lw        $v1, 0x70($s3)
+/* 7E148C 8028060C 24100005 */  addiu     $s0, $zero, 5
+/* 7E1490 80280610 10700085 */  beq       $v1, $s0, .L80280828
+/* 7E1494 80280614 28620006 */   slti     $v0, $v1, 6
+/* 7E1498 80280618 1040000D */  beqz      $v0, .L80280650
+/* 7E149C 8028061C 24020001 */   addiu    $v0, $zero, 1
+/* 7E14A0 80280620 1062006D */  beq       $v1, $v0, .L802807D8
+/* 7E14A4 80280624 28620002 */   slti     $v0, $v1, 2
+/* 7E14A8 80280628 10400005 */  beqz      $v0, .L80280640
+/* 7E14AC 8028062C 24020004 */   addiu    $v0, $zero, 4
+/* 7E14B0 80280630 10600017 */  beqz      $v1, .L80280690
+/* 7E14B4 80280634 0000102D */   daddu    $v0, $zero, $zero
+/* 7E14B8 80280638 080A024B */  j         .L8028092C
+/* 7E14BC 8028063C 00000000 */   nop      
+.L80280640:
+/* 7E14C0 80280640 1062006F */  beq       $v1, $v0, .L80280800
+/* 7E14C4 80280644 0000102D */   daddu    $v0, $zero, $zero
+/* 7E14C8 80280648 080A024B */  j         .L8028092C
+/* 7E14CC 8028064C 00000000 */   nop      
+.L80280650:
+/* 7E14D0 80280650 2410000A */  addiu     $s0, $zero, 0xa
+/* 7E14D4 80280654 10700091 */  beq       $v1, $s0, .L8028089C
+/* 7E14D8 80280658 2862000B */   slti     $v0, $v1, 0xb
+/* 7E14DC 8028065C 10400005 */  beqz      $v0, .L80280674
+/* 7E14E0 80280660 24020006 */   addiu    $v0, $zero, 6
+/* 7E14E4 80280664 1062007F */  beq       $v1, $v0, .L80280864
+/* 7E14E8 80280668 0000102D */   daddu    $v0, $zero, $zero
+/* 7E14EC 8028066C 080A024B */  j         .L8028092C
+/* 7E14F0 80280670 00000000 */   nop      
+.L80280674:
+/* 7E14F4 80280674 2402000B */  addiu     $v0, $zero, 0xb
+/* 7E14F8 80280678 1062009D */  beq       $v1, $v0, .L802808F0
+/* 7E14FC 8028067C 24020064 */   addiu    $v0, $zero, 0x64
+/* 7E1500 80280680 10620012 */  beq       $v1, $v0, .L802806CC
+/* 7E1504 80280684 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1508 80280688 080A024B */  j         .L8028092C
+/* 7E150C 8028068C 00000000 */   nop      
+.L80280690:
+/* 7E1510 80280690 0C0B1059 */  jal       does_script_exist
+/* 7E1514 80280694 8E640074 */   lw       $a0, 0x74($s3)
+/* 7E1518 80280698 144000A4 */  bnez      $v0, .L8028092C
+/* 7E151C 8028069C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1520 802806A0 3C04001E */  lui       $a0, 0x1e
+/* 7E1524 802806A4 34840001 */  ori       $a0, $a0, 1
+/* 7E1528 802806A8 26650078 */  addiu     $a1, $s3, 0x78
+/* 7E152C 802806AC 24020064 */  addiu     $v0, $zero, 0x64
+/* 7E1530 802806B0 AE620070 */  sw        $v0, 0x70($s3)
+/* 7E1534 802806B4 0C049640 */  jal       load_string
+/* 7E1538 802806B8 AE600078 */   sw       $zero, 0x78($s3)
+/* 7E153C 802806BC 3C018028 */  lui       $at, 0x8028
+/* 7E1540 802806C0 AC226528 */  sw        $v0, 0x6528($at)
+/* 7E1544 802806C4 080A024B */  j         .L8028092C
+/* 7E1548 802806C8 0000102D */   daddu    $v0, $zero, $zero
+.L802806CC:
+/* 7E154C 802806CC 8E700078 */  lw        $s0, 0x78($s3)
+/* 7E1550 802806D0 24020001 */  addiu     $v0, $zero, 1
+/* 7E1554 802806D4 16020095 */  bne       $s0, $v0, .L8028092C
+/* 7E1558 802806D8 0000102D */   daddu    $v0, $zero, $zero
+/* 7E155C 802806DC 3C028028 */  lui       $v0, 0x8028
+/* 7E1560 802806E0 8C426528 */  lw        $v0, 0x6528($v0)
+/* 7E1564 802806E4 904204E8 */  lbu       $v0, 0x4e8($v0)
+/* 7E1568 802806E8 14400035 */  bnez      $v0, .L802807C0
+/* 7E156C 802806EC 00000000 */   nop      
+/* 7E1570 802806F0 86C2000C */  lh        $v0, 0xc($s6)
+/* 7E1574 802806F4 8E430004 */  lw        $v1, 4($s2)
+/* 7E1578 802806F8 0043102A */  slt       $v0, $v0, $v1
+/* 7E157C 802806FC 10400006 */  beqz      $v0, .L80280718
+/* 7E1580 80280700 00000000 */   nop      
+/* 7E1584 80280704 0C0A005F */  jal       func_8028017C
+/* 7E1588 80280708 24040001 */   addiu    $a0, $zero, 1
+/* 7E158C 8028070C AE620074 */  sw        $v0, 0x74($s3)
+/* 7E1590 80280710 080A024A */  j         .L80280928
+/* 7E1594 80280714 AE700070 */   sw       $s0, 0x70($s3)
+.L80280718:
+/* 7E1598 80280718 8E420000 */  lw        $v0, ($s2)
+/* 7E159C 8028071C 2442FF20 */  addiu     $v0, $v0, -0xe0
+/* 7E15A0 80280720 2C420075 */  sltiu     $v0, $v0, 0x75
+/* 7E15A4 80280724 1440000C */  bnez      $v0, .L80280758
+/* 7E15A8 80280728 00000000 */   nop      
+/* 7E15AC 8028072C 0C039D5D */  jal       add_item
+/* 7E15B0 80280730 0000202D */   daddu    $a0, $zero, $zero
+/* 7E15B4 80280734 2403FFFF */  addiu     $v1, $zero, -1
+/* 7E15B8 80280738 14430007 */  bne       $v0, $v1, .L80280758
+/* 7E15BC 8028073C 00000000 */   nop      
+/* 7E15C0 80280740 0C0A005F */  jal       func_8028017C
+/* 7E15C4 80280744 24040002 */   addiu    $a0, $zero, 2
+/* 7E15C8 80280748 AE620074 */  sw        $v0, 0x74($s3)
+/* 7E15CC 8028074C 24020004 */  addiu     $v0, $zero, 4
+/* 7E15D0 80280750 080A024A */  j         .L80280928
+/* 7E15D4 80280754 AE620070 */   sw       $v0, 0x70($s3)
+.L80280758:
+/* 7E15D8 80280758 96C2000C */  lhu       $v0, 0xc($s6)
+/* 7E15DC 8028075C 96430006 */  lhu       $v1, 6($s2)
+/* 7E15E0 80280760 00431023 */  subu      $v0, $v0, $v1
+/* 7E15E4 80280764 A6C2000C */  sh        $v0, 0xc($s6)
+/* 7E15E8 80280768 8E440000 */  lw        $a0, ($s2)
+/* 7E15EC 8028076C 2482FF20 */  addiu     $v0, $a0, -0xe0
+/* 7E15F0 80280770 2C420075 */  sltiu     $v0, $v0, 0x75
+/* 7E15F4 80280774 1040000A */  beqz      $v0, .L802807A0
+/* 7E15F8 80280778 00000000 */   nop      
+/* 7E15FC 8028077C 0C039DCF */  jal       add_badge
+/* 7E1600 80280780 00000000 */   nop      
+/* 7E1604 80280784 0000202D */  daddu     $a0, $zero, $zero
+/* 7E1608 80280788 3C05F840 */  lui       $a1, 0xf840
+/* 7E160C 8028078C 34A55CF0 */  ori       $a1, $a1, 0x5cf0
+/* 7E1610 80280790 0C0B2026 */  jal       set_variable
+/* 7E1614 80280794 24060001 */   addiu    $a2, $zero, 1
+/* 7E1618 80280798 080A01EA */  j         .L802807A8
+/* 7E161C 8028079C 00000000 */   nop      
+.L802807A0:
+/* 7E1620 802807A0 0C039D5D */  jal       add_item
+/* 7E1624 802807A4 00000000 */   nop      
+.L802807A8:
+/* 7E1628 802807A8 0C0A005F */  jal       func_8028017C
+/* 7E162C 802807AC 24040003 */   addiu    $a0, $zero, 3
+/* 7E1630 802807B0 AE620074 */  sw        $v0, 0x74($s3)
+/* 7E1634 802807B4 24020005 */  addiu     $v0, $zero, 5
+/* 7E1638 802807B8 080A024A */  j         .L80280928
+/* 7E163C 802807BC AE620070 */   sw       $v0, 0x70($s3)
+.L802807C0:
+/* 7E1640 802807C0 0C0A00B4 */  jal       func_802802D0
+/* 7E1644 802807C4 24040016 */   addiu    $a0, $zero, 0x16
+/* 7E1648 802807C8 AE620074 */  sw        $v0, 0x74($s3)
+/* 7E164C 802807CC 24020006 */  addiu     $v0, $zero, 6
+/* 7E1650 802807D0 080A024A */  j         .L80280928
+/* 7E1654 802807D4 AE620070 */   sw       $v0, 0x70($s3)
+.L802807D8:
+/* 7E1658 802807D8 8E640074 */  lw        $a0, 0x74($s3)
+/* 7E165C 802807DC 0C0B1059 */  jal       does_script_exist
+/* 7E1660 802807E0 00000000 */   nop      
+/* 7E1664 802807E4 14400051 */  bnez      $v0, .L8028092C
+/* 7E1668 802807E8 0000102D */   daddu    $v0, $zero, $zero
+/* 7E166C 802807EC 8E430000 */  lw        $v1, ($s2)
+/* 7E1670 802807F0 3C018028 */  lui       $at, 0x8028
+/* 7E1674 802807F4 AC206534 */  sw        $zero, 0x6534($at)
+/* 7E1678 802807F8 080A0214 */  j         .L80280850
+/* 7E167C 802807FC 2402000A */   addiu    $v0, $zero, 0xa
+.L80280800:
+/* 7E1680 80280800 8E640074 */  lw        $a0, 0x74($s3)
+/* 7E1684 80280804 0C0B1059 */  jal       does_script_exist
+/* 7E1688 80280808 00000000 */   nop      
+/* 7E168C 8028080C 14400047 */  bnez      $v0, .L8028092C
+/* 7E1690 80280810 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1694 80280814 8E430000 */  lw        $v1, ($s2)
+/* 7E1698 80280818 3C018028 */  lui       $at, 0x8028
+/* 7E169C 8028081C AC306534 */  sw        $s0, 0x6534($at)
+/* 7E16A0 80280820 080A0214 */  j         .L80280850
+/* 7E16A4 80280824 2402000A */   addiu    $v0, $zero, 0xa
+.L80280828:
+/* 7E16A8 80280828 8E640074 */  lw        $a0, 0x74($s3)
+/* 7E16AC 8028082C 0C0B1059 */  jal       does_script_exist
+/* 7E16B0 80280830 00000000 */   nop      
+/* 7E16B4 80280834 1440003D */  bnez      $v0, .L8028092C
+/* 7E16B8 80280838 0000102D */   daddu    $v0, $zero, $zero
+/* 7E16BC 8028083C 8E430000 */  lw        $v1, ($s2)
+/* 7E16C0 80280840 24020001 */  addiu     $v0, $zero, 1
+/* 7E16C4 80280844 3C018028 */  lui       $at, 0x8028
+/* 7E16C8 80280848 AC226534 */  sw        $v0, 0x6534($at)
+/* 7E16CC 8028084C 2402000A */  addiu     $v0, $zero, 0xa
+.L80280850:
+/* 7E16D0 80280850 AE620070 */  sw        $v0, 0x70($s3)
+/* 7E16D4 80280854 3C018028 */  lui       $at, 0x8028
+/* 7E16D8 80280858 AC236530 */  sw        $v1, 0x6530($at)
+/* 7E16DC 8028085C 080A024B */  j         .L8028092C
+/* 7E16E0 80280860 0000102D */   daddu    $v0, $zero, $zero
+.L80280864:
+/* 7E16E4 80280864 8E640074 */  lw        $a0, 0x74($s3)
+/* 7E16E8 80280868 0C0B1059 */  jal       does_script_exist
+/* 7E16EC 8028086C 00000000 */   nop      
+/* 7E16F0 80280870 1440002E */  bnez      $v0, .L8028092C
+/* 7E16F4 80280874 0000102D */   daddu    $v0, $zero, $zero
+/* 7E16F8 80280878 8E430000 */  lw        $v1, ($s2)
+/* 7E16FC 8028087C 24020003 */  addiu     $v0, $zero, 3
+/* 7E1700 80280880 3C018028 */  lui       $at, 0x8028
+/* 7E1704 80280884 AC226534 */  sw        $v0, 0x6534($at)
+/* 7E1708 80280888 AE700070 */  sw        $s0, 0x70($s3)
+/* 7E170C 8028088C 3C018028 */  lui       $at, 0x8028
+/* 7E1710 80280890 AC236530 */  sw        $v1, 0x6530($at)
+/* 7E1714 80280894 080A024B */  j         .L8028092C
+/* 7E1718 80280898 0000102D */   daddu    $v0, $zero, $zero
+.L8028089C:
+/* 7E171C 8028089C 8E820010 */  lw        $v0, 0x10($s4)
+/* 7E1720 802808A0 3C108028 */  lui       $s0, 0x8028
+/* 7E1724 802808A4 2610652C */  addiu     $s0, $s0, 0x652c
+/* 7E1728 802808A8 1040000E */  beqz      $v0, .L802808E4
+/* 7E172C 802808AC AE000000 */   sw       $zero, ($s0)
+/* 7E1730 802808B0 8C44000C */  lw        $a0, 0xc($v0)
+/* 7E1734 802808B4 1080000B */  beqz      $a0, .L802808E4
+/* 7E1738 802808B8 24050001 */   addiu    $a1, $zero, 1
+/* 7E173C 802808BC 0C0B0CF8 */  jal       start_script
+/* 7E1740 802808C0 0000302D */   daddu    $a2, $zero, $zero
+/* 7E1744 802808C4 3C038028 */  lui       $v1, 0x8028
+/* 7E1748 802808C8 8C636534 */  lw        $v1, 0x6534($v1)
+/* 7E174C 802808CC 3C048028 */  lui       $a0, 0x8028
+/* 7E1750 802808D0 8C846530 */  lw        $a0, 0x6530($a0)
+/* 7E1754 802808D4 AE020000 */  sw        $v0, ($s0)
+/* 7E1758 802808D8 AC55008C */  sw        $s5, 0x8c($v0)
+/* 7E175C 802808DC AC430084 */  sw        $v1, 0x84($v0)
+/* 7E1760 802808E0 AC440088 */  sw        $a0, 0x88($v0)
+.L802808E4:
+/* 7E1764 802808E4 2402000B */  addiu     $v0, $zero, 0xb
+/* 7E1768 802808E8 080A024A */  j         .L80280928
+/* 7E176C 802808EC AE620070 */   sw       $v0, 0x70($s3)
+.L802808F0:
+/* 7E1770 802808F0 3C028028 */  lui       $v0, 0x8028
+/* 7E1774 802808F4 8C42652C */  lw        $v0, 0x652c($v0)
+/* 7E1778 802808F8 10400005 */  beqz      $v0, .L80280910
+/* 7E177C 802808FC 00000000 */   nop      
+/* 7E1780 80280900 0C0B1059 */  jal       does_script_exist
+/* 7E1784 80280904 8C440144 */   lw       $a0, 0x144($v0)
+/* 7E1788 80280908 14400008 */  bnez      $v0, .L8028092C
+/* 7E178C 8028090C 0000102D */   daddu    $v0, $zero, $zero
+.L80280910:
+/* 7E1790 80280910 0C03A6CC */  jal       decrement_status_menu_disabled
+/* 7E1794 80280914 00000000 */   nop      
+/* 7E1798 80280918 0C03A5B2 */  jal       func_800E96C8
+/* 7E179C 8028091C 00000000 */   nop      
+/* 7E17A0 80280920 080A024B */  j         .L8028092C
+/* 7E17A4 80280924 24020001 */   addiu    $v0, $zero, 1
+.L80280928:
+/* 7E17A8 80280928 0000102D */  daddu     $v0, $zero, $zero
+.L8028092C:
+/* 7E17AC 8028092C 8FBF002C */  lw        $ra, 0x2c($sp)
+/* 7E17B0 80280930 8FB60028 */  lw        $s6, 0x28($sp)
+/* 7E17B4 80280934 8FB50024 */  lw        $s5, 0x24($sp)
+/* 7E17B8 80280938 8FB40020 */  lw        $s4, 0x20($sp)
+/* 7E17BC 8028093C 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E17C0 80280940 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E17C4 80280944 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E17C8 80280948 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E17CC 8028094C 03E00008 */  jr        $ra
+/* 7E17D0 80280950 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
new file mode 100644
index 0000000000..17da75e86e
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
@@ -0,0 +1,104 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280954
+/* 7E17D4 80280954 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E17D8 80280958 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E17DC 8028095C 27BDFFC0 */  addiu     $sp, $sp, -0x40
+/* 7E17E0 80280960 AFBF003C */  sw        $ra, 0x3c($sp)
+/* 7E17E4 80280964 AFBE0038 */  sw        $fp, 0x38($sp)
+/* 7E17E8 80280968 AFB70034 */  sw        $s7, 0x34($sp)
+/* 7E17EC 8028096C AFB60030 */  sw        $s6, 0x30($sp)
+/* 7E17F0 80280970 AFB5002C */  sw        $s5, 0x2c($sp)
+/* 7E17F4 80280974 AFB40028 */  sw        $s4, 0x28($sp)
+/* 7E17F8 80280978 AFB30024 */  sw        $s3, 0x24($sp)
+/* 7E17FC 8028097C AFB20020 */  sw        $s2, 0x20($sp)
+/* 7E1800 80280980 AFB1001C */  sw        $s1, 0x1c($sp)
+/* 7E1804 80280984 AFB00018 */  sw        $s0, 0x18($sp)
+/* 7E1808 80280988 8C420144 */  lw        $v0, 0x144($v0)
+/* 7E180C 8028098C 0080B82D */  daddu     $s7, $a0, $zero
+/* 7E1810 80280990 24420028 */  addiu     $v0, $v0, 0x28
+/* 7E1814 80280994 12E00006 */  beqz      $s7, .L802809B0
+/* 7E1818 80280998 AFA20010 */   sw       $v0, 0x10($sp)
+/* 7E181C 8028099C 24020001 */  addiu     $v0, $zero, 1
+/* 7E1820 802809A0 12E20006 */  beq       $s7, $v0, .L802809BC
+/* 7E1824 802809A4 24150007 */   addiu    $s5, $zero, 7
+/* 7E1828 802809A8 080A0271 */  j         .L802809C4
+/* 7E182C 802809AC 24140020 */   addiu    $s4, $zero, 0x20
+.L802809B0:
+/* 7E1830 802809B0 24150005 */  addiu     $s5, $zero, 5
+/* 7E1834 802809B4 080A0271 */  j         .L802809C4
+/* 7E1838 802809B8 2414000A */   addiu    $s4, $zero, 0xa
+.L802809BC:
+/* 7E183C 802809BC 24150006 */  addiu     $s5, $zero, 6
+/* 7E1840 802809C0 2414000A */  addiu     $s4, $zero, 0xa
+.L802809C4:
+/* 7E1844 802809C4 0000902D */  daddu     $s2, $zero, $zero
+/* 7E1848 802809C8 12800027 */  beqz      $s4, .L80280A68
+/* 7E184C 802809CC 0240982D */   daddu    $s3, $s2, $zero
+/* 7E1850 802809D0 2AFE0002 */  slti      $fp, $s7, 2
+/* 7E1854 802809D4 3C168008 */  lui       $s6, %hi(gItemTable)
+/* 7E1858 802809D8 26D678E0 */  addiu     $s6, $s6, %lo(gItemTable)
+/* 7E185C 802809DC 3C118011 */  lui       $s1, %hi(gPlayerData)
+/* 7E1860 802809E0 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
+/* 7E1864 802809E4 8FB00010 */  lw        $s0, 0x10($sp)
+.L802809E8:
+/* 7E1868 802809E8 13C00005 */  beqz      $fp, .L80280A00
+/* 7E186C 802809EC 00000000 */   nop      
+/* 7E1870 802809F0 06E00003 */  bltz      $s7, .L80280A00
+/* 7E1874 802809F4 00000000 */   nop      
+/* 7E1878 802809F8 080A0281 */  j         .L80280A04
+/* 7E187C 802809FC 862401B4 */   lh       $a0, 0x1b4($s1)
+.L80280A00:
+/* 7E1880 80280A00 862401C8 */  lh        $a0, 0x1c8($s1)
+.L80280A04:
+/* 7E1884 80280A04 10800014 */  beqz      $a0, .L80280A58
+/* 7E1888 80280A08 00041140 */   sll      $v0, $a0, 5
+/* 7E188C 80280A0C 00561821 */  addu      $v1, $v0, $s6
+/* 7E1890 80280A10 84620004 */  lh        $v0, 4($v1)
+/* 7E1894 80280A14 3C058009 */  lui       $a1, 0x8009
+/* 7E1898 80280A18 24A5A680 */  addiu     $a1, $a1, -0x5980
+/* 7E189C 80280A1C 000210C0 */  sll       $v0, $v0, 3
+/* 7E18A0 80280A20 00451021 */  addu      $v0, $v0, $a1
+/* 7E18A4 80280A24 8C420000 */  lw        $v0, ($v0)
+/* 7E18A8 80280A28 24050001 */  addiu     $a1, $zero, 1
+/* 7E18AC 80280A2C AE120108 */  sw        $s2, 0x108($s0)
+/* 7E18B0 80280A30 AE05018C */  sw        $a1, 0x18c($s0)
+/* 7E18B4 80280A34 AE020000 */  sw        $v0, ($s0)
+/* 7E18B8 80280A38 8C620000 */  lw        $v0, ($v1)
+/* 7E18BC 80280A3C AE020084 */  sw        $v0, 0x84($s0)
+/* 7E18C0 80280A40 8C620014 */  lw        $v0, 0x14($v1)
+/* 7E18C4 80280A44 02659821 */  addu      $s3, $s3, $a1
+/* 7E18C8 80280A48 0C0A02DE */  jal       func_80280B78
+/* 7E18CC 80280A4C AE020294 */   sw       $v0, 0x294($s0)
+/* 7E18D0 80280A50 AE020210 */  sw        $v0, 0x210($s0)
+/* 7E18D4 80280A54 26100004 */  addiu     $s0, $s0, 4
+.L80280A58:
+/* 7E18D8 80280A58 26520001 */  addiu     $s2, $s2, 1
+/* 7E18DC 80280A5C 0254102A */  slt       $v0, $s2, $s4
+/* 7E18E0 80280A60 1440FFE1 */  bnez      $v0, .L802809E8
+/* 7E18E4 80280A64 26310002 */   addiu    $s1, $s1, 2
+.L80280A68:
+/* 7E18E8 80280A68 8FA40010 */  lw        $a0, 0x10($sp)
+/* 7E18EC 80280A6C AC950318 */  sw        $s5, 0x318($a0)
+/* 7E18F0 80280A70 AC930324 */  sw        $s3, 0x324($a0)
+/* 7E18F4 80280A74 0C03D3F1 */  jal       func_800F4FC4
+/* 7E18F8 80280A78 AC800328 */   sw       $zero, 0x328($a0)
+/* 7E18FC 80280A7C 0C03A625 */  jal       func_800E9894
+/* 7E1900 80280A80 00000000 */   nop      
+/* 7E1904 80280A84 0C03A63B */  jal       func_800E98EC
+/* 7E1908 80280A88 00000000 */   nop      
+/* 7E190C 80280A8C 0C03A5E3 */  jal       open_status_menu_short
+/* 7E1910 80280A90 00000000 */   nop      
+/* 7E1914 80280A94 8FBF003C */  lw        $ra, 0x3c($sp)
+/* 7E1918 80280A98 8FBE0038 */  lw        $fp, 0x38($sp)
+/* 7E191C 80280A9C 8FB70034 */  lw        $s7, 0x34($sp)
+/* 7E1920 80280AA0 8FB60030 */  lw        $s6, 0x30($sp)
+/* 7E1924 80280AA4 8FB5002C */  lw        $s5, 0x2c($sp)
+/* 7E1928 80280AA8 8FB40028 */  lw        $s4, 0x28($sp)
+/* 7E192C 80280AAC 8FB30024 */  lw        $s3, 0x24($sp)
+/* 7E1930 80280AB0 8FB20020 */  lw        $s2, 0x20($sp)
+/* 7E1934 80280AB4 8FB1001C */  lw        $s1, 0x1c($sp)
+/* 7E1938 80280AB8 8FB00018 */  lw        $s0, 0x18($sp)
+/* 7E193C 80280ABC 03E00008 */  jr        $ra
+/* 7E1940 80280AC0 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s
new file mode 100644
index 0000000000..d2636a902e
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s
@@ -0,0 +1,40 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280AC4
+/* 7E1944 80280AC4 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E1948 80280AC8 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E194C 80280ACC 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E1950 80280AD0 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E1954 80280AD4 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E1958 80280AD8 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E195C 80280ADC AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E1960 80280AE0 8C420144 */  lw        $v0, 0x144($v0)
+/* 7E1964 80280AE4 0080902D */  daddu     $s2, $a0, $zero
+/* 7E1968 80280AE8 84500354 */  lh        $s0, 0x354($v0)
+/* 7E196C 80280AEC 16000003 */  bnez      $s0, .L80280AFC
+/* 7E1970 80280AF0 24510028 */   addiu    $s1, $v0, 0x28
+/* 7E1974 80280AF4 080A02CB */  j         .L80280B2C
+/* 7E1978 80280AF8 0000102D */   daddu    $v0, $zero, $zero
+.L80280AFC:
+/* 7E197C 80280AFC 0C03C4EC */  jal       func_800F13B0
+/* 7E1980 80280B00 00000000 */   nop      
+/* 7E1984 80280B04 240200FF */  addiu     $v0, $zero, 0xff
+/* 7E1988 80280B08 16020003 */  bne       $s0, $v0, .L80280B18
+/* 7E198C 80280B0C 2602FFFF */   addiu    $v0, $s0, -1
+/* 7E1990 80280B10 080A02C9 */  j         .L80280B24
+/* 7E1994 80280B14 2402FFFF */   addiu    $v0, $zero, -1
+.L80280B18:
+/* 7E1998 80280B18 00021080 */  sll       $v0, $v0, 2
+/* 7E199C 80280B1C 02221021 */  addu      $v0, $s1, $v0
+/* 7E19A0 80280B20 8C420108 */  lw        $v0, 0x108($v0)
+.L80280B24:
+/* 7E19A4 80280B24 AE420000 */  sw        $v0, ($s2)
+/* 7E19A8 80280B28 24020001 */  addiu     $v0, $zero, 1
+.L80280B2C:
+/* 7E19AC 80280B2C 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E19B0 80280B30 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E19B4 80280B34 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E19B8 80280B38 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E19BC 80280B3C 03E00008 */  jr        $ra
+/* 7E19C0 80280B40 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s
new file mode 100644
index 0000000000..7f6e120ee0
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s
@@ -0,0 +1,17 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280B44
+/* 7E19C4 80280B44 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E19C8 80280B48 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 7E19CC 80280B4C 0C03C54E */  jal       func_800F1538
+/* 7E19D0 80280B50 00000000 */   nop      
+/* 7E19D4 80280B54 0C03A640 */  jal       func_800E9900
+/* 7E19D8 80280B58 00000000 */   nop      
+/* 7E19DC 80280B5C 0C03A631 */  jal       func_800E98C4
+/* 7E19E0 80280B60 00000000 */   nop      
+/* 7E19E4 80280B64 0C03A5EE */  jal       func_800E97B8
+/* 7E19E8 80280B68 00000000 */   nop      
+/* 7E19EC 80280B6C 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 7E19F0 80280B70 03E00008 */  jr        $ra
+/* 7E19F4 80280B74 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
new file mode 100644
index 0000000000..9f96c4c9fa
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
@@ -0,0 +1,29 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280B78
+/* 7E19F8 80280B78 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E19FC 80280B7C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E1A00 80280B80 8C420144 */  lw        $v0, 0x144($v0)
+/* 7E1A04 80280B84 84460004 */  lh        $a2, 4($v0)
+/* 7E1A08 80280B88 8C43001C */  lw        $v1, 0x1c($v0)
+/* 7E1A0C 80280B8C 18C0000A */  blez      $a2, .L80280BB8
+/* 7E1A10 80280B90 0000282D */   daddu    $a1, $zero, $zero
+.L80280B94:
+/* 7E1A14 80280B94 8C620000 */  lw        $v0, ($v1)
+/* 7E1A18 80280B98 14440004 */  bne       $v0, $a0, .L80280BAC
+/* 7E1A1C 80280B9C 24A50001 */   addiu    $a1, $a1, 1
+/* 7E1A20 80280BA0 8C620004 */  lw        $v0, 4($v1)
+/* 7E1A24 80280BA4 03E00008 */  jr        $ra
+/* 7E1A28 80280BA8 00000000 */   nop      
+.L80280BAC:
+/* 7E1A2C 80280BAC 00A6102A */  slt       $v0, $a1, $a2
+/* 7E1A30 80280BB0 1440FFF8 */  bnez      $v0, .L80280B94
+/* 7E1A34 80280BB4 2463000C */   addiu    $v1, $v1, 0xc
+.L80280BB8:
+/* 7E1A38 80280BB8 00041140 */  sll       $v0, $a0, 5
+/* 7E1A3C 80280BBC 3C018008 */  lui       $at, 0x8008
+/* 7E1A40 80280BC0 00220821 */  addu      $at, $at, $v0
+/* 7E1A44 80280BC4 842278EC */  lh        $v0, 0x78ec($at)
+/* 7E1A48 80280BC8 03E00008 */  jr        $ra
+/* 7E1A4C 80280BCC 00000000 */   nop      
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
new file mode 100644
index 0000000000..b4e4d7c2fd
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
@@ -0,0 +1,604 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80280BD0
+/* 7E1A50 80280BD0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E1A54 80280BD4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E1A58 80280BD8 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E1A5C 80280BDC AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E1A60 80280BE0 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E1A64 80280BE4 3C128011 */  lui       $s2, %hi(gPlayerData)
+/* 7E1A68 80280BE8 2652F290 */  addiu     $s2, $s2, %lo(gPlayerData)
+/* 7E1A6C 80280BEC AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E1A70 80280BF0 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E1A74 80280BF4 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E1A78 80280BF8 8C500144 */  lw        $s0, 0x144($v0)
+/* 7E1A7C 80280BFC 10A00006 */  beqz      $a1, .L80280C18
+/* 7E1A80 80280C00 0080882D */   daddu    $s1, $a0, $zero
+/* 7E1A84 80280C04 0C0A0000 */  jal       func_80280000
+/* 7E1A88 80280C08 24040004 */   addiu    $a0, $zero, 4
+/* 7E1A8C 80280C0C AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1A90 80280C10 24020004 */  addiu     $v0, $zero, 4
+/* 7E1A94 80280C14 AE220070 */  sw        $v0, 0x70($s1)
+.L80280C18:
+/* 7E1A98 80280C18 8E230070 */  lw        $v1, 0x70($s1)
+/* 7E1A9C 80280C1C 24130020 */  addiu     $s3, $zero, 0x20
+/* 7E1AA0 80280C20 10730117 */  beq       $v1, $s3, .L80281080
+/* 7E1AA4 80280C24 28620021 */   slti     $v0, $v1, 0x21
+/* 7E1AA8 80280C28 10400027 */  beqz      $v0, .L80280CC8
+/* 7E1AAC 80280C2C 24020007 */   addiu    $v0, $zero, 7
+/* 7E1AB0 80280C30 1062018C */  beq       $v1, $v0, .L80281264
+/* 7E1AB4 80280C34 28620008 */   slti     $v0, $v1, 8
+/* 7E1AB8 80280C38 10400011 */  beqz      $v0, .L80280C80
+/* 7E1ABC 80280C3C 24020003 */   addiu    $v0, $zero, 3
+/* 7E1AC0 80280C40 106200D9 */  beq       $v1, $v0, .L80280FA8
+/* 7E1AC4 80280C44 28620004 */   slti     $v0, $v1, 4
+/* 7E1AC8 80280C48 10400007 */  beqz      $v0, .L80280C68
+/* 7E1ACC 80280C4C 24020004 */   addiu    $v0, $zero, 4
+/* 7E1AD0 80280C50 106001DC */  beqz      $v1, .L802813C4
+/* 7E1AD4 80280C54 24020002 */   addiu    $v0, $zero, 2
+/* 7E1AD8 80280C58 106200AF */  beq       $v1, $v0, .L80280F18
+/* 7E1ADC 80280C5C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1AE0 80280C60 080A0506 */  j         .L80281418
+/* 7E1AE4 80280C64 00000000 */   nop      
+.L80280C68:
+/* 7E1AE8 80280C68 1062003F */  beq       $v1, $v0, .L80280D68
+/* 7E1AEC 80280C6C 24020005 */   addiu    $v0, $zero, 5
+/* 7E1AF0 80280C70 1062012B */  beq       $v1, $v0, .L80281120
+/* 7E1AF4 80280C74 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1AF8 80280C78 080A0506 */  j         .L80281418
+/* 7E1AFC 80280C7C 00000000 */   nop      
+.L80280C80:
+/* 7E1B00 80280C80 2402000C */  addiu     $v0, $zero, 0xc
+/* 7E1B04 80280C84 10620108 */  beq       $v1, $v0, .L802810A8
+/* 7E1B08 80280C88 2862000D */   slti     $v0, $v1, 0xd
+/* 7E1B0C 80280C8C 10400007 */  beqz      $v0, .L80280CAC
+/* 7E1B10 80280C90 24020009 */   addiu    $v0, $zero, 9
+/* 7E1B14 80280C94 106201CB */  beq       $v1, $v0, .L802813C4
+/* 7E1B18 80280C98 2402000A */   addiu    $v0, $zero, 0xa
+/* 7E1B1C 80280C9C 106201D1 */  beq       $v1, $v0, .L802813E4
+/* 7E1B20 80280CA0 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1B24 80280CA4 080A0506 */  j         .L80281418
+/* 7E1B28 80280CA8 00000000 */   nop      
+.L80280CAC:
+/* 7E1B2C 80280CAC 24020015 */  addiu     $v0, $zero, 0x15
+/* 7E1B30 80280CB0 106200A0 */  beq       $v1, $v0, .L80280F34
+/* 7E1B34 80280CB4 2402001F */   addiu    $v0, $zero, 0x1f
+/* 7E1B38 80280CB8 106200C5 */  beq       $v1, $v0, .L80280FD0
+/* 7E1B3C 80280CBC 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1B40 80280CC0 080A0506 */  j         .L80281418
+/* 7E1B44 80280CC4 00000000 */   nop      
+.L80280CC8:
+/* 7E1B48 80280CC8 24020047 */  addiu     $v0, $zero, 0x47
+/* 7E1B4C 80280CCC 1062016F */  beq       $v1, $v0, .L8028128C
+/* 7E1B50 80280CD0 28620048 */   slti     $v0, $v1, 0x48
+/* 7E1B54 80280CD4 10400012 */  beqz      $v0, .L80280D20
+/* 7E1B58 80280CD8 24020033 */   addiu    $v0, $zero, 0x33
+/* 7E1B5C 80280CDC 10620117 */  beq       $v1, $v0, .L8028113C
+/* 7E1B60 80280CE0 28620034 */   slti     $v0, $v1, 0x34
+/* 7E1B64 80280CE4 10400007 */  beqz      $v0, .L80280D04
+/* 7E1B68 80280CE8 24020029 */   addiu    $v0, $zero, 0x29
+/* 7E1B6C 80280CEC 10620027 */  beq       $v1, $v0, .L80280D8C
+/* 7E1B70 80280CF0 2402002A */   addiu    $v0, $zero, 0x2a
+/* 7E1B74 80280CF4 106201B3 */  beq       $v1, $v0, .L802813C4
+/* 7E1B78 80280CF8 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1B7C 80280CFC 080A0506 */  j         .L80281418
+/* 7E1B80 80280D00 00000000 */   nop      
+.L80280D04:
+/* 7E1B84 80280D04 24020034 */  addiu     $v0, $zero, 0x34
+/* 7E1B88 80280D08 10620133 */  beq       $v1, $v0, .L802811D8
+/* 7E1B8C 80280D0C 24020035 */   addiu    $v0, $zero, 0x35
+/* 7E1B90 80280D10 1062013B */  beq       $v1, $v0, .L80281200
+/* 7E1B94 80280D14 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1B98 80280D18 080A0506 */  j         .L80281418
+/* 7E1B9C 80280D1C 00000000 */   nop      
+.L80280D20:
+/* 7E1BA0 80280D20 240200C9 */  addiu     $v0, $zero, 0xc9
+/* 7E1BA4 80280D24 10620072 */  beq       $v1, $v0, .L80280EF0
+/* 7E1BA8 80280D28 286200CA */   slti     $v0, $v1, 0xca
+/* 7E1BAC 80280D2C 10400007 */  beqz      $v0, .L80280D4C
+/* 7E1BB0 80280D30 24020048 */   addiu    $v0, $zero, 0x48
+/* 7E1BB4 80280D34 1062017E */  beq       $v1, $v0, .L80281330
+/* 7E1BB8 80280D38 24020049 */   addiu    $v0, $zero, 0x49
+/* 7E1BBC 80280D3C 1062018C */  beq       $v1, $v0, .L80281370
+/* 7E1BC0 80280D40 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1BC4 80280D44 080A0506 */  j         .L80281418
+/* 7E1BC8 80280D48 00000000 */   nop      
+.L80280D4C:
+/* 7E1BCC 80280D4C 240201F5 */  addiu     $v0, $zero, 0x1f5
+/* 7E1BD0 80280D50 106200EA */  beq       $v1, $v0, .L802810FC
+/* 7E1BD4 80280D54 240202BD */   addiu    $v0, $zero, 0x2bd
+/* 7E1BD8 80280D58 10620138 */  beq       $v1, $v0, .L8028123C
+/* 7E1BDC 80280D5C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1BE0 80280D60 080A0506 */  j         .L80281418
+/* 7E1BE4 80280D64 00000000 */   nop      
+.L80280D68:
+/* 7E1BE8 80280D68 0C0B1059 */  jal       does_script_exist
+/* 7E1BEC 80280D6C 8E240074 */   lw       $a0, 0x74($s1)
+/* 7E1BF0 80280D70 144001A9 */  bnez      $v0, .L80281418
+/* 7E1BF4 80280D74 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1BF8 80280D78 3C04001E */  lui       $a0, 0x1e
+/* 7E1BFC 80280D7C 34840003 */  ori       $a0, $a0, 3
+/* 7E1C00 80280D80 26250078 */  addiu     $a1, $s1, 0x78
+/* 7E1C04 80280D84 080A04D5 */  j         .L80281354
+/* 7E1C08 80280D88 24020029 */   addiu    $v0, $zero, 0x29
+.L80280D8C:
+/* 7E1C0C 80280D8C 8E240078 */  lw        $a0, 0x78($s1)
+/* 7E1C10 80280D90 24020001 */  addiu     $v0, $zero, 1
+/* 7E1C14 80280D94 148201A0 */  bne       $a0, $v0, .L80281418
+/* 7E1C18 80280D98 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1C1C 80280D9C 3C028028 */  lui       $v0, 0x8028
+/* 7E1C20 80280DA0 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1C24 80280DA4 904304E8 */  lbu       $v1, 0x4e8($v0)
+/* 7E1C28 80280DA8 10640012 */  beq       $v1, $a0, .L80280DF4
+/* 7E1C2C 80280DAC 28620002 */   slti     $v0, $v1, 2
+/* 7E1C30 80280DB0 10400005 */  beqz      $v0, .L80280DC8
+/* 7E1C34 80280DB4 24020002 */   addiu    $v0, $zero, 2
+/* 7E1C38 80280DB8 10600009 */  beqz      $v1, .L80280DE0
+/* 7E1C3C 80280DBC 00000000 */   nop      
+/* 7E1C40 80280DC0 080A03B6 */  j         .L80280ED8
+/* 7E1C44 80280DC4 00000000 */   nop      
+.L80280DC8:
+/* 7E1C48 80280DC8 10620018 */  beq       $v1, $v0, .L80280E2C
+/* 7E1C4C 80280DCC 24020003 */   addiu    $v0, $zero, 3
+/* 7E1C50 80280DD0 1062002D */  beq       $v1, $v0, .L80280E88
+/* 7E1C54 80280DD4 00000000 */   nop      
+/* 7E1C58 80280DD8 080A03B6 */  j         .L80280ED8
+/* 7E1C5C 80280DDC 00000000 */   nop      
+.L80280DE0:
+/* 7E1C60 80280DE0 0C0A005F */  jal       func_8028017C
+/* 7E1C64 80280DE4 24040005 */   addiu    $a0, $zero, 5
+/* 7E1C68 80280DE8 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1C6C 80280DEC 080A0505 */  j         .L80281414
+/* 7E1C70 80280DF0 AE200070 */   sw       $zero, 0x70($s1)
+.L80280DF4:
+/* 7E1C74 80280DF4 0C039D7B */  jal       get_item_count
+/* 7E1C78 80280DF8 00000000 */   nop      
+/* 7E1C7C 80280DFC 14400005 */  bnez      $v0, .L80280E14
+/* 7E1C80 80280E00 00000000 */   nop      
+/* 7E1C84 80280E04 0C0A005F */  jal       func_8028017C
+/* 7E1C88 80280E08 24040006 */   addiu    $a0, $zero, 6
+/* 7E1C8C 80280E0C 080A04EE */  j         .L802813B8
+/* 7E1C90 80280E10 AE220074 */   sw       $v0, 0x74($s1)
+.L80280E14:
+/* 7E1C94 80280E14 0C0A005F */  jal       func_8028017C
+/* 7E1C98 80280E18 24040007 */   addiu    $a0, $zero, 7
+/* 7E1C9C 80280E1C AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1CA0 80280E20 240200C9 */  addiu     $v0, $zero, 0xc9
+/* 7E1CA4 80280E24 080A0505 */  j         .L80281414
+/* 7E1CA8 80280E28 AE220070 */   sw       $v0, 0x70($s1)
+.L80280E2C:
+/* 7E1CAC 80280E2C 0C039D7B */  jal       get_item_count
+/* 7E1CB0 80280E30 00000000 */   nop      
+/* 7E1CB4 80280E34 14400005 */  bnez      $v0, .L80280E4C
+/* 7E1CB8 80280E38 00000000 */   nop      
+/* 7E1CBC 80280E3C 0C0A005F */  jal       func_8028017C
+/* 7E1CC0 80280E40 2404000C */   addiu    $a0, $zero, 0xc
+/* 7E1CC4 80280E44 080A04EE */  j         .L802813B8
+/* 7E1CC8 80280E48 AE220074 */   sw       $v0, 0x74($s1)
+.L80280E4C:
+/* 7E1CCC 80280E4C 0C039E12 */  jal       get_stored_empty_count
+/* 7E1CD0 80280E50 00000000 */   nop      
+/* 7E1CD4 80280E54 14400005 */  bnez      $v0, .L80280E6C
+/* 7E1CD8 80280E58 00000000 */   nop      
+/* 7E1CDC 80280E5C 0C0A005F */  jal       func_8028017C
+/* 7E1CE0 80280E60 2404000D */   addiu    $a0, $zero, 0xd
+/* 7E1CE4 80280E64 080A04EE */  j         .L802813B8
+/* 7E1CE8 80280E68 AE220074 */   sw       $v0, 0x74($s1)
+.L80280E6C:
+/* 7E1CEC 80280E6C 0C039E12 */  jal       get_stored_empty_count
+/* 7E1CF0 80280E70 00000000 */   nop      
+/* 7E1CF4 80280E74 2404000E */  addiu     $a0, $zero, 0xe
+/* 7E1CF8 80280E78 0C0A0082 */  jal       func_80280208
+/* 7E1CFC 80280E7C 0040282D */   daddu    $a1, $v0, $zero
+/* 7E1D00 80280E80 080A048C */  j         .L80281230
+/* 7E1D04 80280E84 AE220074 */   sw       $v0, 0x74($s1)
+.L80280E88:
+/* 7E1D08 80280E88 0C039E05 */  jal       get_stored_count
+/* 7E1D0C 80280E8C 00000000 */   nop      
+/* 7E1D10 80280E90 14400005 */  bnez      $v0, .L80280EA8
+/* 7E1D14 80280E94 00000000 */   nop      
+/* 7E1D18 80280E98 0C0A005F */  jal       func_8028017C
+/* 7E1D1C 80280E9C 24040011 */   addiu    $a0, $zero, 0x11
+/* 7E1D20 80280EA0 080A04EE */  j         .L802813B8
+/* 7E1D24 80280EA4 AE220074 */   sw       $v0, 0x74($s1)
+.L80280EA8:
+/* 7E1D28 80280EA8 0C039D88 */  jal       get_item_empty_count
+/* 7E1D2C 80280EAC 00000000 */   nop      
+/* 7E1D30 80280EB0 14400005 */  bnez      $v0, .L80280EC8
+/* 7E1D34 80280EB4 00000000 */   nop      
+/* 7E1D38 80280EB8 0C0A005F */  jal       func_8028017C
+/* 7E1D3C 80280EBC 24040012 */   addiu    $a0, $zero, 0x12
+/* 7E1D40 80280EC0 080A04EE */  j         .L802813B8
+/* 7E1D44 80280EC4 AE220074 */   sw       $v0, 0x74($s1)
+.L80280EC8:
+/* 7E1D48 80280EC8 0C0A005F */  jal       func_8028017C
+/* 7E1D4C 80280ECC 24040013 */   addiu    $a0, $zero, 0x13
+/* 7E1D50 80280ED0 080A04E8 */  j         .L802813A0
+/* 7E1D54 80280ED4 AE220074 */   sw       $v0, 0x74($s1)
+.L80280ED8:
+/* 7E1D58 80280ED8 0C0A00D7 */  jal       func_8028035C
+/* 7E1D5C 80280EDC 00000000 */   nop      
+/* 7E1D60 80280EE0 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1D64 80280EE4 2402002A */  addiu     $v0, $zero, 0x2a
+/* 7E1D68 80280EE8 080A0505 */  j         .L80281414
+/* 7E1D6C 80280EEC AE220070 */   sw       $v0, 0x70($s1)
+.L80280EF0:
+/* 7E1D70 80280EF0 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E1D74 80280EF4 0C0B1059 */  jal       does_script_exist
+/* 7E1D78 80280EF8 00000000 */   nop      
+/* 7E1D7C 80280EFC 14400146 */  bnez      $v0, .L80281418
+/* 7E1D80 80280F00 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1D84 80280F04 0C0A0255 */  jal       func_80280954
+/* 7E1D88 80280F08 0000202D */   daddu    $a0, $zero, $zero
+/* 7E1D8C 80280F0C 24020002 */  addiu     $v0, $zero, 2
+/* 7E1D90 80280F10 080A0505 */  j         .L80281414
+/* 7E1D94 80280F14 AE220070 */   sw       $v0, 0x70($s1)
+.L80280F18:
+/* 7E1D98 80280F18 0C0A02B1 */  jal       func_80280AC4
+/* 7E1D9C 80280F1C 2604000C */   addiu    $a0, $s0, 0xc
+/* 7E1DA0 80280F20 24030001 */  addiu     $v1, $zero, 1
+/* 7E1DA4 80280F24 1443013C */  bne       $v0, $v1, .L80281418
+/* 7E1DA8 80280F28 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1DAC 80280F2C 080A049F */  j         .L8028127C
+/* 7E1DB0 80280F30 24020015 */   addiu    $v0, $zero, 0x15
+.L80280F34:
+/* 7E1DB4 80280F34 8E220074 */  lw        $v0, 0x74($s1)
+/* 7E1DB8 80280F38 1C4000D7 */  bgtz      $v0, .L80281298
+/* 7E1DBC 80280F3C 2442FFFF */   addiu    $v0, $v0, -1
+/* 7E1DC0 80280F40 0C0A02D1 */  jal       func_80280B44
+/* 7E1DC4 80280F44 00000000 */   nop      
+/* 7E1DC8 80280F48 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E1DCC 80280F4C 04400012 */  bltz      $v0, .L80280F98
+/* 7E1DD0 80280F50 00021040 */   sll      $v0, $v0, 1
+/* 7E1DD4 80280F54 00521021 */  addu      $v0, $v0, $s2
+/* 7E1DD8 80280F58 844401B4 */  lh        $a0, 0x1b4($v0)
+/* 7E1DDC 80280F5C 3C028008 */  lui       $v0, %hi(gItemTable)
+/* 7E1DE0 80280F60 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
+/* 7E1DE4 80280F64 00048140 */  sll       $s0, $a0, 5
+/* 7E1DE8 80280F68 0C0A02DE */  jal       func_80280B78
+/* 7E1DEC 80280F6C 02028021 */   addu     $s0, $s0, $v0
+/* 7E1DF0 80280F70 24040008 */  addiu     $a0, $zero, 8
+/* 7E1DF4 80280F74 0040302D */  daddu     $a2, $v0, $zero
+/* 7E1DF8 80280F78 8E050000 */  lw        $a1, ($s0)
+/* 7E1DFC 80280F7C 0C0A0022 */  jal       func_80280088
+/* 7E1E00 80280F80 2407FFFF */   addiu    $a3, $zero, -1
+/* 7E1E04 80280F84 0C03A546 */  jal       show_coin_counter
+/* 7E1E08 80280F88 AE220074 */   sw       $v0, 0x74($s1)
+/* 7E1E0C 80280F8C 24020003 */  addiu     $v0, $zero, 3
+/* 7E1E10 80280F90 080A0505 */  j         .L80281414
+/* 7E1E14 80280F94 AE220070 */   sw       $v0, 0x70($s1)
+.L80280F98:
+/* 7E1E18 80280F98 0C0A0000 */  jal       func_80280000
+/* 7E1E1C 80280F9C 24040016 */   addiu    $a0, $zero, 0x16
+/* 7E1E20 80280FA0 080A04EE */  j         .L802813B8
+/* 7E1E24 80280FA4 AE220074 */   sw       $v0, 0x74($s1)
+.L80280FA8:
+/* 7E1E28 80280FA8 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E1E2C 80280FAC 0C0B1059 */  jal       does_script_exist
+/* 7E1E30 80280FB0 00000000 */   nop      
+/* 7E1E34 80280FB4 14400118 */  bnez      $v0, .L80281418
+/* 7E1E38 80280FB8 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1E3C 80280FBC 3C04001E */  lui       $a0, 0x1e
+/* 7E1E40 80280FC0 34840002 */  ori       $a0, $a0, 2
+/* 7E1E44 80280FC4 26250078 */  addiu     $a1, $s1, 0x78
+/* 7E1E48 80280FC8 080A04D5 */  j         .L80281354
+/* 7E1E4C 80280FCC 2402001F */   addiu    $v0, $zero, 0x1f
+.L80280FD0:
+/* 7E1E50 80280FD0 8E230078 */  lw        $v1, 0x78($s1)
+/* 7E1E54 80280FD4 24020001 */  addiu     $v0, $zero, 1
+/* 7E1E58 80280FD8 1462010F */  bne       $v1, $v0, .L80281418
+/* 7E1E5C 80280FDC 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1E60 80280FE0 3C028028 */  lui       $v0, 0x8028
+/* 7E1E64 80280FE4 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1E68 80280FE8 904204E8 */  lbu       $v0, 0x4e8($v0)
+/* 7E1E6C 80280FEC 1440001D */  bnez      $v0, .L80281064
+/* 7E1E70 80280FF0 00000000 */   nop      
+/* 7E1E74 80280FF4 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E1E78 80280FF8 00021040 */  sll       $v0, $v0, 1
+/* 7E1E7C 80280FFC 00521021 */  addu      $v0, $v0, $s2
+/* 7E1E80 80281000 0C0A02DE */  jal       func_80280B78
+/* 7E1E84 80281004 844401B4 */   lh       $a0, 0x1b4($v0)
+/* 7E1E88 80281008 0C03A830 */  jal       add_coins
+/* 7E1E8C 8028100C 0040202D */   daddu    $a0, $v0, $zero
+/* 7E1E90 80281010 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E1E94 80281014 00021040 */  sll       $v0, $v0, 1
+/* 7E1E98 80281018 00521021 */  addu      $v0, $v0, $s2
+/* 7E1E9C 8028101C 0C039D7B */  jal       get_item_count
+/* 7E1EA0 80281020 A44001B4 */   sh       $zero, 0x1b4($v0)
+/* 7E1EA4 80281024 14400009 */  bnez      $v0, .L8028104C
+/* 7E1EA8 80281028 00000000 */   nop      
+/* 7E1EAC 8028102C 0C0A00B4 */  jal       func_802802D0
+/* 7E1EB0 80281030 2404000B */   addiu    $a0, $zero, 0xb
+/* 7E1EB4 80281034 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1EB8 80281038 24020009 */  addiu     $v0, $zero, 9
+/* 7E1EBC 8028103C 0C03A5A6 */  jal       hide_coin_counter
+/* 7E1EC0 80281040 AE220070 */   sw       $v0, 0x70($s1)
+/* 7E1EC4 80281044 080A0506 */  j         .L80281418
+/* 7E1EC8 80281048 0000102D */   daddu    $v0, $zero, $zero
+.L8028104C:
+/* 7E1ECC 8028104C 0C0A00B4 */  jal       func_802802D0
+/* 7E1ED0 80281050 2404000A */   addiu    $a0, $zero, 0xa
+/* 7E1ED4 80281054 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1ED8 80281058 24020020 */  addiu     $v0, $zero, 0x20
+/* 7E1EDC 8028105C 080A0505 */  j         .L80281414
+/* 7E1EE0 80281060 AE220070 */   sw       $v0, 0x70($s1)
+.L80281064:
+/* 7E1EE4 80281064 0C0A00B4 */  jal       func_802802D0
+/* 7E1EE8 80281068 24040009 */   addiu    $a0, $zero, 9
+/* 7E1EEC 8028106C AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1EF0 80281070 0C03A5A6 */  jal       hide_coin_counter
+/* 7E1EF4 80281074 AE330070 */   sw       $s3, 0x70($s1)
+/* 7E1EF8 80281078 080A0506 */  j         .L80281418
+/* 7E1EFC 8028107C 0000102D */   daddu    $v0, $zero, $zero
+.L80281080:
+/* 7E1F00 80281080 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E1F04 80281084 0C0B1059 */  jal       does_script_exist
+/* 7E1F08 80281088 00000000 */   nop      
+/* 7E1F0C 8028108C 144000E2 */  bnez      $v0, .L80281418
+/* 7E1F10 80281090 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1F14 80281094 3C04001E */  lui       $a0, 0x1e
+/* 7E1F18 80281098 34840004 */  ori       $a0, $a0, 4
+/* 7E1F1C 8028109C 26250078 */  addiu     $a1, $s1, 0x78
+/* 7E1F20 802810A0 080A04D5 */  j         .L80281354
+/* 7E1F24 802810A4 2402000C */   addiu    $v0, $zero, 0xc
+.L802810A8:
+/* 7E1F28 802810A8 8E230078 */  lw        $v1, 0x78($s1)
+/* 7E1F2C 802810AC 24020001 */  addiu     $v0, $zero, 1
+/* 7E1F30 802810B0 146200D9 */  bne       $v1, $v0, .L80281418
+/* 7E1F34 802810B4 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1F38 802810B8 3C028028 */  lui       $v0, 0x8028
+/* 7E1F3C 802810BC 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1F40 802810C0 904204E8 */  lbu       $v0, 0x4e8($v0)
+/* 7E1F44 802810C4 14400009 */  bnez      $v0, .L802810EC
+/* 7E1F48 802810C8 00000000 */   nop      
+/* 7E1F4C 802810CC 0C0A00D7 */  jal       func_8028035C
+/* 7E1F50 802810D0 00000000 */   nop      
+/* 7E1F54 802810D4 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E1F58 802810D8 240200C9 */  addiu     $v0, $zero, 0xc9
+/* 7E1F5C 802810DC 0C03A5B2 */  jal       func_800E96C8
+/* 7E1F60 802810E0 AE220070 */   sw       $v0, 0x70($s1)
+/* 7E1F64 802810E4 080A0506 */  j         .L80281418
+/* 7E1F68 802810E8 0000102D */   daddu    $v0, $zero, $zero
+.L802810EC:
+/* 7E1F6C 802810EC 0C03A5B2 */  jal       func_800E96C8
+/* 7E1F70 802810F0 00000000 */   nop      
+/* 7E1F74 802810F4 080A04EB */  j         .L802813AC
+/* 7E1F78 802810F8 00000000 */   nop      
+.L802810FC:
+/* 7E1F7C 802810FC 0C0B1059 */  jal       does_script_exist
+/* 7E1F80 80281100 8E240074 */   lw       $a0, 0x74($s1)
+/* 7E1F84 80281104 144000C4 */  bnez      $v0, .L80281418
+/* 7E1F88 80281108 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1F8C 8028110C 0C0A0255 */  jal       func_80280954
+/* 7E1F90 80281110 24040001 */   addiu    $a0, $zero, 1
+/* 7E1F94 80281114 24020005 */  addiu     $v0, $zero, 5
+/* 7E1F98 80281118 080A0505 */  j         .L80281414
+/* 7E1F9C 8028111C AE220070 */   sw       $v0, 0x70($s1)
+.L80281120:
+/* 7E1FA0 80281120 0C0A02B1 */  jal       func_80280AC4
+/* 7E1FA4 80281124 2604000C */   addiu    $a0, $s0, 0xc
+/* 7E1FA8 80281128 24030001 */  addiu     $v1, $zero, 1
+/* 7E1FAC 8028112C 144300BA */  bne       $v0, $v1, .L80281418
+/* 7E1FB0 80281130 0000102D */   daddu    $v0, $zero, $zero
+/* 7E1FB4 80281134 080A049F */  j         .L8028127C
+/* 7E1FB8 80281138 24020033 */   addiu    $v0, $zero, 0x33
+.L8028113C:
+/* 7E1FBC 8028113C 8E220074 */  lw        $v0, 0x74($s1)
+/* 7E1FC0 80281140 1C400055 */  bgtz      $v0, .L80281298
+/* 7E1FC4 80281144 2442FFFF */   addiu    $v0, $v0, -1
+/* 7E1FC8 80281148 0C0A02D1 */  jal       func_80280B44
+/* 7E1FCC 8028114C 00000000 */   nop      
+/* 7E1FD0 80281150 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E1FD4 80281154 0440001C */  bltz      $v0, .L802811C8
+/* 7E1FD8 80281158 00021040 */   sll      $v0, $v0, 1
+/* 7E1FDC 8028115C 00521021 */  addu      $v0, $v0, $s2
+/* 7E1FE0 80281160 0C039DF1 */  jal       store_item
+/* 7E1FE4 80281164 844401B4 */   lh       $a0, 0x1b4($v0)
+/* 7E1FE8 80281168 04400005 */  bltz      $v0, .L80281180
+/* 7E1FEC 8028116C 00000000 */   nop      
+/* 7E1FF0 80281170 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E1FF4 80281174 00021040 */  sll       $v0, $v0, 1
+/* 7E1FF8 80281178 00521021 */  addu      $v0, $v0, $s2
+/* 7E1FFC 8028117C A44001B4 */  sh        $zero, 0x1b4($v0)
+.L80281180:
+/* 7E2000 80281180 0C039D7B */  jal       get_item_count
+/* 7E2004 80281184 00000000 */   nop      
+/* 7E2008 80281188 10400005 */  beqz      $v0, .L802811A0
+/* 7E200C 8028118C 00000000 */   nop      
+/* 7E2010 80281190 0C039E12 */  jal       get_stored_empty_count
+/* 7E2014 80281194 00000000 */   nop      
+/* 7E2018 80281198 14400005 */  bnez      $v0, .L802811B0
+/* 7E201C 8028119C 00000000 */   nop      
+.L802811A0:
+/* 7E2020 802811A0 0C0A0000 */  jal       func_80280000
+/* 7E2024 802811A4 2404000F */   addiu    $a0, $zero, 0xf
+/* 7E2028 802811A8 080A04EE */  j         .L802813B8
+/* 7E202C 802811AC AE220074 */   sw       $v0, 0x74($s1)
+.L802811B0:
+/* 7E2030 802811B0 0C0A0000 */  jal       func_80280000
+/* 7E2034 802811B4 24040010 */   addiu    $a0, $zero, 0x10
+/* 7E2038 802811B8 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E203C 802811BC 24020034 */  addiu     $v0, $zero, 0x34
+/* 7E2040 802811C0 080A0505 */  j         .L80281414
+/* 7E2044 802811C4 AE220070 */   sw       $v0, 0x70($s1)
+.L802811C8:
+/* 7E2048 802811C8 0C0A0000 */  jal       func_80280000
+/* 7E204C 802811CC 24040016 */   addiu    $a0, $zero, 0x16
+/* 7E2050 802811D0 080A04EE */  j         .L802813B8
+/* 7E2054 802811D4 AE220074 */   sw       $v0, 0x74($s1)
+.L802811D8:
+/* 7E2058 802811D8 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E205C 802811DC 0C0B1059 */  jal       does_script_exist
+/* 7E2060 802811E0 00000000 */   nop      
+/* 7E2064 802811E4 1440008C */  bnez      $v0, .L80281418
+/* 7E2068 802811E8 0000102D */   daddu    $v0, $zero, $zero
+/* 7E206C 802811EC 3C04001E */  lui       $a0, 0x1e
+/* 7E2070 802811F0 34840005 */  ori       $a0, $a0, 5
+/* 7E2074 802811F4 26250078 */  addiu     $a1, $s1, 0x78
+/* 7E2078 802811F8 080A04D5 */  j         .L80281354
+/* 7E207C 802811FC 24020035 */   addiu    $v0, $zero, 0x35
+.L80281200:
+/* 7E2080 80281200 8E230078 */  lw        $v1, 0x78($s1)
+/* 7E2084 80281204 24020001 */  addiu     $v0, $zero, 1
+/* 7E2088 80281208 14620083 */  bne       $v1, $v0, .L80281418
+/* 7E208C 8028120C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E2090 80281210 3C028028 */  lui       $v0, 0x8028
+/* 7E2094 80281214 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E2098 80281218 904204E8 */  lbu       $v0, 0x4e8($v0)
+/* 7E209C 8028121C 14400063 */  bnez      $v0, .L802813AC
+/* 7E20A0 80281220 00000000 */   nop      
+/* 7E20A4 80281224 0C0A00D7 */  jal       func_8028035C
+/* 7E20A8 80281228 00000000 */   nop      
+/* 7E20AC 8028122C AE220074 */  sw        $v0, 0x74($s1)
+.L80281230:
+/* 7E20B0 80281230 240201F5 */  addiu     $v0, $zero, 0x1f5
+/* 7E20B4 80281234 080A0505 */  j         .L80281414
+/* 7E20B8 80281238 AE220070 */   sw       $v0, 0x70($s1)
+.L8028123C:
+/* 7E20BC 8028123C 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E20C0 80281240 0C0B1059 */  jal       does_script_exist
+/* 7E20C4 80281244 00000000 */   nop      
+/* 7E20C8 80281248 14400073 */  bnez      $v0, .L80281418
+/* 7E20CC 8028124C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E20D0 80281250 0C0A0255 */  jal       func_80280954
+/* 7E20D4 80281254 24040002 */   addiu    $a0, $zero, 2
+/* 7E20D8 80281258 24020007 */  addiu     $v0, $zero, 7
+/* 7E20DC 8028125C 080A0505 */  j         .L80281414
+/* 7E20E0 80281260 AE220070 */   sw       $v0, 0x70($s1)
+.L80281264:
+/* 7E20E4 80281264 0C0A02B1 */  jal       func_80280AC4
+/* 7E20E8 80281268 2604000C */   addiu    $a0, $s0, 0xc
+/* 7E20EC 8028126C 24030001 */  addiu     $v1, $zero, 1
+/* 7E20F0 80281270 14430069 */  bne       $v0, $v1, .L80281418
+/* 7E20F4 80281274 0000102D */   daddu    $v0, $zero, $zero
+/* 7E20F8 80281278 24020047 */  addiu     $v0, $zero, 0x47
+.L8028127C:
+/* 7E20FC 8028127C AE220070 */  sw        $v0, 0x70($s1)
+/* 7E2100 80281280 2402000F */  addiu     $v0, $zero, 0xf
+/* 7E2104 80281284 080A0505 */  j         .L80281414
+/* 7E2108 80281288 AE220074 */   sw       $v0, 0x74($s1)
+.L8028128C:
+/* 7E210C 8028128C 8E220074 */  lw        $v0, 0x74($s1)
+/* 7E2110 80281290 18400003 */  blez      $v0, .L802812A0
+/* 7E2114 80281294 2442FFFF */   addiu    $v0, $v0, -1
+.L80281298:
+/* 7E2118 80281298 080A0505 */  j         .L80281414
+/* 7E211C 8028129C AE220074 */   sw       $v0, 0x74($s1)
+.L802812A0:
+/* 7E2120 802812A0 0C0A02D1 */  jal       func_80280B44
+/* 7E2124 802812A4 00000000 */   nop      
+/* 7E2128 802812A8 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E212C 802812AC 0440001C */  bltz      $v0, .L80281320
+/* 7E2130 802812B0 00021040 */   sll      $v0, $v0, 1
+/* 7E2134 802812B4 00521021 */  addu      $v0, $v0, $s2
+/* 7E2138 802812B8 0C039D5D */  jal       add_item
+/* 7E213C 802812BC 844401C8 */   lh       $a0, 0x1c8($v0)
+/* 7E2140 802812C0 04400005 */  bltz      $v0, .L802812D8
+/* 7E2144 802812C4 00000000 */   nop      
+/* 7E2148 802812C8 8E02000C */  lw        $v0, 0xc($s0)
+/* 7E214C 802812CC 00021040 */  sll       $v0, $v0, 1
+/* 7E2150 802812D0 00521021 */  addu      $v0, $v0, $s2
+/* 7E2154 802812D4 A44001C8 */  sh        $zero, 0x1c8($v0)
+.L802812D8:
+/* 7E2158 802812D8 0C039D88 */  jal       get_item_empty_count
+/* 7E215C 802812DC 00000000 */   nop      
+/* 7E2160 802812E0 10400005 */  beqz      $v0, .L802812F8
+/* 7E2164 802812E4 00000000 */   nop      
+/* 7E2168 802812E8 0C039E05 */  jal       get_stored_count
+/* 7E216C 802812EC 00000000 */   nop      
+/* 7E2170 802812F0 14400005 */  bnez      $v0, .L80281308
+/* 7E2174 802812F4 00000000 */   nop      
+.L802812F8:
+/* 7E2178 802812F8 0C0A0000 */  jal       func_80280000
+/* 7E217C 802812FC 24040014 */   addiu    $a0, $zero, 0x14
+/* 7E2180 80281300 080A04EE */  j         .L802813B8
+/* 7E2184 80281304 AE220074 */   sw       $v0, 0x74($s1)
+.L80281308:
+/* 7E2188 80281308 0C0A0000 */  jal       func_80280000
+/* 7E218C 8028130C 24040015 */   addiu    $a0, $zero, 0x15
+/* 7E2190 80281310 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E2194 80281314 24020048 */  addiu     $v0, $zero, 0x48
+/* 7E2198 80281318 080A0505 */  j         .L80281414
+/* 7E219C 8028131C AE220070 */   sw       $v0, 0x70($s1)
+.L80281320:
+/* 7E21A0 80281320 0C0A0000 */  jal       func_80280000
+/* 7E21A4 80281324 24040016 */   addiu    $a0, $zero, 0x16
+/* 7E21A8 80281328 080A04EE */  j         .L802813B8
+/* 7E21AC 8028132C AE220074 */   sw       $v0, 0x74($s1)
+.L80281330:
+/* 7E21B0 80281330 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E21B4 80281334 0C0B1059 */  jal       does_script_exist
+/* 7E21B8 80281338 00000000 */   nop      
+/* 7E21BC 8028133C 14400036 */  bnez      $v0, .L80281418
+/* 7E21C0 80281340 0000102D */   daddu    $v0, $zero, $zero
+/* 7E21C4 80281344 3C04001E */  lui       $a0, 0x1e
+/* 7E21C8 80281348 34840005 */  ori       $a0, $a0, 5
+/* 7E21CC 8028134C 26250078 */  addiu     $a1, $s1, 0x78
+/* 7E21D0 80281350 24020049 */  addiu     $v0, $zero, 0x49
+.L80281354:
+/* 7E21D4 80281354 AE220070 */  sw        $v0, 0x70($s1)
+/* 7E21D8 80281358 0C049640 */  jal       load_string
+/* 7E21DC 8028135C AE200078 */   sw       $zero, 0x78($s1)
+/* 7E21E0 80281360 3C018028 */  lui       $at, 0x8028
+/* 7E21E4 80281364 AC226538 */  sw        $v0, 0x6538($at)
+/* 7E21E8 80281368 080A0506 */  j         .L80281418
+/* 7E21EC 8028136C 0000102D */   daddu    $v0, $zero, $zero
+.L80281370:
+/* 7E21F0 80281370 8E230078 */  lw        $v1, 0x78($s1)
+/* 7E21F4 80281374 24020001 */  addiu     $v0, $zero, 1
+/* 7E21F8 80281378 14620027 */  bne       $v1, $v0, .L80281418
+/* 7E21FC 8028137C 0000102D */   daddu    $v0, $zero, $zero
+/* 7E2200 80281380 3C028028 */  lui       $v0, 0x8028
+/* 7E2204 80281384 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E2208 80281388 904204E8 */  lbu       $v0, 0x4e8($v0)
+/* 7E220C 8028138C 14400007 */  bnez      $v0, .L802813AC
+/* 7E2210 80281390 00000000 */   nop      
+/* 7E2214 80281394 0C0A00D7 */  jal       func_8028035C
+/* 7E2218 80281398 00000000 */   nop      
+/* 7E221C 8028139C AE220074 */  sw        $v0, 0x74($s1)
+.L802813A0:
+/* 7E2220 802813A0 240202BD */  addiu     $v0, $zero, 0x2bd
+/* 7E2224 802813A4 080A0505 */  j         .L80281414
+/* 7E2228 802813A8 AE220070 */   sw       $v0, 0x70($s1)
+.L802813AC:
+/* 7E222C 802813AC 0C0A00B4 */  jal       func_802802D0
+/* 7E2230 802813B0 24040016 */   addiu    $a0, $zero, 0x16
+/* 7E2234 802813B4 AE220074 */  sw        $v0, 0x74($s1)
+.L802813B8:
+/* 7E2238 802813B8 24020009 */  addiu     $v0, $zero, 9
+/* 7E223C 802813BC 080A0505 */  j         .L80281414
+/* 7E2240 802813C0 AE220070 */   sw       $v0, 0x70($s1)
+.L802813C4:
+/* 7E2244 802813C4 8E240074 */  lw        $a0, 0x74($s1)
+/* 7E2248 802813C8 0C0B1059 */  jal       does_script_exist
+/* 7E224C 802813CC 00000000 */   nop      
+/* 7E2250 802813D0 14400011 */  bnez      $v0, .L80281418
+/* 7E2254 802813D4 0000102D */   daddu    $v0, $zero, $zero
+/* 7E2258 802813D8 2402000A */  addiu     $v0, $zero, 0xa
+/* 7E225C 802813DC 080A0505 */  j         .L80281414
+/* 7E2260 802813E0 AE220070 */   sw       $v0, 0x70($s1)
+.L802813E4:
+/* 7E2264 802813E4 8E020010 */  lw        $v0, 0x10($s0)
+/* 7E2268 802813E8 10400006 */  beqz      $v0, .L80281404
+/* 7E226C 802813EC 00000000 */   nop      
+/* 7E2270 802813F0 8C440014 */  lw        $a0, 0x14($v0)
+/* 7E2274 802813F4 10800003 */  beqz      $a0, .L80281404
+/* 7E2278 802813F8 24050001 */   addiu    $a1, $zero, 1
+/* 7E227C 802813FC 0C0B0CF8 */  jal       start_script
+/* 7E2280 80281400 0000302D */   daddu    $a2, $zero, $zero
+.L80281404:
+/* 7E2284 80281404 0C03A5E3 */  jal       open_status_menu_short
+/* 7E2288 80281408 00000000 */   nop      
+/* 7E228C 8028140C 080A0506 */  j         .L80281418
+/* 7E2290 80281410 24020001 */   addiu    $v0, $zero, 1
+.L80281414:
+/* 7E2294 80281414 0000102D */  daddu     $v0, $zero, $zero
+.L80281418:
+/* 7E2298 80281418 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E229C 8028141C 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E22A0 80281420 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E22A4 80281424 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E22A8 80281428 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E22AC 8028142C 03E00008 */  jr        $ra
+/* 7E22B0 80281430 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s
new file mode 100644
index 0000000000..5dcd366f21
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s
@@ -0,0 +1,43 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80281434
+/* 7E22B4 80281434 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E22B8 80281438 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E22BC 8028143C 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E22C0 80281440 AFBF0024 */  sw        $ra, 0x24($sp)
+/* 7E22C4 80281444 AFB20020 */  sw        $s2, 0x20($sp)
+/* 7E22C8 80281448 AFB1001C */  sw        $s1, 0x1c($sp)
+/* 7E22CC 8028144C AFB00018 */  sw        $s0, 0x18($sp)
+/* 7E22D0 80281450 8C440144 */  lw        $a0, 0x144($v0)
+/* 7E22D4 80281454 00A0882D */  daddu     $s1, $a1, $zero
+/* 7E22D8 80281458 8C830008 */  lw        $v1, 8($a0)
+/* 7E22DC 8028145C 00C0902D */  daddu     $s2, $a2, $zero
+/* 7E22E0 80281460 00031040 */  sll       $v0, $v1, 1
+/* 7E22E4 80281464 00431021 */  addu      $v0, $v0, $v1
+/* 7E22E8 80281468 8C830018 */  lw        $v1, 0x18($a0)
+/* 7E22EC 8028146C 00021080 */  sll       $v0, $v0, 2
+/* 7E22F0 80281470 00621821 */  addu      $v1, $v1, $v0
+/* 7E22F4 80281474 8C700000 */  lw        $s0, ($v1)
+/* 7E22F8 80281478 3C028008 */  lui       $v0, %hi(gItemTable)
+/* 7E22FC 8028147C 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
+/* 7E2300 80281480 00108140 */  sll       $s0, $s0, 5
+/* 7E2304 80281484 02028021 */  addu      $s0, $s0, $v0
+/* 7E2308 80281488 8E040000 */  lw        $a0, ($s0)
+/* 7E230C 8028148C 0C04991D */  jal       get_string_width
+/* 7E2310 80281490 0000282D */   daddu    $a1, $zero, $zero
+/* 7E2314 80281494 00021043 */  sra       $v0, $v0, 1
+/* 7E2318 80281498 2442FFC4 */  addiu     $v0, $v0, -0x3c
+/* 7E231C 8028149C 02222823 */  subu      $a1, $s1, $v0
+/* 7E2320 802814A0 26460006 */  addiu     $a2, $s2, 6
+/* 7E2324 802814A4 AFA00010 */  sw        $zero, 0x10($sp)
+/* 7E2328 802814A8 AFA00014 */  sw        $zero, 0x14($sp)
+/* 7E232C 802814AC 8E040000 */  lw        $a0, ($s0)
+/* 7E2330 802814B0 0C04993B */  jal       draw_string
+/* 7E2334 802814B4 240700FF */   addiu    $a3, $zero, 0xff
+/* 7E2338 802814B8 8FBF0024 */  lw        $ra, 0x24($sp)
+/* 7E233C 802814BC 8FB20020 */  lw        $s2, 0x20($sp)
+/* 7E2340 802814C0 8FB1001C */  lw        $s1, 0x1c($sp)
+/* 7E2344 802814C4 8FB00018 */  lw        $s0, 0x18($sp)
+/* 7E2348 802814C8 03E00008 */  jr        $ra
+/* 7E234C 802814CC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s
new file mode 100644
index 0000000000..663497bde0
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s
@@ -0,0 +1,25 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802814D0
+/* 7E2350 802814D0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 7E2354 802814D4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 7E2358 802814D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E235C 802814DC AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E2360 802814E0 8C420144 */  lw        $v0, 0x144($v0)
+/* 7E2364 802814E4 24A50008 */  addiu     $a1, $a1, 8
+/* 7E2368 802814E8 8C440008 */  lw        $a0, 8($v0)
+/* 7E236C 802814EC 8C430018 */  lw        $v1, 0x18($v0)
+/* 7E2370 802814F0 2402000A */  addiu     $v0, $zero, 0xa
+/* 7E2374 802814F4 AFA20010 */  sw        $v0, 0x10($sp)
+/* 7E2378 802814F8 AFA00014 */  sw        $zero, 0x14($sp)
+/* 7E237C 802814FC 00041040 */  sll       $v0, $a0, 1
+/* 7E2380 80281500 00441021 */  addu      $v0, $v0, $a0
+/* 7E2384 80281504 00021080 */  sll       $v0, $v0, 2
+/* 7E2388 80281508 00621821 */  addu      $v1, $v1, $v0
+/* 7E238C 8028150C 8C640008 */  lw        $a0, 8($v1)
+/* 7E2390 80281510 0C04993B */  jal       draw_string
+/* 7E2394 80281514 240700FF */   addiu    $a3, $zero, 0xff
+/* 7E2398 80281518 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E239C 8028151C 03E00008 */  jr        $ra
+/* 7E23A0 80281520 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
new file mode 100644
index 0000000000..96d43f70bf
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
@@ -0,0 +1,394 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel MakeDoorAdvanced
+/* 7E2B2C 80281CAC 27BDFFA8 */  addiu     $sp, $sp, -0x58
+/* 7E2B30 80281CB0 AFB10034 */  sw        $s1, 0x34($sp)
+/* 7E2B34 80281CB4 0080882D */  daddu     $s1, $a0, $zero
+/* 7E2B38 80281CB8 AFBF0054 */  sw        $ra, 0x54($sp)
+/* 7E2B3C 80281CBC AFBE0050 */  sw        $fp, 0x50($sp)
+/* 7E2B40 80281CC0 AFB7004C */  sw        $s7, 0x4c($sp)
+/* 7E2B44 80281CC4 AFB60048 */  sw        $s6, 0x48($sp)
+/* 7E2B48 80281CC8 AFB50044 */  sw        $s5, 0x44($sp)
+/* 7E2B4C 80281CCC AFB40040 */  sw        $s4, 0x40($sp)
+/* 7E2B50 80281CD0 AFB3003C */  sw        $s3, 0x3c($sp)
+/* 7E2B54 80281CD4 AFB20038 */  sw        $s2, 0x38($sp)
+/* 7E2B58 80281CD8 AFB00030 */  sw        $s0, 0x30($sp)
+/* 7E2B5C 80281CDC 8E30000C */  lw        $s0, 0xc($s1)
+/* 7E2B60 80281CE0 0C00AB39 */  jal       heap_malloc
+/* 7E2B64 80281CE4 24040064 */   addiu    $a0, $zero, 0x64
+/* 7E2B68 80281CE8 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2B6C 80281CEC 0040902D */  daddu     $s2, $v0, $zero
+/* 7E2B70 80281CF0 AE400000 */  sw        $zero, ($s2)
+/* 7E2B74 80281CF4 8E050000 */  lw        $a1, ($s0)
+/* 7E2B78 80281CF8 0C0B1EAF */  jal       get_variable
+/* 7E2B7C 80281CFC 26100004 */   addiu    $s0, $s0, 4
+/* 7E2B80 80281D00 0040982D */  daddu     $s3, $v0, $zero
+/* 7E2B84 80281D04 32620FFF */  andi      $v0, $s3, 0xfff
+/* 7E2B88 80281D08 AE420004 */  sw        $v0, 4($s2)
+/* 7E2B8C 80281D0C 3262F000 */  andi      $v0, $s3, 0xf000
+/* 7E2B90 80281D10 00021303 */  sra       $v0, $v0, 0xc
+/* 7E2B94 80281D14 A6420008 */  sh        $v0, 8($s2)
+/* 7E2B98 80281D18 A640000A */  sh        $zero, 0xa($s2)
+/* 7E2B9C 80281D1C 8E050000 */  lw        $a1, ($s0)
+/* 7E2BA0 80281D20 26100004 */  addiu     $s0, $s0, 4
+/* 7E2BA4 80281D24 0C0B1EAF */  jal       get_variable
+/* 7E2BA8 80281D28 0220202D */   daddu    $a0, $s1, $zero
+/* 7E2BAC 80281D2C 8E050000 */  lw        $a1, ($s0)
+/* 7E2BB0 80281D30 26100004 */  addiu     $s0, $s0, 4
+/* 7E2BB4 80281D34 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2BB8 80281D38 0C0B1EAF */  jal       get_variable
+/* 7E2BBC 80281D3C AFA2002C */   sw       $v0, 0x2c($sp)
+/* 7E2BC0 80281D40 8E050000 */  lw        $a1, ($s0)
+/* 7E2BC4 80281D44 26100004 */  addiu     $s0, $s0, 4
+/* 7E2BC8 80281D48 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2BCC 80281D4C 0C0B1EAF */  jal       get_variable
+/* 7E2BD0 80281D50 0040F02D */   daddu    $fp, $v0, $zero
+/* 7E2BD4 80281D54 8E050000 */  lw        $a1, ($s0)
+/* 7E2BD8 80281D58 26100004 */  addiu     $s0, $s0, 4
+/* 7E2BDC 80281D5C 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2BE0 80281D60 0C0B1EAF */  jal       get_variable
+/* 7E2BE4 80281D64 0040A82D */   daddu    $s5, $v0, $zero
+/* 7E2BE8 80281D68 8E050000 */  lw        $a1, ($s0)
+/* 7E2BEC 80281D6C 26100004 */  addiu     $s0, $s0, 4
+/* 7E2BF0 80281D70 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2BF4 80281D74 0C0B1EAF */  jal       get_variable
+/* 7E2BF8 80281D78 0040B82D */   daddu    $s7, $v0, $zero
+/* 7E2BFC 80281D7C 0040A02D */  daddu     $s4, $v0, $zero
+/* 7E2C00 80281D80 AE540060 */  sw        $s4, 0x60($s2)
+/* 7E2C04 80281D84 8E050000 */  lw        $a1, ($s0)
+/* 7E2C08 80281D88 26100004 */  addiu     $s0, $s0, 4
+/* 7E2C0C 80281D8C 0C0B1EAF */  jal       get_variable
+/* 7E2C10 80281D90 0220202D */   daddu    $a0, $s1, $zero
+/* 7E2C14 80281D94 8E050000 */  lw        $a1, ($s0)
+/* 7E2C18 80281D98 26100004 */  addiu     $s0, $s0, 4
+/* 7E2C1C 80281D9C 0220202D */  daddu     $a0, $s1, $zero
+/* 7E2C20 80281DA0 0C0B1EAF */  jal       get_variable
+/* 7E2C24 80281DA4 0040B02D */   daddu    $s6, $v0, $zero
+/* 7E2C28 80281DA8 AE42003C */  sw        $v0, 0x3c($s2)
+/* 7E2C2C 80281DAC 8E050000 */  lw        $a1, ($s0)
+/* 7E2C30 80281DB0 0C0B1EAF */  jal       get_variable
+/* 7E2C34 80281DB4 0220202D */   daddu    $a0, $s1, $zero
+/* 7E2C38 80281DB8 12A00003 */  beqz      $s5, .L80281DC8
+/* 7E2C3C 80281DBC AE42005C */   sw       $v0, 0x5c($s2)
+/* 7E2C40 80281DC0 36730800 */  ori       $s3, $s3, 0x800
+/* 7E2C44 80281DC4 AE530004 */  sw        $s3, 4($s2)
+.L80281DC8:
+/* 7E2C48 80281DC8 0280202D */  daddu     $a0, $s4, $zero
+/* 7E2C4C 80281DCC 27A50018 */  addiu     $a1, $sp, 0x18
+/* 7E2C50 80281DD0 27B0001C */  addiu     $s0, $sp, 0x1c
+/* 7E2C54 80281DD4 0200302D */  daddu     $a2, $s0, $zero
+/* 7E2C58 80281DD8 0C016F84 */  jal       get_collider_center
+/* 7E2C5C 80281DDC 27A70020 */   addiu    $a3, $sp, 0x20
+/* 7E2C60 80281DE0 0280202D */  daddu     $a0, $s4, $zero
+/* 7E2C64 80281DE4 27A50024 */  addiu     $a1, $sp, 0x24
+/* 7E2C68 80281DE8 0200302D */  daddu     $a2, $s0, $zero
+/* 7E2C6C 80281DEC 0C016F76 */  jal       func_8005BDD8
+/* 7E2C70 80281DF0 27A70028 */   addiu    $a3, $sp, 0x28
+/* 7E2C74 80281DF4 326300FF */  andi      $v1, $s3, 0xff
+/* 7E2C78 80281DF8 2C620008 */  sltiu     $v0, $v1, 8
+/* 7E2C7C 80281DFC 104000F0 */  beqz      $v0, .L802821C0
+/* 7E2C80 80281E00 00031080 */   sll      $v0, $v1, 2
+/* 7E2C84 80281E04 3C018028 */  lui       $at, 0x8028
+/* 7E2C88 80281E08 00220821 */  addu      $at, $at, $v0
+/* 7E2C8C 80281E0C 8C226500 */  lw        $v0, 0x6500($at)
+/* 7E2C90 80281E10 00400008 */  jr        $v0
+/* 7E2C94 80281E14 00000000 */   nop      
+/* 7E2C98 80281E18 C7AA0024 */  lwc1      $f10, 0x24($sp)
+/* 7E2C9C 80281E1C 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2CA0 80281E20 44811000 */  mtc1      $at, $f2
+/* 7E2CA4 80281E24 00000000 */  nop       
+/* 7E2CA8 80281E28 46025302 */  mul.s     $f12, $f10, $f2
+/* 7E2CAC 80281E2C 00000000 */  nop       
+/* 7E2CB0 80281E30 C7A60028 */  lwc1      $f6, 0x28($sp)
+/* 7E2CB4 80281E34 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2CB8 80281E38 44810000 */  mtc1      $at, $f0
+/* 7E2CBC 80281E3C 00000000 */  nop       
+/* 7E2CC0 80281E40 46003102 */  mul.s     $f4, $f6, $f0
+/* 7E2CC4 80281E44 00000000 */  nop       
+/* 7E2CC8 80281E48 46023182 */  mul.s     $f6, $f6, $f2
+/* 7E2CCC 80281E4C 00000000 */  nop       
+/* 7E2CD0 80281E50 46005282 */  mul.s     $f10, $f10, $f0
+/* 7E2CD4 80281E54 00000000 */  nop       
+/* 7E2CD8 80281E58 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2CDC 80281E5C 460C1200 */  add.s     $f8, $f2, $f12
+/* 7E2CE0 80281E60 460C1081 */  sub.s     $f2, $f2, $f12
+/* 7E2CE4 80281E64 46044201 */  sub.s     $f8, $f8, $f4
+/* 7E2CE8 80281E68 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2CEC 80281E6C 46060100 */  add.s     $f4, $f0, $f6
+/* 7E2CF0 80281E70 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2CF4 80281E74 E6420014 */  swc1      $f2, 0x14($s2)
+/* 7E2CF8 80281E78 080A0819 */  j         .L80282064
+/* 7E2CFC 80281E7C 460A2100 */   add.s    $f4, $f4, $f10
+/* 7E2D00 80281E80 C7A80024 */  lwc1      $f8, 0x24($sp)
+/* 7E2D04 80281E84 3C014270 */  lui       $at, 0x4270
+/* 7E2D08 80281E88 44812000 */  mtc1      $at, $f4
+/* 7E2D0C 80281E8C 00000000 */  nop       
+/* 7E2D10 80281E90 46044302 */  mul.s     $f12, $f8, $f4
+/* 7E2D14 80281E94 00000000 */  nop       
+/* 7E2D18 80281E98 C7A60028 */  lwc1      $f6, 0x28($sp)
+/* 7E2D1C 80281E9C 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2D20 80281EA0 44815000 */  mtc1      $at, $f10
+/* 7E2D24 80281EA4 00000000 */  nop       
+/* 7E2D28 80281EA8 460A3382 */  mul.s     $f14, $f6, $f10
+/* 7E2D2C 80281EAC 00000000 */  nop       
+/* 7E2D30 80281EB0 46043102 */  mul.s     $f4, $f6, $f4
+/* 7E2D34 80281EB4 00000000 */  nop       
+/* 7E2D38 80281EB8 460A4282 */  mul.s     $f10, $f8, $f10
+/* 7E2D3C 80281EBC 00000000 */  nop       
+/* 7E2D40 80281EC0 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2D44 80281EC4 44810000 */  mtc1      $at, $f0
+/* 7E2D48 80281EC8 00000000 */  nop       
+/* 7E2D4C 80281ECC 46004202 */  mul.s     $f8, $f8, $f0
+/* 7E2D50 80281ED0 00000000 */  nop       
+/* 7E2D54 80281ED4 46003182 */  mul.s     $f6, $f6, $f0
+/* 7E2D58 80281ED8 00000000 */  nop       
+/* 7E2D5C 80281EDC C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2D60 80281EE0 460C1300 */  add.s     $f12, $f2, $f12
+/* 7E2D64 80281EE4 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2D68 80281EE8 46040100 */  add.s     $f4, $f0, $f4
+/* 7E2D6C 80281EEC 46081081 */  sub.s     $f2, $f2, $f8
+/* 7E2D70 80281EF0 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2D74 80281EF4 460E6301 */  sub.s     $f12, $f12, $f14
+/* 7E2D78 80281EF8 E6420014 */  swc1      $f2, 0x14($s2)
+/* 7E2D7C 80281EFC 080A083D */  j         .L802820F4
+/* 7E2D80 80281F00 460A2100 */   add.s    $f4, $f4, $f10
+/* 7E2D84 80281F04 C7A80024 */  lwc1      $f8, 0x24($sp)
+/* 7E2D88 80281F08 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2D8C 80281F0C 44813000 */  mtc1      $at, $f6
+/* 7E2D90 80281F10 00000000 */  nop       
+/* 7E2D94 80281F14 46064282 */  mul.s     $f10, $f8, $f6
+/* 7E2D98 80281F18 00000000 */  nop       
+/* 7E2D9C 80281F1C C7A40028 */  lwc1      $f4, 0x28($sp)
+/* 7E2DA0 80281F20 46062182 */  mul.s     $f6, $f4, $f6
+/* 7E2DA4 80281F24 00000000 */  nop       
+/* 7E2DA8 80281F28 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2DAC 80281F2C 44810000 */  mtc1      $at, $f0
+/* 7E2DB0 80281F30 00000000 */  nop       
+/* 7E2DB4 80281F34 46002102 */  mul.s     $f4, $f4, $f0
+/* 7E2DB8 80281F38 00000000 */  nop       
+/* 7E2DBC 80281F3C 46004202 */  mul.s     $f8, $f8, $f0
+/* 7E2DC0 80281F40 00000000 */  nop       
+/* 7E2DC4 80281F44 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2DC8 80281F48 460A1300 */  add.s     $f12, $f2, $f10
+/* 7E2DCC 80281F4C 460A1081 */  sub.s     $f2, $f2, $f10
+/* 7E2DD0 80281F50 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2DD4 80281F54 46060280 */  add.s     $f10, $f0, $f6
+/* 7E2DD8 80281F58 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2DDC 80281F5C 46041081 */  sub.s     $f2, $f2, $f4
+/* 7E2DE0 80281F60 E64C000C */  swc1      $f12, 0xc($s2)
+/* 7E2DE4 80281F64 46080001 */  sub.s     $f0, $f0, $f8
+/* 7E2DE8 80281F68 E64A0010 */  swc1      $f10, 0x10($s2)
+/* 7E2DEC 80281F6C 080A086F */  j         .L802821BC
+/* 7E2DF0 80281F70 E6420014 */   swc1     $f2, 0x14($s2)
+/* 7E2DF4 80281F74 C7A80024 */  lwc1      $f8, 0x24($sp)
+/* 7E2DF8 80281F78 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2DFC 80281F7C 44813000 */  mtc1      $at, $f6
+/* 7E2E00 80281F80 00000000 */  nop       
+/* 7E2E04 80281F84 46064282 */  mul.s     $f10, $f8, $f6
+/* 7E2E08 80281F88 00000000 */  nop       
+/* 7E2E0C 80281F8C C7A40028 */  lwc1      $f4, 0x28($sp)
+/* 7E2E10 80281F90 46062182 */  mul.s     $f6, $f4, $f6
+/* 7E2E14 80281F94 00000000 */  nop       
+/* 7E2E18 80281F98 3C014270 */  lui       $at, 0x4270
+/* 7E2E1C 80281F9C 44811000 */  mtc1      $at, $f2
+/* 7E2E20 80281FA0 00000000 */  nop       
+/* 7E2E24 80281FA4 46024302 */  mul.s     $f12, $f8, $f2
+/* 7E2E28 80281FA8 00000000 */  nop       
+/* 7E2E2C 80281FAC 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2E30 80281FB0 44810000 */  mtc1      $at, $f0
+/* 7E2E34 80281FB4 00000000 */  nop       
+/* 7E2E38 80281FB8 46002382 */  mul.s     $f14, $f4, $f0
+/* 7E2E3C 80281FBC 00000000 */  nop       
+/* 7E2E40 80281FC0 46022102 */  mul.s     $f4, $f4, $f2
+/* 7E2E44 80281FC4 00000000 */  nop       
+/* 7E2E48 80281FC8 46004202 */  mul.s     $f8, $f8, $f0
+/* 7E2E4C 80281FCC 00000000 */  nop       
+/* 7E2E50 80281FD0 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2E54 80281FD4 460A1280 */  add.s     $f10, $f2, $f10
+/* 7E2E58 80281FD8 460C1081 */  sub.s     $f2, $f2, $f12
+/* 7E2E5C 80281FDC C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2E60 80281FE0 46060180 */  add.s     $f6, $f0, $f6
+/* 7E2E64 80281FE4 46040001 */  sub.s     $f0, $f0, $f4
+/* 7E2E68 80281FE8 460E1081 */  sub.s     $f2, $f2, $f14
+/* 7E2E6C 80281FEC E64A000C */  swc1      $f10, 0xc($s2)
+/* 7E2E70 80281FF0 46080001 */  sub.s     $f0, $f0, $f8
+/* 7E2E74 80281FF4 E6460010 */  swc1      $f6, 0x10($s2)
+/* 7E2E78 80281FF8 080A086F */  j         .L802821BC
+/* 7E2E7C 80281FFC E6420014 */   swc1     $f2, 0x14($s2)
+/* 7E2E80 80282000 C7AA0024 */  lwc1      $f10, 0x24($sp)
+/* 7E2E84 80282004 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2E88 80282008 44811000 */  mtc1      $at, $f2
+/* 7E2E8C 8028200C 00000000 */  nop       
+/* 7E2E90 80282010 46025302 */  mul.s     $f12, $f10, $f2
+/* 7E2E94 80282014 00000000 */  nop       
+/* 7E2E98 80282018 C7A60028 */  lwc1      $f6, 0x28($sp)
+/* 7E2E9C 8028201C 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2EA0 80282020 44810000 */  mtc1      $at, $f0
+/* 7E2EA4 80282024 00000000 */  nop       
+/* 7E2EA8 80282028 46003102 */  mul.s     $f4, $f6, $f0
+/* 7E2EAC 8028202C 00000000 */  nop       
+/* 7E2EB0 80282030 46023182 */  mul.s     $f6, $f6, $f2
+/* 7E2EB4 80282034 00000000 */  nop       
+/* 7E2EB8 80282038 46005282 */  mul.s     $f10, $f10, $f0
+/* 7E2EBC 8028203C 00000000 */  nop       
+/* 7E2EC0 80282040 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2EC4 80282044 460C1200 */  add.s     $f8, $f2, $f12
+/* 7E2EC8 80282048 460C1081 */  sub.s     $f2, $f2, $f12
+/* 7E2ECC 8028204C 46044200 */  add.s     $f8, $f8, $f4
+/* 7E2ED0 80282050 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2ED4 80282054 46060100 */  add.s     $f4, $f0, $f6
+/* 7E2ED8 80282058 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2EDC 8028205C E6420014 */  swc1      $f2, 0x14($s2)
+/* 7E2EE0 80282060 460A2101 */  sub.s     $f4, $f4, $f10
+.L80282064:
+/* 7E2EE4 80282064 E6400018 */  swc1      $f0, 0x18($s2)
+/* 7E2EE8 80282068 E648000C */  swc1      $f8, 0xc($s2)
+/* 7E2EEC 8028206C 080A0870 */  j         .L802821C0
+/* 7E2EF0 80282070 E6440010 */   swc1     $f4, 0x10($s2)
+/* 7E2EF4 80282074 C7A80024 */  lwc1      $f8, 0x24($sp)
+/* 7E2EF8 80282078 3C014270 */  lui       $at, 0x4270
+/* 7E2EFC 8028207C 44812000 */  mtc1      $at, $f4
+/* 7E2F00 80282080 00000000 */  nop       
+/* 7E2F04 80282084 46044302 */  mul.s     $f12, $f8, $f4
+/* 7E2F08 80282088 00000000 */  nop       
+/* 7E2F0C 8028208C C7A60028 */  lwc1      $f6, 0x28($sp)
+/* 7E2F10 80282090 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2F14 80282094 44815000 */  mtc1      $at, $f10
+/* 7E2F18 80282098 00000000 */  nop       
+/* 7E2F1C 8028209C 460A3382 */  mul.s     $f14, $f6, $f10
+/* 7E2F20 802820A0 00000000 */  nop       
+/* 7E2F24 802820A4 46043102 */  mul.s     $f4, $f6, $f4
+/* 7E2F28 802820A8 00000000 */  nop       
+/* 7E2F2C 802820AC 460A4282 */  mul.s     $f10, $f8, $f10
+/* 7E2F30 802820B0 00000000 */  nop       
+/* 7E2F34 802820B4 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2F38 802820B8 44810000 */  mtc1      $at, $f0
+/* 7E2F3C 802820BC 00000000 */  nop       
+/* 7E2F40 802820C0 46004202 */  mul.s     $f8, $f8, $f0
+/* 7E2F44 802820C4 00000000 */  nop       
+/* 7E2F48 802820C8 46003182 */  mul.s     $f6, $f6, $f0
+/* 7E2F4C 802820CC 00000000 */  nop       
+/* 7E2F50 802820D0 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2F54 802820D4 460C1300 */  add.s     $f12, $f2, $f12
+/* 7E2F58 802820D8 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2F5C 802820DC 46040100 */  add.s     $f4, $f0, $f4
+/* 7E2F60 802820E0 46081081 */  sub.s     $f2, $f2, $f8
+/* 7E2F64 802820E4 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2F68 802820E8 460E6300 */  add.s     $f12, $f12, $f14
+/* 7E2F6C 802820EC E6420014 */  swc1      $f2, 0x14($s2)
+/* 7E2F70 802820F0 460A2101 */  sub.s     $f4, $f4, $f10
+.L802820F4:
+/* 7E2F74 802820F4 E6400018 */  swc1      $f0, 0x18($s2)
+/* 7E2F78 802820F8 E64C000C */  swc1      $f12, 0xc($s2)
+/* 7E2F7C 802820FC 080A0870 */  j         .L802821C0
+/* 7E2F80 80282100 E6440010 */   swc1     $f4, 0x10($s2)
+/* 7E2F84 80282104 C7A80024 */  lwc1      $f8, 0x24($sp)
+/* 7E2F88 80282108 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2F8C 8028210C 44813000 */  mtc1      $at, $f6
+/* 7E2F90 80282110 00000000 */  nop       
+/* 7E2F94 80282114 46064282 */  mul.s     $f10, $f8, $f6
+/* 7E2F98 80282118 00000000 */  nop       
+/* 7E2F9C 8028211C C7A40028 */  lwc1      $f4, 0x28($sp)
+/* 7E2FA0 80282120 46062182 */  mul.s     $f6, $f4, $f6
+/* 7E2FA4 80282124 00000000 */  nop       
+/* 7E2FA8 80282128 3C0141A0 */  lui       $at, 0x41a0
+/* 7E2FAC 8028212C 44810000 */  mtc1      $at, $f0
+/* 7E2FB0 80282130 00000000 */  nop       
+/* 7E2FB4 80282134 46002102 */  mul.s     $f4, $f4, $f0
+/* 7E2FB8 80282138 00000000 */  nop       
+/* 7E2FBC 8028213C 46004202 */  mul.s     $f8, $f8, $f0
+/* 7E2FC0 80282140 00000000 */  nop       
+/* 7E2FC4 80282144 C7A20018 */  lwc1      $f2, 0x18($sp)
+/* 7E2FC8 80282148 460A1300 */  add.s     $f12, $f2, $f10
+/* 7E2FCC 8028214C 460A1081 */  sub.s     $f2, $f2, $f10
+/* 7E2FD0 80282150 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E2FD4 80282154 46060280 */  add.s     $f10, $f0, $f6
+/* 7E2FD8 80282158 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E2FDC 8028215C 46041080 */  add.s     $f2, $f2, $f4
+/* 7E2FE0 80282160 E64C000C */  swc1      $f12, 0xc($s2)
+/* 7E2FE4 80282164 46080000 */  add.s     $f0, $f0, $f8
+/* 7E2FE8 80282168 E64A0010 */  swc1      $f10, 0x10($s2)
+/* 7E2FEC 8028216C 080A086F */  j         .L802821BC
+/* 7E2FF0 80282170 E6420014 */   swc1     $f2, 0x14($s2)
+/* 7E2FF4 80282174 C7A60024 */  lwc1      $f6, 0x24($sp)
+/* 7E2FF8 80282178 3C0141F0 */  lui       $at, 0x41f0
+/* 7E2FFC 8028217C 44810000 */  mtc1      $at, $f0
+/* 7E3000 80282180 00000000 */  nop       
+/* 7E3004 80282184 46003182 */  mul.s     $f6, $f6, $f0
+/* 7E3008 80282188 00000000 */  nop       
+/* 7E300C 8028218C C7A20028 */  lwc1      $f2, 0x28($sp)
+/* 7E3010 80282190 46001082 */  mul.s     $f2, $f2, $f0
+/* 7E3014 80282194 00000000 */  nop       
+/* 7E3018 80282198 C7A40018 */  lwc1      $f4, 0x18($sp)
+/* 7E301C 8028219C 46062200 */  add.s     $f8, $f4, $f6
+/* 7E3020 802821A0 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E3024 802821A4 46020280 */  add.s     $f10, $f0, $f2
+/* 7E3028 802821A8 46062101 */  sub.s     $f4, $f4, $f6
+/* 7E302C 802821AC 46020001 */  sub.s     $f0, $f0, $f2
+/* 7E3030 802821B0 E648000C */  swc1      $f8, 0xc($s2)
+/* 7E3034 802821B4 E64A0010 */  swc1      $f10, 0x10($s2)
+/* 7E3038 802821B8 E6440014 */  swc1      $f4, 0x14($s2)
+.L802821BC:
+/* 7E303C 802821BC E6400018 */  swc1      $f0, 0x18($s2)
+.L802821C0:
+/* 7E3040 802821C0 3C048028 */  lui       $a0, 0x8028
+/* 7E3044 802821C4 248447D4 */  addiu     $a0, $a0, 0x47d4
+/* 7E3048 802821C8 3C02800B */  lui       $v0, %hi(gCameras)
+/* 7E304C 802821CC 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
+/* 7E3050 802821D0 C6400014 */  lwc1      $f0, 0x14($s2)
+/* 7E3054 802821D4 C6420018 */  lwc1      $f2, 0x18($s2)
+/* 7E3058 802821D8 C644000C */  lwc1      $f4, 0xc($s2)
+/* 7E305C 802821DC C6460010 */  lwc1      $f6, 0x10($s2)
+/* 7E3060 802821E0 8FA8002C */  lw        $t0, 0x2c($sp)
+/* 7E3064 802821E4 24050100 */  addiu     $a1, $zero, 0x100
+/* 7E3068 802821E8 AE48002C */  sw        $t0, 0x2c($s2)
+/* 7E306C 802821EC AE5E0030 */  sw        $fp, 0x30($s2)
+/* 7E3070 802821F0 AE550034 */  sw        $s5, 0x34($s2)
+/* 7E3074 802821F4 AE570038 */  sw        $s7, 0x38($s2)
+/* 7E3078 802821F8 E640001C */  swc1      $f0, 0x1c($s2)
+/* 7E307C 802821FC E6420020 */  swc1      $f2, 0x20($s2)
+/* 7E3080 80282200 E6440024 */  swc1      $f4, 0x24($s2)
+/* 7E3084 80282204 E6460028 */  swc1      $f6, 0x28($s2)
+/* 7E3088 80282208 8443002C */  lh        $v1, 0x2c($v0)
+/* 7E308C 8028220C 0280302D */  daddu     $a2, $s4, $zero
+/* 7E3090 80282210 AE430040 */  sw        $v1, 0x40($s2)
+/* 7E3094 80282214 8443002E */  lh        $v1, 0x2e($v0)
+/* 7E3098 80282218 0000382D */  daddu     $a3, $zero, $zero
+/* 7E309C 8028221C AE430044 */  sw        $v1, 0x44($s2)
+/* 7E30A0 80282220 84420030 */  lh        $v0, 0x30($v0)
+/* 7E30A4 80282224 24100003 */  addiu     $s0, $zero, 3
+/* 7E30A8 80282228 AE420048 */  sw        $v0, 0x48($s2)
+/* 7E30AC 8028222C AFB20010 */  sw        $s2, 0x10($sp)
+/* 7E30B0 80282230 0C0B10AA */  jal       bind_trigger_1
+/* 7E30B4 80282234 AFB00014 */   sw       $s0, 0x14($sp)
+/* 7E30B8 80282238 32620800 */  andi      $v0, $s3, 0x800
+/* 7E30BC 8028223C 10400005 */  beqz      $v0, .L80282254
+/* 7E30C0 80282240 24050040 */   addiu    $a1, $zero, 0x40
+/* 7E30C4 80282244 3C048028 */  lui       $a0, 0x8028
+/* 7E30C8 80282248 24844F80 */  addiu     $a0, $a0, 0x4f80
+/* 7E30CC 8028224C 080A0899 */  j         .L80282264
+/* 7E30D0 80282250 02C0302D */   daddu    $a2, $s6, $zero
+.L80282254:
+/* 7E30D4 80282254 3C048028 */  lui       $a0, 0x8028
+/* 7E30D8 80282258 24844F80 */  addiu     $a0, $a0, 0x4f80
+/* 7E30DC 8028225C 24050100 */  addiu     $a1, $zero, 0x100
+/* 7E30E0 80282260 02C0302D */  daddu     $a2, $s6, $zero
+.L80282264:
+/* 7E30E4 80282264 24070001 */  addiu     $a3, $zero, 1
+/* 7E30E8 80282268 AFB20010 */  sw        $s2, 0x10($sp)
+/* 7E30EC 8028226C 0C0B10AA */  jal       bind_trigger_1
+/* 7E30F0 80282270 AFB00014 */   sw       $s0, 0x14($sp)
+/* 7E30F4 80282274 8FBF0054 */  lw        $ra, 0x54($sp)
+/* 7E30F8 80282278 8FBE0050 */  lw        $fp, 0x50($sp)
+/* 7E30FC 8028227C 8FB7004C */  lw        $s7, 0x4c($sp)
+/* 7E3100 80282280 8FB60048 */  lw        $s6, 0x48($sp)
+/* 7E3104 80282284 8FB50044 */  lw        $s5, 0x44($sp)
+/* 7E3108 80282288 8FB40040 */  lw        $s4, 0x40($sp)
+/* 7E310C 8028228C 8FB3003C */  lw        $s3, 0x3c($sp)
+/* 7E3110 80282290 8FB20038 */  lw        $s2, 0x38($sp)
+/* 7E3114 80282294 8FB10034 */  lw        $s1, 0x34($sp)
+/* 7E3118 80282298 8FB00030 */  lw        $s0, 0x30($sp)
+/* 7E311C 8028229C 24020002 */  addiu     $v0, $zero, 2
+/* 7E3120 802822A0 03E00008 */  jr        $ra
+/* 7E3124 802822A4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
new file mode 100644
index 0000000000..ab3b55dccd
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s
@@ -0,0 +1,31 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802822A8
+/* 7E3128 802822A8 27BDFFD0 */  addiu     $sp, $sp, -0x30
+/* 7E312C 802822AC AFBF002C */  sw        $ra, 0x2c($sp)
+/* 7E3130 802822B0 AFB00028 */  sw        $s0, 0x28($sp)
+/* 7E3134 802822B4 8C82000C */  lw        $v0, 0xc($a0)
+/* 7E3138 802822B8 8C450000 */  lw        $a1, ($v0)
+/* 7E313C 802822BC 0C0B1EAF */  jal       get_variable
+/* 7E3140 802822C0 8C900074 */   lw       $s0, 0x74($a0)
+/* 7E3144 802822C4 27A50018 */  addiu     $a1, $sp, 0x18
+/* 7E3148 802822C8 27A6001C */  addiu     $a2, $sp, 0x1c
+/* 7E314C 802822CC 27A70020 */  addiu     $a3, $sp, 0x20
+/* 7E3150 802822D0 8E040060 */  lw        $a0, 0x60($s0)
+/* 7E3154 802822D4 0C016F84 */  jal       get_collider_center
+/* 7E3158 802822D8 0040802D */   daddu    $s0, $v0, $zero
+/* 7E315C 802822DC 0200202D */  daddu     $a0, $s0, $zero
+/* 7E3160 802822E0 C7A00018 */  lwc1      $f0, 0x18($sp)
+/* 7E3164 802822E4 C7A2001C */  lwc1      $f2, 0x1c($sp)
+/* 7E3168 802822E8 44060000 */  mfc1      $a2, $f0
+/* 7E316C 802822EC 44071000 */  mfc1      $a3, $f2
+/* 7E3170 802822F0 C7A00020 */  lwc1      $f0, 0x20($sp)
+/* 7E3174 802822F4 0000282D */  daddu     $a1, $zero, $zero
+/* 7E3178 802822F8 0C052757 */  jal       play_sound_at_position
+/* 7E317C 802822FC E7A00010 */   swc1     $f0, 0x10($sp)
+/* 7E3180 80282300 8FBF002C */  lw        $ra, 0x2c($sp)
+/* 7E3184 80282304 8FB00028 */  lw        $s0, 0x28($sp)
+/* 7E3188 80282308 24020002 */  addiu     $v0, $zero, 2
+/* 7E318C 8028230C 03E00008 */  jr        $ra
+/* 7E3190 80282310 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s b/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s
new file mode 100644
index 0000000000..81bfaff00a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s
@@ -0,0 +1,21 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8028236C
+/* 7E31EC 8028236C 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E31F0 80282370 AFBF0014 */  sw        $ra, 0x14($sp)
+/* 7E31F4 80282374 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E31F8 80282378 8C82000C */  lw        $v0, 0xc($a0)
+/* 7E31FC 8028237C 8C450000 */  lw        $a1, ($v0)
+/* 7E3200 80282380 0C0B1EAF */  jal       get_variable
+/* 7E3204 80282384 8C900074 */   lw       $s0, 0x74($a0)
+/* 7E3208 80282388 00021080 */  sll       $v0, $v0, 2
+/* 7E320C 8028238C 02028021 */  addu      $s0, $s0, $v0
+/* 7E3210 80282390 0C0B1059 */  jal       does_script_exist
+/* 7E3214 80282394 8E04004C */   lw       $a0, 0x4c($s0)
+/* 7E3218 80282398 2C420001 */  sltiu     $v0, $v0, 1
+/* 7E321C 8028239C 8FBF0014 */  lw        $ra, 0x14($sp)
+/* 7E3220 802823A0 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3224 802823A4 00021040 */  sll       $v0, $v0, 1
+/* 7E3228 802823A8 03E00008 */  jr        $ra
+/* 7E322C 802823AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s
new file mode 100644
index 0000000000..0bb756e36c
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s
@@ -0,0 +1,29 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802823B0
+/* 7E3230 802823B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E3234 802823B4 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E3238 802823B8 0080802D */  daddu     $s0, $a0, $zero
+/* 7E323C 802823BC AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E3240 802823C0 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E3244 802823C4 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E3248 802823C8 8E11000C */  lw        $s1, 0xc($s0)
+/* 7E324C 802823CC 8E120074 */  lw        $s2, 0x74($s0)
+/* 7E3250 802823D0 8E250000 */  lw        $a1, ($s1)
+/* 7E3254 802823D4 0C0B1EAF */  jal       get_variable
+/* 7E3258 802823D8 26310004 */   addiu    $s1, $s1, 4
+/* 7E325C 802823DC 0200202D */  daddu     $a0, $s0, $zero
+/* 7E3260 802823E0 8E250000 */  lw        $a1, ($s1)
+/* 7E3264 802823E4 0C0B1EAF */  jal       get_variable
+/* 7E3268 802823E8 0040802D */   daddu    $s0, $v0, $zero
+/* 7E326C 802823EC 00108080 */  sll       $s0, $s0, 2
+/* 7E3270 802823F0 02509021 */  addu      $s2, $s2, $s0
+/* 7E3274 802823F4 AE42004C */  sw        $v0, 0x4c($s2)
+/* 7E3278 802823F8 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E327C 802823FC 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E3280 80282400 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3284 80282404 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3288 80282408 24020002 */  addiu     $v0, $zero, 2
+/* 7E328C 8028240C 03E00008 */  jr        $ra
+/* 7E3290 80282410 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s
new file mode 100644
index 0000000000..b59342864a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s
@@ -0,0 +1,105 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282414
+/* 7E3294 80282414 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E3298 80282418 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E329C 8028241C 0080882D */  daddu     $s1, $a0, $zero
+/* 7E32A0 80282420 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E32A4 80282424 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E32A8 80282428 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E32AC 8028242C 10A0000A */  beqz      $a1, .L80282458
+/* 7E32B0 80282430 8E320088 */   lw       $s2, 0x88($s1)
+/* 7E32B4 80282434 8E220084 */  lw        $v0, 0x84($s1)
+/* 7E32B8 80282438 54400007 */  bnel      $v0, $zero, .L80282458
+/* 7E32BC 8028243C AE200074 */   sw       $zero, 0x74($s1)
+/* 7E32C0 80282440 962400C2 */  lhu       $a0, 0xc2($s1)
+/* 7E32C4 80282444 2405FFFF */  addiu     $a1, $zero, -1
+/* 7E32C8 80282448 24060001 */  addiu     $a2, $zero, 1
+/* 7E32CC 8028244C 0C046E54 */  jal       func_8011B950
+/* 7E32D0 80282450 00C0382D */   daddu    $a3, $a2, $zero
+/* 7E32D4 80282454 AE200074 */  sw        $zero, 0x74($s1)
+.L80282458:
+/* 7E32D8 80282458 8E220074 */  lw        $v0, 0x74($s1)
+/* 7E32DC 8028245C 24420020 */  addiu     $v0, $v0, 0x20
+/* 7E32E0 80282460 AE220074 */  sw        $v0, 0x74($s1)
+/* 7E32E4 80282464 28420100 */  slti      $v0, $v0, 0x100
+/* 7E32E8 80282468 14400002 */  bnez      $v0, .L80282474
+/* 7E32EC 8028246C 240200FF */   addiu    $v0, $zero, 0xff
+/* 7E32F0 80282470 AE220074 */  sw        $v0, 0x74($s1)
+.L80282474:
+/* 7E32F4 80282474 8E220084 */  lw        $v0, 0x84($s1)
+/* 7E32F8 80282478 14400004 */  bnez      $v0, .L8028248C
+/* 7E32FC 8028247C 240200FF */   addiu    $v0, $zero, 0xff
+/* 7E3300 80282480 8E300074 */  lw        $s0, 0x74($s1)
+/* 7E3304 80282484 080A0926 */  j         .L80282498
+/* 7E3308 80282488 0000202D */   daddu    $a0, $zero, $zero
+.L8028248C:
+/* 7E330C 8028248C 8E230074 */  lw        $v1, 0x74($s1)
+/* 7E3310 80282490 00438023 */  subu      $s0, $v0, $v1
+/* 7E3314 80282494 0000202D */  daddu     $a0, $zero, $zero
+.L80282498:
+/* 7E3318 80282498 0080282D */  daddu     $a1, $a0, $zero
+/* 7E331C 8028249C 0080302D */  daddu     $a2, $a0, $zero
+/* 7E3320 802824A0 0C046F97 */  jal       set_background_color_blend
+/* 7E3324 802824A4 320700FF */   andi     $a3, $s0, 0xff
+/* 7E3328 802824A8 240600FF */  addiu     $a2, $zero, 0xff
+/* 7E332C 802824AC 8E420040 */  lw        $v0, 0x40($s2)
+/* 7E3330 802824B0 00D03023 */  subu      $a2, $a2, $s0
+/* 7E3334 802824B4 00460018 */  mult      $v0, $a2
+/* 7E3338 802824B8 00001012 */  mflo      $v0
+/* 7E333C 802824BC 8E450044 */  lw        $a1, 0x44($s2)
+/* 7E3340 802824C0 00000000 */  nop       
+/* 7E3344 802824C4 00A60018 */  mult      $a1, $a2
+/* 7E3348 802824C8 00002812 */  mflo      $a1
+/* 7E334C 802824CC 3C078080 */  lui       $a3, 0x8080
+/* 7E3350 802824D0 34E78081 */  ori       $a3, $a3, 0x8081
+/* 7E3354 802824D4 00470018 */  mult      $v0, $a3
+/* 7E3358 802824D8 00001810 */  mfhi      $v1
+/* 7E335C 802824DC 00000000 */  nop       
+/* 7E3360 802824E0 00000000 */  nop       
+/* 7E3364 802824E4 00A70018 */  mult      $a1, $a3
+/* 7E3368 802824E8 00004010 */  mfhi      $t0
+/* 7E336C 802824EC 8E440048 */  lw        $a0, 0x48($s2)
+/* 7E3370 802824F0 00621821 */  addu      $v1, $v1, $v0
+/* 7E3374 802824F4 00860018 */  mult      $a0, $a2
+/* 7E3378 802824F8 000319C3 */  sra       $v1, $v1, 7
+/* 7E337C 802824FC 000217C3 */  sra       $v0, $v0, 0x1f
+/* 7E3380 80282500 00621823 */  subu      $v1, $v1, $v0
+/* 7E3384 80282504 3C06800B */  lui       $a2, %hi(gCameras)
+/* 7E3388 80282508 24C61D80 */  addiu     $a2, $a2, %lo(gCameras)
+/* 7E338C 8028250C 00002012 */  mflo      $a0
+/* 7E3390 80282510 01051021 */  addu      $v0, $t0, $a1
+/* 7E3394 80282514 000211C3 */  sra       $v0, $v0, 7
+/* 7E3398 80282518 00870018 */  mult      $a0, $a3
+/* 7E339C 8028251C 00052FC3 */  sra       $a1, $a1, 0x1f
+/* 7E33A0 80282520 00451023 */  subu      $v0, $v0, $a1
+/* 7E33A4 80282524 A4C3002C */  sh        $v1, 0x2c($a2)
+/* 7E33A8 80282528 A4C2002E */  sh        $v0, 0x2e($a2)
+/* 7E33AC 8028252C 00001810 */  mfhi      $v1
+/* 7E33B0 80282530 00641021 */  addu      $v0, $v1, $a0
+/* 7E33B4 80282534 000211C3 */  sra       $v0, $v0, 7
+/* 7E33B8 80282538 000427C3 */  sra       $a0, $a0, 0x1f
+/* 7E33BC 8028253C 00441023 */  subu      $v0, $v0, $a0
+/* 7E33C0 80282540 A4C20030 */  sh        $v0, 0x30($a2)
+/* 7E33C4 80282544 8E220074 */  lw        $v0, 0x74($s1)
+/* 7E33C8 80282548 284200FF */  slti      $v0, $v0, 0xff
+/* 7E33CC 8028254C 1440000B */  bnez      $v0, .L8028257C
+/* 7E33D0 80282550 0000102D */   daddu    $v0, $zero, $zero
+/* 7E33D4 80282554 8E230084 */  lw        $v1, 0x84($s1)
+/* 7E33D8 80282558 24020003 */  addiu     $v0, $zero, 3
+/* 7E33DC 8028255C 14620007 */  bne       $v1, $v0, .L8028257C
+/* 7E33E0 80282560 24020002 */   addiu    $v0, $zero, 2
+/* 7E33E4 80282564 962400C2 */  lhu       $a0, 0xc2($s1)
+/* 7E33E8 80282568 2405FFFF */  addiu     $a1, $zero, -1
+/* 7E33EC 8028256C 0000302D */  daddu     $a2, $zero, $zero
+/* 7E33F0 80282570 0C046E54 */  jal       func_8011B950
+/* 7E33F4 80282574 24070001 */   addiu    $a3, $zero, 1
+/* 7E33F8 80282578 24020002 */  addiu     $v0, $zero, 2
+.L8028257C:
+/* 7E33FC 8028257C 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E3400 80282580 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E3404 80282584 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3408 80282588 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E340C 8028258C 03E00008 */  jr        $ra
+/* 7E3410 80282590 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s
new file mode 100644
index 0000000000..b6ca262f0c
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s
@@ -0,0 +1,60 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282634
+/* 7E34B4 80282634 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E34B8 80282638 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E34BC 8028263C AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E34C0 80282640 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E34C4 80282644 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E34C8 80282648 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E34CC 8028264C 8C820074 */  lw        $v0, 0x74($a0)
+/* 7E34D0 80282650 8C51005C */  lw        $s1, 0x5c($v0)
+/* 7E34D4 80282654 12200022 */  beqz      $s1, .L802826E0
+/* 7E34D8 80282658 0000802D */   daddu    $s0, $zero, $zero
+/* 7E34DC 8028265C 2413FFFC */  addiu     $s3, $zero, -4
+/* 7E34E0 80282660 3C120080 */  lui       $s2, 0x80
+.L80282664:
+/* 7E34E4 80282664 0C00E2B7 */  jal       get_npc_by_index
+/* 7E34E8 80282668 0200202D */   daddu    $a0, $s0, $zero
+/* 7E34EC 8028266C 0040182D */  daddu     $v1, $v0, $zero
+/* 7E34F0 80282670 50600009 */  beql      $v1, $zero, .L80282698
+/* 7E34F4 80282674 26100001 */   addiu    $s0, $s0, 1
+/* 7E34F8 80282678 8C640000 */  lw        $a0, ($v1)
+/* 7E34FC 8028267C 10800006 */  beqz      $a0, .L80282698
+/* 7E3500 80282680 26100001 */   addiu    $s0, $s0, 1
+/* 7E3504 80282684 806200A4 */  lb        $v0, 0xa4($v1)
+/* 7E3508 80282688 10530003 */  beq       $v0, $s3, .L80282698
+/* 7E350C 8028268C 00000000 */   nop      
+/* 7E3510 80282690 00921025 */  or        $v0, $a0, $s2
+/* 7E3514 80282694 AC620000 */  sw        $v0, ($v1)
+.L80282698:
+/* 7E3518 80282698 2A020040 */  slti      $v0, $s0, 0x40
+/* 7E351C 8028269C 1440FFF1 */  bnez      $v0, .L80282664
+/* 7E3520 802826A0 00000000 */   nop      
+/* 7E3524 802826A4 2412FFFF */  addiu     $s2, $zero, -1
+/* 7E3528 802826A8 3C10FF7F */  lui       $s0, 0xff7f
+/* 7E352C 802826AC 3610FFFF */  ori       $s0, $s0, 0xffff
+.L802826B0:
+/* 7E3530 802826B0 8E240000 */  lw        $a0, ($s1)
+/* 7E3534 802826B4 1092000B */  beq       $a0, $s2, .L802826E4
+/* 7E3538 802826B8 24020002 */   addiu    $v0, $zero, 2
+/* 7E353C 802826BC 0C00EAD2 */  jal       get_npc_safe
+/* 7E3540 802826C0 26310004 */   addiu    $s1, $s1, 4
+/* 7E3544 802826C4 0040182D */  daddu     $v1, $v0, $zero
+/* 7E3548 802826C8 1060FFF9 */  beqz      $v1, .L802826B0
+/* 7E354C 802826CC 00000000 */   nop      
+/* 7E3550 802826D0 8C620000 */  lw        $v0, ($v1)
+/* 7E3554 802826D4 00501024 */  and       $v0, $v0, $s0
+/* 7E3558 802826D8 080A09AC */  j         .L802826B0
+/* 7E355C 802826DC AC620000 */   sw       $v0, ($v1)
+.L802826E0:
+/* 7E3560 802826E0 24020002 */  addiu     $v0, $zero, 2
+.L802826E4:
+/* 7E3564 802826E4 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E3568 802826E8 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E356C 802826EC 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E3570 802826F0 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3574 802826F4 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3578 802826F8 03E00008 */  jr        $ra
+/* 7E357C 802826FC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s
new file mode 100644
index 0000000000..43648b447a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s
@@ -0,0 +1,36 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282700
+/* 7E3580 80282700 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E3584 80282704 AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E3588 80282708 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E358C 8028270C AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E3590 80282710 8C820074 */  lw        $v0, 0x74($a0)
+/* 7E3594 80282714 8C42005C */  lw        $v0, 0x5c($v0)
+/* 7E3598 80282718 10400010 */  beqz      $v0, .L8028275C
+/* 7E359C 8028271C 0000802D */   daddu    $s0, $zero, $zero
+/* 7E35A0 80282720 3C11FF7F */  lui       $s1, 0xff7f
+/* 7E35A4 80282724 3631FFFF */  ori       $s1, $s1, 0xffff
+.L80282728:
+/* 7E35A8 80282728 0C00E2B7 */  jal       get_npc_by_index
+/* 7E35AC 8028272C 0200202D */   daddu    $a0, $s0, $zero
+/* 7E35B0 80282730 0040182D */  daddu     $v1, $v0, $zero
+/* 7E35B4 80282734 10600006 */  beqz      $v1, .L80282750
+/* 7E35B8 80282738 26100001 */   addiu    $s0, $s0, 1
+/* 7E35BC 8028273C 8C620000 */  lw        $v0, ($v1)
+/* 7E35C0 80282740 10400003 */  beqz      $v0, .L80282750
+/* 7E35C4 80282744 00000000 */   nop      
+/* 7E35C8 80282748 00511024 */  and       $v0, $v0, $s1
+/* 7E35CC 8028274C AC620000 */  sw        $v0, ($v1)
+.L80282750:
+/* 7E35D0 80282750 2A020040 */  slti      $v0, $s0, 0x40
+/* 7E35D4 80282754 1440FFF4 */  bnez      $v0, .L80282728
+/* 7E35D8 80282758 00000000 */   nop      
+.L8028275C:
+/* 7E35DC 8028275C 24020002 */  addiu     $v0, $zero, 2
+/* 7E35E0 80282760 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E35E4 80282764 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E35E8 80282768 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E35EC 8028276C 03E00008 */  jr        $ra
+/* 7E35F0 80282770 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
new file mode 100644
index 0000000000..bafb271ef5
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
@@ -0,0 +1,112 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel CreatePushBlockGrid
+/* 7E4160 802832E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
+/* 7E4164 802832E4 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E4168 802832E8 0080882D */  daddu     $s1, $a0, $zero
+/* 7E416C 802832EC AFBF0034 */  sw        $ra, 0x34($sp)
+/* 7E4170 802832F0 AFBE0030 */  sw        $fp, 0x30($sp)
+/* 7E4174 802832F4 AFB7002C */  sw        $s7, 0x2c($sp)
+/* 7E4178 802832F8 AFB60028 */  sw        $s6, 0x28($sp)
+/* 7E417C 802832FC AFB50024 */  sw        $s5, 0x24($sp)
+/* 7E4180 80283300 AFB40020 */  sw        $s4, 0x20($sp)
+/* 7E4184 80283304 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E4188 80283308 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E418C 8028330C AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4190 80283310 8E30000C */  lw        $s0, 0xc($s1)
+/* 7E4194 80283314 8E050000 */  lw        $a1, ($s0)
+/* 7E4198 80283318 0C0B1EAF */  jal       get_variable
+/* 7E419C 8028331C 26100004 */   addiu    $s0, $s0, 4
+/* 7E41A0 80283320 8E050000 */  lw        $a1, ($s0)
+/* 7E41A4 80283324 26100004 */  addiu     $s0, $s0, 4
+/* 7E41A8 80283328 0220202D */  daddu     $a0, $s1, $zero
+/* 7E41AC 8028332C 0C0B1EAF */  jal       get_variable
+/* 7E41B0 80283330 0040902D */   daddu    $s2, $v0, $zero
+/* 7E41B4 80283334 8E050000 */  lw        $a1, ($s0)
+/* 7E41B8 80283338 26100004 */  addiu     $s0, $s0, 4
+/* 7E41BC 8028333C 0220202D */  daddu     $a0, $s1, $zero
+/* 7E41C0 80283340 0C0B1EAF */  jal       get_variable
+/* 7E41C4 80283344 0040A82D */   daddu    $s5, $v0, $zero
+/* 7E41C8 80283348 8E050000 */  lw        $a1, ($s0)
+/* 7E41CC 8028334C 26100004 */  addiu     $s0, $s0, 4
+/* 7E41D0 80283350 0220202D */  daddu     $a0, $s1, $zero
+/* 7E41D4 80283354 0C0B1EAF */  jal       get_variable
+/* 7E41D8 80283358 0040A02D */   daddu    $s4, $v0, $zero
+/* 7E41DC 8028335C 8E050000 */  lw        $a1, ($s0)
+/* 7E41E0 80283360 26100004 */  addiu     $s0, $s0, 4
+/* 7E41E4 80283364 0220202D */  daddu     $a0, $s1, $zero
+/* 7E41E8 80283368 0C0B1EAF */  jal       get_variable
+/* 7E41EC 8028336C 0040F02D */   daddu    $fp, $v0, $zero
+/* 7E41F0 80283370 0220202D */  daddu     $a0, $s1, $zero
+/* 7E41F4 80283374 8E050000 */  lw        $a1, ($s0)
+/* 7E41F8 80283378 0C0B1EAF */  jal       get_variable
+/* 7E41FC 8028337C 0040B82D */   daddu    $s7, $v0, $zero
+/* 7E4200 80283380 02B40018 */  mult      $s5, $s4
+/* 7E4204 80283384 26100004 */  addiu     $s0, $s0, 4
+/* 7E4208 80283388 0220202D */  daddu     $a0, $s1, $zero
+/* 7E420C 8028338C 8E050000 */  lw        $a1, ($s0)
+/* 7E4210 80283390 00008812 */  mflo      $s1
+/* 7E4214 80283394 0C0B1EAF */  jal       get_variable
+/* 7E4218 80283398 0040B02D */   daddu    $s6, $v0, $zero
+/* 7E421C 8028339C 2404001C */  addiu     $a0, $zero, 0x1c
+/* 7E4220 802833A0 0C00AB0A */  jal       general_heap_malloc
+/* 7E4224 802833A4 0040982D */   daddu    $s3, $v0, $zero
+/* 7E4228 802833A8 00129080 */  sll       $s2, $s2, 2
+/* 7E422C 802833AC 0040802D */  daddu     $s0, $v0, $zero
+/* 7E4230 802833B0 3C01802E */  lui       $at, 0x802e
+/* 7E4234 802833B4 00320821 */  addu      $at, $at, $s2
+/* 7E4238 802833B8 AC30BC88 */  sw        $s0, -0x4378($at)
+/* 7E423C 802833BC 0C00AB0A */  jal       general_heap_malloc
+/* 7E4240 802833C0 0220202D */   daddu    $a0, $s1, $zero
+/* 7E4244 802833C4 1660000D */  bnez      $s3, .L802833FC
+/* 7E4248 802833C8 AE020000 */   sw       $v0, ($s0)
+/* 7E424C 802833CC 1A200018 */  blez      $s1, .L80283430
+/* 7E4250 802833D0 0000282D */   daddu    $a1, $zero, $zero
+/* 7E4254 802833D4 0220202D */  daddu     $a0, $s1, $zero
+.L802833D8:
+/* 7E4258 802833D8 8E020000 */  lw        $v0, ($s0)
+/* 7E425C 802833DC 00451021 */  addu      $v0, $v0, $a1
+/* 7E4260 802833E0 24A50001 */  addiu     $a1, $a1, 1
+/* 7E4264 802833E4 A0400000 */  sb        $zero, ($v0)
+/* 7E4268 802833E8 00A4102A */  slt       $v0, $a1, $a0
+/* 7E426C 802833EC 1440FFFA */  bnez      $v0, .L802833D8
+/* 7E4270 802833F0 00000000 */   nop      
+/* 7E4274 802833F4 080A0D0D */  j         .L80283434
+/* 7E4278 802833F8 A2150004 */   sb       $s5, 4($s0)
+.L802833FC:
+/* 7E427C 802833FC 0000282D */  daddu     $a1, $zero, $zero
+/* 7E4280 80283400 1A20000B */  blez      $s1, .L80283430
+/* 7E4284 80283404 0260302D */   daddu    $a2, $s3, $zero
+/* 7E4288 80283408 0220202D */  daddu     $a0, $s1, $zero
+/* 7E428C 8028340C 00C51021 */  addu      $v0, $a2, $a1
+.L80283410:
+/* 7E4290 80283410 8E030000 */  lw        $v1, ($s0)
+/* 7E4294 80283414 90420000 */  lbu       $v0, ($v0)
+/* 7E4298 80283418 00651821 */  addu      $v1, $v1, $a1
+/* 7E429C 8028341C 24A50001 */  addiu     $a1, $a1, 1
+/* 7E42A0 80283420 A0620000 */  sb        $v0, ($v1)
+/* 7E42A4 80283424 00A4102A */  slt       $v0, $a1, $a0
+/* 7E42A8 80283428 1440FFF9 */  bnez      $v0, .L80283410
+/* 7E42AC 8028342C 00C51021 */   addu     $v0, $a2, $a1
+.L80283430:
+/* 7E42B0 80283430 A2150004 */  sb        $s5, 4($s0)
+.L80283434:
+/* 7E42B4 80283434 A2140005 */  sb        $s4, 5($s0)
+/* 7E42B8 80283438 AE1E0008 */  sw        $fp, 8($s0)
+/* 7E42BC 8028343C AE17000C */  sw        $s7, 0xc($s0)
+/* 7E42C0 80283440 AE160010 */  sw        $s6, 0x10($s0)
+/* 7E42C4 80283444 AE000014 */  sw        $zero, 0x14($s0)
+/* 7E42C8 80283448 8FBF0034 */  lw        $ra, 0x34($sp)
+/* 7E42CC 8028344C 8FBE0030 */  lw        $fp, 0x30($sp)
+/* 7E42D0 80283450 8FB7002C */  lw        $s7, 0x2c($sp)
+/* 7E42D4 80283454 8FB60028 */  lw        $s6, 0x28($sp)
+/* 7E42D8 80283458 8FB50024 */  lw        $s5, 0x24($sp)
+/* 7E42DC 8028345C 8FB40020 */  lw        $s4, 0x20($sp)
+/* 7E42E0 80283460 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E42E4 80283464 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E42E8 80283468 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E42EC 8028346C 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E42F0 80283470 24020002 */  addiu     $v0, $zero, 2
+/* 7E42F4 80283474 03E00008 */  jr        $ra
+/* 7E42F8 80283478 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
new file mode 100644
index 0000000000..659b71eac8
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
@@ -0,0 +1,65 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel GetGridIndexFromPos
+/* 7E4538 802836B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E453C 802836BC AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E4540 802836C0 0080982D */  daddu     $s3, $a0, $zero
+/* 7E4544 802836C4 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E4548 802836C8 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E454C 802836CC AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E4550 802836D0 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4554 802836D4 8E70000C */  lw        $s0, 0xc($s3)
+/* 7E4558 802836D8 8E050000 */  lw        $a1, ($s0)
+/* 7E455C 802836DC 0C0B1EAF */  jal       get_variable
+/* 7E4560 802836E0 26100004 */   addiu    $s0, $s0, 4
+/* 7E4564 802836E4 8E050000 */  lw        $a1, ($s0)
+/* 7E4568 802836E8 26100004 */  addiu     $s0, $s0, 4
+/* 7E456C 802836EC 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4570 802836F0 0C0B1EAF */  jal       get_variable
+/* 7E4574 802836F4 0040882D */   daddu    $s1, $v0, $zero
+/* 7E4578 802836F8 0040902D */  daddu     $s2, $v0, $zero
+/* 7E457C 802836FC 8E050000 */  lw        $a1, ($s0)
+/* 7E4580 80283700 26100004 */  addiu     $s0, $s0, 4
+/* 7E4584 80283704 0C0B1EAF */  jal       get_variable
+/* 7E4588 80283708 0260202D */   daddu    $a0, $s3, $zero
+/* 7E458C 8028370C 8E050000 */  lw        $a1, ($s0)
+/* 7E4590 80283710 0C0B1EAF */  jal       get_variable
+/* 7E4594 80283714 0260202D */   daddu    $a0, $s3, $zero
+/* 7E4598 80283718 00118880 */  sll       $s1, $s1, 2
+/* 7E459C 8028371C 3C04802E */  lui       $a0, 0x802e
+/* 7E45A0 80283720 00912021 */  addu      $a0, $a0, $s1
+/* 7E45A4 80283724 8C84BC88 */  lw        $a0, -0x4378($a0)
+/* 7E45A8 80283728 3C0651EB */  lui       $a2, 0x51eb
+/* 7E45AC 8028372C 8C830008 */  lw        $v1, 8($a0)
+/* 7E45B0 80283730 34C6851F */  ori       $a2, $a2, 0x851f
+/* 7E45B4 80283734 02439023 */  subu      $s2, $s2, $v1
+/* 7E45B8 80283738 02460018 */  mult      $s2, $a2
+/* 7E45BC 8028373C 26100004 */  addiu     $s0, $s0, 4
+/* 7E45C0 80283740 8E050000 */  lw        $a1, ($s0)
+/* 7E45C4 80283744 8E100004 */  lw        $s0, 4($s0)
+/* 7E45C8 80283748 8C830010 */  lw        $v1, 0x10($a0)
+/* 7E45CC 8028374C 00003810 */  mfhi      $a3
+/* 7E45D0 80283750 0260202D */  daddu     $a0, $s3, $zero
+/* 7E45D4 80283754 00431023 */  subu      $v0, $v0, $v1
+/* 7E45D8 80283758 00460018 */  mult      $v0, $a2
+/* 7E45DC 8028375C 001297C3 */  sra       $s2, $s2, 0x1f
+/* 7E45E0 80283760 000730C3 */  sra       $a2, $a3, 3
+/* 7E45E4 80283764 00D23023 */  subu      $a2, $a2, $s2
+/* 7E45E8 80283768 000217C3 */  sra       $v0, $v0, 0x1f
+/* 7E45EC 8028376C 00001810 */  mfhi      $v1
+/* 7E45F0 80283770 000388C3 */  sra       $s1, $v1, 3
+/* 7E45F4 80283774 0C0B2026 */  jal       set_variable
+/* 7E45F8 80283778 02228823 */   subu     $s1, $s1, $v0
+/* 7E45FC 8028377C 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4600 80283780 0200282D */  daddu     $a1, $s0, $zero
+/* 7E4604 80283784 0C0B2026 */  jal       set_variable
+/* 7E4608 80283788 0220302D */   daddu    $a2, $s1, $zero
+/* 7E460C 8028378C 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E4610 80283790 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E4614 80283794 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E4618 80283798 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E461C 8028379C 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4620 802837A0 24020002 */  addiu     $v0, $zero, 2
+/* 7E4624 802837A4 03E00008 */  jr        $ra
+/* 7E4628 802837A8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
new file mode 100644
index 0000000000..a977ae3e7f
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
@@ -0,0 +1,70 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel GetPushBlock
+/* 7E4440 802835C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E4444 802835C4 AFB40020 */  sw        $s4, 0x20($sp)
+/* 7E4448 802835C8 0080A02D */  daddu     $s4, $a0, $zero
+/* 7E444C 802835CC AFBF0024 */  sw        $ra, 0x24($sp)
+/* 7E4450 802835D0 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E4454 802835D4 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E4458 802835D8 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E445C 802835DC AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4460 802835E0 8E90000C */  lw        $s0, 0xc($s4)
+/* 7E4464 802835E4 8E050000 */  lw        $a1, ($s0)
+/* 7E4468 802835E8 0C0B1EAF */  jal       get_variable
+/* 7E446C 802835EC 26100004 */   addiu    $s0, $s0, 4
+/* 7E4470 802835F0 8E050000 */  lw        $a1, ($s0)
+/* 7E4474 802835F4 26100004 */  addiu     $s0, $s0, 4
+/* 7E4478 802835F8 0280202D */  daddu     $a0, $s4, $zero
+/* 7E447C 802835FC 0C0B1EAF */  jal       get_variable
+/* 7E4480 80283600 0040882D */   daddu    $s1, $v0, $zero
+/* 7E4484 80283604 0280202D */  daddu     $a0, $s4, $zero
+/* 7E4488 80283608 8E050000 */  lw        $a1, ($s0)
+/* 7E448C 8028360C 0C0B1EAF */  jal       get_variable
+/* 7E4490 80283610 0040982D */   daddu    $s3, $v0, $zero
+/* 7E4494 80283614 00118880 */  sll       $s1, $s1, 2
+/* 7E4498 80283618 26100004 */  addiu     $s0, $s0, 4
+/* 7E449C 8028361C 3C12802E */  lui       $s2, 0x802e
+/* 7E44A0 80283620 02519021 */  addu      $s2, $s2, $s1
+/* 7E44A4 80283624 8E52BC88 */  lw        $s2, -0x4378($s2)
+/* 7E44A8 80283628 92430004 */  lbu       $v1, 4($s2)
+/* 7E44AC 8028362C 8E100000 */  lw        $s0, ($s0)
+/* 7E44B0 80283630 0263182A */  slt       $v1, $s3, $v1
+/* 7E44B4 80283634 10600009 */  beqz      $v1, .L8028365C
+/* 7E44B8 80283638 0040882D */   daddu    $s1, $v0, $zero
+/* 7E44BC 8028363C 06600008 */  bltz      $s3, .L80283660
+/* 7E44C0 80283640 0280202D */   daddu    $a0, $s4, $zero
+/* 7E44C4 80283644 92420005 */  lbu       $v0, 5($s2)
+/* 7E44C8 80283648 0222102A */  slt       $v0, $s1, $v0
+/* 7E44CC 8028364C 10400005 */  beqz      $v0, .L80283664
+/* 7E44D0 80283650 0200282D */   daddu    $a1, $s0, $zero
+/* 7E44D4 80283654 06210005 */  bgez      $s1, .L8028366C
+/* 7E44D8 80283658 00000000 */   nop      
+.L8028365C:
+/* 7E44DC 8028365C 0280202D */  daddu     $a0, $s4, $zero
+.L80283660:
+/* 7E44E0 80283660 0200282D */  daddu     $a1, $s0, $zero
+.L80283664:
+/* 7E44E4 80283664 0C0B2026 */  jal       set_variable
+/* 7E44E8 80283668 24060003 */   addiu    $a2, $zero, 3
+.L8028366C:
+/* 7E44EC 8028366C 92420004 */  lbu       $v0, 4($s2)
+/* 7E44F0 80283670 02220018 */  mult      $s1, $v0
+/* 7E44F4 80283674 0280202D */  daddu     $a0, $s4, $zero
+/* 7E44F8 80283678 8E420000 */  lw        $v0, ($s2)
+/* 7E44FC 8028367C 00003812 */  mflo      $a3
+/* 7E4500 80283680 02671821 */  addu      $v1, $s3, $a3
+/* 7E4504 80283684 00431021 */  addu      $v0, $v0, $v1
+/* 7E4508 80283688 90460000 */  lbu       $a2, ($v0)
+/* 7E450C 8028368C 0C0B2026 */  jal       set_variable
+/* 7E4510 80283690 0200282D */   daddu    $a1, $s0, $zero
+/* 7E4514 80283694 8FBF0024 */  lw        $ra, 0x24($sp)
+/* 7E4518 80283698 8FB40020 */  lw        $s4, 0x20($sp)
+/* 7E451C 8028369C 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E4520 802836A0 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E4524 802836A4 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E4528 802836A8 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E452C 802836AC 24020002 */  addiu     $v0, $zero, 2
+/* 7E4530 802836B0 03E00008 */  jr        $ra
+/* 7E4534 802836B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
new file mode 100644
index 0000000000..6be07e2913
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
@@ -0,0 +1,86 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel SetPushBlock
+/* 7E42FC 8028347C 27BDFFC0 */  addiu     $sp, $sp, -0x40
+/* 7E4300 80283480 AFB30034 */  sw        $s3, 0x34($sp)
+/* 7E4304 80283484 0080982D */  daddu     $s3, $a0, $zero
+/* 7E4308 80283488 AFBF0038 */  sw        $ra, 0x38($sp)
+/* 7E430C 8028348C AFB20030 */  sw        $s2, 0x30($sp)
+/* 7E4310 80283490 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 7E4314 80283494 AFB00028 */  sw        $s0, 0x28($sp)
+/* 7E4318 80283498 8E70000C */  lw        $s0, 0xc($s3)
+/* 7E431C 8028349C 8E050000 */  lw        $a1, ($s0)
+/* 7E4320 802834A0 0C0B1EAF */  jal       get_variable
+/* 7E4324 802834A4 26100004 */   addiu    $s0, $s0, 4
+/* 7E4328 802834A8 8E050000 */  lw        $a1, ($s0)
+/* 7E432C 802834AC 26100004 */  addiu     $s0, $s0, 4
+/* 7E4330 802834B0 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4334 802834B4 0C0B1EAF */  jal       get_variable
+/* 7E4338 802834B8 0040882D */   daddu    $s1, $v0, $zero
+/* 7E433C 802834BC 8E050000 */  lw        $a1, ($s0)
+/* 7E4340 802834C0 26100004 */  addiu     $s0, $s0, 4
+/* 7E4344 802834C4 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4348 802834C8 0C0B1EAF */  jal       get_variable
+/* 7E434C 802834CC 0040902D */   daddu    $s2, $v0, $zero
+/* 7E4350 802834D0 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4354 802834D4 8E050000 */  lw        $a1, ($s0)
+/* 7E4358 802834D8 0C0B1EAF */  jal       get_variable
+/* 7E435C 802834DC 0040802D */   daddu    $s0, $v0, $zero
+/* 7E4360 802834E0 00118880 */  sll       $s1, $s1, 2
+/* 7E4364 802834E4 3C01802E */  lui       $at, 0x802e
+/* 7E4368 802834E8 00310821 */  addu      $at, $at, $s1
+/* 7E436C 802834EC 8C31BC88 */  lw        $s1, -0x4378($at)
+/* 7E4370 802834F0 92230004 */  lbu       $v1, 4($s1)
+/* 7E4374 802834F4 02030018 */  mult      $s0, $v1
+/* 7E4378 802834F8 8E230000 */  lw        $v1, ($s1)
+/* 7E437C 802834FC 00004012 */  mflo      $t0
+/* 7E4380 80283500 02482021 */  addu      $a0, $s2, $t0
+/* 7E4384 80283504 00641821 */  addu      $v1, $v1, $a0
+/* 7E4388 80283508 A0620000 */  sb        $v0, ($v1)
+/* 7E438C 8028350C 24030001 */  addiu     $v1, $zero, 1
+/* 7E4390 80283510 14430023 */  bne       $v0, $v1, .L802835A0
+/* 7E4394 80283514 3C028000 */   lui      $v0, 0x8000
+/* 7E4398 80283518 3C04802F */  lui       $a0, 0x802f
+/* 7E439C 8028351C 2484A2BC */  addiu     $a0, $a0, -0x5d44
+/* 7E43A0 80283520 8E250008 */  lw        $a1, 8($s1)
+/* 7E43A4 80283524 8E26000C */  lw        $a2, 0xc($s1)
+/* 7E43A8 80283528 8E270010 */  lw        $a3, 0x10($s1)
+/* 7E43AC 8028352C AFA20020 */  sw        $v0, 0x20($sp)
+/* 7E43B0 80283530 00721004 */  sllv      $v0, $s2, $v1
+/* 7E43B4 80283534 00521021 */  addu      $v0, $v0, $s2
+/* 7E43B8 80283538 000210C0 */  sll       $v0, $v0, 3
+/* 7E43BC 8028353C 00521021 */  addu      $v0, $v0, $s2
+/* 7E43C0 80283540 AFA00010 */  sw        $zero, 0x10($sp)
+/* 7E43C4 80283544 AFA00014 */  sw        $zero, 0x14($sp)
+/* 7E43C8 80283548 AFA00018 */  sw        $zero, 0x18($sp)
+/* 7E43CC 8028354C AFA0001C */  sw        $zero, 0x1c($sp)
+/* 7E43D0 80283550 00A22821 */  addu      $a1, $a1, $v0
+/* 7E43D4 80283554 24A5000C */  addiu     $a1, $a1, 0xc
+/* 7E43D8 80283558 00701004 */  sllv      $v0, $s0, $v1
+/* 7E43DC 8028355C 00501021 */  addu      $v0, $v0, $s0
+/* 7E43E0 80283560 000210C0 */  sll       $v0, $v0, 3
+/* 7E43E4 80283564 00501021 */  addu      $v0, $v0, $s0
+/* 7E43E8 80283568 00E23821 */  addu      $a3, $a3, $v0
+/* 7E43EC 8028356C 0C044631 */  jal       create_entity
+/* 7E43F0 80283570 24E7000C */   addiu    $a3, $a3, 0xc
+/* 7E43F4 80283574 3C048028 */  lui       $a0, 0x8028
+/* 7E43F8 80283578 24845674 */  addiu     $a0, $a0, 0x5674
+/* 7E43FC 8028357C 24050040 */  addiu     $a1, $zero, 0x40
+/* 7E4400 80283580 0040802D */  daddu     $s0, $v0, $zero
+/* 7E4404 80283584 26064000 */  addiu     $a2, $s0, 0x4000
+/* 7E4408 80283588 0220382D */  daddu     $a3, $s1, $zero
+/* 7E440C 8028358C 24020003 */  addiu     $v0, $zero, 3
+/* 7E4410 80283590 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4414 80283594 0C0B10AA */  jal       bind_trigger_1
+/* 7E4418 80283598 AFA20014 */   sw       $v0, 0x14($sp)
+/* 7E441C 8028359C AE700084 */  sw        $s0, 0x84($s3)
+.L802835A0:
+/* 7E4420 802835A0 8FBF0038 */  lw        $ra, 0x38($sp)
+/* 7E4424 802835A4 8FB30034 */  lw        $s3, 0x34($sp)
+/* 7E4428 802835A8 8FB20030 */  lw        $s2, 0x30($sp)
+/* 7E442C 802835AC 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 7E4430 802835B0 8FB00028 */  lw        $s0, 0x28($sp)
+/* 7E4434 802835B4 24020002 */  addiu     $v0, $zero, 2
+/* 7E4438 802835B8 03E00008 */  jr        $ra
+/* 7E443C 802835BC 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
new file mode 100644
index 0000000000..2060f0f909
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
@@ -0,0 +1,29 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel SetPushBlockFallEffect
+/* 7E462C 802837AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E4630 802837B0 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E4634 802837B4 0080882D */  daddu     $s1, $a0, $zero
+/* 7E4638 802837B8 AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E463C 802837BC AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4640 802837C0 8E30000C */  lw        $s0, 0xc($s1)
+/* 7E4644 802837C4 8E050000 */  lw        $a1, ($s0)
+/* 7E4648 802837C8 0C0B1EAF */  jal       get_variable
+/* 7E464C 802837CC 26100004 */   addiu    $s0, $s0, 4
+/* 7E4650 802837D0 0220202D */  daddu     $a0, $s1, $zero
+/* 7E4654 802837D4 8E050000 */  lw        $a1, ($s0)
+/* 7E4658 802837D8 0C0B1EAF */  jal       get_variable
+/* 7E465C 802837DC 0040802D */   daddu    $s0, $v0, $zero
+/* 7E4660 802837E0 00108080 */  sll       $s0, $s0, 2
+/* 7E4664 802837E4 3C03802E */  lui       $v1, 0x802e
+/* 7E4668 802837E8 00701821 */  addu      $v1, $v1, $s0
+/* 7E466C 802837EC 8C63BC88 */  lw        $v1, -0x4378($v1)
+/* 7E4670 802837F0 AC620014 */  sw        $v0, 0x14($v1)
+/* 7E4674 802837F4 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E4678 802837F8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E467C 802837FC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4680 80283800 24020002 */  addiu     $v0, $zero, 2
+/* 7E4684 80283804 03E00008 */  jr        $ra
+/* 7E4688 80283808 27BD0020 */   addiu    $sp, $sp, 0x20
+/* 7E468C 8028380C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s
new file mode 100644
index 0000000000..3af1e3c00a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s
@@ -0,0 +1,41 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel TeleportPartnerToPlayer
+/* 7E46FC 8028387C 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
+/* 7E4700 80283880 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
+/* 7E4704 80283884 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E4708 80283888 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E470C 8028388C 3C118011 */  lui       $s1, %hi(gPlayerStatus)
+/* 7E4710 80283890 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
+/* 7E4714 80283894 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E4718 80283898 0220902D */  daddu     $s2, $s1, $zero
+/* 7E471C 8028389C AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E4720 802838A0 10400012 */  beqz      $v0, .L802838EC
+/* 7E4724 802838A4 AFB00010 */   sw       $s0, 0x10($sp)
+/* 7E4728 802838A8 0C00EABB */  jal       get_npc_unsafe
+/* 7E472C 802838AC 2404FFFC */   addiu    $a0, $zero, -4
+/* 7E4730 802838B0 C6200028 */  lwc1      $f0, 0x28($s1)
+/* 7E4734 802838B4 0040802D */  daddu     $s0, $v0, $zero
+/* 7E4738 802838B8 E6000038 */  swc1      $f0, 0x38($s0)
+/* 7E473C 802838BC C6200030 */  lwc1      $f0, 0x30($s1)
+/* 7E4740 802838C0 0C03A969 */  jal       is_current_partner_flying
+/* 7E4744 802838C4 E6000040 */   swc1     $f0, 0x40($s0)
+/* 7E4748 802838C8 10400003 */  beqz      $v0, .L802838D8
+/* 7E474C 802838CC 00000000 */   nop      
+/* 7E4750 802838D0 C620002C */  lwc1      $f0, 0x2c($s1)
+/* 7E4754 802838D4 E600003C */  swc1      $f0, 0x3c($s0)
+.L802838D8:
+/* 7E4758 802838D8 8E450080 */  lw        $a1, 0x80($s2)
+/* 7E475C 802838DC 0C00ECD0 */  jal       set_npc_yaw
+/* 7E4760 802838E0 0200202D */   daddu    $a0, $s0, $zero
+/* 7E4764 802838E4 0C03BD17 */  jal       clear_partner_move_history
+/* 7E4768 802838E8 0200202D */   daddu    $a0, $s0, $zero
+.L802838EC:
+/* 7E476C 802838EC 24020002 */  addiu     $v0, $zero, 2
+/* 7E4770 802838F0 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E4774 802838F4 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E4778 802838F8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E477C 802838FC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4780 80283900 03E00008 */  jr        $ra
+/* 7E4784 80283904 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282880.s b/asm/nonmatchings/world/script_api/7E3700/func_80282880.s
new file mode 100644
index 0000000000..f06a66e3ff
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80282880.s
@@ -0,0 +1,27 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282880
+/* 7E3700 80282880 3C028011 */  lui       $v0, %hi(gPlayerStatus)
+/* 7E3704 80282884 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
+/* 7E3708 80282888 C4420028 */  lwc1      $f2, 0x28($v0)
+/* 7E370C 8028288C C4800084 */  lwc1      $f0, 0x84($a0)
+/* 7E3710 80282890 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3714 80282894 46020001 */  sub.s     $f0, $f0, $f2
+/* 7E3718 80282898 3C013F00 */  lui       $at, 0x3f00
+/* 7E371C 8028289C 44812000 */  mtc1      $at, $f4
+/* 7E3720 802828A0 00000000 */  nop       
+/* 7E3724 802828A4 46040002 */  mul.s     $f0, $f0, $f4
+/* 7E3728 802828A8 00000000 */  nop       
+/* 7E372C 802828AC 46001080 */  add.s     $f2, $f2, $f0
+/* 7E3730 802828B0 E4420028 */  swc1      $f2, 0x28($v0)
+/* 7E3734 802828B4 C4420030 */  lwc1      $f2, 0x30($v0)
+/* 7E3738 802828B8 C480008C */  lwc1      $f0, 0x8c($a0)
+/* 7E373C 802828BC 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3740 802828C0 46020001 */  sub.s     $f0, $f0, $f2
+/* 7E3744 802828C4 46040002 */  mul.s     $f0, $f0, $f4
+/* 7E3748 802828C8 00000000 */  nop       
+/* 7E374C 802828CC 46001080 */  add.s     $f2, $f2, $f0
+/* 7E3750 802828D0 E4420030 */  swc1      $f2, 0x30($v0)
+/* 7E3754 802828D4 03E00008 */  jr        $ra
+/* 7E3758 802828D8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
new file mode 100644
index 0000000000..bf3521561b
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
@@ -0,0 +1,224 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_802828DC
+/* 7E375C 802828DC 27BDFFC0 */  addiu     $sp, $sp, -0x40
+/* 7E3760 802828E0 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E3764 802828E4 0080902D */  daddu     $s2, $a0, $zero
+/* 7E3768 802828E8 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E376C 802828EC AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E3770 802828F0 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E3774 802828F4 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E3778 802828F8 F7B80038 */  sdc1      $f24, 0x38($sp)
+/* 7E377C 802828FC F7B60030 */  sdc1      $f22, 0x30($sp)
+/* 7E3780 80282900 F7B40028 */  sdc1      $f20, 0x28($sp)
+/* 7E3784 80282904 8E4400B0 */  lw        $a0, 0xb0($s2)
+/* 7E3788 80282908 0C04417A */  jal       get_entity_by_index
+/* 7E378C 8028290C 00A0802D */   daddu    $s0, $a1, $zero
+/* 7E3790 80282910 3C138011 */  lui       $s3, %hi(gPlayerStatus)
+/* 7E3794 80282914 2673EFC8 */  addiu     $s3, $s3, %lo(gPlayerStatus)
+/* 7E3798 80282918 1200001A */  beqz      $s0, .L80282984
+/* 7E379C 8028291C 0040882D */   daddu    $s1, $v0, $zero
+/* 7E37A0 80282920 AE400070 */  sw        $zero, 0x70($s2)
+/* 7E37A4 80282924 C6600028 */  lwc1      $f0, 0x28($s3)
+/* 7E37A8 80282928 4600018D */  trunc.w.s $f6, $f0
+/* 7E37AC 8028292C E6460084 */  swc1      $f6, 0x84($s2)
+/* 7E37B0 80282930 C660002C */  lwc1      $f0, 0x2c($s3)
+/* 7E37B4 80282934 4600018D */  trunc.w.s $f6, $f0
+/* 7E37B8 80282938 E6460088 */  swc1      $f6, 0x88($s2)
+/* 7E37BC 8028293C C6600030 */  lwc1      $f0, 0x30($s3)
+/* 7E37C0 80282940 4600018D */  trunc.w.s $f6, $f0
+/* 7E37C4 80282944 E646008C */  swc1      $f6, 0x8c($s2)
+/* 7E37C8 80282948 C6200048 */  lwc1      $f0, 0x48($s1)
+/* 7E37CC 8028294C 4600018D */  trunc.w.s $f6, $f0
+/* 7E37D0 80282950 E6460090 */  swc1      $f6, 0x90($s2)
+/* 7E37D4 80282954 C620004C */  lwc1      $f0, 0x4c($s1)
+/* 7E37D8 80282958 4600018D */  trunc.w.s $f6, $f0
+/* 7E37DC 8028295C E6460094 */  swc1      $f6, 0x94($s2)
+/* 7E37E0 80282960 C6200050 */  lwc1      $f0, 0x50($s1)
+/* 7E37E4 80282964 4600018D */  trunc.w.s $f6, $f0
+/* 7E37E8 80282968 E6460098 */  swc1      $f6, 0x98($s2)
+/* 7E37EC 8028296C C6200060 */  lwc1      $f0, 0x60($s1)
+/* 7E37F0 80282970 4600018D */  trunc.w.s $f6, $f0
+/* 7E37F4 80282974 E64600A8 */  swc1      $f6, 0xa8($s2)
+/* 7E37F8 80282978 C6200068 */  lwc1      $f0, 0x68($s1)
+/* 7E37FC 8028297C 4600018D */  trunc.w.s $f6, $f0
+/* 7E3800 80282980 E64600B4 */  swc1      $f6, 0xb4($s2)
+.L80282984:
+/* 7E3804 80282984 8E420070 */  lw        $v0, 0x70($s2)
+/* 7E3808 80282988 00021080 */  sll       $v0, $v0, 2
+/* 7E380C 8028298C 3C018028 */  lui       $at, 0x8028
+/* 7E3810 80282990 00220821 */  addu      $at, $at, $v0
+/* 7E3814 80282994 C4245640 */  lwc1      $f4, 0x5640($at)
+/* 7E3818 80282998 C642009C */  lwc1      $f2, 0x9c($s2)
+/* 7E381C 8028299C 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E3820 802829A0 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E3824 802829A4 00000000 */  nop       
+/* 7E3828 802829A8 3C0141C8 */  lui       $at, 0x41c8
+/* 7E382C 802829AC 4481C000 */  mtc1      $at, $f24
+/* 7E3830 802829B0 00000000 */  nop       
+/* 7E3834 802829B4 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E3838 802829B8 00000000 */  nop       
+/* 7E383C 802829BC C6400084 */  lwc1      $f0, 0x84($s2)
+/* 7E3840 802829C0 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3844 802829C4 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3848 802829C8 E6600028 */  swc1      $f0, 0x28($s3)
+/* 7E384C 802829CC C64200A0 */  lwc1      $f2, 0xa0($s2)
+/* 7E3850 802829D0 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E3854 802829D4 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E3858 802829D8 00000000 */  nop       
+/* 7E385C 802829DC 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E3860 802829E0 00000000 */  nop       
+/* 7E3864 802829E4 C6400088 */  lwc1      $f0, 0x88($s2)
+/* 7E3868 802829E8 46800020 */  cvt.s.w   $f0, $f0
+/* 7E386C 802829EC 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3870 802829F0 E660002C */  swc1      $f0, 0x2c($s3)
+/* 7E3874 802829F4 C64200A4 */  lwc1      $f2, 0xa4($s2)
+/* 7E3878 802829F8 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E387C 802829FC 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E3880 80282A00 00000000 */  nop       
+/* 7E3884 80282A04 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E3888 80282A08 00000000 */  nop       
+/* 7E388C 80282A0C C640008C */  lwc1      $f0, 0x8c($s2)
+/* 7E3890 80282A10 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3894 80282A14 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3898 80282A18 E6600030 */  swc1      $f0, 0x30($s3)
+/* 7E389C 80282A1C C642009C */  lwc1      $f2, 0x9c($s2)
+/* 7E38A0 80282A20 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E38A4 80282A24 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E38A8 80282A28 00000000 */  nop       
+/* 7E38AC 80282A2C 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E38B0 80282A30 00000000 */  nop       
+/* 7E38B4 80282A34 C6400090 */  lwc1      $f0, 0x90($s2)
+/* 7E38B8 80282A38 46800020 */  cvt.s.w   $f0, $f0
+/* 7E38BC 80282A3C 46020000 */  add.s     $f0, $f0, $f2
+/* 7E38C0 80282A40 E6200048 */  swc1      $f0, 0x48($s1)
+/* 7E38C4 80282A44 C64200A0 */  lwc1      $f2, 0xa0($s2)
+/* 7E38C8 80282A48 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E38CC 80282A4C 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E38D0 80282A50 00000000 */  nop       
+/* 7E38D4 80282A54 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E38D8 80282A58 00000000 */  nop       
+/* 7E38DC 80282A5C C6400094 */  lwc1      $f0, 0x94($s2)
+/* 7E38E0 80282A60 46800020 */  cvt.s.w   $f0, $f0
+/* 7E38E4 80282A64 46020000 */  add.s     $f0, $f0, $f2
+/* 7E38E8 80282A68 E620004C */  swc1      $f0, 0x4c($s1)
+/* 7E38EC 80282A6C C64200A4 */  lwc1      $f2, 0xa4($s2)
+/* 7E38F0 80282A70 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E38F4 80282A74 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E38F8 80282A78 00000000 */  nop       
+/* 7E38FC 80282A7C 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E3900 80282A80 00000000 */  nop       
+/* 7E3904 80282A84 C6400098 */  lwc1      $f0, 0x98($s2)
+/* 7E3908 80282A88 46800020 */  cvt.s.w   $f0, $f0
+/* 7E390C 80282A8C 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3910 80282A90 E6200050 */  swc1      $f0, 0x50($s1)
+/* 7E3914 80282A94 8E420070 */  lw        $v0, 0x70($s2)
+/* 7E3918 80282A98 2842000C */  slti      $v0, $v0, 0xc
+/* 7E391C 80282A9C 1040004D */  beqz      $v0, .L80282BD4
+/* 7E3920 80282AA0 00000000 */   nop      
+/* 7E3924 80282AA4 C642009C */  lwc1      $f2, 0x9c($s2)
+/* 7E3928 80282AA8 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E392C 80282AAC 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E3930 80282AB0 00000000 */  nop       
+/* 7E3934 80282AB4 3C01C2B4 */  lui       $at, 0xc2b4
+/* 7E3938 80282AB8 44810000 */  mtc1      $at, $f0
+/* 7E393C 80282ABC 00000000 */  nop       
+/* 7E3940 80282AC0 46001082 */  mul.s     $f2, $f2, $f0
+/* 7E3944 80282AC4 00000000 */  nop       
+/* 7E3948 80282AC8 C64000B4 */  lwc1      $f0, 0xb4($s2)
+/* 7E394C 80282ACC 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3950 80282AD0 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3954 80282AD4 E6200068 */  swc1      $f0, 0x68($s1)
+/* 7E3958 80282AD8 C64200A4 */  lwc1      $f2, 0xa4($s2)
+/* 7E395C 80282ADC 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E3960 80282AE0 46041082 */  mul.s     $f2, $f2, $f4
+/* 7E3964 80282AE4 00000000 */  nop       
+/* 7E3968 80282AE8 3C0142B4 */  lui       $at, 0x42b4
+/* 7E396C 80282AEC 4481B000 */  mtc1      $at, $f22
+/* 7E3970 80282AF0 00000000 */  nop       
+/* 7E3974 80282AF4 46161082 */  mul.s     $f2, $f2, $f22
+/* 7E3978 80282AF8 00000000 */  nop       
+/* 7E397C 80282AFC 46162582 */  mul.s     $f22, $f4, $f22
+/* 7E3980 80282B00 00000000 */  nop       
+/* 7E3984 80282B04 C64000A8 */  lwc1      $f0, 0xa8($s2)
+/* 7E3988 80282B08 46800020 */  cvt.s.w   $f0, $f0
+/* 7E398C 80282B0C 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3990 80282B10 4600B306 */  mov.s     $f12, $f22
+/* 7E3994 80282B14 0C00A8BB */  jal       sin_deg
+/* 7E3998 80282B18 E6200060 */   swc1     $f0, 0x60($s1)
+/* 7E399C 80282B1C 46180002 */  mul.s     $f0, $f0, $f24
+/* 7E39A0 80282B20 00000000 */  nop       
+/* 7E39A4 80282B24 3C013FE0 */  lui       $at, 0x3fe0
+/* 7E39A8 80282B28 4481A800 */  mtc1      $at, $f21
+/* 7E39AC 80282B2C 4480A000 */  mtc1      $zero, $f20
+/* 7E39B0 80282B30 46000021 */  cvt.d.s   $f0, $f0
+/* 7E39B4 80282B34 46340002 */  mul.d     $f0, $f0, $f20
+/* 7E39B8 80282B38 00000000 */  nop       
+/* 7E39BC 80282B3C C622004C */  lwc1      $f2, 0x4c($s1)
+/* 7E39C0 80282B40 460010A1 */  cvt.d.s   $f2, $f2
+/* 7E39C4 80282B44 46201080 */  add.d     $f2, $f2, $f0
+/* 7E39C8 80282B48 4600B306 */  mov.s     $f12, $f22
+/* 7E39CC 80282B4C 462010A0 */  cvt.s.d   $f2, $f2
+/* 7E39D0 80282B50 0C00A8BB */  jal       sin_deg
+/* 7E39D4 80282B54 E622004C */   swc1     $f2, 0x4c($s1)
+/* 7E39D8 80282B58 C642009C */  lwc1      $f2, 0x9c($s2)
+/* 7E39DC 80282B5C 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E39E0 80282B60 46001082 */  mul.s     $f2, $f2, $f0
+/* 7E39E4 80282B64 00000000 */  nop       
+/* 7E39E8 80282B68 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E39EC 80282B6C 00000000 */  nop       
+/* 7E39F0 80282B70 460010A1 */  cvt.d.s   $f2, $f2
+/* 7E39F4 80282B74 46341082 */  mul.d     $f2, $f2, $f20
+/* 7E39F8 80282B78 00000000 */  nop       
+/* 7E39FC 80282B7C C6200048 */  lwc1      $f0, 0x48($s1)
+/* 7E3A00 80282B80 46000021 */  cvt.d.s   $f0, $f0
+/* 7E3A04 80282B84 46220001 */  sub.d     $f0, $f0, $f2
+/* 7E3A08 80282B88 4600B306 */  mov.s     $f12, $f22
+/* 7E3A0C 80282B8C 46200020 */  cvt.s.d   $f0, $f0
+/* 7E3A10 80282B90 0C00A8BB */  jal       sin_deg
+/* 7E3A14 80282B94 E6200048 */   swc1     $f0, 0x48($s1)
+/* 7E3A18 80282B98 C64200A4 */  lwc1      $f2, 0xa4($s2)
+/* 7E3A1C 80282B9C 468010A0 */  cvt.s.w   $f2, $f2
+/* 7E3A20 80282BA0 46001082 */  mul.s     $f2, $f2, $f0
+/* 7E3A24 80282BA4 00000000 */  nop       
+/* 7E3A28 80282BA8 46181082 */  mul.s     $f2, $f2, $f24
+/* 7E3A2C 80282BAC 00000000 */  nop       
+/* 7E3A30 80282BB0 460010A1 */  cvt.d.s   $f2, $f2
+/* 7E3A34 80282BB4 46341082 */  mul.d     $f2, $f2, $f20
+/* 7E3A38 80282BB8 00000000 */  nop       
+/* 7E3A3C 80282BBC C6200050 */  lwc1      $f0, 0x50($s1)
+/* 7E3A40 80282BC0 46000021 */  cvt.d.s   $f0, $f0
+/* 7E3A44 80282BC4 46220001 */  sub.d     $f0, $f0, $f2
+/* 7E3A48 80282BC8 46200020 */  cvt.s.d   $f0, $f0
+/* 7E3A4C 80282BCC 080A0AF9 */  j         .L80282BE4
+/* 7E3A50 80282BD0 E6200050 */   swc1     $f0, 0x50($s1)
+.L80282BD4:
+/* 7E3A54 80282BD4 44800000 */  mtc1      $zero, $f0
+/* 7E3A58 80282BD8 00000000 */  nop       
+/* 7E3A5C 80282BDC E6200060 */  swc1      $f0, 0x60($s1)
+/* 7E3A60 80282BE0 E6200068 */  swc1      $f0, 0x68($s1)
+.L80282BE4:
+/* 7E3A64 80282BE4 C6600028 */  lwc1      $f0, 0x28($s3)
+/* 7E3A68 80282BE8 C662002C */  lwc1      $f2, 0x2c($s3)
+/* 7E3A6C 80282BEC C6640030 */  lwc1      $f4, 0x30($s3)
+/* 7E3A70 80282BF0 3C02800B */  lui       $v0, %hi(gCameras)
+/* 7E3A74 80282BF4 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
+/* 7E3A78 80282BF8 E4400060 */  swc1      $f0, 0x60($v0)
+/* 7E3A7C 80282BFC E4420064 */  swc1      $f2, 0x64($v0)
+/* 7E3A80 80282C00 E4440068 */  swc1      $f4, 0x68($v0)
+/* 7E3A84 80282C04 8E430070 */  lw        $v1, 0x70($s2)
+/* 7E3A88 80282C08 24630001 */  addiu     $v1, $v1, 1
+/* 7E3A8C 80282C0C 3862000D */  xori      $v0, $v1, 0xd
+/* 7E3A90 80282C10 AE430070 */  sw        $v1, 0x70($s2)
+/* 7E3A94 80282C14 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E3A98 80282C18 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E3A9C 80282C1C 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E3AA0 80282C20 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3AA4 80282C24 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3AA8 80282C28 D7B80038 */  ldc1      $f24, 0x38($sp)
+/* 7E3AAC 80282C2C D7B60030 */  ldc1      $f22, 0x30($sp)
+/* 7E3AB0 80282C30 D7B40028 */  ldc1      $f20, 0x28($sp)
+/* 7E3AB4 80282C34 2C420001 */  sltiu     $v0, $v0, 1
+/* 7E3AB8 80282C38 03E00008 */  jr        $ra
+/* 7E3ABC 80282C3C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
new file mode 100644
index 0000000000..23ea3d1d15
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
@@ -0,0 +1,133 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282C40
+/* 7E3AC0 80282C40 27BDFFC0 */  addiu     $sp, $sp, -0x40
+/* 7E3AC4 80282C44 AFB30034 */  sw        $s3, 0x34($sp)
+/* 7E3AC8 80282C48 0080982D */  daddu     $s3, $a0, $zero
+/* 7E3ACC 80282C4C AFB00028 */  sw        $s0, 0x28($sp)
+/* 7E3AD0 80282C50 AFBF0038 */  sw        $ra, 0x38($sp)
+/* 7E3AD4 80282C54 AFB20030 */  sw        $s2, 0x30($sp)
+/* 7E3AD8 80282C58 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 7E3ADC 80282C5C 8E6400B0 */  lw        $a0, 0xb0($s3)
+/* 7E3AE0 80282C60 8E7200AC */  lw        $s2, 0xac($s3)
+/* 7E3AE4 80282C64 0C04417A */  jal       get_entity_by_index
+/* 7E3AE8 80282C68 00A0802D */   daddu    $s0, $a1, $zero
+/* 7E3AEC 80282C6C 12000023 */  beqz      $s0, .L80282CFC
+/* 7E3AF0 80282C70 0040882D */   daddu    $s1, $v0, $zero
+/* 7E3AF4 80282C74 0000202D */  daddu     $a0, $zero, $zero
+/* 7E3AF8 80282C78 27A50018 */  addiu     $a1, $sp, 0x18
+/* 7E3AFC 80282C7C 27A20024 */  addiu     $v0, $sp, 0x24
+/* 7E3B00 80282C80 27A6001C */  addiu     $a2, $sp, 0x1c
+/* 7E3B04 80282C84 27A70020 */  addiu     $a3, $sp, 0x20
+/* 7E3B08 80282C88 AE600070 */  sw        $zero, 0x70($s3)
+/* 7E3B0C 80282C8C C620004C */  lwc1      $f0, 0x4c($s1)
+/* 7E3B10 80282C90 3C01420C */  lui       $at, 0x420c
+/* 7E3B14 80282C94 44811000 */  mtc1      $at, $f2
+/* 7E3B18 80282C98 4600020D */  trunc.w.s $f8, $f0
+/* 7E3B1C 80282C9C E6680084 */  swc1      $f8, 0x84($s3)
+/* 7E3B20 80282CA0 E7A20024 */  swc1      $f2, 0x24($sp)
+/* 7E3B24 80282CA4 C6260048 */  lwc1      $f6, 0x48($s1)
+/* 7E3B28 80282CA8 C620004C */  lwc1      $f0, 0x4c($s1)
+/* 7E3B2C 80282CAC 3C0140A0 */  lui       $at, 0x40a0
+/* 7E3B30 80282CB0 44811000 */  mtc1      $at, $f2
+/* 7E3B34 80282CB4 C6240050 */  lwc1      $f4, 0x50($s1)
+/* 7E3B38 80282CB8 46020000 */  add.s     $f0, $f0, $f2
+/* 7E3B3C 80282CBC E7A60018 */  swc1      $f6, 0x18($sp)
+/* 7E3B40 80282CC0 E7A40020 */  swc1      $f4, 0x20($sp)
+/* 7E3B44 80282CC4 E7A0001C */  swc1      $f0, 0x1c($sp)
+/* 7E3B48 80282CC8 0C0372DF */  jal       func_800DCB7C
+/* 7E3B4C 80282CCC AFA20010 */   sw       $v0, 0x10($sp)
+/* 7E3B50 80282CD0 C7A20024 */  lwc1      $f2, 0x24($sp)
+/* 7E3B54 80282CD4 4600120D */  trunc.w.s $f8, $f2
+/* 7E3B58 80282CD8 10400008 */  beqz      $v0, .L80282CFC
+/* 7E3B5C 80282CDC E6680074 */   swc1     $f8, 0x74($s3)
+/* 7E3B60 80282CE0 3C0140C0 */  lui       $at, 0x40c0
+/* 7E3B64 80282CE4 44810000 */  mtc1      $at, $f0
+/* 7E3B68 80282CE8 00000000 */  nop       
+/* 7E3B6C 80282CEC 4600103E */  c.le.s    $f2, $f0
+/* 7E3B70 80282CF0 00000000 */  nop       
+/* 7E3B74 80282CF4 45010047 */  bc1t      .L80282E14
+/* 7E3B78 80282CF8 24020002 */   addiu    $v0, $zero, 2
+.L80282CFC:
+/* 7E3B7C 80282CFC 8E420014 */  lw        $v0, 0x14($s2)
+/* 7E3B80 80282D00 10400019 */  beqz      $v0, .L80282D68
+/* 7E3B84 80282D04 0220202D */   daddu    $a0, $s1, $zero
+/* 7E3B88 80282D08 0040F809 */  jalr      $v0
+/* 7E3B8C 80282D0C 0260282D */   daddu    $a1, $s3, $zero
+/* 7E3B90 80282D10 10400040 */  beqz      $v0, .L80282E14
+/* 7E3B94 80282D14 0000102D */   daddu    $v0, $zero, $zero
+/* 7E3B98 80282D18 C6460008 */  lwc1      $f6, 8($s2)
+/* 7E3B9C 80282D1C 468031A0 */  cvt.s.w   $f6, $f6
+/* 7E3BA0 80282D20 C6400010 */  lwc1      $f0, 0x10($s2)
+/* 7E3BA4 80282D24 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3BA8 80282D28 C6220050 */  lwc1      $f2, 0x50($s1)
+/* 7E3BAC 80282D2C 3C0141C8 */  lui       $at, 0x41c8
+/* 7E3BB0 80282D30 44812000 */  mtc1      $at, $f4
+/* 7E3BB4 80282D34 46001081 */  sub.s     $f2, $f2, $f0
+/* 7E3BB8 80282D38 C6200048 */  lwc1      $f0, 0x48($s1)
+/* 7E3BBC 80282D3C 92420004 */  lbu       $v0, 4($s2)
+/* 7E3BC0 80282D40 46060001 */  sub.s     $f0, $f0, $f6
+/* 7E3BC4 80282D44 46041083 */  div.s     $f2, $f2, $f4
+/* 7E3BC8 80282D48 4600120D */  trunc.w.s $f8, $f2
+/* 7E3BCC 80282D4C 44034000 */  mfc1      $v1, $f8
+/* 7E3BD0 80282D50 00000000 */  nop       
+/* 7E3BD4 80282D54 00620018 */  mult      $v1, $v0
+/* 7E3BD8 80282D58 24020001 */  addiu     $v0, $zero, 1
+/* 7E3BDC 80282D5C 8E430000 */  lw        $v1, ($s2)
+/* 7E3BE0 80282D60 080A0B7D */  j         .L80282DF4
+/* 7E3BE4 80282D64 46040003 */   div.s    $f0, $f0, $f4
+.L80282D68:
+/* 7E3BE8 80282D68 8E620070 */  lw        $v0, 0x70($s3)
+/* 7E3BEC 80282D6C 3C0141C8 */  lui       $at, 0x41c8
+/* 7E3BF0 80282D70 44813000 */  mtc1      $at, $f6
+/* 7E3BF4 80282D74 00021080 */  sll       $v0, $v0, 2
+/* 7E3BF8 80282D78 3C018028 */  lui       $at, 0x8028
+/* 7E3BFC 80282D7C 00220821 */  addu      $at, $at, $v0
+/* 7E3C00 80282D80 C4225640 */  lwc1      $f2, 0x5640($at)
+/* 7E3C04 80282D84 46061082 */  mul.s     $f2, $f2, $f6
+/* 7E3C08 80282D88 00000000 */  nop       
+/* 7E3C0C 80282D8C C6600084 */  lwc1      $f0, 0x84($s3)
+/* 7E3C10 80282D90 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3C14 80282D94 46020001 */  sub.s     $f0, $f0, $f2
+/* 7E3C18 80282D98 E620004C */  swc1      $f0, 0x4c($s1)
+/* 7E3C1C 80282D9C 8E620070 */  lw        $v0, 0x70($s3)
+/* 7E3C20 80282DA0 2403000D */  addiu     $v1, $zero, 0xd
+/* 7E3C24 80282DA4 24420001 */  addiu     $v0, $v0, 1
+/* 7E3C28 80282DA8 14430019 */  bne       $v0, $v1, .L80282E10
+/* 7E3C2C 80282DAC AE620070 */   sw       $v0, 0x70($s3)
+/* 7E3C30 80282DB0 C6400010 */  lwc1      $f0, 0x10($s2)
+/* 7E3C34 80282DB4 46800020 */  cvt.s.w   $f0, $f0
+/* 7E3C38 80282DB8 C6220050 */  lwc1      $f2, 0x50($s1)
+/* 7E3C3C 80282DBC C6440008 */  lwc1      $f4, 8($s2)
+/* 7E3C40 80282DC0 46802120 */  cvt.s.w   $f4, $f4
+/* 7E3C44 80282DC4 46001081 */  sub.s     $f2, $f2, $f0
+/* 7E3C48 80282DC8 C6200048 */  lwc1      $f0, 0x48($s1)
+/* 7E3C4C 80282DCC 92420004 */  lbu       $v0, 4($s2)
+/* 7E3C50 80282DD0 46040001 */  sub.s     $f0, $f0, $f4
+/* 7E3C54 80282DD4 46061083 */  div.s     $f2, $f2, $f6
+/* 7E3C58 80282DD8 4600120D */  trunc.w.s $f8, $f2
+/* 7E3C5C 80282DDC 44034000 */  mfc1      $v1, $f8
+/* 7E3C60 80282DE0 00000000 */  nop       
+/* 7E3C64 80282DE4 00620018 */  mult      $v1, $v0
+/* 7E3C68 80282DE8 24020001 */  addiu     $v0, $zero, 1
+/* 7E3C6C 80282DEC 8E430000 */  lw        $v1, ($s2)
+/* 7E3C70 80282DF0 46060003 */  div.s     $f0, $f0, $f6
+.L80282DF4:
+/* 7E3C74 80282DF4 4600020D */  trunc.w.s $f8, $f0
+/* 7E3C78 80282DF8 44044000 */  mfc1      $a0, $f8
+/* 7E3C7C 80282DFC 00004012 */  mflo      $t0
+/* 7E3C80 80282E00 00882021 */  addu      $a0, $a0, $t0
+/* 7E3C84 80282E04 00641821 */  addu      $v1, $v1, $a0
+/* 7E3C88 80282E08 080A0B85 */  j         .L80282E14
+/* 7E3C8C 80282E0C A0600000 */   sb       $zero, ($v1)
+.L80282E10:
+/* 7E3C90 80282E10 0000102D */  daddu     $v0, $zero, $zero
+.L80282E14:
+/* 7E3C94 80282E14 8FBF0038 */  lw        $ra, 0x38($sp)
+/* 7E3C98 80282E18 8FB30034 */  lw        $s3, 0x34($sp)
+/* 7E3C9C 80282E1C 8FB20030 */  lw        $s2, 0x30($sp)
+/* 7E3CA0 80282E20 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 7E3CA4 80282E24 8FB00028 */  lw        $s0, 0x28($sp)
+/* 7E3CA8 80282E28 03E00008 */  jr        $ra
+/* 7E3CAC 80282E2C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s
new file mode 100644
index 0000000000..c76b40eceb
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s
@@ -0,0 +1,160 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80282E30
+/* 7E3CB0 80282E30 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E3CB4 80282E34 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E3CB8 80282E38 0080802D */  daddu     $s0, $a0, $zero
+/* 7E3CBC 80282E3C AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E3CC0 80282E40 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E3CC4 80282E44 8E0400B0 */  lw        $a0, 0xb0($s0)
+/* 7E3CC8 80282E48 0C04417A */  jal       get_entity_by_index
+/* 7E3CCC 80282E4C 8E1100AC */   lw       $s1, 0xac($s0)
+/* 7E3CD0 80282E50 3C038011 */  lui       $v1, %hi(gPlayerStatus)
+/* 7E3CD4 80282E54 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
+/* 7E3CD8 80282E58 0040502D */  daddu     $t2, $v0, $zero
+/* 7E3CDC 80282E5C C4600028 */  lwc1      $f0, 0x28($v1)
+/* 7E3CE0 80282E60 C462002C */  lwc1      $f2, 0x2c($v1)
+/* 7E3CE4 80282E64 8E2D0008 */  lw        $t5, 8($s1)
+/* 7E3CE8 80282E68 8E2B000C */  lw        $t3, 0xc($s1)
+/* 7E3CEC 80282E6C 8E2C0010 */  lw        $t4, 0x10($s1)
+/* 7E3CF0 80282E70 4600010D */  trunc.w.s $f4, $f0
+/* 7E3CF4 80282E74 44042000 */  mfc1      $a0, $f4
+/* 7E3CF8 80282E78 4600110D */  trunc.w.s $f4, $f2
+/* 7E3CFC 80282E7C 44092000 */  mfc1      $t1, $f4
+/* 7E3D00 80282E80 008D2023 */  subu      $a0, $a0, $t5
+/* 7E3D04 80282E84 C4600030 */  lwc1      $f0, 0x30($v1)
+/* 7E3D08 80282E88 012B4823 */  subu      $t1, $t1, $t3
+/* 7E3D0C 80282E8C 4600010D */  trunc.w.s $f4, $f0
+/* 7E3D10 80282E90 44082000 */  mfc1      $t0, $f4
+/* 7E3D14 80282E94 04810002 */  bgez      $a0, .L80282EA0
+/* 7E3D18 80282E98 010C4023 */   subu     $t0, $t0, $t4
+/* 7E3D1C 80282E9C 2484FFE7 */  addiu     $a0, $a0, -0x19
+.L80282EA0:
+/* 7E3D20 80282EA0 05020001 */  bltzl     $t0, .L80282EA8
+/* 7E3D24 80282EA4 2508FFE7 */   addiu    $t0, $t0, -0x19
+.L80282EA8:
+/* 7E3D28 80282EA8 3C0551EB */  lui       $a1, 0x51eb
+/* 7E3D2C 80282EAC 34A5851F */  ori       $a1, $a1, 0x851f
+/* 7E3D30 80282EB0 00850018 */  mult      $a0, $a1
+/* 7E3D34 80282EB4 00001810 */  mfhi      $v1
+/* 7E3D38 80282EB8 00000000 */  nop       
+/* 7E3D3C 80282EBC 00000000 */  nop       
+/* 7E3D40 80282EC0 01250018 */  mult      $t1, $a1
+/* 7E3D44 80282EC4 000417C3 */  sra       $v0, $a0, 0x1f
+/* 7E3D48 80282EC8 00003010 */  mfhi      $a2
+/* 7E3D4C 80282ECC 000318C3 */  sra       $v1, $v1, 3
+/* 7E3D50 80282ED0 00622023 */  subu      $a0, $v1, $v0
+/* 7E3D54 80282ED4 01050018 */  mult      $t0, $a1
+/* 7E3D58 80282ED8 000917C3 */  sra       $v0, $t1, 0x1f
+/* 7E3D5C 80282EDC 000618C3 */  sra       $v1, $a2, 3
+/* 7E3D60 80282EE0 00624823 */  subu      $t1, $v1, $v0
+/* 7E3D64 80282EE4 000817C3 */  sra       $v0, $t0, 0x1f
+/* 7E3D68 80282EE8 00003810 */  mfhi      $a3
+/* 7E3D6C 80282EEC 000718C3 */  sra       $v1, $a3, 3
+/* 7E3D70 80282EF0 00624023 */  subu      $t0, $v1, $v0
+/* 7E3D74 80282EF4 0080382D */  daddu     $a3, $a0, $zero
+/* 7E3D78 80282EF8 00041040 */  sll       $v0, $a0, 1
+/* 7E3D7C 80282EFC 00441021 */  addu      $v0, $v0, $a0
+/* 7E3D80 80282F00 000210C0 */  sll       $v0, $v0, 3
+/* 7E3D84 80282F04 00822021 */  addu      $a0, $a0, $v0
+/* 7E3D88 80282F08 00091040 */  sll       $v0, $t1, 1
+/* 7E3D8C 80282F0C 00491021 */  addu      $v0, $v0, $t1
+/* 7E3D90 80282F10 000210C0 */  sll       $v0, $v0, 3
+/* 7E3D94 80282F14 01224821 */  addu      $t1, $t1, $v0
+/* 7E3D98 80282F18 0100302D */  daddu     $a2, $t0, $zero
+/* 7E3D9C 80282F1C 00081040 */  sll       $v0, $t0, 1
+/* 7E3DA0 80282F20 00481021 */  addu      $v0, $v0, $t0
+/* 7E3DA4 80282F24 000210C0 */  sll       $v0, $v0, 3
+/* 7E3DA8 80282F28 01024021 */  addu      $t0, $t0, $v0
+/* 7E3DAC 80282F2C 2482000C */  addiu     $v0, $a0, 0xc
+/* 7E3DB0 80282F30 004D2021 */  addu      $a0, $v0, $t5
+/* 7E3DB4 80282F34 012B4821 */  addu      $t1, $t1, $t3
+/* 7E3DB8 80282F38 2502000C */  addiu     $v0, $t0, 0xc
+/* 7E3DBC 80282F3C 004C4021 */  addu      $t0, $v0, $t4
+/* 7E3DC0 80282F40 AE040084 */  sw        $a0, 0x84($s0)
+/* 7E3DC4 80282F44 AE090088 */  sw        $t1, 0x88($s0)
+/* 7E3DC8 80282F48 AE08008C */  sw        $t0, 0x8c($s0)
+/* 7E3DCC 80282F4C C5400048 */  lwc1      $f0, 0x48($t2)
+/* 7E3DD0 80282F50 4600010D */  trunc.w.s $f4, $f0
+/* 7E3DD4 80282F54 44042000 */  mfc1      $a0, $f4
+/* 7E3DD8 80282F58 00000000 */  nop       
+/* 7E3DDC 80282F5C AE040090 */  sw        $a0, 0x90($s0)
+/* 7E3DE0 80282F60 C540004C */  lwc1      $f0, 0x4c($t2)
+/* 7E3DE4 80282F64 4600010D */  trunc.w.s $f4, $f0
+/* 7E3DE8 80282F68 E6040094 */  swc1      $f4, 0x94($s0)
+/* 7E3DEC 80282F6C C5400050 */  lwc1      $f0, 0x50($t2)
+/* 7E3DF0 80282F70 4600010D */  trunc.w.s $f4, $f0
+/* 7E3DF4 80282F74 44032000 */  mfc1      $v1, $f4
+/* 7E3DF8 80282F78 00000000 */  nop       
+/* 7E3DFC 80282F7C AE030098 */  sw        $v1, 0x98($s0)
+/* 7E3E00 80282F80 8E220008 */  lw        $v0, 8($s1)
+/* 7E3E04 80282F84 00822023 */  subu      $a0, $a0, $v0
+/* 7E3E08 80282F88 00850018 */  mult      $a0, $a1
+/* 7E3E0C 80282F8C 8E220010 */  lw        $v0, 0x10($s1)
+/* 7E3E10 80282F90 00005010 */  mfhi      $t2
+/* 7E3E14 80282F94 00624023 */  subu      $t0, $v1, $v0
+/* 7E3E18 80282F98 000417C3 */  sra       $v0, $a0, 0x1f
+/* 7E3E1C 80282F9C 01050018 */  mult      $t0, $a1
+/* 7E3E20 80282FA0 000A18C3 */  sra       $v1, $t2, 3
+/* 7E3E24 80282FA4 00625023 */  subu      $t2, $v1, $v0
+/* 7E3E28 80282FA8 01472823 */  subu      $a1, $t2, $a3
+/* 7E3E2C 80282FAC 000817C3 */  sra       $v0, $t0, 0x1f
+/* 7E3E30 80282FB0 00004810 */  mfhi      $t1
+/* 7E3E34 80282FB4 000918C3 */  sra       $v1, $t1, 3
+/* 7E3E38 80282FB8 00621023 */  subu      $v0, $v1, $v0
+/* 7E3E3C 80282FBC 10A00005 */  beqz      $a1, .L80282FD4
+/* 7E3E40 80282FC0 00462023 */   subu     $a0, $v0, $a2
+/* 7E3E44 80282FC4 10800004 */  beqz      $a0, .L80282FD8
+/* 7E3E48 80282FC8 01453021 */   addu     $a2, $t2, $a1
+/* 7E3E4C 80282FCC 0000202D */  daddu     $a0, $zero, $zero
+/* 7E3E50 80282FD0 0080282D */  daddu     $a1, $a0, $zero
+.L80282FD4:
+/* 7E3E54 80282FD4 01453021 */  addu      $a2, $t2, $a1
+.L80282FD8:
+/* 7E3E58 80282FD8 00441821 */  addu      $v1, $v0, $a0
+/* 7E3E5C 80282FDC AE05009C */  sw        $a1, 0x9c($s0)
+/* 7E3E60 80282FE0 AE0000A0 */  sw        $zero, 0xa0($s0)
+/* 7E3E64 80282FE4 14A00005 */  bnez      $a1, .L80282FFC
+/* 7E3E68 80282FE8 AE0400A4 */   sw       $a0, 0xa4($s0)
+/* 7E3E6C 80282FEC 14800003 */  bnez      $a0, .L80282FFC
+/* 7E3E70 80282FF0 24020002 */   addiu    $v0, $zero, 2
+/* 7E3E74 80282FF4 080A0C1B */  j         .L8028306C
+/* 7E3E78 80282FF8 AE0200A8 */   sw       $v0, 0xa8($s0)
+.L80282FFC:
+/* 7E3E7C 80282FFC 92240004 */  lbu       $a0, 4($s1)
+/* 7E3E80 80283000 00C4102A */  slt       $v0, $a2, $a0
+/* 7E3E84 80283004 10400017 */  beqz      $v0, .L80283064
+/* 7E3E88 80283008 24020001 */   addiu    $v0, $zero, 1
+/* 7E3E8C 8028300C 04C20016 */  bltzl     $a2, .L80283068
+/* 7E3E90 80283010 AE0200A8 */   sw       $v0, 0xa8($s0)
+/* 7E3E94 80283014 92220005 */  lbu       $v0, 5($s1)
+/* 7E3E98 80283018 0062102A */  slt       $v0, $v1, $v0
+/* 7E3E9C 8028301C 10400011 */  beqz      $v0, .L80283064
+/* 7E3EA0 80283020 24020001 */   addiu    $v0, $zero, 1
+/* 7E3EA4 80283024 0460000F */  bltz      $v1, .L80283064
+/* 7E3EA8 80283028 00640018 */   mult     $v1, $a0
+/* 7E3EAC 8028302C 8E220000 */  lw        $v0, ($s1)
+/* 7E3EB0 80283030 00007012 */  mflo      $t6
+/* 7E3EB4 80283034 00CE1821 */  addu      $v1, $a2, $t6
+/* 7E3EB8 80283038 00431021 */  addu      $v0, $v0, $v1
+/* 7E3EBC 8028303C 90420000 */  lbu       $v0, ($v0)
+/* 7E3EC0 80283040 14400008 */  bnez      $v0, .L80283064
+/* 7E3EC4 80283044 24020001 */   addiu    $v0, $zero, 1
+/* 7E3EC8 80283048 3C038016 */  lui       $v1, %hi(gCollisionStatus)
+/* 7E3ECC 8028304C 8463A550 */  lh        $v1, %lo(gCollisionStatus)($v1)
+/* 7E3ED0 80283050 2402FFFF */  addiu     $v0, $zero, -1
+/* 7E3ED4 80283054 10620003 */  beq       $v1, $v0, .L80283064
+/* 7E3ED8 80283058 24020001 */   addiu    $v0, $zero, 1
+/* 7E3EDC 8028305C 080A0C1A */  j         .L80283068
+/* 7E3EE0 80283060 AE0000A8 */   sw       $zero, 0xa8($s0)
+.L80283064:
+/* 7E3EE4 80283064 AE0200A8 */  sw        $v0, 0xa8($s0)
+.L80283068:
+/* 7E3EE8 80283068 24020002 */  addiu     $v0, $zero, 2
+.L8028306C:
+/* 7E3EEC 8028306C 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E3EF0 80283070 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3EF4 80283074 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3EF8 80283078 03E00008 */  jr        $ra
+/* 7E3EFC 8028307C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283080.s b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s
new file mode 100644
index 0000000000..f3ad6ab99a
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s
@@ -0,0 +1,65 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283080
+/* 7E3F00 80283080 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E3F04 80283084 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E3F08 80283088 0080802D */  daddu     $s0, $a0, $zero
+/* 7E3F0C 8028308C AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E3F10 80283090 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E3F14 80283094 8E0400B0 */  lw        $a0, 0xb0($s0)
+/* 7E3F18 80283098 0C04417A */  jal       get_entity_by_index
+/* 7E3F1C 8028309C 8E1100AC */   lw       $s1, 0xac($s0)
+/* 7E3F20 802830A0 3C0551EB */  lui       $a1, 0x51eb
+/* 7E3F24 802830A4 34A5851F */  ori       $a1, $a1, 0x851f
+/* 7E3F28 802830A8 C4400050 */  lwc1      $f0, 0x50($v0)
+/* 7E3F2C 802830AC 8E240010 */  lw        $a0, 0x10($s1)
+/* 7E3F30 802830B0 4600008D */  trunc.w.s $f2, $f0
+/* 7E3F34 802830B4 44031000 */  mfc1      $v1, $f2
+/* 7E3F38 802830B8 00000000 */  nop       
+/* 7E3F3C 802830BC 00641823 */  subu      $v1, $v1, $a0
+/* 7E3F40 802830C0 00650018 */  mult      $v1, $a1
+/* 7E3F44 802830C4 C4400048 */  lwc1      $f0, 0x48($v0)
+/* 7E3F48 802830C8 8E220008 */  lw        $v0, 8($s1)
+/* 7E3F4C 802830CC 00003810 */  mfhi      $a3
+/* 7E3F50 802830D0 4600008D */  trunc.w.s $f2, $f0
+/* 7E3F54 802830D4 44061000 */  mfc1      $a2, $f2
+/* 7E3F58 802830D8 00000000 */  nop       
+/* 7E3F5C 802830DC 00C23023 */  subu      $a2, $a2, $v0
+/* 7E3F60 802830E0 00C50018 */  mult      $a2, $a1
+/* 7E3F64 802830E4 00031FC3 */  sra       $v1, $v1, 0x1f
+/* 7E3F68 802830E8 8E0200A4 */  lw        $v0, 0xa4($s0)
+/* 7E3F6C 802830EC 000738C3 */  sra       $a3, $a3, 3
+/* 7E3F70 802830F0 00E33823 */  subu      $a3, $a3, $v1
+/* 7E3F74 802830F4 00002810 */  mfhi      $a1
+/* 7E3F78 802830F8 92230004 */  lbu       $v1, 4($s1)
+/* 7E3F7C 802830FC 00E21021 */  addu      $v0, $a3, $v0
+/* 7E3F80 80283100 00430018 */  mult      $v0, $v1
+/* 7E3F84 80283104 8E04009C */  lw        $a0, 0x9c($s0)
+/* 7E3F88 80283108 00001012 */  mflo      $v0
+/* 7E3F8C 8028310C 000637C3 */  sra       $a2, $a2, 0x1f
+/* 7E3F90 80283110 000528C3 */  sra       $a1, $a1, 3
+/* 7E3F94 80283114 00E30018 */  mult      $a3, $v1
+/* 7E3F98 80283118 00A62823 */  subu      $a1, $a1, $a2
+/* 7E3F9C 8028311C 00A42021 */  addu      $a0, $a1, $a0
+/* 7E3FA0 80283120 00822021 */  addu      $a0, $a0, $v0
+/* 7E3FA4 80283124 8E230000 */  lw        $v1, ($s1)
+/* 7E3FA8 80283128 00004812 */  mflo      $t1
+/* 7E3FAC 8028312C 00A91021 */  addu      $v0, $a1, $t1
+/* 7E3FB0 80283130 00621021 */  addu      $v0, $v1, $v0
+/* 7E3FB4 80283134 90420000 */  lbu       $v0, ($v0)
+/* 7E3FB8 80283138 00641821 */  addu      $v1, $v1, $a0
+/* 7E3FBC 8028313C A0620000 */  sb        $v0, ($v1)
+/* 7E3FC0 80283140 92220004 */  lbu       $v0, 4($s1)
+/* 7E3FC4 80283144 00E20018 */  mult      $a3, $v0
+/* 7E3FC8 80283148 8E230000 */  lw        $v1, ($s1)
+/* 7E3FCC 8028314C 00003012 */  mflo      $a2
+/* 7E3FD0 80283150 00A62821 */  addu      $a1, $a1, $a2
+/* 7E3FD4 80283154 00651821 */  addu      $v1, $v1, $a1
+/* 7E3FD8 80283158 A0600000 */  sb        $zero, ($v1)
+/* 7E3FDC 8028315C 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E3FE0 80283160 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E3FE4 80283164 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E3FE8 80283168 24020002 */  addiu     $v0, $zero, 2
+/* 7E3FEC 8028316C 03E00008 */  jr        $ra
+/* 7E3FF0 80283170 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283174.s b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s
new file mode 100644
index 0000000000..9ba84c5043
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s
@@ -0,0 +1,33 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283174
+/* 7E3FF4 80283174 3C058011 */  lui       $a1, %hi(gPlayerStatus)
+/* 7E3FF8 80283178 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
+/* 7E3FFC 8028317C 8C8200B0 */  lw        $v0, 0xb0($a0)
+/* 7E4000 80283180 3C038016 */  lui       $v1, %hi(gCollisionStatus)
+/* 7E4004 80283184 8463A550 */  lh        $v1, %lo(gCollisionStatus)($v1)
+/* 7E4008 80283188 24424000 */  addiu     $v0, $v0, 0x4000
+/* 7E400C 8028318C 5462000F */  bnel      $v1, $v0, .L802831CC
+/* 7E4010 80283190 AC8000B8 */   sw       $zero, 0xb8($a0)
+/* 7E4014 80283194 80A300B4 */  lb        $v1, 0xb4($a1)
+/* 7E4018 80283198 24020014 */  addiu     $v0, $zero, 0x14
+/* 7E401C 8028319C 10620005 */  beq       $v1, $v0, .L802831B4
+/* 7E4020 802831A0 24020001 */   addiu    $v0, $zero, 1
+/* 7E4024 802831A4 10620003 */  beq       $v1, $v0, .L802831B4
+/* 7E4028 802831A8 24020002 */   addiu    $v0, $zero, 2
+/* 7E402C 802831AC 54620009 */  bnel      $v1, $v0, .L802831D4
+/* 7E4030 802831B0 AC8000B8 */   sw       $zero, 0xb8($a0)
+.L802831B4:
+/* 7E4034 802831B4 8CA20004 */  lw        $v0, 4($a1)
+/* 7E4038 802831B8 30420001 */  andi      $v0, $v0, 1
+/* 7E403C 802831BC 54400003 */  bnel      $v0, $zero, .L802831CC
+/* 7E4040 802831C0 AC8000B8 */   sw       $zero, 0xb8($a0)
+/* 7E4044 802831C4 24020001 */  addiu     $v0, $zero, 1
+/* 7E4048 802831C8 AC8200B8 */  sw        $v0, 0xb8($a0)
+.L802831CC:
+/* 7E404C 802831CC 03E00008 */  jr        $ra
+/* 7E4050 802831D0 24020002 */   addiu    $v0, $zero, 2
+.L802831D4:
+/* 7E4054 802831D4 03E00008 */  jr        $ra
+/* 7E4058 802831D8 00000000 */   nop      
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283240.s b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s
new file mode 100644
index 0000000000..9ed41dd265
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s
@@ -0,0 +1,48 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283240
+/* 7E40C0 80283240 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E40C4 80283244 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E40C8 80283248 0080982D */  daddu     $s3, $a0, $zero
+/* 7E40CC 8028324C AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E40D0 80283250 0000882D */  daddu     $s1, $zero, $zero
+/* 7E40D4 80283254 AFBF0024 */  sw        $ra, 0x24($sp)
+/* 7E40D8 80283258 AFB40020 */  sw        $s4, 0x20($sp)
+/* 7E40DC 8028325C AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E40E0 80283260 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E40E4 80283264 8E62000C */  lw        $v0, 0xc($s3)
+/* 7E40E8 80283268 8C450004 */  lw        $a1, 4($v0)
+/* 7E40EC 8028326C 8C540000 */  lw        $s4, ($v0)
+/* 7E40F0 80283270 0C0B1EAF */  jal       get_variable
+/* 7E40F4 80283274 0220802D */   daddu    $s0, $s1, $zero
+/* 7E40F8 80283278 0040902D */  daddu     $s2, $v0, $zero
+.L8028327C:
+/* 7E40FC 8028327C 0C0B11E4 */  jal       get_script_by_index
+/* 7E4100 80283280 0200202D */   daddu    $a0, $s0, $zero
+/* 7E4104 80283284 10400006 */  beqz      $v0, .L802832A0
+/* 7E4108 80283288 26100001 */   addiu    $s0, $s0, 1
+/* 7E410C 8028328C 8C42015C */  lw        $v0, 0x15c($v0)
+/* 7E4110 80283290 14520004 */  bne       $v0, $s2, .L802832A4
+/* 7E4114 80283294 2A020080 */   slti     $v0, $s0, 0x80
+/* 7E4118 80283298 080A0CAB */  j         .L802832AC
+/* 7E411C 8028329C 24110001 */   addiu    $s1, $zero, 1
+.L802832A0:
+/* 7E4120 802832A0 2A020080 */  slti      $v0, $s0, 0x80
+.L802832A4:
+/* 7E4124 802832A4 1440FFF5 */  bnez      $v0, .L8028327C
+/* 7E4128 802832A8 00000000 */   nop      
+.L802832AC:
+/* 7E412C 802832AC 0260202D */  daddu     $a0, $s3, $zero
+/* 7E4130 802832B0 0280282D */  daddu     $a1, $s4, $zero
+/* 7E4134 802832B4 0C0B2026 */  jal       set_variable
+/* 7E4138 802832B8 0220302D */   daddu    $a2, $s1, $zero
+/* 7E413C 802832BC 8FBF0024 */  lw        $ra, 0x24($sp)
+/* 7E4140 802832C0 8FB40020 */  lw        $s4, 0x20($sp)
+/* 7E4144 802832C4 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E4148 802832C8 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E414C 802832CC 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E4150 802832D0 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4154 802832D4 24020002 */  addiu     $v0, $zero, 2
+/* 7E4158 802832D8 03E00008 */  jr        $ra
+/* 7E415C 802832DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283810.s b/asm/nonmatchings/world/script_api/7E3700/func_80283810.s
new file mode 100644
index 0000000000..6059f9801d
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283810.s
@@ -0,0 +1,33 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283810
+/* 7E4690 80283810 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E4694 80283814 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4698 80283818 0080802D */  daddu     $s0, $a0, $zero
+/* 7E469C 8028381C AFBF0014 */  sw        $ra, 0x14($sp)
+/* 7E46A0 80283820 0C03AD8E */  jal       partner_get_ride_script
+/* 7E46A4 80283824 AE0000AC */   sw       $zero, 0xac($s0)
+/* 7E46A8 80283828 1040000F */  beqz      $v0, .L80283868
+/* 7E46AC 8028382C 00000000 */   nop      
+/* 7E46B0 80283830 3C028011 */  lui       $v0, %hi(D_8010EBB0)
+/* 7E46B4 80283834 8042EBB0 */  lb        $v0, %lo(D_8010EBB0)($v0)
+/* 7E46B8 80283838 14400003 */  bnez      $v0, .L80283848
+/* 7E46BC 8028383C 24020001 */   addiu    $v0, $zero, 1
+/* 7E46C0 80283840 080A0E1A */  j         .L80283868
+/* 7E46C4 80283844 AE0000AC */   sw       $zero, 0xac($s0)
+.L80283848:
+/* 7E46C8 80283848 0C03AD8E */  jal       partner_get_ride_script
+/* 7E46CC 8028384C AE0200AC */   sw       $v0, 0xac($s0)
+/* 7E46D0 80283850 AE0200B0 */  sw        $v0, 0xb0($s0)
+/* 7E46D4 80283854 3C028011 */  lui       $v0, %hi(gPlayerStatus)
+/* 7E46D8 80283858 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
+/* 7E46DC 8028385C C4400080 */  lwc1      $f0, 0x80($v0)
+/* 7E46E0 80283860 4600008D */  trunc.w.s $f2, $f0
+/* 7E46E4 80283864 E60200B8 */  swc1      $f2, 0xb8($s0)
+.L80283868:
+/* 7E46E8 80283868 8FBF0014 */  lw        $ra, 0x14($sp)
+/* 7E46EC 8028386C 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E46F0 80283870 24020002 */  addiu     $v0, $zero, 2
+/* 7E46F4 80283874 03E00008 */  jr        $ra
+/* 7E46F8 80283878 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283908.s b/asm/nonmatchings/world/script_api/7E3700/func_80283908.s
new file mode 100644
index 0000000000..e00af2cf6e
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283908.s
@@ -0,0 +1,88 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283908
+/* 7E4788 80283908 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 7E478C 8028390C 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 7E4790 80283910 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E4794 80283914 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4798 80283918 3C108011 */  lui       $s0, %hi(gPlayerStatus)
+/* 7E479C 8028391C 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
+/* 7E47A0 80283920 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E47A4 80283924 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E47A8 80283928 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E47AC 8028392C 84620160 */  lh        $v0, 0x160($v1)
+/* 7E47B0 80283930 0200882D */  daddu     $s1, $s0, $zero
+/* 7E47B4 80283934 44820000 */  mtc1      $v0, $f0
+/* 7E47B8 80283938 00000000 */  nop       
+/* 7E47BC 8028393C 46800020 */  cvt.s.w   $f0, $f0
+/* 7E47C0 80283940 E6000028 */  swc1      $f0, 0x28($s0)
+/* 7E47C4 80283944 84620162 */  lh        $v0, 0x162($v1)
+/* 7E47C8 80283948 3C04800B */  lui       $a0, %hi(gCameras)
+/* 7E47CC 8028394C 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
+/* 7E47D0 80283950 44820000 */  mtc1      $v0, $f0
+/* 7E47D4 80283954 00000000 */  nop       
+/* 7E47D8 80283958 46800020 */  cvt.s.w   $f0, $f0
+/* 7E47DC 8028395C E600002C */  swc1      $f0, 0x2c($s0)
+/* 7E47E0 80283960 84620164 */  lh        $v0, 0x164($v1)
+/* 7E47E4 80283964 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 7E47E8 80283968 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 7E47EC 8028396C 44820000 */  mtc1      $v0, $f0
+/* 7E47F0 80283970 00000000 */  nop       
+/* 7E47F4 80283974 46800020 */  cvt.s.w   $f0, $f0
+/* 7E47F8 80283978 00031080 */  sll       $v0, $v1, 2
+/* 7E47FC 8028397C 00431021 */  addu      $v0, $v0, $v1
+/* 7E4800 80283980 00021080 */  sll       $v0, $v0, 2
+/* 7E4804 80283984 00431023 */  subu      $v0, $v0, $v1
+/* 7E4808 80283988 000218C0 */  sll       $v1, $v0, 3
+/* 7E480C 8028398C 00431021 */  addu      $v0, $v0, $v1
+/* 7E4810 80283990 000210C0 */  sll       $v0, $v0, 3
+/* 7E4814 80283994 E6000030 */  swc1      $f0, 0x30($s0)
+/* 7E4818 80283998 3C038011 */  lui       $v1, %hi(gPlayerData+0x12)
+/* 7E481C 8028399C 8063F2A2 */  lb        $v1, %lo(gPlayerData+0x12)($v1)
+/* 7E4820 802839A0 10600022 */  beqz      $v1, .L80283A2C
+/* 7E4824 802839A4 00449021 */   addu     $s2, $v0, $a0
+/* 7E4828 802839A8 0C00EABB */  jal       get_npc_unsafe
+/* 7E482C 802839AC 2404FFFC */   addiu    $a0, $zero, -4
+/* 7E4830 802839B0 C60200A8 */  lwc1      $f2, 0xa8($s0)
+/* 7E4834 802839B4 3C014334 */  lui       $at, 0x4334
+/* 7E4838 802839B8 44810000 */  mtc1      $at, $f0
+/* 7E483C 802839BC 3C01C2B4 */  lui       $at, 0xc2b4
+/* 7E4840 802839C0 44816000 */  mtc1      $at, $f12
+/* 7E4844 802839C4 4600103C */  c.lt.s    $f2, $f0
+/* 7E4848 802839C8 00000000 */  nop       
+/* 7E484C 802839CC 45000003 */  bc1f      .L802839DC
+/* 7E4850 802839D0 0040802D */   daddu    $s0, $v0, $zero
+/* 7E4854 802839D4 3C0142B4 */  lui       $at, 0x42b4
+/* 7E4858 802839D8 44816000 */  mtc1      $at, $f12
+.L802839DC:
+/* 7E485C 802839DC 0C00A6C9 */  jal       clamp_angle
+/* 7E4860 802839E0 00000000 */   nop      
+/* 7E4864 802839E4 C6220028 */  lwc1      $f2, 0x28($s1)
+/* 7E4868 802839E8 E6020038 */  swc1      $f2, 0x38($s0)
+/* 7E486C 802839EC C622002C */  lwc1      $f2, 0x2c($s1)
+/* 7E4870 802839F0 E602003C */  swc1      $f2, 0x3c($s0)
+/* 7E4874 802839F4 C6220030 */  lwc1      $f2, 0x30($s1)
+/* 7E4878 802839F8 26040038 */  addiu     $a0, $s0, 0x38
+/* 7E487C 802839FC E6020040 */  swc1      $f2, 0x40($s0)
+/* 7E4880 80283A00 862200B2 */  lh        $v0, 0xb2($s1)
+/* 7E4884 80283A04 44070000 */  mfc1      $a3, $f0
+/* 7E4888 80283A08 24420005 */  addiu     $v0, $v0, 5
+/* 7E488C 80283A0C 44822000 */  mtc1      $v0, $f4
+/* 7E4890 80283A10 00000000 */  nop       
+/* 7E4894 80283A14 46802120 */  cvt.s.w   $f4, $f4
+/* 7E4898 80283A18 44062000 */  mfc1      $a2, $f4
+/* 7E489C 80283A1C 0C00A7E7 */  jal       add_vec2D_polar
+/* 7E48A0 80283A20 26050040 */   addiu    $a1, $s0, 0x40
+/* 7E48A4 80283A24 0C03BCCA */  jal       enable_partner_ai
+/* 7E48A8 80283A28 00000000 */   nop      
+.L80283A2C:
+/* 7E48AC 80283A2C 24020001 */  addiu     $v0, $zero, 1
+/* 7E48B0 80283A30 A6420008 */  sh        $v0, 8($s2)
+/* 7E48B4 80283A34 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E48B8 80283A38 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E48BC 80283A3C 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E48C0 80283A40 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E48C4 80283A44 24020002 */  addiu     $v0, $zero, 2
+/* 7E48C8 80283A48 03E00008 */  jr        $ra
+/* 7E48CC 80283A4C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s
new file mode 100644
index 0000000000..6fbf4c9b88
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s
@@ -0,0 +1,85 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283A50
+/* 7E48D0 80283A50 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E48D4 80283A54 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E48D8 80283A58 0080902D */  daddu     $s2, $a0, $zero
+/* 7E48DC 80283A5C AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E48E0 80283A60 00A0802D */  daddu     $s0, $a1, $zero
+/* 7E48E4 80283A64 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 7E48E8 80283A68 0C016AFA */  jal       get_current_map_header
+/* 7E48EC 80283A6C AFB10014 */   sw       $s1, 0x14($sp)
+/* 7E48F0 80283A70 0000302D */  daddu     $a2, $zero, $zero
+/* 7E48F4 80283A74 3C118011 */  lui       $s1, %hi(gPlayerStatus)
+/* 7E48F8 80283A78 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
+/* 7E48FC 80283A7C 12000021 */  beqz      $s0, .L80283B04
+/* 7E4900 80283A80 0040282D */   daddu    $a1, $v0, $zero
+/* 7E4904 80283A84 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
+/* 7E4908 80283A88 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
+/* 7E490C 80283A8C 8482008E */  lh        $v0, 0x8e($a0)
+/* 7E4910 80283A90 8CA30014 */  lw        $v1, 0x14($a1)
+/* 7E4914 80283A94 00021100 */  sll       $v0, $v0, 4
+/* 7E4918 80283A98 00431021 */  addu      $v0, $v0, $v1
+/* 7E491C 80283A9C C4400000 */  lwc1      $f0, ($v0)
+/* 7E4920 80283AA0 E6200028 */  swc1      $f0, 0x28($s1)
+/* 7E4924 80283AA4 8482008E */  lh        $v0, 0x8e($a0)
+/* 7E4928 80283AA8 8CA30014 */  lw        $v1, 0x14($a1)
+/* 7E492C 80283AAC 00021100 */  sll       $v0, $v0, 4
+/* 7E4930 80283AB0 00431021 */  addu      $v0, $v0, $v1
+/* 7E4934 80283AB4 C4400008 */  lwc1      $f0, 8($v0)
+/* 7E4938 80283AB8 E6200030 */  swc1      $f0, 0x30($s1)
+/* 7E493C 80283ABC 8482008E */  lh        $v0, 0x8e($a0)
+/* 7E4940 80283AC0 8CA30014 */  lw        $v1, 0x14($a1)
+/* 7E4944 80283AC4 00021100 */  sll       $v0, $v0, 4
+/* 7E4948 80283AC8 00431021 */  addu      $v0, $v0, $v1
+/* 7E494C 80283ACC C4400004 */  lwc1      $f0, 4($v0)
+/* 7E4950 80283AD0 4600018D */  trunc.w.s $f6, $f0
+/* 7E4954 80283AD4 44023000 */  mfc1      $v0, $f6
+/* 7E4958 80283AD8 00000000 */  nop       
+/* 7E495C 80283ADC AE42008C */  sw        $v0, 0x8c($s2)
+/* 7E4960 80283AE0 2442FFD8 */  addiu     $v0, $v0, -0x28
+/* 7E4964 80283AE4 44820000 */  mtc1      $v0, $f0
+/* 7E4968 80283AE8 00000000 */  nop       
+/* 7E496C 80283AEC 46800020 */  cvt.s.w   $f0, $f0
+/* 7E4970 80283AF0 8E220000 */  lw        $v0, ($s1)
+/* 7E4974 80283AF4 3C030400 */  lui       $v1, 0x400
+/* 7E4978 80283AF8 E620002C */  swc1      $f0, 0x2c($s1)
+/* 7E497C 80283AFC 080A0ED2 */  j         .L80283B48
+/* 7E4980 80283B00 00431025 */   or       $v0, $v0, $v1
+.L80283B04:
+/* 7E4984 80283B04 C622002C */  lwc1      $f2, 0x2c($s1)
+/* 7E4988 80283B08 3C013F80 */  lui       $at, 0x3f80
+/* 7E498C 80283B0C 44810000 */  mtc1      $at, $f0
+/* 7E4990 80283B10 00000000 */  nop       
+/* 7E4994 80283B14 46001080 */  add.s     $f2, $f2, $f0
+/* 7E4998 80283B18 E622002C */  swc1      $f2, 0x2c($s1)
+/* 7E499C 80283B1C C640008C */  lwc1      $f0, 0x8c($s2)
+/* 7E49A0 80283B20 46800020 */  cvt.s.w   $f0, $f0
+/* 7E49A4 80283B24 4600103C */  c.lt.s    $f2, $f0
+/* 7E49A8 80283B28 00000000 */  nop       
+/* 7E49AC 80283B2C 45010007 */  bc1t      .L80283B4C
+/* 7E49B0 80283B30 3C03FBFF */   lui      $v1, 0xfbff
+/* 7E49B4 80283B34 3463FFFF */  ori       $v1, $v1, 0xffff
+/* 7E49B8 80283B38 8E220000 */  lw        $v0, ($s1)
+/* 7E49BC 80283B3C 24060002 */  addiu     $a2, $zero, 2
+/* 7E49C0 80283B40 E620002C */  swc1      $f0, 0x2c($s1)
+/* 7E49C4 80283B44 00431024 */  and       $v0, $v0, $v1
+.L80283B48:
+/* 7E49C8 80283B48 AE220000 */  sw        $v0, ($s1)
+.L80283B4C:
+/* 7E49CC 80283B4C C6200028 */  lwc1      $f0, 0x28($s1)
+/* 7E49D0 80283B50 C622002C */  lwc1      $f2, 0x2c($s1)
+/* 7E49D4 80283B54 C6240030 */  lwc1      $f4, 0x30($s1)
+/* 7E49D8 80283B58 3C03800B */  lui       $v1, %hi(gCameras)
+/* 7E49DC 80283B5C 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
+/* 7E49E0 80283B60 E4600060 */  swc1      $f0, 0x60($v1)
+/* 7E49E4 80283B64 E4620064 */  swc1      $f2, 0x64($v1)
+/* 7E49E8 80283B68 E4640068 */  swc1      $f4, 0x68($v1)
+/* 7E49EC 80283B6C 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 7E49F0 80283B70 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E49F4 80283B74 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E49F8 80283B78 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E49FC 80283B7C 00C0102D */  daddu     $v0, $a2, $zero
+/* 7E4A00 80283B80 03E00008 */  jr        $ra
+/* 7E4A04 80283B84 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s b/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s
new file mode 100644
index 0000000000..79ef737efa
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s
@@ -0,0 +1,14 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283B88
+/* 7E4A08 80283B88 3C0141A0 */  lui       $at, 0x41a0
+/* 7E4A0C 80283B8C 44816000 */  mtc1      $at, $f12
+/* 7E4A10 80283B90 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E4A14 80283B94 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 7E4A18 80283B98 0C03BCE5 */  jal       func_800EF394
+/* 7E4A1C 80283B9C 00000000 */   nop      
+/* 7E4A20 80283BA0 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 7E4A24 80283BA4 24020002 */  addiu     $v0, $zero, 2
+/* 7E4A28 80283BA8 03E00008 */  jr        $ra
+/* 7E4A2C 80283BAC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s
new file mode 100644
index 0000000000..ad0f9c2619
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s
@@ -0,0 +1,12 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283BB0
+/* 7E4A30 80283BB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 7E4A34 80283BB4 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 7E4A38 80283BB8 0C03BCE9 */  jal       func_800EF3A4
+/* 7E4A3C 80283BBC 00000000 */   nop      
+/* 7E4A40 80283BC0 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 7E4A44 80283BC4 24020002 */  addiu     $v0, $zero, 2
+/* 7E4A48 80283BC8 03E00008 */  jr        $ra
+/* 7E4A4C 80283BCC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s
new file mode 100644
index 0000000000..3703e72e46
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s
@@ -0,0 +1,30 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283BD0
+/* 7E4A50 80283BD0 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 7E4A54 80283BD4 AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4A58 80283BD8 0080802D */  daddu     $s0, $a0, $zero
+/* 7E4A5C 80283BDC AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E4A60 80283BE0 3C118011 */  lui       $s1, %hi(gPlayerStatus)
+/* 7E4A64 80283BE4 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
+/* 7E4A68 80283BE8 AFBF0018 */  sw        $ra, 0x18($sp)
+/* 7E4A6C 80283BEC 10A00008 */  beqz      $a1, .L80283C10
+/* 7E4A70 80283BF0 8E02000C */   lw       $v0, 0xc($s0)
+/* 7E4A74 80283BF4 0C0B1EAF */  jal       get_variable
+/* 7E4A78 80283BF8 8C450000 */   lw       $a1, ($v0)
+/* 7E4A7C 80283BFC AE020070 */  sw        $v0, 0x70($s0)
+/* 7E4A80 80283C00 8E250080 */  lw        $a1, 0x80($s1)
+/* 7E4A84 80283C04 8E26005C */  lw        $a2, 0x5c($s1)
+/* 7E4A88 80283C08 0C0389DE */  jal       move_player
+/* 7E4A8C 80283C0C 0040202D */   daddu    $a0, $v0, $zero
+.L80283C10:
+/* 7E4A90 80283C10 8E030070 */  lw        $v1, 0x70($s0)
+/* 7E4A94 80283C14 2463FFFF */  addiu     $v1, $v1, -1
+/* 7E4A98 80283C18 AE030070 */  sw        $v1, 0x70($s0)
+/* 7E4A9C 80283C1C 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 7E4AA0 80283C20 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E4AA4 80283C24 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4AA8 80283C28 000317C2 */  srl       $v0, $v1, 0x1f
+/* 7E4AAC 80283C2C 03E00008 */  jr        $ra
+/* 7E4AB0 80283C30 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s b/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s
new file mode 100644
index 0000000000..30588c716d
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s
@@ -0,0 +1,55 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283C34
+/* 7E4AB4 80283C34 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 7E4AB8 80283C38 AFB20018 */  sw        $s2, 0x18($sp)
+/* 7E4ABC 80283C3C 0080902D */  daddu     $s2, $a0, $zero
+/* 7E4AC0 80283C40 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 7E4AC4 80283C44 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 7E4AC8 80283C48 AFB10014 */  sw        $s1, 0x14($sp)
+/* 7E4ACC 80283C4C AFB00010 */  sw        $s0, 0x10($sp)
+/* 7E4AD0 80283C50 0C016AFA */  jal       get_current_map_header
+/* 7E4AD4 80283C54 8E50000C */   lw       $s0, 0xc($s2)
+/* 7E4AD8 80283C58 0240202D */  daddu     $a0, $s2, $zero
+/* 7E4ADC 80283C5C 8C530014 */  lw        $s3, 0x14($v0)
+/* 7E4AE0 80283C60 8E050000 */  lw        $a1, ($s0)
+/* 7E4AE4 80283C64 0C0B1EAF */  jal       get_variable
+/* 7E4AE8 80283C68 26100004 */   addiu    $s0, $s0, 4
+/* 7E4AEC 80283C6C 8E050000 */  lw        $a1, ($s0)
+/* 7E4AF0 80283C70 26100004 */  addiu     $s0, $s0, 4
+/* 7E4AF4 80283C74 00028900 */  sll       $s1, $v0, 4
+/* 7E4AF8 80283C78 02338821 */  addu      $s1, $s1, $s3
+/* 7E4AFC 80283C7C C6200000 */  lwc1      $f0, ($s1)
+/* 7E4B00 80283C80 4600008D */  trunc.w.s $f2, $f0
+/* 7E4B04 80283C84 44061000 */  mfc1      $a2, $f2
+/* 7E4B08 80283C88 0C0B2026 */  jal       set_variable
+/* 7E4B0C 80283C8C 0240202D */   daddu    $a0, $s2, $zero
+/* 7E4B10 80283C90 8E050000 */  lw        $a1, ($s0)
+/* 7E4B14 80283C94 26100004 */  addiu     $s0, $s0, 4
+/* 7E4B18 80283C98 C6200004 */  lwc1      $f0, 4($s1)
+/* 7E4B1C 80283C9C 4600008D */  trunc.w.s $f2, $f0
+/* 7E4B20 80283CA0 44061000 */  mfc1      $a2, $f2
+/* 7E4B24 80283CA4 0C0B2026 */  jal       set_variable
+/* 7E4B28 80283CA8 0240202D */   daddu    $a0, $s2, $zero
+/* 7E4B2C 80283CAC 8E050000 */  lw        $a1, ($s0)
+/* 7E4B30 80283CB0 26100004 */  addiu     $s0, $s0, 4
+/* 7E4B34 80283CB4 C6200008 */  lwc1      $f0, 8($s1)
+/* 7E4B38 80283CB8 4600008D */  trunc.w.s $f2, $f0
+/* 7E4B3C 80283CBC 44061000 */  mfc1      $a2, $f2
+/* 7E4B40 80283CC0 0C0B2026 */  jal       set_variable
+/* 7E4B44 80283CC4 0240202D */   daddu    $a0, $s2, $zero
+/* 7E4B48 80283CC8 C620000C */  lwc1      $f0, 0xc($s1)
+/* 7E4B4C 80283CCC 8E050000 */  lw        $a1, ($s0)
+/* 7E4B50 80283CD0 4600008D */  trunc.w.s $f2, $f0
+/* 7E4B54 80283CD4 44061000 */  mfc1      $a2, $f2
+/* 7E4B58 80283CD8 0C0B2026 */  jal       set_variable
+/* 7E4B5C 80283CDC 0240202D */   daddu    $a0, $s2, $zero
+/* 7E4B60 80283CE0 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 7E4B64 80283CE4 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 7E4B68 80283CE8 8FB20018 */  lw        $s2, 0x18($sp)
+/* 7E4B6C 80283CEC 8FB10014 */  lw        $s1, 0x14($sp)
+/* 7E4B70 80283CF0 8FB00010 */  lw        $s0, 0x10($sp)
+/* 7E4B74 80283CF4 24020002 */  addiu     $v0, $zero, 2
+/* 7E4B78 80283CF8 03E00008 */  jr        $ra
+/* 7E4B7C 80283CFC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
new file mode 100644
index 0000000000..cac5108f20
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
@@ -0,0 +1,33 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283D00
+/* 7E4B80 80283D00 0080282D */  daddu     $a1, $a0, $zero
+/* 7E4B84 80283D04 8CA20090 */  lw        $v0, 0x90($a1)
+/* 7E4B88 80283D08 04400009 */  bltz      $v0, .L80283D30
+/* 7E4B8C 80283D0C 2403FFFF */   addiu    $v1, $zero, -1
+/* 7E4B90 80283D10 3C02802E */  lui       $v0, 0x802e
+/* 7E4B94 80283D14 2442BD28 */  addiu     $v0, $v0, -0x42d8
+/* 7E4B98 80283D18 8CA4008C */  lw        $a0, 0x8c($a1)
+/* 7E4B9C 80283D1C AC430004 */  sw        $v1, 4($v0)
+/* 7E4BA0 80283D20 3C01802E */  lui       $at, 0x802e
+/* 7E4BA4 80283D24 AC23BC7C */  sw        $v1, -0x4384($at)
+/* 7E4BA8 80283D28 080A0F55 */  j         .L80283D54
+/* 7E4BAC 80283D2C AC440000 */   sw       $a0, ($v0)
+.L80283D30:
+/* 7E4BB0 80283D30 3C02802E */  lui       $v0, 0x802e
+/* 7E4BB4 80283D34 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4BB8 80283D38 8CA4008C */  lw        $a0, 0x8c($a1)
+/* 7E4BBC 80283D3C AC430004 */  sw        $v1, 4($v0)
+/* 7E4BC0 80283D40 3C01802E */  lui       $at, 0x802e
+/* 7E4BC4 80283D44 AC23BD28 */  sw        $v1, -0x42d8($at)
+/* 7E4BC8 80283D48 AC440000 */  sw        $a0, ($v0)
+/* 7E4BCC 80283D4C 3C02802E */  lui       $v0, 0x802e
+/* 7E4BD0 80283D50 2442BD28 */  addiu     $v0, $v0, -0x42d8
+.L80283D54:
+/* 7E4BD4 80283D54 ACA2008C */  sw        $v0, 0x8c($a1)
+/* 7E4BD8 80283D58 3C02802E */  lui       $v0, 0x802e
+/* 7E4BDC 80283D5C 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4BE0 80283D60 ACA20090 */  sw        $v0, 0x90($a1)
+/* 7E4BE4 80283D64 03E00008 */  jr        $ra
+/* 7E4BE8 80283D68 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
new file mode 100644
index 0000000000..c14c4cbc3f
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
@@ -0,0 +1,39 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283D6C
+/* 7E4BEC 80283D6C 0080282D */  daddu     $a1, $a0, $zero
+/* 7E4BF0 80283D70 8CA20090 */  lw        $v0, 0x90($a1)
+/* 7E4BF4 80283D74 0440000C */  bltz      $v0, .L80283DA8
+/* 7E4BF8 80283D78 00000000 */   nop      
+/* 7E4BFC 80283D7C 8CA2008C */  lw        $v0, 0x8c($a1)
+/* 7E4C00 80283D80 3C03802E */  lui       $v1, 0x802e
+/* 7E4C04 80283D84 2463BD28 */  addiu     $v1, $v1, -0x42d8
+/* 7E4C08 80283D88 AC620000 */  sw        $v0, ($v1)
+/* 7E4C0C 80283D8C 8CA40094 */  lw        $a0, 0x94($a1)
+/* 7E4C10 80283D90 2402FFFF */  addiu     $v0, $zero, -1
+/* 7E4C14 80283D94 AC620008 */  sw        $v0, 8($v1)
+/* 7E4C18 80283D98 3C01802E */  lui       $at, 0x802e
+/* 7E4C1C 80283D9C AC22BC7C */  sw        $v0, -0x4384($at)
+/* 7E4C20 80283DA0 080A0F74 */  j         .L80283DD0
+/* 7E4C24 80283DA4 AC640004 */   sw       $a0, 4($v1)
+.L80283DA8:
+/* 7E4C28 80283DA8 8CA2008C */  lw        $v0, 0x8c($a1)
+/* 7E4C2C 80283DAC 3C03802E */  lui       $v1, 0x802e
+/* 7E4C30 80283DB0 2463BC7C */  addiu     $v1, $v1, -0x4384
+/* 7E4C34 80283DB4 AC620000 */  sw        $v0, ($v1)
+/* 7E4C38 80283DB8 8CA40094 */  lw        $a0, 0x94($a1)
+/* 7E4C3C 80283DBC 2402FFFF */  addiu     $v0, $zero, -1
+/* 7E4C40 80283DC0 AC620008 */  sw        $v0, 8($v1)
+/* 7E4C44 80283DC4 3C01802E */  lui       $at, 0x802e
+/* 7E4C48 80283DC8 AC22BD28 */  sw        $v0, -0x42d8($at)
+/* 7E4C4C 80283DCC AC640004 */  sw        $a0, 4($v1)
+.L80283DD0:
+/* 7E4C50 80283DD0 3C02802E */  lui       $v0, 0x802e
+/* 7E4C54 80283DD4 2442BD28 */  addiu     $v0, $v0, -0x42d8
+/* 7E4C58 80283DD8 ACA2008C */  sw        $v0, 0x8c($a1)
+/* 7E4C5C 80283DDC 3C02802E */  lui       $v0, 0x802e
+/* 7E4C60 80283DE0 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4C64 80283DE4 ACA20090 */  sw        $v0, 0x90($a1)
+/* 7E4C68 80283DE8 03E00008 */  jr        $ra
+/* 7E4C6C 80283DEC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
new file mode 100644
index 0000000000..987b888572
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
@@ -0,0 +1,19 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283DF0
+/* 7E4C70 80283DF0 3C03802E */  lui       $v1, 0x802e
+/* 7E4C74 80283DF4 2463BD28 */  addiu     $v1, $v1, -0x42d8
+/* 7E4C78 80283DF8 8C82008C */  lw        $v0, 0x8c($a0)
+/* 7E4C7C 80283DFC 2406FFFF */  addiu     $a2, $zero, -1
+/* 7E4C80 80283E00 AC660004 */  sw        $a2, 4($v1)
+/* 7E4C84 80283E04 AC620000 */  sw        $v0, ($v1)
+/* 7E4C88 80283E08 8C850090 */  lw        $a1, 0x90($a0)
+/* 7E4C8C 80283E0C 3C02802E */  lui       $v0, 0x802e
+/* 7E4C90 80283E10 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4C94 80283E14 AC460004 */  sw        $a2, 4($v0)
+/* 7E4C98 80283E18 AC450000 */  sw        $a1, ($v0)
+/* 7E4C9C 80283E1C AC820090 */  sw        $v0, 0x90($a0)
+/* 7E4CA0 80283E20 24020002 */  addiu     $v0, $zero, 2
+/* 7E4CA4 80283E24 03E00008 */  jr        $ra
+/* 7E4CA8 80283E28 AC83008C */   sw       $v1, 0x8c($a0)
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
new file mode 100644
index 0000000000..6b1f36df10
--- /dev/null
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
@@ -0,0 +1,25 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80283E2C
+/* 7E4CAC 80283E2C 8C82008C */  lw        $v0, 0x8c($a0)
+/* 7E4CB0 80283E30 3C05802E */  lui       $a1, 0x802e
+/* 7E4CB4 80283E34 24A5BD28 */  addiu     $a1, $a1, -0x42d8
+/* 7E4CB8 80283E38 ACA20000 */  sw        $v0, ($a1)
+/* 7E4CBC 80283E3C 8C820094 */  lw        $v0, 0x94($a0)
+/* 7E4CC0 80283E40 2406FFFF */  addiu     $a2, $zero, -1
+/* 7E4CC4 80283E44 ACA60008 */  sw        $a2, 8($a1)
+/* 7E4CC8 80283E48 ACA20004 */  sw        $v0, 4($a1)
+/* 7E4CCC 80283E4C 8C830090 */  lw        $v1, 0x90($a0)
+/* 7E4CD0 80283E50 3C02802E */  lui       $v0, 0x802e
+/* 7E4CD4 80283E54 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4CD8 80283E58 AC430000 */  sw        $v1, ($v0)
+/* 7E4CDC 80283E5C 8C830098 */  lw        $v1, 0x98($a0)
+/* 7E4CE0 80283E60 AC460008 */  sw        $a2, 8($v0)
+/* 7E4CE4 80283E64 AC430004 */  sw        $v1, 4($v0)
+/* 7E4CE8 80283E68 AC820090 */  sw        $v0, 0x90($a0)
+/* 7E4CEC 80283E6C 24020002 */  addiu     $v0, $zero, 2
+/* 7E4CF0 80283E70 03E00008 */  jr        $ra
+/* 7E4CF4 80283E74 AC85008C */   sw       $a1, 0x8c($a0)
+/* 7E4CF8 80283E78 00000000 */  nop       
+/* 7E4CFC 80283E7C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/world/func_80058DD0.s b/asm/nonmatchings/world/world/func_80058DD0.s
new file mode 100644
index 0000000000..aeabcebb6e
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80058DD0.s
@@ -0,0 +1,51 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80058DD0
+/* 341D0 80058DD0 24050007 */  addiu     $a1, $zero, 7
+/* 341D4 80058DD4 2486000E */  addiu     $a2, $a0, 0xe
+/* 341D8 80058DD8 84830000 */  lh        $v1, ($a0)
+/* 341DC 80058DDC 24020001 */  addiu     $v0, $zero, 1
+/* 341E0 80058DE0 AC82002C */  sw        $v0, 0x2c($a0)
+/* 341E4 80058DE4 00431807 */  srav      $v1, $v1, $v0
+/* 341E8 80058DE8 0060382D */  daddu     $a3, $v1, $zero
+/* 341EC 80058DEC 24024000 */  addiu     $v0, $zero, 0x4000
+/* 341F0 80058DF0 00431023 */  subu      $v0, $v0, $v1
+/* 341F4 80058DF4 A4820002 */  sh        $v0, 2($a0)
+.L80058DF8:
+/* 341F8 80058DF8 A4C00008 */  sh        $zero, 8($a2)
+/* 341FC 80058DFC 24A5FFFF */  addiu     $a1, $a1, -1
+/* 34200 80058E00 04A1FFFD */  bgez      $a1, .L80058DF8
+/* 34204 80058E04 24C6FFFE */   addiu    $a2, $a2, -2
+/* 34208 80058E08 00071400 */  sll       $v0, $a3, 0x10
+/* 3420C 80058E0C 00021403 */  sra       $v0, $v0, 0x10
+/* 34210 80058E10 3C013F10 */  lui       $at, 0x3f10
+/* 34214 80058E14 44811800 */  mtc1      $at, $f3
+/* 34218 80058E18 44801000 */  mtc1      $zero, $f2
+/* 3421C 80058E1C 44820000 */  mtc1      $v0, $f0
+/* 34220 80058E20 00000000 */  nop       
+/* 34224 80058E24 46800021 */  cvt.d.w   $f0, $f0
+/* 34228 80058E28 46220082 */  mul.d     $f2, $f0, $f2
+/* 3422C 80058E2C 00000000 */  nop       
+/* 34230 80058E30 24050009 */  addiu     $a1, $zero, 9
+/* 34234 80058E34 3C0140D0 */  lui       $at, 0x40d0
+/* 34238 80058E38 44813800 */  mtc1      $at, $f7
+/* 3423C 80058E3C 44803000 */  mtc1      $zero, $f6
+/* 34240 80058E40 24830012 */  addiu     $v1, $a0, 0x12
+/* 34244 80058E44 A4870018 */  sh        $a3, 0x18($a0)
+/* 34248 80058E48 46201106 */  mov.d     $f4, $f2
+.L80058E4C:
+/* 3424C 80058E4C 46241082 */  mul.d     $f2, $f2, $f4
+/* 34250 80058E50 00000000 */  nop       
+/* 34254 80058E54 46261002 */  mul.d     $f0, $f2, $f6
+/* 34258 80058E58 00000000 */  nop       
+/* 3425C 80058E5C 24A50001 */  addiu     $a1, $a1, 1
+/* 34260 80058E60 4620020D */  trunc.w.d $f8, $f0
+/* 34264 80058E64 44024000 */  mfc1      $v0, $f8
+/* 34268 80058E68 00000000 */  nop       
+/* 3426C 80058E6C A4620008 */  sh        $v0, 8($v1)
+/* 34270 80058E70 28A20010 */  slti      $v0, $a1, 0x10
+/* 34274 80058E74 1440FFF5 */  bnez      $v0, .L80058E4C
+/* 34278 80058E78 24630002 */   addiu    $v1, $v1, 2
+/* 3427C 80058E7C 03E00008 */  jr        $ra
+/* 34280 80058E80 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/func_80058E84.s b/asm/nonmatchings/world/world/func_80058E84.s
new file mode 100644
index 0000000000..226b4c4634
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80058E84.s
@@ -0,0 +1,70 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80058E84
+/* 34284 80058E84 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 34288 80058E88 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 3428C 80058E8C 0080982D */  daddu     $s3, $a0, $zero
+/* 34290 80058E90 AFB20018 */  sw        $s2, 0x18($sp)
+/* 34294 80058E94 00C0902D */  daddu     $s2, $a2, $zero
+/* 34298 80058E98 0240202D */  daddu     $a0, $s2, $zero
+/* 3429C 80058E9C AFB40020 */  sw        $s4, 0x20($sp)
+/* 342A0 80058EA0 00A0A02D */  daddu     $s4, $a1, $zero
+/* 342A4 80058EA4 24050004 */  addiu     $a1, $zero, 4
+/* 342A8 80058EA8 24060030 */  addiu     $a2, $zero, 0x30
+/* 342AC 80058EAC AFBF0024 */  sw        $ra, 0x24($sp)
+/* 342B0 80058EB0 AFB10014 */  sw        $s1, 0x14($sp)
+/* 342B4 80058EB4 0C015FE4 */  jal       alHeapAlloc
+/* 342B8 80058EB8 AFB00010 */   sw       $s0, 0x10($sp)
+/* 342BC 80058EBC 0240202D */  daddu     $a0, $s2, $zero
+/* 342C0 80058EC0 24050A10 */  addiu     $a1, $zero, 0xa10
+/* 342C4 80058EC4 24060002 */  addiu     $a2, $zero, 2
+/* 342C8 80058EC8 0C015FE4 */  jal       alHeapAlloc
+/* 342CC 80058ECC AE62000C */   sw       $v0, 0xc($s3)
+/* 342D0 80058ED0 0000882D */  daddu     $s1, $zero, $zero
+/* 342D4 80058ED4 AE620000 */  sw        $v0, ($s3)
+/* 342D8 80058ED8 0240202D */  daddu     $a0, $s2, $zero
+.L80058EDC:
+/* 342DC 80058EDC 24050001 */  addiu     $a1, $zero, 1
+/* 342E0 80058EE0 24060010 */  addiu     $a2, $zero, 0x10
+/* 342E4 80058EE4 3223FFFF */  andi      $v1, $s1, 0xffff
+/* 342E8 80058EE8 00A31004 */  sllv      $v0, $v1, $a1
+/* 342EC 80058EEC 00431021 */  addu      $v0, $v0, $v1
+/* 342F0 80058EF0 8E70000C */  lw        $s0, 0xc($s3)
+/* 342F4 80058EF4 00021100 */  sll       $v0, $v0, 4
+/* 342F8 80058EF8 0C015FE4 */  jal       alHeapAlloc
+/* 342FC 80058EFC 02028021 */   addu     $s0, $s0, $v0
+/* 34300 80058F00 0240202D */  daddu     $a0, $s2, $zero
+/* 34304 80058F04 24050001 */  addiu     $a1, $zero, 1
+/* 34308 80058F08 24060020 */  addiu     $a2, $zero, 0x20
+/* 3430C 80058F0C 0C015FE4 */  jal       alHeapAlloc
+/* 34310 80058F10 AE02002C */   sw       $v0, 0x2c($s0)
+/* 34314 80058F14 0240202D */  daddu     $a0, $s2, $zero
+/* 34318 80058F18 24050001 */  addiu     $a1, $zero, 1
+/* 3431C 80058F1C 8E03002C */  lw        $v1, 0x2c($s0)
+/* 34320 80058F20 24060030 */  addiu     $a2, $zero, 0x30
+/* 34324 80058F24 0C015FE4 */  jal       alHeapAlloc
+/* 34328 80058F28 AC620000 */   sw       $v0, ($v1)
+/* 3432C 80058F2C 0240202D */  daddu     $a0, $s2, $zero
+/* 34330 80058F30 24050001 */  addiu     $a1, $zero, 1
+/* 34334 80058F34 24060008 */  addiu     $a2, $zero, 8
+/* 34338 80058F38 0C015FE4 */  jal       alHeapAlloc
+/* 3433C 80058F3C AE020024 */   sw       $v0, 0x24($s0)
+/* 34340 80058F40 8E030024 */  lw        $v1, 0x24($s0)
+/* 34344 80058F44 26310001 */  addiu     $s1, $s1, 1
+/* 34348 80058F48 AC620028 */  sw        $v0, 0x28($v1)
+/* 3434C 80058F4C 3222FFFF */  andi      $v0, $s1, 0xffff
+/* 34350 80058F50 2C420004 */  sltiu     $v0, $v0, 4
+/* 34354 80058F54 1440FFE1 */  bnez      $v0, .L80058EDC
+/* 34358 80058F58 0240202D */   daddu    $a0, $s2, $zero
+/* 3435C 80058F5C 0260202D */  daddu     $a0, $s3, $zero
+/* 34360 80058F60 0C016413 */  jal       func_8005904C
+/* 34364 80058F64 328500FF */   andi     $a1, $s4, 0xff
+/* 34368 80058F68 8FBF0024 */  lw        $ra, 0x24($sp)
+/* 3436C 80058F6C 8FB40020 */  lw        $s4, 0x20($sp)
+/* 34370 80058F70 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 34374 80058F74 8FB20018 */  lw        $s2, 0x18($sp)
+/* 34378 80058F78 8FB10014 */  lw        $s1, 0x14($sp)
+/* 3437C 80058F7C 8FB00010 */  lw        $s0, 0x10($sp)
+/* 34380 80058F80 03E00008 */  jr        $ra
+/* 34384 80058F84 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/world/func_80058F88.s b/asm/nonmatchings/world/world/func_80058F88.s
new file mode 100644
index 0000000000..2aec790b72
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80058F88.s
@@ -0,0 +1,36 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80058F88
+/* 34388 80058F88 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 3438C 80058F8C AFB10014 */  sw        $s1, 0x14($sp)
+/* 34390 80058F90 0080882D */  daddu     $s1, $a0, $zero
+/* 34394 80058F94 AFB00010 */  sw        $s0, 0x10($sp)
+/* 34398 80058F98 00A0802D */  daddu     $s0, $a1, $zero
+/* 3439C 80058F9C 0200202D */  daddu     $a0, $s0, $zero
+/* 343A0 80058FA0 24051420 */  addiu     $a1, $zero, 0x1420
+/* 343A4 80058FA4 AFBF0018 */  sw        $ra, 0x18($sp)
+/* 343A8 80058FA8 0C015FE4 */  jal       alHeapAlloc
+/* 343AC 80058FAC 24060002 */   addiu    $a2, $zero, 2
+/* 343B0 80058FB0 0200202D */  daddu     $a0, $s0, $zero
+/* 343B4 80058FB4 24050001 */  addiu     $a1, $zero, 1
+/* 343B8 80058FB8 24060030 */  addiu     $a2, $zero, 0x30
+/* 343BC 80058FBC 0C015FE4 */  jal       alHeapAlloc
+/* 343C0 80058FC0 AE220000 */   sw       $v0, ($s1)
+/* 343C4 80058FC4 0200202D */  daddu     $a0, $s0, $zero
+/* 343C8 80058FC8 24050001 */  addiu     $a1, $zero, 1
+/* 343CC 80058FCC 24060008 */  addiu     $a2, $zero, 8
+/* 343D0 80058FD0 0C015FE4 */  jal       alHeapAlloc
+/* 343D4 80058FD4 AE220010 */   sw       $v0, 0x10($s1)
+/* 343D8 80058FD8 0220202D */  daddu     $a0, $s1, $zero
+/* 343DC 80058FDC 0000282D */  daddu     $a1, $zero, $zero
+/* 343E0 80058FE0 00A0302D */  daddu     $a2, $a1, $zero
+/* 343E4 80058FE4 8C830010 */  lw        $v1, 0x10($a0)
+/* 343E8 80058FE8 24075000 */  addiu     $a3, $zero, 0x5000
+/* 343EC 80058FEC 0C016402 */  jal       func_80059008
+/* 343F0 80058FF0 AC620028 */   sw       $v0, 0x28($v1)
+/* 343F4 80058FF4 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 343F8 80058FF8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 343FC 80058FFC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 34400 80059000 03E00008 */  jr        $ra
+/* 34404 80059004 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/world/func_80059008.s b/asm/nonmatchings/world/world/func_80059008.s
new file mode 100644
index 0000000000..b4094302e5
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059008.s
@@ -0,0 +1,23 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059008
+/* 34408 80059008 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 3440C 8005900C 00071400 */  sll       $v0, $a3, 0x10
+/* 34410 80059010 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 34414 80059014 A4850006 */  sh        $a1, 6($a0)
+/* 34418 80059018 10400008 */  beqz      $v0, .L8005903C
+/* 3441C 8005901C A4860008 */   sh       $a2, 8($a0)
+/* 34420 80059020 8C820010 */  lw        $v0, 0x10($a0)
+/* 34424 80059024 AC82000C */  sw        $v0, 0xc($a0)
+/* 34428 80059028 A4470000 */  sh        $a3, ($v0)
+/* 3442C 8005902C 0C016374 */  jal       func_80058DD0
+/* 34430 80059030 8C84000C */   lw       $a0, 0xc($a0)
+/* 34434 80059034 08016410 */  j         .L80059040
+/* 34438 80059038 00000000 */   nop      
+.L8005903C:
+/* 3443C 8005903C AC80000C */  sw        $zero, 0xc($a0)
+.L80059040:
+/* 34440 80059040 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 34444 80059044 03E00008 */  jr        $ra
+/* 34448 80059048 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/world/func_8005904C.s b/asm/nonmatchings/world/world/func_8005904C.s
new file mode 100644
index 0000000000..a3c371c8e1
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_8005904C.s
@@ -0,0 +1,191 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8005904C
+/* 3444C 8005904C 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 34450 80059050 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 34454 80059054 0080982D */  daddu     $s3, $a0, $zero
+/* 34458 80059058 30A500FF */  andi      $a1, $a1, 0xff
+/* 3445C 8005905C 24A5FFFF */  addiu     $a1, $a1, -1
+/* 34460 80059060 2CA2000A */  sltiu     $v0, $a1, 0xa
+/* 34464 80059064 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 34468 80059068 AFB20018 */  sw        $s2, 0x18($sp)
+/* 3446C 8005906C AFB10014 */  sw        $s1, 0x14($sp)
+/* 34470 80059070 AFB00010 */  sw        $s0, 0x10($sp)
+/* 34474 80059074 8E660000 */  lw        $a2, ($s3)
+/* 34478 80059078 10400021 */  beqz      $v0, .L80059100
+/* 3447C 8005907C 00051080 */   sll      $v0, $a1, 2
+/* 34480 80059080 3C01800A */  lui       $at, 0x800a
+/* 34484 80059084 00220821 */  addu      $at, $at, $v0
+/* 34488 80059088 8C228940 */  lw        $v0, -0x76c0($at)
+/* 3448C 8005908C 00400008 */  jr        $v0
+/* 34490 80059090 00000000 */   nop      
+/* 34494 80059094 3C048008 */  lui       $a0, 0x8008
+/* 34498 80059098 08016442 */  j         .L80059108
+/* 3449C 8005909C 2484EFE0 */   addiu    $a0, $a0, -0x1020
+/* 344A0 800590A0 3C048008 */  lui       $a0, 0x8008
+/* 344A4 800590A4 08016442 */  j         .L80059108
+/* 344A8 800590A8 2484F158 */   addiu    $a0, $a0, -0xea8
+/* 344AC 800590AC 3C048008 */  lui       $a0, 0x8008
+/* 344B0 800590B0 08016442 */  j         .L80059108
+/* 344B4 800590B4 2484F180 */   addiu    $a0, $a0, -0xe80
+/* 344B8 800590B8 3C048008 */  lui       $a0, 0x8008
+/* 344BC 800590BC 08016442 */  j         .L80059108
+/* 344C0 800590C0 2484F1A8 */   addiu    $a0, $a0, -0xe58
+/* 344C4 800590C4 3C048008 */  lui       $a0, 0x8008
+/* 344C8 800590C8 08016442 */  j         .L80059108
+/* 344CC 800590CC 8C84F1F8 */   lw       $a0, -0xe08($a0)
+/* 344D0 800590D0 3C048008 */  lui       $a0, 0x8008
+/* 344D4 800590D4 08016442 */  j         .L80059108
+/* 344D8 800590D8 8C84F1FC */   lw       $a0, -0xe04($a0)
+/* 344DC 800590DC 3C048008 */  lui       $a0, 0x8008
+/* 344E0 800590E0 08016442 */  j         .L80059108
+/* 344E4 800590E4 8C84F200 */   lw       $a0, -0xe00($a0)
+/* 344E8 800590E8 3C048008 */  lui       $a0, 0x8008
+/* 344EC 800590EC 08016442 */  j         .L80059108
+/* 344F0 800590F0 8C84F204 */   lw       $a0, -0xdfc($a0)
+/* 344F4 800590F4 3C048008 */  lui       $a0, 0x8008
+/* 344F8 800590F8 08016442 */  j         .L80059108
+/* 344FC 800590FC 2484F048 */   addiu    $a0, $a0, -0xfb8
+.L80059100:
+/* 34500 80059100 3C048008 */  lui       $a0, 0x8008
+/* 34504 80059104 2484F1D0 */  addiu     $a0, $a0, -0xe30
+.L80059108:
+/* 34508 80059108 90820003 */  lbu       $v0, 3($a0)
+/* 3450C 8005910C A2620010 */  sb        $v0, 0x10($s3)
+/* 34510 80059110 8C830004 */  lw        $v1, 4($a0)
+/* 34514 80059114 8E620000 */  lw        $v0, ($s3)
+/* 34518 80059118 24110507 */  addiu     $s1, $zero, 0x507
+/* 3451C 8005911C AE620004 */  sw        $v0, 4($s3)
+/* 34520 80059120 00031040 */  sll       $v0, $v1, 1
+/* 34524 80059124 00431021 */  addu      $v0, $v0, $v1
+/* 34528 80059128 000210C0 */  sll       $v0, $v0, 3
+/* 3452C 8005912C 00431023 */  subu      $v0, $v0, $v1
+/* 34530 80059130 000210C0 */  sll       $v0, $v0, 3
+/* 34534 80059134 AE620008 */  sw        $v0, 8($s3)
+.L80059138:
+/* 34538 80059138 ACC00000 */  sw        $zero, ($a2)
+/* 3453C 8005913C 2631FFFF */  addiu     $s1, $s1, -1
+/* 34540 80059140 0621FFFD */  bgez      $s1, .L80059138
+/* 34544 80059144 24C60004 */   addiu    $a2, $a2, 4
+/* 34548 80059148 92620010 */  lbu       $v0, 0x10($s3)
+/* 3454C 8005914C 10400069 */  beqz      $v0, .L800592F4
+/* 34550 80059150 0000882D */   daddu    $s1, $zero, $zero
+/* 34554 80059154 0220902D */  daddu     $s2, $s1, $zero
+/* 34558 80059158 24020002 */  addiu     $v0, $zero, 2
+/* 3455C 8005915C 00421004 */  sllv      $v0, $v0, $v0
+/* 34560 80059160 00448021 */  addu      $s0, $v0, $a0
+.L80059164:
+/* 34564 80059164 8E62000C */  lw        $v0, 0xc($s3)
+/* 34568 80059168 8E030000 */  lw        $v1, ($s0)
+/* 3456C 8005916C 26100004 */  addiu     $s0, $s0, 4
+/* 34570 80059170 00522021 */  addu      $a0, $v0, $s2
+/* 34574 80059174 00031040 */  sll       $v0, $v1, 1
+/* 34578 80059178 00431021 */  addu      $v0, $v0, $v1
+/* 3457C 8005917C 000210C0 */  sll       $v0, $v0, 3
+/* 34580 80059180 00431023 */  subu      $v0, $v0, $v1
+/* 34584 80059184 000210C0 */  sll       $v0, $v0, 3
+/* 34588 80059188 AC820000 */  sw        $v0, ($a0)
+/* 3458C 8005918C 8E030000 */  lw        $v1, ($s0)
+/* 34590 80059190 26100004 */  addiu     $s0, $s0, 4
+/* 34594 80059194 00031040 */  sll       $v0, $v1, 1
+/* 34598 80059198 00431021 */  addu      $v0, $v0, $v1
+/* 3459C 8005919C 000210C0 */  sll       $v0, $v0, 3
+/* 345A0 800591A0 00431023 */  subu      $v0, $v0, $v1
+/* 345A4 800591A4 000210C0 */  sll       $v0, $v0, 3
+/* 345A8 800591A8 AC820004 */  sw        $v0, 4($a0)
+/* 345AC 800591AC 96020002 */  lhu       $v0, 2($s0)
+/* 345B0 800591B0 26100004 */  addiu     $s0, $s0, 4
+/* 345B4 800591B4 A482000A */  sh        $v0, 0xa($a0)
+/* 345B8 800591B8 96020002 */  lhu       $v0, 2($s0)
+/* 345BC 800591BC 26100004 */  addiu     $s0, $s0, 4
+/* 345C0 800591C0 A4820008 */  sh        $v0, 8($a0)
+/* 345C4 800591C4 96020002 */  lhu       $v0, 2($s0)
+/* 345C8 800591C8 26100004 */  addiu     $s0, $s0, 4
+/* 345CC 800591CC A482000C */  sh        $v0, 0xc($a0)
+/* 345D0 800591D0 8E020000 */  lw        $v0, ($s0)
+/* 345D4 800591D4 50400033 */  beql      $v0, $zero, .L800592A4
+/* 345D8 800591D8 AC800028 */   sw       $zero, 0x28($a0)
+/* 345DC 800591DC 26100004 */  addiu     $s0, $s0, 4
+/* 345E0 800591E0 44820000 */  mtc1      $v0, $f0
+/* 345E4 800591E4 00000000 */  nop       
+/* 345E8 800591E8 46800020 */  cvt.s.w   $f0, $f0
+/* 345EC 800591EC 3C01447A */  lui       $at, 0x447a
+/* 345F0 800591F0 44811000 */  mtc1      $at, $f2
+/* 345F4 800591F4 8C830004 */  lw        $v1, 4($a0)
+/* 345F8 800591F8 8C820000 */  lw        $v0, ($a0)
+/* 345FC 800591FC 46020003 */  div.s     $f0, $f0, $f2
+/* 34600 80059200 46000021 */  cvt.d.s   $f0, $f0
+/* 34604 80059204 00621823 */  subu      $v1, $v1, $v0
+/* 34608 80059208 46200000 */  add.d     $f0, $f0, $f0
+/* 3460C 8005920C 3C028008 */  lui       $v0, 0x8008
+/* 34610 80059210 8C428E50 */  lw        $v0, -0x71b0($v0)
+/* 34614 80059214 44832000 */  mtc1      $v1, $f4
+/* 34618 80059218 00000000 */  nop       
+/* 3461C 8005921C 46802121 */  cvt.d.w   $f4, $f4
+/* 34620 80059220 C4420008 */  lwc1      $f2, 8($v0)
+/* 34624 80059224 468010A1 */  cvt.d.w   $f2, $f2
+/* 34628 80059228 46220003 */  div.d     $f0, $f0, $f2
+/* 3462C 8005922C 46200020 */  cvt.s.d   $f0, $f0
+/* 34630 80059230 E4800010 */  swc1      $f0, 0x10($a0)
+/* 34634 80059234 C6000000 */  lwc1      $f0, ($s0)
+/* 34638 80059238 46800020 */  cvt.s.w   $f0, $f0
+/* 3463C 8005923C 26100004 */  addiu     $s0, $s0, 4
+/* 34640 80059240 3C01800A */  lui       $at, 0x800a
+/* 34644 80059244 D4228968 */  ldc1      $f2, -0x7698($at)
+/* 34648 80059248 46000021 */  cvt.d.s   $f0, $f0
+/* 3464C 8005924C 04610006 */  bgez      $v1, .L80059268
+/* 34650 80059250 46220083 */   div.d    $f2, $f0, $f2
+/* 34654 80059254 3C0141F0 */  lui       $at, 0x41f0
+/* 34658 80059258 44810800 */  mtc1      $at, $f1
+/* 3465C 8005925C 44800000 */  mtc1      $zero, $f0
+/* 34660 80059260 00000000 */  nop       
+/* 34664 80059264 46202100 */  add.d     $f4, $f4, $f0
+.L80059268:
+/* 34668 80059268 46241002 */  mul.d     $f0, $f2, $f4
+/* 3466C 8005926C 00000000 */  nop       
+/* 34670 80059270 3C013F80 */  lui       $at, 0x3f80
+/* 34674 80059274 44811000 */  mtc1      $at, $f2
+/* 34678 80059278 8C82002C */  lw        $v0, 0x2c($a0)
+/* 3467C 8005927C AC800018 */  sw        $zero, 0x18($a0)
+/* 34680 80059280 E4820014 */  swc1      $f2, 0x14($a0)
+/* 34684 80059284 AC820028 */  sw        $v0, 0x28($a0)
+/* 34688 80059288 46200020 */  cvt.s.d   $f0, $f0
+/* 3468C 8005928C E480001C */  swc1      $f0, 0x1c($a0)
+/* 34690 80059290 AC400008 */  sw        $zero, 8($v0)
+/* 34694 80059294 8C830028 */  lw        $v1, 0x28($a0)
+/* 34698 80059298 24020001 */  addiu     $v0, $zero, 1
+/* 3469C 8005929C 080164AA */  j         .L800592A8
+/* 346A0 800592A0 AC62000C */   sw       $v0, 0xc($v1)
+.L800592A4:
+/* 346A4 800592A4 26100008 */  addiu     $s0, $s0, 8
+.L800592A8:
+/* 346A8 800592A8 8E020000 */  lw        $v0, ($s0)
+/* 346AC 800592AC 5040000A */  beql      $v0, $zero, .L800592D8
+/* 346B0 800592B0 AC800020 */   sw       $zero, 0x20($a0)
+/* 346B4 800592B4 8C830024 */  lw        $v1, 0x24($a0)
+/* 346B8 800592B8 AC830020 */  sw        $v1, 0x20($a0)
+/* 346BC 800592BC 96020002 */  lhu       $v0, 2($s0)
+/* 346C0 800592C0 A4620000 */  sh        $v0, ($v1)
+/* 346C4 800592C4 8C840020 */  lw        $a0, 0x20($a0)
+/* 346C8 800592C8 0C016374 */  jal       func_80058DD0
+/* 346CC 800592CC 26100004 */   addiu    $s0, $s0, 4
+/* 346D0 800592D0 080164B8 */  j         .L800592E0
+/* 346D4 800592D4 26520030 */   addiu    $s2, $s2, 0x30
+.L800592D8:
+/* 346D8 800592D8 26100004 */  addiu     $s0, $s0, 4
+/* 346DC 800592DC 26520030 */  addiu     $s2, $s2, 0x30
+.L800592E0:
+/* 346E0 800592E0 92620010 */  lbu       $v0, 0x10($s3)
+/* 346E4 800592E4 26310001 */  addiu     $s1, $s1, 1
+/* 346E8 800592E8 0222102A */  slt       $v0, $s1, $v0
+/* 346EC 800592EC 1440FF9D */  bnez      $v0, .L80059164
+/* 346F0 800592F0 00000000 */   nop      
+.L800592F4:
+/* 346F4 800592F4 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 346F8 800592F8 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 346FC 800592FC 8FB20018 */  lw        $s2, 0x18($sp)
+/* 34700 80059300 8FB10014 */  lw        $s1, 0x14($sp)
+/* 34704 80059304 8FB00010 */  lw        $s0, 0x10($sp)
+/* 34708 80059308 03E00008 */  jr        $ra
+/* 3470C 8005930C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/world/func_80059310.s b/asm/nonmatchings/world/world/func_80059310.s
new file mode 100644
index 0000000000..c21b3f1924
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059310.s
@@ -0,0 +1,375 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059310
+/* 34710 80059310 27BDFF98 */  addiu     $sp, $sp, -0x68
+/* 34714 80059314 AFB00030 */  sw        $s0, 0x30($sp)
+/* 34718 80059318 00A0802D */  daddu     $s0, $a1, $zero
+/* 3471C 8005931C AFB10034 */  sw        $s1, 0x34($sp)
+/* 34720 80059320 00C0882D */  daddu     $s1, $a2, $zero
+/* 34724 80059324 AFB60048 */  sw        $s6, 0x48($sp)
+/* 34728 80059328 24F60170 */  addiu     $s6, $a3, 0x170
+/* 3472C 8005932C 32220FFF */  andi      $v0, $s1, 0xfff
+/* 34730 80059330 3C030617 */  lui       $v1, 0x617
+/* 34734 80059334 00431025 */  or        $v0, $v0, $v1
+/* 34738 80059338 AFBF0054 */  sw        $ra, 0x54($sp)
+/* 3473C 8005933C AFBE0050 */  sw        $fp, 0x50($sp)
+/* 34740 80059340 AFB7004C */  sw        $s7, 0x4c($sp)
+/* 34744 80059344 AFB50044 */  sw        $s5, 0x44($sp)
+/* 34748 80059348 AFB40040 */  sw        $s4, 0x40($sp)
+/* 3474C 8005934C AFB3003C */  sw        $s3, 0x3c($sp)
+/* 34750 80059350 AFB20038 */  sw        $s2, 0x38($sp)
+/* 34754 80059354 F7B60060 */  sdc1      $f22, 0x60($sp)
+/* 34758 80059358 F7B40058 */  sdc1      $f20, 0x58($sp)
+/* 3475C 8005935C AFA40068 */  sw        $a0, 0x68($sp)
+/* 34760 80059360 A7A70026 */  sh        $a3, 0x26($sp)
+/* 34764 80059364 A7A0001E */  sh        $zero, 0x1e($sp)
+/* 34768 80059368 AE020000 */  sw        $v0, ($s0)
+/* 3476C 8005936C 8FA80068 */  lw        $t0, 0x68($sp)
+/* 34770 80059370 26120008 */  addiu     $s2, $s0, 8
+/* 34774 80059374 8D040004 */  lw        $a0, 4($t0)
+/* 34778 80059378 0C0187A4 */  jal       osVirtualToPhysical
+/* 3477C 8005937C 24F302E0 */   addiu    $s3, $a3, 0x2e0
+/* 34780 80059380 0240202D */  daddu     $a0, $s2, $zero
+/* 34784 80059384 3C0300FF */  lui       $v1, 0xff
+/* 34788 80059388 3463FFFF */  ori       $v1, $v1, 0xffff
+/* 3478C 8005938C AE020004 */  sw        $v0, 4($s0)
+/* 34790 80059390 00111400 */  sll       $v0, $s1, 0x10
+/* 34794 80059394 00021403 */  sra       $v0, $v0, 0x10
+/* 34798 80059398 00431024 */  and       $v0, $v0, $v1
+/* 3479C 8005939C 3C030200 */  lui       $v1, 0x200
+/* 347A0 800593A0 00431025 */  or        $v0, $v0, $v1
+/* 347A4 800593A4 AC820000 */  sw        $v0, ($a0)
+/* 347A8 800593A8 24020170 */  addiu     $v0, $zero, 0x170
+/* 347AC 800593AC AC820004 */  sw        $v0, 4($a0)
+/* 347B0 800593B0 8FA80068 */  lw        $t0, 0x68($sp)
+/* 347B4 800593B4 0000A02D */  daddu     $s4, $zero, $zero
+/* 347B8 800593B8 91020010 */  lbu       $v0, 0x10($t0)
+/* 347BC 800593BC 26520008 */  addiu     $s2, $s2, 8
+/* 347C0 800593C0 1040011D */  beqz      $v0, .L80059838
+/* 347C4 800593C4 A7B10028 */   sh       $s1, 0x28($sp)
+/* 347C8 800593C8 00131400 */  sll       $v0, $s3, 0x10
+/* 347CC 800593CC 3C014700 */  lui       $at, 0x4700
+/* 347D0 800593D0 4481B000 */  mtc1      $at, $f22
+/* 347D4 800593D4 00021403 */  sra       $v0, $v0, 0x10
+/* 347D8 800593D8 AFA2002C */  sw        $v0, 0x2c($sp)
+.L800593DC:
+/* 347DC 800593DC 97A8001E */  lhu       $t0, 0x1e($sp)
+/* 347E0 800593E0 00081400 */  sll       $v0, $t0, 0x10
+/* 347E4 800593E4 00021403 */  sra       $v0, $v0, 0x10
+/* 347E8 800593E8 00021840 */  sll       $v1, $v0, 1
+/* 347EC 800593EC 00621821 */  addu      $v1, $v1, $v0
+/* 347F0 800593F0 8FA80068 */  lw        $t0, 0x68($sp)
+/* 347F4 800593F4 00031900 */  sll       $v1, $v1, 4
+/* 347F8 800593F8 8D02000C */  lw        $v0, 0xc($t0)
+/* 347FC 800593FC 8D040004 */  lw        $a0, 4($t0)
+/* 34800 80059400 00439821 */  addu      $s3, $v0, $v1
+/* 34804 80059404 8E620000 */  lw        $v0, ($s3)
+/* 34808 80059408 8D030000 */  lw        $v1, ($t0)
+/* 3480C 8005940C 00021040 */  sll       $v0, $v0, 1
+/* 34810 80059410 0082B823 */  subu      $s7, $a0, $v0
+/* 34814 80059414 02E3102B */  sltu      $v0, $s7, $v1
+/* 34818 80059418 10400004 */  beqz      $v0, .L8005942C
+/* 3481C 8005941C 00000000 */   nop      
+/* 34820 80059420 8D020008 */  lw        $v0, 8($t0)
+/* 34824 80059424 00021040 */  sll       $v0, $v0, 1
+/* 34828 80059428 02E2B821 */  addu      $s7, $s7, $v0
+.L8005942C:
+/* 3482C 8005942C 8E620004 */  lw        $v0, 4($s3)
+/* 34830 80059430 00021040 */  sll       $v0, $v0, 1
+/* 34834 80059434 0082F023 */  subu      $fp, $a0, $v0
+/* 34838 80059438 03C3102B */  sltu      $v0, $fp, $v1
+/* 3483C 8005943C 10400005 */  beqz      $v0, .L80059454
+/* 34840 80059440 00000000 */   nop      
+/* 34844 80059444 8FA80068 */  lw        $t0, 0x68($sp)
+/* 34848 80059448 8D020008 */  lw        $v0, 8($t0)
+/* 3484C 8005944C 00021040 */  sll       $v0, $v0, 1
+/* 34850 80059450 03C2F021 */  addu      $fp, $fp, $v0
+.L80059454:
+/* 34854 80059454 16F40005 */  bne       $s7, $s4, .L8005946C
+/* 34858 80059458 0240802D */   daddu    $s0, $s2, $zero
+/* 3485C 8005945C 02C0102D */  daddu     $v0, $s6, $zero
+/* 34860 80059460 97B60026 */  lhu       $s6, 0x26($sp)
+/* 34864 80059464 08016524 */  j         .L80059490
+/* 34868 80059468 A7A20026 */   sh       $v0, 0x26($sp)
+.L8005946C:
+/* 3486C 8005946C 26520008 */  addiu     $s2, $s2, 8
+/* 34870 80059470 02E0202D */  daddu     $a0, $s7, $zero
+/* 34874 80059474 97A80026 */  lhu       $t0, 0x26($sp)
+/* 34878 80059478 3C030417 */  lui       $v1, 0x417
+/* 3487C 8005947C 31020FFF */  andi      $v0, $t0, 0xfff
+/* 34880 80059480 00431025 */  or        $v0, $v0, $v1
+/* 34884 80059484 0C0187A4 */  jal       osVirtualToPhysical
+/* 34888 80059488 AE020000 */   sw       $v0, ($s0)
+/* 3488C 8005948C AE020004 */  sw        $v0, 4($s0)
+.L80059490:
+/* 34890 80059490 8E620028 */  lw        $v0, 0x28($s3)
+/* 34894 80059494 10400068 */  beqz      $v0, .L80059638
+/* 34898 80059498 0260202D */   daddu    $a0, $s3, $zero
+/* 3489C 8005949C 8E700004 */  lw        $s0, 4($s3)
+/* 348A0 800594A0 8E620000 */  lw        $v0, ($s3)
+/* 348A4 800594A4 240500B8 */  addiu     $a1, $zero, 0xb8
+/* 348A8 800594A8 0C0166F5 */  jal       func_80059BD4
+/* 348AC 800594AC 02028023 */   subu     $s0, $s0, $v0
+/* 348B0 800594B0 44901000 */  mtc1      $s0, $f2
+/* 348B4 800594B4 00000000 */  nop       
+/* 348B8 800594B8 468010A0 */  cvt.s.w   $f2, $f2
+/* 348BC 800594BC 46020103 */  div.s     $f4, $f0, $f2
+/* 348C0 800594C0 46162002 */  mul.s     $f0, $f4, $f22
+/* 348C4 800594C4 00000000 */  nop       
+/* 348C8 800594C8 4600018D */  trunc.w.s $f6, $f0
+/* 348CC 800594CC 44023000 */  mfc1      $v0, $f6
+/* 348D0 800594D0 3C013800 */  lui       $at, 0x3800
+/* 348D4 800594D4 44810000 */  mtc1      $at, $f0
+/* 348D8 800594D8 44822000 */  mtc1      $v0, $f4
+/* 348DC 800594DC 00000000 */  nop       
+/* 348E0 800594E0 46802120 */  cvt.s.w   $f4, $f4
+/* 348E4 800594E4 46002102 */  mul.s     $f4, $f4, $f0
+/* 348E8 800594E8 00000000 */  nop       
+/* 348EC 800594EC 3C013FF0 */  lui       $at, 0x3ff0
+/* 348F0 800594F0 44811800 */  mtc1      $at, $f3
+/* 348F4 800594F4 44801000 */  mtc1      $zero, $f2
+/* 348F8 800594F8 46002021 */  cvt.d.s   $f0, $f4
+/* 348FC 800594FC 46201081 */  sub.d     $f2, $f2, $f0
+/* 34900 80059500 3C014338 */  lui       $at, 0x4338
+/* 34904 80059504 44812000 */  mtc1      $at, $f4
+/* 34908 80059508 46201520 */  cvt.s.d   $f20, $f2
+/* 3490C 8005950C 4604A102 */  mul.s     $f4, $f20, $f4
+/* 34910 80059510 00000000 */  nop       
+/* 34914 80059514 8E620028 */  lw        $v0, 0x28($s3)
+/* 34918 80059518 C4400008 */  lwc1      $f0, 8($v0)
+/* 3491C 8005951C 46040000 */  add.s     $f0, $f0, $f4
+/* 34920 80059520 4600018D */  trunc.w.s $f6, $f0
+/* 34924 80059524 44143000 */  mfc1      $s4, $f6
+/* 34928 80059528 00000000 */  nop       
+/* 3492C 8005952C 44941000 */  mtc1      $s4, $f2
+/* 34930 80059530 00000000 */  nop       
+/* 34934 80059534 468010A0 */  cvt.s.w   $f2, $f2
+/* 34938 80059538 46020001 */  sub.s     $f0, $f0, $f2
+/* 3493C 8005953C E4400008 */  swc1      $f0, 8($v0)
+/* 34940 80059540 8E630018 */  lw        $v1, 0x18($s3)
+/* 34944 80059544 8E620004 */  lw        $v0, 4($s3)
+/* 34948 80059548 8FA80068 */  lw        $t0, 0x68($sp)
+/* 3494C 8005954C 00621823 */  subu      $v1, $v1, $v0
+/* 34950 80059550 8D020004 */  lw        $v0, 4($t0)
+/* 34954 80059554 00031840 */  sll       $v1, $v1, 1
+/* 34958 80059558 00432821 */  addu      $a1, $v0, $v1
+/* 3495C 8005955C 30A20007 */  andi      $v0, $a1, 7
+/* 34960 80059560 00021843 */  sra       $v1, $v0, 1
+/* 34964 80059564 0003A840 */  sll       $s5, $v1, 1
+/* 34968 80059568 8D020000 */  lw        $v0, ($t0)
+/* 3496C 8005956C 00B52823 */  subu      $a1, $a1, $s5
+/* 34970 80059570 00A2102B */  sltu      $v0, $a1, $v0
+/* 34974 80059574 10400004 */  beqz      $v0, .L80059588
+/* 34978 80059578 00000000 */   nop      
+/* 3497C 8005957C 8D020008 */  lw        $v0, 8($t0)
+/* 34980 80059580 00021040 */  sll       $v0, $v0, 1
+/* 34984 80059584 00A22821 */  addu      $a1, $a1, $v0
+.L80059588:
+/* 34988 80059588 8FA40068 */  lw        $a0, 0x68($sp)
+/* 3498C 8005958C 8FA6002C */  lw        $a2, 0x2c($sp)
+/* 34990 80059590 02833821 */  addu      $a3, $s4, $v1
+/* 34994 80059594 0C0166AE */  jal       func_80059AB8
+/* 34998 80059598 AFB20010 */   sw       $s2, 0x10($sp)
+/* 3499C 8005959C 0040902D */  daddu     $s2, $v0, $zero
+/* 349A0 800595A0 4616A002 */  mul.s     $f0, $f20, $f22
+/* 349A4 800595A4 00000000 */  nop       
+/* 349A8 800595A8 00168C00 */  sll       $s1, $s6, 0x10
+/* 349AC 800595AC 8E630028 */  lw        $v1, 0x28($s3)
+/* 349B0 800595B0 8C640000 */  lw        $a0, ($v1)
+/* 349B4 800595B4 4600018D */  trunc.w.s $f6, $f0
+/* 349B8 800595B8 44103000 */  mfc1      $s0, $f6
+/* 349BC 800595BC 0C0187A4 */  jal       osVirtualToPhysical
+/* 349C0 800595C0 00118E03 */   sra      $s1, $s1, 0x18
+/* 349C4 800595C4 3C0300FF */  lui       $v1, 0xff
+/* 349C8 800595C8 3463FFFF */  ori       $v1, $v1, 0xffff
+/* 349CC 800595CC 0240202D */  daddu     $a0, $s2, $zero
+/* 349D0 800595D0 00431024 */  and       $v0, $v0, $v1
+/* 349D4 800595D4 3C030500 */  lui       $v1, 0x500
+/* 349D8 800595D8 00431025 */  or        $v0, $v0, $v1
+/* 349DC 800595DC 3210FFFF */  andi      $s0, $s0, 0xffff
+/* 349E0 800595E0 00108380 */  sll       $s0, $s0, 0xe
+/* 349E4 800595E4 32310003 */  andi      $s1, $s1, 3
+/* 349E8 800595E8 AC820000 */  sw        $v0, ($a0)
+/* 349EC 800595EC 8E620028 */  lw        $v0, 0x28($s3)
+/* 349F0 800595F0 8FA8002C */  lw        $t0, 0x2c($sp)
+/* 349F4 800595F4 8C43000C */  lw        $v1, 0xc($v0)
+/* 349F8 800595F8 01151021 */  addu      $v0, $t0, $s5
+/* 349FC 800595FC 30420FFF */  andi      $v0, $v0, 0xfff
+/* 34A00 80059600 00021080 */  sll       $v0, $v0, 2
+/* 34A04 80059604 00031F80 */  sll       $v1, $v1, 0x1e
+/* 34A08 80059608 00701825 */  or        $v1, $v1, $s0
+/* 34A0C 8005960C 00621825 */  or        $v1, $v1, $v0
+/* 34A10 80059610 00711825 */  or        $v1, $v1, $s1
+/* 34A14 80059614 AC830004 */  sw        $v1, 4($a0)
+/* 34A18 80059618 8E620028 */  lw        $v0, 0x28($s3)
+/* 34A1C 8005961C AC40000C */  sw        $zero, 0xc($v0)
+/* 34A20 80059620 8E620018 */  lw        $v0, 0x18($s3)
+/* 34A24 80059624 26520008 */  addiu     $s2, $s2, 8
+/* 34A28 80059628 2442FF48 */  addiu     $v0, $v0, -0xb8
+/* 34A2C 8005962C 00541021 */  addu      $v0, $v0, $s4
+/* 34A30 80059630 08016597 */  j         .L8005965C
+/* 34A34 80059634 AE620018 */   sw       $v0, 0x18($s3)
+.L80059638:
+/* 34A38 80059638 0240802D */  daddu     $s0, $s2, $zero
+/* 34A3C 8005963C 26520008 */  addiu     $s2, $s2, 8
+/* 34A40 80059640 03C0202D */  daddu     $a0, $fp, $zero
+/* 34A44 80059644 32C20FFF */  andi      $v0, $s6, 0xfff
+/* 34A48 80059648 3C030417 */  lui       $v1, 0x417
+/* 34A4C 8005964C 00431025 */  or        $v0, $v0, $v1
+/* 34A50 80059650 0C0187A4 */  jal       osVirtualToPhysical
+/* 34A54 80059654 AE020000 */   sw       $v0, ($s0)
+/* 34A58 80059658 AE020004 */  sw        $v0, 4($s0)
+.L8005965C:
+/* 34A5C 8005965C 86620008 */  lh        $v0, 8($s3)
+/* 34A60 80059660 10400018 */  beqz      $v0, .L800596C4
+/* 34A64 80059664 0240282D */   daddu    $a1, $s2, $zero
+/* 34A68 80059668 32C4FFFF */  andi      $a0, $s6, 0xffff
+/* 34A6C 8005966C 97A80026 */  lhu       $t0, 0x26($sp)
+/* 34A70 80059670 96630008 */  lhu       $v1, 8($s3)
+/* 34A74 80059674 00081400 */  sll       $v0, $t0, 0x10
+/* 34A78 80059678 00441025 */  or        $v0, $v0, $a0
+/* 34A7C 8005967C 3C080C00 */  lui       $t0, 0xc00
+/* 34A80 80059680 00681825 */  or        $v1, $v1, $t0
+/* 34A84 80059684 ACA20004 */  sw        $v0, 4($a1)
+/* 34A88 80059688 ACA30000 */  sw        $v1, ($a1)
+/* 34A8C 8005968C 8E620028 */  lw        $v0, 0x28($s3)
+/* 34A90 80059690 1440000C */  bnez      $v0, .L800596C4
+/* 34A94 80059694 26520008 */   addiu    $s2, $s2, 8
+/* 34A98 80059698 8E620020 */  lw        $v0, 0x20($s3)
+/* 34A9C 8005969C 14400009 */  bnez      $v0, .L800596C4
+/* 34AA0 800596A0 0240802D */   daddu    $s0, $s2, $zero
+/* 34AA4 800596A4 26520008 */  addiu     $s2, $s2, 8
+/* 34AA8 800596A8 03C0202D */  daddu     $a0, $fp, $zero
+/* 34AAC 800596AC 32C20FFF */  andi      $v0, $s6, 0xfff
+/* 34AB0 800596B0 3C080617 */  lui       $t0, 0x617
+/* 34AB4 800596B4 00481025 */  or        $v0, $v0, $t0
+/* 34AB8 800596B8 0C0187A4 */  jal       osVirtualToPhysical
+/* 34ABC 800596BC AE020000 */   sw       $v0, ($s0)
+/* 34AC0 800596C0 AE020004 */  sw        $v0, 4($s0)
+.L800596C4:
+/* 34AC4 800596C4 8662000A */  lh        $v0, 0xa($s3)
+/* 34AC8 800596C8 10400014 */  beqz      $v0, .L8005971C
+/* 34ACC 800596CC 0240302D */   daddu    $a2, $s2, $zero
+/* 34AD0 800596D0 26520008 */  addiu     $s2, $s2, 8
+/* 34AD4 800596D4 0240802D */  daddu     $s0, $s2, $zero
+/* 34AD8 800596D8 26520008 */  addiu     $s2, $s2, 8
+/* 34ADC 800596DC 00161400 */  sll       $v0, $s6, 0x10
+/* 34AE0 800596E0 3C080C00 */  lui       $t0, 0xc00
+/* 34AE4 800596E4 97A50026 */  lhu       $a1, 0x26($sp)
+/* 34AE8 800596E8 9663000A */  lhu       $v1, 0xa($s3)
+/* 34AEC 800596EC 00451025 */  or        $v0, $v0, $a1
+/* 34AF0 800596F0 00681825 */  or        $v1, $v1, $t0
+/* 34AF4 800596F4 ACC20004 */  sw        $v0, 4($a2)
+/* 34AF8 800596F8 ACC30000 */  sw        $v1, ($a2)
+/* 34AFC 800596FC 97A80026 */  lhu       $t0, 0x26($sp)
+/* 34B00 80059700 02E0202D */  daddu     $a0, $s7, $zero
+/* 34B04 80059704 31020FFF */  andi      $v0, $t0, 0xfff
+/* 34B08 80059708 3C080617 */  lui       $t0, 0x617
+/* 34B0C 8005970C 00481025 */  or        $v0, $v0, $t0
+/* 34B10 80059710 0C0187A4 */  jal       osVirtualToPhysical
+/* 34B14 80059714 AE020000 */   sw       $v0, ($s0)
+/* 34B18 80059718 AE020004 */  sw        $v0, 4($s0)
+.L8005971C:
+/* 34B1C 8005971C 8E620020 */  lw        $v0, 0x20($s3)
+/* 34B20 80059720 10400020 */  beqz      $v0, .L800597A4
+/* 34B24 80059724 3C020B00 */   lui      $v0, 0xb00
+/* 34B28 80059728 34420020 */  ori       $v0, $v0, 0x20
+/* 34B2C 8005972C 0240882D */  daddu     $s1, $s2, $zero
+/* 34B30 80059730 00168400 */  sll       $s0, $s6, 0x10
+/* 34B34 80059734 AE220000 */  sw        $v0, ($s1)
+/* 34B38 80059738 8E640020 */  lw        $a0, 0x20($s3)
+/* 34B3C 8005973C 00108603 */  sra       $s0, $s0, 0x18
+/* 34B40 80059740 0C0187A4 */  jal       osVirtualToPhysical
+/* 34B44 80059744 24840008 */   addiu    $a0, $a0, 8
+/* 34B48 80059748 26520008 */  addiu     $s2, $s2, 8
+/* 34B4C 8005974C AE220004 */  sw        $v0, 4($s1)
+/* 34B50 80059750 0240882D */  daddu     $s1, $s2, $zero
+/* 34B54 80059754 8E620020 */  lw        $v0, 0x20($s3)
+/* 34B58 80059758 3C030E00 */  lui       $v1, 0xe00
+/* 34B5C 8005975C 9044002F */  lbu       $a0, 0x2f($v0)
+/* 34B60 80059760 94420002 */  lhu       $v0, 2($v0)
+/* 34B64 80059764 00042400 */  sll       $a0, $a0, 0x10
+/* 34B68 80059768 00431025 */  or        $v0, $v0, $v1
+/* 34B6C 8005976C 00822025 */  or        $a0, $a0, $v0
+/* 34B70 80059770 AE240000 */  sw        $a0, ($s1)
+/* 34B74 80059774 8E620020 */  lw        $v0, 0x20($s3)
+/* 34B78 80059778 8C440028 */  lw        $a0, 0x28($v0)
+/* 34B7C 8005977C 0C0187A4 */  jal       osVirtualToPhysical
+/* 34B80 80059780 00108600 */   sll      $s0, $s0, 0x18
+/* 34B84 80059784 3C0300FF */  lui       $v1, 0xff
+/* 34B88 80059788 3463FFFF */  ori       $v1, $v1, 0xffff
+/* 34B8C 8005978C 00431024 */  and       $v0, $v0, $v1
+/* 34B90 80059790 02028025 */  or        $s0, $s0, $v0
+/* 34B94 80059794 AE300004 */  sw        $s0, 4($s1)
+/* 34B98 80059798 8E620020 */  lw        $v0, 0x20($s3)
+/* 34B9C 8005979C 26520008 */  addiu     $s2, $s2, 8
+/* 34BA0 800597A0 AC40002C */  sw        $zero, 0x2c($v0)
+.L800597A4:
+/* 34BA4 800597A4 8E620028 */  lw        $v0, 0x28($s3)
+/* 34BA8 800597A8 14400009 */  bnez      $v0, .L800597D0
+/* 34BAC 800597AC 0240802D */   daddu    $s0, $s2, $zero
+/* 34BB0 800597B0 26520008 */  addiu     $s2, $s2, 8
+/* 34BB4 800597B4 03C0202D */  daddu     $a0, $fp, $zero
+/* 34BB8 800597B8 32C20FFF */  andi      $v0, $s6, 0xfff
+/* 34BBC 800597BC 3C080617 */  lui       $t0, 0x617
+/* 34BC0 800597C0 00481025 */  or        $v0, $v0, $t0
+/* 34BC4 800597C4 0C0187A4 */  jal       osVirtualToPhysical
+/* 34BC8 800597C8 AE020000 */   sw       $v0, ($s0)
+/* 34BCC 800597CC AE020004 */  sw        $v0, 4($s0)
+.L800597D0:
+/* 34BD0 800597D0 8662000C */  lh        $v0, 0xc($s3)
+/* 34BD4 800597D4 1040000A */  beqz      $v0, .L80059800
+/* 34BD8 800597D8 0240282D */   daddu    $a1, $s2, $zero
+/* 34BDC 800597DC 26520008 */  addiu     $s2, $s2, 8
+/* 34BE0 800597E0 00161400 */  sll       $v0, $s6, 0x10
+/* 34BE4 800597E4 3C080C00 */  lui       $t0, 0xc00
+/* 34BE8 800597E8 97A40028 */  lhu       $a0, 0x28($sp)
+/* 34BEC 800597EC 9663000C */  lhu       $v1, 0xc($s3)
+/* 34BF0 800597F0 00441025 */  or        $v0, $v0, $a0
+/* 34BF4 800597F4 00681825 */  or        $v1, $v1, $t0
+/* 34BF8 800597F8 ACA20004 */  sw        $v0, 4($a1)
+/* 34BFC 800597FC ACA30000 */  sw        $v1, ($a1)
+.L80059800:
+/* 34C00 80059800 97A8001E */  lhu       $t0, 0x1e($sp)
+/* 34C04 80059804 25030001 */  addiu     $v1, $t0, 1
+/* 34C08 80059808 A7A3001E */  sh        $v1, 0x1e($sp)
+/* 34C0C 8005980C 00031C00 */  sll       $v1, $v1, 0x10
+/* 34C10 80059810 8FA80068 */  lw        $t0, 0x68($sp)
+/* 34C14 80059814 8E620004 */  lw        $v0, 4($s3)
+/* 34C18 80059818 8D040004 */  lw        $a0, 4($t0)
+/* 34C1C 8005981C 00021040 */  sll       $v0, $v0, 1
+/* 34C20 80059820 0082A021 */  addu      $s4, $a0, $v0
+/* 34C24 80059824 91020010 */  lbu       $v0, 0x10($t0)
+/* 34C28 80059828 00031C03 */  sra       $v1, $v1, 0x10
+/* 34C2C 8005982C 0062182A */  slt       $v1, $v1, $v0
+/* 34C30 80059830 1460FEEA */  bnez      $v1, .L800593DC
+/* 34C34 80059834 00000000 */   nop      
+.L80059838:
+/* 34C38 80059838 8FA80068 */  lw        $t0, 0x68($sp)
+/* 34C3C 8005983C 8D030004 */  lw        $v1, 4($t0)
+/* 34C40 80059840 8D020008 */  lw        $v0, 8($t0)
+/* 34C44 80059844 8D040000 */  lw        $a0, ($t0)
+/* 34C48 80059848 24630170 */  addiu     $v1, $v1, 0x170
+/* 34C4C 8005984C 00021040 */  sll       $v0, $v0, 1
+/* 34C50 80059850 00821021 */  addu      $v0, $a0, $v0
+/* 34C54 80059854 AD030004 */  sw        $v1, 4($t0)
+/* 34C58 80059858 0062182B */  sltu      $v1, $v1, $v0
+/* 34C5C 8005985C 50600001 */  beql      $v1, $zero, .L80059864
+/* 34C60 80059860 AD040004 */   sw       $a0, 4($t0)
+.L80059864:
+/* 34C64 80059864 0240102D */  daddu     $v0, $s2, $zero
+/* 34C68 80059868 8FBF0054 */  lw        $ra, 0x54($sp)
+/* 34C6C 8005986C 8FBE0050 */  lw        $fp, 0x50($sp)
+/* 34C70 80059870 8FB7004C */  lw        $s7, 0x4c($sp)
+/* 34C74 80059874 8FB60048 */  lw        $s6, 0x48($sp)
+/* 34C78 80059878 8FB50044 */  lw        $s5, 0x44($sp)
+/* 34C7C 8005987C 8FB40040 */  lw        $s4, 0x40($sp)
+/* 34C80 80059880 8FB3003C */  lw        $s3, 0x3c($sp)
+/* 34C84 80059884 8FB20038 */  lw        $s2, 0x38($sp)
+/* 34C88 80059888 8FB10034 */  lw        $s1, 0x34($sp)
+/* 34C8C 8005988C 8FB00030 */  lw        $s0, 0x30($sp)
+/* 34C90 80059890 D7B60060 */  ldc1      $f22, 0x60($sp)
+/* 34C94 80059894 D7B40058 */  ldc1      $f20, 0x58($sp)
+/* 34C98 80059898 03E00008 */  jr        $ra
+/* 34C9C 8005989C 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/asm/nonmatchings/world/world/func_800598A0.s b/asm/nonmatchings/world/world/func_800598A0.s
new file mode 100644
index 0000000000..fab9b05da6
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_800598A0.s
@@ -0,0 +1,140 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_800598A0
+/* 34CA0 800598A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 34CA4 800598A4 00063400 */  sll       $a2, $a2, 0x10
+/* 34CA8 800598A8 00063403 */  sra       $a2, $a2, 0x10
+/* 34CAC 800598AC 2CC20008 */  sltiu     $v0, $a2, 8
+/* 34CB0 800598B0 1040007D */  beqz      $v0, .L80059AA8
+/* 34CB4 800598B4 AFBF0010 */   sw       $ra, 0x10($sp)
+/* 34CB8 800598B8 00061080 */  sll       $v0, $a2, 2
+/* 34CBC 800598BC 3C01800A */  lui       $at, 0x800a
+/* 34CC0 800598C0 00220821 */  addu      $at, $at, $v0
+/* 34CC4 800598C4 8C228970 */  lw        $v0, -0x7690($at)
+/* 34CC8 800598C8 00400008 */  jr        $v0
+/* 34CCC 800598CC 00000000 */   nop      
+/* 34CD0 800598D0 00051400 */  sll       $v0, $a1, 0x10
+/* 34CD4 800598D4 00021403 */  sra       $v0, $v0, 0x10
+/* 34CD8 800598D8 00021840 */  sll       $v1, $v0, 1
+/* 34CDC 800598DC 00621821 */  addu      $v1, $v1, $v0
+/* 34CE0 800598E0 8C82000C */  lw        $v0, 0xc($a0)
+/* 34CE4 800598E4 00031900 */  sll       $v1, $v1, 4
+/* 34CE8 800598E8 00621821 */  addu      $v1, $v1, $v0
+/* 34CEC 800598EC 2402FFF8 */  addiu     $v0, $zero, -8
+/* 34CF0 800598F0 00E21024 */  and       $v0, $a3, $v0
+/* 34CF4 800598F4 080166AA */  j         .L80059AA8
+/* 34CF8 800598F8 AC620000 */   sw       $v0, ($v1)
+/* 34CFC 800598FC 00051400 */  sll       $v0, $a1, 0x10
+/* 34D00 80059900 00021403 */  sra       $v0, $v0, 0x10
+/* 34D04 80059904 00021840 */  sll       $v1, $v0, 1
+/* 34D08 80059908 00621821 */  addu      $v1, $v1, $v0
+/* 34D0C 8005990C 8C82000C */  lw        $v0, 0xc($a0)
+/* 34D10 80059910 00031900 */  sll       $v1, $v1, 4
+/* 34D14 80059914 00621821 */  addu      $v1, $v1, $v0
+/* 34D18 80059918 2402FFF8 */  addiu     $v0, $zero, -8
+/* 34D1C 8005991C 00E21024 */  and       $v0, $a3, $v0
+/* 34D20 80059920 080166AA */  j         .L80059AA8
+/* 34D24 80059924 AC620004 */   sw       $v0, 4($v1)
+/* 34D28 80059928 00051400 */  sll       $v0, $a1, 0x10
+/* 34D2C 8005992C 00021403 */  sra       $v0, $v0, 0x10
+/* 34D30 80059930 00021840 */  sll       $v1, $v0, 1
+/* 34D34 80059934 00621821 */  addu      $v1, $v1, $v0
+/* 34D38 80059938 8C82000C */  lw        $v0, 0xc($a0)
+/* 34D3C 8005993C 00031900 */  sll       $v1, $v1, 4
+/* 34D40 80059940 00621821 */  addu      $v1, $v1, $v0
+/* 34D44 80059944 080166AA */  j         .L80059AA8
+/* 34D48 80059948 A4670008 */   sh       $a3, 8($v1)
+/* 34D4C 8005994C 00051400 */  sll       $v0, $a1, 0x10
+/* 34D50 80059950 00021403 */  sra       $v0, $v0, 0x10
+/* 34D54 80059954 00021840 */  sll       $v1, $v0, 1
+/* 34D58 80059958 00621821 */  addu      $v1, $v1, $v0
+/* 34D5C 8005995C 8C82000C */  lw        $v0, 0xc($a0)
+/* 34D60 80059960 00031900 */  sll       $v1, $v1, 4
+/* 34D64 80059964 00621821 */  addu      $v1, $v1, $v0
+/* 34D68 80059968 080166AA */  j         .L80059AA8
+/* 34D6C 8005996C A467000A */   sh       $a3, 0xa($v1)
+/* 34D70 80059970 00051400 */  sll       $v0, $a1, 0x10
+/* 34D74 80059974 00021403 */  sra       $v0, $v0, 0x10
+/* 34D78 80059978 00021840 */  sll       $v1, $v0, 1
+/* 34D7C 8005997C 00621821 */  addu      $v1, $v1, $v0
+/* 34D80 80059980 8C82000C */  lw        $v0, 0xc($a0)
+/* 34D84 80059984 00031900 */  sll       $v1, $v1, 4
+/* 34D88 80059988 00621821 */  addu      $v1, $v1, $v0
+/* 34D8C 8005998C 080166AA */  j         .L80059AA8
+/* 34D90 80059990 A467000C */   sh       $a3, 0xc($v1)
+/* 34D94 80059994 00051400 */  sll       $v0, $a1, 0x10
+/* 34D98 80059998 00021403 */  sra       $v0, $v0, 0x10
+/* 34D9C 8005999C 00021840 */  sll       $v1, $v0, 1
+/* 34DA0 800599A0 00621821 */  addu      $v1, $v1, $v0
+/* 34DA4 800599A4 00031900 */  sll       $v1, $v1, 4
+/* 34DA8 800599A8 44870000 */  mtc1      $a3, $f0
+/* 34DAC 800599AC 00000000 */  nop       
+/* 34DB0 800599B0 46800020 */  cvt.s.w   $f0, $f0
+/* 34DB4 800599B4 3C01447A */  lui       $at, 0x447a
+/* 34DB8 800599B8 44811000 */  mtc1      $at, $f2
+/* 34DBC 800599BC 8C82000C */  lw        $v0, 0xc($a0)
+/* 34DC0 800599C0 3C048008 */  lui       $a0, 0x8008
+/* 34DC4 800599C4 8C848E50 */  lw        $a0, -0x71b0($a0)
+/* 34DC8 800599C8 46020003 */  div.s     $f0, $f0, $f2
+/* 34DCC 800599CC 46000021 */  cvt.d.s   $f0, $f0
+/* 34DD0 800599D0 46200000 */  add.d     $f0, $f0, $f0
+/* 34DD4 800599D4 00621821 */  addu      $v1, $v1, $v0
+/* 34DD8 800599D8 C4820008 */  lwc1      $f2, 8($a0)
+/* 34DDC 800599DC 468010A1 */  cvt.d.w   $f2, $f2
+/* 34DE0 800599E0 46220003 */  div.d     $f0, $f0, $f2
+/* 34DE4 800599E4 46200020 */  cvt.s.d   $f0, $f0
+/* 34DE8 800599E8 080166AA */  j         .L80059AA8
+/* 34DEC 800599EC E4600010 */   swc1     $f0, 0x10($v1)
+/* 34DF0 800599F0 00051400 */  sll       $v0, $a1, 0x10
+/* 34DF4 800599F4 00021403 */  sra       $v0, $v0, 0x10
+/* 34DF8 800599F8 00021840 */  sll       $v1, $v0, 1
+/* 34DFC 800599FC 00621821 */  addu      $v1, $v1, $v0
+/* 34E00 80059A00 00031900 */  sll       $v1, $v1, 4
+/* 34E04 80059A04 44870000 */  mtc1      $a3, $f0
+/* 34E08 80059A08 00000000 */  nop       
+/* 34E0C 80059A0C 46800020 */  cvt.s.w   $f0, $f0
+/* 34E10 80059A10 46000021 */  cvt.d.s   $f0, $f0
+/* 34E14 80059A14 8C82000C */  lw        $v0, 0xc($a0)
+/* 34E18 80059A18 3C01800A */  lui       $at, 0x800a
+/* 34E1C 80059A1C D4228990 */  ldc1      $f2, -0x7670($at)
+/* 34E20 80059A20 00622021 */  addu      $a0, $v1, $v0
+/* 34E24 80059A24 8C830004 */  lw        $v1, 4($a0)
+/* 34E28 80059A28 8C820000 */  lw        $v0, ($a0)
+/* 34E2C 80059A2C 00621823 */  subu      $v1, $v1, $v0
+/* 34E30 80059A30 44832000 */  mtc1      $v1, $f4
+/* 34E34 80059A34 00000000 */  nop       
+/* 34E38 80059A38 46802121 */  cvt.d.w   $f4, $f4
+/* 34E3C 80059A3C 04610006 */  bgez      $v1, .L80059A58
+/* 34E40 80059A40 46220083 */   div.d    $f2, $f0, $f2
+/* 34E44 80059A44 3C0141F0 */  lui       $at, 0x41f0
+/* 34E48 80059A48 44810800 */  mtc1      $at, $f1
+/* 34E4C 80059A4C 44800000 */  mtc1      $zero, $f0
+/* 34E50 80059A50 00000000 */  nop       
+/* 34E54 80059A54 46202100 */  add.d     $f4, $f4, $f0
+.L80059A58:
+/* 34E58 80059A58 46241002 */  mul.d     $f0, $f2, $f4
+/* 34E5C 80059A5C 00000000 */  nop       
+/* 34E60 80059A60 46200020 */  cvt.s.d   $f0, $f0
+/* 34E64 80059A64 080166AA */  j         .L80059AA8
+/* 34E68 80059A68 E480001C */   swc1     $f0, 0x1c($a0)
+/* 34E6C 80059A6C 00051400 */  sll       $v0, $a1, 0x10
+/* 34E70 80059A70 00021403 */  sra       $v0, $v0, 0x10
+/* 34E74 80059A74 00021840 */  sll       $v1, $v0, 1
+/* 34E78 80059A78 00621821 */  addu      $v1, $v1, $v0
+/* 34E7C 80059A7C 8C82000C */  lw        $v0, 0xc($a0)
+/* 34E80 80059A80 00031900 */  sll       $v1, $v1, 4
+/* 34E84 80059A84 00621021 */  addu      $v0, $v1, $v0
+/* 34E88 80059A88 8C420020 */  lw        $v0, 0x20($v0)
+/* 34E8C 80059A8C 10400006 */  beqz      $v0, .L80059AA8
+/* 34E90 80059A90 00000000 */   nop      
+/* 34E94 80059A94 A4470000 */  sh        $a3, ($v0)
+/* 34E98 80059A98 8C82000C */  lw        $v0, 0xc($a0)
+/* 34E9C 80059A9C 00621021 */  addu      $v0, $v1, $v0
+/* 34EA0 80059AA0 0C016374 */  jal       func_80058DD0
+/* 34EA4 80059AA4 8C440020 */   lw       $a0, 0x20($v0)
+.L80059AA8:
+/* 34EA8 80059AA8 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 34EAC 80059AAC 0000102D */  daddu     $v0, $zero, $zero
+/* 34EB0 80059AB0 03E00008 */  jr        $ra
+/* 34EB4 80059AB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/world/func_80059AB8.s b/asm/nonmatchings/world/world/func_80059AB8.s
new file mode 100644
index 0000000000..52a8841a34
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059AB8.s
@@ -0,0 +1,77 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059AB8
+/* 34EB8 80059AB8 27BDFFD0 */  addiu     $sp, $sp, -0x30
+/* 34EBC 80059ABC AFB50024 */  sw        $s5, 0x24($sp)
+/* 34EC0 80059AC0 0080A82D */  daddu     $s5, $a0, $zero
+/* 34EC4 80059AC4 00A0202D */  daddu     $a0, $a1, $zero
+/* 34EC8 80059AC8 AFB60028 */  sw        $s6, 0x28($sp)
+/* 34ECC 80059ACC 00C0B02D */  daddu     $s6, $a2, $zero
+/* 34ED0 80059AD0 AFB40020 */  sw        $s4, 0x20($sp)
+/* 34ED4 80059AD4 8FB40040 */  lw        $s4, 0x40($sp)
+/* 34ED8 80059AD8 00073840 */  sll       $a3, $a3, 1
+/* 34EDC 80059ADC AFB00010 */  sw        $s0, 0x10($sp)
+/* 34EE0 80059AE0 00878021 */  addu      $s0, $a0, $a3
+/* 34EE4 80059AE4 AFBF002C */  sw        $ra, 0x2c($sp)
+/* 34EE8 80059AE8 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 34EEC 80059AEC AFB20018 */  sw        $s2, 0x18($sp)
+/* 34EF0 80059AF0 AFB10014 */  sw        $s1, 0x14($sp)
+/* 34EF4 80059AF4 8EA20008 */  lw        $v0, 8($s5)
+/* 34EF8 80059AF8 8EA30000 */  lw        $v1, ($s5)
+/* 34EFC 80059AFC 00021040 */  sll       $v0, $v0, 1
+/* 34F00 80059B00 00623021 */  addu      $a2, $v1, $v0
+/* 34F04 80059B04 00D0102B */  sltu      $v0, $a2, $s0
+/* 34F08 80059B08 1040001C */  beqz      $v0, .L80059B7C
+/* 34F0C 80059B0C 0280902D */   daddu    $s2, $s4, $zero
+/* 34F10 80059B10 26940008 */  addiu     $s4, $s4, 8
+/* 34F14 80059B14 00C48823 */  subu      $s1, $a2, $a0
+/* 34F18 80059B18 00118843 */  sra       $s1, $s1, 1
+/* 34F1C 80059B1C 00118840 */  sll       $s1, $s1, 1
+/* 34F20 80059B20 32230FFF */  andi      $v1, $s1, 0xfff
+/* 34F24 80059B24 00031B00 */  sll       $v1, $v1, 0xc
+/* 34F28 80059B28 32C20FFF */  andi      $v0, $s6, 0xfff
+/* 34F2C 80059B2C 3C130400 */  lui       $s3, 0x400
+/* 34F30 80059B30 00531025 */  or        $v0, $v0, $s3
+/* 34F34 80059B34 00621825 */  or        $v1, $v1, $v0
+/* 34F38 80059B38 02068023 */  subu      $s0, $s0, $a2
+/* 34F3C 80059B3C 00108043 */  sra       $s0, $s0, 1
+/* 34F40 80059B40 0C0187A4 */  jal       osVirtualToPhysical
+/* 34F44 80059B44 AE430000 */   sw       $v1, ($s2)
+/* 34F48 80059B48 AE420004 */  sw        $v0, 4($s2)
+/* 34F4C 80059B4C 0280902D */  daddu     $s2, $s4, $zero
+/* 34F50 80059B50 00108040 */  sll       $s0, $s0, 1
+/* 34F54 80059B54 32100FFF */  andi      $s0, $s0, 0xfff
+/* 34F58 80059B58 00108300 */  sll       $s0, $s0, 0xc
+/* 34F5C 80059B5C 02D18821 */  addu      $s1, $s6, $s1
+/* 34F60 80059B60 32310FFF */  andi      $s1, $s1, 0xfff
+/* 34F64 80059B64 02338825 */  or        $s1, $s1, $s3
+/* 34F68 80059B68 02118025 */  or        $s0, $s0, $s1
+/* 34F6C 80059B6C AE500000 */  sw        $s0, ($s2)
+/* 34F70 80059B70 8EA40000 */  lw        $a0, ($s5)
+/* 34F74 80059B74 080166E7 */  j         .L80059B9C
+/* 34F78 80059B78 26940008 */   addiu    $s4, $s4, 8
+.L80059B7C:
+/* 34F7C 80059B7C 26940008 */  addiu     $s4, $s4, 8
+/* 34F80 80059B80 30E20FFF */  andi      $v0, $a3, 0xfff
+/* 34F84 80059B84 00021300 */  sll       $v0, $v0, 0xc
+/* 34F88 80059B88 32C30FFF */  andi      $v1, $s6, 0xfff
+/* 34F8C 80059B8C 3C050400 */  lui       $a1, 0x400
+/* 34F90 80059B90 00651825 */  or        $v1, $v1, $a1
+/* 34F94 80059B94 00431025 */  or        $v0, $v0, $v1
+/* 34F98 80059B98 AE420000 */  sw        $v0, ($s2)
+.L80059B9C:
+/* 34F9C 80059B9C 0C0187A4 */  jal       osVirtualToPhysical
+/* 34FA0 80059BA0 00000000 */   nop      
+/* 34FA4 80059BA4 AE420004 */  sw        $v0, 4($s2)
+/* 34FA8 80059BA8 0280102D */  daddu     $v0, $s4, $zero
+/* 34FAC 80059BAC 8FBF002C */  lw        $ra, 0x2c($sp)
+/* 34FB0 80059BB0 8FB60028 */  lw        $s6, 0x28($sp)
+/* 34FB4 80059BB4 8FB50024 */  lw        $s5, 0x24($sp)
+/* 34FB8 80059BB8 8FB40020 */  lw        $s4, 0x20($sp)
+/* 34FBC 80059BBC 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 34FC0 80059BC0 8FB20018 */  lw        $s2, 0x18($sp)
+/* 34FC4 80059BC4 8FB10014 */  lw        $s1, 0x14($sp)
+/* 34FC8 80059BC8 8FB00010 */  lw        $s0, 0x10($sp)
+/* 34FCC 80059BCC 03E00008 */  jr        $ra
+/* 34FD0 80059BD0 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/world/func_80059BD4.s b/asm/nonmatchings/world/world/func_80059BD4.s
new file mode 100644
index 0000000000..b15be47501
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059BD4.s
@@ -0,0 +1,50 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059BD4
+/* 34FD4 80059BD4 C4800010 */  lwc1      $f0, 0x10($a0)
+/* 34FD8 80059BD8 44851000 */  mtc1      $a1, $f2
+/* 34FDC 80059BDC 00000000 */  nop       
+/* 34FE0 80059BE0 468010A0 */  cvt.s.w   $f2, $f2
+/* 34FE4 80059BE4 46020002 */  mul.s     $f0, $f0, $f2
+/* 34FE8 80059BE8 00000000 */  nop       
+/* 34FEC 80059BEC C4820014 */  lwc1      $f2, 0x14($a0)
+/* 34FF0 80059BF0 46001080 */  add.s     $f2, $f2, $f0
+/* 34FF4 80059BF4 24820014 */  addiu     $v0, $a0, 0x14
+/* 34FF8 80059BF8 3C014000 */  lui       $at, 0x4000
+/* 34FFC 80059BFC 44810800 */  mtc1      $at, $f1
+/* 35000 80059C00 44800000 */  mtc1      $zero, $f0
+/* 35004 80059C04 46001121 */  cvt.d.s   $f4, $f2
+/* 35008 80059C08 4624003C */  c.lt.d    $f0, $f4
+/* 3500C 80059C0C 00000000 */  nop       
+/* 35010 80059C10 45000008 */  bc1f      .L80059C34
+/* 35014 80059C14 E4820014 */   swc1     $f2, 0x14($a0)
+/* 35018 80059C18 3C014010 */  lui       $at, 0x4010
+/* 3501C 80059C1C 44810800 */  mtc1      $at, $f1
+/* 35020 80059C20 44800000 */  mtc1      $zero, $f0
+/* 35024 80059C24 00000000 */  nop       
+/* 35028 80059C28 46202001 */  sub.d     $f0, $f4, $f0
+/* 3502C 80059C2C 0801670E */  j         .L80059C38
+/* 35030 80059C30 46200020 */   cvt.s.d  $f0, $f0
+.L80059C34:
+/* 35034 80059C34 46001006 */  mov.s     $f0, $f2
+.L80059C38:
+/* 35038 80059C38 E4400000 */  swc1      $f0, ($v0)
+/* 3503C 80059C3C C4820014 */  lwc1      $f2, 0x14($a0)
+/* 35040 80059C40 44800000 */  mtc1      $zero, $f0
+/* 35044 80059C44 00000000 */  nop       
+/* 35048 80059C48 4600103C */  c.lt.s    $f2, $f0
+/* 3504C 80059C4C 00000000 */  nop       
+/* 35050 80059C50 45030001 */  bc1tl     .L80059C58
+/* 35054 80059C54 46001087 */   neg.s    $f2, $f2
+.L80059C58:
+/* 35058 80059C58 3C013FF0 */  lui       $at, 0x3ff0
+/* 3505C 80059C5C 44810800 */  mtc1      $at, $f1
+/* 35060 80059C60 44800000 */  mtc1      $zero, $f0
+/* 35064 80059C64 460010A1 */  cvt.d.s   $f2, $f2
+/* 35068 80059C68 46201081 */  sub.d     $f2, $f2, $f0
+/* 3506C 80059C6C C480001C */  lwc1      $f0, 0x1c($a0)
+/* 35070 80059C70 462010A0 */  cvt.s.d   $f2, $f2
+/* 35074 80059C74 46020002 */  mul.s     $f0, $f0, $f2
+/* 35078 80059C78 03E00008 */  jr        $ra
+/* 3507C 80059C7C 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/func_80059C88.s b/asm/nonmatchings/world/world/func_80059C88.s
new file mode 100644
index 0000000000..77d0e7ff62
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059C88.s
@@ -0,0 +1,9 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059C88
+/* 35088 80059C88 8C82000C */  lw        $v0, 0xc($a0)
+/* 3508C 80059C8C AC450004 */  sw        $a1, 4($v0)
+/* 35090 80059C90 AC460008 */  sw        $a2, 8($v0)
+/* 35094 80059C94 03E00008 */  jr        $ra
+/* 35098 80059C98 AC47000C */   sw       $a3, 0xc($v0)
diff --git a/asm/nonmatchings/world/world/func_80059C9C.s b/asm/nonmatchings/world/world/func_80059C9C.s
new file mode 100644
index 0000000000..82c14cdfd6
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059C9C.s
@@ -0,0 +1,49 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059C9C
+/* 3509C 80059C9C 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 350A0 80059CA0 2402000E */  addiu     $v0, $zero, 0xe
+/* 350A4 80059CA4 3C03800A */  lui       $v1, 0x800a
+/* 350A8 80059CA8 246341C0 */  addiu     $v1, $v1, 0x41c0
+/* 350AC 80059CAC AFBF001C */  sw        $ra, 0x1c($sp)
+/* 350B0 80059CB0 AFB00018 */  sw        $s0, 0x18($sp)
+.L80059CB4:
+/* 350B4 80059CB4 AC600000 */  sw        $zero, ($v1)
+/* 350B8 80059CB8 2442FFFF */  addiu     $v0, $v0, -1
+/* 350BC 80059CBC 0441FFFD */  bgez      $v0, .L80059CB4
+/* 350C0 80059CC0 2463FFE0 */   addiu    $v1, $v1, -0x20
+/* 350C4 80059CC4 2402005F */  addiu     $v0, $zero, 0x5f
+/* 350C8 80059CC8 3C03800B */  lui       $v1, 0x800b
+/* 350CC 80059CCC 24634514 */  addiu     $v1, $v1, 0x4514
+.L80059CD0:
+/* 350D0 80059CD0 AC600000 */  sw        $zero, ($v1)
+/* 350D4 80059CD4 2442FFFF */  addiu     $v0, $v0, -1
+/* 350D8 80059CD8 0441FFFD */  bgez      $v0, .L80059CD0
+/* 350DC 80059CDC 2463FFFC */   addiu    $v1, $v1, -4
+/* 350E0 80059CE0 0C019A58 */  jal       osUnmapTLBAll
+/* 350E4 80059CE4 00000000 */   nop      
+/* 350E8 80059CE8 3C0300FF */  lui       $v1, 0xff
+/* 350EC 80059CEC 3463FFFF */  ori       $v1, $v1, 0xffff
+/* 350F0 80059CF0 24040010 */  addiu     $a0, $zero, 0x10
+/* 350F4 80059CF4 0000282D */  daddu     $a1, $zero, $zero
+/* 350F8 80059CF8 3C10E020 */  lui       $s0, 0xe020
+/* 350FC 80059CFC 26100000 */  addiu     $s0, $s0, 0
+/* 35100 80059D00 0200302D */  daddu     $a2, $s0, $zero
+/* 35104 80059D04 2402FFFF */  addiu     $v0, $zero, -1
+/* 35108 80059D08 3C07801A */  lui       $a3, 0x801a
+/* 3510C 80059D0C 24E76000 */  addiu     $a3, $a3, 0x6000
+/* 35110 80059D10 00E33824 */  and       $a3, $a3, $v1
+/* 35114 80059D14 AFA20010 */  sw        $v0, 0x10($sp)
+/* 35118 80059D18 0C0199E8 */  jal       osMapTLB
+/* 3511C 80059D1C AFA20014 */   sw       $v0, 0x14($sp)
+/* 35120 80059D20 3C040032 */  lui       $a0, 0x32
+/* 35124 80059D24 24845AD0 */  addiu     $a0, $a0, 0x5ad0
+/* 35128 80059D28 3C050032 */  lui       $a1, 0x32
+/* 3512C 80059D2C 24A56410 */  addiu     $a1, $a1, 0x6410
+/* 35130 80059D30 0C00A5CF */  jal       dma_copy
+/* 35134 80059D34 0200302D */   daddu    $a2, $s0, $zero
+/* 35138 80059D38 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 3513C 80059D3C 8FB00018 */  lw        $s0, 0x18($sp)
+/* 35140 80059D40 03E00008 */  jr        $ra
+/* 35144 80059D44 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/world/func_80059D50.s b/asm/nonmatchings/world/world/func_80059D50.s
new file mode 100644
index 0000000000..eeae71c2ce
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059D50.s
@@ -0,0 +1,121 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059D50
+/* 35150 80059D50 3C02800A */  lui       $v0, %hi(D_8009A650)
+/* 35154 80059D54 8C42A650 */  lw        $v0, %lo(D_8009A650)($v0)
+/* 35158 80059D58 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 3515C 80059D5C AFBF0020 */  sw        $ra, 0x20($sp)
+/* 35160 80059D60 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 35164 80059D64 AFB20018 */  sw        $s2, 0x18($sp)
+/* 35168 80059D68 AFB10014 */  sw        $s1, 0x14($sp)
+/* 3516C 80059D6C 30420C00 */  andi      $v0, $v0, 0xc00
+/* 35170 80059D70 14400059 */  bnez      $v0, .L80059ED8
+/* 35174 80059D74 AFB00010 */   sw       $s0, 0x10($sp)
+/* 35178 80059D78 0000902D */  daddu     $s2, $zero, $zero
+/* 3517C 80059D7C 3C10800A */  lui       $s0, 0x800a
+/* 35180 80059D80 26104000 */  addiu     $s0, $s0, 0x4000
+/* 35184 80059D84 24040003 */  addiu     $a0, $zero, 3
+.L80059D88:
+/* 35188 80059D88 8E030000 */  lw        $v1, ($s0)
+/* 3518C 80059D8C 30620001 */  andi      $v0, $v1, 1
+/* 35190 80059D90 10400007 */  beqz      $v0, .L80059DB0
+/* 35194 80059D94 26520001 */   addiu    $s2, $s2, 1
+/* 35198 80059D98 30620002 */  andi      $v0, $v1, 2
+/* 3519C 80059D9C 14400004 */  bnez      $v0, .L80059DB0
+/* 351A0 80059DA0 00000000 */   nop      
+/* 351A4 80059DA4 34620002 */  ori       $v0, $v1, 2
+/* 351A8 80059DA8 AE020000 */  sw        $v0, ($s0)
+/* 351AC 80059DAC AE04000C */  sw        $a0, 0xc($s0)
+.L80059DB0:
+/* 351B0 80059DB0 2A42000F */  slti      $v0, $s2, 0xf
+/* 351B4 80059DB4 1440FFF4 */  bnez      $v0, .L80059D88
+/* 351B8 80059DB8 26100020 */   addiu    $s0, $s0, 0x20
+/* 351BC 80059DBC 0000902D */  daddu     $s2, $zero, $zero
+/* 351C0 80059DC0 2413FFFD */  addiu     $s3, $zero, -3
+/* 351C4 80059DC4 3C11800B */  lui       $s1, 0x800b
+/* 351C8 80059DC8 26314398 */  addiu     $s1, $s1, 0x4398
+.L80059DCC:
+/* 351CC 80059DCC 8E300000 */  lw        $s0, ($s1)
+/* 351D0 80059DD0 52000020 */  beql      $s0, $zero, .L80059E54
+/* 351D4 80059DD4 26520001 */   addiu    $s2, $s2, 1
+/* 351D8 80059DD8 8E020000 */  lw        $v0, ($s0)
+/* 351DC 80059DDC 30420001 */  andi      $v0, $v0, 1
+/* 351E0 80059DE0 5040001C */  beql      $v0, $zero, .L80059E54
+/* 351E4 80059DE4 26520001 */   addiu    $s2, $s2, 1
+/* 351E8 80059DE8 8E030010 */  lw        $v1, 0x10($s0)
+/* 351EC 80059DEC 8C620000 */  lw        $v0, ($v1)
+/* 351F0 80059DF0 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
+/* 351F4 80059DF4 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
+/* 351F8 80059DF8 00531024 */  and       $v0, $v0, $s3
+/* 351FC 80059DFC AC620000 */  sw        $v0, ($v1)
+/* 35200 80059E00 80820070 */  lb        $v0, 0x70($a0)
+/* 35204 80059E04 10400007 */  beqz      $v0, .L80059E24
+/* 35208 80059E08 00000000 */   nop      
+/* 3520C 80059E0C 8E020000 */  lw        $v0, ($s0)
+/* 35210 80059E10 30420004 */  andi      $v0, $v0, 4
+/* 35214 80059E14 5040000F */  beql      $v0, $zero, .L80059E54
+/* 35218 80059E18 26520001 */   addiu    $s2, $s2, 1
+/* 3521C 80059E1C 0801678D */  j         .L80059E34
+/* 35220 80059E20 00000000 */   nop      
+.L80059E24:
+/* 35224 80059E24 8E020000 */  lw        $v0, ($s0)
+/* 35228 80059E28 30420004 */  andi      $v0, $v0, 4
+/* 3522C 80059E2C 54400009 */  bnel      $v0, $zero, .L80059E54
+/* 35230 80059E30 26520001 */   addiu    $s2, $s2, 1
+.L80059E34:
+/* 35234 80059E34 8E020010 */  lw        $v0, 0x10($s0)
+/* 35238 80059E38 8C420010 */  lw        $v0, 0x10($v0)
+/* 3523C 80059E3C 0040F809 */  jalr      $v0
+/* 35240 80059E40 0200202D */   daddu    $a0, $s0, $zero
+/* 35244 80059E44 8E020000 */  lw        $v0, ($s0)
+/* 35248 80059E48 34420008 */  ori       $v0, $v0, 8
+/* 3524C 80059E4C AE020000 */  sw        $v0, ($s0)
+/* 35250 80059E50 26520001 */  addiu     $s2, $s2, 1
+.L80059E54:
+/* 35254 80059E54 2A420060 */  slti      $v0, $s2, 0x60
+/* 35258 80059E58 1440FFDC */  bnez      $v0, .L80059DCC
+/* 3525C 80059E5C 26310004 */   addiu    $s1, $s1, 4
+/* 35260 80059E60 0000902D */  daddu     $s2, $zero, $zero
+/* 35264 80059E64 3C10800A */  lui       $s0, 0x800a
+/* 35268 80059E68 26104000 */  addiu     $s0, $s0, 0x4000
+/* 3526C 80059E6C 2611001C */  addiu     $s1, $s0, 0x1c
+.L80059E70:
+/* 35270 80059E70 8E030000 */  lw        $v1, ($s0)
+/* 35274 80059E74 30620001 */  andi      $v0, $v1, 1
+/* 35278 80059E78 50400013 */  beql      $v0, $zero, .L80059EC8
+/* 3527C 80059E7C 26520001 */   addiu    $s2, $s2, 1
+/* 35280 80059E80 30620002 */  andi      $v0, $v1, 2
+/* 35284 80059E84 50400010 */  beql      $v0, $zero, .L80059EC8
+/* 35288 80059E88 26520001 */   addiu    $s2, $s2, 1
+/* 3528C 80059E8C 8E22FFF0 */  lw        $v0, -0x10($s1)
+/* 35290 80059E90 10400003 */  beqz      $v0, .L80059EA0
+/* 35294 80059E94 2442FFFF */   addiu    $v0, $v0, -1
+/* 35298 80059E98 080167B1 */  j         .L80059EC4
+/* 3529C 80059E9C AE22FFF0 */   sw       $v0, -0x10($s1)
+.L80059EA0:
+/* 352A0 80059EA0 8E240000 */  lw        $a0, ($s1)
+/* 352A4 80059EA4 50800005 */  beql      $a0, $zero, .L80059EBC
+/* 352A8 80059EA8 AE000000 */   sw       $zero, ($s0)
+/* 352AC 80059EAC 0C00AB1E */  jal       general_heap_free
+/* 352B0 80059EB0 00000000 */   nop      
+/* 352B4 80059EB4 AE200000 */  sw        $zero, ($s1)
+/* 352B8 80059EB8 AE000000 */  sw        $zero, ($s0)
+.L80059EBC:
+/* 352BC 80059EBC 0C019A48 */  jal       osUnmapTLB
+/* 352C0 80059EC0 0240202D */   daddu    $a0, $s2, $zero
+.L80059EC4:
+/* 352C4 80059EC4 26520001 */  addiu     $s2, $s2, 1
+.L80059EC8:
+/* 352C8 80059EC8 26310020 */  addiu     $s1, $s1, 0x20
+/* 352CC 80059ECC 2A42000F */  slti      $v0, $s2, 0xf
+/* 352D0 80059ED0 1440FFE7 */  bnez      $v0, .L80059E70
+/* 352D4 80059ED4 26100020 */   addiu    $s0, $s0, 0x20
+.L80059ED8:
+/* 352D8 80059ED8 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 352DC 80059EDC 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 352E0 80059EE0 8FB20018 */  lw        $s2, 0x18($sp)
+/* 352E4 80059EE4 8FB10014 */  lw        $s1, 0x14($sp)
+/* 352E8 80059EE8 8FB00010 */  lw        $s0, 0x10($sp)
+/* 352EC 80059EEC 03E00008 */  jr        $ra
+/* 352F0 80059EF0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/world/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s
new file mode 100644
index 0000000000..e02e9c8c07
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_80059F94.s
@@ -0,0 +1,211 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_80059F94
+/* 35394 80059F94 27BDFFC8 */  addiu     $sp, $sp, -0x38
+/* 35398 80059F98 F7B40030 */  sdc1      $f20, 0x30($sp)
+/* 3539C 80059F9C 3C014080 */  lui       $at, 0x4080
+/* 353A0 80059FA0 4481A000 */  mtc1      $at, $f20
+/* 353A4 80059FA4 AFB10014 */  sw        $s1, 0x14($sp)
+/* 353A8 80059FA8 24110001 */  addiu     $s1, $zero, 1
+/* 353AC 80059FAC AFB20018 */  sw        $s2, 0x18($sp)
+/* 353B0 80059FB0 0000902D */  daddu     $s2, $zero, $zero
+/* 353B4 80059FB4 AFB50024 */  sw        $s5, 0x24($sp)
+/* 353B8 80059FB8 3C15800B */  lui       $s5, %hi(gCameras)
+/* 353BC 80059FBC 26B51D80 */  addiu     $s5, $s5, %lo(gCameras)
+/* 353C0 80059FC0 AFB00010 */  sw        $s0, 0x10($sp)
+/* 353C4 80059FC4 3C10800A */  lui       $s0, 0x800a
+/* 353C8 80059FC8 2610A66C */  addiu     $s0, $s0, -0x5994
+/* 353CC 80059FCC AFB40020 */  sw        $s4, 0x20($sp)
+/* 353D0 80059FD0 24140002 */  addiu     $s4, $zero, 2
+/* 353D4 80059FD4 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 353D8 80059FD8 3413FFFE */  ori       $s3, $zero, 0xfffe
+/* 353DC 80059FDC AFBF0028 */  sw        $ra, 0x28($sp)
+/* 353E0 80059FE0 00121080 */  sll       $v0, $s2, 2
+.L80059FE4:
+/* 353E4 80059FE4 3C0E800B */  lui       $t6, 0x800b
+/* 353E8 80059FE8 01C27021 */  addu      $t6, $t6, $v0
+/* 353EC 80059FEC 8DCE4398 */  lw        $t6, 0x4398($t6)
+/* 353F0 80059FF0 51C000A5 */  beql      $t6, $zero, .L8005A288
+/* 353F4 80059FF4 26520001 */   addiu    $s2, $s2, 1
+/* 353F8 80059FF8 8DC30000 */  lw        $v1, ($t6)
+/* 353FC 80059FFC 30620001 */  andi      $v0, $v1, 1
+/* 35400 8005A000 504000A1 */  beql      $v0, $zero, .L8005A288
+/* 35404 8005A004 26520001 */   addiu    $s2, $s2, 1
+/* 35408 8005A008 30620008 */  andi      $v0, $v1, 8
+/* 3540C 8005A00C 5040009E */  beql      $v0, $zero, .L8005A288
+/* 35410 8005A010 26520001 */   addiu    $s2, $s2, 1
+/* 35414 8005A014 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 35418 8005A018 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 3541C 8005A01C 80420070 */  lb        $v0, 0x70($v0)
+/* 35420 8005A020 10400005 */  beqz      $v0, .L8005A038
+/* 35424 8005A024 30620004 */   andi     $v0, $v1, 4
+/* 35428 8005A028 50400097 */  beql      $v0, $zero, .L8005A288
+/* 3542C 8005A02C 26520001 */   addiu    $s2, $s2, 1
+/* 35430 8005A030 08016810 */  j         .L8005A040
+/* 35434 8005A034 00000000 */   nop      
+.L8005A038:
+/* 35438 8005A038 54400093 */  bnel      $v0, $zero, .L8005A288
+/* 3543C 8005A03C 26520001 */   addiu    $s2, $s2, 1
+.L8005A040:
+/* 35440 8005A040 8DC20010 */  lw        $v0, 0x10($t6)
+/* 35444 8005A044 8C4F0018 */  lw        $t7, 0x18($v0)
+/* 35448 8005A048 3C028006 */  lui       $v0, 0x8006
+/* 3544C 8005A04C 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 35450 8005A050 51E2008D */  beql      $t7, $v0, .L8005A288
+/* 35454 8005A054 26520001 */   addiu    $s2, $s2, 1
+/* 35458 8005A058 12200088 */  beqz      $s1, .L8005A27C
+/* 3545C 8005A05C 3C04DC08 */   lui      $a0, 0xdc08
+/* 35460 8005A060 34840008 */  ori       $a0, $a0, 8
+/* 35464 8005A064 3C06D9FF */  lui       $a2, 0xd9ff
+/* 35468 8005A068 34C6FFFF */  ori       $a2, $a2, 0xffff
+/* 3546C 8005A06C 3C050020 */  lui       $a1, 0x20
+/* 35470 8005A070 34A50405 */  ori       $a1, $a1, 0x405
+/* 35474 8005A074 3C07DB04 */  lui       $a3, 0xdb04
+/* 35478 8005A078 34E70004 */  ori       $a3, $a3, 4
+/* 3547C 8005A07C 3C08DB04 */  lui       $t0, 0xdb04
+/* 35480 8005A080 3508000C */  ori       $t0, $t0, 0xc
+/* 35484 8005A084 3C09DB04 */  lui       $t1, 0xdb04
+/* 35488 8005A088 35290014 */  ori       $t1, $t1, 0x14
+/* 3548C 8005A08C 3C0ADB04 */  lui       $t2, 0xdb04
+/* 35490 8005A090 8E0B0000 */  lw        $t3, ($s0)
+/* 35494 8005A094 354A001C */  ori       $t2, $t2, 0x1c
+/* 35498 8005A098 0160182D */  daddu     $v1, $t3, $zero
+/* 3549C 8005A09C 256B0008 */  addiu     $t3, $t3, 8
+/* 354A0 8005A0A0 AE0B0000 */  sw        $t3, ($s0)
+/* 354A4 8005A0A4 3C0D8007 */  lui       $t5, %hi(gCurrentCameraID)
+/* 354A8 8005A0A8 8DAD7410 */  lw        $t5, %lo(gCurrentCameraID)($t5)
+/* 354AC 8005A0AC 3C02E700 */  lui       $v0, 0xe700
+/* 354B0 8005A0B0 AC620000 */  sw        $v0, ($v1)
+/* 354B4 8005A0B4 25620008 */  addiu     $v0, $t3, 8
+/* 354B8 8005A0B8 AC600004 */  sw        $zero, 4($v1)
+/* 354BC 8005A0BC AE020000 */  sw        $v0, ($s0)
+/* 354C0 8005A0C0 AD640000 */  sw        $a0, ($t3)
+/* 354C4 8005A0C4 3C04ED00 */  lui       $a0, 0xed00
+/* 354C8 8005A0C8 000D1080 */  sll       $v0, $t5, 2
+/* 354CC 8005A0CC 004D1021 */  addu      $v0, $v0, $t5
+/* 354D0 8005A0D0 00021080 */  sll       $v0, $v0, 2
+/* 354D4 8005A0D4 004D1023 */  subu      $v0, $v0, $t5
+/* 354D8 8005A0D8 000218C0 */  sll       $v1, $v0, 3
+/* 354DC 8005A0DC 00431021 */  addu      $v0, $v0, $v1
+/* 354E0 8005A0E0 000210C0 */  sll       $v0, $v0, 3
+/* 354E4 8005A0E4 00556021 */  addu      $t4, $v0, $s5
+/* 354E8 8005A0E8 258200A0 */  addiu     $v0, $t4, 0xa0
+/* 354EC 8005A0EC AD620004 */  sw        $v0, 4($t3)
+/* 354F0 8005A0F0 25620010 */  addiu     $v0, $t3, 0x10
+/* 354F4 8005A0F4 AE020000 */  sw        $v0, ($s0)
+/* 354F8 8005A0F8 3C02D900 */  lui       $v0, 0xd900
+/* 354FC 8005A0FC AD620008 */  sw        $v0, 8($t3)
+/* 35500 8005A100 25620018 */  addiu     $v0, $t3, 0x18
+/* 35504 8005A104 AD60000C */  sw        $zero, 0xc($t3)
+/* 35508 8005A108 AE020000 */  sw        $v0, ($s0)
+/* 3550C 8005A10C 25620020 */  addiu     $v0, $t3, 0x20
+/* 35510 8005A110 AD660010 */  sw        $a2, 0x10($t3)
+/* 35514 8005A114 AD650014 */  sw        $a1, 0x14($t3)
+/* 35518 8005A118 AE020000 */  sw        $v0, ($s0)
+/* 3551C 8005A11C 8583000E */  lh        $v1, 0xe($t4)
+/* 35520 8005A120 25620028 */  addiu     $v0, $t3, 0x28
+/* 35524 8005A124 AE020000 */  sw        $v0, ($s0)
+/* 35528 8005A128 44831000 */  mtc1      $v1, $f2
+/* 3552C 8005A12C 00000000 */  nop       
+/* 35530 8005A130 468010A0 */  cvt.s.w   $f2, $f2
+/* 35534 8005A134 46141082 */  mul.s     $f2, $f2, $f20
+/* 35538 8005A138 00000000 */  nop       
+/* 3553C 8005A13C 85830010 */  lh        $v1, 0x10($t4)
+/* 35540 8005A140 25620030 */  addiu     $v0, $t3, 0x30
+/* 35544 8005A144 AE020000 */  sw        $v0, ($s0)
+/* 35548 8005A148 25620038 */  addiu     $v0, $t3, 0x38
+/* 3554C 8005A14C 44830000 */  mtc1      $v1, $f0
+/* 35550 8005A150 00000000 */  nop       
+/* 35554 8005A154 46800020 */  cvt.s.w   $f0, $f0
+/* 35558 8005A158 46140002 */  mul.s     $f0, $f0, $f20
+/* 3555C 8005A15C 00000000 */  nop       
+/* 35560 8005A160 AE020000 */  sw        $v0, ($s0)
+/* 35564 8005A164 4600110D */  trunc.w.s $f4, $f2
+/* 35568 8005A168 44032000 */  mfc1      $v1, $f4
+/* 3556C 8005A16C 00000000 */  nop       
+/* 35570 8005A170 30630FFF */  andi      $v1, $v1, 0xfff
+/* 35574 8005A174 00031B00 */  sll       $v1, $v1, 0xc
+/* 35578 8005A178 4600010D */  trunc.w.s $f4, $f0
+/* 3557C 8005A17C 44022000 */  mfc1      $v0, $f4
+/* 35580 8005A180 00000000 */  nop       
+/* 35584 8005A184 30420FFF */  andi      $v0, $v0, 0xfff
+/* 35588 8005A188 00441025 */  or        $v0, $v0, $a0
+/* 3558C 8005A18C 00621825 */  or        $v1, $v1, $v0
+/* 35590 8005A190 AD630018 */  sw        $v1, 0x18($t3)
+/* 35594 8005A194 8583000E */  lh        $v1, 0xe($t4)
+/* 35598 8005A198 8585000A */  lh        $a1, 0xa($t4)
+/* 3559C 8005A19C 85840010 */  lh        $a0, 0x10($t4)
+/* 355A0 8005A1A0 8586000C */  lh        $a2, 0xc($t4)
+/* 355A4 8005A1A4 25620040 */  addiu     $v0, $t3, 0x40
+/* 355A8 8005A1A8 AE020000 */  sw        $v0, ($s0)
+/* 355AC 8005A1AC AD670020 */  sw        $a3, 0x20($t3)
+/* 355B0 8005A1B0 AD740024 */  sw        $s4, 0x24($t3)
+/* 355B4 8005A1B4 AD680028 */  sw        $t0, 0x28($t3)
+/* 355B8 8005A1B8 00651821 */  addu      $v1, $v1, $a1
+/* 355BC 8005A1BC 44831000 */  mtc1      $v1, $f2
+/* 355C0 8005A1C0 00000000 */  nop       
+/* 355C4 8005A1C4 468010A0 */  cvt.s.w   $f2, $f2
+/* 355C8 8005A1C8 46141082 */  mul.s     $f2, $f2, $f20
+/* 355CC 8005A1CC 00000000 */  nop       
+/* 355D0 8005A1D0 AD74002C */  sw        $s4, 0x2c($t3)
+/* 355D4 8005A1D4 AD690030 */  sw        $t1, 0x30($t3)
+/* 355D8 8005A1D8 00862021 */  addu      $a0, $a0, $a2
+/* 355DC 8005A1DC 44840000 */  mtc1      $a0, $f0
+/* 355E0 8005A1E0 00000000 */  nop       
+/* 355E4 8005A1E4 46800020 */  cvt.s.w   $f0, $f0
+/* 355E8 8005A1E8 46140002 */  mul.s     $f0, $f0, $f20
+/* 355EC 8005A1EC 00000000 */  nop       
+/* 355F0 8005A1F0 AD730034 */  sw        $s3, 0x34($t3)
+/* 355F4 8005A1F4 4600110D */  trunc.w.s $f4, $f2
+/* 355F8 8005A1F8 44032000 */  mfc1      $v1, $f4
+/* 355FC 8005A1FC 00000000 */  nop       
+/* 35600 8005A200 30630FFF */  andi      $v1, $v1, 0xfff
+/* 35604 8005A204 00031B00 */  sll       $v1, $v1, 0xc
+/* 35608 8005A208 4600010D */  trunc.w.s $f4, $f0
+/* 3560C 8005A20C 44022000 */  mfc1      $v0, $f4
+/* 35610 8005A210 00000000 */  nop       
+/* 35614 8005A214 30420FFF */  andi      $v0, $v0, 0xfff
+/* 35618 8005A218 00621825 */  or        $v1, $v1, $v0
+/* 3561C 8005A21C AD63001C */  sw        $v1, 0x1c($t3)
+/* 35620 8005A220 AD6A0038 */  sw        $t2, 0x38($t3)
+/* 35624 8005A224 AD73003C */  sw        $s3, 0x3c($t3)
+/* 35628 8005A228 95820000 */  lhu       $v0, ($t4)
+/* 3562C 8005A22C 30420010 */  andi      $v0, $v0, 0x10
+/* 35630 8005A230 14400012 */  bnez      $v0, .L8005A27C
+/* 35634 8005A234 0000882D */   daddu    $s1, $zero, $zero
+/* 35638 8005A238 3C04DA38 */  lui       $a0, 0xda38
+/* 3563C 8005A23C 34840007 */  ori       $a0, $a0, 7
+/* 35640 8005A240 25620048 */  addiu     $v0, $t3, 0x48
+/* 35644 8005A244 AE020000 */  sw        $v0, ($s0)
+/* 35648 8005A248 3C02DB0E */  lui       $v0, 0xdb0e
+/* 3564C 8005A24C AD620040 */  sw        $v0, 0x40($t3)
+/* 35650 8005A250 95830038 */  lhu       $v1, 0x38($t4)
+/* 35654 8005A254 25620050 */  addiu     $v0, $t3, 0x50
+/* 35658 8005A258 AE020000 */  sw        $v0, ($s0)
+/* 3565C 8005A25C 000D1180 */  sll       $v0, $t5, 6
+/* 35660 8005A260 AD630044 */  sw        $v1, 0x44($t3)
+/* 35664 8005A264 3C03800A */  lui       $v1, 0x800a
+/* 35668 8005A268 8C63A674 */  lw        $v1, -0x598c($v1)
+/* 3566C 8005A26C 24420030 */  addiu     $v0, $v0, 0x30
+/* 35670 8005A270 AD640048 */  sw        $a0, 0x48($t3)
+/* 35674 8005A274 00621821 */  addu      $v1, $v1, $v0
+/* 35678 8005A278 AD63004C */  sw        $v1, 0x4c($t3)
+.L8005A27C:
+/* 3567C 8005A27C 01E0F809 */  jalr      $t7
+/* 35680 8005A280 01C0202D */   daddu    $a0, $t6, $zero
+/* 35684 8005A284 26520001 */  addiu     $s2, $s2, 1
+.L8005A288:
+/* 35688 8005A288 2A420060 */  slti      $v0, $s2, 0x60
+/* 3568C 8005A28C 5440FF55 */  bnel      $v0, $zero, .L80059FE4
+/* 35690 8005A290 00121080 */   sll      $v0, $s2, 2
+/* 35694 8005A294 8FBF0028 */  lw        $ra, 0x28($sp)
+/* 35698 8005A298 8FB50024 */  lw        $s5, 0x24($sp)
+/* 3569C 8005A29C 8FB40020 */  lw        $s4, 0x20($sp)
+/* 356A0 8005A2A0 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 356A4 8005A2A4 8FB20018 */  lw        $s2, 0x18($sp)
+/* 356A8 8005A2A8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 356AC 8005A2AC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 356B0 8005A2B0 D7B40030 */  ldc1      $f20, 0x30($sp)
+/* 356B4 8005A2B4 03E00008 */  jr        $ra
+/* 356B8 8005A2B8 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/world/world/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s
new file mode 100644
index 0000000000..82657661e3
--- /dev/null
+++ b/asm/nonmatchings/world/world/func_8005A2BC.s
@@ -0,0 +1,122 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel func_8005A2BC
+/* 356BC 8005A2BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 356C0 8005A2C0 AFB20018 */  sw        $s2, 0x18($sp)
+/* 356C4 8005A2C4 0080902D */  daddu     $s2, $a0, $zero
+/* 356C8 8005A2C8 AFB00010 */  sw        $s0, 0x10($sp)
+/* 356CC 8005A2CC 0000802D */  daddu     $s0, $zero, $zero
+/* 356D0 8005A2D0 3C03800B */  lui       $v1, 0x800b
+/* 356D4 8005A2D4 24634398 */  addiu     $v1, $v1, 0x4398
+/* 356D8 8005A2D8 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 356DC 8005A2DC AFB10014 */  sw        $s1, 0x14($sp)
+.L8005A2E0:
+/* 356E0 8005A2E0 8C620000 */  lw        $v0, ($v1)
+/* 356E4 8005A2E4 10400006 */  beqz      $v0, .L8005A300
+/* 356E8 8005A2E8 2A020060 */   slti     $v0, $s0, 0x60
+/* 356EC 8005A2EC 26100001 */  addiu     $s0, $s0, 1
+/* 356F0 8005A2F0 2A020060 */  slti      $v0, $s0, 0x60
+/* 356F4 8005A2F4 1440FFFA */  bnez      $v0, .L8005A2E0
+/* 356F8 8005A2F8 24630004 */   addiu    $v1, $v1, 4
+/* 356FC 8005A2FC 2A020060 */  slti      $v0, $s0, 0x60
+.L8005A300:
+/* 35700 8005A300 14400003 */  bnez      $v0, .L8005A310
+/* 35704 8005A304 00000000 */   nop      
+.L8005A308:
+/* 35708 8005A308 080168C2 */  j         .L8005A308
+/* 3570C 8005A30C 00000000 */   nop      
+.L8005A310:
+/* 35710 8005A310 0C00AB0A */  jal       general_heap_malloc
+/* 35714 8005A314 24040014 */   addiu    $a0, $zero, 0x14
+/* 35718 8005A318 00101880 */  sll       $v1, $s0, 2
+/* 3571C 8005A31C 0040882D */  daddu     $s1, $v0, $zero
+/* 35720 8005A320 3C01800B */  lui       $at, 0x800b
+/* 35724 8005A324 00230821 */  addu      $at, $at, $v1
+/* 35728 8005A328 AC314398 */  sw        $s1, 0x4398($at)
+/* 3572C 8005A32C 16200003 */  bnez      $s1, .L8005A33C
+/* 35730 8005A330 0000802D */   daddu    $s0, $zero, $zero
+.L8005A334:
+/* 35734 8005A334 080168CD */  j         .L8005A334
+/* 35738 8005A338 00000000 */   nop      
+.L8005A33C:
+/* 3573C 8005A33C 3C04800A */  lui       $a0, 0x800a
+/* 35740 8005A340 24844000 */  addiu     $a0, $a0, 0x4000
+/* 35744 8005A344 8E430004 */  lw        $v1, 4($s2)
+/* 35748 8005A348 24020001 */  addiu     $v0, $zero, 1
+/* 3574C 8005A34C AE220000 */  sw        $v0, ($s1)
+/* 35750 8005A350 AE230004 */  sw        $v1, 4($s1)
+.L8005A354:
+/* 35754 8005A354 8C820000 */  lw        $v0, ($a0)
+/* 35758 8005A358 30420001 */  andi      $v0, $v0, 1
+/* 3575C 8005A35C 50400006 */  beql      $v0, $zero, .L8005A378
+/* 35760 8005A360 26100001 */   addiu    $s0, $s0, 1
+/* 35764 8005A364 8C830004 */  lw        $v1, 4($a0)
+/* 35768 8005A368 8E420004 */  lw        $v0, 4($s2)
+/* 3576C 8005A36C 10620006 */  beq       $v1, $v0, .L8005A388
+/* 35770 8005A370 2A02000F */   slti     $v0, $s0, 0xf
+/* 35774 8005A374 26100001 */  addiu     $s0, $s0, 1
+.L8005A378:
+/* 35778 8005A378 2A02000F */  slti      $v0, $s0, 0xf
+/* 3577C 8005A37C 1440FFF5 */  bnez      $v0, .L8005A354
+/* 35780 8005A380 24840020 */   addiu    $a0, $a0, 0x20
+/* 35784 8005A384 2A02000F */  slti      $v0, $s0, 0xf
+.L8005A388:
+/* 35788 8005A388 14400003 */  bnez      $v0, .L8005A398
+/* 3578C 8005A38C 00000000 */   nop      
+.L8005A390:
+/* 35790 8005A390 080168E4 */  j         .L8005A390
+/* 35794 8005A394 00000000 */   nop      
+.L8005A398:
+/* 35798 8005A398 8C820008 */  lw        $v0, 8($a0)
+/* 3579C 8005A39C 14400016 */  bnez      $v0, .L8005A3F8
+/* 357A0 8005A3A0 24420001 */   addiu    $v0, $v0, 1
+/* 357A4 8005A3A4 8E42000C */  lw        $v0, 0xc($s2)
+/* 357A8 8005A3A8 14400004 */  bnez      $v0, .L8005A3BC
+/* 357AC 8005A3AC AC820010 */   sw       $v0, 0x10($a0)
+/* 357B0 8005A3B0 3C028006 */  lui       $v0, 0x8006
+/* 357B4 8005A3B4 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357B8 8005A3B8 AC820014 */  sw        $v0, 0x14($a0)
+.L8005A3BC:
+/* 357BC 8005A3BC 8E420010 */  lw        $v0, 0x10($s2)
+/* 357C0 8005A3C0 8C830018 */  lw        $v1, 0x18($a0)
+/* 357C4 8005A3C4 14600004 */  bnez      $v1, .L8005A3D8
+/* 357C8 8005A3C8 AC820014 */   sw       $v0, 0x14($a0)
+/* 357CC 8005A3CC 3C028006 */  lui       $v0, 0x8006
+/* 357D0 8005A3D0 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357D4 8005A3D4 AC820018 */  sw        $v0, 0x18($a0)
+.L8005A3D8:
+/* 357D8 8005A3D8 8E420014 */  lw        $v0, 0x14($s2)
+/* 357DC 8005A3DC 14400004 */  bnez      $v0, .L8005A3F0
+/* 357E0 8005A3E0 AC820018 */   sw       $v0, 0x18($a0)
+/* 357E4 8005A3E4 3C028006 */  lui       $v0, 0x8006
+/* 357E8 8005A3E8 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357EC 8005A3EC AC820018 */  sw        $v0, 0x18($a0)
+.L8005A3F0:
+/* 357F0 8005A3F0 8C820008 */  lw        $v0, 8($a0)
+/* 357F4 8005A3F4 24420001 */  addiu     $v0, $v0, 1
+.L8005A3F8:
+/* 357F8 8005A3F8 AC820008 */  sw        $v0, 8($a0)
+/* 357FC 8005A3FC AE240010 */  sw        $a0, 0x10($s1)
+/* 35800 8005A400 8E420008 */  lw        $v0, 8($s2)
+/* 35804 8005A404 10400003 */  beqz      $v0, .L8005A414
+/* 35808 8005A408 00000000 */   nop      
+/* 3580C 8005A40C 0040F809 */  jalr      $v0
+/* 35810 8005A410 0220202D */   daddu    $a0, $s1, $zero
+.L8005A414:
+/* 35814 8005A414 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 35818 8005A418 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 3581C 8005A41C 80420070 */  lb        $v0, 0x70($v0)
+/* 35820 8005A420 10400005 */  beqz      $v0, .L8005A438
+/* 35824 8005A424 0220102D */   daddu    $v0, $s1, $zero
+/* 35828 8005A428 8E220000 */  lw        $v0, ($s1)
+/* 3582C 8005A42C 34420004 */  ori       $v0, $v0, 4
+/* 35830 8005A430 AE220000 */  sw        $v0, ($s1)
+/* 35834 8005A434 0220102D */  daddu     $v0, $s1, $zero
+.L8005A438:
+/* 35838 8005A438 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 3583C 8005A43C 8FB20018 */  lw        $s2, 0x18($sp)
+/* 35840 8005A440 8FB10014 */  lw        $s1, 0x14($sp)
+/* 35844 8005A444 8FB00010 */  lw        $s0, 0x10($sp)
+/* 35848 8005A448 03E00008 */  jr        $ra
+/* 3584C 8005A44C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/world/get_asset_offset.s b/asm/nonmatchings/world/world/get_asset_offset.s
new file mode 100644
index 0000000000..fcb7cc7f75
--- /dev/null
+++ b/asm/nonmatchings/world/world/get_asset_offset.s
@@ -0,0 +1,58 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel get_asset_offset
+/* 361D0 8005ADD0 27BDFFB8 */  addiu     $sp, $sp, -0x48
+/* 361D4 8005ADD4 AFB20038 */  sw        $s2, 0x38($sp)
+/* 361D8 8005ADD8 0080902D */  daddu     $s2, $a0, $zero
+/* 361DC 8005ADDC AFB3003C */  sw        $s3, 0x3c($sp)
+/* 361E0 8005ADE0 00A0982D */  daddu     $s3, $a1, $zero
+/* 361E4 8005ADE4 3C0401E4 */  lui       $a0, 0x1e4
+/* 361E8 8005ADE8 34840020 */  ori       $a0, $a0, 0x20
+/* 361EC 8005ADEC 3C0501E4 */  lui       $a1, 0x1e4
+/* 361F0 8005ADF0 34A5003C */  ori       $a1, $a1, 0x3c
+/* 361F4 8005ADF4 27A60010 */  addiu     $a2, $sp, 0x10
+/* 361F8 8005ADF8 AFBF0040 */  sw        $ra, 0x40($sp)
+/* 361FC 8005ADFC AFB10034 */  sw        $s1, 0x34($sp)
+/* 36200 8005AE00 0C00A5CF */  jal       dma_copy
+/* 36204 8005AE04 AFB00030 */   sw       $s0, 0x30($sp)
+/* 36208 8005AE08 8FA40020 */  lw        $a0, 0x20($sp)
+/* 3620C 8005AE0C 0C00AB39 */  jal       heap_malloc
+/* 36210 8005AE10 00000000 */   nop      
+/* 36214 8005AE14 0040882D */  daddu     $s1, $v0, $zero
+/* 36218 8005AE18 0220802D */  daddu     $s0, $s1, $zero
+/* 3621C 8005AE1C 3C0201E4 */  lui       $v0, 0x1e4
+/* 36220 8005AE20 34420020 */  ori       $v0, $v0, 0x20
+/* 36224 8005AE24 3C0401E4 */  lui       $a0, 0x1e4
+/* 36228 8005AE28 34840020 */  ori       $a0, $a0, 0x20
+/* 3622C 8005AE2C 8FA50020 */  lw        $a1, 0x20($sp)
+/* 36230 8005AE30 0220302D */  daddu     $a2, $s1, $zero
+/* 36234 8005AE34 0C00A5CF */  jal       dma_copy
+/* 36238 8005AE38 00A22821 */   addu     $a1, $a1, $v0
+.L8005AE3C:
+/* 3623C 8005AE3C 0200202D */  daddu     $a0, $s0, $zero
+/* 36240 8005AE40 0C01BB5C */  jal       strcmp
+/* 36244 8005AE44 0240282D */   daddu    $a1, $s2, $zero
+/* 36248 8005AE48 10400003 */  beqz      $v0, .L8005AE58
+/* 3624C 8005AE4C 3C0301E4 */   lui      $v1, 0x1e4
+/* 36250 8005AE50 08016B8F */  j         .L8005AE3C
+/* 36254 8005AE54 2610001C */   addiu    $s0, $s0, 0x1c
+.L8005AE58:
+/* 36258 8005AE58 8E020014 */  lw        $v0, 0x14($s0)
+/* 3625C 8005AE5C 34630020 */  ori       $v1, $v1, 0x20
+/* 36260 8005AE60 AE620000 */  sw        $v0, ($s3)
+/* 36264 8005AE64 8E100010 */  lw        $s0, 0x10($s0)
+/* 36268 8005AE68 0220202D */  daddu     $a0, $s1, $zero
+/* 3626C 8005AE6C 0C00AB4B */  jal       heap_free
+/* 36270 8005AE70 02038021 */   addu     $s0, $s0, $v1
+/* 36274 8005AE74 0200102D */  daddu     $v0, $s0, $zero
+/* 36278 8005AE78 8FBF0040 */  lw        $ra, 0x40($sp)
+/* 3627C 8005AE7C 8FB3003C */  lw        $s3, 0x3c($sp)
+/* 36280 8005AE80 8FB20038 */  lw        $s2, 0x38($sp)
+/* 36284 8005AE84 8FB10034 */  lw        $s1, 0x34($sp)
+/* 36288 8005AE88 8FB00030 */  lw        $s0, 0x30($sp)
+/* 3628C 8005AE8C 03E00008 */  jr        $ra
+/* 36290 8005AE90 27BD0048 */   addiu    $sp, $sp, 0x48
+/* 36294 8005AE94 00000000 */  nop       
+/* 36298 8005AE98 00000000 */  nop       
+/* 3629C 8005AE9C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/world/get_current_map_config.s b/asm/nonmatchings/world/world/get_current_map_config.s
new file mode 100644
index 0000000000..b59d381a0f
--- /dev/null
+++ b/asm/nonmatchings/world/world/get_current_map_config.s
@@ -0,0 +1,8 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel get_current_map_config
+/* 35FD8 8005ABD8 3C02800A */  lui       $v0, 0x800a
+/* 35FDC 8005ABDC 8C4241E0 */  lw        $v0, 0x41e0($v0)
+/* 35FE0 8005ABE0 03E00008 */  jr        $ra
+/* 35FE4 8005ABE4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/get_current_map_header.s b/asm/nonmatchings/world/world/get_current_map_header.s
new file mode 100644
index 0000000000..866291ad6f
--- /dev/null
+++ b/asm/nonmatchings/world/world/get_current_map_header.s
@@ -0,0 +1,8 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel get_current_map_header
+/* 35FE8 8005ABE8 3C02800A */  lui       $v0, 0x800a
+/* 35FEC 8005ABEC 244241E8 */  addiu     $v0, $v0, 0x41e8
+/* 35FF0 8005ABF0 03E00008 */  jr        $ra
+/* 35FF4 8005ABF4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/get_map_IDs_by_name.s b/asm/nonmatchings/world/world/get_map_IDs_by_name.s
new file mode 100644
index 0000000000..72e6bb7711
--- /dev/null
+++ b/asm/nonmatchings/world/world/get_map_IDs_by_name.s
@@ -0,0 +1,70 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel get_map_IDs_by_name
+/* 35FF8 8005ABF8 27BDFFC8 */  addiu     $sp, $sp, -0x38
+/* 35FFC 8005ABFC AFB50024 */  sw        $s5, 0x24($sp)
+/* 36000 8005AC00 0080A82D */  daddu     $s5, $a0, $zero
+/* 36004 8005AC04 AFB60028 */  sw        $s6, 0x28($sp)
+/* 36008 8005AC08 00A0B02D */  daddu     $s6, $a1, $zero
+/* 3600C 8005AC0C AFB7002C */  sw        $s7, 0x2c($sp)
+/* 36010 8005AC10 00C0B82D */  daddu     $s7, $a2, $zero
+/* 36014 8005AC14 3C028009 */  lui       $v0, %hi(gAreas)
+/* 36018 8005AC18 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
+/* 3601C 8005AC1C AFBF0030 */  sw        $ra, 0x30($sp)
+/* 36020 8005AC20 AFB40020 */  sw        $s4, 0x20($sp)
+/* 36024 8005AC24 AFB3001C */  sw        $s3, 0x1c($sp)
+/* 36028 8005AC28 AFB20018 */  sw        $s2, 0x18($sp)
+/* 3602C 8005AC2C AFB10014 */  sw        $s1, 0x14($sp)
+/* 36030 8005AC30 AFB00010 */  sw        $s0, 0x10($sp)
+/* 36034 8005AC34 8C440004 */  lw        $a0, 4($v0)
+/* 36038 8005AC38 1080001F */  beqz      $a0, .L8005ACB8
+/* 3603C 8005AC3C 0000A02D */   daddu    $s4, $zero, $zero
+/* 36040 8005AC40 0280902D */  daddu     $s2, $s4, $zero
+.L8005AC44:
+/* 36044 8005AC44 02421021 */  addu      $v0, $s2, $v0
+/* 36048 8005AC48 8C420000 */  lw        $v0, ($v0)
+/* 3604C 8005AC4C 18400012 */  blez      $v0, .L8005AC98
+/* 36050 8005AC50 0000802D */   daddu    $s0, $zero, $zero
+/* 36054 8005AC54 3C028009 */  lui       $v0, %hi(gAreas)
+/* 36058 8005AC58 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
+/* 3605C 8005AC5C 02429821 */  addu      $s3, $s2, $v0
+/* 36060 8005AC60 0080882D */  daddu     $s1, $a0, $zero
+.L8005AC64:
+/* 36064 8005AC64 8E240000 */  lw        $a0, ($s1)
+/* 36068 8005AC68 0C01BB5C */  jal       strcmp
+/* 3606C 8005AC6C 02A0282D */   daddu    $a1, $s5, $zero
+/* 36070 8005AC70 54400005 */  bnel      $v0, $zero, .L8005AC88
+/* 36074 8005AC74 26100001 */   addiu    $s0, $s0, 1
+/* 36078 8005AC78 24020001 */  addiu     $v0, $zero, 1
+/* 3607C 8005AC7C A6D40000 */  sh        $s4, ($s6)
+/* 36080 8005AC80 08016B2F */  j         .L8005ACBC
+/* 36084 8005AC84 A6F00000 */   sh       $s0, ($s7)
+.L8005AC88:
+/* 36088 8005AC88 8E620000 */  lw        $v0, ($s3)
+/* 3608C 8005AC8C 0202102A */  slt       $v0, $s0, $v0
+/* 36090 8005AC90 1440FFF4 */  bnez      $v0, .L8005AC64
+/* 36094 8005AC94 26310020 */   addiu    $s1, $s1, 0x20
+.L8005AC98:
+/* 36098 8005AC98 26520010 */  addiu     $s2, $s2, 0x10
+/* 3609C 8005AC9C 3C048009 */  lui       $a0, 0x8009
+/* 360A0 8005ACA0 00922021 */  addu      $a0, $a0, $s2
+/* 360A4 8005ACA4 8C8434F4 */  lw        $a0, 0x34f4($a0)
+/* 360A8 8005ACA8 3C028009 */  lui       $v0, %hi(gAreas)
+/* 360AC 8005ACAC 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
+/* 360B0 8005ACB0 1480FFE4 */  bnez      $a0, .L8005AC44
+/* 360B4 8005ACB4 26940001 */   addiu    $s4, $s4, 1
+.L8005ACB8:
+/* 360B8 8005ACB8 0000102D */  daddu     $v0, $zero, $zero
+.L8005ACBC:
+/* 360BC 8005ACBC 8FBF0030 */  lw        $ra, 0x30($sp)
+/* 360C0 8005ACC0 8FB7002C */  lw        $s7, 0x2c($sp)
+/* 360C4 8005ACC4 8FB60028 */  lw        $s6, 0x28($sp)
+/* 360C8 8005ACC8 8FB50024 */  lw        $s5, 0x24($sp)
+/* 360CC 8005ACCC 8FB40020 */  lw        $s4, 0x20($sp)
+/* 360D0 8005ACD0 8FB3001C */  lw        $s3, 0x1c($sp)
+/* 360D4 8005ACD4 8FB20018 */  lw        $s2, 0x18($sp)
+/* 360D8 8005ACD8 8FB10014 */  lw        $s1, 0x14($sp)
+/* 360DC 8005ACDC 8FB00010 */  lw        $s0, 0x10($sp)
+/* 360E0 8005ACE0 03E00008 */  jr        $ra
+/* 360E4 8005ACE4 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/world/world/load_asset_by_name.s b/asm/nonmatchings/world/world/load_asset_by_name.s
new file mode 100644
index 0000000000..97be367b37
--- /dev/null
+++ b/asm/nonmatchings/world/world/load_asset_by_name.s
@@ -0,0 +1,64 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel load_asset_by_name
+/* 360E8 8005ACE8 27BDFFB8 */  addiu     $sp, $sp, -0x48
+/* 360EC 8005ACEC AFB00030 */  sw        $s0, 0x30($sp)
+/* 360F0 8005ACF0 0080802D */  daddu     $s0, $a0, $zero
+/* 360F4 8005ACF4 AFB3003C */  sw        $s3, 0x3c($sp)
+/* 360F8 8005ACF8 00A0982D */  daddu     $s3, $a1, $zero
+/* 360FC 8005ACFC 3C0401E4 */  lui       $a0, 0x1e4
+/* 36100 8005AD00 34840020 */  ori       $a0, $a0, 0x20
+/* 36104 8005AD04 3C0501E4 */  lui       $a1, 0x1e4
+/* 36108 8005AD08 34A5003C */  ori       $a1, $a1, 0x3c
+/* 3610C 8005AD0C 27A60010 */  addiu     $a2, $sp, 0x10
+/* 36110 8005AD10 AFBF0040 */  sw        $ra, 0x40($sp)
+/* 36114 8005AD14 AFB20038 */  sw        $s2, 0x38($sp)
+/* 36118 8005AD18 0C00A5CF */  jal       dma_copy
+/* 3611C 8005AD1C AFB10034 */   sw       $s1, 0x34($sp)
+/* 36120 8005AD20 8FA40020 */  lw        $a0, 0x20($sp)
+/* 36124 8005AD24 0C00AB39 */  jal       heap_malloc
+/* 36128 8005AD28 00000000 */   nop      
+/* 3612C 8005AD2C 0040902D */  daddu     $s2, $v0, $zero
+/* 36130 8005AD30 0240882D */  daddu     $s1, $s2, $zero
+/* 36134 8005AD34 3C0201E4 */  lui       $v0, 0x1e4
+/* 36138 8005AD38 34420020 */  ori       $v0, $v0, 0x20
+/* 3613C 8005AD3C 3C0401E4 */  lui       $a0, 0x1e4
+/* 36140 8005AD40 34840020 */  ori       $a0, $a0, 0x20
+/* 36144 8005AD44 8FA50020 */  lw        $a1, 0x20($sp)
+/* 36148 8005AD48 0240302D */  daddu     $a2, $s2, $zero
+/* 3614C 8005AD4C 0C00A5CF */  jal       dma_copy
+/* 36150 8005AD50 00A22821 */   addu     $a1, $a1, $v0
+.L8005AD54:
+/* 36154 8005AD54 0220202D */  daddu     $a0, $s1, $zero
+/* 36158 8005AD58 0C01BB5C */  jal       strcmp
+/* 3615C 8005AD5C 0200282D */   daddu    $a1, $s0, $zero
+/* 36160 8005AD60 10400003 */  beqz      $v0, .L8005AD70
+/* 36164 8005AD64 00000000 */   nop      
+/* 36168 8005AD68 08016B55 */  j         .L8005AD54
+/* 3616C 8005AD6C 2631001C */   addiu    $s1, $s1, 0x1c
+.L8005AD70:
+/* 36170 8005AD70 8E220018 */  lw        $v0, 0x18($s1)
+/* 36174 8005AD74 AE620000 */  sw        $v0, ($s3)
+/* 36178 8005AD78 0C00AB0A */  jal       general_heap_malloc
+/* 3617C 8005AD7C 8E240014 */   lw       $a0, 0x14($s1)
+/* 36180 8005AD80 3C0301E4 */  lui       $v1, 0x1e4
+/* 36184 8005AD84 34630020 */  ori       $v1, $v1, 0x20
+/* 36188 8005AD88 0040802D */  daddu     $s0, $v0, $zero
+/* 3618C 8005AD8C 0040302D */  daddu     $a2, $v0, $zero
+/* 36190 8005AD90 8E220010 */  lw        $v0, 0x10($s1)
+/* 36194 8005AD94 8E250014 */  lw        $a1, 0x14($s1)
+/* 36198 8005AD98 00432021 */  addu      $a0, $v0, $v1
+/* 3619C 8005AD9C 00A32821 */  addu      $a1, $a1, $v1
+/* 361A0 8005ADA0 0C00A5CF */  jal       dma_copy
+/* 361A4 8005ADA4 00452821 */   addu     $a1, $v0, $a1
+/* 361A8 8005ADA8 0C00AB4B */  jal       heap_free
+/* 361AC 8005ADAC 0240202D */   daddu    $a0, $s2, $zero
+/* 361B0 8005ADB0 0200102D */  daddu     $v0, $s0, $zero
+/* 361B4 8005ADB4 8FBF0040 */  lw        $ra, 0x40($sp)
+/* 361B8 8005ADB8 8FB3003C */  lw        $s3, 0x3c($sp)
+/* 361BC 8005ADBC 8FB20038 */  lw        $s2, 0x38($sp)
+/* 361C0 8005ADC0 8FB10034 */  lw        $s1, 0x34($sp)
+/* 361C4 8005ADC4 8FB00030 */  lw        $s0, 0x30($sp)
+/* 361C8 8005ADC8 03E00008 */  jr        $ra
+/* 361CC 8005ADCC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s
new file mode 100644
index 0000000000..34eb98d497
--- /dev/null
+++ b/asm/nonmatchings/world/world/load_map_by_IDs.s
@@ -0,0 +1,333 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel load_map_by_IDs
+/* 35AF4 8005A6F4 27BDFFB0 */  addiu     $sp, $sp, -0x50
+/* 35AF8 8005A6F8 AFB00038 */  sw        $s0, 0x38($sp)
+/* 35AFC 8005A6FC 00C0802D */  daddu     $s0, $a2, $zero
+/* 35B00 8005A700 AFB1003C */  sw        $s1, 0x3c($sp)
+/* 35B04 8005A704 0080882D */  daddu     $s1, $a0, $zero
+/* 35B08 8005A708 AFB30044 */  sw        $s3, 0x44($sp)
+/* 35B0C 8005A70C 00A0982D */  daddu     $s3, $a1, $zero
+/* 35B10 8005A710 AFB40048 */  sw        $s4, 0x48($sp)
+/* 35B14 8005A714 0000A02D */  daddu     $s4, $zero, $zero
+/* 35B18 8005A718 AFBF004C */  sw        $ra, 0x4c($sp)
+/* 35B1C 8005A71C 0C05260E */  jal       func_80149838
+/* 35B20 8005A720 AFB20040 */   sw       $s2, 0x40($sp)
+/* 35B24 8005A724 3C05800A */  lui       $a1, %hi(D_8009A650)
+/* 35B28 8005A728 24A5A650 */  addiu     $a1, $a1, %lo(D_8009A650)
+/* 35B2C 8005A72C 2402FFBF */  addiu     $v0, $zero, -0x41
+/* 35B30 8005A730 3C128007 */  lui       $s2, %hi(gGameStatusPtr)
+/* 35B34 8005A734 2652419C */  addiu     $s2, $s2, %lo(gGameStatusPtr)
+/* 35B38 8005A738 8CA30000 */  lw        $v1, ($a1)
+/* 35B3C 8005A73C 8E440000 */  lw        $a0, ($s2)
+/* 35B40 8005A740 00621824 */  and       $v1, $v1, $v0
+/* 35B44 8005A744 2402FF7F */  addiu     $v0, $zero, -0x81
+/* 35B48 8005A748 00621824 */  and       $v1, $v1, $v0
+/* 35B4C 8005A74C ACA30000 */  sw        $v1, ($a1)
+/* 35B50 8005A750 0C00B458 */  jal       func_8002D160
+/* 35B54 8005A754 A0800084 */   sb       $zero, 0x84($a0)
+/* 35B58 8005A758 0C0AC81E */  jal       func_802B2078
+/* 35B5C 8005A75C 00108400 */   sll      $s0, $s0, 0x10
+/* 35B60 8005A760 0C047624 */  jal       func_8011D890
+/* 35B64 8005A764 00108403 */   sra      $s0, $s0, 0x10
+/* 35B68 8005A768 0C048C2E */  jal       clear_dynamic_entity_list
+/* 35B6C 8005A76C 00000000 */   nop
+/* 35B70 8005A770 0C0B0C77 */  jal       clear_script_list
+/* 35B74 8005A774 00000000 */   nop
+/* 35B78 8005A778 12000005 */  beqz      $s0, .L8005A790
+/* 35B7C 8005A77C 24020001 */   addiu    $v0, $zero, 1
+/* 35B80 8005A780 12020008 */  beq       $s0, $v0, .L8005A7A4
+/* 35B84 8005A784 00000000 */   nop
+/* 35B88 8005A788 080169F0 */  j         .L8005A7C0
+/* 35B8C 8005A78C 00000000 */   nop
+.L8005A790:
+/* 35B90 8005A790 0C0514E4 */  jal       clear_area_flags
+/* 35B94 8005A794 00000000 */   nop
+/* 35B98 8005A798 8E420000 */  lw        $v0, ($s2)
+/* 35B9C 8005A79C 080169F0 */  j         .L8005A7C0
+/* 35BA0 8005A7A0 A0400167 */   sb       $zero, 0x167($v0)
+.L8005A7A4:
+/* 35BA4 8005A7A4 0C00AD24 */  jal       fio_deserialize_state
+/* 35BA8 8005A7A8 00000000 */   nop
+/* 35BAC 8005A7AC 8E420000 */  lw        $v0, ($s2)
+/* 35BB0 8005A7B0 94510086 */  lhu       $s1, 0x86($v0)
+/* 35BB4 8005A7B4 9453008C */  lhu       $s3, 0x8c($v0)
+/* 35BB8 8005A7B8 A0500167 */  sb        $s0, 0x167($v0)
+/* 35BBC 8005A7BC A4510088 */  sh        $s1, 0x88($v0)
+.L8005A7C0:
+/* 35BC0 8005A7C0 3C04800E */  lui       $a0, 0x800e
+/* 35BC4 8005A7C4 24849230 */  addiu     $a0, $a0, -0x6dd0
+/* 35BC8 8005A7C8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 35BCC 8005A7CC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 35BD0 8005A7D0 00131C00 */  sll       $v1, $s3, 0x10
+/* 35BD4 8005A7D4 AC400144 */  sw        $zero, 0x144($v0)
+/* 35BD8 8005A7D8 00111400 */  sll       $v0, $s1, 0x10
+/* 35BDC 8005A7DC 00021303 */  sra       $v0, $v0, 0xc
+/* 35BE0 8005A7E0 3C018009 */  lui       $at, 0x8009
+/* 35BE4 8005A7E4 00220821 */  addu      $at, $at, $v0
+/* 35BE8 8005A7E8 8C2234F4 */  lw        $v0, 0x34f4($at)
+/* 35BEC 8005A7EC 00031AC3 */  sra       $v1, $v1, 0xb
+/* 35BF0 8005A7F0 00439021 */  addu      $s2, $v0, $v1
+/* 35BF4 8005A7F4 8E460000 */  lw        $a2, ($s2)
+/* 35BF8 8005A7F8 3C05800A */  lui       $a1, 0x800a
+/* 35BFC 8005A7FC 0C01953C */  jal       sprintf
+/* 35C00 8005A800 24A58A10 */   addiu    $a1, $a1, -0x75f0
+/* 35C04 8005A804 3C04800E */  lui       $a0, 0x800e
+/* 35C08 8005A808 248491E0 */  addiu     $a0, $a0, -0x6e20
+/* 35C0C 8005A80C 8E460000 */  lw        $a2, ($s2)
+/* 35C10 8005A810 3C05800A */  lui       $a1, 0x800a
+/* 35C14 8005A814 0C01953C */  jal       sprintf
+/* 35C18 8005A818 24A58A1C */   addiu    $a1, $a1, -0x75e4
+/* 35C1C 8005A81C 8E450000 */  lw        $a1, ($s2)
+/* 35C20 8005A820 0C01BB50 */  jal       strcpy
+/* 35C24 8005A824 27A40018 */   addiu    $a0, $sp, 0x18
+/* 35C28 8005A828 3C04800B */  lui       $a0, 0x800b
+/* 35C2C 8005A82C 24840CF0 */  addiu     $a0, $a0, 0xcf0
+/* 35C30 8005A830 3C05800A */  lui       $a1, 0x800a
+/* 35C34 8005A834 24A58A24 */  addiu     $a1, $a1, -0x75dc
+/* 35C38 8005A838 27A60018 */  addiu     $a2, $sp, 0x18
+/* 35C3C 8005A83C 0C01953C */  jal       sprintf
+/* 35C40 8005A840 A3A0001B */   sb       $zero, 0x1b($sp)
+/* 35C44 8005A844 8E450014 */  lw        $a1, 0x14($s2)
+/* 35C48 8005A848 3C01800A */  lui       $at, 0x800a
+/* 35C4C 8005A84C AC3241E0 */  sw        $s2, 0x41e0($at)
+/* 35C50 8005A850 10A00005 */  beqz      $a1, .L8005A868
+/* 35C54 8005A854 00000000 */   nop
+/* 35C58 8005A858 3C04800E */  lui       $a0, 0x800e
+/* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, -0x6998
+/* 35C60 8005A860 0C01BB50 */  jal       strcpy
+/* 35C64 8005A864 00000000 */   nop
+.L8005A868:
+/* 35C68 8005A868 0C0169B0 */  jal       load_world_script_api
+/* 35C6C 8005A86C 00000000 */   nop
+/* 35C70 8005A870 8E440008 */  lw        $a0, 8($s2)
+/* 35C74 8005A874 10800004 */  beqz      $a0, .L8005A888
+/* 35C78 8005A878 00000000 */   nop
+/* 35C7C 8005A87C 8E45000C */  lw        $a1, 0xc($s2)
+/* 35C80 8005A880 0C00A5CF */  jal       dma_copy
+/* 35C84 8005A884 8E460010 */   lw       $a2, 0x10($s2)
+.L8005A888:
+/* 35C88 8005A888 8E420004 */  lw        $v0, 4($s2)
+/* 35C8C 8005A88C 3C03800A */  lui       $v1, 0x800a
+/* 35C90 8005A890 246341E8 */  addiu     $v1, $v1, 0x41e8
+/* 35C94 8005A894 24440040 */  addiu     $a0, $v0, 0x40
+.L8005A898:
+/* 35C98 8005A898 8C480000 */  lw        $t0, ($v0)
+/* 35C9C 8005A89C 8C490004 */  lw        $t1, 4($v0)
+/* 35CA0 8005A8A0 8C4A0008 */  lw        $t2, 8($v0)
+/* 35CA4 8005A8A4 8C4B000C */  lw        $t3, 0xc($v0)
+/* 35CA8 8005A8A8 AC680000 */  sw        $t0, ($v1)
+/* 35CAC 8005A8AC AC690004 */  sw        $t1, 4($v1)
+/* 35CB0 8005A8B0 AC6A0008 */  sw        $t2, 8($v1)
+/* 35CB4 8005A8B4 AC6B000C */  sw        $t3, 0xc($v1)
+/* 35CB8 8005A8B8 24420010 */  addiu     $v0, $v0, 0x10
+/* 35CBC 8005A8BC 1444FFF6 */  bne       $v0, $a0, .L8005A898
+/* 35CC0 8005A8C0 24630010 */   addiu    $v1, $v1, 0x10
+/* 35CC4 8005A8C4 8E420018 */  lw        $v0, 0x18($s2)
+/* 35CC8 8005A8C8 3C13800A */  lui       $s3, 0x800a
+/* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, 0x41e8
+/* 35CD0 8005A8D0 10400004 */  beqz      $v0, .L8005A8E4
+/* 35CD4 8005A8D4 00000000 */   nop
+/* 35CD8 8005A8D8 0040F809 */  jalr      $v0
+/* 35CDC 8005A8DC 00000000 */   nop
+/* 35CE0 8005A8E0 0040A02D */  daddu     $s4, $v0, $zero
+.L8005A8E4:
+/* 35CE4 8005A8E4 16800015 */  bnez      $s4, .L8005A93C
+/* 35CE8 8005A8E8 00000000 */   nop
+/* 35CEC 8005A8EC 3C04800E */  lui       $a0, 0x800e
+/* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, -0x6dd0
+/* 35CF4 8005A8F4 0C016B3A */  jal       load_asset_by_name
+/* 35CF8 8005A8F8 27A50030 */   addiu    $a1, $sp, 0x30
+/* 35CFC 8005A8FC 0040882D */  daddu     $s1, $v0, $zero
+/* 35D00 8005A900 0220202D */  daddu     $a0, $s1, $zero
+/* 35D04 8005A904 3C108021 */  lui       $s0, 0x8021
+/* 35D08 8005A908 26100000 */  addiu     $s0, $s0, 0
+/* 35D0C 8005A90C 0C01BB7C */  jal       decode_yay0
+/* 35D10 8005A910 0200282D */   daddu    $a1, $s0, $zero
+/* 35D14 8005A914 0C00AB1E */  jal       general_heap_free
+/* 35D18 8005A918 0220202D */   daddu    $a0, $s1, $zero
+/* 35D1C 8005A91C 8E020000 */  lw        $v0, ($s0)
+/* 35D20 8005A920 8E030008 */  lw        $v1, 8($s0)
+/* 35D24 8005A924 8E04000C */  lw        $a0, 0xc($s0)
+/* 35D28 8005A928 8E050010 */  lw        $a1, 0x10($s0)
+/* 35D2C 8005A92C AE620000 */  sw        $v0, ($s3)
+/* 35D30 8005A930 AE630028 */  sw        $v1, 0x28($s3)
+/* 35D34 8005A934 AE64002C */  sw        $a0, 0x2c($s3)
+/* 35D38 8005A938 AE650030 */  sw        $a1, 0x30($s3)
+.L8005A93C:
+/* 35D3C 8005A93C 8E420014 */  lw        $v0, 0x14($s2)
+/* 35D40 8005A940 10400005 */  beqz      $v0, .L8005A958
+/* 35D44 8005A944 00000000 */   nop
+/* 35D48 8005A948 3C04800E */  lui       $a0, 0x800e
+/* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, -0x6998
+/* 35D50 8005A950 0C05175C */  jal       load_map_bg
+/* 35D54 8005A954 00000000 */   nop
+.L8005A958:
+/* 35D58 8005A958 0C00B458 */  jal       func_8002D160
+/* 35D5C 8005A95C 00000000 */   nop
+/* 35D60 8005A960 0C0AC81E */  jal       func_802B2078
+/* 35D64 8005A964 00000000 */   nop
+/* 35D68 8005A968 0C05259C */  jal       func_80149670
+/* 35D6C 8005A96C 0000202D */   daddu    $a0, $zero, $zero
+/* 35D70 8005A970 0C048C2E */  jal       clear_dynamic_entity_list
+/* 35D74 8005A974 00000000 */   nop
+/* 35D78 8005A978 0C0B0C77 */  jal       clear_script_list
+/* 35D7C 8005A97C 00000000 */   nop
+/* 35D80 8005A980 0C00B7BD */  jal       create_cameras_a
+/* 35D84 8005A984 00000000 */   nop
+/* 35D88 8005A988 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
+/* 35D8C 8005A98C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
+/* 35D90 8005A990 8E020000 */  lw        $v0, ($s0)
+/* 35D94 8005A994 0C0B763E */  jal       func_802DD8F8
+/* 35D98 8005A998 80440084 */   lb       $a0, 0x84($v0)
+/* 35D9C 8005A99C 0C047889 */  jal       func_8011E224
+/* 35DA0 8005A9A0 00000000 */   nop
+/* 35DA4 8005A9A4 0C0482EC */  jal       clear_virtual_models
+/* 35DA8 8005A9A8 00000000 */   nop
+/* 35DAC 8005A9AC 0C00E12F */  jal       clear_npcs
+/* 35DB0 8005A9B0 00000000 */   nop
+/* 35DB4 8005A9B4 0C050440 */  jal       func_80141100
+/* 35DB8 8005A9B8 00000000 */   nop
+/* 35DBC 8005A9BC 0C0515A0 */  jal       clear_trigger_data
+/* 35DC0 8005A9C0 00000000 */   nop
+/* 35DC4 8005A9C4 0C045751 */  jal       clear_model_data
+/* 35DC8 8005A9C8 00000000 */   nop
+/* 35DCC 8005A9CC 0C052010 */  jal       func_80148040
+/* 35DD0 8005A9D0 00000000 */   nop
+/* 35DD4 8005A9D4 0C05177E */  jal       func_80145DF8
+/* 35DD8 8005A9D8 00000000 */   nop
+/* 35DDC 8005A9DC 8E020000 */  lw        $v0, ($s0)
+/* 35DE0 8005A9E0 804300A8 */  lb        $v1, 0xa8($v0)
+/* 35DE4 8005A9E4 2402FFFF */  addiu     $v0, $zero, -1
+/* 35DE8 8005A9E8 14620003 */  bne       $v1, $v0, .L8005A9F8
+/* 35DEC 8005A9EC 00000000 */   nop
+/* 35DF0 8005A9F0 0C04E062 */  jal       func_80138188
+/* 35DF4 8005A9F4 00000000 */   nop
+.L8005A9F8:
+/* 35DF8 8005A9F8 16800005 */  bnez      $s4, .L8005AA10
+/* 35DFC 8005A9FC 00000000 */   nop
+/* 35E00 8005AA00 0C016BE5 */  jal       initialize_collision
+/* 35E04 8005AA04 00000000 */   nop
+/* 35E08 8005AA08 0C016BF0 */  jal       load_hit_asset
+/* 35E0C 8005AA0C 00000000 */   nop
+.L8005AA10:
+/* 35E10 8005AA10 0C01CACC */  jal       func_80072B30
+/* 35E14 8005AA14 00000000 */   nop
+/* 35E18 8005AA18 0C00F900 */  jal       clear_encounter_status
+/* 35E1C 8005AA1C 00000000 */   nop
+/* 35E20 8005AA20 0C04432E */  jal       clear_entity_data
+/* 35E24 8005AA24 24040001 */   addiu    $a0, $zero, 1
+/* 35E28 8005AA28 0C016727 */  jal       func_80059C9C
+/* 35E2C 8005AA2C 00000000 */   nop
+/* 35E30 8005AA30 0C037F14 */  jal       clear_player_status
+/* 35E34 8005AA34 00000000 */   nop
+/* 35E38 8005AA38 0C037F1D */  jal       func_800DFC74
+/* 35E3C 8005AA3C 00000000 */   nop
+/* 35E40 8005AA40 0C03AD1D */  jal       partner_reset_data
+/* 35E44 8005AA44 00000000 */   nop
+/* 35E48 8005AA48 0C048D9D */  jal       clear_printers
+/* 35E4C 8005AA4C 00000000 */   nop
+/* 35E50 8005AA50 0C04C3FC */  jal       clear_item_entity_data
+/* 35E54 8005AA54 00000000 */   nop
+/* 35E58 8005AA58 3C028011 */  lui       $v0, %hi(gPlayerStatus)
+/* 35E5C 8005AA5C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
+/* 35E60 8005AA60 C4400084 */  lwc1      $f0, 0x84($v0)
+/* 35E64 8005AA64 E4400080 */  swc1      $f0, 0x80($v0)
+/* 35E68 8005AA68 8E42001C */  lw        $v0, 0x1c($s2)
+/* 35E6C 8005AA6C 30420003 */  andi      $v0, $v0, 3
+/* 35E70 8005AA70 00021080 */  sll       $v0, $v0, 2
+/* 35E74 8005AA74 3C048009 */  lui       $a0, 0x8009
+/* 35E78 8005AA78 00822021 */  addu      $a0, $a0, $v0
+/* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
+/* 35E80 8005AA80 8C84FF60 */   lw       $a0, -0xa0($a0)
+/* 35E84 8005AA84 0C052580 */  jal       func_80149600
+/* 35E88 8005AA88 00000000 */   nop
+/* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
+/* 35E90 8005AA90 00000000 */   nop
+/* 35E94 8005AA94 3C04800B */  lui       $a0, 0x800b
+/* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, 0xcf0
+/* 35E9C 8005AA9C 0C016B74 */  jal       get_asset_offset
+/* 35EA0 8005AAA0 27A50030 */   addiu    $a1, $sp, 0x30
+/* 35EA4 8005AAA4 8E640000 */  lw        $a0, ($s3)
+/* 35EA8 8005AAA8 10800004 */  beqz      $a0, .L8005AABC
+/* 35EAC 8005AAAC 00000000 */   nop
+/* 35EB0 8005AAB0 8FA60030 */  lw        $a2, 0x30($sp)
+/* 35EB4 8005AAB4 0C046B52 */  jal       load_data_for_models
+/* 35EB8 8005AAB8 0040282D */   daddu    $a1, $v0, $zero
+.L8005AABC:
+/* 35EBC 8005AABC 8E640038 */  lw        $a0, 0x38($s3)
+/* 35EC0 8005AAC0 50800005 */  beql      $a0, $zero, .L8005AAD8
+/* 35EC4 8005AAC4 24040128 */   addiu    $a0, $zero, 0x128
+/* 35EC8 8005AAC8 0C05178A */  jal       read_background_size
+/* 35ECC 8005AACC 00000000 */   nop
+/* 35ED0 8005AAD0 08016ABA */  j         .L8005AAE8
+/* 35ED4 8005AAD4 00000000 */   nop
+.L8005AAD8:
+/* 35ED8 8005AAD8 240500C8 */  addiu     $a1, $zero, 0xc8
+/* 35EDC 8005AADC 2406000C */  addiu     $a2, $zero, 0xc
+/* 35EE0 8005AAE0 0C05179C */  jal       set_background_size
+/* 35EE4 8005AAE4 24070014 */   addiu    $a3, $zero, 0x14
+.L8005AAE8:
+/* 35EE8 8005AAE8 3C04800B */  lui       $a0, %hi(gCameras)
+/* 35EEC 8005AAEC 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
+/* 35EF0 8005AAF0 94820000 */  lhu       $v0, ($a0)
+/* 35EF4 8005AAF4 94830AB0 */  lhu       $v1, 0xab0($a0)
+/* 35EF8 8005AAF8 3C018007 */  lui       $at, %hi(gCurrentCameraID)
+/* 35EFC 8005AAFC AC207410 */  sw        $zero, %lo(gCurrentCameraID)($at)
+/* 35F00 8005AB00 34420002 */  ori       $v0, $v0, 2
+/* 35F04 8005AB04 A4820000 */  sh        $v0, ($a0)
+/* 35F08 8005AB08 94820558 */  lhu       $v0, 0x558($a0)
+/* 35F0C 8005AB0C 34630002 */  ori       $v1, $v1, 2
+/* 35F10 8005AB10 A4830AB0 */  sh        $v1, 0xab0($a0)
+/* 35F14 8005AB14 34420002 */  ori       $v0, $v0, 2
+/* 35F18 8005AB18 A4820558 */  sh        $v0, 0x558($a0)
+/* 35F1C 8005AB1C 94821008 */  lhu       $v0, 0x1008($a0)
+/* 35F20 8005AB20 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
+/* 35F24 8005AB24 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
+/* 35F28 8005AB28 34420002 */  ori       $v0, $v0, 2
+/* 35F2C 8005AB2C A4821008 */  sh        $v0, 0x1008($a0)
+/* 35F30 8005AB30 806300A8 */  lb        $v1, 0xa8($v1)
+/* 35F34 8005AB34 2402FFFF */  addiu     $v0, $zero, -1
+/* 35F38 8005AB38 14620008 */  bne       $v1, $v0, .L8005AB5C
+/* 35F3C 8005AB3C 240200A2 */   addiu    $v0, $zero, 0xa2
+/* 35F40 8005AB40 240200C8 */  addiu     $v0, $zero, 0xc8
+/* 35F44 8005AB44 AFA20010 */  sw        $v0, 0x10($sp)
+/* 35F48 8005AB48 0000202D */  daddu     $a0, $zero, $zero
+/* 35F4C 8005AB4C 2405000C */  addiu     $a1, $zero, 0xc
+/* 35F50 8005AB50 24060014 */  addiu     $a2, $zero, 0x14
+/* 35F54 8005AB54 08016ADC */  j         .L8005AB70
+/* 35F58 8005AB58 24070128 */   addiu    $a3, $zero, 0x128
+.L8005AB5C:
+/* 35F5C 8005AB5C AFA20010 */  sw        $v0, 0x10($sp)
+/* 35F60 8005AB60 0000202D */  daddu     $a0, $zero, $zero
+/* 35F64 8005AB64 2405001D */  addiu     $a1, $zero, 0x1d
+/* 35F68 8005AB68 2406001C */  addiu     $a2, $zero, 0x1c
+/* 35F6C 8005AB6C 24070106 */  addiu     $a3, $zero, 0x106
+.L8005AB70:
+/* 35F70 8005AB70 0C00B8C5 */  jal       set_cam_viewport
+/* 35F74 8005AB74 00000000 */   nop
+/* 35F78 8005AB78 0C039E4D */  jal       initialize_status_menu
+/* 35F7C 8005AB7C 00000000 */   nop
+/* 35F80 8005AB80 0000282D */  daddu     $a1, $zero, $zero
+/* 35F84 8005AB84 00A0302D */  daddu     $a2, $a1, $zero
+/* 35F88 8005AB88 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
+/* 35F8C 8005AB8C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
+/* 35F90 8005AB90 8E030000 */  lw        $v1, ($s0)
+/* 35F94 8005AB94 240203E8 */  addiu     $v0, $zero, 0x3e8
+/* 35F98 8005AB98 A4620090 */  sh        $v0, 0x90($v1)
+/* 35F9C 8005AB9C A4620092 */  sh        $v0, 0x92($v1)
+/* 35FA0 8005ABA0 8E640010 */  lw        $a0, 0x10($s3)
+/* 35FA4 8005ABA4 0C0B0D74 */  jal       start_script_in_group
+/* 35FA8 8005ABA8 00A0382D */   daddu    $a3, $a1, $zero
+/* 35FAC 8005ABAC 8E030000 */  lw        $v1, ($s0)
+/* 35FB0 8005ABB0 8C420144 */  lw        $v0, 0x144($v0)
+/* 35FB4 8005ABB4 AC62006C */  sw        $v0, 0x6c($v1)
+/* 35FB8 8005ABB8 8FBF004C */  lw        $ra, 0x4c($sp)
+/* 35FBC 8005ABBC 8FB40048 */  lw        $s4, 0x48($sp)
+/* 35FC0 8005ABC0 8FB30044 */  lw        $s3, 0x44($sp)
+/* 35FC4 8005ABC4 8FB20040 */  lw        $s2, 0x40($sp)
+/* 35FC8 8005ABC8 8FB1003C */  lw        $s1, 0x3c($sp)
+/* 35FCC 8005ABCC 8FB00038 */  lw        $s0, 0x38($sp)
+/* 35FD0 8005ABD0 03E00008 */  jr        $ra
+/* 35FD4 8005ABD4 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/asm/nonmatchings/world/world/play_effect.s b/asm/nonmatchings/world/world/play_effect.s
new file mode 100644
index 0000000000..5cf072e2dc
--- /dev/null
+++ b/asm/nonmatchings/world/world/play_effect.s
@@ -0,0 +1,101 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel play_effect
+/* 35964 8005A564 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 35968 8005A568 AFB20020 */  sw        $s2, 0x20($sp)
+/* 3596C 8005A56C 0080902D */  daddu     $s2, $a0, $zero
+/* 35970 8005A570 3C038008 */  lui       $v1, 0x8008
+/* 35974 8005A574 2463F210 */  addiu     $v1, $v1, -0xdf0
+/* 35978 8005A578 00121040 */  sll       $v0, $s2, 1
+/* 3597C 8005A57C 00521021 */  addu      $v0, $v0, $s2
+/* 35980 8005A580 000210C0 */  sll       $v0, $v0, 3
+/* 35984 8005A584 AFB1001C */  sw        $s1, 0x1c($sp)
+/* 35988 8005A588 00438821 */  addu      $s1, $v0, $v1
+/* 3598C 8005A58C 0000202D */  daddu     $a0, $zero, $zero
+/* 35990 8005A590 AFB00018 */  sw        $s0, 0x18($sp)
+/* 35994 8005A594 3C10800A */  lui       $s0, 0x800a
+/* 35998 8005A598 26104000 */  addiu     $s0, $s0, 0x4000
+/* 3599C 8005A59C AFBF0024 */  sw        $ra, 0x24($sp)
+.L8005A5A0:
+/* 359A0 8005A5A0 8E020000 */  lw        $v0, ($s0)
+/* 359A4 8005A5A4 30420001 */  andi      $v0, $v0, 1
+/* 359A8 8005A5A8 50400005 */  beql      $v0, $zero, .L8005A5C0
+/* 359AC 8005A5AC 24840001 */   addiu    $a0, $a0, 1
+/* 359B0 8005A5B0 8E020004 */  lw        $v0, 4($s0)
+/* 359B4 8005A5B4 10520006 */  beq       $v0, $s2, .L8005A5D0
+/* 359B8 8005A5B8 2882000F */   slti     $v0, $a0, 0xf
+/* 359BC 8005A5BC 24840001 */  addiu     $a0, $a0, 1
+.L8005A5C0:
+/* 359C0 8005A5C0 2882000F */  slti      $v0, $a0, 0xf
+/* 359C4 8005A5C4 1440FFF6 */  bnez      $v0, .L8005A5A0
+/* 359C8 8005A5C8 26100020 */   addiu    $s0, $s0, 0x20
+/* 359CC 8005A5CC 2882000F */  slti      $v0, $a0, 0xf
+.L8005A5D0:
+/* 359D0 8005A5D0 14400030 */  bnez      $v0, .L8005A694
+/* 359D4 8005A5D4 24020001 */   addiu    $v0, $zero, 1
+/* 359D8 8005A5D8 0000202D */  daddu     $a0, $zero, $zero
+/* 359DC 8005A5DC 3C10800A */  lui       $s0, 0x800a
+/* 359E0 8005A5E0 26104000 */  addiu     $s0, $s0, 0x4000
+.L8005A5E4:
+/* 359E4 8005A5E4 8E020000 */  lw        $v0, ($s0)
+/* 359E8 8005A5E8 30420001 */  andi      $v0, $v0, 1
+/* 359EC 8005A5EC 10400006 */  beqz      $v0, .L8005A608
+/* 359F0 8005A5F0 2882000F */   slti     $v0, $a0, 0xf
+/* 359F4 8005A5F4 24840001 */  addiu     $a0, $a0, 1
+/* 359F8 8005A5F8 2882000F */  slti      $v0, $a0, 0xf
+/* 359FC 8005A5FC 1440FFF9 */  bnez      $v0, .L8005A5E4
+/* 35A00 8005A600 26100020 */   addiu    $s0, $s0, 0x20
+/* 35A04 8005A604 2882000F */  slti      $v0, $a0, 0xf
+.L8005A608:
+/* 35A08 8005A608 14400003 */  bnez      $v0, .L8005A618
+/* 35A0C 8005A60C 3C0700FF */   lui      $a3, 0xff
+.L8005A610:
+/* 35A10 8005A610 08016984 */  j         .L8005A610
+/* 35A14 8005A614 00000000 */   nop      
+.L8005A618:
+/* 35A18 8005A618 34E7FFFF */  ori       $a3, $a3, 0xffff
+/* 35A1C 8005A61C 0000282D */  daddu     $a1, $zero, $zero
+/* 35A20 8005A620 2402FFFF */  addiu     $v0, $zero, -1
+/* 35A24 8005A624 3C038019 */  lui       $v1, 0x8019
+/* 35A28 8005A628 24637000 */  addiu     $v1, $v1, 0x7000
+/* 35A2C 8005A62C AFA20010 */  sw        $v0, 0x10($sp)
+/* 35A30 8005A630 AFA20014 */  sw        $v0, 0x14($sp)
+/* 35A34 8005A634 00041300 */  sll       $v0, $a0, 0xc
+/* 35A38 8005A638 00431021 */  addu      $v0, $v0, $v1
+/* 35A3C 8005A63C 8E26000C */  lw        $a2, 0xc($s1)
+/* 35A40 8005A640 0C0199E8 */  jal       osMapTLB
+/* 35A44 8005A644 00473824 */   and      $a3, $v0, $a3
+/* 35A48 8005A648 8E240004 */  lw        $a0, 4($s1)
+/* 35A4C 8005A64C 8E250008 */  lw        $a1, 8($s1)
+/* 35A50 8005A650 0C00A5CF */  jal       dma_copy
+/* 35A54 8005A654 8E26000C */   lw       $a2, 0xc($s1)
+/* 35A58 8005A658 8E220010 */  lw        $v0, 0x10($s1)
+/* 35A5C 8005A65C 5040000D */  beql      $v0, $zero, .L8005A694
+/* 35A60 8005A660 24020001 */   addiu    $v0, $zero, 1
+/* 35A64 8005A664 8E240014 */  lw        $a0, 0x14($s1)
+/* 35A68 8005A668 0C00AB0A */  jal       general_heap_malloc
+/* 35A6C 8005A66C 00822023 */   subu     $a0, $a0, $v0
+/* 35A70 8005A670 14400003 */  bnez      $v0, .L8005A680
+/* 35A74 8005A674 AE02001C */   sw       $v0, 0x1c($s0)
+.L8005A678:
+/* 35A78 8005A678 0801699E */  j         .L8005A678
+/* 35A7C 8005A67C 00000000 */   nop      
+.L8005A680:
+/* 35A80 8005A680 8E240010 */  lw        $a0, 0x10($s1)
+/* 35A84 8005A684 8E250014 */  lw        $a1, 0x14($s1)
+/* 35A88 8005A688 0C00A5CF */  jal       dma_copy
+/* 35A8C 8005A68C 8E06001C */   lw       $a2, 0x1c($s0)
+/* 35A90 8005A690 24020001 */  addiu     $v0, $zero, 1
+.L8005A694:
+/* 35A94 8005A694 0040182D */  daddu     $v1, $v0, $zero
+/* 35A98 8005A698 AE120004 */  sw        $s2, 4($s0)
+/* 35A9C 8005A69C AE000008 */  sw        $zero, 8($s0)
+/* 35AA0 8005A6A0 AE030000 */  sw        $v1, ($s0)
+/* 35AA4 8005A6A4 8FBF0024 */  lw        $ra, 0x24($sp)
+/* 35AA8 8005A6A8 8FB20020 */  lw        $s2, 0x20($sp)
+/* 35AAC 8005A6AC 8FB1001C */  lw        $s1, 0x1c($sp)
+/* 35AB0 8005A6B0 8FB00018 */  lw        $s0, 0x18($sp)
+/* 35AB4 8005A6B4 03E00008 */  jr        $ra
+/* 35AB8 8005A6B8 27BD0028 */   addiu    $sp, $sp, 0x28
+/* 35ABC 8005A6BC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/world/remove_all_effects.s b/asm/nonmatchings/world/world/remove_all_effects.s
new file mode 100644
index 0000000000..12613041d9
--- /dev/null
+++ b/asm/nonmatchings/world/world/remove_all_effects.s
@@ -0,0 +1,40 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel remove_all_effects
+/* 358E0 8005A4E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 358E4 8005A4E4 AFB20018 */  sw        $s2, 0x18($sp)
+/* 358E8 8005A4E8 0000902D */  daddu     $s2, $zero, $zero
+/* 358EC 8005A4EC AFB10014 */  sw        $s1, 0x14($sp)
+/* 358F0 8005A4F0 3C11800B */  lui       $s1, 0x800b
+/* 358F4 8005A4F4 26314398 */  addiu     $s1, $s1, 0x4398
+/* 358F8 8005A4F8 AFBF001C */  sw        $ra, 0x1c($sp)
+/* 358FC 8005A4FC AFB00010 */  sw        $s0, 0x10($sp)
+.L8005A500:
+/* 35900 8005A500 8E300000 */  lw        $s0, ($s1)
+/* 35904 8005A504 5200000E */  beql      $s0, $zero, .L8005A540
+/* 35908 8005A508 26520001 */   addiu    $s2, $s2, 1
+/* 3590C 8005A50C 8E020000 */  lw        $v0, ($s0)
+/* 35910 8005A510 30420004 */  andi      $v0, $v0, 4
+/* 35914 8005A514 5040000A */  beql      $v0, $zero, .L8005A540
+/* 35918 8005A518 26520001 */   addiu    $s2, $s2, 1
+/* 3591C 8005A51C 8E04000C */  lw        $a0, 0xc($s0)
+/* 35920 8005A520 10800003 */  beqz      $a0, .L8005A530
+/* 35924 8005A524 00000000 */   nop      
+/* 35928 8005A528 0C00AB1E */  jal       general_heap_free
+/* 3592C 8005A52C 00000000 */   nop      
+.L8005A530:
+/* 35930 8005A530 0C00AB1E */  jal       general_heap_free
+/* 35934 8005A534 0200202D */   daddu    $a0, $s0, $zero
+/* 35938 8005A538 AE200000 */  sw        $zero, ($s1)
+/* 3593C 8005A53C 26520001 */  addiu     $s2, $s2, 1
+.L8005A540:
+/* 35940 8005A540 2A420060 */  slti      $v0, $s2, 0x60
+/* 35944 8005A544 1440FFEE */  bnez      $v0, .L8005A500
+/* 35948 8005A548 26310004 */   addiu    $s1, $s1, 4
+/* 3594C 8005A54C 8FBF001C */  lw        $ra, 0x1c($sp)
+/* 35950 8005A550 8FB20018 */  lw        $s2, 0x18($sp)
+/* 35954 8005A554 8FB10014 */  lw        $s1, 0x14($sp)
+/* 35958 8005A558 8FB00010 */  lw        $s0, 0x10($sp)
+/* 3595C 8005A55C 03E00008 */  jr        $ra
+/* 35960 8005A560 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/world/remove_effect.s b/asm/nonmatchings/world/world/remove_effect.s
new file mode 100644
index 0000000000..e445cf8a4d
--- /dev/null
+++ b/asm/nonmatchings/world/world/remove_effect.s
@@ -0,0 +1,45 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel remove_effect
+/* 35850 8005A450 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 35854 8005A454 AFB10014 */  sw        $s1, 0x14($sp)
+/* 35858 8005A458 0080882D */  daddu     $s1, $a0, $zero
+/* 3585C 8005A45C AFB00010 */  sw        $s0, 0x10($sp)
+/* 35860 8005A460 0000802D */  daddu     $s0, $zero, $zero
+/* 35864 8005A464 3C03800B */  lui       $v1, 0x800b
+/* 35868 8005A468 24634398 */  addiu     $v1, $v1, 0x4398
+/* 3586C 8005A46C AFBF0018 */  sw        $ra, 0x18($sp)
+.L8005A470:
+/* 35870 8005A470 8C620000 */  lw        $v0, ($v1)
+/* 35874 8005A474 10510006 */  beq       $v0, $s1, .L8005A490
+/* 35878 8005A478 2A020060 */   slti     $v0, $s0, 0x60
+/* 3587C 8005A47C 26100001 */  addiu     $s0, $s0, 1
+/* 35880 8005A480 2A020060 */  slti      $v0, $s0, 0x60
+/* 35884 8005A484 1440FFFA */  bnez      $v0, .L8005A470
+/* 35888 8005A488 24630004 */   addiu    $v1, $v1, 4
+/* 3588C 8005A48C 2A020060 */  slti      $v0, $s0, 0x60
+.L8005A490:
+/* 35890 8005A490 14400003 */  bnez      $v0, .L8005A4A0
+/* 35894 8005A494 00000000 */   nop      
+.L8005A498:
+/* 35898 8005A498 08016926 */  j         .L8005A498
+/* 3589C 8005A49C 00000000 */   nop      
+.L8005A4A0:
+/* 358A0 8005A4A0 8E24000C */  lw        $a0, 0xc($s1)
+/* 358A4 8005A4A4 10800003 */  beqz      $a0, .L8005A4B4
+/* 358A8 8005A4A8 00000000 */   nop      
+/* 358AC 8005A4AC 0C00AB1E */  jal       general_heap_free
+/* 358B0 8005A4B0 00000000 */   nop      
+.L8005A4B4:
+/* 358B4 8005A4B4 0C00AB1E */  jal       general_heap_free
+/* 358B8 8005A4B8 0220202D */   daddu    $a0, $s1, $zero
+/* 358BC 8005A4BC 00101080 */  sll       $v0, $s0, 2
+/* 358C0 8005A4C0 3C01800B */  lui       $at, 0x800b
+/* 358C4 8005A4C4 00220821 */  addu      $at, $at, $v0
+/* 358C8 8005A4C8 AC204398 */  sw        $zero, 0x4398($at)
+/* 358CC 8005A4CC 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 358D0 8005A4D0 8FB10014 */  lw        $s1, 0x14($sp)
+/* 358D4 8005A4D4 8FB00010 */  lw        $s0, 0x10($sp)
+/* 358D8 8005A4D8 03E00008 */  jr        $ra
+/* 358DC 8005A4DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/world/render_effects.s b/asm/nonmatchings/world/world/render_effects.s
new file mode 100644
index 0000000000..f0d191c036
--- /dev/null
+++ b/asm/nonmatchings/world/world/render_effects.s
@@ -0,0 +1,48 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel render_effects
+/* 352F4 80059EF4 27BDFFE0 */  addiu     $sp, $sp, -0x20
+/* 352F8 80059EF8 AFB10014 */  sw        $s1, 0x14($sp)
+/* 352FC 80059EFC 0000882D */  daddu     $s1, $zero, $zero
+/* 35300 80059F00 AFB00010 */  sw        $s0, 0x10($sp)
+/* 35304 80059F04 3C10800B */  lui       $s0, 0x800b
+/* 35308 80059F08 26104398 */  addiu     $s0, $s0, 0x4398
+/* 3530C 80059F0C AFBF0018 */  sw        $ra, 0x18($sp)
+.L80059F10:
+/* 35310 80059F10 8E040000 */  lw        $a0, ($s0)
+/* 35314 80059F14 50800017 */  beql      $a0, $zero, .L80059F74
+/* 35318 80059F18 26310001 */   addiu    $s1, $s1, 1
+/* 3531C 80059F1C 8C830000 */  lw        $v1, ($a0)
+/* 35320 80059F20 30620001 */  andi      $v0, $v1, 1
+/* 35324 80059F24 50400013 */  beql      $v0, $zero, .L80059F74
+/* 35328 80059F28 26310001 */   addiu    $s1, $s1, 1
+/* 3532C 80059F2C 30620008 */  andi      $v0, $v1, 8
+/* 35330 80059F30 50400010 */  beql      $v0, $zero, .L80059F74
+/* 35334 80059F34 26310001 */   addiu    $s1, $s1, 1
+/* 35338 80059F38 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
+/* 3533C 80059F3C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
+/* 35340 80059F40 80420070 */  lb        $v0, 0x70($v0)
+/* 35344 80059F44 10400005 */  beqz      $v0, .L80059F5C
+/* 35348 80059F48 30620004 */   andi     $v0, $v1, 4
+/* 3534C 80059F4C 50400009 */  beql      $v0, $zero, .L80059F74
+/* 35350 80059F50 26310001 */   addiu    $s1, $s1, 1
+/* 35354 80059F54 080167D9 */  j         .L80059F64
+/* 35358 80059F58 00000000 */   nop      
+.L80059F5C:
+/* 3535C 80059F5C 54400005 */  bnel      $v0, $zero, .L80059F74
+/* 35360 80059F60 26310001 */   addiu    $s1, $s1, 1
+.L80059F64:
+/* 35364 80059F64 8C820010 */  lw        $v0, 0x10($a0)
+/* 35368 80059F68 8C420014 */  lw        $v0, 0x14($v0)
+/* 3536C 80059F6C 0040F809 */  jalr      $v0
+/* 35370 80059F70 26310001 */   addiu    $s1, $s1, 1
+.L80059F74:
+/* 35374 80059F74 2A220060 */  slti      $v0, $s1, 0x60
+/* 35378 80059F78 1440FFE5 */  bnez      $v0, .L80059F10
+/* 3537C 80059F7C 26100004 */   addiu    $s0, $s0, 4
+/* 35380 80059F80 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 35384 80059F84 8FB10014 */  lw        $s1, 0x14($sp)
+/* 35388 80059F88 8FB00010 */  lw        $s0, 0x10($sp)
+/* 3538C 80059F8C 03E00008 */  jr        $ra
+/* 35390 80059F90 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c
index 733d47d9db..8e7dfef265 100644
--- a/src/world/area_kmr/kmr_00/8ABF90.c
+++ b/src/world/area_kmr/kmr_00/8ABF90.c
@@ -12,11 +12,20 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530_8AC4C0);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240584_8AC514);
+ApiStatus func_80240584_8AC514(ScriptInstance* script, s32 isInitialCall) {
+    func_8005553C(0, 2000);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405A8_8AC538);
+ApiStatus func_802405A8_8AC538(ScriptInstance* script, s32 isInitialCall) {
+    func_80055590(0, 2000);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405CC_8AC55C);
+ApiStatus func_802405CC_8AC55C(ScriptInstance* script, s32 isInitialCall) {
+    func_800554E8(0, 1000);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405F0_8AC580);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 30190c2498..535099ac83 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -241,7 +241,7 @@ render_effects = 0x80059EF4;
 remove_effect = 0x8005A450;
 remove_all_effects = 0x8005A4E0;
 play_effect = 0x8005A564;
-load_map_script_lib = 0x8005A6C0;
+load_world_script_api = 0x8005A6C0;
 load_map_by_IDs = 0x8005A6F4;
 get_current_map_config = 0x8005ABD8;
 get_current_map_header = 0x8005ABE8;
@@ -565,6 +565,7 @@ D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 gEffectTable = 0x8007F214;
 gAreas = 0x800934F0;
+gCurrentEncounter = 0x800B0F10; // size:0xB0
 gBattleState = 0x800DC068;
 test_below_player = 0x800DDFD0;
 trace_below_player = 0x800DE54C;

From 4f0f43a3c91bddc13422b0aefd0a50815ded9efd Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 19:22:44 +0000
Subject: [PATCH 089/101] add include/ld_addrs.h as an explicit dependency of
 %.c

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dac0d3fb0e..15a3c7f519 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 	$(LD) -r -b binary -o $@ $<
 
 # Compile C files
-$(BUILD_DIR)/%.c.o: %.c $(MDEPS)
+$(BUILD_DIR)/%.c.o: %.c $(MDEPS) include/ld_addrs.h
 	@mkdir -p $(shell dirname $@)
 	$(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 

From 5a0dea8665321593a9691a214884c58e471b6921 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 14:53:06 -0500
Subject: [PATCH 090/101] a few more kmr funcs

---
 .../kmr_00/8ABF90/func_802403B8_8AC348.s      | 62 -------------------
 .../kmr_00/8ABF90/func_802404A0_8AC430.s      | 22 -------
 .../kmr_00/8ABF90/func_80240530_8AC4C0.s      | 25 --------
 .../kmr_00/8ABF90/func_80240BD8_8ACB68.s      | 61 ------------------
 .../kmr_04/8CA900/func_8024002C_8CA92C.s      | 17 -----
 include/functions.h                           |  4 ++
 src/os/code_4ac90_len_3910.c                  |  4 +-
 src/world/area_kmr/kmr_00/8ABF90.c            | 46 ++++++++++++--
 src/world/area_kmr/kmr_04/8CA900.c            |  6 +-
 9 files changed, 53 insertions(+), 194 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s

diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s
deleted file mode 100644
index 0c8d88a05b..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403B8_8AC348
-/* 8AC348 802403B8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 8AC34C 802403BC AFB1001C */  sw        $s1, 0x1c($sp)
-/* 8AC350 802403C0 0080882D */  daddu     $s1, $a0, $zero
-/* 8AC354 802403C4 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 8AC358 802403C8 AFB40028 */  sw        $s4, 0x28($sp)
-/* 8AC35C 802403CC AFB30024 */  sw        $s3, 0x24($sp)
-/* 8AC360 802403D0 AFB20020 */  sw        $s2, 0x20($sp)
-/* 8AC364 802403D4 AFB00018 */  sw        $s0, 0x18($sp)
-/* 8AC368 802403D8 8E30000C */  lw        $s0, 0xc($s1)
-/* 8AC36C 802403DC 8E050000 */  lw        $a1, ($s0)
-/* 8AC370 802403E0 0C0B1EAF */  jal       get_variable
-/* 8AC374 802403E4 26100004 */   addiu    $s0, $s0, 4
-/* 8AC378 802403E8 8E050000 */  lw        $a1, ($s0)
-/* 8AC37C 802403EC 26100004 */  addiu     $s0, $s0, 4
-/* 8AC380 802403F0 0220202D */  daddu     $a0, $s1, $zero
-/* 8AC384 802403F4 0C0B1EAF */  jal       get_variable
-/* 8AC388 802403F8 0040A02D */   daddu    $s4, $v0, $zero
-/* 8AC38C 802403FC 8E050000 */  lw        $a1, ($s0)
-/* 8AC390 80240400 26100004 */  addiu     $s0, $s0, 4
-/* 8AC394 80240404 0220202D */  daddu     $a0, $s1, $zero
-/* 8AC398 80240408 0C0B1EAF */  jal       get_variable
-/* 8AC39C 8024040C 0040982D */   daddu    $s3, $v0, $zero
-/* 8AC3A0 80240410 8E050000 */  lw        $a1, ($s0)
-/* 8AC3A4 80240414 26100004 */  addiu     $s0, $s0, 4
-/* 8AC3A8 80240418 0220202D */  daddu     $a0, $s1, $zero
-/* 8AC3AC 8024041C 0C0B1EAF */  jal       get_variable
-/* 8AC3B0 80240420 0040902D */   daddu    $s2, $v0, $zero
-/* 8AC3B4 80240424 0220202D */  daddu     $a0, $s1, $zero
-/* 8AC3B8 80240428 8E050000 */  lw        $a1, ($s0)
-/* 8AC3BC 8024042C 0C0B1EAF */  jal       get_variable
-/* 8AC3C0 80240430 0040802D */   daddu    $s0, $v0, $zero
-/* 8AC3C4 80240434 0280202D */  daddu     $a0, $s4, $zero
-/* 8AC3C8 80240438 44931000 */  mtc1      $s3, $f2
-/* 8AC3CC 8024043C 00000000 */  nop       
-/* 8AC3D0 80240440 468010A0 */  cvt.s.w   $f2, $f2
-/* 8AC3D4 80240444 44051000 */  mfc1      $a1, $f2
-/* 8AC3D8 80240448 44921000 */  mtc1      $s2, $f2
-/* 8AC3DC 8024044C 00000000 */  nop       
-/* 8AC3E0 80240450 468010A0 */  cvt.s.w   $f2, $f2
-/* 8AC3E4 80240454 44061000 */  mfc1      $a2, $f2
-/* 8AC3E8 80240458 44901000 */  mtc1      $s0, $f2
-/* 8AC3EC 8024045C 00000000 */  nop       
-/* 8AC3F0 80240460 468010A0 */  cvt.s.w   $f2, $f2
-/* 8AC3F4 80240464 44071000 */  mfc1      $a3, $f2
-/* 8AC3F8 80240468 44820000 */  mtc1      $v0, $f0
-/* 8AC3FC 8024046C 00000000 */  nop       
-/* 8AC400 80240470 46800020 */  cvt.s.w   $f0, $f0
-/* 8AC404 80240474 0C01BFBC */  jal       func_8006FEF0
-/* 8AC408 80240478 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 8AC40C 8024047C 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 8AC410 80240480 8FB40028 */  lw        $s4, 0x28($sp)
-/* 8AC414 80240484 8FB30024 */  lw        $s3, 0x24($sp)
-/* 8AC418 80240488 8FB20020 */  lw        $s2, 0x20($sp)
-/* 8AC41C 8024048C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 8AC420 80240490 8FB00018 */  lw        $s0, 0x18($sp)
-/* 8AC424 80240494 24020002 */  addiu     $v0, $zero, 2
-/* 8AC428 80240498 03E00008 */  jr        $ra
-/* 8AC42C 8024049C 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s
deleted file mode 100644
index 5f6d59ef52..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404A0_8AC430
-/* 8AC430 802404A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8AC434 802404A4 2402001E */  addiu     $v0, $zero, 0x1e
-/* 8AC438 802404A8 44801000 */  mtc1      $zero, $f2
-/* 8AC43C 802404AC 3C013E99 */  lui       $at, 0x3e99
-/* 8AC440 802404B0 3421999A */  ori       $at, $at, 0x999a
-/* 8AC444 802404B4 44810000 */  mtc1      $at, $f0
-/* 8AC448 802404B8 44051000 */  mfc1      $a1, $f2
-/* 8AC44C 802404BC 24040004 */  addiu     $a0, $zero, 4
-/* 8AC450 802404C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8AC454 802404C4 AFA20014 */  sw        $v0, 0x14($sp)
-/* 8AC458 802404C8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8AC45C 802404CC 00A0302D */  daddu     $a2, $a1, $zero
-/* 8AC460 802404D0 0C01C5D4 */  jal       func_80071750
-/* 8AC464 802404D4 00A0382D */   daddu    $a3, $a1, $zero
-/* 8AC468 802404D8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8AC46C 802404DC 24020002 */  addiu     $v0, $zero, 2
-/* 8AC470 802404E0 03E00008 */  jr        $ra
-/* 8AC474 802404E4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s
deleted file mode 100644
index 2ec6fc2697..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240530_8AC4C0
-/* 8AC4C0 80240530 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8AC4C4 80240534 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8AC4C8 80240538 8C82000C */  lw        $v0, 0xc($a0)
-/* 8AC4CC 8024053C 0C0B1EAF */  jal       get_variable
-/* 8AC4D0 80240540 8C450000 */   lw       $a1, ($v0)
-/* 8AC4D4 80240544 0C00EABB */  jal       get_npc_unsafe
-/* 8AC4D8 80240548 0040202D */   daddu    $a0, $v0, $zero
-/* 8AC4DC 8024054C 3C014120 */  lui       $at, 0x4120
-/* 8AC4E0 80240550 44810000 */  mtc1      $at, $f0
-/* 8AC4E4 80240554 C442003C */  lwc1      $f2, 0x3c($v0)
-/* 8AC4E8 80240558 46001080 */  add.s     $f2, $f2, $f0
-/* 8AC4EC 8024055C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8AC4F0 80240560 8C450038 */  lw        $a1, 0x38($v0)
-/* 8AC4F4 80240564 8C470040 */  lw        $a3, 0x40($v0)
-/* 8AC4F8 80240568 44061000 */  mfc1      $a2, $f2
-/* 8AC4FC 8024056C 0C01BFBC */  jal       func_8006FEF0
-/* 8AC500 80240570 24040003 */   addiu    $a0, $zero, 3
-/* 8AC504 80240574 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8AC508 80240578 24020002 */  addiu     $v0, $zero, 2
-/* 8AC50C 8024057C 03E00008 */  jr        $ra
-/* 8AC510 80240580 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s
deleted file mode 100644
index 7d41d5f9ba..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s
+++ /dev/null
@@ -1,61 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BD8_8ACB68
-/* 8ACB68 80240BD8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8ACB6C 80240BDC AFB1001C */  sw        $s1, 0x1c($sp)
-/* 8ACB70 80240BE0 0080882D */  daddu     $s1, $a0, $zero
-/* 8ACB74 80240BE4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8ACB78 80240BE8 AFB00018 */  sw        $s0, 0x18($sp)
-/* 8ACB7C 80240BEC 10A0001D */  beqz      $a1, .L80240C64
-/* 8ACB80 80240BF0 8E22000C */   lw       $v0, 0xc($s1)
-/* 8ACB84 80240BF4 0C0B1EAF */  jal       get_variable
-/* 8ACB88 80240BF8 8C450000 */   lw       $a1, ($v0)
-/* 8ACB8C 80240BFC 0040202D */  daddu     $a0, $v0, $zero
-/* 8ACB90 80240C00 0C00EABB */  jal       get_npc_unsafe
-/* 8ACB94 80240C04 AE240074 */   sw       $a0, 0x74($s1)
-/* 8ACB98 80240C08 0040802D */  daddu     $s0, $v0, $zero
-/* 8ACB9C 80240C0C 3C04B000 */  lui       $a0, 0xb000
-/* 8ACBA0 80240C10 C6000040 */  lwc1      $f0, 0x40($s0)
-/* 8ACBA4 80240C14 3484001E */  ori       $a0, $a0, 0x1e
-/* 8ACBA8 80240C18 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8ACBAC 80240C1C 8E060038 */  lw        $a2, 0x38($s0)
-/* 8ACBB0 80240C20 8E07003C */  lw        $a3, 0x3c($s0)
-/* 8ACBB4 80240C24 0C052757 */  jal       play_sound_at_position
-/* 8ACBB8 80240C28 0000282D */   daddu    $a1, $zero, $zero
-/* 8ACBBC 80240C2C C604003C */  lwc1      $f4, 0x3c($s0)
-/* 8ACBC0 80240C30 3C0141A0 */  lui       $at, 0x41a0
-/* 8ACBC4 80240C34 44810000 */  mtc1      $at, $f0
-/* 8ACBC8 80240C38 3C014120 */  lui       $at, 0x4120
-/* 8ACBCC 80240C3C 44811000 */  mtc1      $at, $f2
-/* 8ACBD0 80240C40 46002100 */  add.s     $f4, $f4, $f0
-/* 8ACBD4 80240C44 E7A20010 */  swc1      $f2, 0x10($sp)
-/* 8ACBD8 80240C48 8E050038 */  lw        $a1, 0x38($s0)
-/* 8ACBDC 80240C4C 8E070040 */  lw        $a3, 0x40($s0)
-/* 8ACBE0 80240C50 44062000 */  mfc1      $a2, $f4
-/* 8ACBE4 80240C54 0C01BFBC */  jal       func_8006FEF0
-/* 8ACBE8 80240C58 0000202D */   daddu    $a0, $zero, $zero
-/* 8ACBEC 80240C5C 24020003 */  addiu     $v0, $zero, 3
-/* 8ACBF0 80240C60 AE220070 */  sw        $v0, 0x70($s1)
-.L80240C64:
-/* 8ACBF4 80240C64 0C00EABB */  jal       get_npc_unsafe
-/* 8ACBF8 80240C68 8E240074 */   lw       $a0, 0x74($s1)
-/* 8ACBFC 80240C6C 0040802D */  daddu     $s0, $v0, $zero
-/* 8ACC00 80240C70 8E230070 */  lw        $v1, 0x70($s1)
-/* 8ACC04 80240C74 2402FFFF */  addiu     $v0, $zero, -1
-/* 8ACC08 80240C78 2463FFFF */  addiu     $v1, $v1, -1
-/* 8ACC0C 80240C7C 10620003 */  beq       $v1, $v0, .L80240C8C
-/* 8ACC10 80240C80 AE230070 */   sw       $v1, 0x70($s1)
-/* 8ACC14 80240C84 08090327 */  j         .L80240C9C
-/* 8ACC18 80240C88 0000102D */   daddu    $v0, $zero, $zero
-.L80240C8C:
-/* 8ACC1C 80240C8C 3C01C47A */  lui       $at, 0xc47a
-/* 8ACC20 80240C90 44810000 */  mtc1      $at, $f0
-/* 8ACC24 80240C94 24020002 */  addiu     $v0, $zero, 2
-/* 8ACC28 80240C98 E600003C */  swc1      $f0, 0x3c($s0)
-.L80240C9C:
-/* 8ACC2C 80240C9C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8ACC30 80240CA0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 8ACC34 80240CA4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 8ACC38 80240CA8 03E00008 */  jr        $ra
-/* 8ACC3C 80240CAC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s
deleted file mode 100644
index 1e621e0276..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024002C_8CA92C
-/* 8CA92C 8024002C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CA930 80240030 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8CA934 80240034 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8CA938 80240038 0C039D59 */  jal       get_player_data
-/* 8CA93C 8024003C 0080802D */   daddu    $s0, $a0, $zero
-/* 8CA940 80240040 80430002 */  lb        $v1, 2($v0)
-/* 8CA944 80240044 AE030084 */  sw        $v1, 0x84($s0)
-/* 8CA948 80240048 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8CA94C 8024004C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8CA950 80240050 24020002 */  addiu     $v0, $zero, 2
-/* 8CA954 80240054 03E00008 */  jr        $ra
-/* 8CA958 80240058 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8CA95C 8024005C 00000000 */  nop       
diff --git a/include/functions.h b/include/functions.h
index 545f4ec24e..ef868510b0 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -33,6 +33,8 @@ s32 get_model_list_index_from_tree_index(s32 treeIndex);
 void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY,
                                f32* sizeZ);
 
+void func_8006FEF0(s32, f32, f32, f32, f32);
+void func_80071750(s32, f32, f32, f32, f32, s32);
 void func_80072950(s32, f32, f32, f32, f32, s32 time);
 
 void update_collider_transform(s16 colliderID);
@@ -74,6 +76,8 @@ void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
 f32 func_800E0088(f32, f32);
 s32 func_800EB168(s32);
 
+PlayerData* get_player_data(void);
+
 // Partner
 void func_800EBA3C(Npc* partner);
 void func_800EBB40(Npc* partner);
diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c
index a335a6b510..0a8deb9f6d 100644
--- a/src/os/code_4ac90_len_3910.c
+++ b/src/os/code_4ac90_len_3910.c
@@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30);
 
 INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_emote);
 
-INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FEF0);
+INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4);
 
 INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FF50);
 
@@ -164,7 +164,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071690);
 
 INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800716F0);
 
-INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071750);
+INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5);
 
 INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800717B0);
 
diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c
index 8e7dfef265..5ca2ded1f5 100644
--- a/src/world/area_kmr/kmr_00/8ABF90.c
+++ b/src/world/area_kmr/kmr_00/8ABF90.c
@@ -4,13 +4,31 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240000_8ABF90);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240388_8AC318);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802403B8_8AC348);
+ApiStatus func_802403B8_8AC348(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404A0_8AC430);
+    func_8006FEF0(var0, var1, var2, var3, var4);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802404A0_8AC430(ScriptInstance* script, s32 isInitialCall) {
+    func_80071750(4, 0.0f, 0.0f, 0.0f, 0.3f, 30);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530_8AC4C0);
+ApiStatus func_80240530_8AC4C0(ScriptInstance* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(get_variable(script, *script->ptrReadPos));
+
+    func_8006FEF0(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80240584_8AC514(ScriptInstance* script, s32 isInitialCall) {
     func_8005553C(0, 2000);
@@ -29,6 +47,26 @@ ApiStatus func_802405CC_8AC55C(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405F0_8AC580);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240BD8_8ACB68);
+ApiStatus func_80240BD8_8ACB68(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc;
+
+    if (isInitialCall) {
+        script->functionTemp[1].s = get_variable(script, *args);
+        npc = get_npc_unsafe(script->functionTemp[1].s);
+        play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
+        func_8006FEF0(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
+        script->functionTemp[0].s = 3;
+    }
+
+    npc = get_npc_unsafe(script->functionTemp[1].s);
+    script->functionTemp[0].s--;
+    if (script->functionTemp[0].s == -1) {
+        npc->pos.y = -1000.0f;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240CB0_8ACC40);
diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c
index 3326b00c98..9102ee97cb 100644
--- a/src/world/area_kmr/kmr_04/8CA900.c
+++ b/src/world/area_kmr/kmr_04/8CA900.c
@@ -2,4 +2,8 @@
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C);
+ApiStatus func_8024002C_8CA92C(ScriptInstance* script, s32 isInitialCall) {
+    script->varTable[0] = get_player_data()->curHP;
+
+    return ApiStatus_DONE2;
+}

From 2c4fcac207c2462d5500a1330212b5ed2e12f362 Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Mon, 2 Nov 2020 20:16:19 +0000
Subject: [PATCH 091/101] fix build

---
 Makefile       | 5 ++---
 tools/n64splat | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 15a3c7f519..9058c9f924 100644
--- a/Makefile
+++ b/Makefile
@@ -130,12 +130,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 	$(LD) -r -b binary -o $@ $<
 
 # Compile C files
-$(BUILD_DIR)/%.c.o: %.c $(MDEPS) include/ld_addrs.h
+$(BUILD_DIR)/%.c.o: %.c $(MDEPS) | include/ld_addrs.h
 	@mkdir -p $(shell dirname $@)
 	$(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
-$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py
+$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py | include/ld_addrs.h
 	@mkdir -p $(shell dirname $@)
 	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
@@ -178,7 +178,6 @@ $(BUILD_DIR)/%.i8.png: %.png
 	@mkdir -p $(shell dirname $@)
 	$(PYTHON) tools/convert_image.py i8 $< $@ $(IMG_FLAGS)
 
-
 ASSET_FILES := $(foreach asset, $(ASSETS), $(BUILD_DIR)/bin/assets/$(asset))
 YAY0_ASSET_FILES := $(foreach asset, $(filter-out %_tex, $(ASSET_FILES)), $(asset).Yay0)
 
diff --git a/tools/n64splat b/tools/n64splat
index c78e4fe9d8..8f74e0bcce 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit c78e4fe9d863d4b3fa203af5f8b7179bb1c7c82f
+Subproject commit 8f74e0bccec04e12c3dec27f64c257f61def594c

From 743619e28f7799d772dfdecea7d171a8ed14c195 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 15:19:04 -0500
Subject: [PATCH 092/101] a few more

---
 .../kmr_04/8CA960/func_80240434_8CAD34.s      |  8 ---
 .../kmr_04/8CA960/func_80240444_8CAD44.s      | 15 -----
 .../kmr_05/8CF570/func_8024173C_8CF7AC.s      | 23 --------
 .../kmr_06/8D2A10/func_80241CC8_8D31D8.s      | 58 -------------------
 .../kmr_09/8D5E00/func_802414F8_8D72F8.s      | 18 ------
 .../kmr_10/8D84D0/func_80240304_8D87D4.s      | 55 ------------------
 src/world/area_kmr/kmr_04/8CA960.c            | 12 +++-
 src/world/area_kmr/kmr_05/8CF570.c            |  9 ++-
 src/world/area_kmr/kmr_06/8D2A10.c            | 19 +++++-
 src/world/area_kmr/kmr_09/8D5E00.c            |  6 +-
 src/world/area_kmr/kmr_10/8D84D0.c            | 15 ++++-
 tools/symbol_addrs.txt                        |  1 +
 12 files changed, 56 insertions(+), 183 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s

diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
deleted file mode 100644
index 03e5caf0ac..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240434_8CAD34
-/* 8CAD34 80240434 3C018011 */  lui       $at, %hi(gPlayerData+0x1)
-/* 8CAD38 80240438 A020F291 */  sb        $zero, %lo(gPlayerData+0x1)($at)
-/* 8CAD3C 8024043C 03E00008 */  jr        $ra
-/* 8CAD40 80240440 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s
deleted file mode 100644
index 26fc9b1e21..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240444_8CAD44
-/* 8CAD44 80240444 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CAD48 80240448 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8CAD4C 8024044C 0C04417A */  jal       get_entity_by_index
-/* 8CAD50 80240450 8C840084 */   lw       $a0, 0x84($a0)
-/* 8CAD54 80240454 0C043F5A */  jal       func_8010FD68
-/* 8CAD58 80240458 0040202D */   daddu    $a0, $v0, $zero
-/* 8CAD5C 8024045C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8CAD60 80240460 24020002 */  addiu     $v0, $zero, 2
-/* 8CAD64 80240464 03E00008 */  jr        $ra
-/* 8CAD68 80240468 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8CAD6C 8024046C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s
deleted file mode 100644
index 4a2b86ff84..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024173C_8CF7AC
-/* 8CF7AC 8024173C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CF7B0 80241740 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8CF7B4 80241744 0080802D */  daddu     $s0, $a0, $zero
-/* 8CF7B8 80241748 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8CF7BC 8024174C 0C00FB5A */  jal       get_enemy_safe
-/* 8CF7C0 80241750 24040006 */   addiu    $a0, $zero, 6
-/* 8CF7C4 80241754 14400003 */  bnez      $v0, .L80241764
-/* 8CF7C8 80241758 24020001 */   addiu    $v0, $zero, 1
-/* 8CF7CC 8024175C 080905DA */  j         .L80241768
-/* 8CF7D0 80241760 AE000084 */   sw       $zero, 0x84($s0)
-.L80241764:
-/* 8CF7D4 80241764 AE020084 */  sw        $v0, 0x84($s0)
-.L80241768:
-/* 8CF7D8 80241768 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8CF7DC 8024176C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8CF7E0 80241770 24020002 */  addiu     $v0, $zero, 2
-/* 8CF7E4 80241774 03E00008 */  jr        $ra
-/* 8CF7E8 80241778 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8CF7EC 8024177C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s
deleted file mode 100644
index c522a017fc..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CC8_8D31D8
-/* 8D31D8 80241CC8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8D31DC 80241CCC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8D31E0 80241CD0 0080802D */  daddu     $s0, $a0, $zero
-/* 8D31E4 80241CD4 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D31E8 80241CD8 34A50F8A */  ori       $a1, $a1, 0xf8a
-/* 8D31EC 80241CDC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8D31F0 80241CE0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8D31F4 80241CE4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8D31F8 80241CE8 0C0B1EAF */  jal       get_variable
-/* 8D31FC 80241CEC AFB10014 */   sw       $s1, 0x14($sp)
-/* 8D3200 80241CF0 0200202D */  daddu     $a0, $s0, $zero
-/* 8D3204 80241CF4 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D3208 80241CF8 34A50F8B */  ori       $a1, $a1, 0xf8b
-/* 8D320C 80241CFC 0C0B1EAF */  jal       get_variable
-/* 8D3210 80241D00 0040902D */   daddu    $s2, $v0, $zero
-/* 8D3214 80241D04 0200202D */  daddu     $a0, $s0, $zero
-/* 8D3218 80241D08 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D321C 80241D0C 34A50F8C */  ori       $a1, $a1, 0xf8c
-/* 8D3220 80241D10 0C0B1EAF */  jal       get_variable
-/* 8D3224 80241D14 0040982D */   daddu    $s3, $v0, $zero
-/* 8D3228 80241D18 8E440004 */  lw        $a0, 4($s2)
-/* 8D322C 80241D1C 0C048D70 */  jal       func_801235C0
-/* 8D3230 80241D20 0040882D */   daddu    $s1, $v0, $zero
-/* 8D3234 80241D24 0C00AB4B */  jal       heap_free
-/* 8D3238 80241D28 0240202D */   daddu    $a0, $s2, $zero
-/* 8D323C 80241D2C 0C00AB4B */  jal       heap_free
-/* 8D3240 80241D30 0260202D */   daddu    $a0, $s3, $zero
-/* 8D3244 80241D34 0C00AB4B */  jal       heap_free
-/* 8D3248 80241D38 0220202D */   daddu    $a0, $s1, $zero
-/* 8D324C 80241D3C 0200202D */  daddu     $a0, $s0, $zero
-/* 8D3250 80241D40 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D3254 80241D44 34A50F8A */  ori       $a1, $a1, 0xf8a
-/* 8D3258 80241D48 0C0B2026 */  jal       set_variable
-/* 8D325C 80241D4C 0000302D */   daddu    $a2, $zero, $zero
-/* 8D3260 80241D50 0200202D */  daddu     $a0, $s0, $zero
-/* 8D3264 80241D54 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D3268 80241D58 34A50F8B */  ori       $a1, $a1, 0xf8b
-/* 8D326C 80241D5C 0C0B2026 */  jal       set_variable
-/* 8D3270 80241D60 0000302D */   daddu    $a2, $zero, $zero
-/* 8D3274 80241D64 0200202D */  daddu     $a0, $s0, $zero
-/* 8D3278 80241D68 3C05FD05 */  lui       $a1, 0xfd05
-/* 8D327C 80241D6C 34A50F8C */  ori       $a1, $a1, 0xf8c
-/* 8D3280 80241D70 0C0B2026 */  jal       set_variable
-/* 8D3284 80241D74 0000302D */   daddu    $a2, $zero, $zero
-/* 8D3288 80241D78 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8D328C 80241D7C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8D3290 80241D80 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8D3294 80241D84 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8D3298 80241D88 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8D329C 80241D8C 24020002 */  addiu     $v0, $zero, 2
-/* 8D32A0 80241D90 03E00008 */  jr        $ra
-/* 8D32A4 80241D94 27BD0028 */   addiu    $sp, $sp, 0x28
-/* 8D32A8 80241D98 00000000 */  nop       
-/* 8D32AC 80241D9C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s
deleted file mode 100644
index e3d954ccfb..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414F8_8D72F8
-/* 8D72F8 802414F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8D72FC 802414FC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8D7300 80241500 0080802D */  daddu     $s0, $a0, $zero
-/* 8D7304 80241504 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8D7308 80241508 0C00FB5A */  jal       get_enemy_safe
-/* 8D730C 8024150C 24040002 */   addiu    $a0, $zero, 2
-/* 8D7310 80241510 AE020084 */  sw        $v0, 0x84($s0)
-/* 8D7314 80241514 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8D7318 80241518 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8D731C 8024151C 24020002 */  addiu     $v0, $zero, 2
-/* 8D7320 80241520 03E00008 */  jr        $ra
-/* 8D7324 80241524 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8D7328 80241528 00000000 */  nop       
-/* 8D732C 8024152C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s
deleted file mode 100644
index e6a170ae27..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240304_8D87D4
-/* 8D87D4 80240304 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8D87D8 80240308 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8D87DC 8024030C 0080882D */  daddu     $s1, $a0, $zero
-/* 8D87E0 80240310 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8D87E4 80240314 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8D87E8 80240318 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8D87EC 8024031C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8D87F0 80240320 8E30000C */  lw        $s0, 0xc($s1)
-/* 8D87F4 80240324 8E050000 */  lw        $a1, ($s0)
-/* 8D87F8 80240328 0C0B1EAF */  jal       get_variable
-/* 8D87FC 8024032C 26100004 */   addiu    $s0, $s0, 4
-/* 8D8800 80240330 8E050000 */  lw        $a1, ($s0)
-/* 8D8804 80240334 26100004 */  addiu     $s0, $s0, 4
-/* 8D8808 80240338 0220202D */  daddu     $a0, $s1, $zero
-/* 8D880C 8024033C 0C0B1EAF */  jal       get_variable
-/* 8D8810 80240340 0040982D */   daddu    $s3, $v0, $zero
-/* 8D8814 80240344 8E050000 */  lw        $a1, ($s0)
-/* 8D8818 80240348 26100004 */  addiu     $s0, $s0, 4
-/* 8D881C 8024034C 0220202D */  daddu     $a0, $s1, $zero
-/* 8D8820 80240350 0C0B1EAF */  jal       get_variable
-/* 8D8824 80240354 0040902D */   daddu    $s2, $v0, $zero
-/* 8D8828 80240358 0220202D */  daddu     $a0, $s1, $zero
-/* 8D882C 8024035C 8E050000 */  lw        $a1, ($s0)
-/* 8D8830 80240360 0C0B1EAF */  jal       get_variable
-/* 8D8834 80240364 0040882D */   daddu    $s1, $v0, $zero
-/* 8D8838 80240368 0260202D */  daddu     $a0, $s3, $zero
-/* 8D883C 8024036C 0C04417A */  jal       get_entity_by_index
-/* 8D8840 80240370 0040802D */   daddu    $s0, $v0, $zero
-/* 8D8844 80240374 0040182D */  daddu     $v1, $v0, $zero
-/* 8D8848 80240378 44920000 */  mtc1      $s2, $f0
-/* 8D884C 8024037C 00000000 */  nop       
-/* 8D8850 80240380 46800020 */  cvt.s.w   $f0, $f0
-/* 8D8854 80240384 E4600048 */  swc1      $f0, 0x48($v1)
-/* 8D8858 80240388 44910000 */  mtc1      $s1, $f0
-/* 8D885C 8024038C 00000000 */  nop       
-/* 8D8860 80240390 46800020 */  cvt.s.w   $f0, $f0
-/* 8D8864 80240394 E460004C */  swc1      $f0, 0x4c($v1)
-/* 8D8868 80240398 44900000 */  mtc1      $s0, $f0
-/* 8D886C 8024039C 00000000 */  nop       
-/* 8D8870 802403A0 46800020 */  cvt.s.w   $f0, $f0
-/* 8D8874 802403A4 E4600050 */  swc1      $f0, 0x50($v1)
-/* 8D8878 802403A8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8D887C 802403AC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8D8880 802403B0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8D8884 802403B4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8D8888 802403B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8D888C 802403BC 24020002 */  addiu     $v0, $zero, 2
-/* 8D8890 802403C0 03E00008 */  jr        $ra
-/* 8D8894 802403C4 27BD0028 */   addiu    $sp, $sp, 0x28
-/* 8D8898 802403C8 00000000 */  nop       
-/* 8D889C 802403CC 00000000 */  nop       
diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c
index fa5c2991fd..f093d21cf2 100644
--- a/src/world/area_kmr/kmr_04/8CA960.c
+++ b/src/world/area_kmr/kmr_04/8CA960.c
@@ -10,6 +10,14 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240434_8CAD34);
+ApiStatus func_80240434_8CAD34(ScriptInstance* script, s32 isInitialCall) {
+    gPlayerData.hammerLevel = 0;
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240444_8CAD44);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240444_8CAD44(ScriptInstance* script, s32 isInitialCall) {
+    func_8010FD68(get_entity_by_index(script->varTable[0]));
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_05/8CF570.c b/src/world/area_kmr/kmr_05/8CF570.c
index 40108e0814..918928f1c1 100644
--- a/src/world/area_kmr/kmr_05/8CF570.c
+++ b/src/world/area_kmr/kmr_05/8CF570.c
@@ -2,5 +2,12 @@
 
 #include "world/common/SomeMatrixOperations.inc.c"
 
+ApiStatus func_8024173C_8CF7AC(ScriptInstance* script, s32 isInitialCall) {
+    if (get_enemy_safe(6) == NULL) {
+        script->varTable[0] = FALSE;
+    } else {
+        script->varTable[0] = TRUE;
+    }
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C_8CF7AC);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c
index a143535e33..e16bb442c4 100644
--- a/src/world/area_kmr/kmr_06/8D2A10.c
+++ b/src/world/area_kmr/kmr_06/8D2A10.c
@@ -14,4 +14,21 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241A68_8D2F78);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78_8D3188);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241CC8_8D31D8);
+ApiStatus func_80241CC8_8D31D8(ScriptInstance* script, s32 isInitialCall) {
+    // todo use correct types
+    s32* mapVar10 = get_variable(script, SI_MAP_VAR(10));
+    s32 mapVar11 = get_variable(script, SI_MAP_VAR(11));
+    s32 mapVar12 = get_variable(script, SI_MAP_VAR(12));
+
+    func_801235C0(mapVar10[1]);
+
+    heap_free(mapVar10);
+    heap_free(mapVar11);
+    heap_free(mapVar12);
+
+    set_variable(script, SI_MAP_VAR(10), 0);
+    set_variable(script, SI_MAP_VAR(11), 0);
+    set_variable(script, SI_MAP_VAR(12), 0);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c
index e72deb901d..485dac7e92 100644
--- a/src/world/area_kmr/kmr_09/8D5E00.c
+++ b/src/world/area_kmr/kmr_09/8D5E00.c
@@ -22,4 +22,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802411E8_8D6FE8);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_8024130C_8D710C);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802414F8_8D72F8);
+ApiStatus func_802414F8_8D72F8(ScriptInstance* script, s32 isInitialCall) {
+    script->varTable[0] = get_enemy_safe(2);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index c9559e5a2a..b6fe6e8913 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -10,4 +10,17 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240304_8D87D4);
+ApiStatus func_80240304_8D87D4(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 entityIndex = get_variable(script, *args++);
+    s32 x = get_variable(script, *args++);
+    s32 y = get_variable(script, *args++);
+    s32 z = get_variable(script, *args++);
+    Entity* entity = get_entity_by_index(entityIndex);
+
+    entity->position.x = x;
+    entity->position.y = y;
+    entity->position.z = z;
+
+    return ApiStatus_DONE2;
+}
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index 535099ac83..e514193529 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -564,6 +564,7 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 gEffectTable = 0x8007F214;
+gItemTable = 0x800878E0; // size: 0x2D80
 gAreas = 0x800934F0;
 gCurrentEncounter = 0x800B0F10; // size:0xB0
 gBattleState = 0x800DC068;

From d55b0888a1c6c042ecd3f697a20ed3011cc15b3c Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 15:22:54 -0500
Subject: [PATCH 093/101] gItemTable offsets

---
 .../code_135EE0/pause_badges_comparator.s     |  8 +-
 .../code_135EE0/pause_badges_try_equip.s      |  4 +-
 asm/nonmatchings/code_18C790/func_8025E190.s  |  8 +-
 asm/nonmatchings/code_18F340/func_80260E90.s  |  4 +-
 asm/nonmatchings/code_18F340/func_80261064.s  |  4 +-
 asm/nonmatchings/code_18F340/func_802611E8.s  |  4 +-
 .../code_415D90/update_partner_menu.s         |  4 +-
 .../code_415D90/update_player_menu.s          | 12 +--
 .../code_80850_len_3060/is_ability_active.s   |  4 +-
 .../code_b72b0_len_15ed0/func_80133A94.s      |  4 +-
 .../code_b72b0_len_15ed0/func_801363A0.s      |  8 +-
 .../code_b72b0_len_15ed0/func_8013673C.s      |  4 +-
 .../update_item_entity_temp.s                 | 16 ++--
 .../code_ebd0_len_6a0/func_80033BC0.s         | 52 +++++-----
 .../code_f270_len_1190/func_80034C3C.s        | 88 ++++++++---------
 .../hos_06/A397F0/func_80240AD0_A39FB0.s      |  4 +-
 .../mac_01/8017D0/func_8024522C_805AAC.s      |  4 +-
 .../nok_02/9DA8F0/func_802442E0_9DB300.s      |  4 +-
 .../world/world/load_map_by_IDs.s             | 96 +++++++++----------
 tools/symbol_addrs.txt                        |  2 +-
 20 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/asm/nonmatchings/code_135EE0/pause_badges_comparator.s b/asm/nonmatchings/code_135EE0/pause_badges_comparator.s
index af6a222628..71523184a5 100644
--- a/asm/nonmatchings/code_135EE0/pause_badges_comparator.s
+++ b/asm/nonmatchings/code_135EE0/pause_badges_comparator.s
@@ -8,9 +8,9 @@ glabel pause_badges_comparator
 /* 13A32C 80246FEC 08091C00 */  j         .L80247000
 /* 13A330 80246FF0 24037FFF */   addiu    $v1, $zero, 0x7fff
 .L80246FF4:
-/* 13A334 80246FF4 3C038008 */  lui       $v1, 0x8008
+/* 13A334 80246FF4 3C038008 */  lui       $v1, %hi(gItemTable+0x6)
 /* 13A338 80246FF8 00621821 */  addu      $v1, $v1, $v0
-/* 13A33C 80246FFC 946378E6 */  lhu       $v1, 0x78e6($v1)
+/* 13A33C 80246FFC 946378E6 */  lhu       $v1, %lo(gItemTable+0x6)($v1)
 .L80247000:
 /* 13A340 80247000 84A20000 */  lh        $v0, ($a1)
 /* 13A344 80247004 14400003 */  bnez      $v0, .L80247014
@@ -18,9 +18,9 @@ glabel pause_badges_comparator
 /* 13A34C 8024700C 08091C08 */  j         .L80247020
 /* 13A350 80247010 24047FFF */   addiu    $a0, $zero, 0x7fff
 .L80247014:
-/* 13A354 80247014 3C048008 */  lui       $a0, 0x8008
+/* 13A354 80247014 3C048008 */  lui       $a0, %hi(gItemTable+0x6)
 /* 13A358 80247018 00822021 */  addu      $a0, $a0, $v0
-/* 13A35C 8024701C 948478E6 */  lhu       $a0, 0x78e6($a0)
+/* 13A35C 8024701C 948478E6 */  lhu       $a0, %lo(gItemTable+0x6)($a0)
 .L80247020:
 /* 13A360 80247020 00031400 */  sll       $v0, $v1, 0x10
 /* 13A364 80247024 00021C03 */  sra       $v1, $v0, 0x10
diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s b/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s
index fc676a9918..09ccf5cca0 100644
--- a/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s
+++ b/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s
@@ -41,9 +41,9 @@ glabel pause_badges_try_equip
 /* 13A6FC 802473BC 00021403 */  sra       $v0, $v0, 0x10
 /* 13A700 802473C0 10400013 */  beqz      $v0, .L80247410
 /* 13A704 802473C4 00021140 */   sll      $v0, $v0, 5
-/* 13A708 802473C8 3C038008 */  lui       $v1, 0x8008
+/* 13A708 802473C8 3C038008 */  lui       $v1, %hi(gItemTable+0x1A)
 /* 13A70C 802473CC 00621821 */  addu      $v1, $v1, $v0
-/* 13A710 802473D0 906378FA */  lbu       $v1, 0x78fa($v1)
+/* 13A710 802473D0 906378FA */  lbu       $v1, %lo(gItemTable+0x1A)($v1)
 /* 13A714 802473D4 00031080 */  sll       $v0, $v1, 2
 /* 13A718 802473D8 00431021 */  addu      $v0, $v0, $v1
 /* 13A71C 802473DC 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s
index 25536adca0..b9ce87826e 100644
--- a/asm/nonmatchings/code_18C790/func_8025E190.s
+++ b/asm/nonmatchings/code_18C790/func_8025E190.s
@@ -816,8 +816,8 @@ glabel func_8025E190
 /* 18D6C4 8025EDE4 2404000C */   addiu    $a0, $zero, 0xc
 /* 18D6C8 8025EDE8 1040001B */  beqz      $v0, .L8025EE58
 /* 18D6CC 8025EDEC 00000000 */   nop      
-/* 18D6D0 8025EDF0 3C028009 */  lui       $v0, 0x8009
-/* 18D6D4 8025EDF4 844297E4 */  lh        $v0, -0x681c($v0)
+/* 18D6D0 8025EDF0 3C028009 */  lui       $v0, %hi(gItemTable+0x1F04)
+/* 18D6D4 8025EDF4 844297E4 */  lh        $v0, %lo(gItemTable+0x1F04)($v0)
 /* 18D6D8 8025EDF8 3C14802A */  lui       $s4, 0x802a
 /* 18D6DC 8025EDFC 8E94FAA8 */  lw        $s4, -0x558($s4)
 /* 18D6E0 8025EE00 000210C0 */  sll       $v0, $v0, 3
@@ -1062,8 +1062,8 @@ glabel func_8025E190
 /* 18DA84 8025F1A4 24040004 */   addiu    $a0, $zero, 4
 /* 18DA88 8025F1A8 1040001B */  beqz      $v0, .L8025F218
 /* 18DA8C 8025F1AC 00000000 */   nop      
-/* 18DA90 8025F1B0 3C028009 */  lui       $v0, 0x8009
-/* 18DA94 8025F1B4 844295C4 */  lh        $v0, -0x6a3c($v0)
+/* 18DA90 8025F1B0 3C028009 */  lui       $v0, %hi(gItemTable+0x1CE4)
+/* 18DA94 8025F1B4 844295C4 */  lh        $v0, %lo(gItemTable+0x1CE4)($v0)
 /* 18DA98 8025F1B8 3C14802A */  lui       $s4, 0x802a
 /* 18DA9C 8025F1BC 8E94FAC4 */  lw        $s4, -0x53c($s4)
 /* 18DAA0 8025F1C0 000210C0 */  sll       $v0, $v0, 3
diff --git a/asm/nonmatchings/code_18F340/func_80260E90.s b/asm/nonmatchings/code_18F340/func_80260E90.s
index 83d0f9b1fd..91972974b5 100644
--- a/asm/nonmatchings/code_18F340/func_80260E90.s
+++ b/asm/nonmatchings/code_18F340/func_80260E90.s
@@ -23,9 +23,9 @@ glabel func_80260E90
 /* 18F7B8 80260ED8 8442017A */  lh        $v0, 0x17a($v0)
 /* 18F7BC 80260EDC 0260202D */  daddu     $a0, $s3, $zero
 /* 18F7C0 80260EE0 00021140 */  sll       $v0, $v0, 5
-/* 18F7C4 80260EE4 3C128008 */  lui       $s2, 0x8008
+/* 18F7C4 80260EE4 3C128008 */  lui       $s2, %hi(gItemTable+0xC)
 /* 18F7C8 80260EE8 02429021 */  addu      $s2, $s2, $v0
-/* 18F7CC 80260EEC 865278EC */  lh        $s2, 0x78ec($s2)
+/* 18F7CC 80260EEC 865278EC */  lh        $s2, %lo(gItemTable+0xC)($s2)
 /* 18F7D0 80260EF0 92620191 */  lbu       $v0, 0x191($s3)
 /* 18F7D4 80260EF4 C6620148 */  lwc1      $f2, 0x148($s3)
 /* 18F7D8 80260EF8 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/code_18F340/func_80261064.s b/asm/nonmatchings/code_18F340/func_80261064.s
index 49745bae6e..4fa77ee069 100644
--- a/asm/nonmatchings/code_18F340/func_80261064.s
+++ b/asm/nonmatchings/code_18F340/func_80261064.s
@@ -10,9 +10,9 @@ glabel func_80261064
 /* 18F958 80261078 8462017A */  lh        $v0, 0x17a($v1)
 /* 18F95C 8026107C 8C6400D8 */  lw        $a0, 0xd8($v1)
 /* 18F960 80261080 00021140 */  sll       $v0, $v0, 5
-/* 18F964 80261084 3C108008 */  lui       $s0, 0x8008
+/* 18F964 80261084 3C108008 */  lui       $s0, %hi(gItemTable+0xC)
 /* 18F968 80261088 02028021 */  addu      $s0, $s0, $v0
-/* 18F96C 8026108C 861078EC */  lh        $s0, 0x78ec($s0)
+/* 18F96C 8026108C 861078EC */  lh        $s0, %lo(gItemTable+0xC)($s0)
 /* 18F970 80261090 0C099CAB */  jal       heroes_is_ability_active
 /* 18F974 80261094 2405001D */   addiu    $a1, $zero, 0x1d
 /* 18F978 80261098 10400007 */  beqz      $v0, .L802610B8
diff --git a/asm/nonmatchings/code_18F340/func_802611E8.s b/asm/nonmatchings/code_18F340/func_802611E8.s
index bd5d756376..b77b1b717e 100644
--- a/asm/nonmatchings/code_18F340/func_802611E8.s
+++ b/asm/nonmatchings/code_18F340/func_802611E8.s
@@ -8,8 +8,8 @@ glabel func_802611E8
 /* 18FAD4 802611F4 3C048011 */  lui       $a0, %hi(gPlayerData)
 /* 18FAD8 802611F8 2484F290 */  addiu     $a0, $a0, %lo(gPlayerData)
 /* 18FADC 802611FC AFB10014 */  sw        $s1, 0x14($sp)
-/* 18FAE0 80261200 3C118009 */  lui       $s1, 0x8009
-/* 18FAE4 80261204 26318B80 */  addiu     $s1, $s1, -0x7480
+/* 18FAE0 80261200 3C118009 */  lui       $s1, %hi(gItemTable+0x12A0)
+/* 18FAE4 80261204 26318B80 */  addiu     $s1, $s1, %lo(gItemTable+0x12A0)
 /* 18FAE8 80261208 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 18FAEC 8026120C AFB00010 */  sw        $s0, 0x10($sp)
 /* 18FAF0 80261210 90820002 */  lbu       $v0, 2($a0)
diff --git a/asm/nonmatchings/code_415D90/update_partner_menu.s b/asm/nonmatchings/code_415D90/update_partner_menu.s
index 130efaf459..2632ee7d7c 100644
--- a/asm/nonmatchings/code_415D90/update_partner_menu.s
+++ b/asm/nonmatchings/code_415D90/update_partner_menu.s
@@ -881,9 +881,9 @@ glabel update_partner_menu
 /* 41DC4C 802A8EBC A682017A */  sh        $v0, 0x17a($s4)
 /* 41DC50 802A8EC0 00021400 */  sll       $v0, $v0, 0x10
 /* 41DC54 802A8EC4 000212C3 */  sra       $v0, $v0, 0xb
-/* 41DC58 802A8EC8 3C038008 */  lui       $v1, 0x8008
+/* 41DC58 802A8EC8 3C038008 */  lui       $v1, %hi(gItemTable+0x8)
 /* 41DC5C 802A8ECC 00621821 */  addu      $v1, $v1, $v0
-/* 41DC60 802A8ED0 8C6378E8 */  lw        $v1, 0x78e8($v1)
+/* 41DC60 802A8ED0 8C6378E8 */  lw        $v1, %lo(gItemTable+0x8)($v1)
 /* 41DC64 802A8ED4 9242032D */  lbu       $v0, 0x32d($s2)
 /* 41DC68 802A8ED8 AE800188 */  sw        $zero, 0x188($s4)
 /* 41DC6C 802A8EDC 2442FFFF */  addiu     $v0, $v0, -1
diff --git a/asm/nonmatchings/code_415D90/update_player_menu.s b/asm/nonmatchings/code_415D90/update_player_menu.s
index 8400f7b653..354b17aef3 100644
--- a/asm/nonmatchings/code_415D90/update_player_menu.s
+++ b/asm/nonmatchings/code_415D90/update_player_menu.s
@@ -1524,9 +1524,9 @@ glabel update_player_menu
 /* 41BD14 802A6F84 A6C2017A */  sh        $v0, 0x17a($s6)
 /* 41BD18 802A6F88 00021400 */  sll       $v0, $v0, 0x10
 /* 41BD1C 802A6F8C 000212C3 */  sra       $v0, $v0, 0xb
-/* 41BD20 802A6F90 3C038008 */  lui       $v1, 0x8008
+/* 41BD20 802A6F90 3C038008 */  lui       $v1, %hi(gItemTable+0x8)
 /* 41BD24 802A6F94 00621821 */  addu      $v1, $v1, $v0
-/* 41BD28 802A6F98 8C6378E8 */  lw        $v1, 0x78e8($v1)
+/* 41BD28 802A6F98 8C6378E8 */  lw        $v1, %lo(gItemTable+0x8)($v1)
 /* 41BD2C 802A6F9C 3C02802B */  lui       $v0, 0x802b
 /* 41BD30 802A6FA0 9042CFFD */  lbu       $v0, -0x3003($v0)
 /* 41BD34 802A6FA4 AEC00188 */  sw        $zero, 0x188($s6)
@@ -1698,9 +1698,9 @@ glabel update_player_menu
 /* 41BFAC 802A721C 24030034 */  addiu     $v1, $zero, 0x34
 /* 41BFB0 802A7220 A6C3017C */  sh        $v1, 0x17c($s6)
 /* 41BFB4 802A7224 00021140 */  sll       $v0, $v0, 5
-/* 41BFB8 802A7228 3C038008 */  lui       $v1, 0x8008
+/* 41BFB8 802A7228 3C038008 */  lui       $v1, %hi(gItemTable+0x8)
 /* 41BFBC 802A722C 00621821 */  addu      $v1, $v1, $v0
-/* 41BFC0 802A7230 8C6378E8 */  lw        $v1, 0x78e8($v1)
+/* 41BFC0 802A7230 8C6378E8 */  lw        $v1, %lo(gItemTable+0x8)($v1)
 /* 41BFC4 802A7234 3C02802B */  lui       $v0, 0x802b
 /* 41BFC8 802A7238 9042CFFD */  lbu       $v0, -0x3003($v0)
 /* 41BFCC 802A723C AEC00188 */  sw        $zero, 0x188($s6)
@@ -2116,9 +2116,9 @@ glabel update_player_menu
 /* 41C5DC 802A784C A6C2017A */  sh        $v0, 0x17a($s6)
 /* 41C5E0 802A7850 00021400 */  sll       $v0, $v0, 0x10
 /* 41C5E4 802A7854 000212C3 */  sra       $v0, $v0, 0xb
-/* 41C5E8 802A7858 3C038008 */  lui       $v1, 0x8008
+/* 41C5E8 802A7858 3C038008 */  lui       $v1, %hi(gItemTable+0x8)
 /* 41C5EC 802A785C 00621821 */  addu      $v1, $v1, $v0
-/* 41C5F0 802A7860 8C6378E8 */  lw        $v1, 0x78e8($v1)
+/* 41C5F0 802A7860 8C6378E8 */  lw        $v1, %lo(gItemTable+0x8)($v1)
 /* 41C5F4 802A7864 3C02802B */  lui       $v0, 0x802b
 /* 41C5F8 802A7868 9042CFFD */  lbu       $v0, -0x3003($v0)
 /* 41C5FC 802A786C AEC00188 */  sw        $zero, 0x188($s6)
diff --git a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s
index c7c3a412d7..0fb8cd2082 100644
--- a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s
+++ b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s
@@ -36,9 +36,9 @@ glabel is_ability_active
 /* 8326C 800E9DBC 84430208 */  lh        $v1, 0x208($v0)
 /* 83270 800E9DC0 10600004 */  beqz      $v1, .L800E9DD4
 /* 83274 800E9DC4 00031140 */   sll      $v0, $v1, 5
-/* 83278 800E9DC8 3C038008 */  lui       $v1, 0x8008
+/* 83278 800E9DC8 3C038008 */  lui       $v1, %hi(gItemTable+0x1A)
 /* 8327C 800E9DCC 00621821 */  addu      $v1, $v1, $v0
-/* 83280 800E9DD0 906378FA */  lbu       $v1, 0x78fa($v1)
+/* 83280 800E9DD0 906378FA */  lbu       $v1, %lo(gItemTable+0x1A)($v1)
 .L800E9DD4:
 /* 83284 800E9DD4 2D220038 */  sltiu     $v0, $t1, 0x38
 /* 83288 800E9DD8 504000A9 */  beql      $v0, $zero, .L800EA080
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s
index 11b9bc03b0..088737167b 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s
@@ -17,9 +17,9 @@ glabel func_80133A94
 /* CA1C4 80133AC4 34424000 */  ori       $v0, $v0, 0x4000
 /* CA1C8 80133AC8 00431824 */  and       $v1, $v0, $v1
 /* CA1CC 80133ACC AC830000 */  sw        $v1, ($a0)
-/* CA1D0 80133AD0 3C028008 */  lui       $v0, 0x8008
+/* CA1D0 80133AD0 3C028008 */  lui       $v0, %hi(gItemTable+0x18)
 /* CA1D4 80133AD4 00451021 */  addu      $v0, $v0, $a1
-/* CA1D8 80133AD8 944278F8 */  lhu       $v0, 0x78f8($v0)
+/* CA1D8 80133AD8 944278F8 */  lhu       $v0, %lo(gItemTable+0x18)($v0)
 /* CA1DC 80133ADC 30421000 */  andi      $v0, $v0, 0x1000
 /* CA1E0 80133AE0 10400005 */  beqz      $v0, .L80133AF8
 /* CA1E4 80133AE4 3C020004 */   lui      $v0, 4
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s
index d73bf04627..797379ba6d 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s
@@ -69,9 +69,9 @@ glabel func_801363A0
 /* CCB84 80136484 0000282D */   daddu    $a1, $zero, $zero
 /* CCB88 80136488 86840018 */  lh        $a0, 0x18($s4)
 /* CCB8C 8013648C 00041140 */  sll       $v0, $a0, 5
-/* CCB90 80136490 3C038008 */  lui       $v1, 0x8008
+/* CCB90 80136490 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CCB94 80136494 00621821 */  addu      $v1, $v1, $v0
-/* CCB98 80136498 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CCB98 80136498 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CCB9C 8013649C 30620008 */  andi      $v0, $v1, 8
 /* CCBA0 801364A0 5440000F */  bnel      $v0, $zero, .L801364E0
 /* CCBA4 801364A4 0240202D */   daddu    $a0, $s2, $zero
@@ -160,9 +160,9 @@ glabel func_801363A0
 .L801365C8:
 /* CCCC8 801365C8 86840018 */  lh        $a0, 0x18($s4)
 /* CCCCC 801365CC 00041140 */  sll       $v0, $a0, 5
-/* CCCD0 801365D0 3C038008 */  lui       $v1, 0x8008
+/* CCCD0 801365D0 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CCCD4 801365D4 00621821 */  addu      $v1, $v1, $v0
-/* CCCD8 801365D8 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CCCD8 801365D8 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CCCDC 801365DC 2404000C */  addiu     $a0, $zero, 0xc
 /* CCCE0 801365E0 0220282D */  daddu     $a1, $s1, $zero
 /* CCCE4 801365E4 24C6FFE8 */  addiu     $a2, $a2, -0x18
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s
index 04bd6932e8..4a400b5825 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s
@@ -102,9 +102,9 @@ glabel func_8013673C
 /* CCF94 80136894 86250018 */  lh        $a1, 0x18($s1)
 /* CCF98 80136898 00021040 */  sll       $v0, $v0, 1
 /* CCF9C 8013689C 00051940 */  sll       $v1, $a1, 5
-/* CCFA0 801368A0 3C048008 */  lui       $a0, 0x8008
+/* CCFA0 801368A0 3C048008 */  lui       $a0, %hi(gItemTable+0x18)
 /* CCFA4 801368A4 00832021 */  addu      $a0, $a0, $v1
-/* CCFA8 801368A8 948478F8 */  lhu       $a0, 0x78f8($a0)
+/* CCFA8 801368A8 948478F8 */  lhu       $a0, %lo(gItemTable+0x18)($a0)
 /* CCFAC 801368AC 3C068015 */  lui       $a2, 0x8015
 /* CCFB0 801368B0 00C23021 */  addu      $a2, $a2, $v0
 /* CCFB4 801368B4 84C6C6E4 */  lh        $a2, -0x391c($a2)
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
index a976d26f12..69126c8956 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
@@ -97,9 +97,9 @@ glabel update_item_entity_temp
 /* CBF38 80135838 00000000 */   nop      
 /* CBF3C 8013583C 86240018 */  lh        $a0, 0x18($s1)
 /* CBF40 80135840 00041140 */  sll       $v0, $a0, 5
-/* CBF44 80135844 3C038008 */  lui       $v1, 0x8008
+/* CBF44 80135844 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CBF48 80135848 00621821 */  addu      $v1, $v1, $v0
-/* CBF4C 8013584C 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CBF4C 8013584C 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CBF50 80135850 30620040 */  andi      $v0, $v1, 0x40
 /* CBF54 80135854 10400003 */  beqz      $v0, .L80135864
 /* CBF58 80135858 30620008 */   andi     $v0, $v1, 8
@@ -310,9 +310,9 @@ glabel update_item_entity_temp
 /* CC234 80135B34 00000000 */   nop      
 /* CC238 80135B38 86240018 */  lh        $a0, 0x18($s1)
 /* CC23C 80135B3C 00041140 */  sll       $v0, $a0, 5
-/* CC240 80135B40 3C038008 */  lui       $v1, 0x8008
+/* CC240 80135B40 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CC244 80135B44 00621821 */  addu      $v1, $v1, $v0
-/* CC248 80135B48 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CC248 80135B48 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CC24C 80135B4C 30620040 */  andi      $v0, $v1, 0x40
 /* CC250 80135B50 1440000F */  bnez      $v0, .L80135B90
 /* CC254 80135B54 30620008 */   andi     $v0, $v1, 8
@@ -377,9 +377,9 @@ glabel update_item_entity_temp
 /* CC334 80135C34 00000000 */   nop      
 /* CC338 80135C38 86240018 */  lh        $a0, 0x18($s1)
 /* CC33C 80135C3C 00041140 */  sll       $v0, $a0, 5
-/* CC340 80135C40 3C038008 */  lui       $v1, 0x8008
+/* CC340 80135C40 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CC344 80135C44 00621821 */  addu      $v1, $v1, $v0
-/* CC348 80135C48 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CC348 80135C48 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CC34C 80135C4C 30620040 */  andi      $v0, $v1, 0x40
 /* CC350 80135C50 54400013 */  bnel      $v0, $zero, .L80135CA0
 /* CC354 80135C54 3C040006 */   lui      $a0, 6
@@ -413,9 +413,9 @@ glabel update_item_entity_temp
 /* CC3B8 80135CB8 24020006 */   addiu    $v0, $zero, 6
 /* CC3BC 80135CBC 86240018 */  lh        $a0, 0x18($s1)
 /* CC3C0 80135CC0 00041140 */  sll       $v0, $a0, 5
-/* CC3C4 80135CC4 3C038008 */  lui       $v1, 0x8008
+/* CC3C4 80135CC4 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* CC3C8 80135CC8 00621821 */  addu      $v1, $v1, $v0
-/* CC3CC 80135CCC 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* CC3CC 80135CCC 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* CC3D0 80135CD0 30620040 */  andi      $v0, $v1, 0x40
 /* CC3D4 80135CD4 1440000F */  bnez      $v0, .L80135D14
 /* CC3D8 80135CD8 30620008 */   andi     $v0, $v1, 8
diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
index d7331898fe..c9ec986f63 100644
--- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
+++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s
@@ -33,9 +33,9 @@ glabel func_80033BC0
 /* F030 80033C30 0C018030 */  jal       nuContRmbForceStopEnd
 /* F034 80033C34 AC820000 */   sw       $v0, ($a0)
 /* F038 80033C38 0C05260E */  jal       func_80149838
-/* F03C 80033C3C 00000000 */   nop
+/* F03C 80033C3C 00000000 */   nop      
 /* F040 80033C40 0C016AFA */  jal       get_current_map_header
-/* F044 80033C44 00000000 */   nop
+/* F044 80033C44 00000000 */   nop      
 /* F048 80033C48 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
 /* F04C 80033C4C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
 /* F050 80033C50 8E040000 */  lw        $a0, ($s0)
@@ -53,7 +53,7 @@ glabel func_80033BC0
 /* F080 80033C80 0C016BE1 */  jal       func_8005AF84
 /* F084 80033C84 A0400070 */   sb       $zero, 0x70($v0)
 /* F088 80033C88 0C00AB37 */  jal       func_8002ACDC
-/* F08C 80033C8C 00000000 */   nop
+/* F08C 80033C8C 00000000 */   nop      
 /* F090 80033C90 0C05259C */  jal       func_80149670
 /* F094 80033C94 24040001 */   addiu    $a0, $zero, 1
 /* F098 80033C98 8E030000 */  lw        $v1, ($s0)
@@ -65,37 +65,37 @@ glabel func_80033BC0
 /* F0B0 80033CB0 0C0B763E */  jal       func_802DD8F8
 /* F0B4 80033CB4 80440084 */   lb       $a0, 0x84($v0)
 /* F0B8 80033CB8 0C0457FA */  jal       init_model_data
-/* F0BC 80033CBC 00000000 */   nop
+/* F0BC 80033CBC 00000000 */   nop      
 /* F0C0 80033CC0 0C05203C */  jal       func_801480F0
-/* F0C4 80033CC4 00000000 */   nop
+/* F0C4 80033CC4 00000000 */   nop      
 /* F0C8 80033CC8 0C048316 */  jal       init_virtual_models
-/* F0CC 80033CCC 00000000 */   nop
+/* F0CC 80033CCC 00000000 */   nop      
 /* F0D0 80033CD0 0C0478C4 */  jal       func_8011E310
-/* F0D4 80033CD4 00000000 */   nop
+/* F0D4 80033CD4 00000000 */   nop      
 /* F0D8 80033CD8 0C048C45 */  jal       init_dynamic_entity_list
-/* F0DC 80033CDC 00000000 */   nop
+/* F0DC 80033CDC 00000000 */   nop      
 /* F0E0 80033CE0 0000202D */  daddu     $a0, $zero, $zero
 /* F0E4 80033CE4 0C0514BA */  jal       func_801452E8
 /* F0E8 80033CE8 0080282D */   daddu    $a1, $a0, $zero
 /* F0EC 80033CEC 0C0504C0 */  jal       init_menu_icon_list
-/* F0F0 80033CF0 00000000 */   nop
+/* F0F0 80033CF0 00000000 */   nop      
 /* F0F4 80033CF4 0C04C433 */  jal       init_item_entity_list
-/* F0F8 80033CF8 00000000 */   nop
+/* F0F8 80033CF8 00000000 */   nop      
 /* F0FC 80033CFC 0C0B0CBB */  jal       init_script_list
-/* F100 80033D00 00000000 */   nop
+/* F100 80033D00 00000000 */   nop      
 /* F104 80033D04 0C00E14B */  jal       init_npc_list
-/* F108 80033D08 00000000 */   nop
+/* F108 80033D08 00000000 */   nop      
 /* F10C 80033D0C 0C044396 */  jal       func_80110E58
-/* F110 80033D10 00000000 */   nop
+/* F110 80033D10 00000000 */   nop      
 /* F114 80033D14 0C0515CA */  jal       init_trigger_list
-/* F118 80033D18 00000000 */   nop
+/* F118 80033D18 00000000 */   nop      
 /* F11C 80033D1C 8E020000 */  lw        $v0, ($s0)
 /* F120 80033D20 904200AA */  lbu       $v0, 0xaa($v0)
 /* F124 80033D24 30420001 */  andi      $v0, $v0, 1
 /* F128 80033D28 10400008 */  beqz      $v0, .L80033D4C
-/* F12C 80033D2C 00000000 */   nop
+/* F12C 80033D2C 00000000 */   nop      
 /* F130 80033D30 0C00EC6C */  jal       func_8003B1B0
-/* F134 80033D34 00000000 */   nop
+/* F134 80033D34 00000000 */   nop      
 /* F138 80033D38 3C02800A */  lui       $v0, 0x800a
 /* F13C 80033D3C 8C420904 */  lw        $v0, 0x904($v0)
 /* F140 80033D40 24040011 */  addiu     $a0, $zero, 0x11
@@ -107,7 +107,7 @@ glabel func_80033BC0
 /* F154 80033D54 0C03AC80 */  jal       func_800EB200
 /* F158 80033D58 80440012 */   lb       $a0, 0x12($v0)
 /* F15C 80033D5C 0C0169B0 */  jal       load_world_script_api
-/* F160 80033D60 00000000 */   nop
+/* F160 80033D60 00000000 */   nop      
 /* F164 80033D64 3C04800E */  lui       $a0, 0x800e
 /* F168 80033D68 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* F16C 80033D6C 0C016B3A */  jal       load_asset_by_name
@@ -120,12 +120,12 @@ glabel func_80033BC0
 /* F188 80033D88 0C00AB1E */  jal       general_heap_free
 /* F18C 80033D8C 0200202D */   daddu    $a0, $s0, $zero
 /* F190 80033D90 0C016BE5 */  jal       initialize_collision
-/* F194 80033D94 00000000 */   nop
+/* F194 80033D94 00000000 */   nop      
 /* F198 80033D98 0C016C16 */  jal       load_collision
-/* F19C 80033D9C 00000000 */   nop
+/* F19C 80033D9C 00000000 */   nop      
 /* F1A0 80033DA0 8E240008 */  lw        $a0, 8($s1)
 /* F1A4 80033DA4 10800004 */  beqz      $a0, .L80033DB8
-/* F1A8 80033DA8 00000000 */   nop
+/* F1A8 80033DA8 00000000 */   nop      
 /* F1AC 80033DAC 8E25000C */  lw        $a1, 0xc($s1)
 /* F1B0 80033DB0 0C00A5CF */  jal       dma_copy
 /* F1B4 80033DB4 8E260010 */   lw       $a2, 0x10($s1)
@@ -136,9 +136,9 @@ glabel func_80033BC0
 /* F1C4 80033DC4 50800005 */  beql      $a0, $zero, .L80033DDC
 /* F1C8 80033DC8 24040128 */   addiu    $a0, $zero, 0x128
 /* F1CC 80033DCC 0C05178A */  jal       read_background_size
-/* F1D0 80033DD0 00000000 */   nop
+/* F1D0 80033DD0 00000000 */   nop      
 /* F1D4 80033DD4 0800CF7B */  j         .L80033DEC
-/* F1D8 80033DD8 00000000 */   nop
+/* F1D8 80033DD8 00000000 */   nop      
 .L80033DDC:
 /* F1DC 80033DDC 240500C8 */  addiu     $a1, $zero, 0xc8
 /* F1E0 80033DE0 2406000C */  addiu     $a2, $zero, 0xc
@@ -154,9 +154,9 @@ glabel func_80033BC0
 /* F204 80033E04 0C045709 */  jal       load_model_textures
 /* F208 80033E08 0040282D */   daddu    $a1, $v0, $zero
 /* F20C 80033E0C 0C04584B */  jal       calculate_model_sizes
-/* F210 80033E10 00000000 */   nop
+/* F210 80033E10 00000000 */   nop      
 /* F214 80033E14 0C00EC6C */  jal       func_8003B1B0
-/* F218 80033E18 00000000 */   nop
+/* F218 80033E18 00000000 */   nop      
 /* F21C 80033E1C 3C02800A */  lui       $v0, 0x800a
 /* F220 80033E20 8C420904 */  lw        $v0, 0x904($v0)
 /* F224 80033E24 3C04800A */  lui       $a0, 0x800a
@@ -164,12 +164,12 @@ glabel func_80033BC0
 /* F22C 80033E2C 10800003 */  beqz      $a0, .L80033E3C
 /* F230 80033E30 AE620004 */   sw       $v0, 4($s3)
 /* F234 80033E34 0C009C22 */  jal       func_80027088
-/* F238 80033E38 00000000 */   nop
+/* F238 80033E38 00000000 */   nop      
 .L80033E3C:
 /* F23C 80033E3C 24040004 */  addiu     $a0, $zero, 4
 .L80033E40:
 /* F240 80033E40 0C00CD3C */  jal       set_game_mode
-/* F244 80033E44 00000000 */   nop
+/* F244 80033E44 00000000 */   nop      
 .L80033E48:
 /* F248 80033E48 8FBF0028 */  lw        $ra, 0x28($sp)
 /* F24C 80033E4C 8FB30024 */  lw        $s3, 0x24($sp)
diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
index 75b1db7e46..61f3fe0a2d 100644
--- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
+++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s
@@ -17,19 +17,19 @@ glabel func_80034C3C
 /* 1006C 80034C6C 28620002 */   slti     $v0, $v1, 2
 /* 10070 80034C70 24020004 */  addiu     $v0, $zero, 4
 /* 10074 80034C74 106200CA */  beq       $v1, $v0, .L80034FA0
-/* 10078 80034C78 00000000 */   nop
+/* 10078 80034C78 00000000 */   nop      
 /* 1007C 80034C7C 0800D3F6 */  j         .L80034FD8
-/* 10080 80034C80 00000000 */   nop
+/* 10080 80034C80 00000000 */   nop      
 .L80034C84:
 /* 10084 80034C84 104000D4 */  beqz      $v0, .L80034FD8
-/* 10088 80034C88 00000000 */   nop
+/* 10088 80034C88 00000000 */   nop      
 /* 1008C 80034C8C 046000D2 */  bltz      $v1, .L80034FD8
 /* 10090 80034C90 24020004 */   addiu    $v0, $zero, 4
 /* 10094 80034C94 3C06800A */  lui       $a2, 0x800a
 /* 10098 80034C98 24C60920 */  addiu     $a2, $a2, 0x920
 /* 1009C 80034C9C 80C30000 */  lb        $v1, ($a2)
 /* 100A0 80034CA0 14620007 */  bne       $v1, $v0, .L80034CC0
-/* 100A4 80034CA4 00000000 */   nop
+/* 100A4 80034CA4 00000000 */   nop      
 /* 100A8 80034CA8 3C03800A */  lui       $v1, %hi(D_8009A650)
 /* 100AC 80034CAC 2463A650 */  addiu     $v1, $v1, %lo(D_8009A650)
 /* 100B0 80034CB0 8C620000 */  lw        $v0, ($v1)
@@ -44,7 +44,7 @@ glabel func_80034C3C
 /* 100D0 80034CD0 A0C20000 */  sb        $v0, ($a2)
 /* 100D4 80034CD4 00021600 */  sll       $v0, $v0, 0x18
 /* 100D8 80034CD8 144000BF */  bnez      $v0, .L80034FD8
-/* 100DC 80034CDC 00000000 */   nop
+/* 100DC 80034CDC 00000000 */   nop      
 .L80034CE0:
 /* 100E0 80034CE0 3C048007 */  lui       $a0, 0x8007
 /* 100E4 80034CE4 24847950 */  addiu     $a0, $a0, 0x7950
@@ -53,7 +53,7 @@ glabel func_80034C3C
 /* 100F0 80034CF0 0C017CBC */  jal       nuGfxSetCfb
 /* 100F4 80034CF4 A0C20000 */   sb       $v0, ($a2)
 /* 100F8 80034CF8 0C0911C2 */  jal       pause_cleanup
-/* 100FC 80034CFC 00000000 */   nop
+/* 100FC 80034CFC 00000000 */   nop      
 /* 10100 80034D00 3C04800A */  lui       $a0, %hi(D_8009A650)
 /* 10104 80034D04 2484A650 */  addiu     $a0, $a0, %lo(D_8009A650)
 /* 10108 80034D08 8C820000 */  lw        $v0, ($a0)
@@ -80,47 +80,47 @@ glabel func_80034C3C
 /* 1015C 80034D5C 0C016BE1 */  jal       func_8005AF84
 /* 10160 80034D60 A4A30148 */   sh       $v1, 0x148($a1)
 /* 10164 80034D64 0C00AB37 */  jal       func_8002ACDC
-/* 10168 80034D68 00000000 */   nop
+/* 10168 80034D68 00000000 */   nop      
 /* 1016C 80034D6C 0C018030 */  jal       nuContRmbForceStopEnd
-/* 10170 80034D70 00000000 */   nop
+/* 10170 80034D70 00000000 */   nop      
 /* 10174 80034D74 0C05259C */  jal       func_80149670
 /* 10178 80034D78 24040001 */   addiu    $a0, $zero, 1
 /* 1017C 80034D7C 8E020000 */  lw        $v0, ($s0)
 /* 10180 80034D80 0C0B763E */  jal       func_802DD8F8
 /* 10184 80034D84 80440084 */   lb       $a0, 0x84($v0)
 /* 10188 80034D88 0C0457FA */  jal       init_model_data
-/* 1018C 80034D8C 00000000 */   nop
+/* 1018C 80034D8C 00000000 */   nop      
 /* 10190 80034D90 0C05203C */  jal       func_801480F0
-/* 10194 80034D94 00000000 */   nop
+/* 10194 80034D94 00000000 */   nop      
 /* 10198 80034D98 0C048316 */  jal       init_virtual_models
-/* 1019C 80034D9C 00000000 */   nop
+/* 1019C 80034D9C 00000000 */   nop      
 /* 101A0 80034DA0 0C0478C4 */  jal       func_8011E310
-/* 101A4 80034DA4 00000000 */   nop
+/* 101A4 80034DA4 00000000 */   nop      
 /* 101A8 80034DA8 0C048C45 */  jal       init_dynamic_entity_list
-/* 101AC 80034DAC 00000000 */   nop
+/* 101AC 80034DAC 00000000 */   nop      
 /* 101B0 80034DB0 0000202D */  daddu     $a0, $zero, $zero
 /* 101B4 80034DB4 0C0514BA */  jal       func_801452E8
 /* 101B8 80034DB8 0080282D */   daddu    $a1, $a0, $zero
 /* 101BC 80034DBC 0C0504C0 */  jal       init_menu_icon_list
-/* 101C0 80034DC0 00000000 */   nop
+/* 101C0 80034DC0 00000000 */   nop      
 /* 101C4 80034DC4 0C04C433 */  jal       init_item_entity_list
-/* 101C8 80034DC8 00000000 */   nop
+/* 101C8 80034DC8 00000000 */   nop      
 /* 101CC 80034DCC 0C0B0CBB */  jal       init_script_list
-/* 101D0 80034DD0 00000000 */   nop
+/* 101D0 80034DD0 00000000 */   nop      
 /* 101D4 80034DD4 0C00E14B */  jal       init_npc_list
-/* 101D8 80034DD8 00000000 */   nop
+/* 101D8 80034DD8 00000000 */   nop      
 /* 101DC 80034DDC 0C044396 */  jal       func_80110E58
-/* 101E0 80034DE0 00000000 */   nop
+/* 101E0 80034DE0 00000000 */   nop      
 /* 101E4 80034DE4 0C0515CA */  jal       init_trigger_list
-/* 101E8 80034DE8 00000000 */   nop
+/* 101E8 80034DE8 00000000 */   nop      
 /* 101EC 80034DEC 3C04800A */  lui       $a0, 0x800a
 /* 101F0 80034DF0 8C840924 */  lw        $a0, 0x924($a0)
 /* 101F4 80034DF4 0C0525FF */  jal       func_801497FC
-/* 101F8 80034DF8 00000000 */   nop
+/* 101F8 80034DF8 00000000 */   nop      
 /* 101FC 80034DFC 0C052B1C */  jal       func_8014AC70
-/* 10200 80034E00 00000000 */   nop
+/* 10200 80034E00 00000000 */   nop      
 /* 10204 80034E04 0C0169B0 */  jal       load_world_script_api
-/* 10208 80034E08 00000000 */   nop
+/* 10208 80034E08 00000000 */   nop      
 /* 1020C 80034E0C 3C04800E */  lui       $a0, 0x800e
 /* 10210 80034E10 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* 10214 80034E14 0C016B3A */  jal       load_asset_by_name
@@ -133,12 +133,12 @@ glabel func_80034C3C
 /* 10230 80034E30 0C00AB1E */  jal       general_heap_free
 /* 10234 80034E34 0200202D */   daddu    $a0, $s0, $zero
 /* 10238 80034E38 0C016BE5 */  jal       initialize_collision
-/* 1023C 80034E3C 00000000 */   nop
+/* 1023C 80034E3C 00000000 */   nop      
 /* 10240 80034E40 0C016C16 */  jal       load_collision
-/* 10244 80034E44 00000000 */   nop
+/* 10244 80034E44 00000000 */   nop      
 /* 10248 80034E48 8E240008 */  lw        $a0, 8($s1)
 /* 1024C 80034E4C 10800004 */  beqz      $a0, .L80034E60
-/* 10250 80034E50 00000000 */   nop
+/* 10250 80034E50 00000000 */   nop      
 /* 10254 80034E54 8E25000C */  lw        $a1, 0xc($s1)
 /* 10258 80034E58 0C00A5CF */  jal       dma_copy
 /* 1025C 80034E5C 8E260010 */   lw       $a2, 0x10($s1)
@@ -149,9 +149,9 @@ glabel func_80034C3C
 /* 1026C 80034E6C 50800005 */  beql      $a0, $zero, .L80034E84
 /* 10270 80034E70 24040128 */   addiu    $a0, $zero, 0x128
 /* 10274 80034E74 0C05178A */  jal       read_background_size
-/* 10278 80034E78 00000000 */   nop
+/* 10278 80034E78 00000000 */   nop      
 /* 1027C 80034E7C 0800D3A5 */  j         .L80034E94
-/* 10280 80034E80 00000000 */   nop
+/* 10280 80034E80 00000000 */   nop      
 .L80034E84:
 /* 10284 80034E84 240500C8 */  addiu     $a1, $zero, 0xc8
 /* 10288 80034E88 2406000C */  addiu     $a2, $zero, 0xc
@@ -164,11 +164,11 @@ glabel func_80034C3C
 /* 102A0 80034EA0 0C04584B */  jal       calculate_model_sizes
 /* 102A4 80034EA4 A462015C */   sh       $v0, 0x15c($v1)
 /* 102A8 80034EA8 0C00EC6C */  jal       func_8003B1B0
-/* 102AC 80034EAC 00000000 */   nop
+/* 102AC 80034EAC 00000000 */   nop      
 /* 102B0 80034EB0 0C051FB1 */  jal       func_80147EC4
 /* 102B4 80034EB4 0000202D */   daddu    $a0, $zero, $zero
 /* 102B8 80034EB8 0C03A631 */  jal       func_800E98C4
-/* 102BC 80034EBC 00000000 */   nop
+/* 102BC 80034EBC 00000000 */   nop      
 /* 102C0 80034EC0 0C009C22 */  jal       func_80027088
 /* 102C4 80034EC4 24040001 */   addiu    $a0, $zero, 1
 /* 102C8 80034EC8 24020003 */  addiu     $v0, $zero, 3
@@ -185,13 +185,13 @@ glabel func_80034C3C
 /* 102F4 80034EF4 3C01802E */  lui       $at, 0x802e
 /* 102F8 80034EF8 A0239D71 */  sb        $v1, -0x628f($at)
 /* 102FC 80034EFC 0C00F949 */  jal       func_8003E524
-/* 10300 80034F00 00000000 */   nop
+/* 10300 80034F00 00000000 */   nop      
 /* 10304 80034F04 0C00E64C */  jal       update_npcs
-/* 10308 80034F08 00000000 */   nop
+/* 10308 80034F08 00000000 */   nop      
 /* 1030C 80034F0C 0C037DD0 */  jal       update_player
-/* 10310 80034F10 00000000 */   nop
+/* 10310 80034F10 00000000 */   nop      
 /* 10314 80034F14 0C016754 */  jal       func_80059D50
-/* 10318 80034F18 00000000 */   nop
+/* 10318 80034F18 00000000 */   nop      
 /* 1031C 80034F1C 3C03800A */  lui       $v1, 0x800a
 /* 10320 80034F20 24630922 */  addiu     $v1, $v1, 0x922
 /* 10324 80034F24 94620000 */  lhu       $v0, ($v1)
@@ -201,16 +201,16 @@ glabel func_80034C3C
 /* 10334 80034F34 04420028 */  bltzl     $v0, .L80034FD8
 /* 10338 80034F38 A4600000 */   sh       $zero, ($v1)
 /* 1033C 80034F3C 0800D3F6 */  j         .L80034FD8
-/* 10340 80034F40 00000000 */   nop
+/* 10340 80034F40 00000000 */   nop      
 .L80034F44:
 /* 10344 80034F44 0C00F949 */  jal       func_8003E524
-/* 10348 80034F48 00000000 */   nop
+/* 10348 80034F48 00000000 */   nop      
 /* 1034C 80034F4C 0C00E64C */  jal       update_npcs
-/* 10350 80034F50 00000000 */   nop
+/* 10350 80034F50 00000000 */   nop      
 /* 10354 80034F54 0C037DD0 */  jal       update_player
-/* 10358 80034F58 00000000 */   nop
+/* 10358 80034F58 00000000 */   nop      
 /* 1035C 80034F5C 0C016754 */  jal       func_80059D50
-/* 10360 80034F60 00000000 */   nop
+/* 10360 80034F60 00000000 */   nop      
 /* 10364 80034F64 3C04800A */  lui       $a0, 0x800a
 /* 10368 80034F68 24840922 */  addiu     $a0, $a0, 0x922
 /* 1036C 80034F6C 84820000 */  lh        $v0, ($a0)
@@ -226,20 +226,20 @@ glabel func_80034C3C
 /* 10390 80034F90 04420011 */  bltzl     $v0, .L80034FD8
 /* 10394 80034F94 A4800000 */   sh       $zero, ($a0)
 /* 10398 80034F98 0800D3F6 */  j         .L80034FD8
-/* 1039C 80034F9C 00000000 */   nop
+/* 1039C 80034F9C 00000000 */   nop      
 .L80034FA0:
 /* 103A0 80034FA0 0C009C22 */  jal       func_80027088
 /* 103A4 80034FA4 0000202D */   daddu    $a0, $zero, $zero
 /* 103A8 80034FA8 0C00F949 */  jal       func_8003E524
-/* 103AC 80034FAC 00000000 */   nop
+/* 103AC 80034FAC 00000000 */   nop      
 /* 103B0 80034FB0 0C00E64C */  jal       update_npcs
-/* 103B4 80034FB4 00000000 */   nop
+/* 103B4 80034FB4 00000000 */   nop      
 /* 103B8 80034FB8 0C037DD0 */  jal       update_player
-/* 103BC 80034FBC 00000000 */   nop
+/* 103BC 80034FBC 00000000 */   nop      
 /* 103C0 80034FC0 0C016754 */  jal       func_80059D50
-/* 103C4 80034FC4 00000000 */   nop
+/* 103C4 80034FC4 00000000 */   nop      
 /* 103C8 80034FC8 0C038069 */  jal       enable_player_input
-/* 103CC 80034FCC 00000000 */   nop
+/* 103CC 80034FCC 00000000 */   nop      
 /* 103D0 80034FD0 0C00CD3C */  jal       set_game_mode
 /* 103D4 80034FD4 24040004 */   addiu    $a0, $zero, 4
 .L80034FD8:
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
index c5ce7fa7f1..a05cb23b6f 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
@@ -130,9 +130,9 @@ glabel func_80240AD0_A39FB0
 /* A3A188 80240CA8 AE620094 */  sw        $v0, 0x94($s3)
 /* A3A18C 80240CAC 8C620000 */  lw        $v0, ($v1)
 /* A3A190 80240CB0 00021140 */  sll       $v0, $v0, 5
-/* A3A194 80240CB4 3C038008 */  lui       $v1, 0x8008
+/* A3A194 80240CB4 3C038008 */  lui       $v1, %hi(gItemTable+0x1A)
 /* A3A198 80240CB8 00621821 */  addu      $v1, $v1, $v0
-/* A3A19C 80240CBC 906378FA */  lbu       $v1, 0x78fa($v1)
+/* A3A19C 80240CBC 906378FA */  lbu       $v1, %lo(gItemTable+0x1A)($v1)
 /* A3A1A0 80240CC0 00031080 */  sll       $v0, $v1, 2
 /* A3A1A4 80240CC4 00431021 */  addu      $v0, $v0, $v1
 /* A3A1A8 80240CC8 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
index 1927b1c282..26075f11b5 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
@@ -42,8 +42,8 @@ glabel func_8024522C_805AAC
 /* 805B3C 802452BC 8FA70010 */  lw        $a3, 0x10($sp)
 /* 805B40 802452C0 54E20019 */  bnel      $a3, $v0, .L80245328
 /* 805B44 802452C4 26730001 */   addiu    $s3, $s3, 1
-/* 805B48 802452C8 3C028009 */  lui       $v0, 0x8009
-/* 805B4C 802452CC 84428364 */  lh        $v0, -0x7c9c($v0)
+/* 805B48 802452C8 3C028009 */  lui       $v0, %hi(gItemTable+0xA84)
+/* 805B4C 802452CC 84428364 */  lh        $v0, %lo(gItemTable+0xA84)($v0)
 /* 805B50 802452D0 3C078009 */  lui       $a3, 0x8009
 /* 805B54 802452D4 24E7A680 */  addiu     $a3, $a3, -0x5980
 /* 805B58 802452D8 AE330108 */  sw        $s3, 0x108($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
index 1d1ca2e1e7..399fb6bed3 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
@@ -19,9 +19,9 @@ glabel func_802442E0_9DB300
 /* 9DB338 80244318 00041140 */  sll       $v0, $a0, 5
 /* 9DB33C 8024431C 3C018025 */  lui       $at, 0x8025
 /* 9DB340 80244320 AC2429B4 */  sw        $a0, 0x29b4($at)
-/* 9DB344 80244324 3C038008 */  lui       $v1, 0x8008
+/* 9DB344 80244324 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* 9DB348 80244328 00621821 */  addu      $v1, $v1, $v0
-/* 9DB34C 8024432C 946378F8 */  lhu       $v1, 0x78f8($v1)
+/* 9DB34C 8024432C 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
 /* 9DB350 80244330 AE040088 */  sw        $a0, 0x88($s0)
 /* 9DB354 80244334 30630004 */  andi      $v1, $v1, 4
 /* 9DB358 80244338 0003182B */  sltu      $v1, $zero, $v1
diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s
index 34eb98d497..4561cc722a 100644
--- a/asm/nonmatchings/world/world/load_map_by_IDs.s
+++ b/asm/nonmatchings/world/world/load_map_by_IDs.s
@@ -32,24 +32,24 @@ glabel load_map_by_IDs
 /* 35B60 8005A760 0C047624 */  jal       func_8011D890
 /* 35B64 8005A764 00108403 */   sra      $s0, $s0, 0x10
 /* 35B68 8005A768 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35B6C 8005A76C 00000000 */   nop
+/* 35B6C 8005A76C 00000000 */   nop      
 /* 35B70 8005A770 0C0B0C77 */  jal       clear_script_list
-/* 35B74 8005A774 00000000 */   nop
+/* 35B74 8005A774 00000000 */   nop      
 /* 35B78 8005A778 12000005 */  beqz      $s0, .L8005A790
 /* 35B7C 8005A77C 24020001 */   addiu    $v0, $zero, 1
 /* 35B80 8005A780 12020008 */  beq       $s0, $v0, .L8005A7A4
-/* 35B84 8005A784 00000000 */   nop
+/* 35B84 8005A784 00000000 */   nop      
 /* 35B88 8005A788 080169F0 */  j         .L8005A7C0
-/* 35B8C 8005A78C 00000000 */   nop
+/* 35B8C 8005A78C 00000000 */   nop      
 .L8005A790:
 /* 35B90 8005A790 0C0514E4 */  jal       clear_area_flags
-/* 35B94 8005A794 00000000 */   nop
+/* 35B94 8005A794 00000000 */   nop      
 /* 35B98 8005A798 8E420000 */  lw        $v0, ($s2)
 /* 35B9C 8005A79C 080169F0 */  j         .L8005A7C0
 /* 35BA0 8005A7A0 A0400167 */   sb       $zero, 0x167($v0)
 .L8005A7A4:
 /* 35BA4 8005A7A4 0C00AD24 */  jal       fio_deserialize_state
-/* 35BA8 8005A7A8 00000000 */   nop
+/* 35BA8 8005A7A8 00000000 */   nop      
 /* 35BAC 8005A7AC 8E420000 */  lw        $v0, ($s2)
 /* 35BB0 8005A7B0 94510086 */  lhu       $s1, 0x86($v0)
 /* 35BB4 8005A7B4 9453008C */  lhu       $s3, 0x8c($v0)
@@ -93,17 +93,17 @@ glabel load_map_by_IDs
 /* 35C48 8005A848 3C01800A */  lui       $at, 0x800a
 /* 35C4C 8005A84C AC3241E0 */  sw        $s2, 0x41e0($at)
 /* 35C50 8005A850 10A00005 */  beqz      $a1, .L8005A868
-/* 35C54 8005A854 00000000 */   nop
+/* 35C54 8005A854 00000000 */   nop      
 /* 35C58 8005A858 3C04800E */  lui       $a0, 0x800e
 /* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, -0x6998
 /* 35C60 8005A860 0C01BB50 */  jal       strcpy
-/* 35C64 8005A864 00000000 */   nop
+/* 35C64 8005A864 00000000 */   nop      
 .L8005A868:
 /* 35C68 8005A868 0C0169B0 */  jal       load_world_script_api
-/* 35C6C 8005A86C 00000000 */   nop
+/* 35C6C 8005A86C 00000000 */   nop      
 /* 35C70 8005A870 8E440008 */  lw        $a0, 8($s2)
 /* 35C74 8005A874 10800004 */  beqz      $a0, .L8005A888
-/* 35C78 8005A878 00000000 */   nop
+/* 35C78 8005A878 00000000 */   nop      
 /* 35C7C 8005A87C 8E45000C */  lw        $a1, 0xc($s2)
 /* 35C80 8005A880 0C00A5CF */  jal       dma_copy
 /* 35C84 8005A884 8E460010 */   lw       $a2, 0x10($s2)
@@ -128,13 +128,13 @@ glabel load_map_by_IDs
 /* 35CC8 8005A8C8 3C13800A */  lui       $s3, 0x800a
 /* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, 0x41e8
 /* 35CD0 8005A8D0 10400004 */  beqz      $v0, .L8005A8E4
-/* 35CD4 8005A8D4 00000000 */   nop
+/* 35CD4 8005A8D4 00000000 */   nop      
 /* 35CD8 8005A8D8 0040F809 */  jalr      $v0
-/* 35CDC 8005A8DC 00000000 */   nop
+/* 35CDC 8005A8DC 00000000 */   nop      
 /* 35CE0 8005A8E0 0040A02D */  daddu     $s4, $v0, $zero
 .L8005A8E4:
 /* 35CE4 8005A8E4 16800015 */  bnez      $s4, .L8005A93C
-/* 35CE8 8005A8E8 00000000 */   nop
+/* 35CE8 8005A8E8 00000000 */   nop      
 /* 35CEC 8005A8EC 3C04800E */  lui       $a0, 0x800e
 /* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, -0x6dd0
 /* 35CF4 8005A8F4 0C016B3A */  jal       load_asset_by_name
@@ -158,78 +158,78 @@ glabel load_map_by_IDs
 .L8005A93C:
 /* 35D3C 8005A93C 8E420014 */  lw        $v0, 0x14($s2)
 /* 35D40 8005A940 10400005 */  beqz      $v0, .L8005A958
-/* 35D44 8005A944 00000000 */   nop
+/* 35D44 8005A944 00000000 */   nop      
 /* 35D48 8005A948 3C04800E */  lui       $a0, 0x800e
 /* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, -0x6998
 /* 35D50 8005A950 0C05175C */  jal       load_map_bg
-/* 35D54 8005A954 00000000 */   nop
+/* 35D54 8005A954 00000000 */   nop      
 .L8005A958:
 /* 35D58 8005A958 0C00B458 */  jal       func_8002D160
-/* 35D5C 8005A95C 00000000 */   nop
+/* 35D5C 8005A95C 00000000 */   nop      
 /* 35D60 8005A960 0C0AC81E */  jal       func_802B2078
-/* 35D64 8005A964 00000000 */   nop
+/* 35D64 8005A964 00000000 */   nop      
 /* 35D68 8005A968 0C05259C */  jal       func_80149670
 /* 35D6C 8005A96C 0000202D */   daddu    $a0, $zero, $zero
 /* 35D70 8005A970 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35D74 8005A974 00000000 */   nop
+/* 35D74 8005A974 00000000 */   nop      
 /* 35D78 8005A978 0C0B0C77 */  jal       clear_script_list
-/* 35D7C 8005A97C 00000000 */   nop
+/* 35D7C 8005A97C 00000000 */   nop      
 /* 35D80 8005A980 0C00B7BD */  jal       create_cameras_a
-/* 35D84 8005A984 00000000 */   nop
+/* 35D84 8005A984 00000000 */   nop      
 /* 35D88 8005A988 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
 /* 35D8C 8005A98C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
 /* 35D90 8005A990 8E020000 */  lw        $v0, ($s0)
 /* 35D94 8005A994 0C0B763E */  jal       func_802DD8F8
 /* 35D98 8005A998 80440084 */   lb       $a0, 0x84($v0)
 /* 35D9C 8005A99C 0C047889 */  jal       func_8011E224
-/* 35DA0 8005A9A0 00000000 */   nop
+/* 35DA0 8005A9A0 00000000 */   nop      
 /* 35DA4 8005A9A4 0C0482EC */  jal       clear_virtual_models
-/* 35DA8 8005A9A8 00000000 */   nop
+/* 35DA8 8005A9A8 00000000 */   nop      
 /* 35DAC 8005A9AC 0C00E12F */  jal       clear_npcs
-/* 35DB0 8005A9B0 00000000 */   nop
+/* 35DB0 8005A9B0 00000000 */   nop      
 /* 35DB4 8005A9B4 0C050440 */  jal       func_80141100
-/* 35DB8 8005A9B8 00000000 */   nop
+/* 35DB8 8005A9B8 00000000 */   nop      
 /* 35DBC 8005A9BC 0C0515A0 */  jal       clear_trigger_data
-/* 35DC0 8005A9C0 00000000 */   nop
+/* 35DC0 8005A9C0 00000000 */   nop      
 /* 35DC4 8005A9C4 0C045751 */  jal       clear_model_data
-/* 35DC8 8005A9C8 00000000 */   nop
+/* 35DC8 8005A9C8 00000000 */   nop      
 /* 35DCC 8005A9CC 0C052010 */  jal       func_80148040
-/* 35DD0 8005A9D0 00000000 */   nop
+/* 35DD0 8005A9D0 00000000 */   nop      
 /* 35DD4 8005A9D4 0C05177E */  jal       func_80145DF8
-/* 35DD8 8005A9D8 00000000 */   nop
+/* 35DD8 8005A9D8 00000000 */   nop      
 /* 35DDC 8005A9DC 8E020000 */  lw        $v0, ($s0)
 /* 35DE0 8005A9E0 804300A8 */  lb        $v1, 0xa8($v0)
 /* 35DE4 8005A9E4 2402FFFF */  addiu     $v0, $zero, -1
 /* 35DE8 8005A9E8 14620003 */  bne       $v1, $v0, .L8005A9F8
-/* 35DEC 8005A9EC 00000000 */   nop
+/* 35DEC 8005A9EC 00000000 */   nop      
 /* 35DF0 8005A9F0 0C04E062 */  jal       func_80138188
-/* 35DF4 8005A9F4 00000000 */   nop
+/* 35DF4 8005A9F4 00000000 */   nop      
 .L8005A9F8:
 /* 35DF8 8005A9F8 16800005 */  bnez      $s4, .L8005AA10
-/* 35DFC 8005A9FC 00000000 */   nop
+/* 35DFC 8005A9FC 00000000 */   nop      
 /* 35E00 8005AA00 0C016BE5 */  jal       initialize_collision
-/* 35E04 8005AA04 00000000 */   nop
+/* 35E04 8005AA04 00000000 */   nop      
 /* 35E08 8005AA08 0C016BF0 */  jal       load_hit_asset
-/* 35E0C 8005AA0C 00000000 */   nop
+/* 35E0C 8005AA0C 00000000 */   nop      
 .L8005AA10:
 /* 35E10 8005AA10 0C01CACC */  jal       func_80072B30
-/* 35E14 8005AA14 00000000 */   nop
+/* 35E14 8005AA14 00000000 */   nop      
 /* 35E18 8005AA18 0C00F900 */  jal       clear_encounter_status
-/* 35E1C 8005AA1C 00000000 */   nop
+/* 35E1C 8005AA1C 00000000 */   nop      
 /* 35E20 8005AA20 0C04432E */  jal       clear_entity_data
 /* 35E24 8005AA24 24040001 */   addiu    $a0, $zero, 1
 /* 35E28 8005AA28 0C016727 */  jal       func_80059C9C
-/* 35E2C 8005AA2C 00000000 */   nop
+/* 35E2C 8005AA2C 00000000 */   nop      
 /* 35E30 8005AA30 0C037F14 */  jal       clear_player_status
-/* 35E34 8005AA34 00000000 */   nop
+/* 35E34 8005AA34 00000000 */   nop      
 /* 35E38 8005AA38 0C037F1D */  jal       func_800DFC74
-/* 35E3C 8005AA3C 00000000 */   nop
+/* 35E3C 8005AA3C 00000000 */   nop      
 /* 35E40 8005AA40 0C03AD1D */  jal       partner_reset_data
-/* 35E44 8005AA44 00000000 */   nop
+/* 35E44 8005AA44 00000000 */   nop      
 /* 35E48 8005AA48 0C048D9D */  jal       clear_printers
-/* 35E4C 8005AA4C 00000000 */   nop
+/* 35E4C 8005AA4C 00000000 */   nop      
 /* 35E50 8005AA50 0C04C3FC */  jal       clear_item_entity_data
-/* 35E54 8005AA54 00000000 */   nop
+/* 35E54 8005AA54 00000000 */   nop      
 /* 35E58 8005AA58 3C028011 */  lui       $v0, %hi(gPlayerStatus)
 /* 35E5C 8005AA5C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
 /* 35E60 8005AA60 C4400084 */  lwc1      $f0, 0x84($v0)
@@ -242,16 +242,16 @@ glabel load_map_by_IDs
 /* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
 /* 35E80 8005AA80 8C84FF60 */   lw       $a0, -0xa0($a0)
 /* 35E84 8005AA84 0C052580 */  jal       func_80149600
-/* 35E88 8005AA88 00000000 */   nop
+/* 35E88 8005AA88 00000000 */   nop      
 /* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
-/* 35E90 8005AA90 00000000 */   nop
+/* 35E90 8005AA90 00000000 */   nop      
 /* 35E94 8005AA94 3C04800B */  lui       $a0, 0x800b
 /* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, 0xcf0
 /* 35E9C 8005AA9C 0C016B74 */  jal       get_asset_offset
 /* 35EA0 8005AAA0 27A50030 */   addiu    $a1, $sp, 0x30
 /* 35EA4 8005AAA4 8E640000 */  lw        $a0, ($s3)
 /* 35EA8 8005AAA8 10800004 */  beqz      $a0, .L8005AABC
-/* 35EAC 8005AAAC 00000000 */   nop
+/* 35EAC 8005AAAC 00000000 */   nop      
 /* 35EB0 8005AAB0 8FA60030 */  lw        $a2, 0x30($sp)
 /* 35EB4 8005AAB4 0C046B52 */  jal       load_data_for_models
 /* 35EB8 8005AAB8 0040282D */   daddu    $a1, $v0, $zero
@@ -260,9 +260,9 @@ glabel load_map_by_IDs
 /* 35EC0 8005AAC0 50800005 */  beql      $a0, $zero, .L8005AAD8
 /* 35EC4 8005AAC4 24040128 */   addiu    $a0, $zero, 0x128
 /* 35EC8 8005AAC8 0C05178A */  jal       read_background_size
-/* 35ECC 8005AACC 00000000 */   nop
+/* 35ECC 8005AACC 00000000 */   nop      
 /* 35ED0 8005AAD0 08016ABA */  j         .L8005AAE8
-/* 35ED4 8005AAD4 00000000 */   nop
+/* 35ED4 8005AAD4 00000000 */   nop      
 .L8005AAD8:
 /* 35ED8 8005AAD8 240500C8 */  addiu     $a1, $zero, 0xc8
 /* 35EDC 8005AADC 2406000C */  addiu     $a2, $zero, 0xc
@@ -306,9 +306,9 @@ glabel load_map_by_IDs
 /* 35F6C 8005AB6C 24070106 */  addiu     $a3, $zero, 0x106
 .L8005AB70:
 /* 35F70 8005AB70 0C00B8C5 */  jal       set_cam_viewport
-/* 35F74 8005AB74 00000000 */   nop
+/* 35F74 8005AB74 00000000 */   nop      
 /* 35F78 8005AB78 0C039E4D */  jal       initialize_status_menu
-/* 35F7C 8005AB7C 00000000 */   nop
+/* 35F7C 8005AB7C 00000000 */   nop      
 /* 35F80 8005AB80 0000282D */  daddu     $a1, $zero, $zero
 /* 35F84 8005AB84 00A0302D */  daddu     $a2, $a1, $zero
 /* 35F88 8005AB88 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index e514193529..7d8ed28671 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -564,7 +564,7 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 gEffectTable = 0x8007F214;
-gItemTable = 0x800878E0; // size: 0x2D80
+gItemTable = 0x800878E0; // size:0x2D80
 gAreas = 0x800934F0;
 gCurrentEncounter = 0x800B0F10; // size:0xB0
 gBattleState = 0x800DC068;

From ec5e547146b631dd03cb85633a458f1f5371b58f Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 15:44:06 -0500
Subject: [PATCH 094/101] symbol detection fix

---
 .../code_105700_len_2130/func_802E3F0C.s      |  4 +--
 .../code_135EE0/pause_badges_handle_input.s   |  4 +--
 .../code_13CAF0/pause_items_handle_input.s    |  4 +--
 asm/nonmatchings/code_167570/func_802471EC.s  |  4 +--
 .../code_b72b0_len_15ed0/init_got_item.s      |  4 +--
 .../code_b72b0_len_15ed0/make_item_entity.s   |  4 +--
 .../update_item_entity_temp.s                 | 28 +++++++++----------
 .../dgb_03/C31730/func_802416B4_C32B94.s      |  4 +--
 .../dgb_06/C3D080/func_80240268_C3D2E8.s      |  4 +--
 .../dgb_09/C46BE0/func_80242730_C49310.s      |  4 +--
 .../dgb_12/C4DEF0/func_80240268_C4E158.s      |  4 +--
 .../dgb_18/C56EF0/begin_battle_C57158.s       |  4 +--
 .../hos_06/A397F0/func_80240AD0_A39FB0.s      |  4 +--
 .../hos_06/A3B4B0/func_80242238_A3B718.s      |  4 +--
 .../isk_09/9864E0/func_80240268_986748.s      |  4 +--
 .../iwa_03/918BB0/func_80240268_918E18.s      |  4 +--
 .../jan_04/B44AC0/func_802405B8_B44D28.s      |  4 +--
 .../jan_12/B73570/func_80240FA4_B74054.s      |  4 +--
 .../kkj_17/AF1C60/func_80240268_AF1EC8.s      |  4 +--
 .../kkj_20/AFDB40/func_80240268_AFDDA8.s      |  4 +--
 .../kmr_10/8D84D0/func_80240268_8D8738.s      |  4 +--
 .../kpa_14/A57830/func_802405E8_A57A98.s      |  4 +--
 .../kpa_15/A596A0/func_80240578_A59908.s      |  4 +--
 .../kzn_08/C71C10/func_802409F8_C71E78.s      |  4 +--
 .../obk_07/BCEBF0/func_80240268_BCEE58.s      |  4 +--
 .../omo_04/DAD400/func_80240268_DAD668.s      |  4 +--
 .../omo_06/DB8180/func_80240AD8_DB83E8.s      |  4 +--
 .../omo_07/DC01D0/func_80243188_DC0438.s      |  4 +--
 .../omo_09/DCD3F0/func_80240988_DCD658.s      |  4 +--
 .../omo_13/DE36C0/func_80241498_DE3928.s      |  4 +--
 .../pra_05/D55BD0/func_80241188_D56D38.s      |  4 +--
 .../pra_11/D61520/func_80241188_D62688.s      |  4 +--
 .../pra_12/D62D10/func_802411B8_D63EC8.s      |  4 +--
 .../pra_14/D67D20/func_80241188_D68E88.s      |  4 +--
 .../pra_27/D799F0/func_802411B8_D7ABA8.s      |  4 +--
 .../pra_28/D7B2A0/func_802411B8_D7C458.s      |  4 +--
 .../pra_35/D8FBA0/func_80242BB8_D8FE08.s      |  4 +--
 .../sam_01/CF7E80/func_80241EF8_CF9A68.s      |  4 +--
 .../sam_10/D37800/func_80240268_D37A68.s      |  4 +--
 .../tik_02/86CA50/func_80240578_86CCB8.s      |  4 +--
 .../tik_05/8750D0/func_802408E8_8756A8.s      |  4 +--
 .../tik_12/8891C0/func_80240BC8_889798.s      |  4 +--
 .../world/script_api/7E0E80/func_80280B78.s   |  4 +--
 tools/n64splat                                |  2 +-
 44 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s
index 38924f2e42..17c307478b 100644
--- a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s
@@ -52,9 +52,9 @@ glabel func_802E3F0C
 /* 105844 802E3FC4 3C014034 */  lui       $at, 0x4034
 /* 105848 802E3FC8 44811800 */  mtc1      $at, $f3
 /* 10584C 802E3FCC 44801000 */  mtc1      $zero, $f2
-/* 105850 802E3FD0 3C018008 */  lui       $at, 0x8008
+/* 105850 802E3FD0 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 105854 802E3FD4 00220821 */  addu      $at, $at, $v0
-/* 105858 802E3FD8 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 105858 802E3FD8 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 10585C 802E3FDC 46000021 */  cvt.d.s   $f0, $f0
 /* 105860 802E3FE0 46220000 */  add.d     $f0, $f0, $f2
 /* 105864 802E3FE4 26070050 */  addiu     $a3, $s0, 0x50
diff --git a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s
index 9b39fc746c..c26ba78cc6 100644
--- a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s
+++ b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s
@@ -322,9 +322,9 @@ glabel pause_badges_handle_input
 /* 13C874 80249534 00000000 */   nop      
 /* 13C878 80249538 10600008 */  beqz      $v1, .L8024955C
 /* 13C87C 8024953C 00031140 */   sll      $v0, $v1, 5
-/* 13C880 80249540 3C018008 */  lui       $at, 0x8008
+/* 13C880 80249540 3C018008 */  lui       $at, %hi(gItemTable+0x10)
 /* 13C884 80249544 00220821 */  addu      $at, $at, $v0
-/* 13C888 80249548 8C2278F0 */  lw        $v0, 0x78f0($at)
+/* 13C888 80249548 8C2278F0 */  lw        $v0, %lo(gItemTable+0x10)($at)
 /* 13C88C 8024954C 3C018027 */  lui       $at, 0x8027
 /* 13C890 80249550 AC2200C8 */  sw        $v0, 0xc8($at)
 /* 13C894 80249554 08092566 */  j         .L80249598
diff --git a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
index 1519cb0083..99608f669f 100644
--- a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
+++ b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s
@@ -262,9 +262,9 @@ glabel pause_items_handle_input
 /* 13DED4 8024AB94 00000000 */   nop      
 /* 13DED8 8024AB98 10600008 */  beqz      $v1, .L8024ABBC
 /* 13DEDC 8024AB9C 00031140 */   sll      $v0, $v1, 5
-/* 13DEE0 8024ABA0 3C018008 */  lui       $at, 0x8008
+/* 13DEE0 8024ABA0 3C018008 */  lui       $at, %hi(gItemTable+0x10)
 /* 13DEE4 8024ABA4 00220821 */  addu      $at, $at, $v0
-/* 13DEE8 8024ABA8 8C2278F0 */  lw        $v0, 0x78f0($at)
+/* 13DEE8 8024ABA8 8C2278F0 */  lw        $v0, %lo(gItemTable+0x10)($at)
 /* 13DEEC 8024ABAC 3C018027 */  lui       $at, 0x8027
 /* 13DEF0 8024ABB0 AC2200C8 */  sw        $v0, 0xc8($at)
 /* 13DEF4 8024ABB4 08092AFE */  j         .L8024ABF8
diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s
index eb4c69fd35..c9e96cc667 100644
--- a/asm/nonmatchings/code_167570/func_802471EC.s
+++ b/asm/nonmatchings/code_167570/func_802471EC.s
@@ -673,9 +673,9 @@ glabel func_802471EC
 /* 168448 80247BE8 2C820005 */  sltiu     $v0, $a0, 5
 /* 16844C 80247BEC 10400043 */  beqz      $v0, .L80247CFC
 /* 168450 80247BF0 00041080 */   sll      $v0, $a0, 2
-/* 168454 80247BF4 3C018025 */  lui       $at, 0x8025
+/* 168454 80247BF4 3C018025 */  lui       $at, %hi(pause_partners_draw_movelist_title)
 /* 168458 80247BF8 00220821 */  addu      $at, $at, $v0
-/* 16845C 80247BFC 8C22C048 */  lw        $v0, -0x3fb8($at)
+/* 16845C 80247BFC 8C22C048 */  lw        $v0, %lo(pause_partners_draw_movelist_title)($at)
 /* 168460 80247C00 00400008 */  jr        $v0
 /* 168464 80247C04 00000000 */   nop      
 /* 168468 80247C08 3C018025 */  lui       $at, 0x8025
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s
index 7cc13571d1..943c60a96f 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s
@@ -93,9 +93,9 @@ glabel init_got_item
 /* C8344 80131C44 AE230000 */  sw        $v1, ($s1)
 /* C8348 80131C48 E6200030 */  swc1      $f0, 0x30($s1)
 /* C834C 80131C4C E6220010 */  swc1      $f2, 0x10($s1)
-/* C8350 80131C50 3C018008 */  lui       $at, 0x8008
+/* C8350 80131C50 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C8354 80131C54 00220821 */  addu      $at, $at, $v0
-/* C8358 80131C58 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C8358 80131C58 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C835C 80131C5C 30421000 */  andi      $v0, $v0, 0x1000
 /* C8360 80131C60 10400005 */  beqz      $v0, .L80131C78
 /* C8364 80131C64 3C020004 */   lui      $v0, 4
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s
index c64ec0ee05..1329717014 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s
@@ -116,9 +116,9 @@ glabel make_item_entity
 /* C7C8C 8013158C A6020036 */  sh        $v0, 0x36($s0)
 /* C7C90 80131590 A6020038 */  sh        $v0, 0x38($s0)
 /* C7C94 80131594 00121140 */  sll       $v0, $s2, 5
-/* C7C98 80131598 3C018008 */  lui       $at, 0x8008
+/* C7C98 80131598 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C7C9C 8013159C 00220821 */  addu      $at, $at, $v0
-/* C7CA0 801315A0 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C7CA0 801315A0 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C7CA4 801315A4 2403001E */  addiu     $v1, $zero, 0x1e
 /* C7CA8 801315A8 3C018015 */  lui       $at, 0x8015
 /* C7CAC 801315AC A42365A6 */  sh        $v1, 0x65a6($at)
diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
index 69126c8956..e84cc08a92 100644
--- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
+++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s
@@ -128,9 +128,9 @@ glabel update_item_entity_temp
 .L801358A8:
 /* CBFA8 801358A8 86220018 */  lh        $v0, 0x18($s1)
 /* CBFAC 801358AC 00021140 */  sll       $v0, $v0, 5
-/* CBFB0 801358B0 3C018008 */  lui       $at, 0x8008
+/* CBFB0 801358B0 3C018008 */  lui       $at, %hi(gItemTable+0x4)
 /* CBFB4 801358B4 00220821 */  addu      $at, $at, $v0
-/* CBFB8 801358B8 842278E4 */  lh        $v0, 0x78e4($at)
+/* CBFB8 801358B8 842278E4 */  lh        $v0, %lo(gItemTable+0x4)($at)
 /* CBFBC 801358BC 000210C0 */  sll       $v0, $v0, 3
 /* CBFC0 801358C0 3C048009 */  lui       $a0, 0x8009
 /* CBFC4 801358C4 00822021 */  addu      $a0, $a0, $v0
@@ -182,9 +182,9 @@ glabel update_item_entity_temp
 .L80135974:
 /* CC074 80135974 86220018 */  lh        $v0, 0x18($s1)
 /* CC078 80135978 00021140 */  sll       $v0, $v0, 5
-/* CC07C 8013597C 3C018008 */  lui       $at, 0x8008
+/* CC07C 8013597C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC080 80135980 00220821 */  addu      $at, $at, $v0
-/* CC084 80135984 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC084 80135984 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC088 80135988 30420008 */  andi      $v0, $v0, 8
 /* CC08C 8013598C 1040000F */  beqz      $v0, .L801359CC
 /* CC090 80135990 0000202D */   daddu    $a0, $zero, $zero
@@ -207,9 +207,9 @@ glabel update_item_entity_temp
 .L801359CC:
 /* CC0CC 801359CC 86220018 */  lh        $v0, 0x18($s1)
 /* CC0D0 801359D0 00021140 */  sll       $v0, $v0, 5
-/* CC0D4 801359D4 3C018008 */  lui       $at, 0x8008
+/* CC0D4 801359D4 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC0D8 801359D8 00220821 */  addu      $at, $at, $v0
-/* CC0DC 801359DC 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC0DC 801359DC 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC0E0 801359E0 30420040 */  andi      $v0, $v0, 0x40
 /* CC0E4 801359E4 10400012 */  beqz      $v0, .L80135A30
 /* CC0E8 801359E8 0000202D */   daddu    $a0, $zero, $zero
@@ -348,9 +348,9 @@ glabel update_item_entity_temp
 .L80135BC8:
 /* CC2C8 80135BC8 86220018 */  lh        $v0, 0x18($s1)
 /* CC2CC 80135BCC 00021140 */  sll       $v0, $v0, 5
-/* CC2D0 80135BD0 3C018008 */  lui       $at, 0x8008
+/* CC2D0 80135BD0 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC2D4 80135BD4 00220821 */  addu      $at, $at, $v0
-/* CC2D8 80135BD8 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC2D8 80135BD8 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC2DC 80135BDC 30420020 */  andi      $v0, $v0, 0x20
 /* CC2E0 80135BE0 10400010 */  beqz      $v0, .L80135C24
 /* CC2E4 80135BE4 00000000 */   nop      
@@ -495,9 +495,9 @@ glabel update_item_entity_temp
 .L80135DEC:
 /* CC4EC 80135DEC 86220018 */  lh        $v0, 0x18($s1)
 /* CC4F0 80135DF0 00021140 */  sll       $v0, $v0, 5
-/* CC4F4 80135DF4 3C018008 */  lui       $at, 0x8008
+/* CC4F4 80135DF4 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC4F8 80135DF8 00220821 */  addu      $at, $at, $v0
-/* CC4FC 80135DFC 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC4FC 80135DFC 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC500 80135E00 30420020 */  andi      $v0, $v0, 0x20
 /* CC504 80135E04 10400006 */  beqz      $v0, .L80135E20
 /* CC508 80135E08 2404000C */   addiu    $a0, $zero, 0xc
@@ -531,9 +531,9 @@ glabel update_item_entity_temp
 /* CC574 80135E74 A222001A */   sb       $v0, 0x1a($s1)
 /* CC578 80135E78 86220018 */  lh        $v0, 0x18($s1)
 /* CC57C 80135E7C 00021140 */  sll       $v0, $v0, 5
-/* CC580 80135E80 3C018008 */  lui       $at, 0x8008
+/* CC580 80135E80 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC584 80135E84 00220821 */  addu      $at, $at, $v0
-/* CC588 80135E88 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC588 80135E88 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC58C 80135E8C 30420004 */  andi      $v0, $v0, 4
 /* CC590 80135E90 10400009 */  beqz      $v0, .L80135EB8
 /* CC594 80135E94 0000202D */   daddu    $a0, $zero, $zero
@@ -570,9 +570,9 @@ glabel update_item_entity_temp
 /* CC604 80135F04 A222001A */   sb       $v0, 0x1a($s1)
 /* CC608 80135F08 86230018 */  lh        $v1, 0x18($s1)
 /* CC60C 80135F0C 00031140 */  sll       $v0, $v1, 5
-/* CC610 80135F10 3C018008 */  lui       $at, 0x8008
+/* CC610 80135F10 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CC614 80135F14 00220821 */  addu      $at, $at, $v0
-/* CC618 80135F18 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CC618 80135F18 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CC61C 80135F1C 30420004 */  andi      $v0, $v0, 4
 /* CC620 80135F20 10400003 */  beqz      $v0, .L80135F30
 /* CC624 80135F24 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s
index 64c13b6966..491b435c0c 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s
@@ -124,9 +124,9 @@ glabel func_802416B4_C32B94
 /* C32D58 80241878 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C32D5C 8024187C 10400042 */  beqz      $v0, .L80241988
 /* C32D60 80241880 00031080 */   sll      $v0, $v1, 2
-/* C32D64 80241884 3C018024 */  lui       $at, 0x8024
+/* C32D64 80241884 3C018024 */  lui       $at, %hi(pause_tabs_draw_stats)
 /* C32D68 80241888 00220821 */  addu      $at, $at, $v0
-/* C32D6C 8024188C 8C224B98 */  lw        $v0, 0x4b98($at)
+/* C32D6C 8024188C 8C224B98 */  lw        $v0, %lo(pause_tabs_draw_stats)($at)
 /* C32D70 80241890 00400008 */  jr        $v0
 /* C32D74 80241894 00000000 */   nop      
 /* C32D78 80241898 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
index 77f053290b..c423a6bfed 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
@@ -11,9 +11,9 @@ glabel func_80240268_C3D2E8
 /* C3D300 80240280 8C450000 */   lw       $a1, ($v0)
 /* C3D304 80240284 00021140 */  sll       $v0, $v0, 5
 /* C3D308 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* C3D30C 8024028C 3C018008 */  lui       $at, 0x8008
+/* C3D30C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C3D310 80240290 00220821 */  addu      $at, $at, $v0
-/* C3D314 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C3D314 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C3D318 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* C3D31C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* C3D320 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s
index 45a1eca563..e2f554ea49 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s
@@ -66,9 +66,9 @@ glabel func_80242730_C49310
 /* C493FC 8024281C 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C49400 80242820 10400034 */  beqz      $v0, .L802428F4
 /* C49404 80242824 00031080 */   sll      $v0, $v1, 2
-/* C49408 80242828 3C018024 */  lui       $at, 0x8024
+/* C49408 80242828 3C018024 */  lui       $at, %hi(DisablePartnerBlur)
 /* C4940C 8024282C 00220821 */  addu      $at, $at, $v0
-/* C49410 80242830 8C2256D8 */  lw        $v0, 0x56d8($at)
+/* C49410 80242830 8C2256D8 */  lw        $v0, %lo(DisablePartnerBlur)($at)
 /* C49414 80242834 00400008 */  jr        $v0
 /* C49418 80242838 00000000 */   nop      
 /* C4941C 8024283C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
index c12eeb8986..0f38f76d59 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
@@ -11,9 +11,9 @@ glabel func_80240268_C4E158
 /* C4E170 80240280 8C450000 */   lw       $a1, ($v0)
 /* C4E174 80240284 00021140 */  sll       $v0, $v0, 5
 /* C4E178 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* C4E17C 8024028C 3C018008 */  lui       $at, 0x8008
+/* C4E17C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C4E180 80240290 00220821 */  addu      $at, $at, $v0
-/* C4E184 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C4E184 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C4E188 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* C4E18C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* C4E190 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
index 99c367974e..6127881d49 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
@@ -11,9 +11,9 @@ glabel begin_battle_C57158
 /* C57170 80241230 8C450000 */   lw       $a1, ($v0)
 /* C57174 80241234 00021140 */  sll       $v0, $v0, 5
 /* C57178 80241238 AE000084 */  sw        $zero, 0x84($s0)
-/* C5717C 8024123C 3C018008 */  lui       $at, 0x8008
+/* C5717C 8024123C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C57180 80241240 00220821 */  addu      $at, $at, $v0
-/* C57184 80241244 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C57184 80241244 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C57188 80241248 30420040 */  andi      $v0, $v0, 0x40
 /* C5718C 8024124C 10400002 */  beqz      $v0, .L80241258
 /* C57190 80241250 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
index a05cb23b6f..cb0f944197 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
@@ -124,9 +124,9 @@ glabel func_80240AD0_A39FB0
 /* A3A170 80240C90 AE620088 */  sw        $v0, 0x88($s3)
 /* A3A174 80240C94 8C620000 */  lw        $v0, ($v1)
 /* A3A178 80240C98 00021140 */  sll       $v0, $v0, 5
-/* A3A17C 80240C9C 3C018008 */  lui       $at, 0x8008
+/* A3A17C 80240C9C 3C018008 */  lui       $at, %hi(gItemTable)
 /* A3A180 80240CA0 00220821 */  addu      $at, $at, $v0
-/* A3A184 80240CA4 8C2278E0 */  lw        $v0, 0x78e0($at)
+/* A3A184 80240CA4 8C2278E0 */  lw        $v0, %lo(gItemTable)($at)
 /* A3A188 80240CA8 AE620094 */  sw        $v0, 0x94($s3)
 /* A3A18C 80240CAC 8C620000 */  lw        $v0, ($v1)
 /* A3A190 80240CB0 00021140 */  sll       $v0, $v0, 5
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
index 6d5b641387..7875e2d598 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
@@ -11,9 +11,9 @@ glabel func_80242238_A3B718
 /* A3B730 80242250 8C450000 */   lw       $a1, ($v0)
 /* A3B734 80242254 00021140 */  sll       $v0, $v0, 5
 /* A3B738 80242258 AE000084 */  sw        $zero, 0x84($s0)
-/* A3B73C 8024225C 3C018008 */  lui       $at, 0x8008
+/* A3B73C 8024225C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* A3B740 80242260 00220821 */  addu      $at, $at, $v0
-/* A3B744 80242264 942278F8 */  lhu       $v0, 0x78f8($at)
+/* A3B744 80242264 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* A3B748 80242268 30420040 */  andi      $v0, $v0, 0x40
 /* A3B74C 8024226C 10400002 */  beqz      $v0, .L80242278
 /* A3B750 80242270 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
index 71f2fc41b1..e5a231ce10 100644
--- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
+++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
@@ -11,9 +11,9 @@ glabel func_80240268_986748
 /* 986760 80240280 8C450000 */   lw       $a1, ($v0)
 /* 986764 80240284 00021140 */  sll       $v0, $v0, 5
 /* 986768 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 98676C 8024028C 3C018008 */  lui       $at, 0x8008
+/* 98676C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 986770 80240290 00220821 */  addu      $at, $at, $v0
-/* 986774 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 986774 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 986778 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* 98677C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* 986780 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
index 53b15ea335..c0afdfea60 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
@@ -11,9 +11,9 @@ glabel func_80240268_918E18
 /* 918E30 80240280 8C450000 */   lw       $a1, ($v0)
 /* 918E34 80240284 00021140 */  sll       $v0, $v0, 5
 /* 918E38 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 918E3C 8024028C 3C018008 */  lui       $at, 0x8008
+/* 918E3C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 918E40 80240290 00220821 */  addu      $at, $at, $v0
-/* 918E44 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 918E44 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 918E48 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* 918E4C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* 918E50 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
index 7329f118d5..64cdc774c2 100644
--- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
+++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
@@ -11,9 +11,9 @@ glabel func_802405B8_B44D28
 /* B44D40 802405D0 8C450000 */   lw       $a1, ($v0)
 /* B44D44 802405D4 00021140 */  sll       $v0, $v0, 5
 /* B44D48 802405D8 AE000084 */  sw        $zero, 0x84($s0)
-/* B44D4C 802405DC 3C018008 */  lui       $at, 0x8008
+/* B44D4C 802405DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* B44D50 802405E0 00220821 */  addu      $at, $at, $v0
-/* B44D54 802405E4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* B44D54 802405E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* B44D58 802405E8 30420040 */  andi      $v0, $v0, 0x40
 /* B44D5C 802405EC 10400002 */  beqz      $v0, .L802405F8
 /* B44D60 802405F0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
index 613e42884f..e5b4c42817 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
@@ -100,9 +100,9 @@ glabel func_80240FA4_B74054
 /* B741B8 80241108 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B741BC 8024110C 10400048 */  beqz      $v0, .L80241230
 /* B741C0 80241110 00031080 */   sll      $v0, $v1, 2
-/* B741C4 80241114 3C018024 */  lui       $at, 0x8024
+/* B741C4 80241114 3C018024 */  lui       $at, %hi(pause_textbox_draw_contents)
 /* B741C8 80241118 00220821 */  addu      $at, $at, $v0
-/* B741CC 8024111C 8C223570 */  lw        $v0, 0x3570($at)
+/* B741CC 8024111C 8C223570 */  lw        $v0, %lo(pause_textbox_draw_contents)($at)
 /* B741D0 80241120 00400008 */  jr        $v0
 /* B741D4 80241124 00000000 */   nop      
 /* B741D8 80241128 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
index 150d71f6ff..f9e8671c71 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
@@ -11,9 +11,9 @@ glabel func_80240268_AF1EC8
 /* AF1EE0 80240280 8C450000 */   lw       $a1, ($v0)
 /* AF1EE4 80240284 00021140 */  sll       $v0, $v0, 5
 /* AF1EE8 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* AF1EEC 8024028C 3C018008 */  lui       $at, 0x8008
+/* AF1EEC 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* AF1EF0 80240290 00220821 */  addu      $at, $at, $v0
-/* AF1EF4 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* AF1EF4 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* AF1EF8 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* AF1EFC 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* AF1F00 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s
index 615f7872a8..96268db26b 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s
@@ -11,9 +11,9 @@ glabel func_80240268_AFDDA8
 /* AFDDC0 80240280 8C450000 */   lw       $a1, ($v0)
 /* AFDDC4 80240284 00021140 */  sll       $v0, $v0, 5
 /* AFDDC8 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* AFDDCC 8024028C 3C018008 */  lui       $at, 0x8008
+/* AFDDCC 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* AFDDD0 80240290 00220821 */  addu      $at, $at, $v0
-/* AFDDD4 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* AFDDD4 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* AFDDD8 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* AFDDDC 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* AFDDE0 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
index 8ca1886817..a29f9e2c23 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
@@ -11,9 +11,9 @@ glabel func_80240268_8D8738
 /* 8D8750 80240280 8C450000 */   lw       $a1, ($v0)
 /* 8D8754 80240284 00021140 */  sll       $v0, $v0, 5
 /* 8D8758 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 8D875C 8024028C 3C018008 */  lui       $at, 0x8008
+/* 8D875C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 8D8760 80240290 00220821 */  addu      $at, $at, $v0
-/* 8D8764 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 8D8764 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 8D8768 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* 8D876C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* 8D8770 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s
index d5a3627e3e..8582105a4d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s
@@ -11,9 +11,9 @@ glabel func_802405E8_A57A98
 /* A57AB0 80240600 8C450000 */   lw       $a1, ($v0)
 /* A57AB4 80240604 00021140 */  sll       $v0, $v0, 5
 /* A57AB8 80240608 AE000084 */  sw        $zero, 0x84($s0)
-/* A57ABC 8024060C 3C018008 */  lui       $at, 0x8008
+/* A57ABC 8024060C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* A57AC0 80240610 00220821 */  addu      $at, $at, $v0
-/* A57AC4 80240614 942278F8 */  lhu       $v0, 0x78f8($at)
+/* A57AC4 80240614 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* A57AC8 80240618 30420040 */  andi      $v0, $v0, 0x40
 /* A57ACC 8024061C 10400002 */  beqz      $v0, .L80240628
 /* A57AD0 80240620 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
index 8a45449717..cd959556c0 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
@@ -11,9 +11,9 @@ glabel func_80240578_A59908
 /* A59920 80240590 8C450000 */   lw       $a1, ($v0)
 /* A59924 80240594 00021140 */  sll       $v0, $v0, 5
 /* A59928 80240598 AE000084 */  sw        $zero, 0x84($s0)
-/* A5992C 8024059C 3C018008 */  lui       $at, 0x8008
+/* A5992C 8024059C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* A59930 802405A0 00220821 */  addu      $at, $at, $v0
-/* A59934 802405A4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* A59934 802405A4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* A59938 802405A8 30420040 */  andi      $v0, $v0, 0x40
 /* A5993C 802405AC 10400002 */  beqz      $v0, .L802405B8
 /* A59940 802405B0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
index 992f37f603..e08f09b538 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
@@ -11,9 +11,9 @@ glabel func_802409F8_C71E78
 /* C71E90 80240A10 8C450000 */   lw       $a1, ($v0)
 /* C71E94 80240A14 00021140 */  sll       $v0, $v0, 5
 /* C71E98 80240A18 AE000084 */  sw        $zero, 0x84($s0)
-/* C71E9C 80240A1C 3C018008 */  lui       $at, 0x8008
+/* C71E9C 80240A1C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* C71EA0 80240A20 00220821 */  addu      $at, $at, $v0
-/* C71EA4 80240A24 942278F8 */  lhu       $v0, 0x78f8($at)
+/* C71EA4 80240A24 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* C71EA8 80240A28 30420040 */  andi      $v0, $v0, 0x40
 /* C71EAC 80240A2C 10400002 */  beqz      $v0, .L80240A38
 /* C71EB0 80240A30 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
index fb6528e594..e1d91b4109 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
@@ -11,9 +11,9 @@ glabel func_80240268_BCEE58
 /* BCEE70 80240280 8C450000 */   lw       $a1, ($v0)
 /* BCEE74 80240284 00021140 */  sll       $v0, $v0, 5
 /* BCEE78 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* BCEE7C 8024028C 3C018008 */  lui       $at, 0x8008
+/* BCEE7C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* BCEE80 80240290 00220821 */  addu      $at, $at, $v0
-/* BCEE84 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* BCEE84 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* BCEE88 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* BCEE8C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* BCEE90 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s
index e2264a6465..13f7c32e66 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s
@@ -11,9 +11,9 @@ glabel func_80240268_DAD668
 /* DAD680 80240280 8C450000 */   lw       $a1, ($v0)
 /* DAD684 80240284 00021140 */  sll       $v0, $v0, 5
 /* DAD688 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* DAD68C 8024028C 3C018008 */  lui       $at, 0x8008
+/* DAD68C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* DAD690 80240290 00220821 */  addu      $at, $at, $v0
-/* DAD694 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* DAD694 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* DAD698 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* DAD69C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* DAD6A0 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
index 4901d0a90a..2fdc7b1b90 100644
--- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
+++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
@@ -11,9 +11,9 @@ glabel func_80240AD8_DB83E8
 /* DB8400 80240AF0 8C450000 */   lw       $a1, ($v0)
 /* DB8404 80240AF4 00021140 */  sll       $v0, $v0, 5
 /* DB8408 80240AF8 AE000084 */  sw        $zero, 0x84($s0)
-/* DB840C 80240AFC 3C018008 */  lui       $at, 0x8008
+/* DB840C 80240AFC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* DB8410 80240B00 00220821 */  addu      $at, $at, $v0
-/* DB8414 80240B04 942278F8 */  lhu       $v0, 0x78f8($at)
+/* DB8414 80240B04 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* DB8418 80240B08 30420040 */  andi      $v0, $v0, 0x40
 /* DB841C 80240B0C 10400002 */  beqz      $v0, .L80240B18
 /* DB8420 80240B10 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s
index 51243395a4..42ec6f4440 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s
@@ -11,9 +11,9 @@ glabel func_80243188_DC0438
 /* DC0450 802431A0 8C450000 */   lw       $a1, ($v0)
 /* DC0454 802431A4 00021140 */  sll       $v0, $v0, 5
 /* DC0458 802431A8 AE000084 */  sw        $zero, 0x84($s0)
-/* DC045C 802431AC 3C018008 */  lui       $at, 0x8008
+/* DC045C 802431AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* DC0460 802431B0 00220821 */  addu      $at, $at, $v0
-/* DC0464 802431B4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* DC0464 802431B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* DC0468 802431B8 30420040 */  andi      $v0, $v0, 0x40
 /* DC046C 802431BC 10400002 */  beqz      $v0, .L802431C8
 /* DC0470 802431C0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
index e9c4ce0398..77117b7c23 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
@@ -11,9 +11,9 @@ glabel func_80240988_DCD658
 /* DCD670 802409A0 8C450000 */   lw       $a1, ($v0)
 /* DCD674 802409A4 00021140 */  sll       $v0, $v0, 5
 /* DCD678 802409A8 AE000084 */  sw        $zero, 0x84($s0)
-/* DCD67C 802409AC 3C018008 */  lui       $at, 0x8008
+/* DCD67C 802409AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* DCD680 802409B0 00220821 */  addu      $at, $at, $v0
-/* DCD684 802409B4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* DCD684 802409B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* DCD688 802409B8 30420040 */  andi      $v0, $v0, 0x40
 /* DCD68C 802409BC 10400002 */  beqz      $v0, .L802409C8
 /* DCD690 802409C0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
index 68d5a009a2..c65da6908b 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
@@ -11,9 +11,9 @@ glabel func_80241498_DE3928
 /* DE3940 802414B0 8C450000 */   lw       $a1, ($v0)
 /* DE3944 802414B4 00021140 */  sll       $v0, $v0, 5
 /* DE3948 802414B8 AE000084 */  sw        $zero, 0x84($s0)
-/* DE394C 802414BC 3C018008 */  lui       $at, 0x8008
+/* DE394C 802414BC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* DE3950 802414C0 00220821 */  addu      $at, $at, $v0
-/* DE3954 802414C4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* DE3954 802414C4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* DE3958 802414C8 30420040 */  andi      $v0, $v0, 0x40
 /* DE395C 802414CC 10400002 */  beqz      $v0, .L802414D8
 /* DE3960 802414D0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
index 8d12a9f9be..af10412f52 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
@@ -11,9 +11,9 @@ glabel func_80241188_D56D38
 /* D56D50 802411A0 8C450000 */   lw       $a1, ($v0)
 /* D56D54 802411A4 00021140 */  sll       $v0, $v0, 5
 /* D56D58 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D56D5C 802411AC 3C018008 */  lui       $at, 0x8008
+/* D56D5C 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D56D60 802411B0 00220821 */  addu      $at, $at, $v0
-/* D56D64 802411B4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D56D64 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D56D68 802411B8 30420040 */  andi      $v0, $v0, 0x40
 /* D56D6C 802411BC 10400002 */  beqz      $v0, .L802411C8
 /* D56D70 802411C0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
index aee5e60fe3..7b9aedc5ab 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
@@ -11,9 +11,9 @@ glabel func_80241188_D62688
 /* D626A0 802411A0 8C450000 */   lw       $a1, ($v0)
 /* D626A4 802411A4 00021140 */  sll       $v0, $v0, 5
 /* D626A8 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D626AC 802411AC 3C018008 */  lui       $at, 0x8008
+/* D626AC 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D626B0 802411B0 00220821 */  addu      $at, $at, $v0
-/* D626B4 802411B4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D626B4 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D626B8 802411B8 30420040 */  andi      $v0, $v0, 0x40
 /* D626BC 802411BC 10400002 */  beqz      $v0, .L802411C8
 /* D626C0 802411C0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
index d3c4603ad4..2cdd966250 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
@@ -11,9 +11,9 @@ glabel func_802411B8_D63EC8
 /* D63EE0 802411D0 8C450000 */   lw       $a1, ($v0)
 /* D63EE4 802411D4 00021140 */  sll       $v0, $v0, 5
 /* D63EE8 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D63EEC 802411DC 3C018008 */  lui       $at, 0x8008
+/* D63EEC 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D63EF0 802411E0 00220821 */  addu      $at, $at, $v0
-/* D63EF4 802411E4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D63EF4 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D63EF8 802411E8 30420040 */  andi      $v0, $v0, 0x40
 /* D63EFC 802411EC 10400002 */  beqz      $v0, .L802411F8
 /* D63F00 802411F0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
index e708da90fe..e6c3810e5d 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
@@ -11,9 +11,9 @@ glabel func_80241188_D68E88
 /* D68EA0 802411A0 8C450000 */   lw       $a1, ($v0)
 /* D68EA4 802411A4 00021140 */  sll       $v0, $v0, 5
 /* D68EA8 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D68EAC 802411AC 3C018008 */  lui       $at, 0x8008
+/* D68EAC 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D68EB0 802411B0 00220821 */  addu      $at, $at, $v0
-/* D68EB4 802411B4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D68EB4 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D68EB8 802411B8 30420040 */  andi      $v0, $v0, 0x40
 /* D68EBC 802411BC 10400002 */  beqz      $v0, .L802411C8
 /* D68EC0 802411C0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
index 451146e8f9..531b0ab6d9 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
@@ -11,9 +11,9 @@ glabel func_802411B8_D7ABA8
 /* D7ABC0 802411D0 8C450000 */   lw       $a1, ($v0)
 /* D7ABC4 802411D4 00021140 */  sll       $v0, $v0, 5
 /* D7ABC8 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D7ABCC 802411DC 3C018008 */  lui       $at, 0x8008
+/* D7ABCC 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D7ABD0 802411E0 00220821 */  addu      $at, $at, $v0
-/* D7ABD4 802411E4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D7ABD4 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D7ABD8 802411E8 30420040 */  andi      $v0, $v0, 0x40
 /* D7ABDC 802411EC 10400002 */  beqz      $v0, .L802411F8
 /* D7ABE0 802411F0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
index 16b5b1982b..63e76797cf 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
@@ -11,9 +11,9 @@ glabel func_802411B8_D7C458
 /* D7C470 802411D0 8C450000 */   lw       $a1, ($v0)
 /* D7C474 802411D4 00021140 */  sll       $v0, $v0, 5
 /* D7C478 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D7C47C 802411DC 3C018008 */  lui       $at, 0x8008
+/* D7C47C 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D7C480 802411E0 00220821 */  addu      $at, $at, $v0
-/* D7C484 802411E4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D7C484 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D7C488 802411E8 30420040 */  andi      $v0, $v0, 0x40
 /* D7C48C 802411EC 10400002 */  beqz      $v0, .L802411F8
 /* D7C490 802411F0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
index 15efa22f53..56d903bf8b 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
@@ -11,9 +11,9 @@ glabel func_80242BB8_D8FE08
 /* D8FE20 80242BD0 8C450000 */   lw       $a1, ($v0)
 /* D8FE24 80242BD4 00021140 */  sll       $v0, $v0, 5
 /* D8FE28 80242BD8 AE000084 */  sw        $zero, 0x84($s0)
-/* D8FE2C 80242BDC 3C018008 */  lui       $at, 0x8008
+/* D8FE2C 80242BDC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D8FE30 80242BE0 00220821 */  addu      $at, $at, $v0
-/* D8FE34 80242BE4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D8FE34 80242BE4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D8FE38 80242BE8 30420040 */  andi      $v0, $v0, 0x40
 /* D8FE3C 80242BEC 10400002 */  beqz      $v0, .L80242BF8
 /* D8FE40 80242BF0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
index b0013735bd..3648ece98f 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
@@ -11,9 +11,9 @@ glabel func_80241EF8_CF9A68
 /* CF9A80 80241F10 8C450000 */   lw       $a1, ($v0)
 /* CF9A84 80241F14 00021140 */  sll       $v0, $v0, 5
 /* CF9A88 80241F18 AE000084 */  sw        $zero, 0x84($s0)
-/* CF9A8C 80241F1C 3C018008 */  lui       $at, 0x8008
+/* CF9A8C 80241F1C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* CF9A90 80241F20 00220821 */  addu      $at, $at, $v0
-/* CF9A94 80241F24 942278F8 */  lhu       $v0, 0x78f8($at)
+/* CF9A94 80241F24 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* CF9A98 80241F28 30420040 */  andi      $v0, $v0, 0x40
 /* CF9A9C 80241F2C 10400002 */  beqz      $v0, .L80241F38
 /* CF9AA0 80241F30 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
index 860e726e19..403bdbdf18 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
@@ -11,9 +11,9 @@ glabel func_80240268_D37A68
 /* D37A80 80240280 8C450000 */   lw       $a1, ($v0)
 /* D37A84 80240284 00021140 */  sll       $v0, $v0, 5
 /* D37A88 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* D37A8C 8024028C 3C018008 */  lui       $at, 0x8008
+/* D37A8C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* D37A90 80240290 00220821 */  addu      $at, $at, $v0
-/* D37A94 80240294 942278F8 */  lhu       $v0, 0x78f8($at)
+/* D37A94 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* D37A98 80240298 30420040 */  andi      $v0, $v0, 0x40
 /* D37A9C 8024029C 10400002 */  beqz      $v0, .L802402A8
 /* D37AA0 802402A0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
index 7138223922..de36c223b6 100644
--- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
+++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
@@ -11,9 +11,9 @@ glabel func_80240578_86CCB8
 /* 86CCD0 80240590 8C450000 */   lw       $a1, ($v0)
 /* 86CCD4 80240594 00021140 */  sll       $v0, $v0, 5
 /* 86CCD8 80240598 AE000084 */  sw        $zero, 0x84($s0)
-/* 86CCDC 8024059C 3C018008 */  lui       $at, 0x8008
+/* 86CCDC 8024059C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 86CCE0 802405A0 00220821 */  addu      $at, $at, $v0
-/* 86CCE4 802405A4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 86CCE4 802405A4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 86CCE8 802405A8 30420040 */  andi      $v0, $v0, 0x40
 /* 86CCEC 802405AC 10400002 */  beqz      $v0, .L802405B8
 /* 86CCF0 802405B0 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
index 1cf2fe6e11..e9417584aa 100644
--- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
+++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
@@ -11,9 +11,9 @@ glabel func_802408E8_8756A8
 /* 8756C0 80240900 8C450000 */   lw       $a1, ($v0)
 /* 8756C4 80240904 00021140 */  sll       $v0, $v0, 5
 /* 8756C8 80240908 AE000084 */  sw        $zero, 0x84($s0)
-/* 8756CC 8024090C 3C018008 */  lui       $at, 0x8008
+/* 8756CC 8024090C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 8756D0 80240910 00220821 */  addu      $at, $at, $v0
-/* 8756D4 80240914 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 8756D4 80240914 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 8756D8 80240918 30420040 */  andi      $v0, $v0, 0x40
 /* 8756DC 8024091C 10400002 */  beqz      $v0, .L80240928
 /* 8756E0 80240920 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s
index 3e76e15376..64d72913b6 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s
@@ -11,9 +11,9 @@ glabel func_80240BC8_889798
 /* 8897B0 80240BE0 8C450000 */   lw       $a1, ($v0)
 /* 8897B4 80240BE4 00021140 */  sll       $v0, $v0, 5
 /* 8897B8 80240BE8 AE000084 */  sw        $zero, 0x84($s0)
-/* 8897BC 80240BEC 3C018008 */  lui       $at, 0x8008
+/* 8897BC 80240BEC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
 /* 8897C0 80240BF0 00220821 */  addu      $at, $at, $v0
-/* 8897C4 80240BF4 942278F8 */  lhu       $v0, 0x78f8($at)
+/* 8897C4 80240BF4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
 /* 8897C8 80240BF8 30420040 */  andi      $v0, $v0, 0x40
 /* 8897CC 80240BFC 10400002 */  beqz      $v0, .L80240C08
 /* 8897D0 80240C00 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
index 9f96c4c9fa..52a7392921 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s
@@ -22,8 +22,8 @@ glabel func_80280B78
 /* 7E1A34 80280BB4 2463000C */   addiu    $v1, $v1, 0xc
 .L80280BB8:
 /* 7E1A38 80280BB8 00041140 */  sll       $v0, $a0, 5
-/* 7E1A3C 80280BBC 3C018008 */  lui       $at, 0x8008
+/* 7E1A3C 80280BBC 3C018008 */  lui       $at, %hi(gItemTable+0xC)
 /* 7E1A40 80280BC0 00220821 */  addu      $at, $at, $v0
-/* 7E1A44 80280BC4 842278EC */  lh        $v0, 0x78ec($at)
+/* 7E1A44 80280BC4 842278EC */  lh        $v0, %lo(gItemTable+0xC)($at)
 /* 7E1A48 80280BC8 03E00008 */  jr        $ra
 /* 7E1A4C 80280BCC 00000000 */   nop      
diff --git a/tools/n64splat b/tools/n64splat
index 42c5f587eb..79f47d6951 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3
+Subproject commit 79f47d69514c39d902b7b3aee41d713670d88934

From 285396f1424236a7d33d9abe375e643115eb379d Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 15:48:48 -0500
Subject: [PATCH 095/101] CheckItemFlags40

---
 .../dgb_06/C3D080/func_80240268_C3D2E8.s      | 27 -------------------
 .../dgb_12/C4DEF0/func_80240268_C4E158.s      | 27 -------------------
 .../dgb_18/C56EF0/begin_battle_C57158.s       | 27 -------------------
 .../hos_06/A3B4B0/func_80242238_A3B718.s      | 26 ------------------
 .../isk_09/9864E0/func_80240268_986748.s      | 26 ------------------
 .../iwa_03/918BB0/func_80240268_918E18.s      | 26 ------------------
 .../jan_04/B44AC0/func_802405B8_B44D28.s      | 27 -------------------
 .../kkj_17/AF1C60/func_80240268_AF1EC8.s      | 26 ------------------
 .../kmr_10/8D84D0/func_80240268_8D8738.s      | 26 ------------------
 .../kpa_15/A596A0/func_80240578_A59908.s      | 27 -------------------
 .../kzn_08/C71C10/func_802409F8_C71E78.s      | 27 -------------------
 .../obk_07/BCEBF0/func_80240268_BCEE58.s      | 27 -------------------
 .../omo_06/DB8180/func_80240AD8_DB83E8.s      | 27 -------------------
 .../omo_09/DCD3F0/func_80240988_DCD658.s      | 27 -------------------
 .../omo_13/DE36C0/func_80241498_DE3928.s      | 27 -------------------
 .../pra_05/D55BD0/func_80241188_D56D38.s      | 27 -------------------
 .../pra_11/D61520/func_80241188_D62688.s      | 27 -------------------
 .../pra_12/D62D10/func_802411B8_D63EC8.s      | 27 -------------------
 .../pra_14/D67D20/func_80241188_D68E88.s      | 27 -------------------
 .../pra_27/D799F0/func_802411B8_D7ABA8.s      | 27 -------------------
 .../pra_28/D7B2A0/func_802411B8_D7C458.s      | 27 -------------------
 .../pra_35/D8FBA0/func_80242BB8_D8FE08.s      | 27 -------------------
 .../sam_01/CF7E80/func_80241EF8_CF9A68.s      | 27 -------------------
 .../sam_10/D37800/func_80240268_D37A68.s      | 26 ------------------
 .../tik_02/86CA50/func_80240578_86CCB8.s      | 27 -------------------
 .../tik_05/8750D0/func_802408E8_8756A8.s      | 26 ------------------
 src/world/area_dgb/dgb_06/C3D080.c            |  2 +-
 src/world/area_dgb/dgb_12/C4DEF0.c            |  2 +-
 src/world/area_dgb/dgb_18/C56EF0.c            |  2 +-
 src/world/area_hos/hos_06/A3B4B0.c            |  2 +-
 src/world/area_isk/isk_09/9864E0.c            |  2 +-
 src/world/area_iwa/iwa_03/918BB0.c            |  2 +-
 src/world/area_jan/jan_04/B44AC0.c            |  2 +-
 src/world/area_kkj/kkj_17/AF1C60.c            |  2 +-
 src/world/area_kmr/kmr_10/8D84D0.c            |  2 +-
 src/world/area_kpa/kpa_15/A596A0.c            |  2 +-
 src/world/area_kzn/kzn_08/C71C10.c            |  2 +-
 src/world/area_obk/obk_07/BCEBF0.c            |  2 +-
 src/world/area_omo/omo_06/DB8180.c            |  2 +-
 src/world/area_omo/omo_09/DCD3F0.c            |  2 +-
 src/world/area_omo/omo_13/DE36C0.c            |  2 +-
 src/world/area_pra/pra_05/D55BD0.c            |  2 +-
 src/world/area_pra/pra_11/D61520.c            |  2 +-
 src/world/area_pra/pra_12/D62D10.c            |  2 +-
 src/world/area_pra/pra_14/D67D20.c            |  2 +-
 src/world/area_pra/pra_27/D799F0.c            |  2 +-
 src/world/area_pra/pra_28/D7B2A0.c            |  2 +-
 src/world/area_pra/pra_35/D8FBA0.c            |  2 +-
 src/world/area_sam/sam_01/CF7E80.c            |  2 +-
 src/world/area_sam/sam_10/D37800.c            |  2 +-
 src/world/area_tik/tik_02/86CA50.c            |  2 +-
 src/world/area_tik/tik_05/8750D0.c            |  2 +-
 src/world/common/CheckItemFlags40.inc.c       | 13 +++++++++
 53 files changed, 39 insertions(+), 721 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
 delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
 delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
 delete mode 100644 asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
 delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
 delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
 delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
 delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
 delete mode 100644 asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
 delete mode 100644 asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
 delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
 delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
 delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
 create mode 100644 src/world/common/CheckItemFlags40.inc.c

diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
deleted file mode 100644
index c423a6bfed..0000000000
--- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_C3D2E8
-/* C3D2E8 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C3D2EC 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* C3D2F0 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* C3D2F4 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* C3D2F8 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* C3D2FC 8024027C 0C0B1EAF */  jal       get_variable
-/* C3D300 80240280 8C450000 */   lw       $a1, ($v0)
-/* C3D304 80240284 00021140 */  sll       $v0, $v0, 5
-/* C3D308 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* C3D30C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* C3D310 80240290 00220821 */  addu      $at, $at, $v0
-/* C3D314 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* C3D318 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* C3D31C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* C3D320 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* C3D324 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* C3D328 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* C3D32C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* C3D330 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* C3D334 802402B4 03E00008 */  jr        $ra
-/* C3D338 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C3D33C 802402BC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
deleted file mode 100644
index 0f38f76d59..0000000000
--- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_C4E158
-/* C4E158 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C4E15C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* C4E160 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* C4E164 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* C4E168 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* C4E16C 8024027C 0C0B1EAF */  jal       get_variable
-/* C4E170 80240280 8C450000 */   lw       $a1, ($v0)
-/* C4E174 80240284 00021140 */  sll       $v0, $v0, 5
-/* C4E178 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* C4E17C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* C4E180 80240290 00220821 */  addu      $at, $at, $v0
-/* C4E184 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* C4E188 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* C4E18C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* C4E190 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* C4E194 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* C4E198 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* C4E19C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* C4E1A0 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* C4E1A4 802402B4 03E00008 */  jr        $ra
-/* C4E1A8 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C4E1AC 802402BC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
deleted file mode 100644
index 6127881d49..0000000000
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel begin_battle_C57158
-/* C57158 80241218 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C5715C 8024121C AFB00010 */  sw        $s0, 0x10($sp)
-/* C57160 80241220 0080802D */  daddu     $s0, $a0, $zero
-/* C57164 80241224 AFBF0014 */  sw        $ra, 0x14($sp)
-/* C57168 80241228 8E02000C */  lw        $v0, 0xc($s0)
-/* C5716C 8024122C 0C0B1EAF */  jal       get_variable
-/* C57170 80241230 8C450000 */   lw       $a1, ($v0)
-/* C57174 80241234 00021140 */  sll       $v0, $v0, 5
-/* C57178 80241238 AE000084 */  sw        $zero, 0x84($s0)
-/* C5717C 8024123C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* C57180 80241240 00220821 */  addu      $at, $at, $v0
-/* C57184 80241244 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* C57188 80241248 30420040 */  andi      $v0, $v0, 0x40
-/* C5718C 8024124C 10400002 */  beqz      $v0, .L80241258
-/* C57190 80241250 24020001 */   addiu    $v0, $zero, 1
-/* C57194 80241254 AE020084 */  sw        $v0, 0x84($s0)
-.L80241258:
-/* C57198 80241258 8FBF0014 */  lw        $ra, 0x14($sp)
-/* C5719C 8024125C 8FB00010 */  lw        $s0, 0x10($sp)
-/* C571A0 80241260 24020002 */  addiu     $v0, $zero, 2
-/* C571A4 80241264 03E00008 */  jr        $ra
-/* C571A8 80241268 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C571AC 8024126C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
deleted file mode 100644
index 7875e2d598..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242238_A3B718
-/* A3B718 80242238 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A3B71C 8024223C AFB00010 */  sw        $s0, 0x10($sp)
-/* A3B720 80242240 0080802D */  daddu     $s0, $a0, $zero
-/* A3B724 80242244 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A3B728 80242248 8E02000C */  lw        $v0, 0xc($s0)
-/* A3B72C 8024224C 0C0B1EAF */  jal       get_variable
-/* A3B730 80242250 8C450000 */   lw       $a1, ($v0)
-/* A3B734 80242254 00021140 */  sll       $v0, $v0, 5
-/* A3B738 80242258 AE000084 */  sw        $zero, 0x84($s0)
-/* A3B73C 8024225C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* A3B740 80242260 00220821 */  addu      $at, $at, $v0
-/* A3B744 80242264 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* A3B748 80242268 30420040 */  andi      $v0, $v0, 0x40
-/* A3B74C 8024226C 10400002 */  beqz      $v0, .L80242278
-/* A3B750 80242270 24020001 */   addiu    $v0, $zero, 1
-/* A3B754 80242274 AE020084 */  sw        $v0, 0x84($s0)
-.L80242278:
-/* A3B758 80242278 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A3B75C 8024227C 8FB00010 */  lw        $s0, 0x10($sp)
-/* A3B760 80242280 24020002 */  addiu     $v0, $zero, 2
-/* A3B764 80242284 03E00008 */  jr        $ra
-/* A3B768 80242288 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
deleted file mode 100644
index e5a231ce10..0000000000
--- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_986748
-/* 986748 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 98674C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* 986750 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* 986754 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 986758 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* 98675C 8024027C 0C0B1EAF */  jal       get_variable
-/* 986760 80240280 8C450000 */   lw       $a1, ($v0)
-/* 986764 80240284 00021140 */  sll       $v0, $v0, 5
-/* 986768 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 98676C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* 986770 80240290 00220821 */  addu      $at, $at, $v0
-/* 986774 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* 986778 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* 98677C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* 986780 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* 986784 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* 986788 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 98678C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 986790 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* 986794 802402B4 03E00008 */  jr        $ra
-/* 986798 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
deleted file mode 100644
index c0afdfea60..0000000000
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_918E18
-/* 918E18 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 918E1C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* 918E20 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* 918E24 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 918E28 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* 918E2C 8024027C 0C0B1EAF */  jal       get_variable
-/* 918E30 80240280 8C450000 */   lw       $a1, ($v0)
-/* 918E34 80240284 00021140 */  sll       $v0, $v0, 5
-/* 918E38 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 918E3C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* 918E40 80240290 00220821 */  addu      $at, $at, $v0
-/* 918E44 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* 918E48 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* 918E4C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* 918E50 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* 918E54 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* 918E58 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 918E5C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 918E60 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* 918E64 802402B4 03E00008 */  jr        $ra
-/* 918E68 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
deleted file mode 100644
index 64cdc774c2..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405B8_B44D28
-/* B44D28 802405B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B44D2C 802405BC AFB00010 */  sw        $s0, 0x10($sp)
-/* B44D30 802405C0 0080802D */  daddu     $s0, $a0, $zero
-/* B44D34 802405C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B44D38 802405C8 8E02000C */  lw        $v0, 0xc($s0)
-/* B44D3C 802405CC 0C0B1EAF */  jal       get_variable
-/* B44D40 802405D0 8C450000 */   lw       $a1, ($v0)
-/* B44D44 802405D4 00021140 */  sll       $v0, $v0, 5
-/* B44D48 802405D8 AE000084 */  sw        $zero, 0x84($s0)
-/* B44D4C 802405DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* B44D50 802405E0 00220821 */  addu      $at, $at, $v0
-/* B44D54 802405E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* B44D58 802405E8 30420040 */  andi      $v0, $v0, 0x40
-/* B44D5C 802405EC 10400002 */  beqz      $v0, .L802405F8
-/* B44D60 802405F0 24020001 */   addiu    $v0, $zero, 1
-/* B44D64 802405F4 AE020084 */  sw        $v0, 0x84($s0)
-.L802405F8:
-/* B44D68 802405F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B44D6C 802405FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* B44D70 80240600 24020002 */  addiu     $v0, $zero, 2
-/* B44D74 80240604 03E00008 */  jr        $ra
-/* B44D78 80240608 27BD0018 */   addiu    $sp, $sp, 0x18
-/* B44D7C 8024060C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
deleted file mode 100644
index f9e8671c71..0000000000
--- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_AF1EC8
-/* AF1EC8 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AF1ECC 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* AF1ED0 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* AF1ED4 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* AF1ED8 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* AF1EDC 8024027C 0C0B1EAF */  jal       get_variable
-/* AF1EE0 80240280 8C450000 */   lw       $a1, ($v0)
-/* AF1EE4 80240284 00021140 */  sll       $v0, $v0, 5
-/* AF1EE8 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* AF1EEC 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* AF1EF0 80240290 00220821 */  addu      $at, $at, $v0
-/* AF1EF4 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* AF1EF8 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* AF1EFC 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* AF1F00 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* AF1F04 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* AF1F08 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* AF1F0C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* AF1F10 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* AF1F14 802402B4 03E00008 */  jr        $ra
-/* AF1F18 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
deleted file mode 100644
index a29f9e2c23..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_8D8738
-/* 8D8738 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8D873C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8D8740 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* 8D8744 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8D8748 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* 8D874C 8024027C 0C0B1EAF */  jal       get_variable
-/* 8D8750 80240280 8C450000 */   lw       $a1, ($v0)
-/* 8D8754 80240284 00021140 */  sll       $v0, $v0, 5
-/* 8D8758 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* 8D875C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* 8D8760 80240290 00220821 */  addu      $at, $at, $v0
-/* 8D8764 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* 8D8768 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* 8D876C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* 8D8770 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* 8D8774 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* 8D8778 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8D877C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8D8780 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* 8D8784 802402B4 03E00008 */  jr        $ra
-/* 8D8788 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
deleted file mode 100644
index cd959556c0..0000000000
--- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240578_A59908
-/* A59908 80240578 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A5990C 8024057C AFB00010 */  sw        $s0, 0x10($sp)
-/* A59910 80240580 0080802D */  daddu     $s0, $a0, $zero
-/* A59914 80240584 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A59918 80240588 8E02000C */  lw        $v0, 0xc($s0)
-/* A5991C 8024058C 0C0B1EAF */  jal       get_variable
-/* A59920 80240590 8C450000 */   lw       $a1, ($v0)
-/* A59924 80240594 00021140 */  sll       $v0, $v0, 5
-/* A59928 80240598 AE000084 */  sw        $zero, 0x84($s0)
-/* A5992C 8024059C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* A59930 802405A0 00220821 */  addu      $at, $at, $v0
-/* A59934 802405A4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* A59938 802405A8 30420040 */  andi      $v0, $v0, 0x40
-/* A5993C 802405AC 10400002 */  beqz      $v0, .L802405B8
-/* A59940 802405B0 24020001 */   addiu    $v0, $zero, 1
-/* A59944 802405B4 AE020084 */  sw        $v0, 0x84($s0)
-.L802405B8:
-/* A59948 802405B8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A5994C 802405BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* A59950 802405C0 24020002 */  addiu     $v0, $zero, 2
-/* A59954 802405C4 03E00008 */  jr        $ra
-/* A59958 802405C8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A5995C 802405CC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
deleted file mode 100644
index e08f09b538..0000000000
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409F8_C71E78
-/* C71E78 802409F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C71E7C 802409FC AFB00010 */  sw        $s0, 0x10($sp)
-/* C71E80 80240A00 0080802D */  daddu     $s0, $a0, $zero
-/* C71E84 80240A04 AFBF0014 */  sw        $ra, 0x14($sp)
-/* C71E88 80240A08 8E02000C */  lw        $v0, 0xc($s0)
-/* C71E8C 80240A0C 0C0B1EAF */  jal       get_variable
-/* C71E90 80240A10 8C450000 */   lw       $a1, ($v0)
-/* C71E94 80240A14 00021140 */  sll       $v0, $v0, 5
-/* C71E98 80240A18 AE000084 */  sw        $zero, 0x84($s0)
-/* C71E9C 80240A1C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* C71EA0 80240A20 00220821 */  addu      $at, $at, $v0
-/* C71EA4 80240A24 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* C71EA8 80240A28 30420040 */  andi      $v0, $v0, 0x40
-/* C71EAC 80240A2C 10400002 */  beqz      $v0, .L80240A38
-/* C71EB0 80240A30 24020001 */   addiu    $v0, $zero, 1
-/* C71EB4 80240A34 AE020084 */  sw        $v0, 0x84($s0)
-.L80240A38:
-/* C71EB8 80240A38 8FBF0014 */  lw        $ra, 0x14($sp)
-/* C71EBC 80240A3C 8FB00010 */  lw        $s0, 0x10($sp)
-/* C71EC0 80240A40 24020002 */  addiu     $v0, $zero, 2
-/* C71EC4 80240A44 03E00008 */  jr        $ra
-/* C71EC8 80240A48 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C71ECC 80240A4C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
deleted file mode 100644
index e1d91b4109..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_BCEE58
-/* BCEE58 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BCEE5C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* BCEE60 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* BCEE64 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* BCEE68 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* BCEE6C 8024027C 0C0B1EAF */  jal       get_variable
-/* BCEE70 80240280 8C450000 */   lw       $a1, ($v0)
-/* BCEE74 80240284 00021140 */  sll       $v0, $v0, 5
-/* BCEE78 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* BCEE7C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* BCEE80 80240290 00220821 */  addu      $at, $at, $v0
-/* BCEE84 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* BCEE88 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* BCEE8C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* BCEE90 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* BCEE94 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* BCEE98 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BCEE9C 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* BCEEA0 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* BCEEA4 802402B4 03E00008 */  jr        $ra
-/* BCEEA8 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* BCEEAC 802402BC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
deleted file mode 100644
index 2fdc7b1b90..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AD8_DB83E8
-/* DB83E8 80240AD8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DB83EC 80240ADC AFB00010 */  sw        $s0, 0x10($sp)
-/* DB83F0 80240AE0 0080802D */  daddu     $s0, $a0, $zero
-/* DB83F4 80240AE4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* DB83F8 80240AE8 8E02000C */  lw        $v0, 0xc($s0)
-/* DB83FC 80240AEC 0C0B1EAF */  jal       get_variable
-/* DB8400 80240AF0 8C450000 */   lw       $a1, ($v0)
-/* DB8404 80240AF4 00021140 */  sll       $v0, $v0, 5
-/* DB8408 80240AF8 AE000084 */  sw        $zero, 0x84($s0)
-/* DB840C 80240AFC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* DB8410 80240B00 00220821 */  addu      $at, $at, $v0
-/* DB8414 80240B04 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* DB8418 80240B08 30420040 */  andi      $v0, $v0, 0x40
-/* DB841C 80240B0C 10400002 */  beqz      $v0, .L80240B18
-/* DB8420 80240B10 24020001 */   addiu    $v0, $zero, 1
-/* DB8424 80240B14 AE020084 */  sw        $v0, 0x84($s0)
-.L80240B18:
-/* DB8428 80240B18 8FBF0014 */  lw        $ra, 0x14($sp)
-/* DB842C 80240B1C 8FB00010 */  lw        $s0, 0x10($sp)
-/* DB8430 80240B20 24020002 */  addiu     $v0, $zero, 2
-/* DB8434 80240B24 03E00008 */  jr        $ra
-/* DB8438 80240B28 27BD0018 */   addiu    $sp, $sp, 0x18
-/* DB843C 80240B2C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
deleted file mode 100644
index 77117b7c23..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240988_DCD658
-/* DCD658 80240988 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DCD65C 8024098C AFB00010 */  sw        $s0, 0x10($sp)
-/* DCD660 80240990 0080802D */  daddu     $s0, $a0, $zero
-/* DCD664 80240994 AFBF0014 */  sw        $ra, 0x14($sp)
-/* DCD668 80240998 8E02000C */  lw        $v0, 0xc($s0)
-/* DCD66C 8024099C 0C0B1EAF */  jal       get_variable
-/* DCD670 802409A0 8C450000 */   lw       $a1, ($v0)
-/* DCD674 802409A4 00021140 */  sll       $v0, $v0, 5
-/* DCD678 802409A8 AE000084 */  sw        $zero, 0x84($s0)
-/* DCD67C 802409AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* DCD680 802409B0 00220821 */  addu      $at, $at, $v0
-/* DCD684 802409B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* DCD688 802409B8 30420040 */  andi      $v0, $v0, 0x40
-/* DCD68C 802409BC 10400002 */  beqz      $v0, .L802409C8
-/* DCD690 802409C0 24020001 */   addiu    $v0, $zero, 1
-/* DCD694 802409C4 AE020084 */  sw        $v0, 0x84($s0)
-.L802409C8:
-/* DCD698 802409C8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* DCD69C 802409CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* DCD6A0 802409D0 24020002 */  addiu     $v0, $zero, 2
-/* DCD6A4 802409D4 03E00008 */  jr        $ra
-/* DCD6A8 802409D8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* DCD6AC 802409DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
deleted file mode 100644
index c65da6908b..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241498_DE3928
-/* DE3928 80241498 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DE392C 8024149C AFB00010 */  sw        $s0, 0x10($sp)
-/* DE3930 802414A0 0080802D */  daddu     $s0, $a0, $zero
-/* DE3934 802414A4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* DE3938 802414A8 8E02000C */  lw        $v0, 0xc($s0)
-/* DE393C 802414AC 0C0B1EAF */  jal       get_variable
-/* DE3940 802414B0 8C450000 */   lw       $a1, ($v0)
-/* DE3944 802414B4 00021140 */  sll       $v0, $v0, 5
-/* DE3948 802414B8 AE000084 */  sw        $zero, 0x84($s0)
-/* DE394C 802414BC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* DE3950 802414C0 00220821 */  addu      $at, $at, $v0
-/* DE3954 802414C4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* DE3958 802414C8 30420040 */  andi      $v0, $v0, 0x40
-/* DE395C 802414CC 10400002 */  beqz      $v0, .L802414D8
-/* DE3960 802414D0 24020001 */   addiu    $v0, $zero, 1
-/* DE3964 802414D4 AE020084 */  sw        $v0, 0x84($s0)
-.L802414D8:
-/* DE3968 802414D8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* DE396C 802414DC 8FB00010 */  lw        $s0, 0x10($sp)
-/* DE3970 802414E0 24020002 */  addiu     $v0, $zero, 2
-/* DE3974 802414E4 03E00008 */  jr        $ra
-/* DE3978 802414E8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* DE397C 802414EC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
deleted file mode 100644
index af10412f52..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241188_D56D38
-/* D56D38 80241188 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D56D3C 8024118C AFB00010 */  sw        $s0, 0x10($sp)
-/* D56D40 80241190 0080802D */  daddu     $s0, $a0, $zero
-/* D56D44 80241194 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D56D48 80241198 8E02000C */  lw        $v0, 0xc($s0)
-/* D56D4C 8024119C 0C0B1EAF */  jal       get_variable
-/* D56D50 802411A0 8C450000 */   lw       $a1, ($v0)
-/* D56D54 802411A4 00021140 */  sll       $v0, $v0, 5
-/* D56D58 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D56D5C 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D56D60 802411B0 00220821 */  addu      $at, $at, $v0
-/* D56D64 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D56D68 802411B8 30420040 */  andi      $v0, $v0, 0x40
-/* D56D6C 802411BC 10400002 */  beqz      $v0, .L802411C8
-/* D56D70 802411C0 24020001 */   addiu    $v0, $zero, 1
-/* D56D74 802411C4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411C8:
-/* D56D78 802411C8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D56D7C 802411CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D56D80 802411D0 24020002 */  addiu     $v0, $zero, 2
-/* D56D84 802411D4 03E00008 */  jr        $ra
-/* D56D88 802411D8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D56D8C 802411DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
deleted file mode 100644
index 7b9aedc5ab..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241188_D62688
-/* D62688 80241188 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6268C 8024118C AFB00010 */  sw        $s0, 0x10($sp)
-/* D62690 80241190 0080802D */  daddu     $s0, $a0, $zero
-/* D62694 80241194 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D62698 80241198 8E02000C */  lw        $v0, 0xc($s0)
-/* D6269C 8024119C 0C0B1EAF */  jal       get_variable
-/* D626A0 802411A0 8C450000 */   lw       $a1, ($v0)
-/* D626A4 802411A4 00021140 */  sll       $v0, $v0, 5
-/* D626A8 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D626AC 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D626B0 802411B0 00220821 */  addu      $at, $at, $v0
-/* D626B4 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D626B8 802411B8 30420040 */  andi      $v0, $v0, 0x40
-/* D626BC 802411BC 10400002 */  beqz      $v0, .L802411C8
-/* D626C0 802411C0 24020001 */   addiu    $v0, $zero, 1
-/* D626C4 802411C4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411C8:
-/* D626C8 802411C8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D626CC 802411CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D626D0 802411D0 24020002 */  addiu     $v0, $zero, 2
-/* D626D4 802411D4 03E00008 */  jr        $ra
-/* D626D8 802411D8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D626DC 802411DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
deleted file mode 100644
index 2cdd966250..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411B8_D63EC8
-/* D63EC8 802411B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D63ECC 802411BC AFB00010 */  sw        $s0, 0x10($sp)
-/* D63ED0 802411C0 0080802D */  daddu     $s0, $a0, $zero
-/* D63ED4 802411C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D63ED8 802411C8 8E02000C */  lw        $v0, 0xc($s0)
-/* D63EDC 802411CC 0C0B1EAF */  jal       get_variable
-/* D63EE0 802411D0 8C450000 */   lw       $a1, ($v0)
-/* D63EE4 802411D4 00021140 */  sll       $v0, $v0, 5
-/* D63EE8 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D63EEC 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D63EF0 802411E0 00220821 */  addu      $at, $at, $v0
-/* D63EF4 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D63EF8 802411E8 30420040 */  andi      $v0, $v0, 0x40
-/* D63EFC 802411EC 10400002 */  beqz      $v0, .L802411F8
-/* D63F00 802411F0 24020001 */   addiu    $v0, $zero, 1
-/* D63F04 802411F4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411F8:
-/* D63F08 802411F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D63F0C 802411FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D63F10 80241200 24020002 */  addiu     $v0, $zero, 2
-/* D63F14 80241204 03E00008 */  jr        $ra
-/* D63F18 80241208 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D63F1C 8024120C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
deleted file mode 100644
index e6c3810e5d..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241188_D68E88
-/* D68E88 80241188 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D68E8C 8024118C AFB00010 */  sw        $s0, 0x10($sp)
-/* D68E90 80241190 0080802D */  daddu     $s0, $a0, $zero
-/* D68E94 80241194 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D68E98 80241198 8E02000C */  lw        $v0, 0xc($s0)
-/* D68E9C 8024119C 0C0B1EAF */  jal       get_variable
-/* D68EA0 802411A0 8C450000 */   lw       $a1, ($v0)
-/* D68EA4 802411A4 00021140 */  sll       $v0, $v0, 5
-/* D68EA8 802411A8 AE000084 */  sw        $zero, 0x84($s0)
-/* D68EAC 802411AC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D68EB0 802411B0 00220821 */  addu      $at, $at, $v0
-/* D68EB4 802411B4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D68EB8 802411B8 30420040 */  andi      $v0, $v0, 0x40
-/* D68EBC 802411BC 10400002 */  beqz      $v0, .L802411C8
-/* D68EC0 802411C0 24020001 */   addiu    $v0, $zero, 1
-/* D68EC4 802411C4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411C8:
-/* D68EC8 802411C8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D68ECC 802411CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D68ED0 802411D0 24020002 */  addiu     $v0, $zero, 2
-/* D68ED4 802411D4 03E00008 */  jr        $ra
-/* D68ED8 802411D8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D68EDC 802411DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
deleted file mode 100644
index 531b0ab6d9..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411B8_D7ABA8
-/* D7ABA8 802411B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7ABAC 802411BC AFB00010 */  sw        $s0, 0x10($sp)
-/* D7ABB0 802411C0 0080802D */  daddu     $s0, $a0, $zero
-/* D7ABB4 802411C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D7ABB8 802411C8 8E02000C */  lw        $v0, 0xc($s0)
-/* D7ABBC 802411CC 0C0B1EAF */  jal       get_variable
-/* D7ABC0 802411D0 8C450000 */   lw       $a1, ($v0)
-/* D7ABC4 802411D4 00021140 */  sll       $v0, $v0, 5
-/* D7ABC8 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D7ABCC 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D7ABD0 802411E0 00220821 */  addu      $at, $at, $v0
-/* D7ABD4 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D7ABD8 802411E8 30420040 */  andi      $v0, $v0, 0x40
-/* D7ABDC 802411EC 10400002 */  beqz      $v0, .L802411F8
-/* D7ABE0 802411F0 24020001 */   addiu    $v0, $zero, 1
-/* D7ABE4 802411F4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411F8:
-/* D7ABE8 802411F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D7ABEC 802411FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D7ABF0 80241200 24020002 */  addiu     $v0, $zero, 2
-/* D7ABF4 80241204 03E00008 */  jr        $ra
-/* D7ABF8 80241208 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D7ABFC 8024120C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
deleted file mode 100644
index 63e76797cf..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411B8_D7C458
-/* D7C458 802411B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7C45C 802411BC AFB00010 */  sw        $s0, 0x10($sp)
-/* D7C460 802411C0 0080802D */  daddu     $s0, $a0, $zero
-/* D7C464 802411C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D7C468 802411C8 8E02000C */  lw        $v0, 0xc($s0)
-/* D7C46C 802411CC 0C0B1EAF */  jal       get_variable
-/* D7C470 802411D0 8C450000 */   lw       $a1, ($v0)
-/* D7C474 802411D4 00021140 */  sll       $v0, $v0, 5
-/* D7C478 802411D8 AE000084 */  sw        $zero, 0x84($s0)
-/* D7C47C 802411DC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D7C480 802411E0 00220821 */  addu      $at, $at, $v0
-/* D7C484 802411E4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D7C488 802411E8 30420040 */  andi      $v0, $v0, 0x40
-/* D7C48C 802411EC 10400002 */  beqz      $v0, .L802411F8
-/* D7C490 802411F0 24020001 */   addiu    $v0, $zero, 1
-/* D7C494 802411F4 AE020084 */  sw        $v0, 0x84($s0)
-.L802411F8:
-/* D7C498 802411F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D7C49C 802411FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D7C4A0 80241200 24020002 */  addiu     $v0, $zero, 2
-/* D7C4A4 80241204 03E00008 */  jr        $ra
-/* D7C4A8 80241208 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D7C4AC 8024120C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
deleted file mode 100644
index 56d903bf8b..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242BB8_D8FE08
-/* D8FE08 80242BB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8FE0C 80242BBC AFB00010 */  sw        $s0, 0x10($sp)
-/* D8FE10 80242BC0 0080802D */  daddu     $s0, $a0, $zero
-/* D8FE14 80242BC4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D8FE18 80242BC8 8E02000C */  lw        $v0, 0xc($s0)
-/* D8FE1C 80242BCC 0C0B1EAF */  jal       get_variable
-/* D8FE20 80242BD0 8C450000 */   lw       $a1, ($v0)
-/* D8FE24 80242BD4 00021140 */  sll       $v0, $v0, 5
-/* D8FE28 80242BD8 AE000084 */  sw        $zero, 0x84($s0)
-/* D8FE2C 80242BDC 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D8FE30 80242BE0 00220821 */  addu      $at, $at, $v0
-/* D8FE34 80242BE4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D8FE38 80242BE8 30420040 */  andi      $v0, $v0, 0x40
-/* D8FE3C 80242BEC 10400002 */  beqz      $v0, .L80242BF8
-/* D8FE40 80242BF0 24020001 */   addiu    $v0, $zero, 1
-/* D8FE44 80242BF4 AE020084 */  sw        $v0, 0x84($s0)
-.L80242BF8:
-/* D8FE48 80242BF8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D8FE4C 80242BFC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D8FE50 80242C00 24020002 */  addiu     $v0, $zero, 2
-/* D8FE54 80242C04 03E00008 */  jr        $ra
-/* D8FE58 80242C08 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D8FE5C 80242C0C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
deleted file mode 100644
index 3648ece98f..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241EF8_CF9A68
-/* CF9A68 80241EF8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF9A6C 80241EFC AFB00010 */  sw        $s0, 0x10($sp)
-/* CF9A70 80241F00 0080802D */  daddu     $s0, $a0, $zero
-/* CF9A74 80241F04 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CF9A78 80241F08 8E02000C */  lw        $v0, 0xc($s0)
-/* CF9A7C 80241F0C 0C0B1EAF */  jal       get_variable
-/* CF9A80 80241F10 8C450000 */   lw       $a1, ($v0)
-/* CF9A84 80241F14 00021140 */  sll       $v0, $v0, 5
-/* CF9A88 80241F18 AE000084 */  sw        $zero, 0x84($s0)
-/* CF9A8C 80241F1C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* CF9A90 80241F20 00220821 */  addu      $at, $at, $v0
-/* CF9A94 80241F24 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* CF9A98 80241F28 30420040 */  andi      $v0, $v0, 0x40
-/* CF9A9C 80241F2C 10400002 */  beqz      $v0, .L80241F38
-/* CF9AA0 80241F30 24020001 */   addiu    $v0, $zero, 1
-/* CF9AA4 80241F34 AE020084 */  sw        $v0, 0x84($s0)
-.L80241F38:
-/* CF9AA8 80241F38 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CF9AAC 80241F3C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF9AB0 80241F40 24020002 */  addiu     $v0, $zero, 2
-/* CF9AB4 80241F44 03E00008 */  jr        $ra
-/* CF9AB8 80241F48 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CF9ABC 80241F4C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
deleted file mode 100644
index 403bdbdf18..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240268_D37A68
-/* D37A68 80240268 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D37A6C 8024026C AFB00010 */  sw        $s0, 0x10($sp)
-/* D37A70 80240270 0080802D */  daddu     $s0, $a0, $zero
-/* D37A74 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D37A78 80240278 8E02000C */  lw        $v0, 0xc($s0)
-/* D37A7C 8024027C 0C0B1EAF */  jal       get_variable
-/* D37A80 80240280 8C450000 */   lw       $a1, ($v0)
-/* D37A84 80240284 00021140 */  sll       $v0, $v0, 5
-/* D37A88 80240288 AE000084 */  sw        $zero, 0x84($s0)
-/* D37A8C 8024028C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* D37A90 80240290 00220821 */  addu      $at, $at, $v0
-/* D37A94 80240294 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* D37A98 80240298 30420040 */  andi      $v0, $v0, 0x40
-/* D37A9C 8024029C 10400002 */  beqz      $v0, .L802402A8
-/* D37AA0 802402A0 24020001 */   addiu    $v0, $zero, 1
-/* D37AA4 802402A4 AE020084 */  sw        $v0, 0x84($s0)
-.L802402A8:
-/* D37AA8 802402A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D37AAC 802402AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D37AB0 802402B0 24020002 */  addiu     $v0, $zero, 2
-/* D37AB4 802402B4 03E00008 */  jr        $ra
-/* D37AB8 802402B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
deleted file mode 100644
index de36c223b6..0000000000
--- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240578_86CCB8
-/* 86CCB8 80240578 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 86CCBC 8024057C AFB00010 */  sw        $s0, 0x10($sp)
-/* 86CCC0 80240580 0080802D */  daddu     $s0, $a0, $zero
-/* 86CCC4 80240584 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 86CCC8 80240588 8E02000C */  lw        $v0, 0xc($s0)
-/* 86CCCC 8024058C 0C0B1EAF */  jal       get_variable
-/* 86CCD0 80240590 8C450000 */   lw       $a1, ($v0)
-/* 86CCD4 80240594 00021140 */  sll       $v0, $v0, 5
-/* 86CCD8 80240598 AE000084 */  sw        $zero, 0x84($s0)
-/* 86CCDC 8024059C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* 86CCE0 802405A0 00220821 */  addu      $at, $at, $v0
-/* 86CCE4 802405A4 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* 86CCE8 802405A8 30420040 */  andi      $v0, $v0, 0x40
-/* 86CCEC 802405AC 10400002 */  beqz      $v0, .L802405B8
-/* 86CCF0 802405B0 24020001 */   addiu    $v0, $zero, 1
-/* 86CCF4 802405B4 AE020084 */  sw        $v0, 0x84($s0)
-.L802405B8:
-/* 86CCF8 802405B8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 86CCFC 802405BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 86CD00 802405C0 24020002 */  addiu     $v0, $zero, 2
-/* 86CD04 802405C4 03E00008 */  jr        $ra
-/* 86CD08 802405C8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 86CD0C 802405CC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
deleted file mode 100644
index e9417584aa..0000000000
--- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408E8_8756A8
-/* 8756A8 802408E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8756AC 802408EC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8756B0 802408F0 0080802D */  daddu     $s0, $a0, $zero
-/* 8756B4 802408F4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8756B8 802408F8 8E02000C */  lw        $v0, 0xc($s0)
-/* 8756BC 802408FC 0C0B1EAF */  jal       get_variable
-/* 8756C0 80240900 8C450000 */   lw       $a1, ($v0)
-/* 8756C4 80240904 00021140 */  sll       $v0, $v0, 5
-/* 8756C8 80240908 AE000084 */  sw        $zero, 0x84($s0)
-/* 8756CC 8024090C 3C018008 */  lui       $at, %hi(gItemTable+0x18)
-/* 8756D0 80240910 00220821 */  addu      $at, $at, $v0
-/* 8756D4 80240914 942278F8 */  lhu       $v0, %lo(gItemTable+0x18)($at)
-/* 8756D8 80240918 30420040 */  andi      $v0, $v0, 0x40
-/* 8756DC 8024091C 10400002 */  beqz      $v0, .L80240928
-/* 8756E0 80240920 24020001 */   addiu    $v0, $zero, 1
-/* 8756E4 80240924 AE020084 */  sw        $v0, 0x84($s0)
-.L80240928:
-/* 8756E8 80240928 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8756EC 8024092C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8756F0 80240930 24020002 */  addiu     $v0, $zero, 2
-/* 8756F4 80240934 03E00008 */  jr        $ra
-/* 8756F8 80240938 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c
index 1471fa65ca..08ae3e5fa4 100644
--- a/src/world/area_dgb/dgb_06/C3D080.c
+++ b/src/world/area_dgb/dgb_06/C3D080.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240268_C3D2E8);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c
index d5b7c68242..df5f5c27fc 100644
--- a/src/world/area_dgb/dgb_12/C4DEF0.c
+++ b/src/world/area_dgb/dgb_12/C4DEF0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240268_C4E158);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c
index 7a74c96951..16efad6d8a 100644
--- a/src/world/area_dgb/dgb_18/C56EF0.c
+++ b/src/world/area_dgb/dgb_18/C56EF0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", begin_battle_C57158);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c
index deb9883e50..79a7d216f8 100644
--- a/src/world/area_hos/hos_06/A3B4B0.c
+++ b/src/world/area_hos/hos_06/A3B4B0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C);
 
diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c
index 8139d4e67d..84e963a1d5 100644
--- a/src/world/area_isk/isk_09/9864E0.c
+++ b/src/world/area_isk/isk_09/9864E0.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240268_986748);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_802402BC_98679C);
diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c
index 88c66109a5..5a85b2942f 100644
--- a/src/world/area_iwa/iwa_03/918BB0.c
+++ b/src/world/area_iwa/iwa_03/918BB0.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240268_918E18);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_802402BC_918E6C);
diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c
index eb4ec0bf20..26bb0f5f45 100644
--- a/src/world/area_jan/jan_04/B44AC0.c
+++ b/src/world/area_jan/jan_04/B44AC0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c
index b8158372c1..c656a4150f 100644
--- a/src/world/area_kkj/kkj_17/AF1C60.c
+++ b/src/world/area_kkj/kkj_17/AF1C60.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240268_AF1EC8);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_802402BC_AF1F1C);
 
diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index b6fe6e8913..7ade274f5b 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C);
 
diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c
index 7667f67e77..d311dc3f57 100644
--- a/src/world/area_kpa/kpa_15/A596A0.c
+++ b/src/world/area_kpa/kpa_15/A596A0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240578_A59908);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c
index 45d3806333..df32b34791 100644
--- a/src/world/area_kzn/kzn_08/C71C10.c
+++ b/src/world/area_kzn/kzn_08/C71C10.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802409F8_C71E78);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c
index fc12fd89b2..2b40c4a695 100644
--- a/src/world/area_obk/obk_07/BCEBF0.c
+++ b/src/world/area_obk/obk_07/BCEBF0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240268_BCEE58);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c
index f700b956d2..fa7b3fb67c 100644
--- a/src/world/area_omo/omo_06/DB8180.c
+++ b/src/world/area_omo/omo_06/DB8180.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c
index 580b5ccca3..2c926ed605 100644
--- a/src/world/area_omo/omo_09/DCD3F0.c
+++ b/src/world/area_omo/omo_09/DCD3F0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c
index ed8e7fbb17..81b3f5db67 100644
--- a/src/world/area_omo/omo_13/DE36C0.c
+++ b/src/world/area_omo/omo_13/DE36C0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c
index 5923069bbf..bf201d80df 100644
--- a/src/world/area_pra/pra_05/D55BD0.c
+++ b/src/world/area_pra/pra_05/D55BD0.c
@@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c
index b29e0eb8e5..b5aa5bfc93 100644
--- a/src/world/area_pra/pra_11/D61520.c
+++ b/src/world/area_pra/pra_11/D61520.c
@@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241188_D62688);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
index 36a4a29249..9b32793842 100644
--- a/src/world/area_pra/pra_12/D62D10.c
+++ b/src/world/area_pra/pra_12/D62D10.c
@@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802411B8_D63EC8);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c
index 0869525b6c..1e1f1de106 100644
--- a/src/world/area_pra/pra_14/D67D20.c
+++ b/src/world/area_pra/pra_14/D67D20.c
@@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241188_D68E88);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
index bcea4c8d5c..43aee5fc08 100644
--- a/src/world/area_pra/pra_27/D799F0.c
+++ b/src/world/area_pra/pra_27/D799F0.c
@@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802411B8_D7ABA8);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
index f9804c79ff..b6851b8fee 100644
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ b/src/world/area_pra/pra_28/D7B2A0.c
@@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802411B8_D7C458);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c
index 66476e5833..ad243b6b9f 100644
--- a/src/world/area_pra/pra_35/D8FBA0.c
+++ b/src/world/area_pra/pra_35/D8FBA0.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 3da3677484..f7fc1e9651 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -84,4 +84,4 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c
index fee35719cc..0f9904054e 100644
--- a/src/world/area_sam/sam_10/D37800.c
+++ b/src/world/area_sam/sam_10/D37800.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240268_D37A68);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC);
 
diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c
index 356fa762d9..ae8715539d 100644
--- a/src/world/area_tik/tik_02/86CA50.c
+++ b/src/world/area_tik/tik_02/86CA50.c
@@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8);
+#include "world/common/CheckItemFlags40.inc.c"
diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c
index 3d5e6177df..afa714dfa2 100644
--- a/src/world/area_tik/tik_05/8750D0.c
+++ b/src/world/area_tik/tik_05/8750D0.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440);
 
 #include "world/common/SomeItemEntityFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8);
+#include "world/common/CheckItemFlags40.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C_8756FC);
 
diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/CheckItemFlags40.inc.c
new file mode 100644
index 0000000000..7c0bad9a33
--- /dev/null
+++ b/src/world/common/CheckItemFlags40.inc.c
@@ -0,0 +1,13 @@
+#include "common.h"
+
+static ApiStatus CheckItemFlags40(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemIndex = get_variable(script, *args++);
+
+    script->varTable[0] = FALSE;
+    if (gItemTable[itemIndex].typeFlags & 0x40) {
+        script->varTable[0] = TRUE;
+    }
+
+    return ApiStatus_DONE2;
+}

From 087b30ab35ba833d6064221456adbbfc0ab10af9 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:04:59 -0500
Subject: [PATCH 096/101] a couple more kmrs

---
 .../kmr_11/8DAFC0/func_80240EC0_8DAFC0.s      | 28 -------------------
 include/common_structs.h                      |  3 +-
 src/world/area_kmr/kmr_10/8D84D0.c            | 15 ++++++++++
 src/world/area_kmr/kmr_11/8DAFC0.c            | 10 ++++++-
 4 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s

diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s
deleted file mode 100644
index 500303fb66..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EC0_8DAFC0
-/* 8DAFC0 80240EC0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8DAFC4 80240EC4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8DAFC8 80240EC8 0080802D */  daddu     $s0, $a0, $zero
-/* 8DAFCC 80240ECC AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8DAFD0 80240ED0 0C04417A */  jal       get_entity_by_index
-/* 8DAFD4 80240ED4 8E0400AC */   lw       $a0, 0xac($s0)
-/* 8DAFD8 80240ED8 0040182D */  daddu     $v1, $v0, $zero
-/* 8DAFDC 80240EDC C6000084 */  lwc1      $f0, 0x84($s0)
-/* 8DAFE0 80240EE0 46800020 */  cvt.s.w   $f0, $f0
-/* 8DAFE4 80240EE4 E4600048 */  swc1      $f0, 0x48($v1)
-/* 8DAFE8 80240EE8 C6000088 */  lwc1      $f0, 0x88($s0)
-/* 8DAFEC 80240EEC 46800020 */  cvt.s.w   $f0, $f0
-/* 8DAFF0 80240EF0 E460004C */  swc1      $f0, 0x4c($v1)
-/* 8DAFF4 80240EF4 C600008C */  lwc1      $f0, 0x8c($s0)
-/* 8DAFF8 80240EF8 46800020 */  cvt.s.w   $f0, $f0
-/* 8DAFFC 80240EFC E4600050 */  swc1      $f0, 0x50($v1)
-/* 8DB000 80240F00 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8DB004 80240F04 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8DB008 80240F08 24020002 */  addiu     $v0, $zero, 2
-/* 8DB00C 80240F0C 03E00008 */  jr        $ra
-/* 8DB010 80240F10 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8DB014 80240F14 00000000 */  nop       
-/* 8DB018 80240F18 00000000 */  nop       
-/* 8DB01C 80240F1C 00000000 */  nop       
diff --git a/include/common_structs.h b/include/common_structs.h
index 807d692c00..be64321f80 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -271,7 +271,8 @@ typedef struct Entity {
     /* 0x07 */ char unk_08[4];
     /* 0x0B */ u8 alpha; /* reported by rain */
     /* 0x0C */ s16 aabb[3];
-    /* 0x12 */ char unk_12[4];
+    /* 0x12 */ char unk_12[2];
+    /* 0x14 */ s16 unk_14;
     /* 0x16 */ s16 shadowIndex;
     /* 0x18 */ char unk_18[16];
     /* 0x28 */ Bytecode* boundScript;
diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index 7ade274f5b..2b64600489 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -8,7 +8,22 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 
 #include "world/common/CheckItemFlags40.inc.c"
 
+#ifdef NON_MATCHING
+ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Entity *entity = get_entity_by_index(get_variable(script, *args++));
+    s32 something = 0x1E4;
+
+    if (entity == NULL) {
+        return ApiStatus_BLOCK;
+    }
+
+    play_model_animation(entity->unk_14, 0x1E4);
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C);
+#endif
 
 ApiStatus func_80240304_8D87D4(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_kmr/kmr_11/8DAFC0.c b/src/world/area_kmr/kmr_11/8DAFC0.c
index f2c56537a0..0ca706c981 100644
--- a/src/world/area_kmr/kmr_11/8DAFC0.c
+++ b/src/world/area_kmr/kmr_11/8DAFC0.c
@@ -1,3 +1,11 @@
 #include "kmr_11.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DAFC0", func_80240EC0_8DAFC0);
+ApiStatus func_80240EC0_8DAFC0(ScriptInstance* script, s32 isInitialCall) {
+    Entity* entity = get_entity_by_index(script->varTable[10]);
+
+    entity->position.x = script->varTable[0];
+    entity->position.y = script->varTable[1];
+    entity->position.z = script->varTable[2];
+
+    return ApiStatus_DONE2;
+}

From 202243349f52c7b02cefe143a9e14ee52ae9f203 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:10:37 -0500
Subject: [PATCH 097/101] format

---
 src/world/area_kmr/kmr_10/8D84D0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index 2b64600489..638c0b459b 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 #ifdef NON_MATCHING
 ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    Entity *entity = get_entity_by_index(get_variable(script, *args++));
+    Entity* entity = get_entity_by_index(get_variable(script, *args++));
     s32 something = 0x1E4;
 
     if (entity == NULL) {

From d604f179c83ffe109c477a5299e26e30193b1ec6 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:24:18 -0500
Subject: [PATCH 098/101] PR comments

---
 src/world/area_kmr/kmr_06/8D2A10.c | 6 +++---
 src/world/area_kmr/kmr_10/8D84D0.c | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c
index e16bb442c4..0844ff9259 100644
--- a/src/world/area_kmr/kmr_06/8D2A10.c
+++ b/src/world/area_kmr/kmr_06/8D2A10.c
@@ -26,9 +26,9 @@ ApiStatus func_80241CC8_8D31D8(ScriptInstance* script, s32 isInitialCall) {
     heap_free(mapVar11);
     heap_free(mapVar12);
 
-    set_variable(script, SI_MAP_VAR(10), 0);
-    set_variable(script, SI_MAP_VAR(11), 0);
-    set_variable(script, SI_MAP_VAR(12), 0);
+    set_variable(script, SI_MAP_VAR(10), NULL);
+    set_variable(script, SI_MAP_VAR(11), NULL);
+    set_variable(script, SI_MAP_VAR(12), NULL);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index 638c0b459b..0ff186c71c 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -12,7 +12,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Entity* entity = get_entity_by_index(get_variable(script, *args++));
-    s32 something = 0x1E4;
 
     if (entity == NULL) {
         return ApiStatus_BLOCK;

From d16d6a3c1a7f16fd3afb02e377d37b670c9f2458 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:31:54 -0500
Subject: [PATCH 099/101] comment

---
 src/world/area_kmr/kmr_10/8D84D0.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index 0ff186c71c..30e9e15943 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -9,6 +9,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 #include "world/common/CheckItemFlags40.inc.c"
 
 #ifdef NON_MATCHING
+// 0x1E4 is probably a linker constant. We need to learn more about animations,
+// play_model_animation, and entity->unk_14 before we can tackle this
 ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Entity* entity = get_entity_by_index(get_variable(script, *args++));

From cadd7693a9d27eb0ac69d6cc10ed433b8629b119 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:41:24 -0500
Subject: [PATCH 100/101] fixing paths

---
 .../code_7E2AA0/MakeDoorAdvanced.s            | 394 ------------------
 asm/nonmatchings/code_7E2AA0/func_802822A8.s  |  31 --
 asm/nonmatchings/code_7E2AA0/func_8028236C.s  |  21 -
 asm/nonmatchings/code_7E2AA0/func_802823B0.s  |  29 --
 asm/nonmatchings/code_7E2AA0/func_80282414.s  | 105 -----
 asm/nonmatchings/code_7E2AA0/func_80282634.s  |  60 ---
 asm/nonmatchings/code_7E2AA0/func_80282700.s  |  36 --
 .../script_api/7E2AA0}/func_80282594.s        |   0
 src/world/script_api/7E0E80.c                 |  38 +-
 src/world/script_api/7E2AA0.c                 |  16 +-
 src/world/script_api/7E3700.c                 |  48 +--
 src/world/world.c                             |  48 +--
 12 files changed, 75 insertions(+), 751 deletions(-)
 delete mode 100644 asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_802822A8.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_8028236C.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_802823B0.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282414.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282634.s
 delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282700.s
 rename asm/nonmatchings/{code_7E2AA0 => world/script_api/7E2AA0}/func_80282594.s (100%)

diff --git a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s
deleted file mode 100644
index 96d43f70bf..0000000000
--- a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s
+++ /dev/null
@@ -1,394 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel MakeDoorAdvanced
-/* 7E2B2C 80281CAC 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 7E2B30 80281CB0 AFB10034 */  sw        $s1, 0x34($sp)
-/* 7E2B34 80281CB4 0080882D */  daddu     $s1, $a0, $zero
-/* 7E2B38 80281CB8 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 7E2B3C 80281CBC AFBE0050 */  sw        $fp, 0x50($sp)
-/* 7E2B40 80281CC0 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 7E2B44 80281CC4 AFB60048 */  sw        $s6, 0x48($sp)
-/* 7E2B48 80281CC8 AFB50044 */  sw        $s5, 0x44($sp)
-/* 7E2B4C 80281CCC AFB40040 */  sw        $s4, 0x40($sp)
-/* 7E2B50 80281CD0 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 7E2B54 80281CD4 AFB20038 */  sw        $s2, 0x38($sp)
-/* 7E2B58 80281CD8 AFB00030 */  sw        $s0, 0x30($sp)
-/* 7E2B5C 80281CDC 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E2B60 80281CE0 0C00AB39 */  jal       heap_malloc
-/* 7E2B64 80281CE4 24040064 */   addiu    $a0, $zero, 0x64
-/* 7E2B68 80281CE8 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2B6C 80281CEC 0040902D */  daddu     $s2, $v0, $zero
-/* 7E2B70 80281CF0 AE400000 */  sw        $zero, ($s2)
-/* 7E2B74 80281CF4 8E050000 */  lw        $a1, ($s0)
-/* 7E2B78 80281CF8 0C0B1EAF */  jal       get_variable
-/* 7E2B7C 80281CFC 26100004 */   addiu    $s0, $s0, 4
-/* 7E2B80 80281D00 0040982D */  daddu     $s3, $v0, $zero
-/* 7E2B84 80281D04 32620FFF */  andi      $v0, $s3, 0xfff
-/* 7E2B88 80281D08 AE420004 */  sw        $v0, 4($s2)
-/* 7E2B8C 80281D0C 3262F000 */  andi      $v0, $s3, 0xf000
-/* 7E2B90 80281D10 00021303 */  sra       $v0, $v0, 0xc
-/* 7E2B94 80281D14 A6420008 */  sh        $v0, 8($s2)
-/* 7E2B98 80281D18 A640000A */  sh        $zero, 0xa($s2)
-/* 7E2B9C 80281D1C 8E050000 */  lw        $a1, ($s0)
-/* 7E2BA0 80281D20 26100004 */  addiu     $s0, $s0, 4
-/* 7E2BA4 80281D24 0C0B1EAF */  jal       get_variable
-/* 7E2BA8 80281D28 0220202D */   daddu    $a0, $s1, $zero
-/* 7E2BAC 80281D2C 8E050000 */  lw        $a1, ($s0)
-/* 7E2BB0 80281D30 26100004 */  addiu     $s0, $s0, 4
-/* 7E2BB4 80281D34 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2BB8 80281D38 0C0B1EAF */  jal       get_variable
-/* 7E2BBC 80281D3C AFA2002C */   sw       $v0, 0x2c($sp)
-/* 7E2BC0 80281D40 8E050000 */  lw        $a1, ($s0)
-/* 7E2BC4 80281D44 26100004 */  addiu     $s0, $s0, 4
-/* 7E2BC8 80281D48 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2BCC 80281D4C 0C0B1EAF */  jal       get_variable
-/* 7E2BD0 80281D50 0040F02D */   daddu    $fp, $v0, $zero
-/* 7E2BD4 80281D54 8E050000 */  lw        $a1, ($s0)
-/* 7E2BD8 80281D58 26100004 */  addiu     $s0, $s0, 4
-/* 7E2BDC 80281D5C 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2BE0 80281D60 0C0B1EAF */  jal       get_variable
-/* 7E2BE4 80281D64 0040A82D */   daddu    $s5, $v0, $zero
-/* 7E2BE8 80281D68 8E050000 */  lw        $a1, ($s0)
-/* 7E2BEC 80281D6C 26100004 */  addiu     $s0, $s0, 4
-/* 7E2BF0 80281D70 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2BF4 80281D74 0C0B1EAF */  jal       get_variable
-/* 7E2BF8 80281D78 0040B82D */   daddu    $s7, $v0, $zero
-/* 7E2BFC 80281D7C 0040A02D */  daddu     $s4, $v0, $zero
-/* 7E2C00 80281D80 AE540060 */  sw        $s4, 0x60($s2)
-/* 7E2C04 80281D84 8E050000 */  lw        $a1, ($s0)
-/* 7E2C08 80281D88 26100004 */  addiu     $s0, $s0, 4
-/* 7E2C0C 80281D8C 0C0B1EAF */  jal       get_variable
-/* 7E2C10 80281D90 0220202D */   daddu    $a0, $s1, $zero
-/* 7E2C14 80281D94 8E050000 */  lw        $a1, ($s0)
-/* 7E2C18 80281D98 26100004 */  addiu     $s0, $s0, 4
-/* 7E2C1C 80281D9C 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2C20 80281DA0 0C0B1EAF */  jal       get_variable
-/* 7E2C24 80281DA4 0040B02D */   daddu    $s6, $v0, $zero
-/* 7E2C28 80281DA8 AE42003C */  sw        $v0, 0x3c($s2)
-/* 7E2C2C 80281DAC 8E050000 */  lw        $a1, ($s0)
-/* 7E2C30 80281DB0 0C0B1EAF */  jal       get_variable
-/* 7E2C34 80281DB4 0220202D */   daddu    $a0, $s1, $zero
-/* 7E2C38 80281DB8 12A00003 */  beqz      $s5, .L80281DC8
-/* 7E2C3C 80281DBC AE42005C */   sw       $v0, 0x5c($s2)
-/* 7E2C40 80281DC0 36730800 */  ori       $s3, $s3, 0x800
-/* 7E2C44 80281DC4 AE530004 */  sw        $s3, 4($s2)
-.L80281DC8:
-/* 7E2C48 80281DC8 0280202D */  daddu     $a0, $s4, $zero
-/* 7E2C4C 80281DCC 27A50018 */  addiu     $a1, $sp, 0x18
-/* 7E2C50 80281DD0 27B0001C */  addiu     $s0, $sp, 0x1c
-/* 7E2C54 80281DD4 0200302D */  daddu     $a2, $s0, $zero
-/* 7E2C58 80281DD8 0C016F84 */  jal       get_collider_center
-/* 7E2C5C 80281DDC 27A70020 */   addiu    $a3, $sp, 0x20
-/* 7E2C60 80281DE0 0280202D */  daddu     $a0, $s4, $zero
-/* 7E2C64 80281DE4 27A50024 */  addiu     $a1, $sp, 0x24
-/* 7E2C68 80281DE8 0200302D */  daddu     $a2, $s0, $zero
-/* 7E2C6C 80281DEC 0C016F76 */  jal       func_8005BDD8
-/* 7E2C70 80281DF0 27A70028 */   addiu    $a3, $sp, 0x28
-/* 7E2C74 80281DF4 326300FF */  andi      $v1, $s3, 0xff
-/* 7E2C78 80281DF8 2C620008 */  sltiu     $v0, $v1, 8
-/* 7E2C7C 80281DFC 104000F0 */  beqz      $v0, .L802821C0
-/* 7E2C80 80281E00 00031080 */   sll      $v0, $v1, 2
-/* 7E2C84 80281E04 3C018028 */  lui       $at, 0x8028
-/* 7E2C88 80281E08 00220821 */  addu      $at, $at, $v0
-/* 7E2C8C 80281E0C 8C226500 */  lw        $v0, 0x6500($at)
-/* 7E2C90 80281E10 00400008 */  jr        $v0
-/* 7E2C94 80281E14 00000000 */   nop      
-/* 7E2C98 80281E18 C7AA0024 */  lwc1      $f10, 0x24($sp)
-/* 7E2C9C 80281E1C 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2CA0 80281E20 44811000 */  mtc1      $at, $f2
-/* 7E2CA4 80281E24 00000000 */  nop       
-/* 7E2CA8 80281E28 46025302 */  mul.s     $f12, $f10, $f2
-/* 7E2CAC 80281E2C 00000000 */  nop       
-/* 7E2CB0 80281E30 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* 7E2CB4 80281E34 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2CB8 80281E38 44810000 */  mtc1      $at, $f0
-/* 7E2CBC 80281E3C 00000000 */  nop       
-/* 7E2CC0 80281E40 46003102 */  mul.s     $f4, $f6, $f0
-/* 7E2CC4 80281E44 00000000 */  nop       
-/* 7E2CC8 80281E48 46023182 */  mul.s     $f6, $f6, $f2
-/* 7E2CCC 80281E4C 00000000 */  nop       
-/* 7E2CD0 80281E50 46005282 */  mul.s     $f10, $f10, $f0
-/* 7E2CD4 80281E54 00000000 */  nop       
-/* 7E2CD8 80281E58 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2CDC 80281E5C 460C1200 */  add.s     $f8, $f2, $f12
-/* 7E2CE0 80281E60 460C1081 */  sub.s     $f2, $f2, $f12
-/* 7E2CE4 80281E64 46044201 */  sub.s     $f8, $f8, $f4
-/* 7E2CE8 80281E68 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2CEC 80281E6C 46060100 */  add.s     $f4, $f0, $f6
-/* 7E2CF0 80281E70 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2CF4 80281E74 E6420014 */  swc1      $f2, 0x14($s2)
-/* 7E2CF8 80281E78 080A0819 */  j         .L80282064
-/* 7E2CFC 80281E7C 460A2100 */   add.s    $f4, $f4, $f10
-/* 7E2D00 80281E80 C7A80024 */  lwc1      $f8, 0x24($sp)
-/* 7E2D04 80281E84 3C014270 */  lui       $at, 0x4270
-/* 7E2D08 80281E88 44812000 */  mtc1      $at, $f4
-/* 7E2D0C 80281E8C 00000000 */  nop       
-/* 7E2D10 80281E90 46044302 */  mul.s     $f12, $f8, $f4
-/* 7E2D14 80281E94 00000000 */  nop       
-/* 7E2D18 80281E98 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* 7E2D1C 80281E9C 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2D20 80281EA0 44815000 */  mtc1      $at, $f10
-/* 7E2D24 80281EA4 00000000 */  nop       
-/* 7E2D28 80281EA8 460A3382 */  mul.s     $f14, $f6, $f10
-/* 7E2D2C 80281EAC 00000000 */  nop       
-/* 7E2D30 80281EB0 46043102 */  mul.s     $f4, $f6, $f4
-/* 7E2D34 80281EB4 00000000 */  nop       
-/* 7E2D38 80281EB8 460A4282 */  mul.s     $f10, $f8, $f10
-/* 7E2D3C 80281EBC 00000000 */  nop       
-/* 7E2D40 80281EC0 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2D44 80281EC4 44810000 */  mtc1      $at, $f0
-/* 7E2D48 80281EC8 00000000 */  nop       
-/* 7E2D4C 80281ECC 46004202 */  mul.s     $f8, $f8, $f0
-/* 7E2D50 80281ED0 00000000 */  nop       
-/* 7E2D54 80281ED4 46003182 */  mul.s     $f6, $f6, $f0
-/* 7E2D58 80281ED8 00000000 */  nop       
-/* 7E2D5C 80281EDC C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2D60 80281EE0 460C1300 */  add.s     $f12, $f2, $f12
-/* 7E2D64 80281EE4 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2D68 80281EE8 46040100 */  add.s     $f4, $f0, $f4
-/* 7E2D6C 80281EEC 46081081 */  sub.s     $f2, $f2, $f8
-/* 7E2D70 80281EF0 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2D74 80281EF4 460E6301 */  sub.s     $f12, $f12, $f14
-/* 7E2D78 80281EF8 E6420014 */  swc1      $f2, 0x14($s2)
-/* 7E2D7C 80281EFC 080A083D */  j         .L802820F4
-/* 7E2D80 80281F00 460A2100 */   add.s    $f4, $f4, $f10
-/* 7E2D84 80281F04 C7A80024 */  lwc1      $f8, 0x24($sp)
-/* 7E2D88 80281F08 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2D8C 80281F0C 44813000 */  mtc1      $at, $f6
-/* 7E2D90 80281F10 00000000 */  nop       
-/* 7E2D94 80281F14 46064282 */  mul.s     $f10, $f8, $f6
-/* 7E2D98 80281F18 00000000 */  nop       
-/* 7E2D9C 80281F1C C7A40028 */  lwc1      $f4, 0x28($sp)
-/* 7E2DA0 80281F20 46062182 */  mul.s     $f6, $f4, $f6
-/* 7E2DA4 80281F24 00000000 */  nop       
-/* 7E2DA8 80281F28 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2DAC 80281F2C 44810000 */  mtc1      $at, $f0
-/* 7E2DB0 80281F30 00000000 */  nop       
-/* 7E2DB4 80281F34 46002102 */  mul.s     $f4, $f4, $f0
-/* 7E2DB8 80281F38 00000000 */  nop       
-/* 7E2DBC 80281F3C 46004202 */  mul.s     $f8, $f8, $f0
-/* 7E2DC0 80281F40 00000000 */  nop       
-/* 7E2DC4 80281F44 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2DC8 80281F48 460A1300 */  add.s     $f12, $f2, $f10
-/* 7E2DCC 80281F4C 460A1081 */  sub.s     $f2, $f2, $f10
-/* 7E2DD0 80281F50 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2DD4 80281F54 46060280 */  add.s     $f10, $f0, $f6
-/* 7E2DD8 80281F58 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2DDC 80281F5C 46041081 */  sub.s     $f2, $f2, $f4
-/* 7E2DE0 80281F60 E64C000C */  swc1      $f12, 0xc($s2)
-/* 7E2DE4 80281F64 46080001 */  sub.s     $f0, $f0, $f8
-/* 7E2DE8 80281F68 E64A0010 */  swc1      $f10, 0x10($s2)
-/* 7E2DEC 80281F6C 080A086F */  j         .L802821BC
-/* 7E2DF0 80281F70 E6420014 */   swc1     $f2, 0x14($s2)
-/* 7E2DF4 80281F74 C7A80024 */  lwc1      $f8, 0x24($sp)
-/* 7E2DF8 80281F78 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2DFC 80281F7C 44813000 */  mtc1      $at, $f6
-/* 7E2E00 80281F80 00000000 */  nop       
-/* 7E2E04 80281F84 46064282 */  mul.s     $f10, $f8, $f6
-/* 7E2E08 80281F88 00000000 */  nop       
-/* 7E2E0C 80281F8C C7A40028 */  lwc1      $f4, 0x28($sp)
-/* 7E2E10 80281F90 46062182 */  mul.s     $f6, $f4, $f6
-/* 7E2E14 80281F94 00000000 */  nop       
-/* 7E2E18 80281F98 3C014270 */  lui       $at, 0x4270
-/* 7E2E1C 80281F9C 44811000 */  mtc1      $at, $f2
-/* 7E2E20 80281FA0 00000000 */  nop       
-/* 7E2E24 80281FA4 46024302 */  mul.s     $f12, $f8, $f2
-/* 7E2E28 80281FA8 00000000 */  nop       
-/* 7E2E2C 80281FAC 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2E30 80281FB0 44810000 */  mtc1      $at, $f0
-/* 7E2E34 80281FB4 00000000 */  nop       
-/* 7E2E38 80281FB8 46002382 */  mul.s     $f14, $f4, $f0
-/* 7E2E3C 80281FBC 00000000 */  nop       
-/* 7E2E40 80281FC0 46022102 */  mul.s     $f4, $f4, $f2
-/* 7E2E44 80281FC4 00000000 */  nop       
-/* 7E2E48 80281FC8 46004202 */  mul.s     $f8, $f8, $f0
-/* 7E2E4C 80281FCC 00000000 */  nop       
-/* 7E2E50 80281FD0 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2E54 80281FD4 460A1280 */  add.s     $f10, $f2, $f10
-/* 7E2E58 80281FD8 460C1081 */  sub.s     $f2, $f2, $f12
-/* 7E2E5C 80281FDC C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2E60 80281FE0 46060180 */  add.s     $f6, $f0, $f6
-/* 7E2E64 80281FE4 46040001 */  sub.s     $f0, $f0, $f4
-/* 7E2E68 80281FE8 460E1081 */  sub.s     $f2, $f2, $f14
-/* 7E2E6C 80281FEC E64A000C */  swc1      $f10, 0xc($s2)
-/* 7E2E70 80281FF0 46080001 */  sub.s     $f0, $f0, $f8
-/* 7E2E74 80281FF4 E6460010 */  swc1      $f6, 0x10($s2)
-/* 7E2E78 80281FF8 080A086F */  j         .L802821BC
-/* 7E2E7C 80281FFC E6420014 */   swc1     $f2, 0x14($s2)
-/* 7E2E80 80282000 C7AA0024 */  lwc1      $f10, 0x24($sp)
-/* 7E2E84 80282004 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2E88 80282008 44811000 */  mtc1      $at, $f2
-/* 7E2E8C 8028200C 00000000 */  nop       
-/* 7E2E90 80282010 46025302 */  mul.s     $f12, $f10, $f2
-/* 7E2E94 80282014 00000000 */  nop       
-/* 7E2E98 80282018 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* 7E2E9C 8028201C 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2EA0 80282020 44810000 */  mtc1      $at, $f0
-/* 7E2EA4 80282024 00000000 */  nop       
-/* 7E2EA8 80282028 46003102 */  mul.s     $f4, $f6, $f0
-/* 7E2EAC 8028202C 00000000 */  nop       
-/* 7E2EB0 80282030 46023182 */  mul.s     $f6, $f6, $f2
-/* 7E2EB4 80282034 00000000 */  nop       
-/* 7E2EB8 80282038 46005282 */  mul.s     $f10, $f10, $f0
-/* 7E2EBC 8028203C 00000000 */  nop       
-/* 7E2EC0 80282040 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2EC4 80282044 460C1200 */  add.s     $f8, $f2, $f12
-/* 7E2EC8 80282048 460C1081 */  sub.s     $f2, $f2, $f12
-/* 7E2ECC 8028204C 46044200 */  add.s     $f8, $f8, $f4
-/* 7E2ED0 80282050 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2ED4 80282054 46060100 */  add.s     $f4, $f0, $f6
-/* 7E2ED8 80282058 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2EDC 8028205C E6420014 */  swc1      $f2, 0x14($s2)
-/* 7E2EE0 80282060 460A2101 */  sub.s     $f4, $f4, $f10
-.L80282064:
-/* 7E2EE4 80282064 E6400018 */  swc1      $f0, 0x18($s2)
-/* 7E2EE8 80282068 E648000C */  swc1      $f8, 0xc($s2)
-/* 7E2EEC 8028206C 080A0870 */  j         .L802821C0
-/* 7E2EF0 80282070 E6440010 */   swc1     $f4, 0x10($s2)
-/* 7E2EF4 80282074 C7A80024 */  lwc1      $f8, 0x24($sp)
-/* 7E2EF8 80282078 3C014270 */  lui       $at, 0x4270
-/* 7E2EFC 8028207C 44812000 */  mtc1      $at, $f4
-/* 7E2F00 80282080 00000000 */  nop       
-/* 7E2F04 80282084 46044302 */  mul.s     $f12, $f8, $f4
-/* 7E2F08 80282088 00000000 */  nop       
-/* 7E2F0C 8028208C C7A60028 */  lwc1      $f6, 0x28($sp)
-/* 7E2F10 80282090 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2F14 80282094 44815000 */  mtc1      $at, $f10
-/* 7E2F18 80282098 00000000 */  nop       
-/* 7E2F1C 8028209C 460A3382 */  mul.s     $f14, $f6, $f10
-/* 7E2F20 802820A0 00000000 */  nop       
-/* 7E2F24 802820A4 46043102 */  mul.s     $f4, $f6, $f4
-/* 7E2F28 802820A8 00000000 */  nop       
-/* 7E2F2C 802820AC 460A4282 */  mul.s     $f10, $f8, $f10
-/* 7E2F30 802820B0 00000000 */  nop       
-/* 7E2F34 802820B4 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2F38 802820B8 44810000 */  mtc1      $at, $f0
-/* 7E2F3C 802820BC 00000000 */  nop       
-/* 7E2F40 802820C0 46004202 */  mul.s     $f8, $f8, $f0
-/* 7E2F44 802820C4 00000000 */  nop       
-/* 7E2F48 802820C8 46003182 */  mul.s     $f6, $f6, $f0
-/* 7E2F4C 802820CC 00000000 */  nop       
-/* 7E2F50 802820D0 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2F54 802820D4 460C1300 */  add.s     $f12, $f2, $f12
-/* 7E2F58 802820D8 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2F5C 802820DC 46040100 */  add.s     $f4, $f0, $f4
-/* 7E2F60 802820E0 46081081 */  sub.s     $f2, $f2, $f8
-/* 7E2F64 802820E4 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2F68 802820E8 460E6300 */  add.s     $f12, $f12, $f14
-/* 7E2F6C 802820EC E6420014 */  swc1      $f2, 0x14($s2)
-/* 7E2F70 802820F0 460A2101 */  sub.s     $f4, $f4, $f10
-.L802820F4:
-/* 7E2F74 802820F4 E6400018 */  swc1      $f0, 0x18($s2)
-/* 7E2F78 802820F8 E64C000C */  swc1      $f12, 0xc($s2)
-/* 7E2F7C 802820FC 080A0870 */  j         .L802821C0
-/* 7E2F80 80282100 E6440010 */   swc1     $f4, 0x10($s2)
-/* 7E2F84 80282104 C7A80024 */  lwc1      $f8, 0x24($sp)
-/* 7E2F88 80282108 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2F8C 8028210C 44813000 */  mtc1      $at, $f6
-/* 7E2F90 80282110 00000000 */  nop       
-/* 7E2F94 80282114 46064282 */  mul.s     $f10, $f8, $f6
-/* 7E2F98 80282118 00000000 */  nop       
-/* 7E2F9C 8028211C C7A40028 */  lwc1      $f4, 0x28($sp)
-/* 7E2FA0 80282120 46062182 */  mul.s     $f6, $f4, $f6
-/* 7E2FA4 80282124 00000000 */  nop       
-/* 7E2FA8 80282128 3C0141A0 */  lui       $at, 0x41a0
-/* 7E2FAC 8028212C 44810000 */  mtc1      $at, $f0
-/* 7E2FB0 80282130 00000000 */  nop       
-/* 7E2FB4 80282134 46002102 */  mul.s     $f4, $f4, $f0
-/* 7E2FB8 80282138 00000000 */  nop       
-/* 7E2FBC 8028213C 46004202 */  mul.s     $f8, $f8, $f0
-/* 7E2FC0 80282140 00000000 */  nop       
-/* 7E2FC4 80282144 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* 7E2FC8 80282148 460A1300 */  add.s     $f12, $f2, $f10
-/* 7E2FCC 8028214C 460A1081 */  sub.s     $f2, $f2, $f10
-/* 7E2FD0 80282150 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E2FD4 80282154 46060280 */  add.s     $f10, $f0, $f6
-/* 7E2FD8 80282158 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E2FDC 8028215C 46041080 */  add.s     $f2, $f2, $f4
-/* 7E2FE0 80282160 E64C000C */  swc1      $f12, 0xc($s2)
-/* 7E2FE4 80282164 46080000 */  add.s     $f0, $f0, $f8
-/* 7E2FE8 80282168 E64A0010 */  swc1      $f10, 0x10($s2)
-/* 7E2FEC 8028216C 080A086F */  j         .L802821BC
-/* 7E2FF0 80282170 E6420014 */   swc1     $f2, 0x14($s2)
-/* 7E2FF4 80282174 C7A60024 */  lwc1      $f6, 0x24($sp)
-/* 7E2FF8 80282178 3C0141F0 */  lui       $at, 0x41f0
-/* 7E2FFC 8028217C 44810000 */  mtc1      $at, $f0
-/* 7E3000 80282180 00000000 */  nop       
-/* 7E3004 80282184 46003182 */  mul.s     $f6, $f6, $f0
-/* 7E3008 80282188 00000000 */  nop       
-/* 7E300C 8028218C C7A20028 */  lwc1      $f2, 0x28($sp)
-/* 7E3010 80282190 46001082 */  mul.s     $f2, $f2, $f0
-/* 7E3014 80282194 00000000 */  nop       
-/* 7E3018 80282198 C7A40018 */  lwc1      $f4, 0x18($sp)
-/* 7E301C 8028219C 46062200 */  add.s     $f8, $f4, $f6
-/* 7E3020 802821A0 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E3024 802821A4 46020280 */  add.s     $f10, $f0, $f2
-/* 7E3028 802821A8 46062101 */  sub.s     $f4, $f4, $f6
-/* 7E302C 802821AC 46020001 */  sub.s     $f0, $f0, $f2
-/* 7E3030 802821B0 E648000C */  swc1      $f8, 0xc($s2)
-/* 7E3034 802821B4 E64A0010 */  swc1      $f10, 0x10($s2)
-/* 7E3038 802821B8 E6440014 */  swc1      $f4, 0x14($s2)
-.L802821BC:
-/* 7E303C 802821BC E6400018 */  swc1      $f0, 0x18($s2)
-.L802821C0:
-/* 7E3040 802821C0 3C048028 */  lui       $a0, 0x8028
-/* 7E3044 802821C4 248447D4 */  addiu     $a0, $a0, 0x47d4
-/* 7E3048 802821C8 3C02800B */  lui       $v0, %hi(gCameras)
-/* 7E304C 802821CC 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* 7E3050 802821D0 C6400014 */  lwc1      $f0, 0x14($s2)
-/* 7E3054 802821D4 C6420018 */  lwc1      $f2, 0x18($s2)
-/* 7E3058 802821D8 C644000C */  lwc1      $f4, 0xc($s2)
-/* 7E305C 802821DC C6460010 */  lwc1      $f6, 0x10($s2)
-/* 7E3060 802821E0 8FA8002C */  lw        $t0, 0x2c($sp)
-/* 7E3064 802821E4 24050100 */  addiu     $a1, $zero, 0x100
-/* 7E3068 802821E8 AE48002C */  sw        $t0, 0x2c($s2)
-/* 7E306C 802821EC AE5E0030 */  sw        $fp, 0x30($s2)
-/* 7E3070 802821F0 AE550034 */  sw        $s5, 0x34($s2)
-/* 7E3074 802821F4 AE570038 */  sw        $s7, 0x38($s2)
-/* 7E3078 802821F8 E640001C */  swc1      $f0, 0x1c($s2)
-/* 7E307C 802821FC E6420020 */  swc1      $f2, 0x20($s2)
-/* 7E3080 80282200 E6440024 */  swc1      $f4, 0x24($s2)
-/* 7E3084 80282204 E6460028 */  swc1      $f6, 0x28($s2)
-/* 7E3088 80282208 8443002C */  lh        $v1, 0x2c($v0)
-/* 7E308C 8028220C 0280302D */  daddu     $a2, $s4, $zero
-/* 7E3090 80282210 AE430040 */  sw        $v1, 0x40($s2)
-/* 7E3094 80282214 8443002E */  lh        $v1, 0x2e($v0)
-/* 7E3098 80282218 0000382D */  daddu     $a3, $zero, $zero
-/* 7E309C 8028221C AE430044 */  sw        $v1, 0x44($s2)
-/* 7E30A0 80282220 84420030 */  lh        $v0, 0x30($v0)
-/* 7E30A4 80282224 24100003 */  addiu     $s0, $zero, 3
-/* 7E30A8 80282228 AE420048 */  sw        $v0, 0x48($s2)
-/* 7E30AC 8028222C AFB20010 */  sw        $s2, 0x10($sp)
-/* 7E30B0 80282230 0C0B10AA */  jal       bind_trigger_1
-/* 7E30B4 80282234 AFB00014 */   sw       $s0, 0x14($sp)
-/* 7E30B8 80282238 32620800 */  andi      $v0, $s3, 0x800
-/* 7E30BC 8028223C 10400005 */  beqz      $v0, .L80282254
-/* 7E30C0 80282240 24050040 */   addiu    $a1, $zero, 0x40
-/* 7E30C4 80282244 3C048028 */  lui       $a0, 0x8028
-/* 7E30C8 80282248 24844F80 */  addiu     $a0, $a0, 0x4f80
-/* 7E30CC 8028224C 080A0899 */  j         .L80282264
-/* 7E30D0 80282250 02C0302D */   daddu    $a2, $s6, $zero
-.L80282254:
-/* 7E30D4 80282254 3C048028 */  lui       $a0, 0x8028
-/* 7E30D8 80282258 24844F80 */  addiu     $a0, $a0, 0x4f80
-/* 7E30DC 8028225C 24050100 */  addiu     $a1, $zero, 0x100
-/* 7E30E0 80282260 02C0302D */  daddu     $a2, $s6, $zero
-.L80282264:
-/* 7E30E4 80282264 24070001 */  addiu     $a3, $zero, 1
-/* 7E30E8 80282268 AFB20010 */  sw        $s2, 0x10($sp)
-/* 7E30EC 8028226C 0C0B10AA */  jal       bind_trigger_1
-/* 7E30F0 80282270 AFB00014 */   sw       $s0, 0x14($sp)
-/* 7E30F4 80282274 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 7E30F8 80282278 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 7E30FC 8028227C 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 7E3100 80282280 8FB60048 */  lw        $s6, 0x48($sp)
-/* 7E3104 80282284 8FB50044 */  lw        $s5, 0x44($sp)
-/* 7E3108 80282288 8FB40040 */  lw        $s4, 0x40($sp)
-/* 7E310C 8028228C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 7E3110 80282290 8FB20038 */  lw        $s2, 0x38($sp)
-/* 7E3114 80282294 8FB10034 */  lw        $s1, 0x34($sp)
-/* 7E3118 80282298 8FB00030 */  lw        $s0, 0x30($sp)
-/* 7E311C 8028229C 24020002 */  addiu     $v0, $zero, 2
-/* 7E3120 802822A0 03E00008 */  jr        $ra
-/* 7E3124 802822A4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/asm/nonmatchings/code_7E2AA0/func_802822A8.s b/asm/nonmatchings/code_7E2AA0/func_802822A8.s
deleted file mode 100644
index ab3b55dccd..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_802822A8.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802822A8
-/* 7E3128 802822A8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 7E312C 802822AC AFBF002C */  sw        $ra, 0x2c($sp)
-/* 7E3130 802822B0 AFB00028 */  sw        $s0, 0x28($sp)
-/* 7E3134 802822B4 8C82000C */  lw        $v0, 0xc($a0)
-/* 7E3138 802822B8 8C450000 */  lw        $a1, ($v0)
-/* 7E313C 802822BC 0C0B1EAF */  jal       get_variable
-/* 7E3140 802822C0 8C900074 */   lw       $s0, 0x74($a0)
-/* 7E3144 802822C4 27A50018 */  addiu     $a1, $sp, 0x18
-/* 7E3148 802822C8 27A6001C */  addiu     $a2, $sp, 0x1c
-/* 7E314C 802822CC 27A70020 */  addiu     $a3, $sp, 0x20
-/* 7E3150 802822D0 8E040060 */  lw        $a0, 0x60($s0)
-/* 7E3154 802822D4 0C016F84 */  jal       get_collider_center
-/* 7E3158 802822D8 0040802D */   daddu    $s0, $v0, $zero
-/* 7E315C 802822DC 0200202D */  daddu     $a0, $s0, $zero
-/* 7E3160 802822E0 C7A00018 */  lwc1      $f0, 0x18($sp)
-/* 7E3164 802822E4 C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* 7E3168 802822E8 44060000 */  mfc1      $a2, $f0
-/* 7E316C 802822EC 44071000 */  mfc1      $a3, $f2
-/* 7E3170 802822F0 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 7E3174 802822F4 0000282D */  daddu     $a1, $zero, $zero
-/* 7E3178 802822F8 0C052757 */  jal       play_sound_at_position
-/* 7E317C 802822FC E7A00010 */   swc1     $f0, 0x10($sp)
-/* 7E3180 80282300 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 7E3184 80282304 8FB00028 */  lw        $s0, 0x28($sp)
-/* 7E3188 80282308 24020002 */  addiu     $v0, $zero, 2
-/* 7E318C 8028230C 03E00008 */  jr        $ra
-/* 7E3190 80282310 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/code_7E2AA0/func_8028236C.s b/asm/nonmatchings/code_7E2AA0/func_8028236C.s
deleted file mode 100644
index 81bfaff00a..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_8028236C.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8028236C
-/* 7E31EC 8028236C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E31F0 80282370 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 7E31F4 80282374 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E31F8 80282378 8C82000C */  lw        $v0, 0xc($a0)
-/* 7E31FC 8028237C 8C450000 */  lw        $a1, ($v0)
-/* 7E3200 80282380 0C0B1EAF */  jal       get_variable
-/* 7E3204 80282384 8C900074 */   lw       $s0, 0x74($a0)
-/* 7E3208 80282388 00021080 */  sll       $v0, $v0, 2
-/* 7E320C 8028238C 02028021 */  addu      $s0, $s0, $v0
-/* 7E3210 80282390 0C0B1059 */  jal       does_script_exist
-/* 7E3214 80282394 8E04004C */   lw       $a0, 0x4c($s0)
-/* 7E3218 80282398 2C420001 */  sltiu     $v0, $v0, 1
-/* 7E321C 8028239C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 7E3220 802823A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3224 802823A4 00021040 */  sll       $v0, $v0, 1
-/* 7E3228 802823A8 03E00008 */  jr        $ra
-/* 7E322C 802823AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7E2AA0/func_802823B0.s b/asm/nonmatchings/code_7E2AA0/func_802823B0.s
deleted file mode 100644
index 0bb756e36c..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_802823B0.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802823B0
-/* 7E3230 802823B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E3234 802823B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E3238 802823B8 0080802D */  daddu     $s0, $a0, $zero
-/* 7E323C 802823BC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E3240 802823C0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E3244 802823C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E3248 802823C8 8E11000C */  lw        $s1, 0xc($s0)
-/* 7E324C 802823CC 8E120074 */  lw        $s2, 0x74($s0)
-/* 7E3250 802823D0 8E250000 */  lw        $a1, ($s1)
-/* 7E3254 802823D4 0C0B1EAF */  jal       get_variable
-/* 7E3258 802823D8 26310004 */   addiu    $s1, $s1, 4
-/* 7E325C 802823DC 0200202D */  daddu     $a0, $s0, $zero
-/* 7E3260 802823E0 8E250000 */  lw        $a1, ($s1)
-/* 7E3264 802823E4 0C0B1EAF */  jal       get_variable
-/* 7E3268 802823E8 0040802D */   daddu    $s0, $v0, $zero
-/* 7E326C 802823EC 00108080 */  sll       $s0, $s0, 2
-/* 7E3270 802823F0 02509021 */  addu      $s2, $s2, $s0
-/* 7E3274 802823F4 AE42004C */  sw        $v0, 0x4c($s2)
-/* 7E3278 802823F8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E327C 802823FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E3280 80282400 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3284 80282404 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3288 80282408 24020002 */  addiu     $v0, $zero, 2
-/* 7E328C 8028240C 03E00008 */  jr        $ra
-/* 7E3290 80282410 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E2AA0/func_80282414.s b/asm/nonmatchings/code_7E2AA0/func_80282414.s
deleted file mode 100644
index b59342864a..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_80282414.s
+++ /dev/null
@@ -1,105 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282414
-/* 7E3294 80282414 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E3298 80282418 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E329C 8028241C 0080882D */  daddu     $s1, $a0, $zero
-/* 7E32A0 80282420 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E32A4 80282424 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E32A8 80282428 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E32AC 8028242C 10A0000A */  beqz      $a1, .L80282458
-/* 7E32B0 80282430 8E320088 */   lw       $s2, 0x88($s1)
-/* 7E32B4 80282434 8E220084 */  lw        $v0, 0x84($s1)
-/* 7E32B8 80282438 54400007 */  bnel      $v0, $zero, .L80282458
-/* 7E32BC 8028243C AE200074 */   sw       $zero, 0x74($s1)
-/* 7E32C0 80282440 962400C2 */  lhu       $a0, 0xc2($s1)
-/* 7E32C4 80282444 2405FFFF */  addiu     $a1, $zero, -1
-/* 7E32C8 80282448 24060001 */  addiu     $a2, $zero, 1
-/* 7E32CC 8028244C 0C046E54 */  jal       func_8011B950
-/* 7E32D0 80282450 00C0382D */   daddu    $a3, $a2, $zero
-/* 7E32D4 80282454 AE200074 */  sw        $zero, 0x74($s1)
-.L80282458:
-/* 7E32D8 80282458 8E220074 */  lw        $v0, 0x74($s1)
-/* 7E32DC 8028245C 24420020 */  addiu     $v0, $v0, 0x20
-/* 7E32E0 80282460 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E32E4 80282464 28420100 */  slti      $v0, $v0, 0x100
-/* 7E32E8 80282468 14400002 */  bnez      $v0, .L80282474
-/* 7E32EC 8028246C 240200FF */   addiu    $v0, $zero, 0xff
-/* 7E32F0 80282470 AE220074 */  sw        $v0, 0x74($s1)
-.L80282474:
-/* 7E32F4 80282474 8E220084 */  lw        $v0, 0x84($s1)
-/* 7E32F8 80282478 14400004 */  bnez      $v0, .L8028248C
-/* 7E32FC 8028247C 240200FF */   addiu    $v0, $zero, 0xff
-/* 7E3300 80282480 8E300074 */  lw        $s0, 0x74($s1)
-/* 7E3304 80282484 080A0926 */  j         .L80282498
-/* 7E3308 80282488 0000202D */   daddu    $a0, $zero, $zero
-.L8028248C:
-/* 7E330C 8028248C 8E230074 */  lw        $v1, 0x74($s1)
-/* 7E3310 80282490 00438023 */  subu      $s0, $v0, $v1
-/* 7E3314 80282494 0000202D */  daddu     $a0, $zero, $zero
-.L80282498:
-/* 7E3318 80282498 0080282D */  daddu     $a1, $a0, $zero
-/* 7E331C 8028249C 0080302D */  daddu     $a2, $a0, $zero
-/* 7E3320 802824A0 0C046F97 */  jal       set_background_color_blend
-/* 7E3324 802824A4 320700FF */   andi     $a3, $s0, 0xff
-/* 7E3328 802824A8 240600FF */  addiu     $a2, $zero, 0xff
-/* 7E332C 802824AC 8E420040 */  lw        $v0, 0x40($s2)
-/* 7E3330 802824B0 00D03023 */  subu      $a2, $a2, $s0
-/* 7E3334 802824B4 00460018 */  mult      $v0, $a2
-/* 7E3338 802824B8 00001012 */  mflo      $v0
-/* 7E333C 802824BC 8E450044 */  lw        $a1, 0x44($s2)
-/* 7E3340 802824C0 00000000 */  nop       
-/* 7E3344 802824C4 00A60018 */  mult      $a1, $a2
-/* 7E3348 802824C8 00002812 */  mflo      $a1
-/* 7E334C 802824CC 3C078080 */  lui       $a3, 0x8080
-/* 7E3350 802824D0 34E78081 */  ori       $a3, $a3, 0x8081
-/* 7E3354 802824D4 00470018 */  mult      $v0, $a3
-/* 7E3358 802824D8 00001810 */  mfhi      $v1
-/* 7E335C 802824DC 00000000 */  nop       
-/* 7E3360 802824E0 00000000 */  nop       
-/* 7E3364 802824E4 00A70018 */  mult      $a1, $a3
-/* 7E3368 802824E8 00004010 */  mfhi      $t0
-/* 7E336C 802824EC 8E440048 */  lw        $a0, 0x48($s2)
-/* 7E3370 802824F0 00621821 */  addu      $v1, $v1, $v0
-/* 7E3374 802824F4 00860018 */  mult      $a0, $a2
-/* 7E3378 802824F8 000319C3 */  sra       $v1, $v1, 7
-/* 7E337C 802824FC 000217C3 */  sra       $v0, $v0, 0x1f
-/* 7E3380 80282500 00621823 */  subu      $v1, $v1, $v0
-/* 7E3384 80282504 3C06800B */  lui       $a2, %hi(gCameras)
-/* 7E3388 80282508 24C61D80 */  addiu     $a2, $a2, %lo(gCameras)
-/* 7E338C 8028250C 00002012 */  mflo      $a0
-/* 7E3390 80282510 01051021 */  addu      $v0, $t0, $a1
-/* 7E3394 80282514 000211C3 */  sra       $v0, $v0, 7
-/* 7E3398 80282518 00870018 */  mult      $a0, $a3
-/* 7E339C 8028251C 00052FC3 */  sra       $a1, $a1, 0x1f
-/* 7E33A0 80282520 00451023 */  subu      $v0, $v0, $a1
-/* 7E33A4 80282524 A4C3002C */  sh        $v1, 0x2c($a2)
-/* 7E33A8 80282528 A4C2002E */  sh        $v0, 0x2e($a2)
-/* 7E33AC 8028252C 00001810 */  mfhi      $v1
-/* 7E33B0 80282530 00641021 */  addu      $v0, $v1, $a0
-/* 7E33B4 80282534 000211C3 */  sra       $v0, $v0, 7
-/* 7E33B8 80282538 000427C3 */  sra       $a0, $a0, 0x1f
-/* 7E33BC 8028253C 00441023 */  subu      $v0, $v0, $a0
-/* 7E33C0 80282540 A4C20030 */  sh        $v0, 0x30($a2)
-/* 7E33C4 80282544 8E220074 */  lw        $v0, 0x74($s1)
-/* 7E33C8 80282548 284200FF */  slti      $v0, $v0, 0xff
-/* 7E33CC 8028254C 1440000B */  bnez      $v0, .L8028257C
-/* 7E33D0 80282550 0000102D */   daddu    $v0, $zero, $zero
-/* 7E33D4 80282554 8E230084 */  lw        $v1, 0x84($s1)
-/* 7E33D8 80282558 24020003 */  addiu     $v0, $zero, 3
-/* 7E33DC 8028255C 14620007 */  bne       $v1, $v0, .L8028257C
-/* 7E33E0 80282560 24020002 */   addiu    $v0, $zero, 2
-/* 7E33E4 80282564 962400C2 */  lhu       $a0, 0xc2($s1)
-/* 7E33E8 80282568 2405FFFF */  addiu     $a1, $zero, -1
-/* 7E33EC 8028256C 0000302D */  daddu     $a2, $zero, $zero
-/* 7E33F0 80282570 0C046E54 */  jal       func_8011B950
-/* 7E33F4 80282574 24070001 */   addiu    $a3, $zero, 1
-/* 7E33F8 80282578 24020002 */  addiu     $v0, $zero, 2
-.L8028257C:
-/* 7E33FC 8028257C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E3400 80282580 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E3404 80282584 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3408 80282588 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E340C 8028258C 03E00008 */  jr        $ra
-/* 7E3410 80282590 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E2AA0/func_80282634.s b/asm/nonmatchings/code_7E2AA0/func_80282634.s
deleted file mode 100644
index b6ca262f0c..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_80282634.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282634
-/* 7E34B4 80282634 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E34B8 80282638 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E34BC 8028263C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E34C0 80282640 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E34C4 80282644 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E34C8 80282648 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E34CC 8028264C 8C820074 */  lw        $v0, 0x74($a0)
-/* 7E34D0 80282650 8C51005C */  lw        $s1, 0x5c($v0)
-/* 7E34D4 80282654 12200022 */  beqz      $s1, .L802826E0
-/* 7E34D8 80282658 0000802D */   daddu    $s0, $zero, $zero
-/* 7E34DC 8028265C 2413FFFC */  addiu     $s3, $zero, -4
-/* 7E34E0 80282660 3C120080 */  lui       $s2, 0x80
-.L80282664:
-/* 7E34E4 80282664 0C00E2B7 */  jal       get_npc_by_index
-/* 7E34E8 80282668 0200202D */   daddu    $a0, $s0, $zero
-/* 7E34EC 8028266C 0040182D */  daddu     $v1, $v0, $zero
-/* 7E34F0 80282670 50600009 */  beql      $v1, $zero, .L80282698
-/* 7E34F4 80282674 26100001 */   addiu    $s0, $s0, 1
-/* 7E34F8 80282678 8C640000 */  lw        $a0, ($v1)
-/* 7E34FC 8028267C 10800006 */  beqz      $a0, .L80282698
-/* 7E3500 80282680 26100001 */   addiu    $s0, $s0, 1
-/* 7E3504 80282684 806200A4 */  lb        $v0, 0xa4($v1)
-/* 7E3508 80282688 10530003 */  beq       $v0, $s3, .L80282698
-/* 7E350C 8028268C 00000000 */   nop      
-/* 7E3510 80282690 00921025 */  or        $v0, $a0, $s2
-/* 7E3514 80282694 AC620000 */  sw        $v0, ($v1)
-.L80282698:
-/* 7E3518 80282698 2A020040 */  slti      $v0, $s0, 0x40
-/* 7E351C 8028269C 1440FFF1 */  bnez      $v0, .L80282664
-/* 7E3520 802826A0 00000000 */   nop      
-/* 7E3524 802826A4 2412FFFF */  addiu     $s2, $zero, -1
-/* 7E3528 802826A8 3C10FF7F */  lui       $s0, 0xff7f
-/* 7E352C 802826AC 3610FFFF */  ori       $s0, $s0, 0xffff
-.L802826B0:
-/* 7E3530 802826B0 8E240000 */  lw        $a0, ($s1)
-/* 7E3534 802826B4 1092000B */  beq       $a0, $s2, .L802826E4
-/* 7E3538 802826B8 24020002 */   addiu    $v0, $zero, 2
-/* 7E353C 802826BC 0C00EAD2 */  jal       get_npc_safe
-/* 7E3540 802826C0 26310004 */   addiu    $s1, $s1, 4
-/* 7E3544 802826C4 0040182D */  daddu     $v1, $v0, $zero
-/* 7E3548 802826C8 1060FFF9 */  beqz      $v1, .L802826B0
-/* 7E354C 802826CC 00000000 */   nop      
-/* 7E3550 802826D0 8C620000 */  lw        $v0, ($v1)
-/* 7E3554 802826D4 00501024 */  and       $v0, $v0, $s0
-/* 7E3558 802826D8 080A09AC */  j         .L802826B0
-/* 7E355C 802826DC AC620000 */   sw       $v0, ($v1)
-.L802826E0:
-/* 7E3560 802826E0 24020002 */  addiu     $v0, $zero, 2
-.L802826E4:
-/* 7E3564 802826E4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E3568 802826E8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E356C 802826EC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E3570 802826F0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3574 802826F4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3578 802826F8 03E00008 */  jr        $ra
-/* 7E357C 802826FC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7E2AA0/func_80282700.s b/asm/nonmatchings/code_7E2AA0/func_80282700.s
deleted file mode 100644
index 43648b447a..0000000000
--- a/asm/nonmatchings/code_7E2AA0/func_80282700.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282700
-/* 7E3580 80282700 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E3584 80282704 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E3588 80282708 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E358C 8028270C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E3590 80282710 8C820074 */  lw        $v0, 0x74($a0)
-/* 7E3594 80282714 8C42005C */  lw        $v0, 0x5c($v0)
-/* 7E3598 80282718 10400010 */  beqz      $v0, .L8028275C
-/* 7E359C 8028271C 0000802D */   daddu    $s0, $zero, $zero
-/* 7E35A0 80282720 3C11FF7F */  lui       $s1, 0xff7f
-/* 7E35A4 80282724 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80282728:
-/* 7E35A8 80282728 0C00E2B7 */  jal       get_npc_by_index
-/* 7E35AC 8028272C 0200202D */   daddu    $a0, $s0, $zero
-/* 7E35B0 80282730 0040182D */  daddu     $v1, $v0, $zero
-/* 7E35B4 80282734 10600006 */  beqz      $v1, .L80282750
-/* 7E35B8 80282738 26100001 */   addiu    $s0, $s0, 1
-/* 7E35BC 8028273C 8C620000 */  lw        $v0, ($v1)
-/* 7E35C0 80282740 10400003 */  beqz      $v0, .L80282750
-/* 7E35C4 80282744 00000000 */   nop      
-/* 7E35C8 80282748 00511024 */  and       $v0, $v0, $s1
-/* 7E35CC 8028274C AC620000 */  sw        $v0, ($v1)
-.L80282750:
-/* 7E35D0 80282750 2A020040 */  slti      $v0, $s0, 0x40
-/* 7E35D4 80282754 1440FFF4 */  bnez      $v0, .L80282728
-/* 7E35D8 80282758 00000000 */   nop      
-.L8028275C:
-/* 7E35DC 8028275C 24020002 */  addiu     $v0, $zero, 2
-/* 7E35E0 80282760 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E35E4 80282764 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E35E8 80282768 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E35EC 8028276C 03E00008 */  jr        $ra
-/* 7E35F0 80282770 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E2AA0/func_80282594.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s
similarity index 100%
rename from asm/nonmatchings/code_7E2AA0/func_80282594.s
rename to asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s
diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c
index 4b8e83951d..2f02eeb2ae 100644
--- a/src/world/script_api/7E0E80.c
+++ b/src/world/script_api/7E0E80.c
@@ -1,39 +1,39 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280000);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280000);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280088);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280088);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_8028017C);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028017C);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280208);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280208);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_802802D0);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802802D0);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_8028035C);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028035C);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_802803C8);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802803C8);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280410);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280410);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_8028051C);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028051C);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280954);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280954);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280AC4);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280AC4);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280B44);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B44);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280B78);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B78);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80280BD0);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280BD0);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_80281434);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80281434);
 
-INCLUDE_ASM(s32, "code_7e0e80", func_802814D0);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802814D0);
 
-INCLUDE_ASM(s32, "code_7e0e80", draw_shop_items);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", draw_shop_items);
 
-INCLUDE_ASM(s32, "code_7e0e80", MakeShop);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShop);
 
-INCLUDE_ASM(s32, "code_7e0e80", MakeShopOwner);
+INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShopOwner);
diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c
index 339305f3b6..0b3b7469f3 100644
--- a/src/world/script_api/7E2AA0.c
+++ b/src/world/script_api/7E2AA0.c
@@ -36,9 +36,9 @@ ApiStatus func_80281C84(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "code_7E2AA0", MakeDoorAdvanced);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", MakeDoorAdvanced);
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_802822A8);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_802822A8);
 
 ApiStatus func_80282314(ScriptInstance* script, s32 isInitialCall) {
     script->functionTemp[1].s = script->varTable[1];
@@ -57,11 +57,11 @@ ApiStatus func_80282338(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_8028236C);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_8028236C);
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_802823B0);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_802823B0);
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_80282414);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282414);
 
 #ifdef NON_MATCHING
 ApiStatus func_80282594(ScriptInstance* script, s32 isInitialCall) {
@@ -83,7 +83,7 @@ ApiStatus func_80282594(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 #else
-INCLUDE_ASM(s32, "code_7E2AA0", func_80282594);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282594);
 #endif
 
 ApiStatus func_802825FC(ScriptInstance* script, s32 isInitialCall) {
@@ -102,9 +102,9 @@ ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_80282634);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282634);
 
-INCLUDE_ASM(s32, "code_7E2AA0", func_80282700);
+INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282700);
 
 ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) {
     DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1].s;
diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c
index 042ed09145..e0f3b56f63 100644
--- a/src/world/script_api/7E3700.c
+++ b/src/world/script_api/7E3700.c
@@ -1,16 +1,16 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "code_7E3700", func_80282880);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282880);
 
-INCLUDE_ASM(s32, "code_7E3700", func_802828DC);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_802828DC);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80282C40);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282C40);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80282E30);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282E30);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283080);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283080);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283174);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283174);
 
 ApiStatus CheckActionState(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -21,38 +21,38 @@ ApiStatus CheckActionState(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283240);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283240);
 
-INCLUDE_ASM(s32, "code_7E3700", CreatePushBlockGrid);
+INCLUDE_ASM(s32, "world/script_api/7E3700", CreatePushBlockGrid);
 
-INCLUDE_ASM(s32, "code_7E3700", SetPushBlock);
+INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlock);
 
-INCLUDE_ASM(s32, "code_7E3700", GetPushBlock);
+INCLUDE_ASM(s32, "world/script_api/7E3700", GetPushBlock);
 
-INCLUDE_ASM(s32, "code_7E3700", GetGridIndexFromPos);
+INCLUDE_ASM(s32, "world/script_api/7E3700", GetGridIndexFromPos);
 
-INCLUDE_ASM(s32, "code_7E3700", SetPushBlockFallEffect);
+INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlockFallEffect);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283810);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283810);
 
-INCLUDE_ASM(s32, "code_7E3700", TeleportPartnerToPlayer);
+INCLUDE_ASM(s32, "world/script_api/7E3700", TeleportPartnerToPlayer);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283908);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283908);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283A50);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283A50);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283B88);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283B88);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283BB0);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283BB0);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283BD0);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283BD0);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283C34);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283C34);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283D00);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D00);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283D6C);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D6C);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283DF0);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283DF0);
 
-INCLUDE_ASM(s32, "code_7E3700", func_80283E2C);
+INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283E2C);
diff --git a/src/world/world.c b/src/world/world.c
index 378d91329e..01a8eb0eff 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -2,47 +2,47 @@
 #include "ld_addrs.h"
 #include "map.h"
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
+INCLUDE_ASM(s32, "world/world", func_80058DD0);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84);
+INCLUDE_ASM(s32, "world/world", func_80058E84);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88);
+INCLUDE_ASM(s32, "world/world", func_80058F88);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008);
+INCLUDE_ASM(s32, "world/world", func_80059008);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C);
+INCLUDE_ASM(s32, "world/world", func_8005904C);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310);
+INCLUDE_ASM(s32, "world/world", func_80059310);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0);
+INCLUDE_ASM(s32, "world/world", func_800598A0);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8);
+INCLUDE_ASM(s32, "world/world", func_80059AB8);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4);
+INCLUDE_ASM(s32, "world/world", func_80059BD4);
 
 void func_80059C80(void) {
 }
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88);
+INCLUDE_ASM(s32, "world/world", func_80059C88);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C);
+INCLUDE_ASM(s32, "world/world", func_80059C9C);
 
 void func_80059D48(void) {
 }
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50);
+INCLUDE_ASM(s32, "world/world", func_80059D50);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects);
+INCLUDE_ASM(s32, "world/world", render_effects);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94);
+INCLUDE_ASM(s32, "world/world", func_80059F94);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC);
+INCLUDE_ASM(s32, "world/world", func_8005A2BC);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect);
+INCLUDE_ASM(s32, "world/world", remove_effect);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects);
+INCLUDE_ASM(s32, "world/world", remove_all_effects);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect);
+INCLUDE_ASM(s32, "world/world", play_effect);
 
 void load_world_script_api(void) {
     dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM);
@@ -64,17 +64,17 @@ static const s32 rodata_73DA0[] = {
     0x25735F74, 0x65780000, // "%s_tex"
 };
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
+INCLUDE_ASM(s32, "world/world", load_map_by_IDs);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config);
+INCLUDE_ASM(s32, "world/world", get_current_map_config);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header);
+INCLUDE_ASM(s32, "world/world", get_current_map_header);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name);
+INCLUDE_ASM(s32, "world/world", get_map_IDs_by_name);
 
-INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize);
+INCLUDE_ASM(void*, "world/world", load_asset_by_name, char* name, s32* decompressedSize);
 
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);
+INCLUDE_ASM(s32, "world/world", get_asset_offset);
 
 #define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), area##_maps, "area_" #area, jp_name }
 

From d86bb8d66b7dcdf6c2a447306371d87cebe03114 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Mon, 2 Nov 2020 16:51:08 -0500
Subject: [PATCH 101/101] Deleting junk

---
 asm/nonmatchings/code_16F740/func_80246B2C.s  |   6 -
 .../code_341d0_len_20d0/func_80058DD0.s       |  51 --
 .../code_341d0_len_20d0/func_80058E84.s       |  70 --
 .../code_341d0_len_20d0/func_80058F88.s       |  36 --
 .../code_341d0_len_20d0/func_80059008.s       |  23 -
 .../code_341d0_len_20d0/func_8005904C.s       | 191 ------
 .../code_341d0_len_20d0/func_80059310.s       | 375 -----------
 .../code_341d0_len_20d0/func_800598A0.s       | 140 ----
 .../code_341d0_len_20d0/func_80059AB8.s       |  77 ---
 .../code_341d0_len_20d0/func_80059BD4.s       |  50 --
 .../code_341d0_len_20d0/func_80059C88.s       |   9 -
 .../code_341d0_len_20d0/func_80059C9C.s       |  49 --
 .../code_341d0_len_20d0/func_80059D50.s       | 121 ----
 .../code_341d0_len_20d0/func_80059F94.s       | 211 ------
 .../code_341d0_len_20d0/func_8005A2BC.s       | 122 ----
 .../code_341d0_len_20d0/get_asset_offset.s    |  58 --
 .../get_current_map_config.s                  |   8 -
 .../get_current_map_header.s                  |   8 -
 .../code_341d0_len_20d0/get_map_IDs_by_name.s |  70 --
 .../code_341d0_len_20d0/load_asset_by_name.s  |  64 --
 .../code_341d0_len_20d0/load_map_by_IDs.s     | 333 ----------
 .../code_341d0_len_20d0/play_effect.s         | 101 ---
 .../code_341d0_len_20d0/remove_all_effects.s  |  40 --
 .../code_341d0_len_20d0/remove_effect.s       |  45 --
 .../code_341d0_len_20d0/render_effects.s      |  48 --
 .../code_7E3700/CreatePushBlockGrid.s         | 112 ----
 .../code_7E3700/GetGridIndexFromPos.s         |  65 --
 asm/nonmatchings/code_7E3700/GetPushBlock.s   |  70 --
 asm/nonmatchings/code_7E3700/SetPushBlock.s   |  86 ---
 .../code_7E3700/SetPushBlockFallEffect.s      |  29 -
 .../code_7E3700/TeleportPartnerToPlayer.s     |  41 --
 asm/nonmatchings/code_7E3700/func_80282880.s  |  27 -
 asm/nonmatchings/code_7E3700/func_802828DC.s  | 224 -------
 asm/nonmatchings/code_7E3700/func_80282C40.s  | 133 ----
 asm/nonmatchings/code_7E3700/func_80282E30.s  | 160 -----
 asm/nonmatchings/code_7E3700/func_80283080.s  |  65 --
 asm/nonmatchings/code_7E3700/func_80283174.s  |  33 -
 asm/nonmatchings/code_7E3700/func_80283240.s  |  48 --
 asm/nonmatchings/code_7E3700/func_80283810.s  |  33 -
 asm/nonmatchings/code_7E3700/func_80283908.s  |  88 ---
 asm/nonmatchings/code_7E3700/func_80283A50.s  |  85 ---
 asm/nonmatchings/code_7E3700/func_80283B88.s  |  14 -
 asm/nonmatchings/code_7E3700/func_80283BB0.s  |  12 -
 asm/nonmatchings/code_7E3700/func_80283BD0.s  |  30 -
 asm/nonmatchings/code_7E3700/func_80283C34.s  |  55 --
 asm/nonmatchings/code_7E3700/func_80283D00.s  |  33 -
 asm/nonmatchings/code_7E3700/func_80283D6C.s  |  39 --
 asm/nonmatchings/code_7E3700/func_80283DF0.s  |  19 -
 asm/nonmatchings/code_7E3700/func_80283E2C.s  |  25 -
 asm/nonmatchings/code_7e0e80/MakeShop.s       | 233 -------
 asm/nonmatchings/code_7e0e80/MakeShopOwner.s  |  22 -
 .../code_7e0e80/draw_shop_items.s             | 221 -------
 asm/nonmatchings/code_7e0e80/func_80280000.s  |  38 --
 asm/nonmatchings/code_7e0e80/func_80280088.s  |  68 --
 asm/nonmatchings/code_7e0e80/func_8028017C.s  |  39 --
 asm/nonmatchings/code_7e0e80/func_80280208.s  |  55 --
 asm/nonmatchings/code_7e0e80/func_802802D0.s  |  39 --
 asm/nonmatchings/code_7e0e80/func_8028035C.s  |  31 -
 asm/nonmatchings/code_7e0e80/func_802803C8.s  |  24 -
 asm/nonmatchings/code_7e0e80/func_80280410.s  |  73 ---
 asm/nonmatchings/code_7e0e80/func_8028051C.s  | 297 ---------
 asm/nonmatchings/code_7e0e80/func_80280954.s  | 104 ---
 asm/nonmatchings/code_7e0e80/func_80280AC4.s  |  40 --
 asm/nonmatchings/code_7e0e80/func_80280B44.s  |  17 -
 asm/nonmatchings/code_7e0e80/func_80280B78.s  |  29 -
 asm/nonmatchings/code_7e0e80/func_80280BD0.s  | 604 ------------------
 asm/nonmatchings/code_7e0e80/func_80281434.s  |  43 --
 asm/nonmatchings/code_7e0e80/func_802814D0.s  |  25 -
 .../end_01/E05390/func_802428C0_E07C20.s      |  20 -
 .../end_01/E05390/func_80242900_E07C60.s      |  37 --
 .../end_01/E05390/func_80242978_E07CD8.s      |  67 --
 .../end_01/E05390/func_80242A68_E07DC8.s      |  69 --
 .../end_01/E05390/func_80242B68_E07EC8.s      |  69 --
 .../end_01/E05390/func_80242C68_E07FC8.s      |  15 -
 .../end_01/E05390/func_80242C94_E07FF4.s      |  27 -
 .../mim_06/BA4CF0/func_80242B04_BA7284.s      |   4 +-
 76 files changed, 2 insertions(+), 6140 deletions(-)
 delete mode 100644 asm/nonmatchings/code_16F740/func_80246B2C.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059008.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059310.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/play_effect.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/remove_effect.s
 delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/render_effects.s
 delete mode 100644 asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s
 delete mode 100644 asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s
 delete mode 100644 asm/nonmatchings/code_7E3700/GetPushBlock.s
 delete mode 100644 asm/nonmatchings/code_7E3700/SetPushBlock.s
 delete mode 100644 asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s
 delete mode 100644 asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80282880.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_802828DC.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80282C40.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80282E30.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283080.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283174.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283240.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283810.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283908.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283A50.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283B88.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283BB0.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283BD0.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283C34.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283D00.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283D6C.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283DF0.s
 delete mode 100644 asm/nonmatchings/code_7E3700/func_80283E2C.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/MakeShop.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/MakeShopOwner.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/draw_shop_items.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280000.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280088.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028017C.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280208.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_802802D0.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028035C.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_802803C8.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280410.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028051C.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280954.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280AC4.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280B44.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280B78.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280BD0.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_80281434.s
 delete mode 100644 asm/nonmatchings/code_7e0e80/func_802814D0.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s
 delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s

diff --git a/asm/nonmatchings/code_16F740/func_80246B2C.s b/asm/nonmatchings/code_16F740/func_80246B2C.s
deleted file mode 100644
index fca63b0631..0000000000
--- a/asm/nonmatchings/code_16F740/func_80246B2C.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80246B2C
-/* 17540C 80246B2C 03E00008 */  jr        $ra
-/* 175410 80246B30 00000000 */   nop      
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s
deleted file mode 100644
index aeabcebb6e..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80058DD0
-/* 341D0 80058DD0 24050007 */  addiu     $a1, $zero, 7
-/* 341D4 80058DD4 2486000E */  addiu     $a2, $a0, 0xe
-/* 341D8 80058DD8 84830000 */  lh        $v1, ($a0)
-/* 341DC 80058DDC 24020001 */  addiu     $v0, $zero, 1
-/* 341E0 80058DE0 AC82002C */  sw        $v0, 0x2c($a0)
-/* 341E4 80058DE4 00431807 */  srav      $v1, $v1, $v0
-/* 341E8 80058DE8 0060382D */  daddu     $a3, $v1, $zero
-/* 341EC 80058DEC 24024000 */  addiu     $v0, $zero, 0x4000
-/* 341F0 80058DF0 00431023 */  subu      $v0, $v0, $v1
-/* 341F4 80058DF4 A4820002 */  sh        $v0, 2($a0)
-.L80058DF8:
-/* 341F8 80058DF8 A4C00008 */  sh        $zero, 8($a2)
-/* 341FC 80058DFC 24A5FFFF */  addiu     $a1, $a1, -1
-/* 34200 80058E00 04A1FFFD */  bgez      $a1, .L80058DF8
-/* 34204 80058E04 24C6FFFE */   addiu    $a2, $a2, -2
-/* 34208 80058E08 00071400 */  sll       $v0, $a3, 0x10
-/* 3420C 80058E0C 00021403 */  sra       $v0, $v0, 0x10
-/* 34210 80058E10 3C013F10 */  lui       $at, 0x3f10
-/* 34214 80058E14 44811800 */  mtc1      $at, $f3
-/* 34218 80058E18 44801000 */  mtc1      $zero, $f2
-/* 3421C 80058E1C 44820000 */  mtc1      $v0, $f0
-/* 34220 80058E20 00000000 */  nop       
-/* 34224 80058E24 46800021 */  cvt.d.w   $f0, $f0
-/* 34228 80058E28 46220082 */  mul.d     $f2, $f0, $f2
-/* 3422C 80058E2C 00000000 */  nop       
-/* 34230 80058E30 24050009 */  addiu     $a1, $zero, 9
-/* 34234 80058E34 3C0140D0 */  lui       $at, 0x40d0
-/* 34238 80058E38 44813800 */  mtc1      $at, $f7
-/* 3423C 80058E3C 44803000 */  mtc1      $zero, $f6
-/* 34240 80058E40 24830012 */  addiu     $v1, $a0, 0x12
-/* 34244 80058E44 A4870018 */  sh        $a3, 0x18($a0)
-/* 34248 80058E48 46201106 */  mov.d     $f4, $f2
-.L80058E4C:
-/* 3424C 80058E4C 46241082 */  mul.d     $f2, $f2, $f4
-/* 34250 80058E50 00000000 */  nop       
-/* 34254 80058E54 46261002 */  mul.d     $f0, $f2, $f6
-/* 34258 80058E58 00000000 */  nop       
-/* 3425C 80058E5C 24A50001 */  addiu     $a1, $a1, 1
-/* 34260 80058E60 4620020D */  trunc.w.d $f8, $f0
-/* 34264 80058E64 44024000 */  mfc1      $v0, $f8
-/* 34268 80058E68 00000000 */  nop       
-/* 3426C 80058E6C A4620008 */  sh        $v0, 8($v1)
-/* 34270 80058E70 28A20010 */  slti      $v0, $a1, 0x10
-/* 34274 80058E74 1440FFF5 */  bnez      $v0, .L80058E4C
-/* 34278 80058E78 24630002 */   addiu    $v1, $v1, 2
-/* 3427C 80058E7C 03E00008 */  jr        $ra
-/* 34280 80058E80 00000000 */   nop      
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s
deleted file mode 100644
index 226b4c4634..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80058E84
-/* 34284 80058E84 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34288 80058E88 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 3428C 80058E8C 0080982D */  daddu     $s3, $a0, $zero
-/* 34290 80058E90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 34294 80058E94 00C0902D */  daddu     $s2, $a2, $zero
-/* 34298 80058E98 0240202D */  daddu     $a0, $s2, $zero
-/* 3429C 80058E9C AFB40020 */  sw        $s4, 0x20($sp)
-/* 342A0 80058EA0 00A0A02D */  daddu     $s4, $a1, $zero
-/* 342A4 80058EA4 24050004 */  addiu     $a1, $zero, 4
-/* 342A8 80058EA8 24060030 */  addiu     $a2, $zero, 0x30
-/* 342AC 80058EAC AFBF0024 */  sw        $ra, 0x24($sp)
-/* 342B0 80058EB0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 342B4 80058EB4 0C015FE4 */  jal       alHeapAlloc
-/* 342B8 80058EB8 AFB00010 */   sw       $s0, 0x10($sp)
-/* 342BC 80058EBC 0240202D */  daddu     $a0, $s2, $zero
-/* 342C0 80058EC0 24050A10 */  addiu     $a1, $zero, 0xa10
-/* 342C4 80058EC4 24060002 */  addiu     $a2, $zero, 2
-/* 342C8 80058EC8 0C015FE4 */  jal       alHeapAlloc
-/* 342CC 80058ECC AE62000C */   sw       $v0, 0xc($s3)
-/* 342D0 80058ED0 0000882D */  daddu     $s1, $zero, $zero
-/* 342D4 80058ED4 AE620000 */  sw        $v0, ($s3)
-/* 342D8 80058ED8 0240202D */  daddu     $a0, $s2, $zero
-.L80058EDC:
-/* 342DC 80058EDC 24050001 */  addiu     $a1, $zero, 1
-/* 342E0 80058EE0 24060010 */  addiu     $a2, $zero, 0x10
-/* 342E4 80058EE4 3223FFFF */  andi      $v1, $s1, 0xffff
-/* 342E8 80058EE8 00A31004 */  sllv      $v0, $v1, $a1
-/* 342EC 80058EEC 00431021 */  addu      $v0, $v0, $v1
-/* 342F0 80058EF0 8E70000C */  lw        $s0, 0xc($s3)
-/* 342F4 80058EF4 00021100 */  sll       $v0, $v0, 4
-/* 342F8 80058EF8 0C015FE4 */  jal       alHeapAlloc
-/* 342FC 80058EFC 02028021 */   addu     $s0, $s0, $v0
-/* 34300 80058F00 0240202D */  daddu     $a0, $s2, $zero
-/* 34304 80058F04 24050001 */  addiu     $a1, $zero, 1
-/* 34308 80058F08 24060020 */  addiu     $a2, $zero, 0x20
-/* 3430C 80058F0C 0C015FE4 */  jal       alHeapAlloc
-/* 34310 80058F10 AE02002C */   sw       $v0, 0x2c($s0)
-/* 34314 80058F14 0240202D */  daddu     $a0, $s2, $zero
-/* 34318 80058F18 24050001 */  addiu     $a1, $zero, 1
-/* 3431C 80058F1C 8E03002C */  lw        $v1, 0x2c($s0)
-/* 34320 80058F20 24060030 */  addiu     $a2, $zero, 0x30
-/* 34324 80058F24 0C015FE4 */  jal       alHeapAlloc
-/* 34328 80058F28 AC620000 */   sw       $v0, ($v1)
-/* 3432C 80058F2C 0240202D */  daddu     $a0, $s2, $zero
-/* 34330 80058F30 24050001 */  addiu     $a1, $zero, 1
-/* 34334 80058F34 24060008 */  addiu     $a2, $zero, 8
-/* 34338 80058F38 0C015FE4 */  jal       alHeapAlloc
-/* 3433C 80058F3C AE020024 */   sw       $v0, 0x24($s0)
-/* 34340 80058F40 8E030024 */  lw        $v1, 0x24($s0)
-/* 34344 80058F44 26310001 */  addiu     $s1, $s1, 1
-/* 34348 80058F48 AC620028 */  sw        $v0, 0x28($v1)
-/* 3434C 80058F4C 3222FFFF */  andi      $v0, $s1, 0xffff
-/* 34350 80058F50 2C420004 */  sltiu     $v0, $v0, 4
-/* 34354 80058F54 1440FFE1 */  bnez      $v0, .L80058EDC
-/* 34358 80058F58 0240202D */   daddu    $a0, $s2, $zero
-/* 3435C 80058F5C 0260202D */  daddu     $a0, $s3, $zero
-/* 34360 80058F60 0C016413 */  jal       func_8005904C
-/* 34364 80058F64 328500FF */   andi     $a1, $s4, 0xff
-/* 34368 80058F68 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 3436C 80058F6C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 34370 80058F70 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 34374 80058F74 8FB20018 */  lw        $s2, 0x18($sp)
-/* 34378 80058F78 8FB10014 */  lw        $s1, 0x14($sp)
-/* 3437C 80058F7C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 34380 80058F80 03E00008 */  jr        $ra
-/* 34384 80058F84 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s
deleted file mode 100644
index 2aec790b72..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80058F88
-/* 34388 80058F88 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 3438C 80058F8C AFB10014 */  sw        $s1, 0x14($sp)
-/* 34390 80058F90 0080882D */  daddu     $s1, $a0, $zero
-/* 34394 80058F94 AFB00010 */  sw        $s0, 0x10($sp)
-/* 34398 80058F98 00A0802D */  daddu     $s0, $a1, $zero
-/* 3439C 80058F9C 0200202D */  daddu     $a0, $s0, $zero
-/* 343A0 80058FA0 24051420 */  addiu     $a1, $zero, 0x1420
-/* 343A4 80058FA4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 343A8 80058FA8 0C015FE4 */  jal       alHeapAlloc
-/* 343AC 80058FAC 24060002 */   addiu    $a2, $zero, 2
-/* 343B0 80058FB0 0200202D */  daddu     $a0, $s0, $zero
-/* 343B4 80058FB4 24050001 */  addiu     $a1, $zero, 1
-/* 343B8 80058FB8 24060030 */  addiu     $a2, $zero, 0x30
-/* 343BC 80058FBC 0C015FE4 */  jal       alHeapAlloc
-/* 343C0 80058FC0 AE220000 */   sw       $v0, ($s1)
-/* 343C4 80058FC4 0200202D */  daddu     $a0, $s0, $zero
-/* 343C8 80058FC8 24050001 */  addiu     $a1, $zero, 1
-/* 343CC 80058FCC 24060008 */  addiu     $a2, $zero, 8
-/* 343D0 80058FD0 0C015FE4 */  jal       alHeapAlloc
-/* 343D4 80058FD4 AE220010 */   sw       $v0, 0x10($s1)
-/* 343D8 80058FD8 0220202D */  daddu     $a0, $s1, $zero
-/* 343DC 80058FDC 0000282D */  daddu     $a1, $zero, $zero
-/* 343E0 80058FE0 00A0302D */  daddu     $a2, $a1, $zero
-/* 343E4 80058FE4 8C830010 */  lw        $v1, 0x10($a0)
-/* 343E8 80058FE8 24075000 */  addiu     $a3, $zero, 0x5000
-/* 343EC 80058FEC 0C016402 */  jal       func_80059008
-/* 343F0 80058FF0 AC620028 */   sw       $v0, 0x28($v1)
-/* 343F4 80058FF4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 343F8 80058FF8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 343FC 80058FFC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 34400 80059000 03E00008 */  jr        $ra
-/* 34404 80059004 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s
deleted file mode 100644
index b4094302e5..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059008
-/* 34408 80059008 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 3440C 8005900C 00071400 */  sll       $v0, $a3, 0x10
-/* 34410 80059010 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 34414 80059014 A4850006 */  sh        $a1, 6($a0)
-/* 34418 80059018 10400008 */  beqz      $v0, .L8005903C
-/* 3441C 8005901C A4860008 */   sh       $a2, 8($a0)
-/* 34420 80059020 8C820010 */  lw        $v0, 0x10($a0)
-/* 34424 80059024 AC82000C */  sw        $v0, 0xc($a0)
-/* 34428 80059028 A4470000 */  sh        $a3, ($v0)
-/* 3442C 8005902C 0C016374 */  jal       func_80058DD0
-/* 34430 80059030 8C84000C */   lw       $a0, 0xc($a0)
-/* 34434 80059034 08016410 */  j         .L80059040
-/* 34438 80059038 00000000 */   nop      
-.L8005903C:
-/* 3443C 8005903C AC80000C */  sw        $zero, 0xc($a0)
-.L80059040:
-/* 34440 80059040 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 34444 80059044 03E00008 */  jr        $ra
-/* 34448 80059048 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s b/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s
deleted file mode 100644
index a3c371c8e1..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s
+++ /dev/null
@@ -1,191 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8005904C
-/* 3444C 8005904C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34450 80059050 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 34454 80059054 0080982D */  daddu     $s3, $a0, $zero
-/* 34458 80059058 30A500FF */  andi      $a1, $a1, 0xff
-/* 3445C 8005905C 24A5FFFF */  addiu     $a1, $a1, -1
-/* 34460 80059060 2CA2000A */  sltiu     $v0, $a1, 0xa
-/* 34464 80059064 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 34468 80059068 AFB20018 */  sw        $s2, 0x18($sp)
-/* 3446C 8005906C AFB10014 */  sw        $s1, 0x14($sp)
-/* 34470 80059070 AFB00010 */  sw        $s0, 0x10($sp)
-/* 34474 80059074 8E660000 */  lw        $a2, ($s3)
-/* 34478 80059078 10400021 */  beqz      $v0, .L80059100
-/* 3447C 8005907C 00051080 */   sll      $v0, $a1, 2
-/* 34480 80059080 3C01800A */  lui       $at, 0x800a
-/* 34484 80059084 00220821 */  addu      $at, $at, $v0
-/* 34488 80059088 8C228940 */  lw        $v0, -0x76c0($at)
-/* 3448C 8005908C 00400008 */  jr        $v0
-/* 34490 80059090 00000000 */   nop      
-/* 34494 80059094 3C048008 */  lui       $a0, 0x8008
-/* 34498 80059098 08016442 */  j         .L80059108
-/* 3449C 8005909C 2484EFE0 */   addiu    $a0, $a0, -0x1020
-/* 344A0 800590A0 3C048008 */  lui       $a0, 0x8008
-/* 344A4 800590A4 08016442 */  j         .L80059108
-/* 344A8 800590A8 2484F158 */   addiu    $a0, $a0, -0xea8
-/* 344AC 800590AC 3C048008 */  lui       $a0, 0x8008
-/* 344B0 800590B0 08016442 */  j         .L80059108
-/* 344B4 800590B4 2484F180 */   addiu    $a0, $a0, -0xe80
-/* 344B8 800590B8 3C048008 */  lui       $a0, 0x8008
-/* 344BC 800590BC 08016442 */  j         .L80059108
-/* 344C0 800590C0 2484F1A8 */   addiu    $a0, $a0, -0xe58
-/* 344C4 800590C4 3C048008 */  lui       $a0, 0x8008
-/* 344C8 800590C8 08016442 */  j         .L80059108
-/* 344CC 800590CC 8C84F1F8 */   lw       $a0, -0xe08($a0)
-/* 344D0 800590D0 3C048008 */  lui       $a0, 0x8008
-/* 344D4 800590D4 08016442 */  j         .L80059108
-/* 344D8 800590D8 8C84F1FC */   lw       $a0, -0xe04($a0)
-/* 344DC 800590DC 3C048008 */  lui       $a0, 0x8008
-/* 344E0 800590E0 08016442 */  j         .L80059108
-/* 344E4 800590E4 8C84F200 */   lw       $a0, -0xe00($a0)
-/* 344E8 800590E8 3C048008 */  lui       $a0, 0x8008
-/* 344EC 800590EC 08016442 */  j         .L80059108
-/* 344F0 800590F0 8C84F204 */   lw       $a0, -0xdfc($a0)
-/* 344F4 800590F4 3C048008 */  lui       $a0, 0x8008
-/* 344F8 800590F8 08016442 */  j         .L80059108
-/* 344FC 800590FC 2484F048 */   addiu    $a0, $a0, -0xfb8
-.L80059100:
-/* 34500 80059100 3C048008 */  lui       $a0, 0x8008
-/* 34504 80059104 2484F1D0 */  addiu     $a0, $a0, -0xe30
-.L80059108:
-/* 34508 80059108 90820003 */  lbu       $v0, 3($a0)
-/* 3450C 8005910C A2620010 */  sb        $v0, 0x10($s3)
-/* 34510 80059110 8C830004 */  lw        $v1, 4($a0)
-/* 34514 80059114 8E620000 */  lw        $v0, ($s3)
-/* 34518 80059118 24110507 */  addiu     $s1, $zero, 0x507
-/* 3451C 8005911C AE620004 */  sw        $v0, 4($s3)
-/* 34520 80059120 00031040 */  sll       $v0, $v1, 1
-/* 34524 80059124 00431021 */  addu      $v0, $v0, $v1
-/* 34528 80059128 000210C0 */  sll       $v0, $v0, 3
-/* 3452C 8005912C 00431023 */  subu      $v0, $v0, $v1
-/* 34530 80059130 000210C0 */  sll       $v0, $v0, 3
-/* 34534 80059134 AE620008 */  sw        $v0, 8($s3)
-.L80059138:
-/* 34538 80059138 ACC00000 */  sw        $zero, ($a2)
-/* 3453C 8005913C 2631FFFF */  addiu     $s1, $s1, -1
-/* 34540 80059140 0621FFFD */  bgez      $s1, .L80059138
-/* 34544 80059144 24C60004 */   addiu    $a2, $a2, 4
-/* 34548 80059148 92620010 */  lbu       $v0, 0x10($s3)
-/* 3454C 8005914C 10400069 */  beqz      $v0, .L800592F4
-/* 34550 80059150 0000882D */   daddu    $s1, $zero, $zero
-/* 34554 80059154 0220902D */  daddu     $s2, $s1, $zero
-/* 34558 80059158 24020002 */  addiu     $v0, $zero, 2
-/* 3455C 8005915C 00421004 */  sllv      $v0, $v0, $v0
-/* 34560 80059160 00448021 */  addu      $s0, $v0, $a0
-.L80059164:
-/* 34564 80059164 8E62000C */  lw        $v0, 0xc($s3)
-/* 34568 80059168 8E030000 */  lw        $v1, ($s0)
-/* 3456C 8005916C 26100004 */  addiu     $s0, $s0, 4
-/* 34570 80059170 00522021 */  addu      $a0, $v0, $s2
-/* 34574 80059174 00031040 */  sll       $v0, $v1, 1
-/* 34578 80059178 00431021 */  addu      $v0, $v0, $v1
-/* 3457C 8005917C 000210C0 */  sll       $v0, $v0, 3
-/* 34580 80059180 00431023 */  subu      $v0, $v0, $v1
-/* 34584 80059184 000210C0 */  sll       $v0, $v0, 3
-/* 34588 80059188 AC820000 */  sw        $v0, ($a0)
-/* 3458C 8005918C 8E030000 */  lw        $v1, ($s0)
-/* 34590 80059190 26100004 */  addiu     $s0, $s0, 4
-/* 34594 80059194 00031040 */  sll       $v0, $v1, 1
-/* 34598 80059198 00431021 */  addu      $v0, $v0, $v1
-/* 3459C 8005919C 000210C0 */  sll       $v0, $v0, 3
-/* 345A0 800591A0 00431023 */  subu      $v0, $v0, $v1
-/* 345A4 800591A4 000210C0 */  sll       $v0, $v0, 3
-/* 345A8 800591A8 AC820004 */  sw        $v0, 4($a0)
-/* 345AC 800591AC 96020002 */  lhu       $v0, 2($s0)
-/* 345B0 800591B0 26100004 */  addiu     $s0, $s0, 4
-/* 345B4 800591B4 A482000A */  sh        $v0, 0xa($a0)
-/* 345B8 800591B8 96020002 */  lhu       $v0, 2($s0)
-/* 345BC 800591BC 26100004 */  addiu     $s0, $s0, 4
-/* 345C0 800591C0 A4820008 */  sh        $v0, 8($a0)
-/* 345C4 800591C4 96020002 */  lhu       $v0, 2($s0)
-/* 345C8 800591C8 26100004 */  addiu     $s0, $s0, 4
-/* 345CC 800591CC A482000C */  sh        $v0, 0xc($a0)
-/* 345D0 800591D0 8E020000 */  lw        $v0, ($s0)
-/* 345D4 800591D4 50400033 */  beql      $v0, $zero, .L800592A4
-/* 345D8 800591D8 AC800028 */   sw       $zero, 0x28($a0)
-/* 345DC 800591DC 26100004 */  addiu     $s0, $s0, 4
-/* 345E0 800591E0 44820000 */  mtc1      $v0, $f0
-/* 345E4 800591E4 00000000 */  nop       
-/* 345E8 800591E8 46800020 */  cvt.s.w   $f0, $f0
-/* 345EC 800591EC 3C01447A */  lui       $at, 0x447a
-/* 345F0 800591F0 44811000 */  mtc1      $at, $f2
-/* 345F4 800591F4 8C830004 */  lw        $v1, 4($a0)
-/* 345F8 800591F8 8C820000 */  lw        $v0, ($a0)
-/* 345FC 800591FC 46020003 */  div.s     $f0, $f0, $f2
-/* 34600 80059200 46000021 */  cvt.d.s   $f0, $f0
-/* 34604 80059204 00621823 */  subu      $v1, $v1, $v0
-/* 34608 80059208 46200000 */  add.d     $f0, $f0, $f0
-/* 3460C 8005920C 3C028008 */  lui       $v0, 0x8008
-/* 34610 80059210 8C428E50 */  lw        $v0, -0x71b0($v0)
-/* 34614 80059214 44832000 */  mtc1      $v1, $f4
-/* 34618 80059218 00000000 */  nop       
-/* 3461C 8005921C 46802121 */  cvt.d.w   $f4, $f4
-/* 34620 80059220 C4420008 */  lwc1      $f2, 8($v0)
-/* 34624 80059224 468010A1 */  cvt.d.w   $f2, $f2
-/* 34628 80059228 46220003 */  div.d     $f0, $f0, $f2
-/* 3462C 8005922C 46200020 */  cvt.s.d   $f0, $f0
-/* 34630 80059230 E4800010 */  swc1      $f0, 0x10($a0)
-/* 34634 80059234 C6000000 */  lwc1      $f0, ($s0)
-/* 34638 80059238 46800020 */  cvt.s.w   $f0, $f0
-/* 3463C 8005923C 26100004 */  addiu     $s0, $s0, 4
-/* 34640 80059240 3C01800A */  lui       $at, 0x800a
-/* 34644 80059244 D4228968 */  ldc1      $f2, -0x7698($at)
-/* 34648 80059248 46000021 */  cvt.d.s   $f0, $f0
-/* 3464C 8005924C 04610006 */  bgez      $v1, .L80059268
-/* 34650 80059250 46220083 */   div.d    $f2, $f0, $f2
-/* 34654 80059254 3C0141F0 */  lui       $at, 0x41f0
-/* 34658 80059258 44810800 */  mtc1      $at, $f1
-/* 3465C 8005925C 44800000 */  mtc1      $zero, $f0
-/* 34660 80059260 00000000 */  nop       
-/* 34664 80059264 46202100 */  add.d     $f4, $f4, $f0
-.L80059268:
-/* 34668 80059268 46241002 */  mul.d     $f0, $f2, $f4
-/* 3466C 8005926C 00000000 */  nop       
-/* 34670 80059270 3C013F80 */  lui       $at, 0x3f80
-/* 34674 80059274 44811000 */  mtc1      $at, $f2
-/* 34678 80059278 8C82002C */  lw        $v0, 0x2c($a0)
-/* 3467C 8005927C AC800018 */  sw        $zero, 0x18($a0)
-/* 34680 80059280 E4820014 */  swc1      $f2, 0x14($a0)
-/* 34684 80059284 AC820028 */  sw        $v0, 0x28($a0)
-/* 34688 80059288 46200020 */  cvt.s.d   $f0, $f0
-/* 3468C 8005928C E480001C */  swc1      $f0, 0x1c($a0)
-/* 34690 80059290 AC400008 */  sw        $zero, 8($v0)
-/* 34694 80059294 8C830028 */  lw        $v1, 0x28($a0)
-/* 34698 80059298 24020001 */  addiu     $v0, $zero, 1
-/* 3469C 8005929C 080164AA */  j         .L800592A8
-/* 346A0 800592A0 AC62000C */   sw       $v0, 0xc($v1)
-.L800592A4:
-/* 346A4 800592A4 26100008 */  addiu     $s0, $s0, 8
-.L800592A8:
-/* 346A8 800592A8 8E020000 */  lw        $v0, ($s0)
-/* 346AC 800592AC 5040000A */  beql      $v0, $zero, .L800592D8
-/* 346B0 800592B0 AC800020 */   sw       $zero, 0x20($a0)
-/* 346B4 800592B4 8C830024 */  lw        $v1, 0x24($a0)
-/* 346B8 800592B8 AC830020 */  sw        $v1, 0x20($a0)
-/* 346BC 800592BC 96020002 */  lhu       $v0, 2($s0)
-/* 346C0 800592C0 A4620000 */  sh        $v0, ($v1)
-/* 346C4 800592C4 8C840020 */  lw        $a0, 0x20($a0)
-/* 346C8 800592C8 0C016374 */  jal       func_80058DD0
-/* 346CC 800592CC 26100004 */   addiu    $s0, $s0, 4
-/* 346D0 800592D0 080164B8 */  j         .L800592E0
-/* 346D4 800592D4 26520030 */   addiu    $s2, $s2, 0x30
-.L800592D8:
-/* 346D8 800592D8 26100004 */  addiu     $s0, $s0, 4
-/* 346DC 800592DC 26520030 */  addiu     $s2, $s2, 0x30
-.L800592E0:
-/* 346E0 800592E0 92620010 */  lbu       $v0, 0x10($s3)
-/* 346E4 800592E4 26310001 */  addiu     $s1, $s1, 1
-/* 346E8 800592E8 0222102A */  slt       $v0, $s1, $v0
-/* 346EC 800592EC 1440FF9D */  bnez      $v0, .L80059164
-/* 346F0 800592F0 00000000 */   nop      
-.L800592F4:
-/* 346F4 800592F4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 346F8 800592F8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 346FC 800592FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 34700 80059300 8FB10014 */  lw        $s1, 0x14($sp)
-/* 34704 80059304 8FB00010 */  lw        $s0, 0x10($sp)
-/* 34708 80059308 03E00008 */  jr        $ra
-/* 3470C 8005930C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s
deleted file mode 100644
index c21b3f1924..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s
+++ /dev/null
@@ -1,375 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059310
-/* 34710 80059310 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* 34714 80059314 AFB00030 */  sw        $s0, 0x30($sp)
-/* 34718 80059318 00A0802D */  daddu     $s0, $a1, $zero
-/* 3471C 8005931C AFB10034 */  sw        $s1, 0x34($sp)
-/* 34720 80059320 00C0882D */  daddu     $s1, $a2, $zero
-/* 34724 80059324 AFB60048 */  sw        $s6, 0x48($sp)
-/* 34728 80059328 24F60170 */  addiu     $s6, $a3, 0x170
-/* 3472C 8005932C 32220FFF */  andi      $v0, $s1, 0xfff
-/* 34730 80059330 3C030617 */  lui       $v1, 0x617
-/* 34734 80059334 00431025 */  or        $v0, $v0, $v1
-/* 34738 80059338 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 3473C 8005933C AFBE0050 */  sw        $fp, 0x50($sp)
-/* 34740 80059340 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 34744 80059344 AFB50044 */  sw        $s5, 0x44($sp)
-/* 34748 80059348 AFB40040 */  sw        $s4, 0x40($sp)
-/* 3474C 8005934C AFB3003C */  sw        $s3, 0x3c($sp)
-/* 34750 80059350 AFB20038 */  sw        $s2, 0x38($sp)
-/* 34754 80059354 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* 34758 80059358 F7B40058 */  sdc1      $f20, 0x58($sp)
-/* 3475C 8005935C AFA40068 */  sw        $a0, 0x68($sp)
-/* 34760 80059360 A7A70026 */  sh        $a3, 0x26($sp)
-/* 34764 80059364 A7A0001E */  sh        $zero, 0x1e($sp)
-/* 34768 80059368 AE020000 */  sw        $v0, ($s0)
-/* 3476C 8005936C 8FA80068 */  lw        $t0, 0x68($sp)
-/* 34770 80059370 26120008 */  addiu     $s2, $s0, 8
-/* 34774 80059374 8D040004 */  lw        $a0, 4($t0)
-/* 34778 80059378 0C0187A4 */  jal       osVirtualToPhysical
-/* 3477C 8005937C 24F302E0 */   addiu    $s3, $a3, 0x2e0
-/* 34780 80059380 0240202D */  daddu     $a0, $s2, $zero
-/* 34784 80059384 3C0300FF */  lui       $v1, 0xff
-/* 34788 80059388 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 3478C 8005938C AE020004 */  sw        $v0, 4($s0)
-/* 34790 80059390 00111400 */  sll       $v0, $s1, 0x10
-/* 34794 80059394 00021403 */  sra       $v0, $v0, 0x10
-/* 34798 80059398 00431024 */  and       $v0, $v0, $v1
-/* 3479C 8005939C 3C030200 */  lui       $v1, 0x200
-/* 347A0 800593A0 00431025 */  or        $v0, $v0, $v1
-/* 347A4 800593A4 AC820000 */  sw        $v0, ($a0)
-/* 347A8 800593A8 24020170 */  addiu     $v0, $zero, 0x170
-/* 347AC 800593AC AC820004 */  sw        $v0, 4($a0)
-/* 347B0 800593B0 8FA80068 */  lw        $t0, 0x68($sp)
-/* 347B4 800593B4 0000A02D */  daddu     $s4, $zero, $zero
-/* 347B8 800593B8 91020010 */  lbu       $v0, 0x10($t0)
-/* 347BC 800593BC 26520008 */  addiu     $s2, $s2, 8
-/* 347C0 800593C0 1040011D */  beqz      $v0, .L80059838
-/* 347C4 800593C4 A7B10028 */   sh       $s1, 0x28($sp)
-/* 347C8 800593C8 00131400 */  sll       $v0, $s3, 0x10
-/* 347CC 800593CC 3C014700 */  lui       $at, 0x4700
-/* 347D0 800593D0 4481B000 */  mtc1      $at, $f22
-/* 347D4 800593D4 00021403 */  sra       $v0, $v0, 0x10
-/* 347D8 800593D8 AFA2002C */  sw        $v0, 0x2c($sp)
-.L800593DC:
-/* 347DC 800593DC 97A8001E */  lhu       $t0, 0x1e($sp)
-/* 347E0 800593E0 00081400 */  sll       $v0, $t0, 0x10
-/* 347E4 800593E4 00021403 */  sra       $v0, $v0, 0x10
-/* 347E8 800593E8 00021840 */  sll       $v1, $v0, 1
-/* 347EC 800593EC 00621821 */  addu      $v1, $v1, $v0
-/* 347F0 800593F0 8FA80068 */  lw        $t0, 0x68($sp)
-/* 347F4 800593F4 00031900 */  sll       $v1, $v1, 4
-/* 347F8 800593F8 8D02000C */  lw        $v0, 0xc($t0)
-/* 347FC 800593FC 8D040004 */  lw        $a0, 4($t0)
-/* 34800 80059400 00439821 */  addu      $s3, $v0, $v1
-/* 34804 80059404 8E620000 */  lw        $v0, ($s3)
-/* 34808 80059408 8D030000 */  lw        $v1, ($t0)
-/* 3480C 8005940C 00021040 */  sll       $v0, $v0, 1
-/* 34810 80059410 0082B823 */  subu      $s7, $a0, $v0
-/* 34814 80059414 02E3102B */  sltu      $v0, $s7, $v1
-/* 34818 80059418 10400004 */  beqz      $v0, .L8005942C
-/* 3481C 8005941C 00000000 */   nop      
-/* 34820 80059420 8D020008 */  lw        $v0, 8($t0)
-/* 34824 80059424 00021040 */  sll       $v0, $v0, 1
-/* 34828 80059428 02E2B821 */  addu      $s7, $s7, $v0
-.L8005942C:
-/* 3482C 8005942C 8E620004 */  lw        $v0, 4($s3)
-/* 34830 80059430 00021040 */  sll       $v0, $v0, 1
-/* 34834 80059434 0082F023 */  subu      $fp, $a0, $v0
-/* 34838 80059438 03C3102B */  sltu      $v0, $fp, $v1
-/* 3483C 8005943C 10400005 */  beqz      $v0, .L80059454
-/* 34840 80059440 00000000 */   nop      
-/* 34844 80059444 8FA80068 */  lw        $t0, 0x68($sp)
-/* 34848 80059448 8D020008 */  lw        $v0, 8($t0)
-/* 3484C 8005944C 00021040 */  sll       $v0, $v0, 1
-/* 34850 80059450 03C2F021 */  addu      $fp, $fp, $v0
-.L80059454:
-/* 34854 80059454 16F40005 */  bne       $s7, $s4, .L8005946C
-/* 34858 80059458 0240802D */   daddu    $s0, $s2, $zero
-/* 3485C 8005945C 02C0102D */  daddu     $v0, $s6, $zero
-/* 34860 80059460 97B60026 */  lhu       $s6, 0x26($sp)
-/* 34864 80059464 08016524 */  j         .L80059490
-/* 34868 80059468 A7A20026 */   sh       $v0, 0x26($sp)
-.L8005946C:
-/* 3486C 8005946C 26520008 */  addiu     $s2, $s2, 8
-/* 34870 80059470 02E0202D */  daddu     $a0, $s7, $zero
-/* 34874 80059474 97A80026 */  lhu       $t0, 0x26($sp)
-/* 34878 80059478 3C030417 */  lui       $v1, 0x417
-/* 3487C 8005947C 31020FFF */  andi      $v0, $t0, 0xfff
-/* 34880 80059480 00431025 */  or        $v0, $v0, $v1
-/* 34884 80059484 0C0187A4 */  jal       osVirtualToPhysical
-/* 34888 80059488 AE020000 */   sw       $v0, ($s0)
-/* 3488C 8005948C AE020004 */  sw        $v0, 4($s0)
-.L80059490:
-/* 34890 80059490 8E620028 */  lw        $v0, 0x28($s3)
-/* 34894 80059494 10400068 */  beqz      $v0, .L80059638
-/* 34898 80059498 0260202D */   daddu    $a0, $s3, $zero
-/* 3489C 8005949C 8E700004 */  lw        $s0, 4($s3)
-/* 348A0 800594A0 8E620000 */  lw        $v0, ($s3)
-/* 348A4 800594A4 240500B8 */  addiu     $a1, $zero, 0xb8
-/* 348A8 800594A8 0C0166F5 */  jal       func_80059BD4
-/* 348AC 800594AC 02028023 */   subu     $s0, $s0, $v0
-/* 348B0 800594B0 44901000 */  mtc1      $s0, $f2
-/* 348B4 800594B4 00000000 */  nop       
-/* 348B8 800594B8 468010A0 */  cvt.s.w   $f2, $f2
-/* 348BC 800594BC 46020103 */  div.s     $f4, $f0, $f2
-/* 348C0 800594C0 46162002 */  mul.s     $f0, $f4, $f22
-/* 348C4 800594C4 00000000 */  nop       
-/* 348C8 800594C8 4600018D */  trunc.w.s $f6, $f0
-/* 348CC 800594CC 44023000 */  mfc1      $v0, $f6
-/* 348D0 800594D0 3C013800 */  lui       $at, 0x3800
-/* 348D4 800594D4 44810000 */  mtc1      $at, $f0
-/* 348D8 800594D8 44822000 */  mtc1      $v0, $f4
-/* 348DC 800594DC 00000000 */  nop       
-/* 348E0 800594E0 46802120 */  cvt.s.w   $f4, $f4
-/* 348E4 800594E4 46002102 */  mul.s     $f4, $f4, $f0
-/* 348E8 800594E8 00000000 */  nop       
-/* 348EC 800594EC 3C013FF0 */  lui       $at, 0x3ff0
-/* 348F0 800594F0 44811800 */  mtc1      $at, $f3
-/* 348F4 800594F4 44801000 */  mtc1      $zero, $f2
-/* 348F8 800594F8 46002021 */  cvt.d.s   $f0, $f4
-/* 348FC 800594FC 46201081 */  sub.d     $f2, $f2, $f0
-/* 34900 80059500 3C014338 */  lui       $at, 0x4338
-/* 34904 80059504 44812000 */  mtc1      $at, $f4
-/* 34908 80059508 46201520 */  cvt.s.d   $f20, $f2
-/* 3490C 8005950C 4604A102 */  mul.s     $f4, $f20, $f4
-/* 34910 80059510 00000000 */  nop       
-/* 34914 80059514 8E620028 */  lw        $v0, 0x28($s3)
-/* 34918 80059518 C4400008 */  lwc1      $f0, 8($v0)
-/* 3491C 8005951C 46040000 */  add.s     $f0, $f0, $f4
-/* 34920 80059520 4600018D */  trunc.w.s $f6, $f0
-/* 34924 80059524 44143000 */  mfc1      $s4, $f6
-/* 34928 80059528 00000000 */  nop       
-/* 3492C 8005952C 44941000 */  mtc1      $s4, $f2
-/* 34930 80059530 00000000 */  nop       
-/* 34934 80059534 468010A0 */  cvt.s.w   $f2, $f2
-/* 34938 80059538 46020001 */  sub.s     $f0, $f0, $f2
-/* 3493C 8005953C E4400008 */  swc1      $f0, 8($v0)
-/* 34940 80059540 8E630018 */  lw        $v1, 0x18($s3)
-/* 34944 80059544 8E620004 */  lw        $v0, 4($s3)
-/* 34948 80059548 8FA80068 */  lw        $t0, 0x68($sp)
-/* 3494C 8005954C 00621823 */  subu      $v1, $v1, $v0
-/* 34950 80059550 8D020004 */  lw        $v0, 4($t0)
-/* 34954 80059554 00031840 */  sll       $v1, $v1, 1
-/* 34958 80059558 00432821 */  addu      $a1, $v0, $v1
-/* 3495C 8005955C 30A20007 */  andi      $v0, $a1, 7
-/* 34960 80059560 00021843 */  sra       $v1, $v0, 1
-/* 34964 80059564 0003A840 */  sll       $s5, $v1, 1
-/* 34968 80059568 8D020000 */  lw        $v0, ($t0)
-/* 3496C 8005956C 00B52823 */  subu      $a1, $a1, $s5
-/* 34970 80059570 00A2102B */  sltu      $v0, $a1, $v0
-/* 34974 80059574 10400004 */  beqz      $v0, .L80059588
-/* 34978 80059578 00000000 */   nop      
-/* 3497C 8005957C 8D020008 */  lw        $v0, 8($t0)
-/* 34980 80059580 00021040 */  sll       $v0, $v0, 1
-/* 34984 80059584 00A22821 */  addu      $a1, $a1, $v0
-.L80059588:
-/* 34988 80059588 8FA40068 */  lw        $a0, 0x68($sp)
-/* 3498C 8005958C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* 34990 80059590 02833821 */  addu      $a3, $s4, $v1
-/* 34994 80059594 0C0166AE */  jal       func_80059AB8
-/* 34998 80059598 AFB20010 */   sw       $s2, 0x10($sp)
-/* 3499C 8005959C 0040902D */  daddu     $s2, $v0, $zero
-/* 349A0 800595A0 4616A002 */  mul.s     $f0, $f20, $f22
-/* 349A4 800595A4 00000000 */  nop       
-/* 349A8 800595A8 00168C00 */  sll       $s1, $s6, 0x10
-/* 349AC 800595AC 8E630028 */  lw        $v1, 0x28($s3)
-/* 349B0 800595B0 8C640000 */  lw        $a0, ($v1)
-/* 349B4 800595B4 4600018D */  trunc.w.s $f6, $f0
-/* 349B8 800595B8 44103000 */  mfc1      $s0, $f6
-/* 349BC 800595BC 0C0187A4 */  jal       osVirtualToPhysical
-/* 349C0 800595C0 00118E03 */   sra      $s1, $s1, 0x18
-/* 349C4 800595C4 3C0300FF */  lui       $v1, 0xff
-/* 349C8 800595C8 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 349CC 800595CC 0240202D */  daddu     $a0, $s2, $zero
-/* 349D0 800595D0 00431024 */  and       $v0, $v0, $v1
-/* 349D4 800595D4 3C030500 */  lui       $v1, 0x500
-/* 349D8 800595D8 00431025 */  or        $v0, $v0, $v1
-/* 349DC 800595DC 3210FFFF */  andi      $s0, $s0, 0xffff
-/* 349E0 800595E0 00108380 */  sll       $s0, $s0, 0xe
-/* 349E4 800595E4 32310003 */  andi      $s1, $s1, 3
-/* 349E8 800595E8 AC820000 */  sw        $v0, ($a0)
-/* 349EC 800595EC 8E620028 */  lw        $v0, 0x28($s3)
-/* 349F0 800595F0 8FA8002C */  lw        $t0, 0x2c($sp)
-/* 349F4 800595F4 8C43000C */  lw        $v1, 0xc($v0)
-/* 349F8 800595F8 01151021 */  addu      $v0, $t0, $s5
-/* 349FC 800595FC 30420FFF */  andi      $v0, $v0, 0xfff
-/* 34A00 80059600 00021080 */  sll       $v0, $v0, 2
-/* 34A04 80059604 00031F80 */  sll       $v1, $v1, 0x1e
-/* 34A08 80059608 00701825 */  or        $v1, $v1, $s0
-/* 34A0C 8005960C 00621825 */  or        $v1, $v1, $v0
-/* 34A10 80059610 00711825 */  or        $v1, $v1, $s1
-/* 34A14 80059614 AC830004 */  sw        $v1, 4($a0)
-/* 34A18 80059618 8E620028 */  lw        $v0, 0x28($s3)
-/* 34A1C 8005961C AC40000C */  sw        $zero, 0xc($v0)
-/* 34A20 80059620 8E620018 */  lw        $v0, 0x18($s3)
-/* 34A24 80059624 26520008 */  addiu     $s2, $s2, 8
-/* 34A28 80059628 2442FF48 */  addiu     $v0, $v0, -0xb8
-/* 34A2C 8005962C 00541021 */  addu      $v0, $v0, $s4
-/* 34A30 80059630 08016597 */  j         .L8005965C
-/* 34A34 80059634 AE620018 */   sw       $v0, 0x18($s3)
-.L80059638:
-/* 34A38 80059638 0240802D */  daddu     $s0, $s2, $zero
-/* 34A3C 8005963C 26520008 */  addiu     $s2, $s2, 8
-/* 34A40 80059640 03C0202D */  daddu     $a0, $fp, $zero
-/* 34A44 80059644 32C20FFF */  andi      $v0, $s6, 0xfff
-/* 34A48 80059648 3C030417 */  lui       $v1, 0x417
-/* 34A4C 8005964C 00431025 */  or        $v0, $v0, $v1
-/* 34A50 80059650 0C0187A4 */  jal       osVirtualToPhysical
-/* 34A54 80059654 AE020000 */   sw       $v0, ($s0)
-/* 34A58 80059658 AE020004 */  sw        $v0, 4($s0)
-.L8005965C:
-/* 34A5C 8005965C 86620008 */  lh        $v0, 8($s3)
-/* 34A60 80059660 10400018 */  beqz      $v0, .L800596C4
-/* 34A64 80059664 0240282D */   daddu    $a1, $s2, $zero
-/* 34A68 80059668 32C4FFFF */  andi      $a0, $s6, 0xffff
-/* 34A6C 8005966C 97A80026 */  lhu       $t0, 0x26($sp)
-/* 34A70 80059670 96630008 */  lhu       $v1, 8($s3)
-/* 34A74 80059674 00081400 */  sll       $v0, $t0, 0x10
-/* 34A78 80059678 00441025 */  or        $v0, $v0, $a0
-/* 34A7C 8005967C 3C080C00 */  lui       $t0, 0xc00
-/* 34A80 80059680 00681825 */  or        $v1, $v1, $t0
-/* 34A84 80059684 ACA20004 */  sw        $v0, 4($a1)
-/* 34A88 80059688 ACA30000 */  sw        $v1, ($a1)
-/* 34A8C 8005968C 8E620028 */  lw        $v0, 0x28($s3)
-/* 34A90 80059690 1440000C */  bnez      $v0, .L800596C4
-/* 34A94 80059694 26520008 */   addiu    $s2, $s2, 8
-/* 34A98 80059698 8E620020 */  lw        $v0, 0x20($s3)
-/* 34A9C 8005969C 14400009 */  bnez      $v0, .L800596C4
-/* 34AA0 800596A0 0240802D */   daddu    $s0, $s2, $zero
-/* 34AA4 800596A4 26520008 */  addiu     $s2, $s2, 8
-/* 34AA8 800596A8 03C0202D */  daddu     $a0, $fp, $zero
-/* 34AAC 800596AC 32C20FFF */  andi      $v0, $s6, 0xfff
-/* 34AB0 800596B0 3C080617 */  lui       $t0, 0x617
-/* 34AB4 800596B4 00481025 */  or        $v0, $v0, $t0
-/* 34AB8 800596B8 0C0187A4 */  jal       osVirtualToPhysical
-/* 34ABC 800596BC AE020000 */   sw       $v0, ($s0)
-/* 34AC0 800596C0 AE020004 */  sw        $v0, 4($s0)
-.L800596C4:
-/* 34AC4 800596C4 8662000A */  lh        $v0, 0xa($s3)
-/* 34AC8 800596C8 10400014 */  beqz      $v0, .L8005971C
-/* 34ACC 800596CC 0240302D */   daddu    $a2, $s2, $zero
-/* 34AD0 800596D0 26520008 */  addiu     $s2, $s2, 8
-/* 34AD4 800596D4 0240802D */  daddu     $s0, $s2, $zero
-/* 34AD8 800596D8 26520008 */  addiu     $s2, $s2, 8
-/* 34ADC 800596DC 00161400 */  sll       $v0, $s6, 0x10
-/* 34AE0 800596E0 3C080C00 */  lui       $t0, 0xc00
-/* 34AE4 800596E4 97A50026 */  lhu       $a1, 0x26($sp)
-/* 34AE8 800596E8 9663000A */  lhu       $v1, 0xa($s3)
-/* 34AEC 800596EC 00451025 */  or        $v0, $v0, $a1
-/* 34AF0 800596F0 00681825 */  or        $v1, $v1, $t0
-/* 34AF4 800596F4 ACC20004 */  sw        $v0, 4($a2)
-/* 34AF8 800596F8 ACC30000 */  sw        $v1, ($a2)
-/* 34AFC 800596FC 97A80026 */  lhu       $t0, 0x26($sp)
-/* 34B00 80059700 02E0202D */  daddu     $a0, $s7, $zero
-/* 34B04 80059704 31020FFF */  andi      $v0, $t0, 0xfff
-/* 34B08 80059708 3C080617 */  lui       $t0, 0x617
-/* 34B0C 8005970C 00481025 */  or        $v0, $v0, $t0
-/* 34B10 80059710 0C0187A4 */  jal       osVirtualToPhysical
-/* 34B14 80059714 AE020000 */   sw       $v0, ($s0)
-/* 34B18 80059718 AE020004 */  sw        $v0, 4($s0)
-.L8005971C:
-/* 34B1C 8005971C 8E620020 */  lw        $v0, 0x20($s3)
-/* 34B20 80059720 10400020 */  beqz      $v0, .L800597A4
-/* 34B24 80059724 3C020B00 */   lui      $v0, 0xb00
-/* 34B28 80059728 34420020 */  ori       $v0, $v0, 0x20
-/* 34B2C 8005972C 0240882D */  daddu     $s1, $s2, $zero
-/* 34B30 80059730 00168400 */  sll       $s0, $s6, 0x10
-/* 34B34 80059734 AE220000 */  sw        $v0, ($s1)
-/* 34B38 80059738 8E640020 */  lw        $a0, 0x20($s3)
-/* 34B3C 8005973C 00108603 */  sra       $s0, $s0, 0x18
-/* 34B40 80059740 0C0187A4 */  jal       osVirtualToPhysical
-/* 34B44 80059744 24840008 */   addiu    $a0, $a0, 8
-/* 34B48 80059748 26520008 */  addiu     $s2, $s2, 8
-/* 34B4C 8005974C AE220004 */  sw        $v0, 4($s1)
-/* 34B50 80059750 0240882D */  daddu     $s1, $s2, $zero
-/* 34B54 80059754 8E620020 */  lw        $v0, 0x20($s3)
-/* 34B58 80059758 3C030E00 */  lui       $v1, 0xe00
-/* 34B5C 8005975C 9044002F */  lbu       $a0, 0x2f($v0)
-/* 34B60 80059760 94420002 */  lhu       $v0, 2($v0)
-/* 34B64 80059764 00042400 */  sll       $a0, $a0, 0x10
-/* 34B68 80059768 00431025 */  or        $v0, $v0, $v1
-/* 34B6C 8005976C 00822025 */  or        $a0, $a0, $v0
-/* 34B70 80059770 AE240000 */  sw        $a0, ($s1)
-/* 34B74 80059774 8E620020 */  lw        $v0, 0x20($s3)
-/* 34B78 80059778 8C440028 */  lw        $a0, 0x28($v0)
-/* 34B7C 8005977C 0C0187A4 */  jal       osVirtualToPhysical
-/* 34B80 80059780 00108600 */   sll      $s0, $s0, 0x18
-/* 34B84 80059784 3C0300FF */  lui       $v1, 0xff
-/* 34B88 80059788 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 34B8C 8005978C 00431024 */  and       $v0, $v0, $v1
-/* 34B90 80059790 02028025 */  or        $s0, $s0, $v0
-/* 34B94 80059794 AE300004 */  sw        $s0, 4($s1)
-/* 34B98 80059798 8E620020 */  lw        $v0, 0x20($s3)
-/* 34B9C 8005979C 26520008 */  addiu     $s2, $s2, 8
-/* 34BA0 800597A0 AC40002C */  sw        $zero, 0x2c($v0)
-.L800597A4:
-/* 34BA4 800597A4 8E620028 */  lw        $v0, 0x28($s3)
-/* 34BA8 800597A8 14400009 */  bnez      $v0, .L800597D0
-/* 34BAC 800597AC 0240802D */   daddu    $s0, $s2, $zero
-/* 34BB0 800597B0 26520008 */  addiu     $s2, $s2, 8
-/* 34BB4 800597B4 03C0202D */  daddu     $a0, $fp, $zero
-/* 34BB8 800597B8 32C20FFF */  andi      $v0, $s6, 0xfff
-/* 34BBC 800597BC 3C080617 */  lui       $t0, 0x617
-/* 34BC0 800597C0 00481025 */  or        $v0, $v0, $t0
-/* 34BC4 800597C4 0C0187A4 */  jal       osVirtualToPhysical
-/* 34BC8 800597C8 AE020000 */   sw       $v0, ($s0)
-/* 34BCC 800597CC AE020004 */  sw        $v0, 4($s0)
-.L800597D0:
-/* 34BD0 800597D0 8662000C */  lh        $v0, 0xc($s3)
-/* 34BD4 800597D4 1040000A */  beqz      $v0, .L80059800
-/* 34BD8 800597D8 0240282D */   daddu    $a1, $s2, $zero
-/* 34BDC 800597DC 26520008 */  addiu     $s2, $s2, 8
-/* 34BE0 800597E0 00161400 */  sll       $v0, $s6, 0x10
-/* 34BE4 800597E4 3C080C00 */  lui       $t0, 0xc00
-/* 34BE8 800597E8 97A40028 */  lhu       $a0, 0x28($sp)
-/* 34BEC 800597EC 9663000C */  lhu       $v1, 0xc($s3)
-/* 34BF0 800597F0 00441025 */  or        $v0, $v0, $a0
-/* 34BF4 800597F4 00681825 */  or        $v1, $v1, $t0
-/* 34BF8 800597F8 ACA20004 */  sw        $v0, 4($a1)
-/* 34BFC 800597FC ACA30000 */  sw        $v1, ($a1)
-.L80059800:
-/* 34C00 80059800 97A8001E */  lhu       $t0, 0x1e($sp)
-/* 34C04 80059804 25030001 */  addiu     $v1, $t0, 1
-/* 34C08 80059808 A7A3001E */  sh        $v1, 0x1e($sp)
-/* 34C0C 8005980C 00031C00 */  sll       $v1, $v1, 0x10
-/* 34C10 80059810 8FA80068 */  lw        $t0, 0x68($sp)
-/* 34C14 80059814 8E620004 */  lw        $v0, 4($s3)
-/* 34C18 80059818 8D040004 */  lw        $a0, 4($t0)
-/* 34C1C 8005981C 00021040 */  sll       $v0, $v0, 1
-/* 34C20 80059820 0082A021 */  addu      $s4, $a0, $v0
-/* 34C24 80059824 91020010 */  lbu       $v0, 0x10($t0)
-/* 34C28 80059828 00031C03 */  sra       $v1, $v1, 0x10
-/* 34C2C 8005982C 0062182A */  slt       $v1, $v1, $v0
-/* 34C30 80059830 1460FEEA */  bnez      $v1, .L800593DC
-/* 34C34 80059834 00000000 */   nop      
-.L80059838:
-/* 34C38 80059838 8FA80068 */  lw        $t0, 0x68($sp)
-/* 34C3C 8005983C 8D030004 */  lw        $v1, 4($t0)
-/* 34C40 80059840 8D020008 */  lw        $v0, 8($t0)
-/* 34C44 80059844 8D040000 */  lw        $a0, ($t0)
-/* 34C48 80059848 24630170 */  addiu     $v1, $v1, 0x170
-/* 34C4C 8005984C 00021040 */  sll       $v0, $v0, 1
-/* 34C50 80059850 00821021 */  addu      $v0, $a0, $v0
-/* 34C54 80059854 AD030004 */  sw        $v1, 4($t0)
-/* 34C58 80059858 0062182B */  sltu      $v1, $v1, $v0
-/* 34C5C 8005985C 50600001 */  beql      $v1, $zero, .L80059864
-/* 34C60 80059860 AD040004 */   sw       $a0, 4($t0)
-.L80059864:
-/* 34C64 80059864 0240102D */  daddu     $v0, $s2, $zero
-/* 34C68 80059868 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 34C6C 8005986C 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 34C70 80059870 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 34C74 80059874 8FB60048 */  lw        $s6, 0x48($sp)
-/* 34C78 80059878 8FB50044 */  lw        $s5, 0x44($sp)
-/* 34C7C 8005987C 8FB40040 */  lw        $s4, 0x40($sp)
-/* 34C80 80059880 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 34C84 80059884 8FB20038 */  lw        $s2, 0x38($sp)
-/* 34C88 80059888 8FB10034 */  lw        $s1, 0x34($sp)
-/* 34C8C 8005988C 8FB00030 */  lw        $s0, 0x30($sp)
-/* 34C90 80059890 D7B60060 */  ldc1      $f22, 0x60($sp)
-/* 34C94 80059894 D7B40058 */  ldc1      $f20, 0x58($sp)
-/* 34C98 80059898 03E00008 */  jr        $ra
-/* 34C9C 8005989C 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s b/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s
deleted file mode 100644
index fab9b05da6..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_800598A0
-/* 34CA0 800598A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 34CA4 800598A4 00063400 */  sll       $a2, $a2, 0x10
-/* 34CA8 800598A8 00063403 */  sra       $a2, $a2, 0x10
-/* 34CAC 800598AC 2CC20008 */  sltiu     $v0, $a2, 8
-/* 34CB0 800598B0 1040007D */  beqz      $v0, .L80059AA8
-/* 34CB4 800598B4 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 34CB8 800598B8 00061080 */  sll       $v0, $a2, 2
-/* 34CBC 800598BC 3C01800A */  lui       $at, 0x800a
-/* 34CC0 800598C0 00220821 */  addu      $at, $at, $v0
-/* 34CC4 800598C4 8C228970 */  lw        $v0, -0x7690($at)
-/* 34CC8 800598C8 00400008 */  jr        $v0
-/* 34CCC 800598CC 00000000 */   nop      
-/* 34CD0 800598D0 00051400 */  sll       $v0, $a1, 0x10
-/* 34CD4 800598D4 00021403 */  sra       $v0, $v0, 0x10
-/* 34CD8 800598D8 00021840 */  sll       $v1, $v0, 1
-/* 34CDC 800598DC 00621821 */  addu      $v1, $v1, $v0
-/* 34CE0 800598E0 8C82000C */  lw        $v0, 0xc($a0)
-/* 34CE4 800598E4 00031900 */  sll       $v1, $v1, 4
-/* 34CE8 800598E8 00621821 */  addu      $v1, $v1, $v0
-/* 34CEC 800598EC 2402FFF8 */  addiu     $v0, $zero, -8
-/* 34CF0 800598F0 00E21024 */  and       $v0, $a3, $v0
-/* 34CF4 800598F4 080166AA */  j         .L80059AA8
-/* 34CF8 800598F8 AC620000 */   sw       $v0, ($v1)
-/* 34CFC 800598FC 00051400 */  sll       $v0, $a1, 0x10
-/* 34D00 80059900 00021403 */  sra       $v0, $v0, 0x10
-/* 34D04 80059904 00021840 */  sll       $v1, $v0, 1
-/* 34D08 80059908 00621821 */  addu      $v1, $v1, $v0
-/* 34D0C 8005990C 8C82000C */  lw        $v0, 0xc($a0)
-/* 34D10 80059910 00031900 */  sll       $v1, $v1, 4
-/* 34D14 80059914 00621821 */  addu      $v1, $v1, $v0
-/* 34D18 80059918 2402FFF8 */  addiu     $v0, $zero, -8
-/* 34D1C 8005991C 00E21024 */  and       $v0, $a3, $v0
-/* 34D20 80059920 080166AA */  j         .L80059AA8
-/* 34D24 80059924 AC620004 */   sw       $v0, 4($v1)
-/* 34D28 80059928 00051400 */  sll       $v0, $a1, 0x10
-/* 34D2C 8005992C 00021403 */  sra       $v0, $v0, 0x10
-/* 34D30 80059930 00021840 */  sll       $v1, $v0, 1
-/* 34D34 80059934 00621821 */  addu      $v1, $v1, $v0
-/* 34D38 80059938 8C82000C */  lw        $v0, 0xc($a0)
-/* 34D3C 8005993C 00031900 */  sll       $v1, $v1, 4
-/* 34D40 80059940 00621821 */  addu      $v1, $v1, $v0
-/* 34D44 80059944 080166AA */  j         .L80059AA8
-/* 34D48 80059948 A4670008 */   sh       $a3, 8($v1)
-/* 34D4C 8005994C 00051400 */  sll       $v0, $a1, 0x10
-/* 34D50 80059950 00021403 */  sra       $v0, $v0, 0x10
-/* 34D54 80059954 00021840 */  sll       $v1, $v0, 1
-/* 34D58 80059958 00621821 */  addu      $v1, $v1, $v0
-/* 34D5C 8005995C 8C82000C */  lw        $v0, 0xc($a0)
-/* 34D60 80059960 00031900 */  sll       $v1, $v1, 4
-/* 34D64 80059964 00621821 */  addu      $v1, $v1, $v0
-/* 34D68 80059968 080166AA */  j         .L80059AA8
-/* 34D6C 8005996C A467000A */   sh       $a3, 0xa($v1)
-/* 34D70 80059970 00051400 */  sll       $v0, $a1, 0x10
-/* 34D74 80059974 00021403 */  sra       $v0, $v0, 0x10
-/* 34D78 80059978 00021840 */  sll       $v1, $v0, 1
-/* 34D7C 8005997C 00621821 */  addu      $v1, $v1, $v0
-/* 34D80 80059980 8C82000C */  lw        $v0, 0xc($a0)
-/* 34D84 80059984 00031900 */  sll       $v1, $v1, 4
-/* 34D88 80059988 00621821 */  addu      $v1, $v1, $v0
-/* 34D8C 8005998C 080166AA */  j         .L80059AA8
-/* 34D90 80059990 A467000C */   sh       $a3, 0xc($v1)
-/* 34D94 80059994 00051400 */  sll       $v0, $a1, 0x10
-/* 34D98 80059998 00021403 */  sra       $v0, $v0, 0x10
-/* 34D9C 8005999C 00021840 */  sll       $v1, $v0, 1
-/* 34DA0 800599A0 00621821 */  addu      $v1, $v1, $v0
-/* 34DA4 800599A4 00031900 */  sll       $v1, $v1, 4
-/* 34DA8 800599A8 44870000 */  mtc1      $a3, $f0
-/* 34DAC 800599AC 00000000 */  nop       
-/* 34DB0 800599B0 46800020 */  cvt.s.w   $f0, $f0
-/* 34DB4 800599B4 3C01447A */  lui       $at, 0x447a
-/* 34DB8 800599B8 44811000 */  mtc1      $at, $f2
-/* 34DBC 800599BC 8C82000C */  lw        $v0, 0xc($a0)
-/* 34DC0 800599C0 3C048008 */  lui       $a0, 0x8008
-/* 34DC4 800599C4 8C848E50 */  lw        $a0, -0x71b0($a0)
-/* 34DC8 800599C8 46020003 */  div.s     $f0, $f0, $f2
-/* 34DCC 800599CC 46000021 */  cvt.d.s   $f0, $f0
-/* 34DD0 800599D0 46200000 */  add.d     $f0, $f0, $f0
-/* 34DD4 800599D4 00621821 */  addu      $v1, $v1, $v0
-/* 34DD8 800599D8 C4820008 */  lwc1      $f2, 8($a0)
-/* 34DDC 800599DC 468010A1 */  cvt.d.w   $f2, $f2
-/* 34DE0 800599E0 46220003 */  div.d     $f0, $f0, $f2
-/* 34DE4 800599E4 46200020 */  cvt.s.d   $f0, $f0
-/* 34DE8 800599E8 080166AA */  j         .L80059AA8
-/* 34DEC 800599EC E4600010 */   swc1     $f0, 0x10($v1)
-/* 34DF0 800599F0 00051400 */  sll       $v0, $a1, 0x10
-/* 34DF4 800599F4 00021403 */  sra       $v0, $v0, 0x10
-/* 34DF8 800599F8 00021840 */  sll       $v1, $v0, 1
-/* 34DFC 800599FC 00621821 */  addu      $v1, $v1, $v0
-/* 34E00 80059A00 00031900 */  sll       $v1, $v1, 4
-/* 34E04 80059A04 44870000 */  mtc1      $a3, $f0
-/* 34E08 80059A08 00000000 */  nop       
-/* 34E0C 80059A0C 46800020 */  cvt.s.w   $f0, $f0
-/* 34E10 80059A10 46000021 */  cvt.d.s   $f0, $f0
-/* 34E14 80059A14 8C82000C */  lw        $v0, 0xc($a0)
-/* 34E18 80059A18 3C01800A */  lui       $at, 0x800a
-/* 34E1C 80059A1C D4228990 */  ldc1      $f2, -0x7670($at)
-/* 34E20 80059A20 00622021 */  addu      $a0, $v1, $v0
-/* 34E24 80059A24 8C830004 */  lw        $v1, 4($a0)
-/* 34E28 80059A28 8C820000 */  lw        $v0, ($a0)
-/* 34E2C 80059A2C 00621823 */  subu      $v1, $v1, $v0
-/* 34E30 80059A30 44832000 */  mtc1      $v1, $f4
-/* 34E34 80059A34 00000000 */  nop       
-/* 34E38 80059A38 46802121 */  cvt.d.w   $f4, $f4
-/* 34E3C 80059A3C 04610006 */  bgez      $v1, .L80059A58
-/* 34E40 80059A40 46220083 */   div.d    $f2, $f0, $f2
-/* 34E44 80059A44 3C0141F0 */  lui       $at, 0x41f0
-/* 34E48 80059A48 44810800 */  mtc1      $at, $f1
-/* 34E4C 80059A4C 44800000 */  mtc1      $zero, $f0
-/* 34E50 80059A50 00000000 */  nop       
-/* 34E54 80059A54 46202100 */  add.d     $f4, $f4, $f0
-.L80059A58:
-/* 34E58 80059A58 46241002 */  mul.d     $f0, $f2, $f4
-/* 34E5C 80059A5C 00000000 */  nop       
-/* 34E60 80059A60 46200020 */  cvt.s.d   $f0, $f0
-/* 34E64 80059A64 080166AA */  j         .L80059AA8
-/* 34E68 80059A68 E480001C */   swc1     $f0, 0x1c($a0)
-/* 34E6C 80059A6C 00051400 */  sll       $v0, $a1, 0x10
-/* 34E70 80059A70 00021403 */  sra       $v0, $v0, 0x10
-/* 34E74 80059A74 00021840 */  sll       $v1, $v0, 1
-/* 34E78 80059A78 00621821 */  addu      $v1, $v1, $v0
-/* 34E7C 80059A7C 8C82000C */  lw        $v0, 0xc($a0)
-/* 34E80 80059A80 00031900 */  sll       $v1, $v1, 4
-/* 34E84 80059A84 00621021 */  addu      $v0, $v1, $v0
-/* 34E88 80059A88 8C420020 */  lw        $v0, 0x20($v0)
-/* 34E8C 80059A8C 10400006 */  beqz      $v0, .L80059AA8
-/* 34E90 80059A90 00000000 */   nop      
-/* 34E94 80059A94 A4470000 */  sh        $a3, ($v0)
-/* 34E98 80059A98 8C82000C */  lw        $v0, 0xc($a0)
-/* 34E9C 80059A9C 00621021 */  addu      $v0, $v1, $v0
-/* 34EA0 80059AA0 0C016374 */  jal       func_80058DD0
-/* 34EA4 80059AA4 8C440020 */   lw       $a0, 0x20($v0)
-.L80059AA8:
-/* 34EA8 80059AA8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 34EAC 80059AAC 0000102D */  daddu     $v0, $zero, $zero
-/* 34EB0 80059AB0 03E00008 */  jr        $ra
-/* 34EB4 80059AB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s
deleted file mode 100644
index 52a8841a34..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059AB8
-/* 34EB8 80059AB8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 34EBC 80059ABC AFB50024 */  sw        $s5, 0x24($sp)
-/* 34EC0 80059AC0 0080A82D */  daddu     $s5, $a0, $zero
-/* 34EC4 80059AC4 00A0202D */  daddu     $a0, $a1, $zero
-/* 34EC8 80059AC8 AFB60028 */  sw        $s6, 0x28($sp)
-/* 34ECC 80059ACC 00C0B02D */  daddu     $s6, $a2, $zero
-/* 34ED0 80059AD0 AFB40020 */  sw        $s4, 0x20($sp)
-/* 34ED4 80059AD4 8FB40040 */  lw        $s4, 0x40($sp)
-/* 34ED8 80059AD8 00073840 */  sll       $a3, $a3, 1
-/* 34EDC 80059ADC AFB00010 */  sw        $s0, 0x10($sp)
-/* 34EE0 80059AE0 00878021 */  addu      $s0, $a0, $a3
-/* 34EE4 80059AE4 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 34EE8 80059AE8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 34EEC 80059AEC AFB20018 */  sw        $s2, 0x18($sp)
-/* 34EF0 80059AF0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 34EF4 80059AF4 8EA20008 */  lw        $v0, 8($s5)
-/* 34EF8 80059AF8 8EA30000 */  lw        $v1, ($s5)
-/* 34EFC 80059AFC 00021040 */  sll       $v0, $v0, 1
-/* 34F00 80059B00 00623021 */  addu      $a2, $v1, $v0
-/* 34F04 80059B04 00D0102B */  sltu      $v0, $a2, $s0
-/* 34F08 80059B08 1040001C */  beqz      $v0, .L80059B7C
-/* 34F0C 80059B0C 0280902D */   daddu    $s2, $s4, $zero
-/* 34F10 80059B10 26940008 */  addiu     $s4, $s4, 8
-/* 34F14 80059B14 00C48823 */  subu      $s1, $a2, $a0
-/* 34F18 80059B18 00118843 */  sra       $s1, $s1, 1
-/* 34F1C 80059B1C 00118840 */  sll       $s1, $s1, 1
-/* 34F20 80059B20 32230FFF */  andi      $v1, $s1, 0xfff
-/* 34F24 80059B24 00031B00 */  sll       $v1, $v1, 0xc
-/* 34F28 80059B28 32C20FFF */  andi      $v0, $s6, 0xfff
-/* 34F2C 80059B2C 3C130400 */  lui       $s3, 0x400
-/* 34F30 80059B30 00531025 */  or        $v0, $v0, $s3
-/* 34F34 80059B34 00621825 */  or        $v1, $v1, $v0
-/* 34F38 80059B38 02068023 */  subu      $s0, $s0, $a2
-/* 34F3C 80059B3C 00108043 */  sra       $s0, $s0, 1
-/* 34F40 80059B40 0C0187A4 */  jal       osVirtualToPhysical
-/* 34F44 80059B44 AE430000 */   sw       $v1, ($s2)
-/* 34F48 80059B48 AE420004 */  sw        $v0, 4($s2)
-/* 34F4C 80059B4C 0280902D */  daddu     $s2, $s4, $zero
-/* 34F50 80059B50 00108040 */  sll       $s0, $s0, 1
-/* 34F54 80059B54 32100FFF */  andi      $s0, $s0, 0xfff
-/* 34F58 80059B58 00108300 */  sll       $s0, $s0, 0xc
-/* 34F5C 80059B5C 02D18821 */  addu      $s1, $s6, $s1
-/* 34F60 80059B60 32310FFF */  andi      $s1, $s1, 0xfff
-/* 34F64 80059B64 02338825 */  or        $s1, $s1, $s3
-/* 34F68 80059B68 02118025 */  or        $s0, $s0, $s1
-/* 34F6C 80059B6C AE500000 */  sw        $s0, ($s2)
-/* 34F70 80059B70 8EA40000 */  lw        $a0, ($s5)
-/* 34F74 80059B74 080166E7 */  j         .L80059B9C
-/* 34F78 80059B78 26940008 */   addiu    $s4, $s4, 8
-.L80059B7C:
-/* 34F7C 80059B7C 26940008 */  addiu     $s4, $s4, 8
-/* 34F80 80059B80 30E20FFF */  andi      $v0, $a3, 0xfff
-/* 34F84 80059B84 00021300 */  sll       $v0, $v0, 0xc
-/* 34F88 80059B88 32C30FFF */  andi      $v1, $s6, 0xfff
-/* 34F8C 80059B8C 3C050400 */  lui       $a1, 0x400
-/* 34F90 80059B90 00651825 */  or        $v1, $v1, $a1
-/* 34F94 80059B94 00431025 */  or        $v0, $v0, $v1
-/* 34F98 80059B98 AE420000 */  sw        $v0, ($s2)
-.L80059B9C:
-/* 34F9C 80059B9C 0C0187A4 */  jal       osVirtualToPhysical
-/* 34FA0 80059BA0 00000000 */   nop      
-/* 34FA4 80059BA4 AE420004 */  sw        $v0, 4($s2)
-/* 34FA8 80059BA8 0280102D */  daddu     $v0, $s4, $zero
-/* 34FAC 80059BAC 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 34FB0 80059BB0 8FB60028 */  lw        $s6, 0x28($sp)
-/* 34FB4 80059BB4 8FB50024 */  lw        $s5, 0x24($sp)
-/* 34FB8 80059BB8 8FB40020 */  lw        $s4, 0x20($sp)
-/* 34FBC 80059BBC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 34FC0 80059BC0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 34FC4 80059BC4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 34FC8 80059BC8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 34FCC 80059BCC 03E00008 */  jr        $ra
-/* 34FD0 80059BD0 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s
deleted file mode 100644
index b15be47501..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059BD4
-/* 34FD4 80059BD4 C4800010 */  lwc1      $f0, 0x10($a0)
-/* 34FD8 80059BD8 44851000 */  mtc1      $a1, $f2
-/* 34FDC 80059BDC 00000000 */  nop       
-/* 34FE0 80059BE0 468010A0 */  cvt.s.w   $f2, $f2
-/* 34FE4 80059BE4 46020002 */  mul.s     $f0, $f0, $f2
-/* 34FE8 80059BE8 00000000 */  nop       
-/* 34FEC 80059BEC C4820014 */  lwc1      $f2, 0x14($a0)
-/* 34FF0 80059BF0 46001080 */  add.s     $f2, $f2, $f0
-/* 34FF4 80059BF4 24820014 */  addiu     $v0, $a0, 0x14
-/* 34FF8 80059BF8 3C014000 */  lui       $at, 0x4000
-/* 34FFC 80059BFC 44810800 */  mtc1      $at, $f1
-/* 35000 80059C00 44800000 */  mtc1      $zero, $f0
-/* 35004 80059C04 46001121 */  cvt.d.s   $f4, $f2
-/* 35008 80059C08 4624003C */  c.lt.d    $f0, $f4
-/* 3500C 80059C0C 00000000 */  nop       
-/* 35010 80059C10 45000008 */  bc1f      .L80059C34
-/* 35014 80059C14 E4820014 */   swc1     $f2, 0x14($a0)
-/* 35018 80059C18 3C014010 */  lui       $at, 0x4010
-/* 3501C 80059C1C 44810800 */  mtc1      $at, $f1
-/* 35020 80059C20 44800000 */  mtc1      $zero, $f0
-/* 35024 80059C24 00000000 */  nop       
-/* 35028 80059C28 46202001 */  sub.d     $f0, $f4, $f0
-/* 3502C 80059C2C 0801670E */  j         .L80059C38
-/* 35030 80059C30 46200020 */   cvt.s.d  $f0, $f0
-.L80059C34:
-/* 35034 80059C34 46001006 */  mov.s     $f0, $f2
-.L80059C38:
-/* 35038 80059C38 E4400000 */  swc1      $f0, ($v0)
-/* 3503C 80059C3C C4820014 */  lwc1      $f2, 0x14($a0)
-/* 35040 80059C40 44800000 */  mtc1      $zero, $f0
-/* 35044 80059C44 00000000 */  nop       
-/* 35048 80059C48 4600103C */  c.lt.s    $f2, $f0
-/* 3504C 80059C4C 00000000 */  nop       
-/* 35050 80059C50 45030001 */  bc1tl     .L80059C58
-/* 35054 80059C54 46001087 */   neg.s    $f2, $f2
-.L80059C58:
-/* 35058 80059C58 3C013FF0 */  lui       $at, 0x3ff0
-/* 3505C 80059C5C 44810800 */  mtc1      $at, $f1
-/* 35060 80059C60 44800000 */  mtc1      $zero, $f0
-/* 35064 80059C64 460010A1 */  cvt.d.s   $f2, $f2
-/* 35068 80059C68 46201081 */  sub.d     $f2, $f2, $f0
-/* 3506C 80059C6C C480001C */  lwc1      $f0, 0x1c($a0)
-/* 35070 80059C70 462010A0 */  cvt.s.d   $f2, $f2
-/* 35074 80059C74 46020002 */  mul.s     $f0, $f0, $f2
-/* 35078 80059C78 03E00008 */  jr        $ra
-/* 3507C 80059C7C 00000000 */   nop      
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s
deleted file mode 100644
index 77d0e7ff62..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059C88
-/* 35088 80059C88 8C82000C */  lw        $v0, 0xc($a0)
-/* 3508C 80059C8C AC450004 */  sw        $a1, 4($v0)
-/* 35090 80059C90 AC460008 */  sw        $a2, 8($v0)
-/* 35094 80059C94 03E00008 */  jr        $ra
-/* 35098 80059C98 AC47000C */   sw       $a3, 0xc($v0)
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s
deleted file mode 100644
index 82c14cdfd6..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059C9C
-/* 3509C 80059C9C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 350A0 80059CA0 2402000E */  addiu     $v0, $zero, 0xe
-/* 350A4 80059CA4 3C03800A */  lui       $v1, 0x800a
-/* 350A8 80059CA8 246341C0 */  addiu     $v1, $v1, 0x41c0
-/* 350AC 80059CAC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 350B0 80059CB0 AFB00018 */  sw        $s0, 0x18($sp)
-.L80059CB4:
-/* 350B4 80059CB4 AC600000 */  sw        $zero, ($v1)
-/* 350B8 80059CB8 2442FFFF */  addiu     $v0, $v0, -1
-/* 350BC 80059CBC 0441FFFD */  bgez      $v0, .L80059CB4
-/* 350C0 80059CC0 2463FFE0 */   addiu    $v1, $v1, -0x20
-/* 350C4 80059CC4 2402005F */  addiu     $v0, $zero, 0x5f
-/* 350C8 80059CC8 3C03800B */  lui       $v1, 0x800b
-/* 350CC 80059CCC 24634514 */  addiu     $v1, $v1, 0x4514
-.L80059CD0:
-/* 350D0 80059CD0 AC600000 */  sw        $zero, ($v1)
-/* 350D4 80059CD4 2442FFFF */  addiu     $v0, $v0, -1
-/* 350D8 80059CD8 0441FFFD */  bgez      $v0, .L80059CD0
-/* 350DC 80059CDC 2463FFFC */   addiu    $v1, $v1, -4
-/* 350E0 80059CE0 0C019A58 */  jal       osUnmapTLBAll
-/* 350E4 80059CE4 00000000 */   nop      
-/* 350E8 80059CE8 3C0300FF */  lui       $v1, 0xff
-/* 350EC 80059CEC 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 350F0 80059CF0 24040010 */  addiu     $a0, $zero, 0x10
-/* 350F4 80059CF4 0000282D */  daddu     $a1, $zero, $zero
-/* 350F8 80059CF8 3C10E020 */  lui       $s0, 0xe020
-/* 350FC 80059CFC 26100000 */  addiu     $s0, $s0, 0
-/* 35100 80059D00 0200302D */  daddu     $a2, $s0, $zero
-/* 35104 80059D04 2402FFFF */  addiu     $v0, $zero, -1
-/* 35108 80059D08 3C07801A */  lui       $a3, 0x801a
-/* 3510C 80059D0C 24E76000 */  addiu     $a3, $a3, 0x6000
-/* 35110 80059D10 00E33824 */  and       $a3, $a3, $v1
-/* 35114 80059D14 AFA20010 */  sw        $v0, 0x10($sp)
-/* 35118 80059D18 0C0199E8 */  jal       osMapTLB
-/* 3511C 80059D1C AFA20014 */   sw       $v0, 0x14($sp)
-/* 35120 80059D20 3C040032 */  lui       $a0, 0x32
-/* 35124 80059D24 24845AD0 */  addiu     $a0, $a0, 0x5ad0
-/* 35128 80059D28 3C050032 */  lui       $a1, 0x32
-/* 3512C 80059D2C 24A56410 */  addiu     $a1, $a1, 0x6410
-/* 35130 80059D30 0C00A5CF */  jal       dma_copy
-/* 35134 80059D34 0200302D */   daddu    $a2, $s0, $zero
-/* 35138 80059D38 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 3513C 80059D3C 8FB00018 */  lw        $s0, 0x18($sp)
-/* 35140 80059D40 03E00008 */  jr        $ra
-/* 35144 80059D44 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s
deleted file mode 100644
index eeae71c2ce..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s
+++ /dev/null
@@ -1,121 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059D50
-/* 35150 80059D50 3C02800A */  lui       $v0, %hi(D_8009A650)
-/* 35154 80059D54 8C42A650 */  lw        $v0, %lo(D_8009A650)($v0)
-/* 35158 80059D58 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3515C 80059D5C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 35160 80059D60 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 35164 80059D64 AFB20018 */  sw        $s2, 0x18($sp)
-/* 35168 80059D68 AFB10014 */  sw        $s1, 0x14($sp)
-/* 3516C 80059D6C 30420C00 */  andi      $v0, $v0, 0xc00
-/* 35170 80059D70 14400059 */  bnez      $v0, .L80059ED8
-/* 35174 80059D74 AFB00010 */   sw       $s0, 0x10($sp)
-/* 35178 80059D78 0000902D */  daddu     $s2, $zero, $zero
-/* 3517C 80059D7C 3C10800A */  lui       $s0, 0x800a
-/* 35180 80059D80 26104000 */  addiu     $s0, $s0, 0x4000
-/* 35184 80059D84 24040003 */  addiu     $a0, $zero, 3
-.L80059D88:
-/* 35188 80059D88 8E030000 */  lw        $v1, ($s0)
-/* 3518C 80059D8C 30620001 */  andi      $v0, $v1, 1
-/* 35190 80059D90 10400007 */  beqz      $v0, .L80059DB0
-/* 35194 80059D94 26520001 */   addiu    $s2, $s2, 1
-/* 35198 80059D98 30620002 */  andi      $v0, $v1, 2
-/* 3519C 80059D9C 14400004 */  bnez      $v0, .L80059DB0
-/* 351A0 80059DA0 00000000 */   nop      
-/* 351A4 80059DA4 34620002 */  ori       $v0, $v1, 2
-/* 351A8 80059DA8 AE020000 */  sw        $v0, ($s0)
-/* 351AC 80059DAC AE04000C */  sw        $a0, 0xc($s0)
-.L80059DB0:
-/* 351B0 80059DB0 2A42000F */  slti      $v0, $s2, 0xf
-/* 351B4 80059DB4 1440FFF4 */  bnez      $v0, .L80059D88
-/* 351B8 80059DB8 26100020 */   addiu    $s0, $s0, 0x20
-/* 351BC 80059DBC 0000902D */  daddu     $s2, $zero, $zero
-/* 351C0 80059DC0 2413FFFD */  addiu     $s3, $zero, -3
-/* 351C4 80059DC4 3C11800B */  lui       $s1, 0x800b
-/* 351C8 80059DC8 26314398 */  addiu     $s1, $s1, 0x4398
-.L80059DCC:
-/* 351CC 80059DCC 8E300000 */  lw        $s0, ($s1)
-/* 351D0 80059DD0 52000020 */  beql      $s0, $zero, .L80059E54
-/* 351D4 80059DD4 26520001 */   addiu    $s2, $s2, 1
-/* 351D8 80059DD8 8E020000 */  lw        $v0, ($s0)
-/* 351DC 80059DDC 30420001 */  andi      $v0, $v0, 1
-/* 351E0 80059DE0 5040001C */  beql      $v0, $zero, .L80059E54
-/* 351E4 80059DE4 26520001 */   addiu    $s2, $s2, 1
-/* 351E8 80059DE8 8E030010 */  lw        $v1, 0x10($s0)
-/* 351EC 80059DEC 8C620000 */  lw        $v0, ($v1)
-/* 351F0 80059DF0 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
-/* 351F4 80059DF4 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
-/* 351F8 80059DF8 00531024 */  and       $v0, $v0, $s3
-/* 351FC 80059DFC AC620000 */  sw        $v0, ($v1)
-/* 35200 80059E00 80820070 */  lb        $v0, 0x70($a0)
-/* 35204 80059E04 10400007 */  beqz      $v0, .L80059E24
-/* 35208 80059E08 00000000 */   nop      
-/* 3520C 80059E0C 8E020000 */  lw        $v0, ($s0)
-/* 35210 80059E10 30420004 */  andi      $v0, $v0, 4
-/* 35214 80059E14 5040000F */  beql      $v0, $zero, .L80059E54
-/* 35218 80059E18 26520001 */   addiu    $s2, $s2, 1
-/* 3521C 80059E1C 0801678D */  j         .L80059E34
-/* 35220 80059E20 00000000 */   nop      
-.L80059E24:
-/* 35224 80059E24 8E020000 */  lw        $v0, ($s0)
-/* 35228 80059E28 30420004 */  andi      $v0, $v0, 4
-/* 3522C 80059E2C 54400009 */  bnel      $v0, $zero, .L80059E54
-/* 35230 80059E30 26520001 */   addiu    $s2, $s2, 1
-.L80059E34:
-/* 35234 80059E34 8E020010 */  lw        $v0, 0x10($s0)
-/* 35238 80059E38 8C420010 */  lw        $v0, 0x10($v0)
-/* 3523C 80059E3C 0040F809 */  jalr      $v0
-/* 35240 80059E40 0200202D */   daddu    $a0, $s0, $zero
-/* 35244 80059E44 8E020000 */  lw        $v0, ($s0)
-/* 35248 80059E48 34420008 */  ori       $v0, $v0, 8
-/* 3524C 80059E4C AE020000 */  sw        $v0, ($s0)
-/* 35250 80059E50 26520001 */  addiu     $s2, $s2, 1
-.L80059E54:
-/* 35254 80059E54 2A420060 */  slti      $v0, $s2, 0x60
-/* 35258 80059E58 1440FFDC */  bnez      $v0, .L80059DCC
-/* 3525C 80059E5C 26310004 */   addiu    $s1, $s1, 4
-/* 35260 80059E60 0000902D */  daddu     $s2, $zero, $zero
-/* 35264 80059E64 3C10800A */  lui       $s0, 0x800a
-/* 35268 80059E68 26104000 */  addiu     $s0, $s0, 0x4000
-/* 3526C 80059E6C 2611001C */  addiu     $s1, $s0, 0x1c
-.L80059E70:
-/* 35270 80059E70 8E030000 */  lw        $v1, ($s0)
-/* 35274 80059E74 30620001 */  andi      $v0, $v1, 1
-/* 35278 80059E78 50400013 */  beql      $v0, $zero, .L80059EC8
-/* 3527C 80059E7C 26520001 */   addiu    $s2, $s2, 1
-/* 35280 80059E80 30620002 */  andi      $v0, $v1, 2
-/* 35284 80059E84 50400010 */  beql      $v0, $zero, .L80059EC8
-/* 35288 80059E88 26520001 */   addiu    $s2, $s2, 1
-/* 3528C 80059E8C 8E22FFF0 */  lw        $v0, -0x10($s1)
-/* 35290 80059E90 10400003 */  beqz      $v0, .L80059EA0
-/* 35294 80059E94 2442FFFF */   addiu    $v0, $v0, -1
-/* 35298 80059E98 080167B1 */  j         .L80059EC4
-/* 3529C 80059E9C AE22FFF0 */   sw       $v0, -0x10($s1)
-.L80059EA0:
-/* 352A0 80059EA0 8E240000 */  lw        $a0, ($s1)
-/* 352A4 80059EA4 50800005 */  beql      $a0, $zero, .L80059EBC
-/* 352A8 80059EA8 AE000000 */   sw       $zero, ($s0)
-/* 352AC 80059EAC 0C00AB1E */  jal       general_heap_free
-/* 352B0 80059EB0 00000000 */   nop      
-/* 352B4 80059EB4 AE200000 */  sw        $zero, ($s1)
-/* 352B8 80059EB8 AE000000 */  sw        $zero, ($s0)
-.L80059EBC:
-/* 352BC 80059EBC 0C019A48 */  jal       osUnmapTLB
-/* 352C0 80059EC0 0240202D */   daddu    $a0, $s2, $zero
-.L80059EC4:
-/* 352C4 80059EC4 26520001 */  addiu     $s2, $s2, 1
-.L80059EC8:
-/* 352C8 80059EC8 26310020 */  addiu     $s1, $s1, 0x20
-/* 352CC 80059ECC 2A42000F */  slti      $v0, $s2, 0xf
-/* 352D0 80059ED0 1440FFE7 */  bnez      $v0, .L80059E70
-/* 352D4 80059ED4 26100020 */   addiu    $s0, $s0, 0x20
-.L80059ED8:
-/* 352D8 80059ED8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 352DC 80059EDC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 352E0 80059EE0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 352E4 80059EE4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 352E8 80059EE8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 352EC 80059EEC 03E00008 */  jr        $ra
-/* 352F0 80059EF0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s
deleted file mode 100644
index e02e9c8c07..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s
+++ /dev/null
@@ -1,211 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80059F94
-/* 35394 80059F94 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 35398 80059F98 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* 3539C 80059F9C 3C014080 */  lui       $at, 0x4080
-/* 353A0 80059FA0 4481A000 */  mtc1      $at, $f20
-/* 353A4 80059FA4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 353A8 80059FA8 24110001 */  addiu     $s1, $zero, 1
-/* 353AC 80059FAC AFB20018 */  sw        $s2, 0x18($sp)
-/* 353B0 80059FB0 0000902D */  daddu     $s2, $zero, $zero
-/* 353B4 80059FB4 AFB50024 */  sw        $s5, 0x24($sp)
-/* 353B8 80059FB8 3C15800B */  lui       $s5, %hi(gCameras)
-/* 353BC 80059FBC 26B51D80 */  addiu     $s5, $s5, %lo(gCameras)
-/* 353C0 80059FC0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 353C4 80059FC4 3C10800A */  lui       $s0, 0x800a
-/* 353C8 80059FC8 2610A66C */  addiu     $s0, $s0, -0x5994
-/* 353CC 80059FCC AFB40020 */  sw        $s4, 0x20($sp)
-/* 353D0 80059FD0 24140002 */  addiu     $s4, $zero, 2
-/* 353D4 80059FD4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 353D8 80059FD8 3413FFFE */  ori       $s3, $zero, 0xfffe
-/* 353DC 80059FDC AFBF0028 */  sw        $ra, 0x28($sp)
-/* 353E0 80059FE0 00121080 */  sll       $v0, $s2, 2
-.L80059FE4:
-/* 353E4 80059FE4 3C0E800B */  lui       $t6, 0x800b
-/* 353E8 80059FE8 01C27021 */  addu      $t6, $t6, $v0
-/* 353EC 80059FEC 8DCE4398 */  lw        $t6, 0x4398($t6)
-/* 353F0 80059FF0 51C000A5 */  beql      $t6, $zero, .L8005A288
-/* 353F4 80059FF4 26520001 */   addiu    $s2, $s2, 1
-/* 353F8 80059FF8 8DC30000 */  lw        $v1, ($t6)
-/* 353FC 80059FFC 30620001 */  andi      $v0, $v1, 1
-/* 35400 8005A000 504000A1 */  beql      $v0, $zero, .L8005A288
-/* 35404 8005A004 26520001 */   addiu    $s2, $s2, 1
-/* 35408 8005A008 30620008 */  andi      $v0, $v1, 8
-/* 3540C 8005A00C 5040009E */  beql      $v0, $zero, .L8005A288
-/* 35410 8005A010 26520001 */   addiu    $s2, $s2, 1
-/* 35414 8005A014 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 35418 8005A018 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 3541C 8005A01C 80420070 */  lb        $v0, 0x70($v0)
-/* 35420 8005A020 10400005 */  beqz      $v0, .L8005A038
-/* 35424 8005A024 30620004 */   andi     $v0, $v1, 4
-/* 35428 8005A028 50400097 */  beql      $v0, $zero, .L8005A288
-/* 3542C 8005A02C 26520001 */   addiu    $s2, $s2, 1
-/* 35430 8005A030 08016810 */  j         .L8005A040
-/* 35434 8005A034 00000000 */   nop      
-.L8005A038:
-/* 35438 8005A038 54400093 */  bnel      $v0, $zero, .L8005A288
-/* 3543C 8005A03C 26520001 */   addiu    $s2, $s2, 1
-.L8005A040:
-/* 35440 8005A040 8DC20010 */  lw        $v0, 0x10($t6)
-/* 35444 8005A044 8C4F0018 */  lw        $t7, 0x18($v0)
-/* 35448 8005A048 3C028006 */  lui       $v0, 0x8006
-/* 3544C 8005A04C 24429C80 */  addiu     $v0, $v0, -0x6380
-/* 35450 8005A050 51E2008D */  beql      $t7, $v0, .L8005A288
-/* 35454 8005A054 26520001 */   addiu    $s2, $s2, 1
-/* 35458 8005A058 12200088 */  beqz      $s1, .L8005A27C
-/* 3545C 8005A05C 3C04DC08 */   lui      $a0, 0xdc08
-/* 35460 8005A060 34840008 */  ori       $a0, $a0, 8
-/* 35464 8005A064 3C06D9FF */  lui       $a2, 0xd9ff
-/* 35468 8005A068 34C6FFFF */  ori       $a2, $a2, 0xffff
-/* 3546C 8005A06C 3C050020 */  lui       $a1, 0x20
-/* 35470 8005A070 34A50405 */  ori       $a1, $a1, 0x405
-/* 35474 8005A074 3C07DB04 */  lui       $a3, 0xdb04
-/* 35478 8005A078 34E70004 */  ori       $a3, $a3, 4
-/* 3547C 8005A07C 3C08DB04 */  lui       $t0, 0xdb04
-/* 35480 8005A080 3508000C */  ori       $t0, $t0, 0xc
-/* 35484 8005A084 3C09DB04 */  lui       $t1, 0xdb04
-/* 35488 8005A088 35290014 */  ori       $t1, $t1, 0x14
-/* 3548C 8005A08C 3C0ADB04 */  lui       $t2, 0xdb04
-/* 35490 8005A090 8E0B0000 */  lw        $t3, ($s0)
-/* 35494 8005A094 354A001C */  ori       $t2, $t2, 0x1c
-/* 35498 8005A098 0160182D */  daddu     $v1, $t3, $zero
-/* 3549C 8005A09C 256B0008 */  addiu     $t3, $t3, 8
-/* 354A0 8005A0A0 AE0B0000 */  sw        $t3, ($s0)
-/* 354A4 8005A0A4 3C0D8007 */  lui       $t5, %hi(gCurrentCameraID)
-/* 354A8 8005A0A8 8DAD7410 */  lw        $t5, %lo(gCurrentCameraID)($t5)
-/* 354AC 8005A0AC 3C02E700 */  lui       $v0, 0xe700
-/* 354B0 8005A0B0 AC620000 */  sw        $v0, ($v1)
-/* 354B4 8005A0B4 25620008 */  addiu     $v0, $t3, 8
-/* 354B8 8005A0B8 AC600004 */  sw        $zero, 4($v1)
-/* 354BC 8005A0BC AE020000 */  sw        $v0, ($s0)
-/* 354C0 8005A0C0 AD640000 */  sw        $a0, ($t3)
-/* 354C4 8005A0C4 3C04ED00 */  lui       $a0, 0xed00
-/* 354C8 8005A0C8 000D1080 */  sll       $v0, $t5, 2
-/* 354CC 8005A0CC 004D1021 */  addu      $v0, $v0, $t5
-/* 354D0 8005A0D0 00021080 */  sll       $v0, $v0, 2
-/* 354D4 8005A0D4 004D1023 */  subu      $v0, $v0, $t5
-/* 354D8 8005A0D8 000218C0 */  sll       $v1, $v0, 3
-/* 354DC 8005A0DC 00431021 */  addu      $v0, $v0, $v1
-/* 354E0 8005A0E0 000210C0 */  sll       $v0, $v0, 3
-/* 354E4 8005A0E4 00556021 */  addu      $t4, $v0, $s5
-/* 354E8 8005A0E8 258200A0 */  addiu     $v0, $t4, 0xa0
-/* 354EC 8005A0EC AD620004 */  sw        $v0, 4($t3)
-/* 354F0 8005A0F0 25620010 */  addiu     $v0, $t3, 0x10
-/* 354F4 8005A0F4 AE020000 */  sw        $v0, ($s0)
-/* 354F8 8005A0F8 3C02D900 */  lui       $v0, 0xd900
-/* 354FC 8005A0FC AD620008 */  sw        $v0, 8($t3)
-/* 35500 8005A100 25620018 */  addiu     $v0, $t3, 0x18
-/* 35504 8005A104 AD60000C */  sw        $zero, 0xc($t3)
-/* 35508 8005A108 AE020000 */  sw        $v0, ($s0)
-/* 3550C 8005A10C 25620020 */  addiu     $v0, $t3, 0x20
-/* 35510 8005A110 AD660010 */  sw        $a2, 0x10($t3)
-/* 35514 8005A114 AD650014 */  sw        $a1, 0x14($t3)
-/* 35518 8005A118 AE020000 */  sw        $v0, ($s0)
-/* 3551C 8005A11C 8583000E */  lh        $v1, 0xe($t4)
-/* 35520 8005A120 25620028 */  addiu     $v0, $t3, 0x28
-/* 35524 8005A124 AE020000 */  sw        $v0, ($s0)
-/* 35528 8005A128 44831000 */  mtc1      $v1, $f2
-/* 3552C 8005A12C 00000000 */  nop       
-/* 35530 8005A130 468010A0 */  cvt.s.w   $f2, $f2
-/* 35534 8005A134 46141082 */  mul.s     $f2, $f2, $f20
-/* 35538 8005A138 00000000 */  nop       
-/* 3553C 8005A13C 85830010 */  lh        $v1, 0x10($t4)
-/* 35540 8005A140 25620030 */  addiu     $v0, $t3, 0x30
-/* 35544 8005A144 AE020000 */  sw        $v0, ($s0)
-/* 35548 8005A148 25620038 */  addiu     $v0, $t3, 0x38
-/* 3554C 8005A14C 44830000 */  mtc1      $v1, $f0
-/* 35550 8005A150 00000000 */  nop       
-/* 35554 8005A154 46800020 */  cvt.s.w   $f0, $f0
-/* 35558 8005A158 46140002 */  mul.s     $f0, $f0, $f20
-/* 3555C 8005A15C 00000000 */  nop       
-/* 35560 8005A160 AE020000 */  sw        $v0, ($s0)
-/* 35564 8005A164 4600110D */  trunc.w.s $f4, $f2
-/* 35568 8005A168 44032000 */  mfc1      $v1, $f4
-/* 3556C 8005A16C 00000000 */  nop       
-/* 35570 8005A170 30630FFF */  andi      $v1, $v1, 0xfff
-/* 35574 8005A174 00031B00 */  sll       $v1, $v1, 0xc
-/* 35578 8005A178 4600010D */  trunc.w.s $f4, $f0
-/* 3557C 8005A17C 44022000 */  mfc1      $v0, $f4
-/* 35580 8005A180 00000000 */  nop       
-/* 35584 8005A184 30420FFF */  andi      $v0, $v0, 0xfff
-/* 35588 8005A188 00441025 */  or        $v0, $v0, $a0
-/* 3558C 8005A18C 00621825 */  or        $v1, $v1, $v0
-/* 35590 8005A190 AD630018 */  sw        $v1, 0x18($t3)
-/* 35594 8005A194 8583000E */  lh        $v1, 0xe($t4)
-/* 35598 8005A198 8585000A */  lh        $a1, 0xa($t4)
-/* 3559C 8005A19C 85840010 */  lh        $a0, 0x10($t4)
-/* 355A0 8005A1A0 8586000C */  lh        $a2, 0xc($t4)
-/* 355A4 8005A1A4 25620040 */  addiu     $v0, $t3, 0x40
-/* 355A8 8005A1A8 AE020000 */  sw        $v0, ($s0)
-/* 355AC 8005A1AC AD670020 */  sw        $a3, 0x20($t3)
-/* 355B0 8005A1B0 AD740024 */  sw        $s4, 0x24($t3)
-/* 355B4 8005A1B4 AD680028 */  sw        $t0, 0x28($t3)
-/* 355B8 8005A1B8 00651821 */  addu      $v1, $v1, $a1
-/* 355BC 8005A1BC 44831000 */  mtc1      $v1, $f2
-/* 355C0 8005A1C0 00000000 */  nop       
-/* 355C4 8005A1C4 468010A0 */  cvt.s.w   $f2, $f2
-/* 355C8 8005A1C8 46141082 */  mul.s     $f2, $f2, $f20
-/* 355CC 8005A1CC 00000000 */  nop       
-/* 355D0 8005A1D0 AD74002C */  sw        $s4, 0x2c($t3)
-/* 355D4 8005A1D4 AD690030 */  sw        $t1, 0x30($t3)
-/* 355D8 8005A1D8 00862021 */  addu      $a0, $a0, $a2
-/* 355DC 8005A1DC 44840000 */  mtc1      $a0, $f0
-/* 355E0 8005A1E0 00000000 */  nop       
-/* 355E4 8005A1E4 46800020 */  cvt.s.w   $f0, $f0
-/* 355E8 8005A1E8 46140002 */  mul.s     $f0, $f0, $f20
-/* 355EC 8005A1EC 00000000 */  nop       
-/* 355F0 8005A1F0 AD730034 */  sw        $s3, 0x34($t3)
-/* 355F4 8005A1F4 4600110D */  trunc.w.s $f4, $f2
-/* 355F8 8005A1F8 44032000 */  mfc1      $v1, $f4
-/* 355FC 8005A1FC 00000000 */  nop       
-/* 35600 8005A200 30630FFF */  andi      $v1, $v1, 0xfff
-/* 35604 8005A204 00031B00 */  sll       $v1, $v1, 0xc
-/* 35608 8005A208 4600010D */  trunc.w.s $f4, $f0
-/* 3560C 8005A20C 44022000 */  mfc1      $v0, $f4
-/* 35610 8005A210 00000000 */  nop       
-/* 35614 8005A214 30420FFF */  andi      $v0, $v0, 0xfff
-/* 35618 8005A218 00621825 */  or        $v1, $v1, $v0
-/* 3561C 8005A21C AD63001C */  sw        $v1, 0x1c($t3)
-/* 35620 8005A220 AD6A0038 */  sw        $t2, 0x38($t3)
-/* 35624 8005A224 AD73003C */  sw        $s3, 0x3c($t3)
-/* 35628 8005A228 95820000 */  lhu       $v0, ($t4)
-/* 3562C 8005A22C 30420010 */  andi      $v0, $v0, 0x10
-/* 35630 8005A230 14400012 */  bnez      $v0, .L8005A27C
-/* 35634 8005A234 0000882D */   daddu    $s1, $zero, $zero
-/* 35638 8005A238 3C04DA38 */  lui       $a0, 0xda38
-/* 3563C 8005A23C 34840007 */  ori       $a0, $a0, 7
-/* 35640 8005A240 25620048 */  addiu     $v0, $t3, 0x48
-/* 35644 8005A244 AE020000 */  sw        $v0, ($s0)
-/* 35648 8005A248 3C02DB0E */  lui       $v0, 0xdb0e
-/* 3564C 8005A24C AD620040 */  sw        $v0, 0x40($t3)
-/* 35650 8005A250 95830038 */  lhu       $v1, 0x38($t4)
-/* 35654 8005A254 25620050 */  addiu     $v0, $t3, 0x50
-/* 35658 8005A258 AE020000 */  sw        $v0, ($s0)
-/* 3565C 8005A25C 000D1180 */  sll       $v0, $t5, 6
-/* 35660 8005A260 AD630044 */  sw        $v1, 0x44($t3)
-/* 35664 8005A264 3C03800A */  lui       $v1, 0x800a
-/* 35668 8005A268 8C63A674 */  lw        $v1, -0x598c($v1)
-/* 3566C 8005A26C 24420030 */  addiu     $v0, $v0, 0x30
-/* 35670 8005A270 AD640048 */  sw        $a0, 0x48($t3)
-/* 35674 8005A274 00621821 */  addu      $v1, $v1, $v0
-/* 35678 8005A278 AD63004C */  sw        $v1, 0x4c($t3)
-.L8005A27C:
-/* 3567C 8005A27C 01E0F809 */  jalr      $t7
-/* 35680 8005A280 01C0202D */   daddu    $a0, $t6, $zero
-/* 35684 8005A284 26520001 */  addiu     $s2, $s2, 1
-.L8005A288:
-/* 35688 8005A288 2A420060 */  slti      $v0, $s2, 0x60
-/* 3568C 8005A28C 5440FF55 */  bnel      $v0, $zero, .L80059FE4
-/* 35690 8005A290 00121080 */   sll      $v0, $s2, 2
-/* 35694 8005A294 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 35698 8005A298 8FB50024 */  lw        $s5, 0x24($sp)
-/* 3569C 8005A29C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 356A0 8005A2A0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 356A4 8005A2A4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 356A8 8005A2A8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 356AC 8005A2AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 356B0 8005A2B0 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* 356B4 8005A2B4 03E00008 */  jr        $ra
-/* 356B8 8005A2B8 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s b/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s
deleted file mode 100644
index 82657661e3..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8005A2BC
-/* 356BC 8005A2BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 356C0 8005A2C0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 356C4 8005A2C4 0080902D */  daddu     $s2, $a0, $zero
-/* 356C8 8005A2C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 356CC 8005A2CC 0000802D */  daddu     $s0, $zero, $zero
-/* 356D0 8005A2D0 3C03800B */  lui       $v1, 0x800b
-/* 356D4 8005A2D4 24634398 */  addiu     $v1, $v1, 0x4398
-/* 356D8 8005A2D8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 356DC 8005A2DC AFB10014 */  sw        $s1, 0x14($sp)
-.L8005A2E0:
-/* 356E0 8005A2E0 8C620000 */  lw        $v0, ($v1)
-/* 356E4 8005A2E4 10400006 */  beqz      $v0, .L8005A300
-/* 356E8 8005A2E8 2A020060 */   slti     $v0, $s0, 0x60
-/* 356EC 8005A2EC 26100001 */  addiu     $s0, $s0, 1
-/* 356F0 8005A2F0 2A020060 */  slti      $v0, $s0, 0x60
-/* 356F4 8005A2F4 1440FFFA */  bnez      $v0, .L8005A2E0
-/* 356F8 8005A2F8 24630004 */   addiu    $v1, $v1, 4
-/* 356FC 8005A2FC 2A020060 */  slti      $v0, $s0, 0x60
-.L8005A300:
-/* 35700 8005A300 14400003 */  bnez      $v0, .L8005A310
-/* 35704 8005A304 00000000 */   nop      
-.L8005A308:
-/* 35708 8005A308 080168C2 */  j         .L8005A308
-/* 3570C 8005A30C 00000000 */   nop      
-.L8005A310:
-/* 35710 8005A310 0C00AB0A */  jal       general_heap_malloc
-/* 35714 8005A314 24040014 */   addiu    $a0, $zero, 0x14
-/* 35718 8005A318 00101880 */  sll       $v1, $s0, 2
-/* 3571C 8005A31C 0040882D */  daddu     $s1, $v0, $zero
-/* 35720 8005A320 3C01800B */  lui       $at, 0x800b
-/* 35724 8005A324 00230821 */  addu      $at, $at, $v1
-/* 35728 8005A328 AC314398 */  sw        $s1, 0x4398($at)
-/* 3572C 8005A32C 16200003 */  bnez      $s1, .L8005A33C
-/* 35730 8005A330 0000802D */   daddu    $s0, $zero, $zero
-.L8005A334:
-/* 35734 8005A334 080168CD */  j         .L8005A334
-/* 35738 8005A338 00000000 */   nop      
-.L8005A33C:
-/* 3573C 8005A33C 3C04800A */  lui       $a0, 0x800a
-/* 35740 8005A340 24844000 */  addiu     $a0, $a0, 0x4000
-/* 35744 8005A344 8E430004 */  lw        $v1, 4($s2)
-/* 35748 8005A348 24020001 */  addiu     $v0, $zero, 1
-/* 3574C 8005A34C AE220000 */  sw        $v0, ($s1)
-/* 35750 8005A350 AE230004 */  sw        $v1, 4($s1)
-.L8005A354:
-/* 35754 8005A354 8C820000 */  lw        $v0, ($a0)
-/* 35758 8005A358 30420001 */  andi      $v0, $v0, 1
-/* 3575C 8005A35C 50400006 */  beql      $v0, $zero, .L8005A378
-/* 35760 8005A360 26100001 */   addiu    $s0, $s0, 1
-/* 35764 8005A364 8C830004 */  lw        $v1, 4($a0)
-/* 35768 8005A368 8E420004 */  lw        $v0, 4($s2)
-/* 3576C 8005A36C 10620006 */  beq       $v1, $v0, .L8005A388
-/* 35770 8005A370 2A02000F */   slti     $v0, $s0, 0xf
-/* 35774 8005A374 26100001 */  addiu     $s0, $s0, 1
-.L8005A378:
-/* 35778 8005A378 2A02000F */  slti      $v0, $s0, 0xf
-/* 3577C 8005A37C 1440FFF5 */  bnez      $v0, .L8005A354
-/* 35780 8005A380 24840020 */   addiu    $a0, $a0, 0x20
-/* 35784 8005A384 2A02000F */  slti      $v0, $s0, 0xf
-.L8005A388:
-/* 35788 8005A388 14400003 */  bnez      $v0, .L8005A398
-/* 3578C 8005A38C 00000000 */   nop      
-.L8005A390:
-/* 35790 8005A390 080168E4 */  j         .L8005A390
-/* 35794 8005A394 00000000 */   nop      
-.L8005A398:
-/* 35798 8005A398 8C820008 */  lw        $v0, 8($a0)
-/* 3579C 8005A39C 14400016 */  bnez      $v0, .L8005A3F8
-/* 357A0 8005A3A0 24420001 */   addiu    $v0, $v0, 1
-/* 357A4 8005A3A4 8E42000C */  lw        $v0, 0xc($s2)
-/* 357A8 8005A3A8 14400004 */  bnez      $v0, .L8005A3BC
-/* 357AC 8005A3AC AC820010 */   sw       $v0, 0x10($a0)
-/* 357B0 8005A3B0 3C028006 */  lui       $v0, 0x8006
-/* 357B4 8005A3B4 24429C80 */  addiu     $v0, $v0, -0x6380
-/* 357B8 8005A3B8 AC820014 */  sw        $v0, 0x14($a0)
-.L8005A3BC:
-/* 357BC 8005A3BC 8E420010 */  lw        $v0, 0x10($s2)
-/* 357C0 8005A3C0 8C830018 */  lw        $v1, 0x18($a0)
-/* 357C4 8005A3C4 14600004 */  bnez      $v1, .L8005A3D8
-/* 357C8 8005A3C8 AC820014 */   sw       $v0, 0x14($a0)
-/* 357CC 8005A3CC 3C028006 */  lui       $v0, 0x8006
-/* 357D0 8005A3D0 24429C80 */  addiu     $v0, $v0, -0x6380
-/* 357D4 8005A3D4 AC820018 */  sw        $v0, 0x18($a0)
-.L8005A3D8:
-/* 357D8 8005A3D8 8E420014 */  lw        $v0, 0x14($s2)
-/* 357DC 8005A3DC 14400004 */  bnez      $v0, .L8005A3F0
-/* 357E0 8005A3E0 AC820018 */   sw       $v0, 0x18($a0)
-/* 357E4 8005A3E4 3C028006 */  lui       $v0, 0x8006
-/* 357E8 8005A3E8 24429C80 */  addiu     $v0, $v0, -0x6380
-/* 357EC 8005A3EC AC820018 */  sw        $v0, 0x18($a0)
-.L8005A3F0:
-/* 357F0 8005A3F0 8C820008 */  lw        $v0, 8($a0)
-/* 357F4 8005A3F4 24420001 */  addiu     $v0, $v0, 1
-.L8005A3F8:
-/* 357F8 8005A3F8 AC820008 */  sw        $v0, 8($a0)
-/* 357FC 8005A3FC AE240010 */  sw        $a0, 0x10($s1)
-/* 35800 8005A400 8E420008 */  lw        $v0, 8($s2)
-/* 35804 8005A404 10400003 */  beqz      $v0, .L8005A414
-/* 35808 8005A408 00000000 */   nop      
-/* 3580C 8005A40C 0040F809 */  jalr      $v0
-/* 35810 8005A410 0220202D */   daddu    $a0, $s1, $zero
-.L8005A414:
-/* 35814 8005A414 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 35818 8005A418 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 3581C 8005A41C 80420070 */  lb        $v0, 0x70($v0)
-/* 35820 8005A420 10400005 */  beqz      $v0, .L8005A438
-/* 35824 8005A424 0220102D */   daddu    $v0, $s1, $zero
-/* 35828 8005A428 8E220000 */  lw        $v0, ($s1)
-/* 3582C 8005A42C 34420004 */  ori       $v0, $v0, 4
-/* 35830 8005A430 AE220000 */  sw        $v0, ($s1)
-/* 35834 8005A434 0220102D */  daddu     $v0, $s1, $zero
-.L8005A438:
-/* 35838 8005A438 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 3583C 8005A43C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 35840 8005A440 8FB10014 */  lw        $s1, 0x14($sp)
-/* 35844 8005A444 8FB00010 */  lw        $s0, 0x10($sp)
-/* 35848 8005A448 03E00008 */  jr        $ra
-/* 3584C 8005A44C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s b/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s
deleted file mode 100644
index fcb7cc7f75..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_asset_offset
-/* 361D0 8005ADD0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 361D4 8005ADD4 AFB20038 */  sw        $s2, 0x38($sp)
-/* 361D8 8005ADD8 0080902D */  daddu     $s2, $a0, $zero
-/* 361DC 8005ADDC AFB3003C */  sw        $s3, 0x3c($sp)
-/* 361E0 8005ADE0 00A0982D */  daddu     $s3, $a1, $zero
-/* 361E4 8005ADE4 3C0401E4 */  lui       $a0, 0x1e4
-/* 361E8 8005ADE8 34840020 */  ori       $a0, $a0, 0x20
-/* 361EC 8005ADEC 3C0501E4 */  lui       $a1, 0x1e4
-/* 361F0 8005ADF0 34A5003C */  ori       $a1, $a1, 0x3c
-/* 361F4 8005ADF4 27A60010 */  addiu     $a2, $sp, 0x10
-/* 361F8 8005ADF8 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 361FC 8005ADFC AFB10034 */  sw        $s1, 0x34($sp)
-/* 36200 8005AE00 0C00A5CF */  jal       dma_copy
-/* 36204 8005AE04 AFB00030 */   sw       $s0, 0x30($sp)
-/* 36208 8005AE08 8FA40020 */  lw        $a0, 0x20($sp)
-/* 3620C 8005AE0C 0C00AB39 */  jal       heap_malloc
-/* 36210 8005AE10 00000000 */   nop      
-/* 36214 8005AE14 0040882D */  daddu     $s1, $v0, $zero
-/* 36218 8005AE18 0220802D */  daddu     $s0, $s1, $zero
-/* 3621C 8005AE1C 3C0201E4 */  lui       $v0, 0x1e4
-/* 36220 8005AE20 34420020 */  ori       $v0, $v0, 0x20
-/* 36224 8005AE24 3C0401E4 */  lui       $a0, 0x1e4
-/* 36228 8005AE28 34840020 */  ori       $a0, $a0, 0x20
-/* 3622C 8005AE2C 8FA50020 */  lw        $a1, 0x20($sp)
-/* 36230 8005AE30 0220302D */  daddu     $a2, $s1, $zero
-/* 36234 8005AE34 0C00A5CF */  jal       dma_copy
-/* 36238 8005AE38 00A22821 */   addu     $a1, $a1, $v0
-.L8005AE3C:
-/* 3623C 8005AE3C 0200202D */  daddu     $a0, $s0, $zero
-/* 36240 8005AE40 0C01BB5C */  jal       strcmp
-/* 36244 8005AE44 0240282D */   daddu    $a1, $s2, $zero
-/* 36248 8005AE48 10400003 */  beqz      $v0, .L8005AE58
-/* 3624C 8005AE4C 3C0301E4 */   lui      $v1, 0x1e4
-/* 36250 8005AE50 08016B8F */  j         .L8005AE3C
-/* 36254 8005AE54 2610001C */   addiu    $s0, $s0, 0x1c
-.L8005AE58:
-/* 36258 8005AE58 8E020014 */  lw        $v0, 0x14($s0)
-/* 3625C 8005AE5C 34630020 */  ori       $v1, $v1, 0x20
-/* 36260 8005AE60 AE620000 */  sw        $v0, ($s3)
-/* 36264 8005AE64 8E100010 */  lw        $s0, 0x10($s0)
-/* 36268 8005AE68 0220202D */  daddu     $a0, $s1, $zero
-/* 3626C 8005AE6C 0C00AB4B */  jal       heap_free
-/* 36270 8005AE70 02038021 */   addu     $s0, $s0, $v1
-/* 36274 8005AE74 0200102D */  daddu     $v0, $s0, $zero
-/* 36278 8005AE78 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 3627C 8005AE7C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 36280 8005AE80 8FB20038 */  lw        $s2, 0x38($sp)
-/* 36284 8005AE84 8FB10034 */  lw        $s1, 0x34($sp)
-/* 36288 8005AE88 8FB00030 */  lw        $s0, 0x30($sp)
-/* 3628C 8005AE8C 03E00008 */  jr        $ra
-/* 36290 8005AE90 27BD0048 */   addiu    $sp, $sp, 0x48
-/* 36294 8005AE94 00000000 */  nop       
-/* 36298 8005AE98 00000000 */  nop       
-/* 3629C 8005AE9C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s
deleted file mode 100644
index b59d381a0f..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_current_map_config
-/* 35FD8 8005ABD8 3C02800A */  lui       $v0, 0x800a
-/* 35FDC 8005ABDC 8C4241E0 */  lw        $v0, 0x41e0($v0)
-/* 35FE0 8005ABE0 03E00008 */  jr        $ra
-/* 35FE4 8005ABE4 00000000 */   nop      
diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s
deleted file mode 100644
index 866291ad6f..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_current_map_header
-/* 35FE8 8005ABE8 3C02800A */  lui       $v0, 0x800a
-/* 35FEC 8005ABEC 244241E8 */  addiu     $v0, $v0, 0x41e8
-/* 35FF0 8005ABF0 03E00008 */  jr        $ra
-/* 35FF4 8005ABF4 00000000 */   nop      
diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
deleted file mode 100644
index 72e6bb7711..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_map_IDs_by_name
-/* 35FF8 8005ABF8 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 35FFC 8005ABFC AFB50024 */  sw        $s5, 0x24($sp)
-/* 36000 8005AC00 0080A82D */  daddu     $s5, $a0, $zero
-/* 36004 8005AC04 AFB60028 */  sw        $s6, 0x28($sp)
-/* 36008 8005AC08 00A0B02D */  daddu     $s6, $a1, $zero
-/* 3600C 8005AC0C AFB7002C */  sw        $s7, 0x2c($sp)
-/* 36010 8005AC10 00C0B82D */  daddu     $s7, $a2, $zero
-/* 36014 8005AC14 3C028009 */  lui       $v0, %hi(gAreas)
-/* 36018 8005AC18 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
-/* 3601C 8005AC1C AFBF0030 */  sw        $ra, 0x30($sp)
-/* 36020 8005AC20 AFB40020 */  sw        $s4, 0x20($sp)
-/* 36024 8005AC24 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 36028 8005AC28 AFB20018 */  sw        $s2, 0x18($sp)
-/* 3602C 8005AC2C AFB10014 */  sw        $s1, 0x14($sp)
-/* 36030 8005AC30 AFB00010 */  sw        $s0, 0x10($sp)
-/* 36034 8005AC34 8C440004 */  lw        $a0, 4($v0)
-/* 36038 8005AC38 1080001F */  beqz      $a0, .L8005ACB8
-/* 3603C 8005AC3C 0000A02D */   daddu    $s4, $zero, $zero
-/* 36040 8005AC40 0280902D */  daddu     $s2, $s4, $zero
-.L8005AC44:
-/* 36044 8005AC44 02421021 */  addu      $v0, $s2, $v0
-/* 36048 8005AC48 8C420000 */  lw        $v0, ($v0)
-/* 3604C 8005AC4C 18400012 */  blez      $v0, .L8005AC98
-/* 36050 8005AC50 0000802D */   daddu    $s0, $zero, $zero
-/* 36054 8005AC54 3C028009 */  lui       $v0, %hi(gAreas)
-/* 36058 8005AC58 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
-/* 3605C 8005AC5C 02429821 */  addu      $s3, $s2, $v0
-/* 36060 8005AC60 0080882D */  daddu     $s1, $a0, $zero
-.L8005AC64:
-/* 36064 8005AC64 8E240000 */  lw        $a0, ($s1)
-/* 36068 8005AC68 0C01BB5C */  jal       strcmp
-/* 3606C 8005AC6C 02A0282D */   daddu    $a1, $s5, $zero
-/* 36070 8005AC70 54400005 */  bnel      $v0, $zero, .L8005AC88
-/* 36074 8005AC74 26100001 */   addiu    $s0, $s0, 1
-/* 36078 8005AC78 24020001 */  addiu     $v0, $zero, 1
-/* 3607C 8005AC7C A6D40000 */  sh        $s4, ($s6)
-/* 36080 8005AC80 08016B2F */  j         .L8005ACBC
-/* 36084 8005AC84 A6F00000 */   sh       $s0, ($s7)
-.L8005AC88:
-/* 36088 8005AC88 8E620000 */  lw        $v0, ($s3)
-/* 3608C 8005AC8C 0202102A */  slt       $v0, $s0, $v0
-/* 36090 8005AC90 1440FFF4 */  bnez      $v0, .L8005AC64
-/* 36094 8005AC94 26310020 */   addiu    $s1, $s1, 0x20
-.L8005AC98:
-/* 36098 8005AC98 26520010 */  addiu     $s2, $s2, 0x10
-/* 3609C 8005AC9C 3C048009 */  lui       $a0, 0x8009
-/* 360A0 8005ACA0 00922021 */  addu      $a0, $a0, $s2
-/* 360A4 8005ACA4 8C8434F4 */  lw        $a0, 0x34f4($a0)
-/* 360A8 8005ACA8 3C028009 */  lui       $v0, %hi(gAreas)
-/* 360AC 8005ACAC 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
-/* 360B0 8005ACB0 1480FFE4 */  bnez      $a0, .L8005AC44
-/* 360B4 8005ACB4 26940001 */   addiu    $s4, $s4, 1
-.L8005ACB8:
-/* 360B8 8005ACB8 0000102D */  daddu     $v0, $zero, $zero
-.L8005ACBC:
-/* 360BC 8005ACBC 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 360C0 8005ACC0 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 360C4 8005ACC4 8FB60028 */  lw        $s6, 0x28($sp)
-/* 360C8 8005ACC8 8FB50024 */  lw        $s5, 0x24($sp)
-/* 360CC 8005ACCC 8FB40020 */  lw        $s4, 0x20($sp)
-/* 360D0 8005ACD0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 360D4 8005ACD4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 360D8 8005ACD8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 360DC 8005ACDC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 360E0 8005ACE0 03E00008 */  jr        $ra
-/* 360E4 8005ACE4 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s
deleted file mode 100644
index 97be367b37..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s
+++ /dev/null
@@ -1,64 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel load_asset_by_name
-/* 360E8 8005ACE8 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 360EC 8005ACEC AFB00030 */  sw        $s0, 0x30($sp)
-/* 360F0 8005ACF0 0080802D */  daddu     $s0, $a0, $zero
-/* 360F4 8005ACF4 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 360F8 8005ACF8 00A0982D */  daddu     $s3, $a1, $zero
-/* 360FC 8005ACFC 3C0401E4 */  lui       $a0, 0x1e4
-/* 36100 8005AD00 34840020 */  ori       $a0, $a0, 0x20
-/* 36104 8005AD04 3C0501E4 */  lui       $a1, 0x1e4
-/* 36108 8005AD08 34A5003C */  ori       $a1, $a1, 0x3c
-/* 3610C 8005AD0C 27A60010 */  addiu     $a2, $sp, 0x10
-/* 36110 8005AD10 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 36114 8005AD14 AFB20038 */  sw        $s2, 0x38($sp)
-/* 36118 8005AD18 0C00A5CF */  jal       dma_copy
-/* 3611C 8005AD1C AFB10034 */   sw       $s1, 0x34($sp)
-/* 36120 8005AD20 8FA40020 */  lw        $a0, 0x20($sp)
-/* 36124 8005AD24 0C00AB39 */  jal       heap_malloc
-/* 36128 8005AD28 00000000 */   nop      
-/* 3612C 8005AD2C 0040902D */  daddu     $s2, $v0, $zero
-/* 36130 8005AD30 0240882D */  daddu     $s1, $s2, $zero
-/* 36134 8005AD34 3C0201E4 */  lui       $v0, 0x1e4
-/* 36138 8005AD38 34420020 */  ori       $v0, $v0, 0x20
-/* 3613C 8005AD3C 3C0401E4 */  lui       $a0, 0x1e4
-/* 36140 8005AD40 34840020 */  ori       $a0, $a0, 0x20
-/* 36144 8005AD44 8FA50020 */  lw        $a1, 0x20($sp)
-/* 36148 8005AD48 0240302D */  daddu     $a2, $s2, $zero
-/* 3614C 8005AD4C 0C00A5CF */  jal       dma_copy
-/* 36150 8005AD50 00A22821 */   addu     $a1, $a1, $v0
-.L8005AD54:
-/* 36154 8005AD54 0220202D */  daddu     $a0, $s1, $zero
-/* 36158 8005AD58 0C01BB5C */  jal       strcmp
-/* 3615C 8005AD5C 0200282D */   daddu    $a1, $s0, $zero
-/* 36160 8005AD60 10400003 */  beqz      $v0, .L8005AD70
-/* 36164 8005AD64 00000000 */   nop      
-/* 36168 8005AD68 08016B55 */  j         .L8005AD54
-/* 3616C 8005AD6C 2631001C */   addiu    $s1, $s1, 0x1c
-.L8005AD70:
-/* 36170 8005AD70 8E220018 */  lw        $v0, 0x18($s1)
-/* 36174 8005AD74 AE620000 */  sw        $v0, ($s3)
-/* 36178 8005AD78 0C00AB0A */  jal       general_heap_malloc
-/* 3617C 8005AD7C 8E240014 */   lw       $a0, 0x14($s1)
-/* 36180 8005AD80 3C0301E4 */  lui       $v1, 0x1e4
-/* 36184 8005AD84 34630020 */  ori       $v1, $v1, 0x20
-/* 36188 8005AD88 0040802D */  daddu     $s0, $v0, $zero
-/* 3618C 8005AD8C 0040302D */  daddu     $a2, $v0, $zero
-/* 36190 8005AD90 8E220010 */  lw        $v0, 0x10($s1)
-/* 36194 8005AD94 8E250014 */  lw        $a1, 0x14($s1)
-/* 36198 8005AD98 00432021 */  addu      $a0, $v0, $v1
-/* 3619C 8005AD9C 00A32821 */  addu      $a1, $a1, $v1
-/* 361A0 8005ADA0 0C00A5CF */  jal       dma_copy
-/* 361A4 8005ADA4 00452821 */   addu     $a1, $v0, $a1
-/* 361A8 8005ADA8 0C00AB4B */  jal       heap_free
-/* 361AC 8005ADAC 0240202D */   daddu    $a0, $s2, $zero
-/* 361B0 8005ADB0 0200102D */  daddu     $v0, $s0, $zero
-/* 361B4 8005ADB4 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 361B8 8005ADB8 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 361BC 8005ADBC 8FB20038 */  lw        $s2, 0x38($sp)
-/* 361C0 8005ADC0 8FB10034 */  lw        $s1, 0x34($sp)
-/* 361C4 8005ADC4 8FB00030 */  lw        $s0, 0x30($sp)
-/* 361C8 8005ADC8 03E00008 */  jr        $ra
-/* 361CC 8005ADCC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
deleted file mode 100644
index 34eb98d497..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s
+++ /dev/null
@@ -1,333 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel load_map_by_IDs
-/* 35AF4 8005A6F4 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 35AF8 8005A6F8 AFB00038 */  sw        $s0, 0x38($sp)
-/* 35AFC 8005A6FC 00C0802D */  daddu     $s0, $a2, $zero
-/* 35B00 8005A700 AFB1003C */  sw        $s1, 0x3c($sp)
-/* 35B04 8005A704 0080882D */  daddu     $s1, $a0, $zero
-/* 35B08 8005A708 AFB30044 */  sw        $s3, 0x44($sp)
-/* 35B0C 8005A70C 00A0982D */  daddu     $s3, $a1, $zero
-/* 35B10 8005A710 AFB40048 */  sw        $s4, 0x48($sp)
-/* 35B14 8005A714 0000A02D */  daddu     $s4, $zero, $zero
-/* 35B18 8005A718 AFBF004C */  sw        $ra, 0x4c($sp)
-/* 35B1C 8005A71C 0C05260E */  jal       func_80149838
-/* 35B20 8005A720 AFB20040 */   sw       $s2, 0x40($sp)
-/* 35B24 8005A724 3C05800A */  lui       $a1, %hi(D_8009A650)
-/* 35B28 8005A728 24A5A650 */  addiu     $a1, $a1, %lo(D_8009A650)
-/* 35B2C 8005A72C 2402FFBF */  addiu     $v0, $zero, -0x41
-/* 35B30 8005A730 3C128007 */  lui       $s2, %hi(gGameStatusPtr)
-/* 35B34 8005A734 2652419C */  addiu     $s2, $s2, %lo(gGameStatusPtr)
-/* 35B38 8005A738 8CA30000 */  lw        $v1, ($a1)
-/* 35B3C 8005A73C 8E440000 */  lw        $a0, ($s2)
-/* 35B40 8005A740 00621824 */  and       $v1, $v1, $v0
-/* 35B44 8005A744 2402FF7F */  addiu     $v0, $zero, -0x81
-/* 35B48 8005A748 00621824 */  and       $v1, $v1, $v0
-/* 35B4C 8005A74C ACA30000 */  sw        $v1, ($a1)
-/* 35B50 8005A750 0C00B458 */  jal       func_8002D160
-/* 35B54 8005A754 A0800084 */   sb       $zero, 0x84($a0)
-/* 35B58 8005A758 0C0AC81E */  jal       func_802B2078
-/* 35B5C 8005A75C 00108400 */   sll      $s0, $s0, 0x10
-/* 35B60 8005A760 0C047624 */  jal       func_8011D890
-/* 35B64 8005A764 00108403 */   sra      $s0, $s0, 0x10
-/* 35B68 8005A768 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35B6C 8005A76C 00000000 */   nop
-/* 35B70 8005A770 0C0B0C77 */  jal       clear_script_list
-/* 35B74 8005A774 00000000 */   nop
-/* 35B78 8005A778 12000005 */  beqz      $s0, .L8005A790
-/* 35B7C 8005A77C 24020001 */   addiu    $v0, $zero, 1
-/* 35B80 8005A780 12020008 */  beq       $s0, $v0, .L8005A7A4
-/* 35B84 8005A784 00000000 */   nop
-/* 35B88 8005A788 080169F0 */  j         .L8005A7C0
-/* 35B8C 8005A78C 00000000 */   nop
-.L8005A790:
-/* 35B90 8005A790 0C0514E4 */  jal       clear_area_flags
-/* 35B94 8005A794 00000000 */   nop
-/* 35B98 8005A798 8E420000 */  lw        $v0, ($s2)
-/* 35B9C 8005A79C 080169F0 */  j         .L8005A7C0
-/* 35BA0 8005A7A0 A0400167 */   sb       $zero, 0x167($v0)
-.L8005A7A4:
-/* 35BA4 8005A7A4 0C00AD24 */  jal       fio_deserialize_state
-/* 35BA8 8005A7A8 00000000 */   nop
-/* 35BAC 8005A7AC 8E420000 */  lw        $v0, ($s2)
-/* 35BB0 8005A7B0 94510086 */  lhu       $s1, 0x86($v0)
-/* 35BB4 8005A7B4 9453008C */  lhu       $s3, 0x8c($v0)
-/* 35BB8 8005A7B8 A0500167 */  sb        $s0, 0x167($v0)
-/* 35BBC 8005A7BC A4510088 */  sh        $s1, 0x88($v0)
-.L8005A7C0:
-/* 35BC0 8005A7C0 3C04800E */  lui       $a0, 0x800e
-/* 35BC4 8005A7C4 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* 35BC8 8005A7C8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 35BCC 8005A7CC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 35BD0 8005A7D0 00131C00 */  sll       $v1, $s3, 0x10
-/* 35BD4 8005A7D4 AC400144 */  sw        $zero, 0x144($v0)
-/* 35BD8 8005A7D8 00111400 */  sll       $v0, $s1, 0x10
-/* 35BDC 8005A7DC 00021303 */  sra       $v0, $v0, 0xc
-/* 35BE0 8005A7E0 3C018009 */  lui       $at, 0x8009
-/* 35BE4 8005A7E4 00220821 */  addu      $at, $at, $v0
-/* 35BE8 8005A7E8 8C2234F4 */  lw        $v0, 0x34f4($at)
-/* 35BEC 8005A7EC 00031AC3 */  sra       $v1, $v1, 0xb
-/* 35BF0 8005A7F0 00439021 */  addu      $s2, $v0, $v1
-/* 35BF4 8005A7F4 8E460000 */  lw        $a2, ($s2)
-/* 35BF8 8005A7F8 3C05800A */  lui       $a1, 0x800a
-/* 35BFC 8005A7FC 0C01953C */  jal       sprintf
-/* 35C00 8005A800 24A58A10 */   addiu    $a1, $a1, -0x75f0
-/* 35C04 8005A804 3C04800E */  lui       $a0, 0x800e
-/* 35C08 8005A808 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* 35C0C 8005A80C 8E460000 */  lw        $a2, ($s2)
-/* 35C10 8005A810 3C05800A */  lui       $a1, 0x800a
-/* 35C14 8005A814 0C01953C */  jal       sprintf
-/* 35C18 8005A818 24A58A1C */   addiu    $a1, $a1, -0x75e4
-/* 35C1C 8005A81C 8E450000 */  lw        $a1, ($s2)
-/* 35C20 8005A820 0C01BB50 */  jal       strcpy
-/* 35C24 8005A824 27A40018 */   addiu    $a0, $sp, 0x18
-/* 35C28 8005A828 3C04800B */  lui       $a0, 0x800b
-/* 35C2C 8005A82C 24840CF0 */  addiu     $a0, $a0, 0xcf0
-/* 35C30 8005A830 3C05800A */  lui       $a1, 0x800a
-/* 35C34 8005A834 24A58A24 */  addiu     $a1, $a1, -0x75dc
-/* 35C38 8005A838 27A60018 */  addiu     $a2, $sp, 0x18
-/* 35C3C 8005A83C 0C01953C */  jal       sprintf
-/* 35C40 8005A840 A3A0001B */   sb       $zero, 0x1b($sp)
-/* 35C44 8005A844 8E450014 */  lw        $a1, 0x14($s2)
-/* 35C48 8005A848 3C01800A */  lui       $at, 0x800a
-/* 35C4C 8005A84C AC3241E0 */  sw        $s2, 0x41e0($at)
-/* 35C50 8005A850 10A00005 */  beqz      $a1, .L8005A868
-/* 35C54 8005A854 00000000 */   nop
-/* 35C58 8005A858 3C04800E */  lui       $a0, 0x800e
-/* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, -0x6998
-/* 35C60 8005A860 0C01BB50 */  jal       strcpy
-/* 35C64 8005A864 00000000 */   nop
-.L8005A868:
-/* 35C68 8005A868 0C0169B0 */  jal       load_world_script_api
-/* 35C6C 8005A86C 00000000 */   nop
-/* 35C70 8005A870 8E440008 */  lw        $a0, 8($s2)
-/* 35C74 8005A874 10800004 */  beqz      $a0, .L8005A888
-/* 35C78 8005A878 00000000 */   nop
-/* 35C7C 8005A87C 8E45000C */  lw        $a1, 0xc($s2)
-/* 35C80 8005A880 0C00A5CF */  jal       dma_copy
-/* 35C84 8005A884 8E460010 */   lw       $a2, 0x10($s2)
-.L8005A888:
-/* 35C88 8005A888 8E420004 */  lw        $v0, 4($s2)
-/* 35C8C 8005A88C 3C03800A */  lui       $v1, 0x800a
-/* 35C90 8005A890 246341E8 */  addiu     $v1, $v1, 0x41e8
-/* 35C94 8005A894 24440040 */  addiu     $a0, $v0, 0x40
-.L8005A898:
-/* 35C98 8005A898 8C480000 */  lw        $t0, ($v0)
-/* 35C9C 8005A89C 8C490004 */  lw        $t1, 4($v0)
-/* 35CA0 8005A8A0 8C4A0008 */  lw        $t2, 8($v0)
-/* 35CA4 8005A8A4 8C4B000C */  lw        $t3, 0xc($v0)
-/* 35CA8 8005A8A8 AC680000 */  sw        $t0, ($v1)
-/* 35CAC 8005A8AC AC690004 */  sw        $t1, 4($v1)
-/* 35CB0 8005A8B0 AC6A0008 */  sw        $t2, 8($v1)
-/* 35CB4 8005A8B4 AC6B000C */  sw        $t3, 0xc($v1)
-/* 35CB8 8005A8B8 24420010 */  addiu     $v0, $v0, 0x10
-/* 35CBC 8005A8BC 1444FFF6 */  bne       $v0, $a0, .L8005A898
-/* 35CC0 8005A8C0 24630010 */   addiu    $v1, $v1, 0x10
-/* 35CC4 8005A8C4 8E420018 */  lw        $v0, 0x18($s2)
-/* 35CC8 8005A8C8 3C13800A */  lui       $s3, 0x800a
-/* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, 0x41e8
-/* 35CD0 8005A8D0 10400004 */  beqz      $v0, .L8005A8E4
-/* 35CD4 8005A8D4 00000000 */   nop
-/* 35CD8 8005A8D8 0040F809 */  jalr      $v0
-/* 35CDC 8005A8DC 00000000 */   nop
-/* 35CE0 8005A8E0 0040A02D */  daddu     $s4, $v0, $zero
-.L8005A8E4:
-/* 35CE4 8005A8E4 16800015 */  bnez      $s4, .L8005A93C
-/* 35CE8 8005A8E8 00000000 */   nop
-/* 35CEC 8005A8EC 3C04800E */  lui       $a0, 0x800e
-/* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* 35CF4 8005A8F4 0C016B3A */  jal       load_asset_by_name
-/* 35CF8 8005A8F8 27A50030 */   addiu    $a1, $sp, 0x30
-/* 35CFC 8005A8FC 0040882D */  daddu     $s1, $v0, $zero
-/* 35D00 8005A900 0220202D */  daddu     $a0, $s1, $zero
-/* 35D04 8005A904 3C108021 */  lui       $s0, 0x8021
-/* 35D08 8005A908 26100000 */  addiu     $s0, $s0, 0
-/* 35D0C 8005A90C 0C01BB7C */  jal       decode_yay0
-/* 35D10 8005A910 0200282D */   daddu    $a1, $s0, $zero
-/* 35D14 8005A914 0C00AB1E */  jal       general_heap_free
-/* 35D18 8005A918 0220202D */   daddu    $a0, $s1, $zero
-/* 35D1C 8005A91C 8E020000 */  lw        $v0, ($s0)
-/* 35D20 8005A920 8E030008 */  lw        $v1, 8($s0)
-/* 35D24 8005A924 8E04000C */  lw        $a0, 0xc($s0)
-/* 35D28 8005A928 8E050010 */  lw        $a1, 0x10($s0)
-/* 35D2C 8005A92C AE620000 */  sw        $v0, ($s3)
-/* 35D30 8005A930 AE630028 */  sw        $v1, 0x28($s3)
-/* 35D34 8005A934 AE64002C */  sw        $a0, 0x2c($s3)
-/* 35D38 8005A938 AE650030 */  sw        $a1, 0x30($s3)
-.L8005A93C:
-/* 35D3C 8005A93C 8E420014 */  lw        $v0, 0x14($s2)
-/* 35D40 8005A940 10400005 */  beqz      $v0, .L8005A958
-/* 35D44 8005A944 00000000 */   nop
-/* 35D48 8005A948 3C04800E */  lui       $a0, 0x800e
-/* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, -0x6998
-/* 35D50 8005A950 0C05175C */  jal       load_map_bg
-/* 35D54 8005A954 00000000 */   nop
-.L8005A958:
-/* 35D58 8005A958 0C00B458 */  jal       func_8002D160
-/* 35D5C 8005A95C 00000000 */   nop
-/* 35D60 8005A960 0C0AC81E */  jal       func_802B2078
-/* 35D64 8005A964 00000000 */   nop
-/* 35D68 8005A968 0C05259C */  jal       func_80149670
-/* 35D6C 8005A96C 0000202D */   daddu    $a0, $zero, $zero
-/* 35D70 8005A970 0C048C2E */  jal       clear_dynamic_entity_list
-/* 35D74 8005A974 00000000 */   nop
-/* 35D78 8005A978 0C0B0C77 */  jal       clear_script_list
-/* 35D7C 8005A97C 00000000 */   nop
-/* 35D80 8005A980 0C00B7BD */  jal       create_cameras_a
-/* 35D84 8005A984 00000000 */   nop
-/* 35D88 8005A988 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
-/* 35D8C 8005A98C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
-/* 35D90 8005A990 8E020000 */  lw        $v0, ($s0)
-/* 35D94 8005A994 0C0B763E */  jal       func_802DD8F8
-/* 35D98 8005A998 80440084 */   lb       $a0, 0x84($v0)
-/* 35D9C 8005A99C 0C047889 */  jal       func_8011E224
-/* 35DA0 8005A9A0 00000000 */   nop
-/* 35DA4 8005A9A4 0C0482EC */  jal       clear_virtual_models
-/* 35DA8 8005A9A8 00000000 */   nop
-/* 35DAC 8005A9AC 0C00E12F */  jal       clear_npcs
-/* 35DB0 8005A9B0 00000000 */   nop
-/* 35DB4 8005A9B4 0C050440 */  jal       func_80141100
-/* 35DB8 8005A9B8 00000000 */   nop
-/* 35DBC 8005A9BC 0C0515A0 */  jal       clear_trigger_data
-/* 35DC0 8005A9C0 00000000 */   nop
-/* 35DC4 8005A9C4 0C045751 */  jal       clear_model_data
-/* 35DC8 8005A9C8 00000000 */   nop
-/* 35DCC 8005A9CC 0C052010 */  jal       func_80148040
-/* 35DD0 8005A9D0 00000000 */   nop
-/* 35DD4 8005A9D4 0C05177E */  jal       func_80145DF8
-/* 35DD8 8005A9D8 00000000 */   nop
-/* 35DDC 8005A9DC 8E020000 */  lw        $v0, ($s0)
-/* 35DE0 8005A9E0 804300A8 */  lb        $v1, 0xa8($v0)
-/* 35DE4 8005A9E4 2402FFFF */  addiu     $v0, $zero, -1
-/* 35DE8 8005A9E8 14620003 */  bne       $v1, $v0, .L8005A9F8
-/* 35DEC 8005A9EC 00000000 */   nop
-/* 35DF0 8005A9F0 0C04E062 */  jal       func_80138188
-/* 35DF4 8005A9F4 00000000 */   nop
-.L8005A9F8:
-/* 35DF8 8005A9F8 16800005 */  bnez      $s4, .L8005AA10
-/* 35DFC 8005A9FC 00000000 */   nop
-/* 35E00 8005AA00 0C016BE5 */  jal       initialize_collision
-/* 35E04 8005AA04 00000000 */   nop
-/* 35E08 8005AA08 0C016BF0 */  jal       load_hit_asset
-/* 35E0C 8005AA0C 00000000 */   nop
-.L8005AA10:
-/* 35E10 8005AA10 0C01CACC */  jal       func_80072B30
-/* 35E14 8005AA14 00000000 */   nop
-/* 35E18 8005AA18 0C00F900 */  jal       clear_encounter_status
-/* 35E1C 8005AA1C 00000000 */   nop
-/* 35E20 8005AA20 0C04432E */  jal       clear_entity_data
-/* 35E24 8005AA24 24040001 */   addiu    $a0, $zero, 1
-/* 35E28 8005AA28 0C016727 */  jal       func_80059C9C
-/* 35E2C 8005AA2C 00000000 */   nop
-/* 35E30 8005AA30 0C037F14 */  jal       clear_player_status
-/* 35E34 8005AA34 00000000 */   nop
-/* 35E38 8005AA38 0C037F1D */  jal       func_800DFC74
-/* 35E3C 8005AA3C 00000000 */   nop
-/* 35E40 8005AA40 0C03AD1D */  jal       partner_reset_data
-/* 35E44 8005AA44 00000000 */   nop
-/* 35E48 8005AA48 0C048D9D */  jal       clear_printers
-/* 35E4C 8005AA4C 00000000 */   nop
-/* 35E50 8005AA50 0C04C3FC */  jal       clear_item_entity_data
-/* 35E54 8005AA54 00000000 */   nop
-/* 35E58 8005AA58 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 35E5C 8005AA5C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 35E60 8005AA60 C4400084 */  lwc1      $f0, 0x84($v0)
-/* 35E64 8005AA64 E4400080 */  swc1      $f0, 0x80($v0)
-/* 35E68 8005AA68 8E42001C */  lw        $v0, 0x1c($s2)
-/* 35E6C 8005AA6C 30420003 */  andi      $v0, $v0, 3
-/* 35E70 8005AA70 00021080 */  sll       $v0, $v0, 2
-/* 35E74 8005AA74 3C048009 */  lui       $a0, 0x8009
-/* 35E78 8005AA78 00822021 */  addu      $a0, $a0, $v0
-/* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
-/* 35E80 8005AA80 8C84FF60 */   lw       $a0, -0xa0($a0)
-/* 35E84 8005AA84 0C052580 */  jal       func_80149600
-/* 35E88 8005AA88 00000000 */   nop
-/* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
-/* 35E90 8005AA90 00000000 */   nop
-/* 35E94 8005AA94 3C04800B */  lui       $a0, 0x800b
-/* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, 0xcf0
-/* 35E9C 8005AA9C 0C016B74 */  jal       get_asset_offset
-/* 35EA0 8005AAA0 27A50030 */   addiu    $a1, $sp, 0x30
-/* 35EA4 8005AAA4 8E640000 */  lw        $a0, ($s3)
-/* 35EA8 8005AAA8 10800004 */  beqz      $a0, .L8005AABC
-/* 35EAC 8005AAAC 00000000 */   nop
-/* 35EB0 8005AAB0 8FA60030 */  lw        $a2, 0x30($sp)
-/* 35EB4 8005AAB4 0C046B52 */  jal       load_data_for_models
-/* 35EB8 8005AAB8 0040282D */   daddu    $a1, $v0, $zero
-.L8005AABC:
-/* 35EBC 8005AABC 8E640038 */  lw        $a0, 0x38($s3)
-/* 35EC0 8005AAC0 50800005 */  beql      $a0, $zero, .L8005AAD8
-/* 35EC4 8005AAC4 24040128 */   addiu    $a0, $zero, 0x128
-/* 35EC8 8005AAC8 0C05178A */  jal       read_background_size
-/* 35ECC 8005AACC 00000000 */   nop
-/* 35ED0 8005AAD0 08016ABA */  j         .L8005AAE8
-/* 35ED4 8005AAD4 00000000 */   nop
-.L8005AAD8:
-/* 35ED8 8005AAD8 240500C8 */  addiu     $a1, $zero, 0xc8
-/* 35EDC 8005AADC 2406000C */  addiu     $a2, $zero, 0xc
-/* 35EE0 8005AAE0 0C05179C */  jal       set_background_size
-/* 35EE4 8005AAE4 24070014 */   addiu    $a3, $zero, 0x14
-.L8005AAE8:
-/* 35EE8 8005AAE8 3C04800B */  lui       $a0, %hi(gCameras)
-/* 35EEC 8005AAEC 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* 35EF0 8005AAF0 94820000 */  lhu       $v0, ($a0)
-/* 35EF4 8005AAF4 94830AB0 */  lhu       $v1, 0xab0($a0)
-/* 35EF8 8005AAF8 3C018007 */  lui       $at, %hi(gCurrentCameraID)
-/* 35EFC 8005AAFC AC207410 */  sw        $zero, %lo(gCurrentCameraID)($at)
-/* 35F00 8005AB00 34420002 */  ori       $v0, $v0, 2
-/* 35F04 8005AB04 A4820000 */  sh        $v0, ($a0)
-/* 35F08 8005AB08 94820558 */  lhu       $v0, 0x558($a0)
-/* 35F0C 8005AB0C 34630002 */  ori       $v1, $v1, 2
-/* 35F10 8005AB10 A4830AB0 */  sh        $v1, 0xab0($a0)
-/* 35F14 8005AB14 34420002 */  ori       $v0, $v0, 2
-/* 35F18 8005AB18 A4820558 */  sh        $v0, 0x558($a0)
-/* 35F1C 8005AB1C 94821008 */  lhu       $v0, 0x1008($a0)
-/* 35F20 8005AB20 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 35F24 8005AB24 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 35F28 8005AB28 34420002 */  ori       $v0, $v0, 2
-/* 35F2C 8005AB2C A4821008 */  sh        $v0, 0x1008($a0)
-/* 35F30 8005AB30 806300A8 */  lb        $v1, 0xa8($v1)
-/* 35F34 8005AB34 2402FFFF */  addiu     $v0, $zero, -1
-/* 35F38 8005AB38 14620008 */  bne       $v1, $v0, .L8005AB5C
-/* 35F3C 8005AB3C 240200A2 */   addiu    $v0, $zero, 0xa2
-/* 35F40 8005AB40 240200C8 */  addiu     $v0, $zero, 0xc8
-/* 35F44 8005AB44 AFA20010 */  sw        $v0, 0x10($sp)
-/* 35F48 8005AB48 0000202D */  daddu     $a0, $zero, $zero
-/* 35F4C 8005AB4C 2405000C */  addiu     $a1, $zero, 0xc
-/* 35F50 8005AB50 24060014 */  addiu     $a2, $zero, 0x14
-/* 35F54 8005AB54 08016ADC */  j         .L8005AB70
-/* 35F58 8005AB58 24070128 */   addiu    $a3, $zero, 0x128
-.L8005AB5C:
-/* 35F5C 8005AB5C AFA20010 */  sw        $v0, 0x10($sp)
-/* 35F60 8005AB60 0000202D */  daddu     $a0, $zero, $zero
-/* 35F64 8005AB64 2405001D */  addiu     $a1, $zero, 0x1d
-/* 35F68 8005AB68 2406001C */  addiu     $a2, $zero, 0x1c
-/* 35F6C 8005AB6C 24070106 */  addiu     $a3, $zero, 0x106
-.L8005AB70:
-/* 35F70 8005AB70 0C00B8C5 */  jal       set_cam_viewport
-/* 35F74 8005AB74 00000000 */   nop
-/* 35F78 8005AB78 0C039E4D */  jal       initialize_status_menu
-/* 35F7C 8005AB7C 00000000 */   nop
-/* 35F80 8005AB80 0000282D */  daddu     $a1, $zero, $zero
-/* 35F84 8005AB84 00A0302D */  daddu     $a2, $a1, $zero
-/* 35F88 8005AB88 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
-/* 35F8C 8005AB8C 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
-/* 35F90 8005AB90 8E030000 */  lw        $v1, ($s0)
-/* 35F94 8005AB94 240203E8 */  addiu     $v0, $zero, 0x3e8
-/* 35F98 8005AB98 A4620090 */  sh        $v0, 0x90($v1)
-/* 35F9C 8005AB9C A4620092 */  sh        $v0, 0x92($v1)
-/* 35FA0 8005ABA0 8E640010 */  lw        $a0, 0x10($s3)
-/* 35FA4 8005ABA4 0C0B0D74 */  jal       start_script_in_group
-/* 35FA8 8005ABA8 00A0382D */   daddu    $a3, $a1, $zero
-/* 35FAC 8005ABAC 8E030000 */  lw        $v1, ($s0)
-/* 35FB0 8005ABB0 8C420144 */  lw        $v0, 0x144($v0)
-/* 35FB4 8005ABB4 AC62006C */  sw        $v0, 0x6c($v1)
-/* 35FB8 8005ABB8 8FBF004C */  lw        $ra, 0x4c($sp)
-/* 35FBC 8005ABBC 8FB40048 */  lw        $s4, 0x48($sp)
-/* 35FC0 8005ABC0 8FB30044 */  lw        $s3, 0x44($sp)
-/* 35FC4 8005ABC4 8FB20040 */  lw        $s2, 0x40($sp)
-/* 35FC8 8005ABC8 8FB1003C */  lw        $s1, 0x3c($sp)
-/* 35FCC 8005ABCC 8FB00038 */  lw        $s0, 0x38($sp)
-/* 35FD0 8005ABD0 03E00008 */  jr        $ra
-/* 35FD4 8005ABD4 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s b/asm/nonmatchings/code_341d0_len_20d0/play_effect.s
deleted file mode 100644
index 5cf072e2dc..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s
+++ /dev/null
@@ -1,101 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel play_effect
-/* 35964 8005A564 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 35968 8005A568 AFB20020 */  sw        $s2, 0x20($sp)
-/* 3596C 8005A56C 0080902D */  daddu     $s2, $a0, $zero
-/* 35970 8005A570 3C038008 */  lui       $v1, 0x8008
-/* 35974 8005A574 2463F210 */  addiu     $v1, $v1, -0xdf0
-/* 35978 8005A578 00121040 */  sll       $v0, $s2, 1
-/* 3597C 8005A57C 00521021 */  addu      $v0, $v0, $s2
-/* 35980 8005A580 000210C0 */  sll       $v0, $v0, 3
-/* 35984 8005A584 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 35988 8005A588 00438821 */  addu      $s1, $v0, $v1
-/* 3598C 8005A58C 0000202D */  daddu     $a0, $zero, $zero
-/* 35990 8005A590 AFB00018 */  sw        $s0, 0x18($sp)
-/* 35994 8005A594 3C10800A */  lui       $s0, 0x800a
-/* 35998 8005A598 26104000 */  addiu     $s0, $s0, 0x4000
-/* 3599C 8005A59C AFBF0024 */  sw        $ra, 0x24($sp)
-.L8005A5A0:
-/* 359A0 8005A5A0 8E020000 */  lw        $v0, ($s0)
-/* 359A4 8005A5A4 30420001 */  andi      $v0, $v0, 1
-/* 359A8 8005A5A8 50400005 */  beql      $v0, $zero, .L8005A5C0
-/* 359AC 8005A5AC 24840001 */   addiu    $a0, $a0, 1
-/* 359B0 8005A5B0 8E020004 */  lw        $v0, 4($s0)
-/* 359B4 8005A5B4 10520006 */  beq       $v0, $s2, .L8005A5D0
-/* 359B8 8005A5B8 2882000F */   slti     $v0, $a0, 0xf
-/* 359BC 8005A5BC 24840001 */  addiu     $a0, $a0, 1
-.L8005A5C0:
-/* 359C0 8005A5C0 2882000F */  slti      $v0, $a0, 0xf
-/* 359C4 8005A5C4 1440FFF6 */  bnez      $v0, .L8005A5A0
-/* 359C8 8005A5C8 26100020 */   addiu    $s0, $s0, 0x20
-/* 359CC 8005A5CC 2882000F */  slti      $v0, $a0, 0xf
-.L8005A5D0:
-/* 359D0 8005A5D0 14400030 */  bnez      $v0, .L8005A694
-/* 359D4 8005A5D4 24020001 */   addiu    $v0, $zero, 1
-/* 359D8 8005A5D8 0000202D */  daddu     $a0, $zero, $zero
-/* 359DC 8005A5DC 3C10800A */  lui       $s0, 0x800a
-/* 359E0 8005A5E0 26104000 */  addiu     $s0, $s0, 0x4000
-.L8005A5E4:
-/* 359E4 8005A5E4 8E020000 */  lw        $v0, ($s0)
-/* 359E8 8005A5E8 30420001 */  andi      $v0, $v0, 1
-/* 359EC 8005A5EC 10400006 */  beqz      $v0, .L8005A608
-/* 359F0 8005A5F0 2882000F */   slti     $v0, $a0, 0xf
-/* 359F4 8005A5F4 24840001 */  addiu     $a0, $a0, 1
-/* 359F8 8005A5F8 2882000F */  slti      $v0, $a0, 0xf
-/* 359FC 8005A5FC 1440FFF9 */  bnez      $v0, .L8005A5E4
-/* 35A00 8005A600 26100020 */   addiu    $s0, $s0, 0x20
-/* 35A04 8005A604 2882000F */  slti      $v0, $a0, 0xf
-.L8005A608:
-/* 35A08 8005A608 14400003 */  bnez      $v0, .L8005A618
-/* 35A0C 8005A60C 3C0700FF */   lui      $a3, 0xff
-.L8005A610:
-/* 35A10 8005A610 08016984 */  j         .L8005A610
-/* 35A14 8005A614 00000000 */   nop      
-.L8005A618:
-/* 35A18 8005A618 34E7FFFF */  ori       $a3, $a3, 0xffff
-/* 35A1C 8005A61C 0000282D */  daddu     $a1, $zero, $zero
-/* 35A20 8005A620 2402FFFF */  addiu     $v0, $zero, -1
-/* 35A24 8005A624 3C038019 */  lui       $v1, 0x8019
-/* 35A28 8005A628 24637000 */  addiu     $v1, $v1, 0x7000
-/* 35A2C 8005A62C AFA20010 */  sw        $v0, 0x10($sp)
-/* 35A30 8005A630 AFA20014 */  sw        $v0, 0x14($sp)
-/* 35A34 8005A634 00041300 */  sll       $v0, $a0, 0xc
-/* 35A38 8005A638 00431021 */  addu      $v0, $v0, $v1
-/* 35A3C 8005A63C 8E26000C */  lw        $a2, 0xc($s1)
-/* 35A40 8005A640 0C0199E8 */  jal       osMapTLB
-/* 35A44 8005A644 00473824 */   and      $a3, $v0, $a3
-/* 35A48 8005A648 8E240004 */  lw        $a0, 4($s1)
-/* 35A4C 8005A64C 8E250008 */  lw        $a1, 8($s1)
-/* 35A50 8005A650 0C00A5CF */  jal       dma_copy
-/* 35A54 8005A654 8E26000C */   lw       $a2, 0xc($s1)
-/* 35A58 8005A658 8E220010 */  lw        $v0, 0x10($s1)
-/* 35A5C 8005A65C 5040000D */  beql      $v0, $zero, .L8005A694
-/* 35A60 8005A660 24020001 */   addiu    $v0, $zero, 1
-/* 35A64 8005A664 8E240014 */  lw        $a0, 0x14($s1)
-/* 35A68 8005A668 0C00AB0A */  jal       general_heap_malloc
-/* 35A6C 8005A66C 00822023 */   subu     $a0, $a0, $v0
-/* 35A70 8005A670 14400003 */  bnez      $v0, .L8005A680
-/* 35A74 8005A674 AE02001C */   sw       $v0, 0x1c($s0)
-.L8005A678:
-/* 35A78 8005A678 0801699E */  j         .L8005A678
-/* 35A7C 8005A67C 00000000 */   nop      
-.L8005A680:
-/* 35A80 8005A680 8E240010 */  lw        $a0, 0x10($s1)
-/* 35A84 8005A684 8E250014 */  lw        $a1, 0x14($s1)
-/* 35A88 8005A688 0C00A5CF */  jal       dma_copy
-/* 35A8C 8005A68C 8E06001C */   lw       $a2, 0x1c($s0)
-/* 35A90 8005A690 24020001 */  addiu     $v0, $zero, 1
-.L8005A694:
-/* 35A94 8005A694 0040182D */  daddu     $v1, $v0, $zero
-/* 35A98 8005A698 AE120004 */  sw        $s2, 4($s0)
-/* 35A9C 8005A69C AE000008 */  sw        $zero, 8($s0)
-/* 35AA0 8005A6A0 AE030000 */  sw        $v1, ($s0)
-/* 35AA4 8005A6A4 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 35AA8 8005A6A8 8FB20020 */  lw        $s2, 0x20($sp)
-/* 35AAC 8005A6AC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 35AB0 8005A6B0 8FB00018 */  lw        $s0, 0x18($sp)
-/* 35AB4 8005A6B4 03E00008 */  jr        $ra
-/* 35AB8 8005A6B8 27BD0028 */   addiu    $sp, $sp, 0x28
-/* 35ABC 8005A6BC 00000000 */  nop       
diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s b/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s
deleted file mode 100644
index 12613041d9..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel remove_all_effects
-/* 358E0 8005A4E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 358E4 8005A4E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 358E8 8005A4E8 0000902D */  daddu     $s2, $zero, $zero
-/* 358EC 8005A4EC AFB10014 */  sw        $s1, 0x14($sp)
-/* 358F0 8005A4F0 3C11800B */  lui       $s1, 0x800b
-/* 358F4 8005A4F4 26314398 */  addiu     $s1, $s1, 0x4398
-/* 358F8 8005A4F8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 358FC 8005A4FC AFB00010 */  sw        $s0, 0x10($sp)
-.L8005A500:
-/* 35900 8005A500 8E300000 */  lw        $s0, ($s1)
-/* 35904 8005A504 5200000E */  beql      $s0, $zero, .L8005A540
-/* 35908 8005A508 26520001 */   addiu    $s2, $s2, 1
-/* 3590C 8005A50C 8E020000 */  lw        $v0, ($s0)
-/* 35910 8005A510 30420004 */  andi      $v0, $v0, 4
-/* 35914 8005A514 5040000A */  beql      $v0, $zero, .L8005A540
-/* 35918 8005A518 26520001 */   addiu    $s2, $s2, 1
-/* 3591C 8005A51C 8E04000C */  lw        $a0, 0xc($s0)
-/* 35920 8005A520 10800003 */  beqz      $a0, .L8005A530
-/* 35924 8005A524 00000000 */   nop      
-/* 35928 8005A528 0C00AB1E */  jal       general_heap_free
-/* 3592C 8005A52C 00000000 */   nop      
-.L8005A530:
-/* 35930 8005A530 0C00AB1E */  jal       general_heap_free
-/* 35934 8005A534 0200202D */   daddu    $a0, $s0, $zero
-/* 35938 8005A538 AE200000 */  sw        $zero, ($s1)
-/* 3593C 8005A53C 26520001 */  addiu     $s2, $s2, 1
-.L8005A540:
-/* 35940 8005A540 2A420060 */  slti      $v0, $s2, 0x60
-/* 35944 8005A544 1440FFEE */  bnez      $v0, .L8005A500
-/* 35948 8005A548 26310004 */   addiu    $s1, $s1, 4
-/* 3594C 8005A54C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 35950 8005A550 8FB20018 */  lw        $s2, 0x18($sp)
-/* 35954 8005A554 8FB10014 */  lw        $s1, 0x14($sp)
-/* 35958 8005A558 8FB00010 */  lw        $s0, 0x10($sp)
-/* 3595C 8005A55C 03E00008 */  jr        $ra
-/* 35960 8005A560 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s b/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s
deleted file mode 100644
index e445cf8a4d..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel remove_effect
-/* 35850 8005A450 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 35854 8005A454 AFB10014 */  sw        $s1, 0x14($sp)
-/* 35858 8005A458 0080882D */  daddu     $s1, $a0, $zero
-/* 3585C 8005A45C AFB00010 */  sw        $s0, 0x10($sp)
-/* 35860 8005A460 0000802D */  daddu     $s0, $zero, $zero
-/* 35864 8005A464 3C03800B */  lui       $v1, 0x800b
-/* 35868 8005A468 24634398 */  addiu     $v1, $v1, 0x4398
-/* 3586C 8005A46C AFBF0018 */  sw        $ra, 0x18($sp)
-.L8005A470:
-/* 35870 8005A470 8C620000 */  lw        $v0, ($v1)
-/* 35874 8005A474 10510006 */  beq       $v0, $s1, .L8005A490
-/* 35878 8005A478 2A020060 */   slti     $v0, $s0, 0x60
-/* 3587C 8005A47C 26100001 */  addiu     $s0, $s0, 1
-/* 35880 8005A480 2A020060 */  slti      $v0, $s0, 0x60
-/* 35884 8005A484 1440FFFA */  bnez      $v0, .L8005A470
-/* 35888 8005A488 24630004 */   addiu    $v1, $v1, 4
-/* 3588C 8005A48C 2A020060 */  slti      $v0, $s0, 0x60
-.L8005A490:
-/* 35890 8005A490 14400003 */  bnez      $v0, .L8005A4A0
-/* 35894 8005A494 00000000 */   nop      
-.L8005A498:
-/* 35898 8005A498 08016926 */  j         .L8005A498
-/* 3589C 8005A49C 00000000 */   nop      
-.L8005A4A0:
-/* 358A0 8005A4A0 8E24000C */  lw        $a0, 0xc($s1)
-/* 358A4 8005A4A4 10800003 */  beqz      $a0, .L8005A4B4
-/* 358A8 8005A4A8 00000000 */   nop      
-/* 358AC 8005A4AC 0C00AB1E */  jal       general_heap_free
-/* 358B0 8005A4B0 00000000 */   nop      
-.L8005A4B4:
-/* 358B4 8005A4B4 0C00AB1E */  jal       general_heap_free
-/* 358B8 8005A4B8 0220202D */   daddu    $a0, $s1, $zero
-/* 358BC 8005A4BC 00101080 */  sll       $v0, $s0, 2
-/* 358C0 8005A4C0 3C01800B */  lui       $at, 0x800b
-/* 358C4 8005A4C4 00220821 */  addu      $at, $at, $v0
-/* 358C8 8005A4C8 AC204398 */  sw        $zero, 0x4398($at)
-/* 358CC 8005A4CC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 358D0 8005A4D0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 358D4 8005A4D4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 358D8 8005A4D8 03E00008 */  jr        $ra
-/* 358DC 8005A4DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s b/asm/nonmatchings/code_341d0_len_20d0/render_effects.s
deleted file mode 100644
index f0d191c036..0000000000
--- a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel render_effects
-/* 352F4 80059EF4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 352F8 80059EF8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 352FC 80059EFC 0000882D */  daddu     $s1, $zero, $zero
-/* 35300 80059F00 AFB00010 */  sw        $s0, 0x10($sp)
-/* 35304 80059F04 3C10800B */  lui       $s0, 0x800b
-/* 35308 80059F08 26104398 */  addiu     $s0, $s0, 0x4398
-/* 3530C 80059F0C AFBF0018 */  sw        $ra, 0x18($sp)
-.L80059F10:
-/* 35310 80059F10 8E040000 */  lw        $a0, ($s0)
-/* 35314 80059F14 50800017 */  beql      $a0, $zero, .L80059F74
-/* 35318 80059F18 26310001 */   addiu    $s1, $s1, 1
-/* 3531C 80059F1C 8C830000 */  lw        $v1, ($a0)
-/* 35320 80059F20 30620001 */  andi      $v0, $v1, 1
-/* 35324 80059F24 50400013 */  beql      $v0, $zero, .L80059F74
-/* 35328 80059F28 26310001 */   addiu    $s1, $s1, 1
-/* 3532C 80059F2C 30620008 */  andi      $v0, $v1, 8
-/* 35330 80059F30 50400010 */  beql      $v0, $zero, .L80059F74
-/* 35334 80059F34 26310001 */   addiu    $s1, $s1, 1
-/* 35338 80059F38 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 3533C 80059F3C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 35340 80059F40 80420070 */  lb        $v0, 0x70($v0)
-/* 35344 80059F44 10400005 */  beqz      $v0, .L80059F5C
-/* 35348 80059F48 30620004 */   andi     $v0, $v1, 4
-/* 3534C 80059F4C 50400009 */  beql      $v0, $zero, .L80059F74
-/* 35350 80059F50 26310001 */   addiu    $s1, $s1, 1
-/* 35354 80059F54 080167D9 */  j         .L80059F64
-/* 35358 80059F58 00000000 */   nop      
-.L80059F5C:
-/* 3535C 80059F5C 54400005 */  bnel      $v0, $zero, .L80059F74
-/* 35360 80059F60 26310001 */   addiu    $s1, $s1, 1
-.L80059F64:
-/* 35364 80059F64 8C820010 */  lw        $v0, 0x10($a0)
-/* 35368 80059F68 8C420014 */  lw        $v0, 0x14($v0)
-/* 3536C 80059F6C 0040F809 */  jalr      $v0
-/* 35370 80059F70 26310001 */   addiu    $s1, $s1, 1
-.L80059F74:
-/* 35374 80059F74 2A220060 */  slti      $v0, $s1, 0x60
-/* 35378 80059F78 1440FFE5 */  bnez      $v0, .L80059F10
-/* 3537C 80059F7C 26100004 */   addiu    $s0, $s0, 4
-/* 35380 80059F80 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 35384 80059F84 8FB10014 */  lw        $s1, 0x14($sp)
-/* 35388 80059F88 8FB00010 */  lw        $s0, 0x10($sp)
-/* 3538C 80059F8C 03E00008 */  jr        $ra
-/* 35390 80059F90 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s
deleted file mode 100644
index bafb271ef5..0000000000
--- a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel CreatePushBlockGrid
-/* 7E4160 802832E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 7E4164 802832E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4168 802832E8 0080882D */  daddu     $s1, $a0, $zero
-/* 7E416C 802832EC AFBF0034 */  sw        $ra, 0x34($sp)
-/* 7E4170 802832F0 AFBE0030 */  sw        $fp, 0x30($sp)
-/* 7E4174 802832F4 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 7E4178 802832F8 AFB60028 */  sw        $s6, 0x28($sp)
-/* 7E417C 802832FC AFB50024 */  sw        $s5, 0x24($sp)
-/* 7E4180 80283300 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E4184 80283304 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4188 80283308 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E418C 8028330C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4190 80283310 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E4194 80283314 8E050000 */  lw        $a1, ($s0)
-/* 7E4198 80283318 0C0B1EAF */  jal       get_variable
-/* 7E419C 8028331C 26100004 */   addiu    $s0, $s0, 4
-/* 7E41A0 80283320 8E050000 */  lw        $a1, ($s0)
-/* 7E41A4 80283324 26100004 */  addiu     $s0, $s0, 4
-/* 7E41A8 80283328 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41AC 8028332C 0C0B1EAF */  jal       get_variable
-/* 7E41B0 80283330 0040902D */   daddu    $s2, $v0, $zero
-/* 7E41B4 80283334 8E050000 */  lw        $a1, ($s0)
-/* 7E41B8 80283338 26100004 */  addiu     $s0, $s0, 4
-/* 7E41BC 8028333C 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41C0 80283340 0C0B1EAF */  jal       get_variable
-/* 7E41C4 80283344 0040A82D */   daddu    $s5, $v0, $zero
-/* 7E41C8 80283348 8E050000 */  lw        $a1, ($s0)
-/* 7E41CC 8028334C 26100004 */  addiu     $s0, $s0, 4
-/* 7E41D0 80283350 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41D4 80283354 0C0B1EAF */  jal       get_variable
-/* 7E41D8 80283358 0040A02D */   daddu    $s4, $v0, $zero
-/* 7E41DC 8028335C 8E050000 */  lw        $a1, ($s0)
-/* 7E41E0 80283360 26100004 */  addiu     $s0, $s0, 4
-/* 7E41E4 80283364 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41E8 80283368 0C0B1EAF */  jal       get_variable
-/* 7E41EC 8028336C 0040F02D */   daddu    $fp, $v0, $zero
-/* 7E41F0 80283370 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41F4 80283374 8E050000 */  lw        $a1, ($s0)
-/* 7E41F8 80283378 0C0B1EAF */  jal       get_variable
-/* 7E41FC 8028337C 0040B82D */   daddu    $s7, $v0, $zero
-/* 7E4200 80283380 02B40018 */  mult      $s5, $s4
-/* 7E4204 80283384 26100004 */  addiu     $s0, $s0, 4
-/* 7E4208 80283388 0220202D */  daddu     $a0, $s1, $zero
-/* 7E420C 8028338C 8E050000 */  lw        $a1, ($s0)
-/* 7E4210 80283390 00008812 */  mflo      $s1
-/* 7E4214 80283394 0C0B1EAF */  jal       get_variable
-/* 7E4218 80283398 0040B02D */   daddu    $s6, $v0, $zero
-/* 7E421C 8028339C 2404001C */  addiu     $a0, $zero, 0x1c
-/* 7E4220 802833A0 0C00AB0A */  jal       general_heap_malloc
-/* 7E4224 802833A4 0040982D */   daddu    $s3, $v0, $zero
-/* 7E4228 802833A8 00129080 */  sll       $s2, $s2, 2
-/* 7E422C 802833AC 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4230 802833B0 3C01802E */  lui       $at, 0x802e
-/* 7E4234 802833B4 00320821 */  addu      $at, $at, $s2
-/* 7E4238 802833B8 AC30BC88 */  sw        $s0, -0x4378($at)
-/* 7E423C 802833BC 0C00AB0A */  jal       general_heap_malloc
-/* 7E4240 802833C0 0220202D */   daddu    $a0, $s1, $zero
-/* 7E4244 802833C4 1660000D */  bnez      $s3, .L802833FC
-/* 7E4248 802833C8 AE020000 */   sw       $v0, ($s0)
-/* 7E424C 802833CC 1A200018 */  blez      $s1, .L80283430
-/* 7E4250 802833D0 0000282D */   daddu    $a1, $zero, $zero
-/* 7E4254 802833D4 0220202D */  daddu     $a0, $s1, $zero
-.L802833D8:
-/* 7E4258 802833D8 8E020000 */  lw        $v0, ($s0)
-/* 7E425C 802833DC 00451021 */  addu      $v0, $v0, $a1
-/* 7E4260 802833E0 24A50001 */  addiu     $a1, $a1, 1
-/* 7E4264 802833E4 A0400000 */  sb        $zero, ($v0)
-/* 7E4268 802833E8 00A4102A */  slt       $v0, $a1, $a0
-/* 7E426C 802833EC 1440FFFA */  bnez      $v0, .L802833D8
-/* 7E4270 802833F0 00000000 */   nop      
-/* 7E4274 802833F4 080A0D0D */  j         .L80283434
-/* 7E4278 802833F8 A2150004 */   sb       $s5, 4($s0)
-.L802833FC:
-/* 7E427C 802833FC 0000282D */  daddu     $a1, $zero, $zero
-/* 7E4280 80283400 1A20000B */  blez      $s1, .L80283430
-/* 7E4284 80283404 0260302D */   daddu    $a2, $s3, $zero
-/* 7E4288 80283408 0220202D */  daddu     $a0, $s1, $zero
-/* 7E428C 8028340C 00C51021 */  addu      $v0, $a2, $a1
-.L80283410:
-/* 7E4290 80283410 8E030000 */  lw        $v1, ($s0)
-/* 7E4294 80283414 90420000 */  lbu       $v0, ($v0)
-/* 7E4298 80283418 00651821 */  addu      $v1, $v1, $a1
-/* 7E429C 8028341C 24A50001 */  addiu     $a1, $a1, 1
-/* 7E42A0 80283420 A0620000 */  sb        $v0, ($v1)
-/* 7E42A4 80283424 00A4102A */  slt       $v0, $a1, $a0
-/* 7E42A8 80283428 1440FFF9 */  bnez      $v0, .L80283410
-/* 7E42AC 8028342C 00C51021 */   addu     $v0, $a2, $a1
-.L80283430:
-/* 7E42B0 80283430 A2150004 */  sb        $s5, 4($s0)
-.L80283434:
-/* 7E42B4 80283434 A2140005 */  sb        $s4, 5($s0)
-/* 7E42B8 80283438 AE1E0008 */  sw        $fp, 8($s0)
-/* 7E42BC 8028343C AE17000C */  sw        $s7, 0xc($s0)
-/* 7E42C0 80283440 AE160010 */  sw        $s6, 0x10($s0)
-/* 7E42C4 80283444 AE000014 */  sw        $zero, 0x14($s0)
-/* 7E42C8 80283448 8FBF0034 */  lw        $ra, 0x34($sp)
-/* 7E42CC 8028344C 8FBE0030 */  lw        $fp, 0x30($sp)
-/* 7E42D0 80283450 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 7E42D4 80283454 8FB60028 */  lw        $s6, 0x28($sp)
-/* 7E42D8 80283458 8FB50024 */  lw        $s5, 0x24($sp)
-/* 7E42DC 8028345C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E42E0 80283460 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E42E4 80283464 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E42E8 80283468 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E42EC 8028346C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E42F0 80283470 24020002 */  addiu     $v0, $zero, 2
-/* 7E42F4 80283474 03E00008 */  jr        $ra
-/* 7E42F8 80283478 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s
deleted file mode 100644
index 659b71eac8..0000000000
--- a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel GetGridIndexFromPos
-/* 7E4538 802836B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E453C 802836BC AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4540 802836C0 0080982D */  daddu     $s3, $a0, $zero
-/* 7E4544 802836C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E4548 802836C8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E454C 802836CC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4550 802836D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4554 802836D4 8E70000C */  lw        $s0, 0xc($s3)
-/* 7E4558 802836D8 8E050000 */  lw        $a1, ($s0)
-/* 7E455C 802836DC 0C0B1EAF */  jal       get_variable
-/* 7E4560 802836E0 26100004 */   addiu    $s0, $s0, 4
-/* 7E4564 802836E4 8E050000 */  lw        $a1, ($s0)
-/* 7E4568 802836E8 26100004 */  addiu     $s0, $s0, 4
-/* 7E456C 802836EC 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4570 802836F0 0C0B1EAF */  jal       get_variable
-/* 7E4574 802836F4 0040882D */   daddu    $s1, $v0, $zero
-/* 7E4578 802836F8 0040902D */  daddu     $s2, $v0, $zero
-/* 7E457C 802836FC 8E050000 */  lw        $a1, ($s0)
-/* 7E4580 80283700 26100004 */  addiu     $s0, $s0, 4
-/* 7E4584 80283704 0C0B1EAF */  jal       get_variable
-/* 7E4588 80283708 0260202D */   daddu    $a0, $s3, $zero
-/* 7E458C 8028370C 8E050000 */  lw        $a1, ($s0)
-/* 7E4590 80283710 0C0B1EAF */  jal       get_variable
-/* 7E4594 80283714 0260202D */   daddu    $a0, $s3, $zero
-/* 7E4598 80283718 00118880 */  sll       $s1, $s1, 2
-/* 7E459C 8028371C 3C04802E */  lui       $a0, 0x802e
-/* 7E45A0 80283720 00912021 */  addu      $a0, $a0, $s1
-/* 7E45A4 80283724 8C84BC88 */  lw        $a0, -0x4378($a0)
-/* 7E45A8 80283728 3C0651EB */  lui       $a2, 0x51eb
-/* 7E45AC 8028372C 8C830008 */  lw        $v1, 8($a0)
-/* 7E45B0 80283730 34C6851F */  ori       $a2, $a2, 0x851f
-/* 7E45B4 80283734 02439023 */  subu      $s2, $s2, $v1
-/* 7E45B8 80283738 02460018 */  mult      $s2, $a2
-/* 7E45BC 8028373C 26100004 */  addiu     $s0, $s0, 4
-/* 7E45C0 80283740 8E050000 */  lw        $a1, ($s0)
-/* 7E45C4 80283744 8E100004 */  lw        $s0, 4($s0)
-/* 7E45C8 80283748 8C830010 */  lw        $v1, 0x10($a0)
-/* 7E45CC 8028374C 00003810 */  mfhi      $a3
-/* 7E45D0 80283750 0260202D */  daddu     $a0, $s3, $zero
-/* 7E45D4 80283754 00431023 */  subu      $v0, $v0, $v1
-/* 7E45D8 80283758 00460018 */  mult      $v0, $a2
-/* 7E45DC 8028375C 001297C3 */  sra       $s2, $s2, 0x1f
-/* 7E45E0 80283760 000730C3 */  sra       $a2, $a3, 3
-/* 7E45E4 80283764 00D23023 */  subu      $a2, $a2, $s2
-/* 7E45E8 80283768 000217C3 */  sra       $v0, $v0, 0x1f
-/* 7E45EC 8028376C 00001810 */  mfhi      $v1
-/* 7E45F0 80283770 000388C3 */  sra       $s1, $v1, 3
-/* 7E45F4 80283774 0C0B2026 */  jal       set_variable
-/* 7E45F8 80283778 02228823 */   subu     $s1, $s1, $v0
-/* 7E45FC 8028377C 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4600 80283780 0200282D */  daddu     $a1, $s0, $zero
-/* 7E4604 80283784 0C0B2026 */  jal       set_variable
-/* 7E4608 80283788 0220302D */   daddu    $a2, $s1, $zero
-/* 7E460C 8028378C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E4610 80283790 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4614 80283794 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4618 80283798 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E461C 8028379C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4620 802837A0 24020002 */  addiu     $v0, $zero, 2
-/* 7E4624 802837A4 03E00008 */  jr        $ra
-/* 7E4628 802837A8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7E3700/GetPushBlock.s b/asm/nonmatchings/code_7E3700/GetPushBlock.s
deleted file mode 100644
index a977ae3e7f..0000000000
--- a/asm/nonmatchings/code_7E3700/GetPushBlock.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel GetPushBlock
-/* 7E4440 802835C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E4444 802835C4 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E4448 802835C8 0080A02D */  daddu     $s4, $a0, $zero
-/* 7E444C 802835CC AFBF0024 */  sw        $ra, 0x24($sp)
-/* 7E4450 802835D0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4454 802835D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E4458 802835D8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E445C 802835DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4460 802835E0 8E90000C */  lw        $s0, 0xc($s4)
-/* 7E4464 802835E4 8E050000 */  lw        $a1, ($s0)
-/* 7E4468 802835E8 0C0B1EAF */  jal       get_variable
-/* 7E446C 802835EC 26100004 */   addiu    $s0, $s0, 4
-/* 7E4470 802835F0 8E050000 */  lw        $a1, ($s0)
-/* 7E4474 802835F4 26100004 */  addiu     $s0, $s0, 4
-/* 7E4478 802835F8 0280202D */  daddu     $a0, $s4, $zero
-/* 7E447C 802835FC 0C0B1EAF */  jal       get_variable
-/* 7E4480 80283600 0040882D */   daddu    $s1, $v0, $zero
-/* 7E4484 80283604 0280202D */  daddu     $a0, $s4, $zero
-/* 7E4488 80283608 8E050000 */  lw        $a1, ($s0)
-/* 7E448C 8028360C 0C0B1EAF */  jal       get_variable
-/* 7E4490 80283610 0040982D */   daddu    $s3, $v0, $zero
-/* 7E4494 80283614 00118880 */  sll       $s1, $s1, 2
-/* 7E4498 80283618 26100004 */  addiu     $s0, $s0, 4
-/* 7E449C 8028361C 3C12802E */  lui       $s2, 0x802e
-/* 7E44A0 80283620 02519021 */  addu      $s2, $s2, $s1
-/* 7E44A4 80283624 8E52BC88 */  lw        $s2, -0x4378($s2)
-/* 7E44A8 80283628 92430004 */  lbu       $v1, 4($s2)
-/* 7E44AC 8028362C 8E100000 */  lw        $s0, ($s0)
-/* 7E44B0 80283630 0263182A */  slt       $v1, $s3, $v1
-/* 7E44B4 80283634 10600009 */  beqz      $v1, .L8028365C
-/* 7E44B8 80283638 0040882D */   daddu    $s1, $v0, $zero
-/* 7E44BC 8028363C 06600008 */  bltz      $s3, .L80283660
-/* 7E44C0 80283640 0280202D */   daddu    $a0, $s4, $zero
-/* 7E44C4 80283644 92420005 */  lbu       $v0, 5($s2)
-/* 7E44C8 80283648 0222102A */  slt       $v0, $s1, $v0
-/* 7E44CC 8028364C 10400005 */  beqz      $v0, .L80283664
-/* 7E44D0 80283650 0200282D */   daddu    $a1, $s0, $zero
-/* 7E44D4 80283654 06210005 */  bgez      $s1, .L8028366C
-/* 7E44D8 80283658 00000000 */   nop      
-.L8028365C:
-/* 7E44DC 8028365C 0280202D */  daddu     $a0, $s4, $zero
-.L80283660:
-/* 7E44E0 80283660 0200282D */  daddu     $a1, $s0, $zero
-.L80283664:
-/* 7E44E4 80283664 0C0B2026 */  jal       set_variable
-/* 7E44E8 80283668 24060003 */   addiu    $a2, $zero, 3
-.L8028366C:
-/* 7E44EC 8028366C 92420004 */  lbu       $v0, 4($s2)
-/* 7E44F0 80283670 02220018 */  mult      $s1, $v0
-/* 7E44F4 80283674 0280202D */  daddu     $a0, $s4, $zero
-/* 7E44F8 80283678 8E420000 */  lw        $v0, ($s2)
-/* 7E44FC 8028367C 00003812 */  mflo      $a3
-/* 7E4500 80283680 02671821 */  addu      $v1, $s3, $a3
-/* 7E4504 80283684 00431021 */  addu      $v0, $v0, $v1
-/* 7E4508 80283688 90460000 */  lbu       $a2, ($v0)
-/* 7E450C 8028368C 0C0B2026 */  jal       set_variable
-/* 7E4510 80283690 0200282D */   daddu    $a1, $s0, $zero
-/* 7E4514 80283694 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 7E4518 80283698 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E451C 8028369C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4520 802836A0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4524 802836A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4528 802836A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E452C 802836AC 24020002 */  addiu     $v0, $zero, 2
-/* 7E4530 802836B0 03E00008 */  jr        $ra
-/* 7E4534 802836B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7E3700/SetPushBlock.s b/asm/nonmatchings/code_7E3700/SetPushBlock.s
deleted file mode 100644
index 6be07e2913..0000000000
--- a/asm/nonmatchings/code_7E3700/SetPushBlock.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetPushBlock
-/* 7E42FC 8028347C 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 7E4300 80283480 AFB30034 */  sw        $s3, 0x34($sp)
-/* 7E4304 80283484 0080982D */  daddu     $s3, $a0, $zero
-/* 7E4308 80283488 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 7E430C 8028348C AFB20030 */  sw        $s2, 0x30($sp)
-/* 7E4310 80283490 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 7E4314 80283494 AFB00028 */  sw        $s0, 0x28($sp)
-/* 7E4318 80283498 8E70000C */  lw        $s0, 0xc($s3)
-/* 7E431C 8028349C 8E050000 */  lw        $a1, ($s0)
-/* 7E4320 802834A0 0C0B1EAF */  jal       get_variable
-/* 7E4324 802834A4 26100004 */   addiu    $s0, $s0, 4
-/* 7E4328 802834A8 8E050000 */  lw        $a1, ($s0)
-/* 7E432C 802834AC 26100004 */  addiu     $s0, $s0, 4
-/* 7E4330 802834B0 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4334 802834B4 0C0B1EAF */  jal       get_variable
-/* 7E4338 802834B8 0040882D */   daddu    $s1, $v0, $zero
-/* 7E433C 802834BC 8E050000 */  lw        $a1, ($s0)
-/* 7E4340 802834C0 26100004 */  addiu     $s0, $s0, 4
-/* 7E4344 802834C4 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4348 802834C8 0C0B1EAF */  jal       get_variable
-/* 7E434C 802834CC 0040902D */   daddu    $s2, $v0, $zero
-/* 7E4350 802834D0 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4354 802834D4 8E050000 */  lw        $a1, ($s0)
-/* 7E4358 802834D8 0C0B1EAF */  jal       get_variable
-/* 7E435C 802834DC 0040802D */   daddu    $s0, $v0, $zero
-/* 7E4360 802834E0 00118880 */  sll       $s1, $s1, 2
-/* 7E4364 802834E4 3C01802E */  lui       $at, 0x802e
-/* 7E4368 802834E8 00310821 */  addu      $at, $at, $s1
-/* 7E436C 802834EC 8C31BC88 */  lw        $s1, -0x4378($at)
-/* 7E4370 802834F0 92230004 */  lbu       $v1, 4($s1)
-/* 7E4374 802834F4 02030018 */  mult      $s0, $v1
-/* 7E4378 802834F8 8E230000 */  lw        $v1, ($s1)
-/* 7E437C 802834FC 00004012 */  mflo      $t0
-/* 7E4380 80283500 02482021 */  addu      $a0, $s2, $t0
-/* 7E4384 80283504 00641821 */  addu      $v1, $v1, $a0
-/* 7E4388 80283508 A0620000 */  sb        $v0, ($v1)
-/* 7E438C 8028350C 24030001 */  addiu     $v1, $zero, 1
-/* 7E4390 80283510 14430023 */  bne       $v0, $v1, .L802835A0
-/* 7E4394 80283514 3C028000 */   lui      $v0, 0x8000
-/* 7E4398 80283518 3C04802F */  lui       $a0, 0x802f
-/* 7E439C 8028351C 2484A2BC */  addiu     $a0, $a0, -0x5d44
-/* 7E43A0 80283520 8E250008 */  lw        $a1, 8($s1)
-/* 7E43A4 80283524 8E26000C */  lw        $a2, 0xc($s1)
-/* 7E43A8 80283528 8E270010 */  lw        $a3, 0x10($s1)
-/* 7E43AC 8028352C AFA20020 */  sw        $v0, 0x20($sp)
-/* 7E43B0 80283530 00721004 */  sllv      $v0, $s2, $v1
-/* 7E43B4 80283534 00521021 */  addu      $v0, $v0, $s2
-/* 7E43B8 80283538 000210C0 */  sll       $v0, $v0, 3
-/* 7E43BC 8028353C 00521021 */  addu      $v0, $v0, $s2
-/* 7E43C0 80283540 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E43C4 80283544 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E43C8 80283548 AFA00018 */  sw        $zero, 0x18($sp)
-/* 7E43CC 8028354C AFA0001C */  sw        $zero, 0x1c($sp)
-/* 7E43D0 80283550 00A22821 */  addu      $a1, $a1, $v0
-/* 7E43D4 80283554 24A5000C */  addiu     $a1, $a1, 0xc
-/* 7E43D8 80283558 00701004 */  sllv      $v0, $s0, $v1
-/* 7E43DC 8028355C 00501021 */  addu      $v0, $v0, $s0
-/* 7E43E0 80283560 000210C0 */  sll       $v0, $v0, 3
-/* 7E43E4 80283564 00501021 */  addu      $v0, $v0, $s0
-/* 7E43E8 80283568 00E23821 */  addu      $a3, $a3, $v0
-/* 7E43EC 8028356C 0C044631 */  jal       create_entity
-/* 7E43F0 80283570 24E7000C */   addiu    $a3, $a3, 0xc
-/* 7E43F4 80283574 3C048028 */  lui       $a0, 0x8028
-/* 7E43F8 80283578 24845674 */  addiu     $a0, $a0, 0x5674
-/* 7E43FC 8028357C 24050040 */  addiu     $a1, $zero, 0x40
-/* 7E4400 80283580 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4404 80283584 26064000 */  addiu     $a2, $s0, 0x4000
-/* 7E4408 80283588 0220382D */  daddu     $a3, $s1, $zero
-/* 7E440C 8028358C 24020003 */  addiu     $v0, $zero, 3
-/* 7E4410 80283590 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4414 80283594 0C0B10AA */  jal       bind_trigger_1
-/* 7E4418 80283598 AFA20014 */   sw       $v0, 0x14($sp)
-/* 7E441C 8028359C AE700084 */  sw        $s0, 0x84($s3)
-.L802835A0:
-/* 7E4420 802835A0 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 7E4424 802835A4 8FB30034 */  lw        $s3, 0x34($sp)
-/* 7E4428 802835A8 8FB20030 */  lw        $s2, 0x30($sp)
-/* 7E442C 802835AC 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 7E4430 802835B0 8FB00028 */  lw        $s0, 0x28($sp)
-/* 7E4434 802835B4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4438 802835B8 03E00008 */  jr        $ra
-/* 7E443C 802835BC 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s
deleted file mode 100644
index 2060f0f909..0000000000
--- a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetPushBlockFallEffect
-/* 7E462C 802837AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E4630 802837B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4634 802837B4 0080882D */  daddu     $s1, $a0, $zero
-/* 7E4638 802837B8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E463C 802837BC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4640 802837C0 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E4644 802837C4 8E050000 */  lw        $a1, ($s0)
-/* 7E4648 802837C8 0C0B1EAF */  jal       get_variable
-/* 7E464C 802837CC 26100004 */   addiu    $s0, $s0, 4
-/* 7E4650 802837D0 0220202D */  daddu     $a0, $s1, $zero
-/* 7E4654 802837D4 8E050000 */  lw        $a1, ($s0)
-/* 7E4658 802837D8 0C0B1EAF */  jal       get_variable
-/* 7E465C 802837DC 0040802D */   daddu    $s0, $v0, $zero
-/* 7E4660 802837E0 00108080 */  sll       $s0, $s0, 2
-/* 7E4664 802837E4 3C03802E */  lui       $v1, 0x802e
-/* 7E4668 802837E8 00701821 */  addu      $v1, $v1, $s0
-/* 7E466C 802837EC 8C63BC88 */  lw        $v1, -0x4378($v1)
-/* 7E4670 802837F0 AC620014 */  sw        $v0, 0x14($v1)
-/* 7E4674 802837F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E4678 802837F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E467C 802837FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4680 80283800 24020002 */  addiu     $v0, $zero, 2
-/* 7E4684 80283804 03E00008 */  jr        $ra
-/* 7E4688 80283808 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 7E468C 8028380C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
deleted file mode 100644
index 3af1e3c00a..0000000000
--- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel TeleportPartnerToPlayer
-/* 7E46FC 8028387C 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
-/* 7E4700 80283880 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
-/* 7E4704 80283884 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E4708 80283888 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E470C 8028388C 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 7E4710 80283890 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 7E4714 80283894 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E4718 80283898 0220902D */  daddu     $s2, $s1, $zero
-/* 7E471C 8028389C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E4720 802838A0 10400012 */  beqz      $v0, .L802838EC
-/* 7E4724 802838A4 AFB00010 */   sw       $s0, 0x10($sp)
-/* 7E4728 802838A8 0C00EABB */  jal       get_npc_unsafe
-/* 7E472C 802838AC 2404FFFC */   addiu    $a0, $zero, -4
-/* 7E4730 802838B0 C6200028 */  lwc1      $f0, 0x28($s1)
-/* 7E4734 802838B4 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4738 802838B8 E6000038 */  swc1      $f0, 0x38($s0)
-/* 7E473C 802838BC C6200030 */  lwc1      $f0, 0x30($s1)
-/* 7E4740 802838C0 0C03A969 */  jal       is_current_partner_flying
-/* 7E4744 802838C4 E6000040 */   swc1     $f0, 0x40($s0)
-/* 7E4748 802838C8 10400003 */  beqz      $v0, .L802838D8
-/* 7E474C 802838CC 00000000 */   nop      
-/* 7E4750 802838D0 C620002C */  lwc1      $f0, 0x2c($s1)
-/* 7E4754 802838D4 E600003C */  swc1      $f0, 0x3c($s0)
-.L802838D8:
-/* 7E4758 802838D8 8E450080 */  lw        $a1, 0x80($s2)
-/* 7E475C 802838DC 0C00ECD0 */  jal       set_npc_yaw
-/* 7E4760 802838E0 0200202D */   daddu    $a0, $s0, $zero
-/* 7E4764 802838E4 0C03BD17 */  jal       clear_partner_move_history
-/* 7E4768 802838E8 0200202D */   daddu    $a0, $s0, $zero
-.L802838EC:
-/* 7E476C 802838EC 24020002 */  addiu     $v0, $zero, 2
-/* 7E4770 802838F0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E4774 802838F4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4778 802838F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E477C 802838FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4780 80283900 03E00008 */  jr        $ra
-/* 7E4784 80283904 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80282880.s b/asm/nonmatchings/code_7E3700/func_80282880.s
deleted file mode 100644
index f06a66e3ff..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80282880.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282880
-/* 7E3700 80282880 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 7E3704 80282884 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 7E3708 80282888 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 7E370C 8028288C C4800084 */  lwc1      $f0, 0x84($a0)
-/* 7E3710 80282890 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3714 80282894 46020001 */  sub.s     $f0, $f0, $f2
-/* 7E3718 80282898 3C013F00 */  lui       $at, 0x3f00
-/* 7E371C 8028289C 44812000 */  mtc1      $at, $f4
-/* 7E3720 802828A0 00000000 */  nop       
-/* 7E3724 802828A4 46040002 */  mul.s     $f0, $f0, $f4
-/* 7E3728 802828A8 00000000 */  nop       
-/* 7E372C 802828AC 46001080 */  add.s     $f2, $f2, $f0
-/* 7E3730 802828B0 E4420028 */  swc1      $f2, 0x28($v0)
-/* 7E3734 802828B4 C4420030 */  lwc1      $f2, 0x30($v0)
-/* 7E3738 802828B8 C480008C */  lwc1      $f0, 0x8c($a0)
-/* 7E373C 802828BC 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3740 802828C0 46020001 */  sub.s     $f0, $f0, $f2
-/* 7E3744 802828C4 46040002 */  mul.s     $f0, $f0, $f4
-/* 7E3748 802828C8 00000000 */  nop       
-/* 7E374C 802828CC 46001080 */  add.s     $f2, $f2, $f0
-/* 7E3750 802828D0 E4420030 */  swc1      $f2, 0x30($v0)
-/* 7E3754 802828D4 03E00008 */  jr        $ra
-/* 7E3758 802828D8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/code_7E3700/func_802828DC.s b/asm/nonmatchings/code_7E3700/func_802828DC.s
deleted file mode 100644
index bf3521561b..0000000000
--- a/asm/nonmatchings/code_7E3700/func_802828DC.s
+++ /dev/null
@@ -1,224 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802828DC
-/* 7E375C 802828DC 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 7E3760 802828E0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E3764 802828E4 0080902D */  daddu     $s2, $a0, $zero
-/* 7E3768 802828E8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E376C 802828EC AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E3770 802828F0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E3774 802828F4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E3778 802828F8 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 7E377C 802828FC F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 7E3780 80282900 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 7E3784 80282904 8E4400B0 */  lw        $a0, 0xb0($s2)
-/* 7E3788 80282908 0C04417A */  jal       get_entity_by_index
-/* 7E378C 8028290C 00A0802D */   daddu    $s0, $a1, $zero
-/* 7E3790 80282910 3C138011 */  lui       $s3, %hi(gPlayerStatus)
-/* 7E3794 80282914 2673EFC8 */  addiu     $s3, $s3, %lo(gPlayerStatus)
-/* 7E3798 80282918 1200001A */  beqz      $s0, .L80282984
-/* 7E379C 8028291C 0040882D */   daddu    $s1, $v0, $zero
-/* 7E37A0 80282920 AE400070 */  sw        $zero, 0x70($s2)
-/* 7E37A4 80282924 C6600028 */  lwc1      $f0, 0x28($s3)
-/* 7E37A8 80282928 4600018D */  trunc.w.s $f6, $f0
-/* 7E37AC 8028292C E6460084 */  swc1      $f6, 0x84($s2)
-/* 7E37B0 80282930 C660002C */  lwc1      $f0, 0x2c($s3)
-/* 7E37B4 80282934 4600018D */  trunc.w.s $f6, $f0
-/* 7E37B8 80282938 E6460088 */  swc1      $f6, 0x88($s2)
-/* 7E37BC 8028293C C6600030 */  lwc1      $f0, 0x30($s3)
-/* 7E37C0 80282940 4600018D */  trunc.w.s $f6, $f0
-/* 7E37C4 80282944 E646008C */  swc1      $f6, 0x8c($s2)
-/* 7E37C8 80282948 C6200048 */  lwc1      $f0, 0x48($s1)
-/* 7E37CC 8028294C 4600018D */  trunc.w.s $f6, $f0
-/* 7E37D0 80282950 E6460090 */  swc1      $f6, 0x90($s2)
-/* 7E37D4 80282954 C620004C */  lwc1      $f0, 0x4c($s1)
-/* 7E37D8 80282958 4600018D */  trunc.w.s $f6, $f0
-/* 7E37DC 8028295C E6460094 */  swc1      $f6, 0x94($s2)
-/* 7E37E0 80282960 C6200050 */  lwc1      $f0, 0x50($s1)
-/* 7E37E4 80282964 4600018D */  trunc.w.s $f6, $f0
-/* 7E37E8 80282968 E6460098 */  swc1      $f6, 0x98($s2)
-/* 7E37EC 8028296C C6200060 */  lwc1      $f0, 0x60($s1)
-/* 7E37F0 80282970 4600018D */  trunc.w.s $f6, $f0
-/* 7E37F4 80282974 E64600A8 */  swc1      $f6, 0xa8($s2)
-/* 7E37F8 80282978 C6200068 */  lwc1      $f0, 0x68($s1)
-/* 7E37FC 8028297C 4600018D */  trunc.w.s $f6, $f0
-/* 7E3800 80282980 E64600B4 */  swc1      $f6, 0xb4($s2)
-.L80282984:
-/* 7E3804 80282984 8E420070 */  lw        $v0, 0x70($s2)
-/* 7E3808 80282988 00021080 */  sll       $v0, $v0, 2
-/* 7E380C 8028298C 3C018028 */  lui       $at, 0x8028
-/* 7E3810 80282990 00220821 */  addu      $at, $at, $v0
-/* 7E3814 80282994 C4245640 */  lwc1      $f4, 0x5640($at)
-/* 7E3818 80282998 C642009C */  lwc1      $f2, 0x9c($s2)
-/* 7E381C 8028299C 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E3820 802829A0 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E3824 802829A4 00000000 */  nop       
-/* 7E3828 802829A8 3C0141C8 */  lui       $at, 0x41c8
-/* 7E382C 802829AC 4481C000 */  mtc1      $at, $f24
-/* 7E3830 802829B0 00000000 */  nop       
-/* 7E3834 802829B4 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E3838 802829B8 00000000 */  nop       
-/* 7E383C 802829BC C6400084 */  lwc1      $f0, 0x84($s2)
-/* 7E3840 802829C0 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3844 802829C4 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3848 802829C8 E6600028 */  swc1      $f0, 0x28($s3)
-/* 7E384C 802829CC C64200A0 */  lwc1      $f2, 0xa0($s2)
-/* 7E3850 802829D0 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E3854 802829D4 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E3858 802829D8 00000000 */  nop       
-/* 7E385C 802829DC 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E3860 802829E0 00000000 */  nop       
-/* 7E3864 802829E4 C6400088 */  lwc1      $f0, 0x88($s2)
-/* 7E3868 802829E8 46800020 */  cvt.s.w   $f0, $f0
-/* 7E386C 802829EC 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3870 802829F0 E660002C */  swc1      $f0, 0x2c($s3)
-/* 7E3874 802829F4 C64200A4 */  lwc1      $f2, 0xa4($s2)
-/* 7E3878 802829F8 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E387C 802829FC 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E3880 80282A00 00000000 */  nop       
-/* 7E3884 80282A04 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E3888 80282A08 00000000 */  nop       
-/* 7E388C 80282A0C C640008C */  lwc1      $f0, 0x8c($s2)
-/* 7E3890 80282A10 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3894 80282A14 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3898 80282A18 E6600030 */  swc1      $f0, 0x30($s3)
-/* 7E389C 80282A1C C642009C */  lwc1      $f2, 0x9c($s2)
-/* 7E38A0 80282A20 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E38A4 80282A24 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E38A8 80282A28 00000000 */  nop       
-/* 7E38AC 80282A2C 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E38B0 80282A30 00000000 */  nop       
-/* 7E38B4 80282A34 C6400090 */  lwc1      $f0, 0x90($s2)
-/* 7E38B8 80282A38 46800020 */  cvt.s.w   $f0, $f0
-/* 7E38BC 80282A3C 46020000 */  add.s     $f0, $f0, $f2
-/* 7E38C0 80282A40 E6200048 */  swc1      $f0, 0x48($s1)
-/* 7E38C4 80282A44 C64200A0 */  lwc1      $f2, 0xa0($s2)
-/* 7E38C8 80282A48 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E38CC 80282A4C 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E38D0 80282A50 00000000 */  nop       
-/* 7E38D4 80282A54 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E38D8 80282A58 00000000 */  nop       
-/* 7E38DC 80282A5C C6400094 */  lwc1      $f0, 0x94($s2)
-/* 7E38E0 80282A60 46800020 */  cvt.s.w   $f0, $f0
-/* 7E38E4 80282A64 46020000 */  add.s     $f0, $f0, $f2
-/* 7E38E8 80282A68 E620004C */  swc1      $f0, 0x4c($s1)
-/* 7E38EC 80282A6C C64200A4 */  lwc1      $f2, 0xa4($s2)
-/* 7E38F0 80282A70 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E38F4 80282A74 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E38F8 80282A78 00000000 */  nop       
-/* 7E38FC 80282A7C 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E3900 80282A80 00000000 */  nop       
-/* 7E3904 80282A84 C6400098 */  lwc1      $f0, 0x98($s2)
-/* 7E3908 80282A88 46800020 */  cvt.s.w   $f0, $f0
-/* 7E390C 80282A8C 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3910 80282A90 E6200050 */  swc1      $f0, 0x50($s1)
-/* 7E3914 80282A94 8E420070 */  lw        $v0, 0x70($s2)
-/* 7E3918 80282A98 2842000C */  slti      $v0, $v0, 0xc
-/* 7E391C 80282A9C 1040004D */  beqz      $v0, .L80282BD4
-/* 7E3920 80282AA0 00000000 */   nop      
-/* 7E3924 80282AA4 C642009C */  lwc1      $f2, 0x9c($s2)
-/* 7E3928 80282AA8 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E392C 80282AAC 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E3930 80282AB0 00000000 */  nop       
-/* 7E3934 80282AB4 3C01C2B4 */  lui       $at, 0xc2b4
-/* 7E3938 80282AB8 44810000 */  mtc1      $at, $f0
-/* 7E393C 80282ABC 00000000 */  nop       
-/* 7E3940 80282AC0 46001082 */  mul.s     $f2, $f2, $f0
-/* 7E3944 80282AC4 00000000 */  nop       
-/* 7E3948 80282AC8 C64000B4 */  lwc1      $f0, 0xb4($s2)
-/* 7E394C 80282ACC 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3950 80282AD0 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3954 80282AD4 E6200068 */  swc1      $f0, 0x68($s1)
-/* 7E3958 80282AD8 C64200A4 */  lwc1      $f2, 0xa4($s2)
-/* 7E395C 80282ADC 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E3960 80282AE0 46041082 */  mul.s     $f2, $f2, $f4
-/* 7E3964 80282AE4 00000000 */  nop       
-/* 7E3968 80282AE8 3C0142B4 */  lui       $at, 0x42b4
-/* 7E396C 80282AEC 4481B000 */  mtc1      $at, $f22
-/* 7E3970 80282AF0 00000000 */  nop       
-/* 7E3974 80282AF4 46161082 */  mul.s     $f2, $f2, $f22
-/* 7E3978 80282AF8 00000000 */  nop       
-/* 7E397C 80282AFC 46162582 */  mul.s     $f22, $f4, $f22
-/* 7E3980 80282B00 00000000 */  nop       
-/* 7E3984 80282B04 C64000A8 */  lwc1      $f0, 0xa8($s2)
-/* 7E3988 80282B08 46800020 */  cvt.s.w   $f0, $f0
-/* 7E398C 80282B0C 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3990 80282B10 4600B306 */  mov.s     $f12, $f22
-/* 7E3994 80282B14 0C00A8BB */  jal       sin_deg
-/* 7E3998 80282B18 E6200060 */   swc1     $f0, 0x60($s1)
-/* 7E399C 80282B1C 46180002 */  mul.s     $f0, $f0, $f24
-/* 7E39A0 80282B20 00000000 */  nop       
-/* 7E39A4 80282B24 3C013FE0 */  lui       $at, 0x3fe0
-/* 7E39A8 80282B28 4481A800 */  mtc1      $at, $f21
-/* 7E39AC 80282B2C 4480A000 */  mtc1      $zero, $f20
-/* 7E39B0 80282B30 46000021 */  cvt.d.s   $f0, $f0
-/* 7E39B4 80282B34 46340002 */  mul.d     $f0, $f0, $f20
-/* 7E39B8 80282B38 00000000 */  nop       
-/* 7E39BC 80282B3C C622004C */  lwc1      $f2, 0x4c($s1)
-/* 7E39C0 80282B40 460010A1 */  cvt.d.s   $f2, $f2
-/* 7E39C4 80282B44 46201080 */  add.d     $f2, $f2, $f0
-/* 7E39C8 80282B48 4600B306 */  mov.s     $f12, $f22
-/* 7E39CC 80282B4C 462010A0 */  cvt.s.d   $f2, $f2
-/* 7E39D0 80282B50 0C00A8BB */  jal       sin_deg
-/* 7E39D4 80282B54 E622004C */   swc1     $f2, 0x4c($s1)
-/* 7E39D8 80282B58 C642009C */  lwc1      $f2, 0x9c($s2)
-/* 7E39DC 80282B5C 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E39E0 80282B60 46001082 */  mul.s     $f2, $f2, $f0
-/* 7E39E4 80282B64 00000000 */  nop       
-/* 7E39E8 80282B68 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E39EC 80282B6C 00000000 */  nop       
-/* 7E39F0 80282B70 460010A1 */  cvt.d.s   $f2, $f2
-/* 7E39F4 80282B74 46341082 */  mul.d     $f2, $f2, $f20
-/* 7E39F8 80282B78 00000000 */  nop       
-/* 7E39FC 80282B7C C6200048 */  lwc1      $f0, 0x48($s1)
-/* 7E3A00 80282B80 46000021 */  cvt.d.s   $f0, $f0
-/* 7E3A04 80282B84 46220001 */  sub.d     $f0, $f0, $f2
-/* 7E3A08 80282B88 4600B306 */  mov.s     $f12, $f22
-/* 7E3A0C 80282B8C 46200020 */  cvt.s.d   $f0, $f0
-/* 7E3A10 80282B90 0C00A8BB */  jal       sin_deg
-/* 7E3A14 80282B94 E6200048 */   swc1     $f0, 0x48($s1)
-/* 7E3A18 80282B98 C64200A4 */  lwc1      $f2, 0xa4($s2)
-/* 7E3A1C 80282B9C 468010A0 */  cvt.s.w   $f2, $f2
-/* 7E3A20 80282BA0 46001082 */  mul.s     $f2, $f2, $f0
-/* 7E3A24 80282BA4 00000000 */  nop       
-/* 7E3A28 80282BA8 46181082 */  mul.s     $f2, $f2, $f24
-/* 7E3A2C 80282BAC 00000000 */  nop       
-/* 7E3A30 80282BB0 460010A1 */  cvt.d.s   $f2, $f2
-/* 7E3A34 80282BB4 46341082 */  mul.d     $f2, $f2, $f20
-/* 7E3A38 80282BB8 00000000 */  nop       
-/* 7E3A3C 80282BBC C6200050 */  lwc1      $f0, 0x50($s1)
-/* 7E3A40 80282BC0 46000021 */  cvt.d.s   $f0, $f0
-/* 7E3A44 80282BC4 46220001 */  sub.d     $f0, $f0, $f2
-/* 7E3A48 80282BC8 46200020 */  cvt.s.d   $f0, $f0
-/* 7E3A4C 80282BCC 080A0AF9 */  j         .L80282BE4
-/* 7E3A50 80282BD0 E6200050 */   swc1     $f0, 0x50($s1)
-.L80282BD4:
-/* 7E3A54 80282BD4 44800000 */  mtc1      $zero, $f0
-/* 7E3A58 80282BD8 00000000 */  nop       
-/* 7E3A5C 80282BDC E6200060 */  swc1      $f0, 0x60($s1)
-/* 7E3A60 80282BE0 E6200068 */  swc1      $f0, 0x68($s1)
-.L80282BE4:
-/* 7E3A64 80282BE4 C6600028 */  lwc1      $f0, 0x28($s3)
-/* 7E3A68 80282BE8 C662002C */  lwc1      $f2, 0x2c($s3)
-/* 7E3A6C 80282BEC C6640030 */  lwc1      $f4, 0x30($s3)
-/* 7E3A70 80282BF0 3C02800B */  lui       $v0, %hi(gCameras)
-/* 7E3A74 80282BF4 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* 7E3A78 80282BF8 E4400060 */  swc1      $f0, 0x60($v0)
-/* 7E3A7C 80282BFC E4420064 */  swc1      $f2, 0x64($v0)
-/* 7E3A80 80282C00 E4440068 */  swc1      $f4, 0x68($v0)
-/* 7E3A84 80282C04 8E430070 */  lw        $v1, 0x70($s2)
-/* 7E3A88 80282C08 24630001 */  addiu     $v1, $v1, 1
-/* 7E3A8C 80282C0C 3862000D */  xori      $v0, $v1, 0xd
-/* 7E3A90 80282C10 AE430070 */  sw        $v1, 0x70($s2)
-/* 7E3A94 80282C14 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E3A98 80282C18 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E3A9C 80282C1C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E3AA0 80282C20 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3AA4 80282C24 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3AA8 80282C28 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 7E3AAC 80282C2C D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 7E3AB0 80282C30 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 7E3AB4 80282C34 2C420001 */  sltiu     $v0, $v0, 1
-/* 7E3AB8 80282C38 03E00008 */  jr        $ra
-/* 7E3ABC 80282C3C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/code_7E3700/func_80282C40.s b/asm/nonmatchings/code_7E3700/func_80282C40.s
deleted file mode 100644
index 23ea3d1d15..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80282C40.s
+++ /dev/null
@@ -1,133 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282C40
-/* 7E3AC0 80282C40 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 7E3AC4 80282C44 AFB30034 */  sw        $s3, 0x34($sp)
-/* 7E3AC8 80282C48 0080982D */  daddu     $s3, $a0, $zero
-/* 7E3ACC 80282C4C AFB00028 */  sw        $s0, 0x28($sp)
-/* 7E3AD0 80282C50 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 7E3AD4 80282C54 AFB20030 */  sw        $s2, 0x30($sp)
-/* 7E3AD8 80282C58 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 7E3ADC 80282C5C 8E6400B0 */  lw        $a0, 0xb0($s3)
-/* 7E3AE0 80282C60 8E7200AC */  lw        $s2, 0xac($s3)
-/* 7E3AE4 80282C64 0C04417A */  jal       get_entity_by_index
-/* 7E3AE8 80282C68 00A0802D */   daddu    $s0, $a1, $zero
-/* 7E3AEC 80282C6C 12000023 */  beqz      $s0, .L80282CFC
-/* 7E3AF0 80282C70 0040882D */   daddu    $s1, $v0, $zero
-/* 7E3AF4 80282C74 0000202D */  daddu     $a0, $zero, $zero
-/* 7E3AF8 80282C78 27A50018 */  addiu     $a1, $sp, 0x18
-/* 7E3AFC 80282C7C 27A20024 */  addiu     $v0, $sp, 0x24
-/* 7E3B00 80282C80 27A6001C */  addiu     $a2, $sp, 0x1c
-/* 7E3B04 80282C84 27A70020 */  addiu     $a3, $sp, 0x20
-/* 7E3B08 80282C88 AE600070 */  sw        $zero, 0x70($s3)
-/* 7E3B0C 80282C8C C620004C */  lwc1      $f0, 0x4c($s1)
-/* 7E3B10 80282C90 3C01420C */  lui       $at, 0x420c
-/* 7E3B14 80282C94 44811000 */  mtc1      $at, $f2
-/* 7E3B18 80282C98 4600020D */  trunc.w.s $f8, $f0
-/* 7E3B1C 80282C9C E6680084 */  swc1      $f8, 0x84($s3)
-/* 7E3B20 80282CA0 E7A20024 */  swc1      $f2, 0x24($sp)
-/* 7E3B24 80282CA4 C6260048 */  lwc1      $f6, 0x48($s1)
-/* 7E3B28 80282CA8 C620004C */  lwc1      $f0, 0x4c($s1)
-/* 7E3B2C 80282CAC 3C0140A0 */  lui       $at, 0x40a0
-/* 7E3B30 80282CB0 44811000 */  mtc1      $at, $f2
-/* 7E3B34 80282CB4 C6240050 */  lwc1      $f4, 0x50($s1)
-/* 7E3B38 80282CB8 46020000 */  add.s     $f0, $f0, $f2
-/* 7E3B3C 80282CBC E7A60018 */  swc1      $f6, 0x18($sp)
-/* 7E3B40 80282CC0 E7A40020 */  swc1      $f4, 0x20($sp)
-/* 7E3B44 80282CC4 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* 7E3B48 80282CC8 0C0372DF */  jal       func_800DCB7C
-/* 7E3B4C 80282CCC AFA20010 */   sw       $v0, 0x10($sp)
-/* 7E3B50 80282CD0 C7A20024 */  lwc1      $f2, 0x24($sp)
-/* 7E3B54 80282CD4 4600120D */  trunc.w.s $f8, $f2
-/* 7E3B58 80282CD8 10400008 */  beqz      $v0, .L80282CFC
-/* 7E3B5C 80282CDC E6680074 */   swc1     $f8, 0x74($s3)
-/* 7E3B60 80282CE0 3C0140C0 */  lui       $at, 0x40c0
-/* 7E3B64 80282CE4 44810000 */  mtc1      $at, $f0
-/* 7E3B68 80282CE8 00000000 */  nop       
-/* 7E3B6C 80282CEC 4600103E */  c.le.s    $f2, $f0
-/* 7E3B70 80282CF0 00000000 */  nop       
-/* 7E3B74 80282CF4 45010047 */  bc1t      .L80282E14
-/* 7E3B78 80282CF8 24020002 */   addiu    $v0, $zero, 2
-.L80282CFC:
-/* 7E3B7C 80282CFC 8E420014 */  lw        $v0, 0x14($s2)
-/* 7E3B80 80282D00 10400019 */  beqz      $v0, .L80282D68
-/* 7E3B84 80282D04 0220202D */   daddu    $a0, $s1, $zero
-/* 7E3B88 80282D08 0040F809 */  jalr      $v0
-/* 7E3B8C 80282D0C 0260282D */   daddu    $a1, $s3, $zero
-/* 7E3B90 80282D10 10400040 */  beqz      $v0, .L80282E14
-/* 7E3B94 80282D14 0000102D */   daddu    $v0, $zero, $zero
-/* 7E3B98 80282D18 C6460008 */  lwc1      $f6, 8($s2)
-/* 7E3B9C 80282D1C 468031A0 */  cvt.s.w   $f6, $f6
-/* 7E3BA0 80282D20 C6400010 */  lwc1      $f0, 0x10($s2)
-/* 7E3BA4 80282D24 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3BA8 80282D28 C6220050 */  lwc1      $f2, 0x50($s1)
-/* 7E3BAC 80282D2C 3C0141C8 */  lui       $at, 0x41c8
-/* 7E3BB0 80282D30 44812000 */  mtc1      $at, $f4
-/* 7E3BB4 80282D34 46001081 */  sub.s     $f2, $f2, $f0
-/* 7E3BB8 80282D38 C6200048 */  lwc1      $f0, 0x48($s1)
-/* 7E3BBC 80282D3C 92420004 */  lbu       $v0, 4($s2)
-/* 7E3BC0 80282D40 46060001 */  sub.s     $f0, $f0, $f6
-/* 7E3BC4 80282D44 46041083 */  div.s     $f2, $f2, $f4
-/* 7E3BC8 80282D48 4600120D */  trunc.w.s $f8, $f2
-/* 7E3BCC 80282D4C 44034000 */  mfc1      $v1, $f8
-/* 7E3BD0 80282D50 00000000 */  nop       
-/* 7E3BD4 80282D54 00620018 */  mult      $v1, $v0
-/* 7E3BD8 80282D58 24020001 */  addiu     $v0, $zero, 1
-/* 7E3BDC 80282D5C 8E430000 */  lw        $v1, ($s2)
-/* 7E3BE0 80282D60 080A0B7D */  j         .L80282DF4
-/* 7E3BE4 80282D64 46040003 */   div.s    $f0, $f0, $f4
-.L80282D68:
-/* 7E3BE8 80282D68 8E620070 */  lw        $v0, 0x70($s3)
-/* 7E3BEC 80282D6C 3C0141C8 */  lui       $at, 0x41c8
-/* 7E3BF0 80282D70 44813000 */  mtc1      $at, $f6
-/* 7E3BF4 80282D74 00021080 */  sll       $v0, $v0, 2
-/* 7E3BF8 80282D78 3C018028 */  lui       $at, 0x8028
-/* 7E3BFC 80282D7C 00220821 */  addu      $at, $at, $v0
-/* 7E3C00 80282D80 C4225640 */  lwc1      $f2, 0x5640($at)
-/* 7E3C04 80282D84 46061082 */  mul.s     $f2, $f2, $f6
-/* 7E3C08 80282D88 00000000 */  nop       
-/* 7E3C0C 80282D8C C6600084 */  lwc1      $f0, 0x84($s3)
-/* 7E3C10 80282D90 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3C14 80282D94 46020001 */  sub.s     $f0, $f0, $f2
-/* 7E3C18 80282D98 E620004C */  swc1      $f0, 0x4c($s1)
-/* 7E3C1C 80282D9C 8E620070 */  lw        $v0, 0x70($s3)
-/* 7E3C20 80282DA0 2403000D */  addiu     $v1, $zero, 0xd
-/* 7E3C24 80282DA4 24420001 */  addiu     $v0, $v0, 1
-/* 7E3C28 80282DA8 14430019 */  bne       $v0, $v1, .L80282E10
-/* 7E3C2C 80282DAC AE620070 */   sw       $v0, 0x70($s3)
-/* 7E3C30 80282DB0 C6400010 */  lwc1      $f0, 0x10($s2)
-/* 7E3C34 80282DB4 46800020 */  cvt.s.w   $f0, $f0
-/* 7E3C38 80282DB8 C6220050 */  lwc1      $f2, 0x50($s1)
-/* 7E3C3C 80282DBC C6440008 */  lwc1      $f4, 8($s2)
-/* 7E3C40 80282DC0 46802120 */  cvt.s.w   $f4, $f4
-/* 7E3C44 80282DC4 46001081 */  sub.s     $f2, $f2, $f0
-/* 7E3C48 80282DC8 C6200048 */  lwc1      $f0, 0x48($s1)
-/* 7E3C4C 80282DCC 92420004 */  lbu       $v0, 4($s2)
-/* 7E3C50 80282DD0 46040001 */  sub.s     $f0, $f0, $f4
-/* 7E3C54 80282DD4 46061083 */  div.s     $f2, $f2, $f6
-/* 7E3C58 80282DD8 4600120D */  trunc.w.s $f8, $f2
-/* 7E3C5C 80282DDC 44034000 */  mfc1      $v1, $f8
-/* 7E3C60 80282DE0 00000000 */  nop       
-/* 7E3C64 80282DE4 00620018 */  mult      $v1, $v0
-/* 7E3C68 80282DE8 24020001 */  addiu     $v0, $zero, 1
-/* 7E3C6C 80282DEC 8E430000 */  lw        $v1, ($s2)
-/* 7E3C70 80282DF0 46060003 */  div.s     $f0, $f0, $f6
-.L80282DF4:
-/* 7E3C74 80282DF4 4600020D */  trunc.w.s $f8, $f0
-/* 7E3C78 80282DF8 44044000 */  mfc1      $a0, $f8
-/* 7E3C7C 80282DFC 00004012 */  mflo      $t0
-/* 7E3C80 80282E00 00882021 */  addu      $a0, $a0, $t0
-/* 7E3C84 80282E04 00641821 */  addu      $v1, $v1, $a0
-/* 7E3C88 80282E08 080A0B85 */  j         .L80282E14
-/* 7E3C8C 80282E0C A0600000 */   sb       $zero, ($v1)
-.L80282E10:
-/* 7E3C90 80282E10 0000102D */  daddu     $v0, $zero, $zero
-.L80282E14:
-/* 7E3C94 80282E14 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 7E3C98 80282E18 8FB30034 */  lw        $s3, 0x34($sp)
-/* 7E3C9C 80282E1C 8FB20030 */  lw        $s2, 0x30($sp)
-/* 7E3CA0 80282E20 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 7E3CA4 80282E24 8FB00028 */  lw        $s0, 0x28($sp)
-/* 7E3CA8 80282E28 03E00008 */  jr        $ra
-/* 7E3CAC 80282E2C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/code_7E3700/func_80282E30.s b/asm/nonmatchings/code_7E3700/func_80282E30.s
deleted file mode 100644
index c76b40eceb..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80282E30.s
+++ /dev/null
@@ -1,160 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80282E30
-/* 7E3CB0 80282E30 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E3CB4 80282E34 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E3CB8 80282E38 0080802D */  daddu     $s0, $a0, $zero
-/* 7E3CBC 80282E3C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E3CC0 80282E40 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E3CC4 80282E44 8E0400B0 */  lw        $a0, 0xb0($s0)
-/* 7E3CC8 80282E48 0C04417A */  jal       get_entity_by_index
-/* 7E3CCC 80282E4C 8E1100AC */   lw       $s1, 0xac($s0)
-/* 7E3CD0 80282E50 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 7E3CD4 80282E54 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 7E3CD8 80282E58 0040502D */  daddu     $t2, $v0, $zero
-/* 7E3CDC 80282E5C C4600028 */  lwc1      $f0, 0x28($v1)
-/* 7E3CE0 80282E60 C462002C */  lwc1      $f2, 0x2c($v1)
-/* 7E3CE4 80282E64 8E2D0008 */  lw        $t5, 8($s1)
-/* 7E3CE8 80282E68 8E2B000C */  lw        $t3, 0xc($s1)
-/* 7E3CEC 80282E6C 8E2C0010 */  lw        $t4, 0x10($s1)
-/* 7E3CF0 80282E70 4600010D */  trunc.w.s $f4, $f0
-/* 7E3CF4 80282E74 44042000 */  mfc1      $a0, $f4
-/* 7E3CF8 80282E78 4600110D */  trunc.w.s $f4, $f2
-/* 7E3CFC 80282E7C 44092000 */  mfc1      $t1, $f4
-/* 7E3D00 80282E80 008D2023 */  subu      $a0, $a0, $t5
-/* 7E3D04 80282E84 C4600030 */  lwc1      $f0, 0x30($v1)
-/* 7E3D08 80282E88 012B4823 */  subu      $t1, $t1, $t3
-/* 7E3D0C 80282E8C 4600010D */  trunc.w.s $f4, $f0
-/* 7E3D10 80282E90 44082000 */  mfc1      $t0, $f4
-/* 7E3D14 80282E94 04810002 */  bgez      $a0, .L80282EA0
-/* 7E3D18 80282E98 010C4023 */   subu     $t0, $t0, $t4
-/* 7E3D1C 80282E9C 2484FFE7 */  addiu     $a0, $a0, -0x19
-.L80282EA0:
-/* 7E3D20 80282EA0 05020001 */  bltzl     $t0, .L80282EA8
-/* 7E3D24 80282EA4 2508FFE7 */   addiu    $t0, $t0, -0x19
-.L80282EA8:
-/* 7E3D28 80282EA8 3C0551EB */  lui       $a1, 0x51eb
-/* 7E3D2C 80282EAC 34A5851F */  ori       $a1, $a1, 0x851f
-/* 7E3D30 80282EB0 00850018 */  mult      $a0, $a1
-/* 7E3D34 80282EB4 00001810 */  mfhi      $v1
-/* 7E3D38 80282EB8 00000000 */  nop       
-/* 7E3D3C 80282EBC 00000000 */  nop       
-/* 7E3D40 80282EC0 01250018 */  mult      $t1, $a1
-/* 7E3D44 80282EC4 000417C3 */  sra       $v0, $a0, 0x1f
-/* 7E3D48 80282EC8 00003010 */  mfhi      $a2
-/* 7E3D4C 80282ECC 000318C3 */  sra       $v1, $v1, 3
-/* 7E3D50 80282ED0 00622023 */  subu      $a0, $v1, $v0
-/* 7E3D54 80282ED4 01050018 */  mult      $t0, $a1
-/* 7E3D58 80282ED8 000917C3 */  sra       $v0, $t1, 0x1f
-/* 7E3D5C 80282EDC 000618C3 */  sra       $v1, $a2, 3
-/* 7E3D60 80282EE0 00624823 */  subu      $t1, $v1, $v0
-/* 7E3D64 80282EE4 000817C3 */  sra       $v0, $t0, 0x1f
-/* 7E3D68 80282EE8 00003810 */  mfhi      $a3
-/* 7E3D6C 80282EEC 000718C3 */  sra       $v1, $a3, 3
-/* 7E3D70 80282EF0 00624023 */  subu      $t0, $v1, $v0
-/* 7E3D74 80282EF4 0080382D */  daddu     $a3, $a0, $zero
-/* 7E3D78 80282EF8 00041040 */  sll       $v0, $a0, 1
-/* 7E3D7C 80282EFC 00441021 */  addu      $v0, $v0, $a0
-/* 7E3D80 80282F00 000210C0 */  sll       $v0, $v0, 3
-/* 7E3D84 80282F04 00822021 */  addu      $a0, $a0, $v0
-/* 7E3D88 80282F08 00091040 */  sll       $v0, $t1, 1
-/* 7E3D8C 80282F0C 00491021 */  addu      $v0, $v0, $t1
-/* 7E3D90 80282F10 000210C0 */  sll       $v0, $v0, 3
-/* 7E3D94 80282F14 01224821 */  addu      $t1, $t1, $v0
-/* 7E3D98 80282F18 0100302D */  daddu     $a2, $t0, $zero
-/* 7E3D9C 80282F1C 00081040 */  sll       $v0, $t0, 1
-/* 7E3DA0 80282F20 00481021 */  addu      $v0, $v0, $t0
-/* 7E3DA4 80282F24 000210C0 */  sll       $v0, $v0, 3
-/* 7E3DA8 80282F28 01024021 */  addu      $t0, $t0, $v0
-/* 7E3DAC 80282F2C 2482000C */  addiu     $v0, $a0, 0xc
-/* 7E3DB0 80282F30 004D2021 */  addu      $a0, $v0, $t5
-/* 7E3DB4 80282F34 012B4821 */  addu      $t1, $t1, $t3
-/* 7E3DB8 80282F38 2502000C */  addiu     $v0, $t0, 0xc
-/* 7E3DBC 80282F3C 004C4021 */  addu      $t0, $v0, $t4
-/* 7E3DC0 80282F40 AE040084 */  sw        $a0, 0x84($s0)
-/* 7E3DC4 80282F44 AE090088 */  sw        $t1, 0x88($s0)
-/* 7E3DC8 80282F48 AE08008C */  sw        $t0, 0x8c($s0)
-/* 7E3DCC 80282F4C C5400048 */  lwc1      $f0, 0x48($t2)
-/* 7E3DD0 80282F50 4600010D */  trunc.w.s $f4, $f0
-/* 7E3DD4 80282F54 44042000 */  mfc1      $a0, $f4
-/* 7E3DD8 80282F58 00000000 */  nop       
-/* 7E3DDC 80282F5C AE040090 */  sw        $a0, 0x90($s0)
-/* 7E3DE0 80282F60 C540004C */  lwc1      $f0, 0x4c($t2)
-/* 7E3DE4 80282F64 4600010D */  trunc.w.s $f4, $f0
-/* 7E3DE8 80282F68 E6040094 */  swc1      $f4, 0x94($s0)
-/* 7E3DEC 80282F6C C5400050 */  lwc1      $f0, 0x50($t2)
-/* 7E3DF0 80282F70 4600010D */  trunc.w.s $f4, $f0
-/* 7E3DF4 80282F74 44032000 */  mfc1      $v1, $f4
-/* 7E3DF8 80282F78 00000000 */  nop       
-/* 7E3DFC 80282F7C AE030098 */  sw        $v1, 0x98($s0)
-/* 7E3E00 80282F80 8E220008 */  lw        $v0, 8($s1)
-/* 7E3E04 80282F84 00822023 */  subu      $a0, $a0, $v0
-/* 7E3E08 80282F88 00850018 */  mult      $a0, $a1
-/* 7E3E0C 80282F8C 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E3E10 80282F90 00005010 */  mfhi      $t2
-/* 7E3E14 80282F94 00624023 */  subu      $t0, $v1, $v0
-/* 7E3E18 80282F98 000417C3 */  sra       $v0, $a0, 0x1f
-/* 7E3E1C 80282F9C 01050018 */  mult      $t0, $a1
-/* 7E3E20 80282FA0 000A18C3 */  sra       $v1, $t2, 3
-/* 7E3E24 80282FA4 00625023 */  subu      $t2, $v1, $v0
-/* 7E3E28 80282FA8 01472823 */  subu      $a1, $t2, $a3
-/* 7E3E2C 80282FAC 000817C3 */  sra       $v0, $t0, 0x1f
-/* 7E3E30 80282FB0 00004810 */  mfhi      $t1
-/* 7E3E34 80282FB4 000918C3 */  sra       $v1, $t1, 3
-/* 7E3E38 80282FB8 00621023 */  subu      $v0, $v1, $v0
-/* 7E3E3C 80282FBC 10A00005 */  beqz      $a1, .L80282FD4
-/* 7E3E40 80282FC0 00462023 */   subu     $a0, $v0, $a2
-/* 7E3E44 80282FC4 10800004 */  beqz      $a0, .L80282FD8
-/* 7E3E48 80282FC8 01453021 */   addu     $a2, $t2, $a1
-/* 7E3E4C 80282FCC 0000202D */  daddu     $a0, $zero, $zero
-/* 7E3E50 80282FD0 0080282D */  daddu     $a1, $a0, $zero
-.L80282FD4:
-/* 7E3E54 80282FD4 01453021 */  addu      $a2, $t2, $a1
-.L80282FD8:
-/* 7E3E58 80282FD8 00441821 */  addu      $v1, $v0, $a0
-/* 7E3E5C 80282FDC AE05009C */  sw        $a1, 0x9c($s0)
-/* 7E3E60 80282FE0 AE0000A0 */  sw        $zero, 0xa0($s0)
-/* 7E3E64 80282FE4 14A00005 */  bnez      $a1, .L80282FFC
-/* 7E3E68 80282FE8 AE0400A4 */   sw       $a0, 0xa4($s0)
-/* 7E3E6C 80282FEC 14800003 */  bnez      $a0, .L80282FFC
-/* 7E3E70 80282FF0 24020002 */   addiu    $v0, $zero, 2
-/* 7E3E74 80282FF4 080A0C1B */  j         .L8028306C
-/* 7E3E78 80282FF8 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80282FFC:
-/* 7E3E7C 80282FFC 92240004 */  lbu       $a0, 4($s1)
-/* 7E3E80 80283000 00C4102A */  slt       $v0, $a2, $a0
-/* 7E3E84 80283004 10400017 */  beqz      $v0, .L80283064
-/* 7E3E88 80283008 24020001 */   addiu    $v0, $zero, 1
-/* 7E3E8C 8028300C 04C20016 */  bltzl     $a2, .L80283068
-/* 7E3E90 80283010 AE0200A8 */   sw       $v0, 0xa8($s0)
-/* 7E3E94 80283014 92220005 */  lbu       $v0, 5($s1)
-/* 7E3E98 80283018 0062102A */  slt       $v0, $v1, $v0
-/* 7E3E9C 8028301C 10400011 */  beqz      $v0, .L80283064
-/* 7E3EA0 80283020 24020001 */   addiu    $v0, $zero, 1
-/* 7E3EA4 80283024 0460000F */  bltz      $v1, .L80283064
-/* 7E3EA8 80283028 00640018 */   mult     $v1, $a0
-/* 7E3EAC 8028302C 8E220000 */  lw        $v0, ($s1)
-/* 7E3EB0 80283030 00007012 */  mflo      $t6
-/* 7E3EB4 80283034 00CE1821 */  addu      $v1, $a2, $t6
-/* 7E3EB8 80283038 00431021 */  addu      $v0, $v0, $v1
-/* 7E3EBC 8028303C 90420000 */  lbu       $v0, ($v0)
-/* 7E3EC0 80283040 14400008 */  bnez      $v0, .L80283064
-/* 7E3EC4 80283044 24020001 */   addiu    $v0, $zero, 1
-/* 7E3EC8 80283048 3C038016 */  lui       $v1, %hi(gCollisionStatus)
-/* 7E3ECC 8028304C 8463A550 */  lh        $v1, %lo(gCollisionStatus)($v1)
-/* 7E3ED0 80283050 2402FFFF */  addiu     $v0, $zero, -1
-/* 7E3ED4 80283054 10620003 */  beq       $v1, $v0, .L80283064
-/* 7E3ED8 80283058 24020001 */   addiu    $v0, $zero, 1
-/* 7E3EDC 8028305C 080A0C1A */  j         .L80283068
-/* 7E3EE0 80283060 AE0000A8 */   sw       $zero, 0xa8($s0)
-.L80283064:
-/* 7E3EE4 80283064 AE0200A8 */  sw        $v0, 0xa8($s0)
-.L80283068:
-/* 7E3EE8 80283068 24020002 */  addiu     $v0, $zero, 2
-.L8028306C:
-/* 7E3EEC 8028306C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E3EF0 80283070 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3EF4 80283074 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3EF8 80283078 03E00008 */  jr        $ra
-/* 7E3EFC 8028307C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80283080.s b/asm/nonmatchings/code_7E3700/func_80283080.s
deleted file mode 100644
index f3ad6ab99a..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283080.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283080
-/* 7E3F00 80283080 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E3F04 80283084 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E3F08 80283088 0080802D */  daddu     $s0, $a0, $zero
-/* 7E3F0C 8028308C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E3F10 80283090 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E3F14 80283094 8E0400B0 */  lw        $a0, 0xb0($s0)
-/* 7E3F18 80283098 0C04417A */  jal       get_entity_by_index
-/* 7E3F1C 8028309C 8E1100AC */   lw       $s1, 0xac($s0)
-/* 7E3F20 802830A0 3C0551EB */  lui       $a1, 0x51eb
-/* 7E3F24 802830A4 34A5851F */  ori       $a1, $a1, 0x851f
-/* 7E3F28 802830A8 C4400050 */  lwc1      $f0, 0x50($v0)
-/* 7E3F2C 802830AC 8E240010 */  lw        $a0, 0x10($s1)
-/* 7E3F30 802830B0 4600008D */  trunc.w.s $f2, $f0
-/* 7E3F34 802830B4 44031000 */  mfc1      $v1, $f2
-/* 7E3F38 802830B8 00000000 */  nop       
-/* 7E3F3C 802830BC 00641823 */  subu      $v1, $v1, $a0
-/* 7E3F40 802830C0 00650018 */  mult      $v1, $a1
-/* 7E3F44 802830C4 C4400048 */  lwc1      $f0, 0x48($v0)
-/* 7E3F48 802830C8 8E220008 */  lw        $v0, 8($s1)
-/* 7E3F4C 802830CC 00003810 */  mfhi      $a3
-/* 7E3F50 802830D0 4600008D */  trunc.w.s $f2, $f0
-/* 7E3F54 802830D4 44061000 */  mfc1      $a2, $f2
-/* 7E3F58 802830D8 00000000 */  nop       
-/* 7E3F5C 802830DC 00C23023 */  subu      $a2, $a2, $v0
-/* 7E3F60 802830E0 00C50018 */  mult      $a2, $a1
-/* 7E3F64 802830E4 00031FC3 */  sra       $v1, $v1, 0x1f
-/* 7E3F68 802830E8 8E0200A4 */  lw        $v0, 0xa4($s0)
-/* 7E3F6C 802830EC 000738C3 */  sra       $a3, $a3, 3
-/* 7E3F70 802830F0 00E33823 */  subu      $a3, $a3, $v1
-/* 7E3F74 802830F4 00002810 */  mfhi      $a1
-/* 7E3F78 802830F8 92230004 */  lbu       $v1, 4($s1)
-/* 7E3F7C 802830FC 00E21021 */  addu      $v0, $a3, $v0
-/* 7E3F80 80283100 00430018 */  mult      $v0, $v1
-/* 7E3F84 80283104 8E04009C */  lw        $a0, 0x9c($s0)
-/* 7E3F88 80283108 00001012 */  mflo      $v0
-/* 7E3F8C 8028310C 000637C3 */  sra       $a2, $a2, 0x1f
-/* 7E3F90 80283110 000528C3 */  sra       $a1, $a1, 3
-/* 7E3F94 80283114 00E30018 */  mult      $a3, $v1
-/* 7E3F98 80283118 00A62823 */  subu      $a1, $a1, $a2
-/* 7E3F9C 8028311C 00A42021 */  addu      $a0, $a1, $a0
-/* 7E3FA0 80283120 00822021 */  addu      $a0, $a0, $v0
-/* 7E3FA4 80283124 8E230000 */  lw        $v1, ($s1)
-/* 7E3FA8 80283128 00004812 */  mflo      $t1
-/* 7E3FAC 8028312C 00A91021 */  addu      $v0, $a1, $t1
-/* 7E3FB0 80283130 00621021 */  addu      $v0, $v1, $v0
-/* 7E3FB4 80283134 90420000 */  lbu       $v0, ($v0)
-/* 7E3FB8 80283138 00641821 */  addu      $v1, $v1, $a0
-/* 7E3FBC 8028313C A0620000 */  sb        $v0, ($v1)
-/* 7E3FC0 80283140 92220004 */  lbu       $v0, 4($s1)
-/* 7E3FC4 80283144 00E20018 */  mult      $a3, $v0
-/* 7E3FC8 80283148 8E230000 */  lw        $v1, ($s1)
-/* 7E3FCC 8028314C 00003012 */  mflo      $a2
-/* 7E3FD0 80283150 00A62821 */  addu      $a1, $a1, $a2
-/* 7E3FD4 80283154 00651821 */  addu      $v1, $v1, $a1
-/* 7E3FD8 80283158 A0600000 */  sb        $zero, ($v1)
-/* 7E3FDC 8028315C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E3FE0 80283160 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E3FE4 80283164 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E3FE8 80283168 24020002 */  addiu     $v0, $zero, 2
-/* 7E3FEC 8028316C 03E00008 */  jr        $ra
-/* 7E3FF0 80283170 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80283174.s b/asm/nonmatchings/code_7E3700/func_80283174.s
deleted file mode 100644
index 9ba84c5043..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283174.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283174
-/* 7E3FF4 80283174 3C058011 */  lui       $a1, %hi(gPlayerStatus)
-/* 7E3FF8 80283178 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
-/* 7E3FFC 8028317C 8C8200B0 */  lw        $v0, 0xb0($a0)
-/* 7E4000 80283180 3C038016 */  lui       $v1, %hi(gCollisionStatus)
-/* 7E4004 80283184 8463A550 */  lh        $v1, %lo(gCollisionStatus)($v1)
-/* 7E4008 80283188 24424000 */  addiu     $v0, $v0, 0x4000
-/* 7E400C 8028318C 5462000F */  bnel      $v1, $v0, .L802831CC
-/* 7E4010 80283190 AC8000B8 */   sw       $zero, 0xb8($a0)
-/* 7E4014 80283194 80A300B4 */  lb        $v1, 0xb4($a1)
-/* 7E4018 80283198 24020014 */  addiu     $v0, $zero, 0x14
-/* 7E401C 8028319C 10620005 */  beq       $v1, $v0, .L802831B4
-/* 7E4020 802831A0 24020001 */   addiu    $v0, $zero, 1
-/* 7E4024 802831A4 10620003 */  beq       $v1, $v0, .L802831B4
-/* 7E4028 802831A8 24020002 */   addiu    $v0, $zero, 2
-/* 7E402C 802831AC 54620009 */  bnel      $v1, $v0, .L802831D4
-/* 7E4030 802831B0 AC8000B8 */   sw       $zero, 0xb8($a0)
-.L802831B4:
-/* 7E4034 802831B4 8CA20004 */  lw        $v0, 4($a1)
-/* 7E4038 802831B8 30420001 */  andi      $v0, $v0, 1
-/* 7E403C 802831BC 54400003 */  bnel      $v0, $zero, .L802831CC
-/* 7E4040 802831C0 AC8000B8 */   sw       $zero, 0xb8($a0)
-/* 7E4044 802831C4 24020001 */  addiu     $v0, $zero, 1
-/* 7E4048 802831C8 AC8200B8 */  sw        $v0, 0xb8($a0)
-.L802831CC:
-/* 7E404C 802831CC 03E00008 */  jr        $ra
-/* 7E4050 802831D0 24020002 */   addiu    $v0, $zero, 2
-.L802831D4:
-/* 7E4054 802831D4 03E00008 */  jr        $ra
-/* 7E4058 802831D8 00000000 */   nop      
diff --git a/asm/nonmatchings/code_7E3700/func_80283240.s b/asm/nonmatchings/code_7E3700/func_80283240.s
deleted file mode 100644
index 9ed41dd265..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283240.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283240
-/* 7E40C0 80283240 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E40C4 80283244 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E40C8 80283248 0080982D */  daddu     $s3, $a0, $zero
-/* 7E40CC 8028324C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E40D0 80283250 0000882D */  daddu     $s1, $zero, $zero
-/* 7E40D4 80283254 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 7E40D8 80283258 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E40DC 8028325C AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E40E0 80283260 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E40E4 80283264 8E62000C */  lw        $v0, 0xc($s3)
-/* 7E40E8 80283268 8C450004 */  lw        $a1, 4($v0)
-/* 7E40EC 8028326C 8C540000 */  lw        $s4, ($v0)
-/* 7E40F0 80283270 0C0B1EAF */  jal       get_variable
-/* 7E40F4 80283274 0220802D */   daddu    $s0, $s1, $zero
-/* 7E40F8 80283278 0040902D */  daddu     $s2, $v0, $zero
-.L8028327C:
-/* 7E40FC 8028327C 0C0B11E4 */  jal       get_script_by_index
-/* 7E4100 80283280 0200202D */   daddu    $a0, $s0, $zero
-/* 7E4104 80283284 10400006 */  beqz      $v0, .L802832A0
-/* 7E4108 80283288 26100001 */   addiu    $s0, $s0, 1
-/* 7E410C 8028328C 8C42015C */  lw        $v0, 0x15c($v0)
-/* 7E4110 80283290 14520004 */  bne       $v0, $s2, .L802832A4
-/* 7E4114 80283294 2A020080 */   slti     $v0, $s0, 0x80
-/* 7E4118 80283298 080A0CAB */  j         .L802832AC
-/* 7E411C 8028329C 24110001 */   addiu    $s1, $zero, 1
-.L802832A0:
-/* 7E4120 802832A0 2A020080 */  slti      $v0, $s0, 0x80
-.L802832A4:
-/* 7E4124 802832A4 1440FFF5 */  bnez      $v0, .L8028327C
-/* 7E4128 802832A8 00000000 */   nop      
-.L802832AC:
-/* 7E412C 802832AC 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4130 802832B0 0280282D */  daddu     $a1, $s4, $zero
-/* 7E4134 802832B4 0C0B2026 */  jal       set_variable
-/* 7E4138 802832B8 0220302D */   daddu    $a2, $s1, $zero
-/* 7E413C 802832BC 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 7E4140 802832C0 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E4144 802832C4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4148 802832C8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E414C 802832CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4150 802832D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4154 802832D4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4158 802832D8 03E00008 */  jr        $ra
-/* 7E415C 802832DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7E3700/func_80283810.s b/asm/nonmatchings/code_7E3700/func_80283810.s
deleted file mode 100644
index 6059f9801d..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283810.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283810
-/* 7E4690 80283810 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E4694 80283814 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4698 80283818 0080802D */  daddu     $s0, $a0, $zero
-/* 7E469C 8028381C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 7E46A0 80283820 0C03AD8E */  jal       partner_get_ride_script
-/* 7E46A4 80283824 AE0000AC */   sw       $zero, 0xac($s0)
-/* 7E46A8 80283828 1040000F */  beqz      $v0, .L80283868
-/* 7E46AC 8028382C 00000000 */   nop      
-/* 7E46B0 80283830 3C028011 */  lui       $v0, %hi(D_8010EBB0)
-/* 7E46B4 80283834 8042EBB0 */  lb        $v0, %lo(D_8010EBB0)($v0)
-/* 7E46B8 80283838 14400003 */  bnez      $v0, .L80283848
-/* 7E46BC 8028383C 24020001 */   addiu    $v0, $zero, 1
-/* 7E46C0 80283840 080A0E1A */  j         .L80283868
-/* 7E46C4 80283844 AE0000AC */   sw       $zero, 0xac($s0)
-.L80283848:
-/* 7E46C8 80283848 0C03AD8E */  jal       partner_get_ride_script
-/* 7E46CC 8028384C AE0200AC */   sw       $v0, 0xac($s0)
-/* 7E46D0 80283850 AE0200B0 */  sw        $v0, 0xb0($s0)
-/* 7E46D4 80283854 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 7E46D8 80283858 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 7E46DC 8028385C C4400080 */  lwc1      $f0, 0x80($v0)
-/* 7E46E0 80283860 4600008D */  trunc.w.s $f2, $f0
-/* 7E46E4 80283864 E60200B8 */  swc1      $f2, 0xb8($s0)
-.L80283868:
-/* 7E46E8 80283868 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 7E46EC 8028386C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E46F0 80283870 24020002 */  addiu     $v0, $zero, 2
-/* 7E46F4 80283874 03E00008 */  jr        $ra
-/* 7E46F8 80283878 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s
deleted file mode 100644
index e00af2cf6e..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283908.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283908
-/* 7E4788 80283908 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 7E478C 8028390C 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 7E4790 80283910 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E4794 80283914 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4798 80283918 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* 7E479C 8028391C 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* 7E47A0 80283920 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E47A4 80283924 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E47A8 80283928 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E47AC 8028392C 84620160 */  lh        $v0, 0x160($v1)
-/* 7E47B0 80283930 0200882D */  daddu     $s1, $s0, $zero
-/* 7E47B4 80283934 44820000 */  mtc1      $v0, $f0
-/* 7E47B8 80283938 00000000 */  nop       
-/* 7E47BC 8028393C 46800020 */  cvt.s.w   $f0, $f0
-/* 7E47C0 80283940 E6000028 */  swc1      $f0, 0x28($s0)
-/* 7E47C4 80283944 84620162 */  lh        $v0, 0x162($v1)
-/* 7E47C8 80283948 3C04800B */  lui       $a0, %hi(gCameras)
-/* 7E47CC 8028394C 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* 7E47D0 80283950 44820000 */  mtc1      $v0, $f0
-/* 7E47D4 80283954 00000000 */  nop       
-/* 7E47D8 80283958 46800020 */  cvt.s.w   $f0, $f0
-/* 7E47DC 8028395C E600002C */  swc1      $f0, 0x2c($s0)
-/* 7E47E0 80283960 84620164 */  lh        $v0, 0x164($v1)
-/* 7E47E4 80283964 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 7E47E8 80283968 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 7E47EC 8028396C 44820000 */  mtc1      $v0, $f0
-/* 7E47F0 80283970 00000000 */  nop       
-/* 7E47F4 80283974 46800020 */  cvt.s.w   $f0, $f0
-/* 7E47F8 80283978 00031080 */  sll       $v0, $v1, 2
-/* 7E47FC 8028397C 00431021 */  addu      $v0, $v0, $v1
-/* 7E4800 80283980 00021080 */  sll       $v0, $v0, 2
-/* 7E4804 80283984 00431023 */  subu      $v0, $v0, $v1
-/* 7E4808 80283988 000218C0 */  sll       $v1, $v0, 3
-/* 7E480C 8028398C 00431021 */  addu      $v0, $v0, $v1
-/* 7E4810 80283990 000210C0 */  sll       $v0, $v0, 3
-/* 7E4814 80283994 E6000030 */  swc1      $f0, 0x30($s0)
-/* 7E4818 80283998 3C038011 */  lui       $v1, %hi(gPlayerData+0x12)
-/* 7E481C 8028399C 8063F2A2 */  lb        $v1, %lo(gPlayerData+0x12)($v1)
-/* 7E4820 802839A0 10600022 */  beqz      $v1, .L80283A2C
-/* 7E4824 802839A4 00449021 */   addu     $s2, $v0, $a0
-/* 7E4828 802839A8 0C00EABB */  jal       get_npc_unsafe
-/* 7E482C 802839AC 2404FFFC */   addiu    $a0, $zero, -4
-/* 7E4830 802839B0 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* 7E4834 802839B4 3C014334 */  lui       $at, 0x4334
-/* 7E4838 802839B8 44810000 */  mtc1      $at, $f0
-/* 7E483C 802839BC 3C01C2B4 */  lui       $at, 0xc2b4
-/* 7E4840 802839C0 44816000 */  mtc1      $at, $f12
-/* 7E4844 802839C4 4600103C */  c.lt.s    $f2, $f0
-/* 7E4848 802839C8 00000000 */  nop       
-/* 7E484C 802839CC 45000003 */  bc1f      .L802839DC
-/* 7E4850 802839D0 0040802D */   daddu    $s0, $v0, $zero
-/* 7E4854 802839D4 3C0142B4 */  lui       $at, 0x42b4
-/* 7E4858 802839D8 44816000 */  mtc1      $at, $f12
-.L802839DC:
-/* 7E485C 802839DC 0C00A6C9 */  jal       clamp_angle
-/* 7E4860 802839E0 00000000 */   nop      
-/* 7E4864 802839E4 C6220028 */  lwc1      $f2, 0x28($s1)
-/* 7E4868 802839E8 E6020038 */  swc1      $f2, 0x38($s0)
-/* 7E486C 802839EC C622002C */  lwc1      $f2, 0x2c($s1)
-/* 7E4870 802839F0 E602003C */  swc1      $f2, 0x3c($s0)
-/* 7E4874 802839F4 C6220030 */  lwc1      $f2, 0x30($s1)
-/* 7E4878 802839F8 26040038 */  addiu     $a0, $s0, 0x38
-/* 7E487C 802839FC E6020040 */  swc1      $f2, 0x40($s0)
-/* 7E4880 80283A00 862200B2 */  lh        $v0, 0xb2($s1)
-/* 7E4884 80283A04 44070000 */  mfc1      $a3, $f0
-/* 7E4888 80283A08 24420005 */  addiu     $v0, $v0, 5
-/* 7E488C 80283A0C 44822000 */  mtc1      $v0, $f4
-/* 7E4890 80283A10 00000000 */  nop       
-/* 7E4894 80283A14 46802120 */  cvt.s.w   $f4, $f4
-/* 7E4898 80283A18 44062000 */  mfc1      $a2, $f4
-/* 7E489C 80283A1C 0C00A7E7 */  jal       add_vec2D_polar
-/* 7E48A0 80283A20 26050040 */   addiu    $a1, $s0, 0x40
-/* 7E48A4 80283A24 0C03BCCA */  jal       enable_partner_ai
-/* 7E48A8 80283A28 00000000 */   nop      
-.L80283A2C:
-/* 7E48AC 80283A2C 24020001 */  addiu     $v0, $zero, 1
-/* 7E48B0 80283A30 A6420008 */  sh        $v0, 8($s2)
-/* 7E48B4 80283A34 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E48B8 80283A38 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E48BC 80283A3C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E48C0 80283A40 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E48C4 80283A44 24020002 */  addiu     $v0, $zero, 2
-/* 7E48C8 80283A48 03E00008 */  jr        $ra
-/* 7E48CC 80283A4C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80283A50.s b/asm/nonmatchings/code_7E3700/func_80283A50.s
deleted file mode 100644
index 6fbf4c9b88..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283A50.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283A50
-/* 7E48D0 80283A50 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E48D4 80283A54 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E48D8 80283A58 0080902D */  daddu     $s2, $a0, $zero
-/* 7E48DC 80283A5C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E48E0 80283A60 00A0802D */  daddu     $s0, $a1, $zero
-/* 7E48E4 80283A64 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E48E8 80283A68 0C016AFA */  jal       get_current_map_header
-/* 7E48EC 80283A6C AFB10014 */   sw       $s1, 0x14($sp)
-/* 7E48F0 80283A70 0000302D */  daddu     $a2, $zero, $zero
-/* 7E48F4 80283A74 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 7E48F8 80283A78 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 7E48FC 80283A7C 12000021 */  beqz      $s0, .L80283B04
-/* 7E4900 80283A80 0040282D */   daddu    $a1, $v0, $zero
-/* 7E4904 80283A84 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
-/* 7E4908 80283A88 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
-/* 7E490C 80283A8C 8482008E */  lh        $v0, 0x8e($a0)
-/* 7E4910 80283A90 8CA30014 */  lw        $v1, 0x14($a1)
-/* 7E4914 80283A94 00021100 */  sll       $v0, $v0, 4
-/* 7E4918 80283A98 00431021 */  addu      $v0, $v0, $v1
-/* 7E491C 80283A9C C4400000 */  lwc1      $f0, ($v0)
-/* 7E4920 80283AA0 E6200028 */  swc1      $f0, 0x28($s1)
-/* 7E4924 80283AA4 8482008E */  lh        $v0, 0x8e($a0)
-/* 7E4928 80283AA8 8CA30014 */  lw        $v1, 0x14($a1)
-/* 7E492C 80283AAC 00021100 */  sll       $v0, $v0, 4
-/* 7E4930 80283AB0 00431021 */  addu      $v0, $v0, $v1
-/* 7E4934 80283AB4 C4400008 */  lwc1      $f0, 8($v0)
-/* 7E4938 80283AB8 E6200030 */  swc1      $f0, 0x30($s1)
-/* 7E493C 80283ABC 8482008E */  lh        $v0, 0x8e($a0)
-/* 7E4940 80283AC0 8CA30014 */  lw        $v1, 0x14($a1)
-/* 7E4944 80283AC4 00021100 */  sll       $v0, $v0, 4
-/* 7E4948 80283AC8 00431021 */  addu      $v0, $v0, $v1
-/* 7E494C 80283ACC C4400004 */  lwc1      $f0, 4($v0)
-/* 7E4950 80283AD0 4600018D */  trunc.w.s $f6, $f0
-/* 7E4954 80283AD4 44023000 */  mfc1      $v0, $f6
-/* 7E4958 80283AD8 00000000 */  nop       
-/* 7E495C 80283ADC AE42008C */  sw        $v0, 0x8c($s2)
-/* 7E4960 80283AE0 2442FFD8 */  addiu     $v0, $v0, -0x28
-/* 7E4964 80283AE4 44820000 */  mtc1      $v0, $f0
-/* 7E4968 80283AE8 00000000 */  nop       
-/* 7E496C 80283AEC 46800020 */  cvt.s.w   $f0, $f0
-/* 7E4970 80283AF0 8E220000 */  lw        $v0, ($s1)
-/* 7E4974 80283AF4 3C030400 */  lui       $v1, 0x400
-/* 7E4978 80283AF8 E620002C */  swc1      $f0, 0x2c($s1)
-/* 7E497C 80283AFC 080A0ED2 */  j         .L80283B48
-/* 7E4980 80283B00 00431025 */   or       $v0, $v0, $v1
-.L80283B04:
-/* 7E4984 80283B04 C622002C */  lwc1      $f2, 0x2c($s1)
-/* 7E4988 80283B08 3C013F80 */  lui       $at, 0x3f80
-/* 7E498C 80283B0C 44810000 */  mtc1      $at, $f0
-/* 7E4990 80283B10 00000000 */  nop       
-/* 7E4994 80283B14 46001080 */  add.s     $f2, $f2, $f0
-/* 7E4998 80283B18 E622002C */  swc1      $f2, 0x2c($s1)
-/* 7E499C 80283B1C C640008C */  lwc1      $f0, 0x8c($s2)
-/* 7E49A0 80283B20 46800020 */  cvt.s.w   $f0, $f0
-/* 7E49A4 80283B24 4600103C */  c.lt.s    $f2, $f0
-/* 7E49A8 80283B28 00000000 */  nop       
-/* 7E49AC 80283B2C 45010007 */  bc1t      .L80283B4C
-/* 7E49B0 80283B30 3C03FBFF */   lui      $v1, 0xfbff
-/* 7E49B4 80283B34 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 7E49B8 80283B38 8E220000 */  lw        $v0, ($s1)
-/* 7E49BC 80283B3C 24060002 */  addiu     $a2, $zero, 2
-/* 7E49C0 80283B40 E620002C */  swc1      $f0, 0x2c($s1)
-/* 7E49C4 80283B44 00431024 */  and       $v0, $v0, $v1
-.L80283B48:
-/* 7E49C8 80283B48 AE220000 */  sw        $v0, ($s1)
-.L80283B4C:
-/* 7E49CC 80283B4C C6200028 */  lwc1      $f0, 0x28($s1)
-/* 7E49D0 80283B50 C622002C */  lwc1      $f2, 0x2c($s1)
-/* 7E49D4 80283B54 C6240030 */  lwc1      $f4, 0x30($s1)
-/* 7E49D8 80283B58 3C03800B */  lui       $v1, %hi(gCameras)
-/* 7E49DC 80283B5C 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 7E49E0 80283B60 E4600060 */  swc1      $f0, 0x60($v1)
-/* 7E49E4 80283B64 E4620064 */  swc1      $f2, 0x64($v1)
-/* 7E49E8 80283B68 E4640068 */  swc1      $f4, 0x68($v1)
-/* 7E49EC 80283B6C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E49F0 80283B70 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E49F4 80283B74 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E49F8 80283B78 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E49FC 80283B7C 00C0102D */  daddu     $v0, $a2, $zero
-/* 7E4A00 80283B80 03E00008 */  jr        $ra
-/* 7E4A04 80283B84 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80283B88.s b/asm/nonmatchings/code_7E3700/func_80283B88.s
deleted file mode 100644
index 79ef737efa..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283B88.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283B88
-/* 7E4A08 80283B88 3C0141A0 */  lui       $at, 0x41a0
-/* 7E4A0C 80283B8C 44816000 */  mtc1      $at, $f12
-/* 7E4A10 80283B90 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E4A14 80283B94 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7E4A18 80283B98 0C03BCE5 */  jal       func_800EF394
-/* 7E4A1C 80283B9C 00000000 */   nop      
-/* 7E4A20 80283BA0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7E4A24 80283BA4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4A28 80283BA8 03E00008 */  jr        $ra
-/* 7E4A2C 80283BAC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7E3700/func_80283BB0.s b/asm/nonmatchings/code_7E3700/func_80283BB0.s
deleted file mode 100644
index ad0f9c2619..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283BB0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283BB0
-/* 7E4A30 80283BB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E4A34 80283BB4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7E4A38 80283BB8 0C03BCE9 */  jal       func_800EF3A4
-/* 7E4A3C 80283BBC 00000000 */   nop      
-/* 7E4A40 80283BC0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7E4A44 80283BC4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4A48 80283BC8 03E00008 */  jr        $ra
-/* 7E4A4C 80283BCC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7E3700/func_80283BD0.s b/asm/nonmatchings/code_7E3700/func_80283BD0.s
deleted file mode 100644
index 3703e72e46..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283BD0.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283BD0
-/* 7E4A50 80283BD0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E4A54 80283BD4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4A58 80283BD8 0080802D */  daddu     $s0, $a0, $zero
-/* 7E4A5C 80283BDC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4A60 80283BE0 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 7E4A64 80283BE4 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 7E4A68 80283BE8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E4A6C 80283BEC 10A00008 */  beqz      $a1, .L80283C10
-/* 7E4A70 80283BF0 8E02000C */   lw       $v0, 0xc($s0)
-/* 7E4A74 80283BF4 0C0B1EAF */  jal       get_variable
-/* 7E4A78 80283BF8 8C450000 */   lw       $a1, ($v0)
-/* 7E4A7C 80283BFC AE020070 */  sw        $v0, 0x70($s0)
-/* 7E4A80 80283C00 8E250080 */  lw        $a1, 0x80($s1)
-/* 7E4A84 80283C04 8E26005C */  lw        $a2, 0x5c($s1)
-/* 7E4A88 80283C08 0C0389DE */  jal       move_player
-/* 7E4A8C 80283C0C 0040202D */   daddu    $a0, $v0, $zero
-.L80283C10:
-/* 7E4A90 80283C10 8E030070 */  lw        $v1, 0x70($s0)
-/* 7E4A94 80283C14 2463FFFF */  addiu     $v1, $v1, -1
-/* 7E4A98 80283C18 AE030070 */  sw        $v1, 0x70($s0)
-/* 7E4A9C 80283C1C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E4AA0 80283C20 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4AA4 80283C24 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4AA8 80283C28 000317C2 */  srl       $v0, $v1, 0x1f
-/* 7E4AAC 80283C2C 03E00008 */  jr        $ra
-/* 7E4AB0 80283C30 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7E3700/func_80283C34.s b/asm/nonmatchings/code_7E3700/func_80283C34.s
deleted file mode 100644
index 30588c716d..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283C34.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283C34
-/* 7E4AB4 80283C34 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E4AB8 80283C38 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E4ABC 80283C3C 0080902D */  daddu     $s2, $a0, $zero
-/* 7E4AC0 80283C40 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E4AC4 80283C44 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4AC8 80283C48 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4ACC 80283C4C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4AD0 80283C50 0C016AFA */  jal       get_current_map_header
-/* 7E4AD4 80283C54 8E50000C */   lw       $s0, 0xc($s2)
-/* 7E4AD8 80283C58 0240202D */  daddu     $a0, $s2, $zero
-/* 7E4ADC 80283C5C 8C530014 */  lw        $s3, 0x14($v0)
-/* 7E4AE0 80283C60 8E050000 */  lw        $a1, ($s0)
-/* 7E4AE4 80283C64 0C0B1EAF */  jal       get_variable
-/* 7E4AE8 80283C68 26100004 */   addiu    $s0, $s0, 4
-/* 7E4AEC 80283C6C 8E050000 */  lw        $a1, ($s0)
-/* 7E4AF0 80283C70 26100004 */  addiu     $s0, $s0, 4
-/* 7E4AF4 80283C74 00028900 */  sll       $s1, $v0, 4
-/* 7E4AF8 80283C78 02338821 */  addu      $s1, $s1, $s3
-/* 7E4AFC 80283C7C C6200000 */  lwc1      $f0, ($s1)
-/* 7E4B00 80283C80 4600008D */  trunc.w.s $f2, $f0
-/* 7E4B04 80283C84 44061000 */  mfc1      $a2, $f2
-/* 7E4B08 80283C88 0C0B2026 */  jal       set_variable
-/* 7E4B0C 80283C8C 0240202D */   daddu    $a0, $s2, $zero
-/* 7E4B10 80283C90 8E050000 */  lw        $a1, ($s0)
-/* 7E4B14 80283C94 26100004 */  addiu     $s0, $s0, 4
-/* 7E4B18 80283C98 C6200004 */  lwc1      $f0, 4($s1)
-/* 7E4B1C 80283C9C 4600008D */  trunc.w.s $f2, $f0
-/* 7E4B20 80283CA0 44061000 */  mfc1      $a2, $f2
-/* 7E4B24 80283CA4 0C0B2026 */  jal       set_variable
-/* 7E4B28 80283CA8 0240202D */   daddu    $a0, $s2, $zero
-/* 7E4B2C 80283CAC 8E050000 */  lw        $a1, ($s0)
-/* 7E4B30 80283CB0 26100004 */  addiu     $s0, $s0, 4
-/* 7E4B34 80283CB4 C6200008 */  lwc1      $f0, 8($s1)
-/* 7E4B38 80283CB8 4600008D */  trunc.w.s $f2, $f0
-/* 7E4B3C 80283CBC 44061000 */  mfc1      $a2, $f2
-/* 7E4B40 80283CC0 0C0B2026 */  jal       set_variable
-/* 7E4B44 80283CC4 0240202D */   daddu    $a0, $s2, $zero
-/* 7E4B48 80283CC8 C620000C */  lwc1      $f0, 0xc($s1)
-/* 7E4B4C 80283CCC 8E050000 */  lw        $a1, ($s0)
-/* 7E4B50 80283CD0 4600008D */  trunc.w.s $f2, $f0
-/* 7E4B54 80283CD4 44061000 */  mfc1      $a2, $f2
-/* 7E4B58 80283CD8 0C0B2026 */  jal       set_variable
-/* 7E4B5C 80283CDC 0240202D */   daddu    $a0, $s2, $zero
-/* 7E4B60 80283CE0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E4B64 80283CE4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4B68 80283CE8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4B6C 80283CEC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4B70 80283CF0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4B74 80283CF4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4B78 80283CF8 03E00008 */  jr        $ra
-/* 7E4B7C 80283CFC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7E3700/func_80283D00.s b/asm/nonmatchings/code_7E3700/func_80283D00.s
deleted file mode 100644
index cac5108f20..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283D00.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283D00
-/* 7E4B80 80283D00 0080282D */  daddu     $a1, $a0, $zero
-/* 7E4B84 80283D04 8CA20090 */  lw        $v0, 0x90($a1)
-/* 7E4B88 80283D08 04400009 */  bltz      $v0, .L80283D30
-/* 7E4B8C 80283D0C 2403FFFF */   addiu    $v1, $zero, -1
-/* 7E4B90 80283D10 3C02802E */  lui       $v0, 0x802e
-/* 7E4B94 80283D14 2442BD28 */  addiu     $v0, $v0, -0x42d8
-/* 7E4B98 80283D18 8CA4008C */  lw        $a0, 0x8c($a1)
-/* 7E4B9C 80283D1C AC430004 */  sw        $v1, 4($v0)
-/* 7E4BA0 80283D20 3C01802E */  lui       $at, 0x802e
-/* 7E4BA4 80283D24 AC23BC7C */  sw        $v1, -0x4384($at)
-/* 7E4BA8 80283D28 080A0F55 */  j         .L80283D54
-/* 7E4BAC 80283D2C AC440000 */   sw       $a0, ($v0)
-.L80283D30:
-/* 7E4BB0 80283D30 3C02802E */  lui       $v0, 0x802e
-/* 7E4BB4 80283D34 2442BC7C */  addiu     $v0, $v0, -0x4384
-/* 7E4BB8 80283D38 8CA4008C */  lw        $a0, 0x8c($a1)
-/* 7E4BBC 80283D3C AC430004 */  sw        $v1, 4($v0)
-/* 7E4BC0 80283D40 3C01802E */  lui       $at, 0x802e
-/* 7E4BC4 80283D44 AC23BD28 */  sw        $v1, -0x42d8($at)
-/* 7E4BC8 80283D48 AC440000 */  sw        $a0, ($v0)
-/* 7E4BCC 80283D4C 3C02802E */  lui       $v0, 0x802e
-/* 7E4BD0 80283D50 2442BD28 */  addiu     $v0, $v0, -0x42d8
-.L80283D54:
-/* 7E4BD4 80283D54 ACA2008C */  sw        $v0, 0x8c($a1)
-/* 7E4BD8 80283D58 3C02802E */  lui       $v0, 0x802e
-/* 7E4BDC 80283D5C 2442BC7C */  addiu     $v0, $v0, -0x4384
-/* 7E4BE0 80283D60 ACA20090 */  sw        $v0, 0x90($a1)
-/* 7E4BE4 80283D64 03E00008 */  jr        $ra
-/* 7E4BE8 80283D68 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/code_7E3700/func_80283D6C.s b/asm/nonmatchings/code_7E3700/func_80283D6C.s
deleted file mode 100644
index c14c4cbc3f..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283D6C.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283D6C
-/* 7E4BEC 80283D6C 0080282D */  daddu     $a1, $a0, $zero
-/* 7E4BF0 80283D70 8CA20090 */  lw        $v0, 0x90($a1)
-/* 7E4BF4 80283D74 0440000C */  bltz      $v0, .L80283DA8
-/* 7E4BF8 80283D78 00000000 */   nop      
-/* 7E4BFC 80283D7C 8CA2008C */  lw        $v0, 0x8c($a1)
-/* 7E4C00 80283D80 3C03802E */  lui       $v1, 0x802e
-/* 7E4C04 80283D84 2463BD28 */  addiu     $v1, $v1, -0x42d8
-/* 7E4C08 80283D88 AC620000 */  sw        $v0, ($v1)
-/* 7E4C0C 80283D8C 8CA40094 */  lw        $a0, 0x94($a1)
-/* 7E4C10 80283D90 2402FFFF */  addiu     $v0, $zero, -1
-/* 7E4C14 80283D94 AC620008 */  sw        $v0, 8($v1)
-/* 7E4C18 80283D98 3C01802E */  lui       $at, 0x802e
-/* 7E4C1C 80283D9C AC22BC7C */  sw        $v0, -0x4384($at)
-/* 7E4C20 80283DA0 080A0F74 */  j         .L80283DD0
-/* 7E4C24 80283DA4 AC640004 */   sw       $a0, 4($v1)
-.L80283DA8:
-/* 7E4C28 80283DA8 8CA2008C */  lw        $v0, 0x8c($a1)
-/* 7E4C2C 80283DAC 3C03802E */  lui       $v1, 0x802e
-/* 7E4C30 80283DB0 2463BC7C */  addiu     $v1, $v1, -0x4384
-/* 7E4C34 80283DB4 AC620000 */  sw        $v0, ($v1)
-/* 7E4C38 80283DB8 8CA40094 */  lw        $a0, 0x94($a1)
-/* 7E4C3C 80283DBC 2402FFFF */  addiu     $v0, $zero, -1
-/* 7E4C40 80283DC0 AC620008 */  sw        $v0, 8($v1)
-/* 7E4C44 80283DC4 3C01802E */  lui       $at, 0x802e
-/* 7E4C48 80283DC8 AC22BD28 */  sw        $v0, -0x42d8($at)
-/* 7E4C4C 80283DCC AC640004 */  sw        $a0, 4($v1)
-.L80283DD0:
-/* 7E4C50 80283DD0 3C02802E */  lui       $v0, 0x802e
-/* 7E4C54 80283DD4 2442BD28 */  addiu     $v0, $v0, -0x42d8
-/* 7E4C58 80283DD8 ACA2008C */  sw        $v0, 0x8c($a1)
-/* 7E4C5C 80283DDC 3C02802E */  lui       $v0, 0x802e
-/* 7E4C60 80283DE0 2442BC7C */  addiu     $v0, $v0, -0x4384
-/* 7E4C64 80283DE4 ACA20090 */  sw        $v0, 0x90($a1)
-/* 7E4C68 80283DE8 03E00008 */  jr        $ra
-/* 7E4C6C 80283DEC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/code_7E3700/func_80283DF0.s b/asm/nonmatchings/code_7E3700/func_80283DF0.s
deleted file mode 100644
index 987b888572..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283DF0.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283DF0
-/* 7E4C70 80283DF0 3C03802E */  lui       $v1, 0x802e
-/* 7E4C74 80283DF4 2463BD28 */  addiu     $v1, $v1, -0x42d8
-/* 7E4C78 80283DF8 8C82008C */  lw        $v0, 0x8c($a0)
-/* 7E4C7C 80283DFC 2406FFFF */  addiu     $a2, $zero, -1
-/* 7E4C80 80283E00 AC660004 */  sw        $a2, 4($v1)
-/* 7E4C84 80283E04 AC620000 */  sw        $v0, ($v1)
-/* 7E4C88 80283E08 8C850090 */  lw        $a1, 0x90($a0)
-/* 7E4C8C 80283E0C 3C02802E */  lui       $v0, 0x802e
-/* 7E4C90 80283E10 2442BC7C */  addiu     $v0, $v0, -0x4384
-/* 7E4C94 80283E14 AC460004 */  sw        $a2, 4($v0)
-/* 7E4C98 80283E18 AC450000 */  sw        $a1, ($v0)
-/* 7E4C9C 80283E1C AC820090 */  sw        $v0, 0x90($a0)
-/* 7E4CA0 80283E20 24020002 */  addiu     $v0, $zero, 2
-/* 7E4CA4 80283E24 03E00008 */  jr        $ra
-/* 7E4CA8 80283E28 AC83008C */   sw       $v1, 0x8c($a0)
diff --git a/asm/nonmatchings/code_7E3700/func_80283E2C.s b/asm/nonmatchings/code_7E3700/func_80283E2C.s
deleted file mode 100644
index 6b1f36df10..0000000000
--- a/asm/nonmatchings/code_7E3700/func_80283E2C.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283E2C
-/* 7E4CAC 80283E2C 8C82008C */  lw        $v0, 0x8c($a0)
-/* 7E4CB0 80283E30 3C05802E */  lui       $a1, 0x802e
-/* 7E4CB4 80283E34 24A5BD28 */  addiu     $a1, $a1, -0x42d8
-/* 7E4CB8 80283E38 ACA20000 */  sw        $v0, ($a1)
-/* 7E4CBC 80283E3C 8C820094 */  lw        $v0, 0x94($a0)
-/* 7E4CC0 80283E40 2406FFFF */  addiu     $a2, $zero, -1
-/* 7E4CC4 80283E44 ACA60008 */  sw        $a2, 8($a1)
-/* 7E4CC8 80283E48 ACA20004 */  sw        $v0, 4($a1)
-/* 7E4CCC 80283E4C 8C830090 */  lw        $v1, 0x90($a0)
-/* 7E4CD0 80283E50 3C02802E */  lui       $v0, 0x802e
-/* 7E4CD4 80283E54 2442BC7C */  addiu     $v0, $v0, -0x4384
-/* 7E4CD8 80283E58 AC430000 */  sw        $v1, ($v0)
-/* 7E4CDC 80283E5C 8C830098 */  lw        $v1, 0x98($a0)
-/* 7E4CE0 80283E60 AC460008 */  sw        $a2, 8($v0)
-/* 7E4CE4 80283E64 AC430004 */  sw        $v1, 4($v0)
-/* 7E4CE8 80283E68 AC820090 */  sw        $v0, 0x90($a0)
-/* 7E4CEC 80283E6C 24020002 */  addiu     $v0, $zero, 2
-/* 7E4CF0 80283E70 03E00008 */  jr        $ra
-/* 7E4CF4 80283E74 AC85008C */   sw       $a1, 0x8c($a0)
-/* 7E4CF8 80283E78 00000000 */  nop       
-/* 7E4CFC 80283E7C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_7e0e80/MakeShop.s b/asm/nonmatchings/code_7e0e80/MakeShop.s
deleted file mode 100644
index a65ddabbd8..0000000000
--- a/asm/nonmatchings/code_7e0e80/MakeShop.s
+++ /dev/null
@@ -1,233 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel MakeShop
-/* 7E26E0 80281860 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* 7E26E4 80281864 AFB10044 */  sw        $s1, 0x44($sp)
-/* 7E26E8 80281868 0080882D */  daddu     $s1, $a0, $zero
-/* 7E26EC 8028186C AFBF0064 */  sw        $ra, 0x64($sp)
-/* 7E26F0 80281870 AFBE0060 */  sw        $fp, 0x60($sp)
-/* 7E26F4 80281874 AFB7005C */  sw        $s7, 0x5c($sp)
-/* 7E26F8 80281878 AFB60058 */  sw        $s6, 0x58($sp)
-/* 7E26FC 8028187C AFB50054 */  sw        $s5, 0x54($sp)
-/* 7E2700 80281880 AFB40050 */  sw        $s4, 0x50($sp)
-/* 7E2704 80281884 AFB3004C */  sw        $s3, 0x4c($sp)
-/* 7E2708 80281888 AFB20048 */  sw        $s2, 0x48($sp)
-/* 7E270C 8028188C AFB00040 */  sw        $s0, 0x40($sp)
-/* 7E2710 80281890 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E2714 80281894 8E050000 */  lw        $a1, ($s0)
-/* 7E2718 80281898 0C0B1EAF */  jal       get_variable
-/* 7E271C 8028189C 26100004 */   addiu    $s0, $s0, 4
-/* 7E2720 802818A0 8E050000 */  lw        $a1, ($s0)
-/* 7E2724 802818A4 26100004 */  addiu     $s0, $s0, 4
-/* 7E2728 802818A8 0220202D */  daddu     $a0, $s1, $zero
-/* 7E272C 802818AC 0C0B1EAF */  jal       get_variable
-/* 7E2730 802818B0 0040A82D */   daddu    $s5, $v0, $zero
-/* 7E2734 802818B4 8E050000 */  lw        $a1, ($s0)
-/* 7E2738 802818B8 26100004 */  addiu     $s0, $s0, 4
-/* 7E273C 802818BC 0220202D */  daddu     $a0, $s1, $zero
-/* 7E2740 802818C0 0C0B1EAF */  jal       get_variable
-/* 7E2744 802818C4 0040982D */   daddu    $s3, $v0, $zero
-/* 7E2748 802818C8 0220202D */  daddu     $a0, $s1, $zero
-/* 7E274C 802818CC 8E050000 */  lw        $a1, ($s0)
-/* 7E2750 802818D0 0C0B1EAF */  jal       get_variable
-/* 7E2754 802818D4 0040882D */   daddu    $s1, $v0, $zero
-/* 7E2758 802818D8 2404035C */  addiu     $a0, $zero, 0x35c
-/* 7E275C 802818DC 0C00AB39 */  jal       heap_malloc
-/* 7E2760 802818E0 0040802D */   daddu    $s0, $v0, $zero
-/* 7E2764 802818E4 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 7E2768 802818E8 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 7E276C 802818EC 0040A02D */  daddu     $s4, $v0, $zero
-/* 7E2770 802818F0 AC740144 */  sw        $s4, 0x144($v1)
-/* 7E2774 802818F4 AE950014 */  sw        $s5, 0x14($s4)
-/* 7E2778 802818F8 AE930018 */  sw        $s3, 0x18($s4)
-/* 7E277C 802818FC AE91001C */  sw        $s1, 0x1c($s4)
-/* 7E2780 80281900 AE900024 */  sw        $s0, 0x24($s4)
-/* 7E2784 80281904 8E620000 */  lw        $v0, ($s3)
-/* 7E2788 80281908 10400005 */  beqz      $v0, .L80281920
-/* 7E278C 8028190C 0000902D */   daddu    $s2, $zero, $zero
-.L80281910:
-/* 7E2790 80281910 2673000C */  addiu     $s3, $s3, 0xc
-/* 7E2794 80281914 8E620000 */  lw        $v0, ($s3)
-/* 7E2798 80281918 1440FFFD */  bnez      $v0, .L80281910
-/* 7E279C 8028191C 26520001 */   addiu    $s2, $s2, 1
-.L80281920:
-/* 7E27A0 80281920 A6920002 */  sh        $s2, 2($s4)
-/* 7E27A4 80281924 12200008 */  beqz      $s1, .L80281948
-/* 7E27A8 80281928 0000902D */   daddu    $s2, $zero, $zero
-/* 7E27AC 8028192C 8E220000 */  lw        $v0, ($s1)
-/* 7E27B0 80281930 10400005 */  beqz      $v0, .L80281948
-/* 7E27B4 80281934 00000000 */   nop      
-.L80281938:
-/* 7E27B8 80281938 2631000C */  addiu     $s1, $s1, 0xc
-/* 7E27BC 8028193C 8E220000 */  lw        $v0, ($s1)
-/* 7E27C0 80281940 1440FFFD */  bnez      $v0, .L80281938
-/* 7E27C4 80281944 26520001 */   addiu    $s2, $s2, 1
-.L80281948:
-/* 7E27C8 80281948 86840002 */  lh        $a0, 2($s4)
-/* 7E27CC 8028194C 18800006 */  blez      $a0, .L80281968
-/* 7E27D0 80281950 A6920004 */   sh       $s2, 4($s4)
-/* 7E27D4 80281954 0C00AB39 */  jal       heap_malloc
-/* 7E27D8 80281958 00042100 */   sll      $a0, $a0, 4
-/* 7E27DC 8028195C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 7E27E0 80281960 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 7E27E4 80281964 AC620140 */  sw        $v0, 0x140($v1)
-.L80281968:
-/* 7E27E8 80281968 8E930018 */  lw        $s3, 0x18($s4)
-/* 7E27EC 8028196C 8E620000 */  lw        $v0, ($s3)
-/* 7E27F0 80281970 8E950014 */  lw        $s5, 0x14($s4)
-/* 7E27F4 80281974 10400055 */  beqz      $v0, .L80281ACC
-/* 7E27F8 80281978 0000902D */   daddu    $s2, $zero, $zero
-/* 7E27FC 8028197C 3C1E8007 */  lui       $fp, %hi(gGameStatusPtr)
-/* 7E2800 80281980 27DE419C */  addiu     $fp, $fp, %lo(gGameStatusPtr)
-/* 7E2804 80281984 3C178028 */  lui       $s7, 0x8028
-/* 7E2808 80281988 26F73F58 */  addiu     $s7, $s7, 0x3f58
-/* 7E280C 8028198C 24160003 */  addiu     $s6, $zero, 3
-/* 7E2810 80281990 26B10002 */  addiu     $s1, $s5, 2
-.L80281994:
-/* 7E2814 80281994 27A50028 */  addiu     $a1, $sp, 0x28
-/* 7E2818 80281998 27A6002C */  addiu     $a2, $sp, 0x2c
-/* 7E281C 8028199C 27A70030 */  addiu     $a3, $sp, 0x30
-/* 7E2820 802819A0 96A40000 */  lhu       $a0, ($s5)
-/* 7E2824 802819A4 27A20034 */  addiu     $v0, $sp, 0x34
-/* 7E2828 802819A8 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E282C 802819AC 27A20038 */  addiu     $v0, $sp, 0x38
-/* 7E2830 802819B0 AFA20014 */  sw        $v0, 0x14($sp)
-/* 7E2834 802819B4 27A2003C */  addiu     $v0, $sp, 0x3c
-/* 7E2838 802819B8 0C046C3B */  jal       get_model_center_and_size
-/* 7E283C 802819BC AFA20018 */   sw       $v0, 0x18($sp)
-/* 7E2840 802819C0 00128100 */  sll       $s0, $s2, 4
-/* 7E2844 802819C4 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* 7E2848 802819C8 8FC30000 */  lw        $v1, ($fp)
-/* 7E284C 802819CC 3C0140C0 */  lui       $at, 0x40c0
-/* 7E2850 802819D0 44812000 */  mtc1      $at, $f4
-/* 7E2854 802819D4 C7A00028 */  lwc1      $f0, 0x28($sp)
-/* 7E2858 802819D8 8C620140 */  lw        $v0, 0x140($v1)
-/* 7E285C 802819DC 46041080 */  add.s     $f2, $f2, $f4
-/* 7E2860 802819E0 02021021 */  addu      $v0, $s0, $v0
-/* 7E2864 802819E4 E4400004 */  swc1      $f0, 4($v0)
-/* 7E2868 802819E8 8C620140 */  lw        $v0, 0x140($v1)
-/* 7E286C 802819EC 02021021 */  addu      $v0, $s0, $v0
-/* 7E2870 802819F0 E4420008 */  swc1      $f2, 8($v0)
-/* 7E2874 802819F4 8C620140 */  lw        $v0, 0x140($v1)
-/* 7E2878 802819F8 C7A00030 */  lwc1      $f0, 0x30($sp)
-/* 7E287C 802819FC 02021021 */  addu      $v0, $s0, $v0
-/* 7E2880 80281A00 E440000C */  swc1      $f0, 0xc($v0)
-/* 7E2884 80281A04 96A40000 */  lhu       $a0, ($s5)
-/* 7E2888 80281A08 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 7E288C 80281A0C E7A2002C */   swc1     $f2, 0x2c($sp)
-/* 7E2890 80281A10 0C046B4C */  jal       get_model_from_list_index
-/* 7E2894 80281A14 0040202D */   daddu    $a0, $v0, $zero
-/* 7E2898 80281A18 C7A00028 */  lwc1      $f0, 0x28($sp)
-/* 7E289C 80281A1C C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* 7E28A0 80281A20 94430000 */  lhu       $v1, ($v0)
-/* 7E28A4 80281A24 44050000 */  mfc1      $a1, $f0
-/* 7E28A8 80281A28 44061000 */  mfc1      $a2, $f2
-/* 7E28AC 80281A2C C7A00030 */  lwc1      $f0, 0x30($sp)
-/* 7E28B0 80281A30 34630004 */  ori       $v1, $v1, 4
-/* 7E28B4 80281A34 A4430000 */  sh        $v1, ($v0)
-/* 7E28B8 80281A38 8E630000 */  lw        $v1, ($s3)
-/* 7E28BC 80281A3C 8E840024 */  lw        $a0, 0x24($s4)
-/* 7E28C0 80281A40 24020001 */  addiu     $v0, $zero, 1
-/* 7E28C4 80281A44 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E28C8 80281A48 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E28CC 80281A4C 44070000 */  mfc1      $a3, $f0
-/* 7E28D0 80281A50 0C04C6A5 */  jal       make_item_entity_nodelay
-/* 7E28D4 80281A54 00642025 */   or       $a0, $v1, $a0
-/* 7E28D8 80281A58 8FC40000 */  lw        $a0, ($fp)
-/* 7E28DC 80281A5C 8C830140 */  lw        $v1, 0x140($a0)
-/* 7E28E0 80281A60 26B50004 */  addiu     $s5, $s5, 4
-/* 7E28E4 80281A64 02031821 */  addu      $v1, $s0, $v1
-/* 7E28E8 80281A68 AC620000 */  sw        $v0, ($v1)
-/* 7E28EC 80281A6C 8C820140 */  lw        $v0, 0x140($a0)
-/* 7E28F0 80281A70 2673000C */  addiu     $s3, $s3, 0xc
-/* 7E28F4 80281A74 02028021 */  addu      $s0, $s0, $v0
-/* 7E28F8 80281A78 8E040000 */  lw        $a0, ($s0)
-/* 7E28FC 80281A7C 0C04D052 */  jal       set_item_entity_flags
-/* 7E2900 80281A80 24054000 */   addiu    $a1, $zero, 0x4000
-/* 7E2904 80281A84 02E0202D */  daddu     $a0, $s7, $zero
-/* 7E2908 80281A88 24050080 */  addiu     $a1, $zero, 0x80
-/* 7E290C 80281A8C 96260000 */  lhu       $a2, ($s1)
-/* 7E2910 80281A90 0240382D */  daddu     $a3, $s2, $zero
-/* 7E2914 80281A94 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E2918 80281A98 0C0B10AA */  jal       bind_trigger_1
-/* 7E291C 80281A9C AFB60014 */   sw       $s6, 0x14($sp)
-/* 7E2920 80281AA0 02E0202D */  daddu     $a0, $s7, $zero
-/* 7E2924 80281AA4 24050800 */  addiu     $a1, $zero, 0x800
-/* 7E2928 80281AA8 0240382D */  daddu     $a3, $s2, $zero
-/* 7E292C 80281AAC 96260000 */  lhu       $a2, ($s1)
-/* 7E2930 80281AB0 26310004 */  addiu     $s1, $s1, 4
-/* 7E2934 80281AB4 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E2938 80281AB8 0C0B10AA */  jal       bind_trigger_1
-/* 7E293C 80281ABC AFB60014 */   sw       $s6, 0x14($sp)
-/* 7E2940 80281AC0 8E620000 */  lw        $v0, ($s3)
-/* 7E2944 80281AC4 1440FFB3 */  bnez      $v0, .L80281994
-/* 7E2948 80281AC8 26520001 */   addiu    $s2, $s2, 1
-.L80281ACC:
-/* 7E294C 80281ACC 3C048008 */  lui       $a0, 0x8008
-/* 7E2950 80281AD0 24840868 */  addiu     $a0, $a0, 0x868
-/* 7E2954 80281AD4 0C050529 */  jal       create_icon
-/* 7E2958 80281AD8 2410FFFF */   addiu    $s0, $zero, -1
-/* 7E295C 80281ADC 0040202D */  daddu     $a0, $v0, $zero
-/* 7E2960 80281AE0 24050080 */  addiu     $a1, $zero, 0x80
-/* 7E2964 80281AE4 0C051280 */  jal       set_icon_flags
-/* 7E2968 80281AE8 AE840020 */   sw       $a0, 0x20($s4)
-/* 7E296C 80281AEC 8E840020 */  lw        $a0, 0x20($s4)
-/* 7E2970 80281AF0 0C05128B */  jal       clear_icon_flags
-/* 7E2974 80281AF4 34058000 */   ori      $a1, $zero, 0x8000
-/* 7E2978 80281AF8 3C058028 */  lui       $a1, %hi(draw_shop_items)
-/* 7E297C 80281AFC 24A51524 */  addiu     $a1, $a1, %lo(draw_shop_items)
-/* 7E2980 80281B00 0C048C8F */  jal       bind_dynamic_entity_7
-/* 7E2984 80281B04 0000202D */   daddu    $a0, $zero, $zero
-/* 7E2988 80281B08 0C048D8F */  jal       get_dynamic_entity
-/* 7E298C 80281B0C 0040202D */   daddu    $a0, $v0, $zero
-/* 7E2990 80281B10 2404000A */  addiu     $a0, $zero, 0xa
-/* 7E2994 80281B14 24050064 */  addiu     $a1, $zero, 0x64
-/* 7E2998 80281B18 24060042 */  addiu     $a2, $zero, 0x42
-/* 7E299C 80281B1C 24070078 */  addiu     $a3, $zero, 0x78
-/* 7E29A0 80281B20 2402001C */  addiu     $v0, $zero, 0x1c
-/* 7E29A4 80281B24 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E29A8 80281B28 3C028028 */  lui       $v0, 0x8028
-/* 7E29AC 80281B2C 24421434 */  addiu     $v0, $v0, 0x1434
-/* 7E29B0 80281B30 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E29B4 80281B34 AFA20018 */  sw        $v0, 0x18($sp)
-/* 7E29B8 80281B38 AFA0001C */  sw        $zero, 0x1c($sp)
-/* 7E29BC 80281B3C 0C051F32 */  jal       set_ui_panel_properties
-/* 7E29C0 80281B40 AFB00020 */   sw       $s0, 0x20($sp)
-/* 7E29C4 80281B44 2404000B */  addiu     $a0, $zero, 0xb
-/* 7E29C8 80281B48 24050020 */  addiu     $a1, $zero, 0x20
-/* 7E29CC 80281B4C 240600B8 */  addiu     $a2, $zero, 0xb8
-/* 7E29D0 80281B50 24070100 */  addiu     $a3, $zero, 0x100
-/* 7E29D4 80281B54 00A0102D */  daddu     $v0, $a1, $zero
-/* 7E29D8 80281B58 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E29DC 80281B5C 24020001 */  addiu     $v0, $zero, 1
-/* 7E29E0 80281B60 AFA20014 */  sw        $v0, 0x14($sp)
-/* 7E29E4 80281B64 3C028028 */  lui       $v0, 0x8028
-/* 7E29E8 80281B68 244214D0 */  addiu     $v0, $v0, 0x14d0
-/* 7E29EC 80281B6C AFA20018 */  sw        $v0, 0x18($sp)
-/* 7E29F0 80281B70 AFA0001C */  sw        $zero, 0x1c($sp)
-/* 7E29F4 80281B74 0C051F32 */  jal       set_ui_panel_properties
-/* 7E29F8 80281B78 AFB00020 */   sw       $s0, 0x20($sp)
-/* 7E29FC 80281B7C 3C048015 */  lui       $a0, 0x8015
-/* 7E2A00 80281B80 2484F150 */  addiu     $a0, $a0, -0xeb0
-/* 7E2A04 80281B84 24030009 */  addiu     $v1, $zero, 9
-/* 7E2A08 80281B88 AC830028 */  sw        $v1, 0x28($a0)
-/* 7E2A0C 80281B8C 24030003 */  addiu     $v1, $zero, 3
-/* 7E2A10 80281B90 AC83002C */  sw        $v1, 0x2c($a0)
-/* 7E2A14 80281B94 AE800008 */  sw        $zero, 8($s4)
-/* 7E2A18 80281B98 AE80000C */  sw        $zero, 0xc($s4)
-/* 7E2A1C 80281B9C A6800000 */  sh        $zero, ($s4)
-/* 7E2A20 80281BA0 AE800010 */  sw        $zero, 0x10($s4)
-/* 7E2A24 80281BA4 8FBF0064 */  lw        $ra, 0x64($sp)
-/* 7E2A28 80281BA8 8FBE0060 */  lw        $fp, 0x60($sp)
-/* 7E2A2C 80281BAC 8FB7005C */  lw        $s7, 0x5c($sp)
-/* 7E2A30 80281BB0 8FB60058 */  lw        $s6, 0x58($sp)
-/* 7E2A34 80281BB4 8FB50054 */  lw        $s5, 0x54($sp)
-/* 7E2A38 80281BB8 8FB40050 */  lw        $s4, 0x50($sp)
-/* 7E2A3C 80281BBC 8FB3004C */  lw        $s3, 0x4c($sp)
-/* 7E2A40 80281BC0 8FB20048 */  lw        $s2, 0x48($sp)
-/* 7E2A44 80281BC4 8FB10044 */  lw        $s1, 0x44($sp)
-/* 7E2A48 80281BC8 8FB00040 */  lw        $s0, 0x40($sp)
-/* 7E2A4C 80281BCC 24020002 */  addiu     $v0, $zero, 2
-/* 7E2A50 80281BD0 03E00008 */  jr        $ra
-/* 7E2A54 80281BD4 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s b/asm/nonmatchings/code_7e0e80/MakeShopOwner.s
deleted file mode 100644
index f2774454e3..0000000000
--- a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel MakeShopOwner
-/* 7E2A58 80281BD8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E2A5C 80281BDC AFBF0014 */  sw        $ra, 0x14($sp)
-/* 7E2A60 80281BE0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E2A64 80281BE4 8C82000C */  lw        $v0, 0xc($a0)
-/* 7E2A68 80281BE8 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 7E2A6C 80281BEC 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 7E2A70 80281BF0 8C450000 */  lw        $a1, ($v0)
-/* 7E2A74 80281BF4 0C0B1EAF */  jal       get_variable
-/* 7E2A78 80281BF8 8C700144 */   lw       $s0, 0x144($v1)
-/* 7E2A7C 80281BFC AE020010 */  sw        $v0, 0x10($s0)
-/* 7E2A80 80281C00 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 7E2A84 80281C04 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E2A88 80281C08 24020002 */  addiu     $v0, $zero, 2
-/* 7E2A8C 80281C0C 03E00008 */  jr        $ra
-/* 7E2A90 80281C10 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 7E2A94 80281C14 00000000 */  nop       
-/* 7E2A98 80281C18 00000000 */  nop       
-/* 7E2A9C 80281C1C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_7e0e80/draw_shop_items.s b/asm/nonmatchings/code_7e0e80/draw_shop_items.s
deleted file mode 100644
index 89553acca3..0000000000
--- a/asm/nonmatchings/code_7e0e80/draw_shop_items.s
+++ /dev/null
@@ -1,221 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel draw_shop_items
-/* 7E23A4 80281524 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E23A8 80281528 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E23AC 8028152C 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* 7E23B0 80281530 AFBF005C */  sw        $ra, 0x5c($sp)
-/* 7E23B4 80281534 AFBE0058 */  sw        $fp, 0x58($sp)
-/* 7E23B8 80281538 AFB70054 */  sw        $s7, 0x54($sp)
-/* 7E23BC 8028153C AFB60050 */  sw        $s6, 0x50($sp)
-/* 7E23C0 80281540 AFB5004C */  sw        $s5, 0x4c($sp)
-/* 7E23C4 80281544 AFB40048 */  sw        $s4, 0x48($sp)
-/* 7E23C8 80281548 AFB30044 */  sw        $s3, 0x44($sp)
-/* 7E23CC 8028154C AFB20040 */  sw        $s2, 0x40($sp)
-/* 7E23D0 80281550 AFB1003C */  sw        $s1, 0x3c($sp)
-/* 7E23D4 80281554 AFB00038 */  sw        $s0, 0x38($sp)
-/* 7E23D8 80281558 F7B60068 */  sdc1      $f22, 0x68($sp)
-/* 7E23DC 8028155C F7B40060 */  sdc1      $f20, 0x60($sp)
-/* 7E23E0 80281560 8C520144 */  lw        $s2, 0x144($v0)
-/* 7E23E4 80281564 96420000 */  lhu       $v0, ($s2)
-/* 7E23E8 80281568 30420001 */  andi      $v0, $v0, 1
-/* 7E23EC 8028156C 10400005 */  beqz      $v0, .L80281584
-/* 7E23F0 80281570 2404000A */   addiu    $a0, $zero, 0xa
-/* 7E23F4 80281574 3C108014 */  lui       $s0, %hi(D_80147474)
-/* 7E23F8 80281578 26107474 */  addiu     $s0, $s0, %lo(D_80147474)
-/* 7E23FC 8028157C 080A0563 */  j         .L8028158C
-/* 7E2400 80281580 00000000 */   nop      
-.L80281584:
-/* 7E2404 80281584 3C108014 */  lui       $s0, %hi(D_80147574)
-/* 7E2408 80281588 26107574 */  addiu     $s0, $s0, %lo(D_80147574)
-.L8028158C:
-/* 7E240C 8028158C 0C051F9F */  jal       func_80147E7C
-/* 7E2410 80281590 0200282D */   daddu    $a1, $s0, $zero
-/* 7E2414 80281594 2404000B */  addiu     $a0, $zero, 0xb
-/* 7E2418 80281598 0C051F9F */  jal       func_80147E7C
-/* 7E241C 8028159C 0200282D */   daddu    $a1, $s0, $zero
-/* 7E2420 802815A0 96420000 */  lhu       $v0, ($s2)
-/* 7E2424 802815A4 30420001 */  andi      $v0, $v0, 1
-/* 7E2428 802815A8 10400096 */  beqz      $v0, .L80281804
-/* 7E242C 802815AC 00000000 */   nop      
-/* 7E2430 802815B0 3C04800B */  lui       $a0, %hi(gCameras)
-/* 7E2434 802815B4 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* 7E2438 802815B8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E243C 802815BC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E2440 802815C0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 7E2444 802815C4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 7E2448 802815C8 8C5E0140 */  lw        $fp, 0x140($v0)
-/* 7E244C 802815CC 00031080 */  sll       $v0, $v1, 2
-/* 7E2450 802815D0 00431021 */  addu      $v0, $v0, $v1
-/* 7E2454 802815D4 00021080 */  sll       $v0, $v0, 2
-/* 7E2458 802815D8 00431023 */  subu      $v0, $v0, $v1
-/* 7E245C 802815DC 000218C0 */  sll       $v1, $v0, 3
-/* 7E2460 802815E0 00431021 */  addu      $v0, $v0, $v1
-/* 7E2464 802815E4 000210C0 */  sll       $v0, $v0, 3
-/* 7E2468 802815E8 0044A821 */  addu      $s5, $v0, $a0
-/* 7E246C 802815EC 86420002 */  lh        $v0, 2($s2)
-/* 7E2470 802815F0 8E440018 */  lw        $a0, 0x18($s2)
-/* 7E2474 802815F4 18400083 */  blez      $v0, .L80281804
-/* 7E2478 802815F8 0000B82D */   daddu    $s7, $zero, $zero
-/* 7E247C 802815FC 27D4000C */  addiu     $s4, $fp, 0xc
-/* 7E2480 80281600 24960004 */  addiu     $s6, $a0, 4
-/* 7E2484 80281604 3C013F80 */  lui       $at, 0x3f80
-/* 7E2488 80281608 4481B000 */  mtc1      $at, $f22
-/* 7E248C 8028160C 3C013FE0 */  lui       $at, 0x3fe0
-/* 7E2490 80281610 4481A800 */  mtc1      $at, $f21
-/* 7E2494 80281614 4480A000 */  mtc1      $zero, $f20
-.L80281618:
-/* 7E2498 80281618 26A400D4 */  addiu     $a0, $s5, 0xd4
-/* 7E249C 8028161C C686FFF8 */  lwc1      $f6, -8($s4)
-/* 7E24A0 80281620 C682FFFC */  lwc1      $f2, -4($s4)
-/* 7E24A4 80281624 C6840000 */  lwc1      $f4, ($s4)
-/* 7E24A8 80281628 3C0141F0 */  lui       $at, 0x41f0
-/* 7E24AC 8028162C 44810000 */  mtc1      $at, $f0
-/* 7E24B0 80281630 27A20028 */  addiu     $v0, $sp, 0x28
-/* 7E24B4 80281634 AFA20014 */  sw        $v0, 0x14($sp)
-/* 7E24B8 80281638 27A2002C */  addiu     $v0, $sp, 0x2c
-/* 7E24BC 8028163C AFA20018 */  sw        $v0, 0x18($sp)
-/* 7E24C0 80281640 27A20030 */  addiu     $v0, $sp, 0x30
-/* 7E24C4 80281644 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 7E24C8 80281648 46001080 */  add.s     $f2, $f2, $f0
-/* 7E24CC 8028164C 44053000 */  mfc1      $a1, $f6
-/* 7E24D0 80281650 44072000 */  mfc1      $a3, $f4
-/* 7E24D4 80281654 44061000 */  mfc1      $a2, $f2
-/* 7E24D8 80281658 27A20034 */  addiu     $v0, $sp, 0x34
-/* 7E24DC 8028165C E7B60010 */  swc1      $f22, 0x10($sp)
-/* 7E24E0 80281660 0C00A588 */  jal       transform_point
-/* 7E24E4 80281664 AFA20020 */   sw       $v0, 0x20($sp)
-/* 7E24E8 80281668 C7A60034 */  lwc1      $f6, 0x34($sp)
-/* 7E24EC 8028166C C7A00030 */  lwc1      $f0, 0x30($sp)
-/* 7E24F0 80281670 4606B183 */  div.s     $f6, $f22, $f6
-/* 7E24F4 80281674 46060002 */  mul.s     $f0, $f0, $f6
-/* 7E24F8 80281678 00000000 */  nop       
-/* 7E24FC 8028167C 46160000 */  add.s     $f0, $f0, $f22
-/* 7E2500 80281680 46000021 */  cvt.d.s   $f0, $f0
-/* 7E2504 80281684 46340002 */  mul.d     $f0, $f0, $f20
-/* 7E2508 80281688 00000000 */  nop       
-/* 7E250C 8028168C C7A20028 */  lwc1      $f2, 0x28($sp)
-/* 7E2510 80281690 46061202 */  mul.s     $f8, $f2, $f6
-/* 7E2514 80281694 00000000 */  nop       
-/* 7E2518 80281698 C7A4002C */  lwc1      $f4, 0x2c($sp)
-/* 7E251C 8028169C 46003087 */  neg.s     $f2, $f6
-/* 7E2520 802816A0 46022282 */  mul.s     $f10, $f4, $f2
-/* 7E2524 802816A4 00000000 */  nop       
-/* 7E2528 802816A8 44801000 */  mtc1      $zero, $f2
-/* 7E252C 802816AC E7A60034 */  swc1      $f6, 0x34($sp)
-/* 7E2530 802816B0 E7A80028 */  swc1      $f8, 0x28($sp)
-/* 7E2534 802816B4 E7AA002C */  swc1      $f10, 0x2c($sp)
-/* 7E2538 802816B8 46200020 */  cvt.s.d   $f0, $f0
-/* 7E253C 802816BC 4600103C */  c.lt.s    $f2, $f0
-/* 7E2540 802816C0 00000000 */  nop       
-/* 7E2544 802816C4 45000048 */  bc1f      .L802817E8
-/* 7E2548 802816C8 E7A00030 */   swc1     $f0, 0x30($sp)
-/* 7E254C 802816CC 4616003C */  c.lt.s    $f0, $f22
-/* 7E2550 802816D0 00000000 */  nop       
-/* 7E2554 802816D4 45020045 */  bc1fl     .L802817EC
-/* 7E2558 802816D8 26F70001 */   addiu    $s7, $s7, 1
-/* 7E255C 802816DC 86A2000A */  lh        $v0, 0xa($s5)
-/* 7E2560 802816E0 44820000 */  mtc1      $v0, $f0
-/* 7E2564 802816E4 00000000 */  nop       
-/* 7E2568 802816E8 46800020 */  cvt.s.w   $f0, $f0
-/* 7E256C 802816EC 46004102 */  mul.s     $f4, $f8, $f0
-/* 7E2570 802816F0 00000000 */  nop       
-/* 7E2574 802816F4 46002100 */  add.s     $f4, $f4, $f0
-/* 7E2578 802816F8 46002121 */  cvt.d.s   $f4, $f4
-/* 7E257C 802816FC 46342102 */  mul.d     $f4, $f4, $f20
-/* 7E2580 80281700 00000000 */  nop       
-/* 7E2584 80281704 86A2000C */  lh        $v0, 0xc($s5)
-/* 7E2588 80281708 44820000 */  mtc1      $v0, $f0
-/* 7E258C 8028170C 00000000 */  nop       
-/* 7E2590 80281710 46800020 */  cvt.s.w   $f0, $f0
-/* 7E2594 80281714 46005082 */  mul.s     $f2, $f10, $f0
-/* 7E2598 80281718 00000000 */  nop       
-/* 7E259C 8028171C 46001080 */  add.s     $f2, $f2, $f0
-/* 7E25A0 80281720 460010A1 */  cvt.d.s   $f2, $f2
-/* 7E25A4 80281724 46341082 */  mul.d     $f2, $f2, $f20
-/* 7E25A8 80281728 00000000 */  nop       
-/* 7E25AC 8028172C 86A2000E */  lh        $v0, 0xe($s5)
-/* 7E25B0 80281730 44820000 */  mtc1      $v0, $f0
-/* 7E25B4 80281734 00000000 */  nop       
-/* 7E25B8 80281738 46800021 */  cvt.d.w   $f0, $f0
-/* 7E25BC 8028173C 86A20010 */  lh        $v0, 0x10($s5)
-/* 7E25C0 80281740 46202100 */  add.d     $f4, $f4, $f0
-/* 7E25C4 80281744 44820000 */  mtc1      $v0, $f0
-/* 7E25C8 80281748 00000000 */  nop       
-/* 7E25CC 8028174C 46800021 */  cvt.d.w   $f0, $f0
-/* 7E25D0 80281750 8EC20000 */  lw        $v0, ($s6)
-/* 7E25D4 80281754 46201080 */  add.d     $f2, $f2, $f0
-/* 7E25D8 80281758 28420064 */  slti      $v0, $v0, 0x64
-/* 7E25DC 8028175C 4620230D */  trunc.w.d $f12, $f4
-/* 7E25E0 80281760 44116000 */  mfc1      $s1, $f12
-/* 7E25E4 80281764 4620130D */  trunc.w.d $f12, $f2
-/* 7E25E8 80281768 44136000 */  mfc1      $s3, $f12
-/* 7E25EC 8028176C 10400002 */  beqz      $v0, .L80281778
-/* 7E25F0 80281770 0000802D */   daddu    $s0, $zero, $zero
-/* 7E25F4 80281774 2410FFFC */  addiu     $s0, $zero, -4
-.L80281778:
-/* 7E25F8 80281778 0C04C3D6 */  jal       get_item_entity
-/* 7E25FC 8028177C 8FC40000 */   lw       $a0, ($fp)
-/* 7E2600 80281780 8C420000 */  lw        $v0, ($v0)
-/* 7E2604 80281784 30420040 */  andi      $v0, $v0, 0x40
-/* 7E2608 80281788 14400009 */  bnez      $v0, .L802817B0
-/* 7E260C 8028178C 02302821 */   addu     $a1, $s1, $s0
-/* 7E2610 80281790 0260302D */  daddu     $a2, $s3, $zero
-/* 7E2614 80281794 240200FF */  addiu     $v0, $zero, 0xff
-/* 7E2618 80281798 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E261C 8028179C AFA20014 */  sw        $v0, 0x14($sp)
-/* 7E2620 802817A0 AFA00018 */  sw        $zero, 0x18($sp)
-/* 7E2624 802817A4 8EC40000 */  lw        $a0, ($s6)
-/* 7E2628 802817A8 0C049DA7 */  jal       draw_number
-/* 7E262C 802817AC 24070001 */   addiu    $a3, $zero, 1
-.L802817B0:
-/* 7E2630 802817B0 8E420008 */  lw        $v0, 8($s2)
-/* 7E2634 802817B4 56E2000D */  bnel      $s7, $v0, .L802817EC
-/* 7E2638 802817B8 26F70001 */   addiu    $s7, $s7, 1
-/* 7E263C 802817BC 02302821 */  addu      $a1, $s1, $s0
-/* 7E2640 802817C0 24A5FFFA */  addiu     $a1, $a1, -6
-/* 7E2644 802817C4 8E440020 */  lw        $a0, 0x20($s2)
-/* 7E2648 802817C8 0C051261 */  jal       set_icon_render_pos
-/* 7E264C 802817CC 26660005 */   addiu    $a2, $s3, 5
-/* 7E2650 802817D0 8E440020 */  lw        $a0, 0x20($s2)
-/* 7E2654 802817D4 3C053F33 */  lui       $a1, 0x3f33
-/* 7E2658 802817D8 0C051308 */  jal       func_80144C20
-/* 7E265C 802817DC 34A53333 */   ori      $a1, $a1, 0x3333
-/* 7E2660 802817E0 0C0511EA */  jal       draw_icon_0
-/* 7E2664 802817E4 8E440020 */   lw       $a0, 0x20($s2)
-.L802817E8:
-/* 7E2668 802817E8 26F70001 */  addiu     $s7, $s7, 1
-.L802817EC:
-/* 7E266C 802817EC 26D6000C */  addiu     $s6, $s6, 0xc
-/* 7E2670 802817F0 26940010 */  addiu     $s4, $s4, 0x10
-/* 7E2674 802817F4 86420002 */  lh        $v0, 2($s2)
-/* 7E2678 802817F8 02E2102A */  slt       $v0, $s7, $v0
-/* 7E267C 802817FC 1440FF86 */  bnez      $v0, .L80281618
-/* 7E2680 80281800 27DE0010 */   addiu    $fp, $fp, 0x10
-.L80281804:
-/* 7E2684 80281804 8E420358 */  lw        $v0, 0x358($s2)
-/* 7E2688 80281808 18400003 */  blez      $v0, .L80281818
-/* 7E268C 8028180C 2442FFFF */   addiu    $v0, $v0, -1
-/* 7E2690 80281810 080A060A */  j         .L80281828
-/* 7E2694 80281814 AE420358 */   sw       $v0, 0x358($s2)
-.L80281818:
-/* 7E2698 80281818 96420000 */  lhu       $v0, ($s2)
-/* 7E269C 8028181C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* 7E26A0 80281820 0C03A640 */  jal       func_800E9900
-/* 7E26A4 80281824 A6420000 */   sh       $v0, ($s2)
-.L80281828:
-/* 7E26A8 80281828 8FBF005C */  lw        $ra, 0x5c($sp)
-/* 7E26AC 8028182C 8FBE0058 */  lw        $fp, 0x58($sp)
-/* 7E26B0 80281830 8FB70054 */  lw        $s7, 0x54($sp)
-/* 7E26B4 80281834 8FB60050 */  lw        $s6, 0x50($sp)
-/* 7E26B8 80281838 8FB5004C */  lw        $s5, 0x4c($sp)
-/* 7E26BC 8028183C 8FB40048 */  lw        $s4, 0x48($sp)
-/* 7E26C0 80281840 8FB30044 */  lw        $s3, 0x44($sp)
-/* 7E26C4 80281844 8FB20040 */  lw        $s2, 0x40($sp)
-/* 7E26C8 80281848 8FB1003C */  lw        $s1, 0x3c($sp)
-/* 7E26CC 8028184C 8FB00038 */  lw        $s0, 0x38($sp)
-/* 7E26D0 80281850 D7B60068 */  ldc1      $f22, 0x68($sp)
-/* 7E26D4 80281854 D7B40060 */  ldc1      $f20, 0x60($sp)
-/* 7E26D8 80281858 03E00008 */  jr        $ra
-/* 7E26DC 8028185C 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/asm/nonmatchings/code_7e0e80/func_80280000.s b/asm/nonmatchings/code_7e0e80/func_80280000.s
deleted file mode 100644
index ce58438f1d..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280000.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280000
-/* 7E0E80 80280000 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E0E84 80280004 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E0E88 80280008 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E0E8C 8028000C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E0E90 80280010 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E0E94 80280014 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E0E98 80280018 8C510144 */  lw        $s1, 0x144($v0)
-/* 7E0E9C 8028001C 24050001 */  addiu     $a1, $zero, 1
-/* 7E0EA0 80280020 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E0EA4 80280024 8C430018 */  lw        $v1, 0x18($v0)
-/* 7E0EA8 80280028 00041080 */  sll       $v0, $a0, 2
-/* 7E0EAC 8028002C 3C048028 */  lui       $a0, 0x8028
-/* 7E0EB0 80280030 24843E80 */  addiu     $a0, $a0, 0x3e80
-/* 7E0EB4 80280034 00431021 */  addu      $v0, $v0, $v1
-/* 7E0EB8 80280038 8C500000 */  lw        $s0, ($v0)
-/* 7E0EBC 8028003C 0C0B0CF8 */  jal       start_script
-/* 7E0EC0 80280040 0000302D */   daddu    $a2, $zero, $zero
-/* 7E0EC4 80280044 0040202D */  daddu     $a0, $v0, $zero
-/* 7E0EC8 80280048 AC900084 */  sw        $s0, 0x84($a0)
-/* 7E0ECC 8028004C 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E0ED0 80280050 8C420000 */  lw        $v0, ($v0)
-/* 7E0ED4 80280054 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E0ED8 80280058 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E0EDC 8028005C 8C420008 */  lw        $v0, 8($v0)
-/* 7E0EE0 80280060 AC82008C */  sw        $v0, 0x8c($a0)
-/* 7E0EE4 80280064 8E230010 */  lw        $v1, 0x10($s1)
-/* 7E0EE8 80280068 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E0EEC 8028006C 8C630004 */  lw        $v1, 4($v1)
-/* 7E0EF0 80280070 AC830090 */  sw        $v1, 0x90($a0)
-/* 7E0EF4 80280074 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E0EF8 80280078 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E0EFC 8028007C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E0F00 80280080 03E00008 */  jr        $ra
-/* 7E0F04 80280084 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_80280088.s b/asm/nonmatchings/code_7e0e80/func_80280088.s
deleted file mode 100644
index 4a75caa116..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280088.s
+++ /dev/null
@@ -1,68 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280088
-/* 7E0F08 80280088 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E0F0C 8028008C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E0F10 80280090 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E0F14 80280094 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E0F18 80280098 00C0902D */  daddu     $s2, $a2, $zero
-/* 7E0F1C 8028009C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E0F20 802800A0 00E0882D */  daddu     $s1, $a3, $zero
-/* 7E0F24 802800A4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E0F28 802800A8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E0F2C 802800AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E0F30 802800B0 8C500144 */  lw        $s0, 0x144($v0)
-/* 7E0F34 802800B4 00041080 */  sll       $v0, $a0, 2
-/* 7E0F38 802800B8 8E030010 */  lw        $v1, 0x10($s0)
-/* 7E0F3C 802800BC 00A0202D */  daddu     $a0, $a1, $zero
-/* 7E0F40 802800C0 8C630018 */  lw        $v1, 0x18($v1)
-/* 7E0F44 802800C4 00431021 */  addu      $v0, $v0, $v1
-/* 7E0F48 802800C8 8C530000 */  lw        $s3, ($v0)
-/* 7E0F4C 802800CC 0C0496CF */  jal       set_message_string
-/* 7E0F50 802800D0 0000282D */   daddu    $a1, $zero, $zero
-/* 7E0F54 802800D4 0240202D */  daddu     $a0, $s2, $zero
-/* 7E0F58 802800D8 0C0496FA */  jal       set_message_value
-/* 7E0F5C 802800DC 24050001 */   addiu    $a1, $zero, 1
-/* 7E0F60 802800E0 1A200005 */  blez      $s1, .L802800F8
-/* 7E0F64 802800E4 0220202D */   daddu    $a0, $s1, $zero
-/* 7E0F68 802800E8 0C0496FA */  jal       set_message_value
-/* 7E0F6C 802800EC 24050002 */   addiu    $a1, $zero, 2
-/* 7E0F70 802800F0 080A0047 */  j         .L8028011C
-/* 7E0F74 802800F4 00000000 */   nop      
-.L802800F8:
-/* 7E0F78 802800F8 3C048015 */  lui       $a0, 0x8015
-/* 7E0F7C 802800FC 2484C290 */  addiu     $a0, $a0, -0x3d70
-/* 7E0F80 80280100 24020001 */  addiu     $v0, $zero, 1
-/* 7E0F84 80280104 16420003 */  bne       $s2, $v0, .L80280114
-/* 7E0F88 80280108 00000000 */   nop      
-/* 7E0F8C 8028010C 3C048015 */  lui       $a0, 0x8015
-/* 7E0F90 80280110 2484C294 */  addiu     $a0, $a0, -0x3d6c
-.L80280114:
-/* 7E0F94 80280114 0C0496CF */  jal       set_message_string
-/* 7E0F98 80280118 24050002 */   addiu    $a1, $zero, 2
-.L8028011C:
-/* 7E0F9C 8028011C 3C048028 */  lui       $a0, 0x8028
-/* 7E0FA0 80280120 24843E80 */  addiu     $a0, $a0, 0x3e80
-/* 7E0FA4 80280124 24050001 */  addiu     $a1, $zero, 1
-/* 7E0FA8 80280128 0C0B0CF8 */  jal       start_script
-/* 7E0FAC 8028012C 0000302D */   daddu    $a2, $zero, $zero
-/* 7E0FB0 80280130 0040202D */  daddu     $a0, $v0, $zero
-/* 7E0FB4 80280134 AC930084 */  sw        $s3, 0x84($a0)
-/* 7E0FB8 80280138 8E020010 */  lw        $v0, 0x10($s0)
-/* 7E0FBC 8028013C 8C420000 */  lw        $v0, ($v0)
-/* 7E0FC0 80280140 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E0FC4 80280144 8E020010 */  lw        $v0, 0x10($s0)
-/* 7E0FC8 80280148 8C420008 */  lw        $v0, 8($v0)
-/* 7E0FCC 8028014C AC82008C */  sw        $v0, 0x8c($a0)
-/* 7E0FD0 80280150 8E030010 */  lw        $v1, 0x10($s0)
-/* 7E0FD4 80280154 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E0FD8 80280158 8C630004 */  lw        $v1, 4($v1)
-/* 7E0FDC 8028015C AC830090 */  sw        $v1, 0x90($a0)
-/* 7E0FE0 80280160 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E0FE4 80280164 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E0FE8 80280168 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E0FEC 8028016C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E0FF0 80280170 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E0FF4 80280174 03E00008 */  jr        $ra
-/* 7E0FF8 80280178 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7e0e80/func_8028017C.s b/asm/nonmatchings/code_7e0e80/func_8028017C.s
deleted file mode 100644
index 9095827655..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_8028017C.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8028017C
-/* 7E0FFC 8028017C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E1000 80280180 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E1004 80280184 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E1008 80280188 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E100C 8028018C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E1010 80280190 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E1014 80280194 8C510144 */  lw        $s1, 0x144($v0)
-/* 7E1018 80280198 24050001 */  addiu     $a1, $zero, 1
-/* 7E101C 8028019C 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E1020 802801A0 8C430018 */  lw        $v1, 0x18($v0)
-/* 7E1024 802801A4 00041080 */  sll       $v0, $a0, 2
-/* 7E1028 802801A8 3C048028 */  lui       $a0, 0x8028
-/* 7E102C 802801AC 24843EB0 */  addiu     $a0, $a0, 0x3eb0
-/* 7E1030 802801B0 00431021 */  addu      $v0, $v0, $v1
-/* 7E1034 802801B4 8C500000 */  lw        $s0, ($v0)
-/* 7E1038 802801B8 0C0B0CF8 */  jal       start_script
-/* 7E103C 802801BC 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1040 802801C0 0040202D */  daddu     $a0, $v0, $zero
-/* 7E1044 802801C4 AC900084 */  sw        $s0, 0x84($a0)
-/* 7E1048 802801C8 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E104C 802801CC 8C420000 */  lw        $v0, ($v0)
-/* 7E1050 802801D0 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E1054 802801D4 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E1058 802801D8 8C420008 */  lw        $v0, 8($v0)
-/* 7E105C 802801DC AC82008C */  sw        $v0, 0x8c($a0)
-/* 7E1060 802801E0 8E230010 */  lw        $v1, 0x10($s1)
-/* 7E1064 802801E4 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E1068 802801E8 8C630004 */  lw        $v1, 4($v1)
-/* 7E106C 802801EC AC830090 */  sw        $v1, 0x90($a0)
-/* 7E1070 802801F0 AC83007C */  sw        $v1, 0x7c($a0)
-/* 7E1074 802801F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E1078 802801F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E107C 802801FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E1080 80280200 03E00008 */  jr        $ra
-/* 7E1084 80280204 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_80280208.s b/asm/nonmatchings/code_7e0e80/func_80280208.s
deleted file mode 100644
index 46bbd922c6..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280208.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280208
-/* 7E1088 80280208 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E108C 8028020C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E1090 80280210 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E1094 80280214 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E1098 80280218 00A0802D */  daddu     $s0, $a1, $zero
-/* 7E109C 8028021C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E10A0 80280220 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E10A4 80280224 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E10A8 80280228 8C510144 */  lw        $s1, 0x144($v0)
-/* 7E10AC 8028022C 0000282D */  daddu     $a1, $zero, $zero
-/* 7E10B0 80280230 8E230010 */  lw        $v1, 0x10($s1)
-/* 7E10B4 80280234 00041080 */  sll       $v0, $a0, 2
-/* 7E10B8 80280238 8C630018 */  lw        $v1, 0x18($v1)
-/* 7E10BC 8028023C 00431021 */  addu      $v0, $v0, $v1
-/* 7E10C0 80280240 8C520000 */  lw        $s2, ($v0)
-/* 7E10C4 80280244 0C0496FA */  jal       set_message_value
-/* 7E10C8 80280248 0200202D */   daddu    $a0, $s0, $zero
-/* 7E10CC 8028024C 3C048015 */  lui       $a0, 0x8015
-/* 7E10D0 80280250 2484C290 */  addiu     $a0, $a0, -0x3d70
-/* 7E10D4 80280254 24020001 */  addiu     $v0, $zero, 1
-/* 7E10D8 80280258 16020003 */  bne       $s0, $v0, .L80280268
-/* 7E10DC 8028025C 00000000 */   nop      
-/* 7E10E0 80280260 3C048015 */  lui       $a0, 0x8015
-/* 7E10E4 80280264 2484C294 */  addiu     $a0, $a0, -0x3d6c
-.L80280268:
-/* 7E10E8 80280268 0C0496CF */  jal       set_message_string
-/* 7E10EC 8028026C 24050001 */   addiu    $a1, $zero, 1
-/* 7E10F0 80280270 3C048028 */  lui       $a0, 0x8028
-/* 7E10F4 80280274 24843EB0 */  addiu     $a0, $a0, 0x3eb0
-/* 7E10F8 80280278 24050001 */  addiu     $a1, $zero, 1
-/* 7E10FC 8028027C 0C0B0CF8 */  jal       start_script
-/* 7E1100 80280280 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1104 80280284 0040202D */  daddu     $a0, $v0, $zero
-/* 7E1108 80280288 AC920084 */  sw        $s2, 0x84($a0)
-/* 7E110C 8028028C 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E1110 80280290 8C420000 */  lw        $v0, ($v0)
-/* 7E1114 80280294 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E1118 80280298 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E111C 8028029C 8C420008 */  lw        $v0, 8($v0)
-/* 7E1120 802802A0 AC82008C */  sw        $v0, 0x8c($a0)
-/* 7E1124 802802A4 8E230010 */  lw        $v1, 0x10($s1)
-/* 7E1128 802802A8 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E112C 802802AC 8C630004 */  lw        $v1, 4($v1)
-/* 7E1130 802802B0 AC830090 */  sw        $v1, 0x90($a0)
-/* 7E1134 802802B4 AC83007C */  sw        $v1, 0x7c($a0)
-/* 7E1138 802802B8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E113C 802802BC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E1140 802802C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E1144 802802C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E1148 802802C8 03E00008 */  jr        $ra
-/* 7E114C 802802CC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_802802D0.s b/asm/nonmatchings/code_7e0e80/func_802802D0.s
deleted file mode 100644
index 906857ef51..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_802802D0.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802802D0
-/* 7E1150 802802D0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E1154 802802D4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E1158 802802D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E115C 802802DC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E1160 802802E0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E1164 802802E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E1168 802802E8 8C510144 */  lw        $s1, 0x144($v0)
-/* 7E116C 802802EC 24050001 */  addiu     $a1, $zero, 1
-/* 7E1170 802802F0 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E1174 802802F4 8C430018 */  lw        $v1, 0x18($v0)
-/* 7E1178 802802F8 00041080 */  sll       $v0, $a0, 2
-/* 7E117C 802802FC 3C048028 */  lui       $a0, 0x8028
-/* 7E1180 80280300 24843EE0 */  addiu     $a0, $a0, 0x3ee0
-/* 7E1184 80280304 00431021 */  addu      $v0, $v0, $v1
-/* 7E1188 80280308 8C500000 */  lw        $s0, ($v0)
-/* 7E118C 8028030C 0C0B0CF8 */  jal       start_script
-/* 7E1190 80280310 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1194 80280314 0040202D */  daddu     $a0, $v0, $zero
-/* 7E1198 80280318 AC900084 */  sw        $s0, 0x84($a0)
-/* 7E119C 8028031C 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E11A0 80280320 8C420000 */  lw        $v0, ($v0)
-/* 7E11A4 80280324 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E11A8 80280328 8E220010 */  lw        $v0, 0x10($s1)
-/* 7E11AC 8028032C 8C420008 */  lw        $v0, 8($v0)
-/* 7E11B0 80280330 AC82008C */  sw        $v0, 0x8c($a0)
-/* 7E11B4 80280334 8E230010 */  lw        $v1, 0x10($s1)
-/* 7E11B8 80280338 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E11BC 8028033C 8C630004 */  lw        $v1, 4($v1)
-/* 7E11C0 80280340 AC830090 */  sw        $v1, 0x90($a0)
-/* 7E11C4 80280344 AC83007C */  sw        $v1, 0x7c($a0)
-/* 7E11C8 80280348 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E11CC 8028034C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E11D0 80280350 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E11D4 80280354 03E00008 */  jr        $ra
-/* 7E11D8 80280358 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_8028035C.s b/asm/nonmatchings/code_7e0e80/func_8028035C.s
deleted file mode 100644
index 148c98a96a..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_8028035C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8028035C
-/* 7E11DC 8028035C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E11E0 80280360 3C048028 */  lui       $a0, 0x8028
-/* 7E11E4 80280364 24843F2C */  addiu     $a0, $a0, 0x3f2c
-/* 7E11E8 80280368 24050001 */  addiu     $a1, $zero, 1
-/* 7E11EC 8028036C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E11F0 80280370 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E11F4 80280374 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 7E11F8 80280378 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E11FC 8028037C 8C500144 */  lw        $s0, 0x144($v0)
-/* 7E1200 80280380 0C0B0CF8 */  jal       start_script
-/* 7E1204 80280384 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1208 80280388 8E030010 */  lw        $v1, 0x10($s0)
-/* 7E120C 8028038C 8C630000 */  lw        $v1, ($v1)
-/* 7E1210 80280390 0040202D */  daddu     $a0, $v0, $zero
-/* 7E1214 80280394 AC830084 */  sw        $v1, 0x84($a0)
-/* 7E1218 80280398 8E020010 */  lw        $v0, 0x10($s0)
-/* 7E121C 8028039C 8C420008 */  lw        $v0, 8($v0)
-/* 7E1220 802803A0 AC820088 */  sw        $v0, 0x88($a0)
-/* 7E1224 802803A4 8E030010 */  lw        $v1, 0x10($s0)
-/* 7E1228 802803A8 8C820144 */  lw        $v0, 0x144($a0)
-/* 7E122C 802803AC 8C630004 */  lw        $v1, 4($v1)
-/* 7E1230 802803B0 AC83008C */  sw        $v1, 0x8c($a0)
-/* 7E1234 802803B4 AC83007C */  sw        $v1, 0x7c($a0)
-/* 7E1238 802803B8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 7E123C 802803BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E1240 802803C0 03E00008 */  jr        $ra
-/* 7E1244 802803C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7e0e80/func_802803C8.s b/asm/nonmatchings/code_7e0e80/func_802803C8.s
deleted file mode 100644
index 64650b0886..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_802803C8.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802803C8
-/* 7E1248 802803C8 3C058011 */  lui       $a1, %hi(gPlayerStatus)
-/* 7E124C 802803CC 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
-/* 7E1250 802803D0 AC80008C */  sw        $zero, 0x8c($a0)
-/* 7E1254 802803D4 80A300B4 */  lb        $v1, 0xb4($a1)
-/* 7E1258 802803D8 24020004 */  addiu     $v0, $zero, 4
-/* 7E125C 802803DC 10620008 */  beq       $v1, $v0, .L80280400
-/* 7E1260 802803E0 24020008 */   addiu    $v0, $zero, 8
-/* 7E1264 802803E4 10620006 */  beq       $v1, $v0, .L80280400
-/* 7E1268 802803E8 00000000 */   nop      
-/* 7E126C 802803EC 8CA20000 */  lw        $v0, ($a1)
-/* 7E1270 802803F0 30420100 */  andi      $v0, $v0, 0x100
-/* 7E1274 802803F4 14400004 */  bnez      $v0, .L80280408
-/* 7E1278 802803F8 24020001 */   addiu    $v0, $zero, 1
-/* 7E127C 802803FC AC82008C */  sw        $v0, 0x8c($a0)
-.L80280400:
-/* 7E1280 80280400 03E00008 */  jr        $ra
-/* 7E1284 80280404 24020002 */   addiu    $v0, $zero, 2
-.L80280408:
-/* 7E1288 80280408 03E00008 */  jr        $ra
-/* 7E128C 8028040C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/code_7e0e80/func_80280410.s b/asm/nonmatchings/code_7e0e80/func_80280410.s
deleted file mode 100644
index 72a3308614..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280410.s
+++ /dev/null
@@ -1,73 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280410
-/* 7E1290 80280410 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E1294 80280414 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E1298 80280418 3C128007 */  lui       $s2, %hi(gGameStatusPtr)
-/* 7E129C 8028041C 2652419C */  addiu     $s2, $s2, %lo(gGameStatusPtr)
-/* 7E12A0 80280420 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E12A4 80280424 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E12A8 80280428 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E12AC 8028042C 8C82000C */  lw        $v0, 0xc($a0)
-/* 7E12B0 80280430 8E430000 */  lw        $v1, ($s2)
-/* 7E12B4 80280434 8C450000 */  lw        $a1, ($v0)
-/* 7E12B8 80280438 0C0B1EAF */  jal       get_variable
-/* 7E12BC 8028043C 8C700144 */   lw       $s0, 0x144($v1)
-/* 7E12C0 80280440 96030000 */  lhu       $v1, ($s0)
-/* 7E12C4 80280444 30630008 */  andi      $v1, $v1, 8
-/* 7E12C8 80280448 14600022 */  bnez      $v1, .L802804D4
-/* 7E12CC 8028044C 0040882D */   daddu    $s1, $v0, $zero
-/* 7E12D0 80280450 96020000 */  lhu       $v0, ($s0)
-/* 7E12D4 80280454 AE110008 */  sw        $s1, 8($s0)
-/* 7E12D8 80280458 34420001 */  ori       $v0, $v0, 1
-/* 7E12DC 8028045C 0C03A63B */  jal       func_800E98EC
-/* 7E12E0 80280460 A6020000 */   sh       $v0, ($s0)
-/* 7E12E4 80280464 8E430000 */  lw        $v1, ($s2)
-/* 7E12E8 80280468 24020005 */  addiu     $v0, $zero, 5
-/* 7E12EC 8028046C AE020358 */  sw        $v0, 0x358($s0)
-/* 7E12F0 80280470 8C620010 */  lw        $v0, 0x10($v1)
-/* 7E12F4 80280474 30428000 */  andi      $v0, $v0, 0x8000
-/* 7E12F8 80280478 10400022 */  beqz      $v0, .L80280504
-/* 7E12FC 8028047C 24020002 */   addiu    $v0, $zero, 2
-/* 7E1300 80280480 0C03805E */  jal       disable_player_input
-/* 7E1304 80280484 00000000 */   nop      
-/* 7E1308 80280488 0C038045 */  jal       disable_player_static_collisions
-/* 7E130C 8028048C 00000000 */   nop      
-/* 7E1310 80280490 3C048028 */  lui       $a0, 0x8028
-/* 7E1314 80280494 24844034 */  addiu     $a0, $a0, 0x4034
-/* 7E1318 80280498 24050001 */  addiu     $a1, $zero, 1
-/* 7E131C 8028049C 0C0B0CF8 */  jal       start_script
-/* 7E1320 802804A0 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1324 802804A4 0040182D */  daddu     $v1, $v0, $zero
-/* 7E1328 802804A8 8C650144 */  lw        $a1, 0x144($v1)
-/* 7E132C 802804AC AC710084 */  sw        $s1, 0x84($v1)
-/* 7E1330 802804B0 96040000 */  lhu       $a0, ($s0)
-/* 7E1334 802804B4 0000102D */  daddu     $v0, $zero, $zero
-/* 7E1338 802804B8 3C018028 */  lui       $at, 0x8028
-/* 7E133C 802804BC AC236520 */  sw        $v1, 0x6520($at)
-/* 7E1340 802804C0 34840008 */  ori       $a0, $a0, 8
-/* 7E1344 802804C4 3C018028 */  lui       $at, 0x8028
-/* 7E1348 802804C8 AC256524 */  sw        $a1, 0x6524($at)
-/* 7E134C 802804CC 080A0141 */  j         .L80280504
-/* 7E1350 802804D0 A6040000 */   sh       $a0, ($s0)
-.L802804D4:
-/* 7E1354 802804D4 3C048028 */  lui       $a0, 0x8028
-/* 7E1358 802804D8 0C0B1059 */  jal       does_script_exist
-/* 7E135C 802804DC 8C846524 */   lw       $a0, 0x6524($a0)
-/* 7E1360 802804E0 54400008 */  bnel      $v0, $zero, .L80280504
-/* 7E1364 802804E4 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1368 802804E8 96020000 */  lhu       $v0, ($s0)
-/* 7E136C 802804EC 3042FFF7 */  andi      $v0, $v0, 0xfff7
-/* 7E1370 802804F0 0C038050 */  jal       enable_player_static_collisions
-/* 7E1374 802804F4 A6020000 */   sh       $v0, ($s0)
-/* 7E1378 802804F8 0C038069 */  jal       enable_player_input
-/* 7E137C 802804FC 00000000 */   nop      
-/* 7E1380 80280500 24020002 */  addiu     $v0, $zero, 2
-.L80280504:
-/* 7E1384 80280504 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E1388 80280508 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E138C 8028050C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E1390 80280510 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E1394 80280514 03E00008 */  jr        $ra
-/* 7E1398 80280518 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_8028051C.s b/asm/nonmatchings/code_7e0e80/func_8028051C.s
deleted file mode 100644
index 404aecf0a1..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_8028051C.s
+++ /dev/null
@@ -1,297 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8028051C
-/* 7E139C 8028051C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 7E13A0 80280520 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E13A4 80280524 0080982D */  daddu     $s3, $a0, $zero
-/* 7E13A8 80280528 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E13AC 8028052C 00A0802D */  daddu     $s0, $a1, $zero
-/* 7E13B0 80280530 AFB60028 */  sw        $s6, 0x28($sp)
-/* 7E13B4 80280534 3C168011 */  lui       $s6, %hi(gPlayerData)
-/* 7E13B8 80280538 26D6F290 */  addiu     $s6, $s6, %lo(gPlayerData)
-/* 7E13BC 8028053C AFBF002C */  sw        $ra, 0x2c($sp)
-/* 7E13C0 80280540 AFB50024 */  sw        $s5, 0x24($sp)
-/* 7E13C4 80280544 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E13C8 80280548 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E13CC 8028054C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E13D0 80280550 8E750084 */  lw        $s5, 0x84($s3)
-/* 7E13D4 80280554 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 7E13D8 80280558 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 7E13DC 8028055C 00151040 */  sll       $v0, $s5, 1
-/* 7E13E0 80280560 8C740144 */  lw        $s4, 0x144($v1)
-/* 7E13E4 80280564 00551021 */  addu      $v0, $v0, $s5
-/* 7E13E8 80280568 8E830018 */  lw        $v1, 0x18($s4)
-/* 7E13EC 8028056C 00021080 */  sll       $v0, $v0, 2
-/* 7E13F0 80280570 00629021 */  addu      $s2, $v1, $v0
-/* 7E13F4 80280574 96820000 */  lhu       $v0, ($s4)
-/* 7E13F8 80280578 8E430000 */  lw        $v1, ($s2)
-/* 7E13FC 8028057C 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* 7E1400 80280580 A6820000 */  sh        $v0, ($s4)
-/* 7E1404 80280584 3C028008 */  lui       $v0, %hi(gItemTable)
-/* 7E1408 80280588 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
-/* 7E140C 8028058C 00031940 */  sll       $v1, $v1, 5
-/* 7E1410 80280590 0C03A640 */  jal       func_800E9900
-/* 7E1414 80280594 00628821 */   addu     $s1, $v1, $v0
-/* 7E1418 80280598 1200001B */  beqz      $s0, .L80280608
-/* 7E141C 8028059C 00000000 */   nop      
-/* 7E1420 802805A0 96220018 */  lhu       $v0, 0x18($s1)
-/* 7E1424 802805A4 3C018028 */  lui       $at, 0x8028
-/* 7E1428 802805A8 AC206530 */  sw        $zero, 0x6530($at)
-/* 7E142C 802805AC 3C018028 */  lui       $at, 0x8028
-/* 7E1430 802805B0 AC206534 */  sw        $zero, 0x6534($at)
-/* 7E1434 802805B4 30420040 */  andi      $v0, $v0, 0x40
-/* 7E1438 802805B8 10400008 */  beqz      $v0, .L802805DC
-/* 7E143C 802805BC 2407FFFF */   addiu    $a3, $zero, -1
-/* 7E1440 802805C0 9223001A */  lbu       $v1, 0x1a($s1)
-/* 7E1444 802805C4 00031080 */  sll       $v0, $v1, 2
-/* 7E1448 802805C8 00431021 */  addu      $v0, $v0, $v1
-/* 7E144C 802805CC 00021080 */  sll       $v0, $v0, 2
-/* 7E1450 802805D0 3C078009 */  lui       $a3, 0x8009
-/* 7E1454 802805D4 00E23821 */  addu      $a3, $a3, $v0
-/* 7E1458 802805D8 80E7F072 */  lb        $a3, -0xf8e($a3)
-.L802805DC:
-/* 7E145C 802805DC 8E250000 */  lw        $a1, ($s1)
-/* 7E1460 802805E0 8E460004 */  lw        $a2, 4($s2)
-/* 7E1464 802805E4 0C0A0022 */  jal       func_80280088
-/* 7E1468 802805E8 0000202D */   daddu    $a0, $zero, $zero
-/* 7E146C 802805EC AE620074 */  sw        $v0, 0x74($s3)
-/* 7E1470 802805F0 0C03A6D5 */  jal       increment_status_menu_disabled
-/* 7E1474 802805F4 AE600070 */   sw       $zero, 0x70($s3)
-/* 7E1478 802805F8 0C03A640 */  jal       func_800E9900
-/* 7E147C 802805FC 00000000 */   nop      
-/* 7E1480 80280600 0C03A546 */  jal       show_coin_counter
-/* 7E1484 80280604 00000000 */   nop      
-.L80280608:
-/* 7E1488 80280608 8E630070 */  lw        $v1, 0x70($s3)
-/* 7E148C 8028060C 24100005 */  addiu     $s0, $zero, 5
-/* 7E1490 80280610 10700085 */  beq       $v1, $s0, .L80280828
-/* 7E1494 80280614 28620006 */   slti     $v0, $v1, 6
-/* 7E1498 80280618 1040000D */  beqz      $v0, .L80280650
-/* 7E149C 8028061C 24020001 */   addiu    $v0, $zero, 1
-/* 7E14A0 80280620 1062006D */  beq       $v1, $v0, .L802807D8
-/* 7E14A4 80280624 28620002 */   slti     $v0, $v1, 2
-/* 7E14A8 80280628 10400005 */  beqz      $v0, .L80280640
-/* 7E14AC 8028062C 24020004 */   addiu    $v0, $zero, 4
-/* 7E14B0 80280630 10600017 */  beqz      $v1, .L80280690
-/* 7E14B4 80280634 0000102D */   daddu    $v0, $zero, $zero
-/* 7E14B8 80280638 080A024B */  j         .L8028092C
-/* 7E14BC 8028063C 00000000 */   nop      
-.L80280640:
-/* 7E14C0 80280640 1062006F */  beq       $v1, $v0, .L80280800
-/* 7E14C4 80280644 0000102D */   daddu    $v0, $zero, $zero
-/* 7E14C8 80280648 080A024B */  j         .L8028092C
-/* 7E14CC 8028064C 00000000 */   nop      
-.L80280650:
-/* 7E14D0 80280650 2410000A */  addiu     $s0, $zero, 0xa
-/* 7E14D4 80280654 10700091 */  beq       $v1, $s0, .L8028089C
-/* 7E14D8 80280658 2862000B */   slti     $v0, $v1, 0xb
-/* 7E14DC 8028065C 10400005 */  beqz      $v0, .L80280674
-/* 7E14E0 80280660 24020006 */   addiu    $v0, $zero, 6
-/* 7E14E4 80280664 1062007F */  beq       $v1, $v0, .L80280864
-/* 7E14E8 80280668 0000102D */   daddu    $v0, $zero, $zero
-/* 7E14EC 8028066C 080A024B */  j         .L8028092C
-/* 7E14F0 80280670 00000000 */   nop      
-.L80280674:
-/* 7E14F4 80280674 2402000B */  addiu     $v0, $zero, 0xb
-/* 7E14F8 80280678 1062009D */  beq       $v1, $v0, .L802808F0
-/* 7E14FC 8028067C 24020064 */   addiu    $v0, $zero, 0x64
-/* 7E1500 80280680 10620012 */  beq       $v1, $v0, .L802806CC
-/* 7E1504 80280684 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1508 80280688 080A024B */  j         .L8028092C
-/* 7E150C 8028068C 00000000 */   nop      
-.L80280690:
-/* 7E1510 80280690 0C0B1059 */  jal       does_script_exist
-/* 7E1514 80280694 8E640074 */   lw       $a0, 0x74($s3)
-/* 7E1518 80280698 144000A4 */  bnez      $v0, .L8028092C
-/* 7E151C 8028069C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1520 802806A0 3C04001E */  lui       $a0, 0x1e
-/* 7E1524 802806A4 34840001 */  ori       $a0, $a0, 1
-/* 7E1528 802806A8 26650078 */  addiu     $a1, $s3, 0x78
-/* 7E152C 802806AC 24020064 */  addiu     $v0, $zero, 0x64
-/* 7E1530 802806B0 AE620070 */  sw        $v0, 0x70($s3)
-/* 7E1534 802806B4 0C049640 */  jal       load_string
-/* 7E1538 802806B8 AE600078 */   sw       $zero, 0x78($s3)
-/* 7E153C 802806BC 3C018028 */  lui       $at, 0x8028
-/* 7E1540 802806C0 AC226528 */  sw        $v0, 0x6528($at)
-/* 7E1544 802806C4 080A024B */  j         .L8028092C
-/* 7E1548 802806C8 0000102D */   daddu    $v0, $zero, $zero
-.L802806CC:
-/* 7E154C 802806CC 8E700078 */  lw        $s0, 0x78($s3)
-/* 7E1550 802806D0 24020001 */  addiu     $v0, $zero, 1
-/* 7E1554 802806D4 16020095 */  bne       $s0, $v0, .L8028092C
-/* 7E1558 802806D8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E155C 802806DC 3C028028 */  lui       $v0, 0x8028
-/* 7E1560 802806E0 8C426528 */  lw        $v0, 0x6528($v0)
-/* 7E1564 802806E4 904204E8 */  lbu       $v0, 0x4e8($v0)
-/* 7E1568 802806E8 14400035 */  bnez      $v0, .L802807C0
-/* 7E156C 802806EC 00000000 */   nop      
-/* 7E1570 802806F0 86C2000C */  lh        $v0, 0xc($s6)
-/* 7E1574 802806F4 8E430004 */  lw        $v1, 4($s2)
-/* 7E1578 802806F8 0043102A */  slt       $v0, $v0, $v1
-/* 7E157C 802806FC 10400006 */  beqz      $v0, .L80280718
-/* 7E1580 80280700 00000000 */   nop      
-/* 7E1584 80280704 0C0A005F */  jal       func_8028017C
-/* 7E1588 80280708 24040001 */   addiu    $a0, $zero, 1
-/* 7E158C 8028070C AE620074 */  sw        $v0, 0x74($s3)
-/* 7E1590 80280710 080A024A */  j         .L80280928
-/* 7E1594 80280714 AE700070 */   sw       $s0, 0x70($s3)
-.L80280718:
-/* 7E1598 80280718 8E420000 */  lw        $v0, ($s2)
-/* 7E159C 8028071C 2442FF20 */  addiu     $v0, $v0, -0xe0
-/* 7E15A0 80280720 2C420075 */  sltiu     $v0, $v0, 0x75
-/* 7E15A4 80280724 1440000C */  bnez      $v0, .L80280758
-/* 7E15A8 80280728 00000000 */   nop      
-/* 7E15AC 8028072C 0C039D5D */  jal       add_item
-/* 7E15B0 80280730 0000202D */   daddu    $a0, $zero, $zero
-/* 7E15B4 80280734 2403FFFF */  addiu     $v1, $zero, -1
-/* 7E15B8 80280738 14430007 */  bne       $v0, $v1, .L80280758
-/* 7E15BC 8028073C 00000000 */   nop      
-/* 7E15C0 80280740 0C0A005F */  jal       func_8028017C
-/* 7E15C4 80280744 24040002 */   addiu    $a0, $zero, 2
-/* 7E15C8 80280748 AE620074 */  sw        $v0, 0x74($s3)
-/* 7E15CC 8028074C 24020004 */  addiu     $v0, $zero, 4
-/* 7E15D0 80280750 080A024A */  j         .L80280928
-/* 7E15D4 80280754 AE620070 */   sw       $v0, 0x70($s3)
-.L80280758:
-/* 7E15D8 80280758 96C2000C */  lhu       $v0, 0xc($s6)
-/* 7E15DC 8028075C 96430006 */  lhu       $v1, 6($s2)
-/* 7E15E0 80280760 00431023 */  subu      $v0, $v0, $v1
-/* 7E15E4 80280764 A6C2000C */  sh        $v0, 0xc($s6)
-/* 7E15E8 80280768 8E440000 */  lw        $a0, ($s2)
-/* 7E15EC 8028076C 2482FF20 */  addiu     $v0, $a0, -0xe0
-/* 7E15F0 80280770 2C420075 */  sltiu     $v0, $v0, 0x75
-/* 7E15F4 80280774 1040000A */  beqz      $v0, .L802807A0
-/* 7E15F8 80280778 00000000 */   nop      
-/* 7E15FC 8028077C 0C039DCF */  jal       add_badge
-/* 7E1600 80280780 00000000 */   nop      
-/* 7E1604 80280784 0000202D */  daddu     $a0, $zero, $zero
-/* 7E1608 80280788 3C05F840 */  lui       $a1, 0xf840
-/* 7E160C 8028078C 34A55CF0 */  ori       $a1, $a1, 0x5cf0
-/* 7E1610 80280790 0C0B2026 */  jal       set_variable
-/* 7E1614 80280794 24060001 */   addiu    $a2, $zero, 1
-/* 7E1618 80280798 080A01EA */  j         .L802807A8
-/* 7E161C 8028079C 00000000 */   nop      
-.L802807A0:
-/* 7E1620 802807A0 0C039D5D */  jal       add_item
-/* 7E1624 802807A4 00000000 */   nop      
-.L802807A8:
-/* 7E1628 802807A8 0C0A005F */  jal       func_8028017C
-/* 7E162C 802807AC 24040003 */   addiu    $a0, $zero, 3
-/* 7E1630 802807B0 AE620074 */  sw        $v0, 0x74($s3)
-/* 7E1634 802807B4 24020005 */  addiu     $v0, $zero, 5
-/* 7E1638 802807B8 080A024A */  j         .L80280928
-/* 7E163C 802807BC AE620070 */   sw       $v0, 0x70($s3)
-.L802807C0:
-/* 7E1640 802807C0 0C0A00B4 */  jal       func_802802D0
-/* 7E1644 802807C4 24040016 */   addiu    $a0, $zero, 0x16
-/* 7E1648 802807C8 AE620074 */  sw        $v0, 0x74($s3)
-/* 7E164C 802807CC 24020006 */  addiu     $v0, $zero, 6
-/* 7E1650 802807D0 080A024A */  j         .L80280928
-/* 7E1654 802807D4 AE620070 */   sw       $v0, 0x70($s3)
-.L802807D8:
-/* 7E1658 802807D8 8E640074 */  lw        $a0, 0x74($s3)
-/* 7E165C 802807DC 0C0B1059 */  jal       does_script_exist
-/* 7E1660 802807E0 00000000 */   nop      
-/* 7E1664 802807E4 14400051 */  bnez      $v0, .L8028092C
-/* 7E1668 802807E8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E166C 802807EC 8E430000 */  lw        $v1, ($s2)
-/* 7E1670 802807F0 3C018028 */  lui       $at, 0x8028
-/* 7E1674 802807F4 AC206534 */  sw        $zero, 0x6534($at)
-/* 7E1678 802807F8 080A0214 */  j         .L80280850
-/* 7E167C 802807FC 2402000A */   addiu    $v0, $zero, 0xa
-.L80280800:
-/* 7E1680 80280800 8E640074 */  lw        $a0, 0x74($s3)
-/* 7E1684 80280804 0C0B1059 */  jal       does_script_exist
-/* 7E1688 80280808 00000000 */   nop      
-/* 7E168C 8028080C 14400047 */  bnez      $v0, .L8028092C
-/* 7E1690 80280810 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1694 80280814 8E430000 */  lw        $v1, ($s2)
-/* 7E1698 80280818 3C018028 */  lui       $at, 0x8028
-/* 7E169C 8028081C AC306534 */  sw        $s0, 0x6534($at)
-/* 7E16A0 80280820 080A0214 */  j         .L80280850
-/* 7E16A4 80280824 2402000A */   addiu    $v0, $zero, 0xa
-.L80280828:
-/* 7E16A8 80280828 8E640074 */  lw        $a0, 0x74($s3)
-/* 7E16AC 8028082C 0C0B1059 */  jal       does_script_exist
-/* 7E16B0 80280830 00000000 */   nop      
-/* 7E16B4 80280834 1440003D */  bnez      $v0, .L8028092C
-/* 7E16B8 80280838 0000102D */   daddu    $v0, $zero, $zero
-/* 7E16BC 8028083C 8E430000 */  lw        $v1, ($s2)
-/* 7E16C0 80280840 24020001 */  addiu     $v0, $zero, 1
-/* 7E16C4 80280844 3C018028 */  lui       $at, 0x8028
-/* 7E16C8 80280848 AC226534 */  sw        $v0, 0x6534($at)
-/* 7E16CC 8028084C 2402000A */  addiu     $v0, $zero, 0xa
-.L80280850:
-/* 7E16D0 80280850 AE620070 */  sw        $v0, 0x70($s3)
-/* 7E16D4 80280854 3C018028 */  lui       $at, 0x8028
-/* 7E16D8 80280858 AC236530 */  sw        $v1, 0x6530($at)
-/* 7E16DC 8028085C 080A024B */  j         .L8028092C
-/* 7E16E0 80280860 0000102D */   daddu    $v0, $zero, $zero
-.L80280864:
-/* 7E16E4 80280864 8E640074 */  lw        $a0, 0x74($s3)
-/* 7E16E8 80280868 0C0B1059 */  jal       does_script_exist
-/* 7E16EC 8028086C 00000000 */   nop      
-/* 7E16F0 80280870 1440002E */  bnez      $v0, .L8028092C
-/* 7E16F4 80280874 0000102D */   daddu    $v0, $zero, $zero
-/* 7E16F8 80280878 8E430000 */  lw        $v1, ($s2)
-/* 7E16FC 8028087C 24020003 */  addiu     $v0, $zero, 3
-/* 7E1700 80280880 3C018028 */  lui       $at, 0x8028
-/* 7E1704 80280884 AC226534 */  sw        $v0, 0x6534($at)
-/* 7E1708 80280888 AE700070 */  sw        $s0, 0x70($s3)
-/* 7E170C 8028088C 3C018028 */  lui       $at, 0x8028
-/* 7E1710 80280890 AC236530 */  sw        $v1, 0x6530($at)
-/* 7E1714 80280894 080A024B */  j         .L8028092C
-/* 7E1718 80280898 0000102D */   daddu    $v0, $zero, $zero
-.L8028089C:
-/* 7E171C 8028089C 8E820010 */  lw        $v0, 0x10($s4)
-/* 7E1720 802808A0 3C108028 */  lui       $s0, 0x8028
-/* 7E1724 802808A4 2610652C */  addiu     $s0, $s0, 0x652c
-/* 7E1728 802808A8 1040000E */  beqz      $v0, .L802808E4
-/* 7E172C 802808AC AE000000 */   sw       $zero, ($s0)
-/* 7E1730 802808B0 8C44000C */  lw        $a0, 0xc($v0)
-/* 7E1734 802808B4 1080000B */  beqz      $a0, .L802808E4
-/* 7E1738 802808B8 24050001 */   addiu    $a1, $zero, 1
-/* 7E173C 802808BC 0C0B0CF8 */  jal       start_script
-/* 7E1740 802808C0 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1744 802808C4 3C038028 */  lui       $v1, 0x8028
-/* 7E1748 802808C8 8C636534 */  lw        $v1, 0x6534($v1)
-/* 7E174C 802808CC 3C048028 */  lui       $a0, 0x8028
-/* 7E1750 802808D0 8C846530 */  lw        $a0, 0x6530($a0)
-/* 7E1754 802808D4 AE020000 */  sw        $v0, ($s0)
-/* 7E1758 802808D8 AC55008C */  sw        $s5, 0x8c($v0)
-/* 7E175C 802808DC AC430084 */  sw        $v1, 0x84($v0)
-/* 7E1760 802808E0 AC440088 */  sw        $a0, 0x88($v0)
-.L802808E4:
-/* 7E1764 802808E4 2402000B */  addiu     $v0, $zero, 0xb
-/* 7E1768 802808E8 080A024A */  j         .L80280928
-/* 7E176C 802808EC AE620070 */   sw       $v0, 0x70($s3)
-.L802808F0:
-/* 7E1770 802808F0 3C028028 */  lui       $v0, 0x8028
-/* 7E1774 802808F4 8C42652C */  lw        $v0, 0x652c($v0)
-/* 7E1778 802808F8 10400005 */  beqz      $v0, .L80280910
-/* 7E177C 802808FC 00000000 */   nop      
-/* 7E1780 80280900 0C0B1059 */  jal       does_script_exist
-/* 7E1784 80280904 8C440144 */   lw       $a0, 0x144($v0)
-/* 7E1788 80280908 14400008 */  bnez      $v0, .L8028092C
-/* 7E178C 8028090C 0000102D */   daddu    $v0, $zero, $zero
-.L80280910:
-/* 7E1790 80280910 0C03A6CC */  jal       decrement_status_menu_disabled
-/* 7E1794 80280914 00000000 */   nop      
-/* 7E1798 80280918 0C03A5B2 */  jal       func_800E96C8
-/* 7E179C 8028091C 00000000 */   nop      
-/* 7E17A0 80280920 080A024B */  j         .L8028092C
-/* 7E17A4 80280924 24020001 */   addiu    $v0, $zero, 1
-.L80280928:
-/* 7E17A8 80280928 0000102D */  daddu     $v0, $zero, $zero
-.L8028092C:
-/* 7E17AC 8028092C 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 7E17B0 80280930 8FB60028 */  lw        $s6, 0x28($sp)
-/* 7E17B4 80280934 8FB50024 */  lw        $s5, 0x24($sp)
-/* 7E17B8 80280938 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E17BC 8028093C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E17C0 80280940 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E17C4 80280944 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E17C8 80280948 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E17CC 8028094C 03E00008 */  jr        $ra
-/* 7E17D0 80280950 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/code_7e0e80/func_80280954.s b/asm/nonmatchings/code_7e0e80/func_80280954.s
deleted file mode 100644
index 17da75e86e..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280954.s
+++ /dev/null
@@ -1,104 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280954
-/* 7E17D4 80280954 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E17D8 80280958 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E17DC 8028095C 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 7E17E0 80280960 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 7E17E4 80280964 AFBE0038 */  sw        $fp, 0x38($sp)
-/* 7E17E8 80280968 AFB70034 */  sw        $s7, 0x34($sp)
-/* 7E17EC 8028096C AFB60030 */  sw        $s6, 0x30($sp)
-/* 7E17F0 80280970 AFB5002C */  sw        $s5, 0x2c($sp)
-/* 7E17F4 80280974 AFB40028 */  sw        $s4, 0x28($sp)
-/* 7E17F8 80280978 AFB30024 */  sw        $s3, 0x24($sp)
-/* 7E17FC 8028097C AFB20020 */  sw        $s2, 0x20($sp)
-/* 7E1800 80280980 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 7E1804 80280984 AFB00018 */  sw        $s0, 0x18($sp)
-/* 7E1808 80280988 8C420144 */  lw        $v0, 0x144($v0)
-/* 7E180C 8028098C 0080B82D */  daddu     $s7, $a0, $zero
-/* 7E1810 80280990 24420028 */  addiu     $v0, $v0, 0x28
-/* 7E1814 80280994 12E00006 */  beqz      $s7, .L802809B0
-/* 7E1818 80280998 AFA20010 */   sw       $v0, 0x10($sp)
-/* 7E181C 8028099C 24020001 */  addiu     $v0, $zero, 1
-/* 7E1820 802809A0 12E20006 */  beq       $s7, $v0, .L802809BC
-/* 7E1824 802809A4 24150007 */   addiu    $s5, $zero, 7
-/* 7E1828 802809A8 080A0271 */  j         .L802809C4
-/* 7E182C 802809AC 24140020 */   addiu    $s4, $zero, 0x20
-.L802809B0:
-/* 7E1830 802809B0 24150005 */  addiu     $s5, $zero, 5
-/* 7E1834 802809B4 080A0271 */  j         .L802809C4
-/* 7E1838 802809B8 2414000A */   addiu    $s4, $zero, 0xa
-.L802809BC:
-/* 7E183C 802809BC 24150006 */  addiu     $s5, $zero, 6
-/* 7E1840 802809C0 2414000A */  addiu     $s4, $zero, 0xa
-.L802809C4:
-/* 7E1844 802809C4 0000902D */  daddu     $s2, $zero, $zero
-/* 7E1848 802809C8 12800027 */  beqz      $s4, .L80280A68
-/* 7E184C 802809CC 0240982D */   daddu    $s3, $s2, $zero
-/* 7E1850 802809D0 2AFE0002 */  slti      $fp, $s7, 2
-/* 7E1854 802809D4 3C168008 */  lui       $s6, %hi(gItemTable)
-/* 7E1858 802809D8 26D678E0 */  addiu     $s6, $s6, %lo(gItemTable)
-/* 7E185C 802809DC 3C118011 */  lui       $s1, %hi(gPlayerData)
-/* 7E1860 802809E0 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 7E1864 802809E4 8FB00010 */  lw        $s0, 0x10($sp)
-.L802809E8:
-/* 7E1868 802809E8 13C00005 */  beqz      $fp, .L80280A00
-/* 7E186C 802809EC 00000000 */   nop      
-/* 7E1870 802809F0 06E00003 */  bltz      $s7, .L80280A00
-/* 7E1874 802809F4 00000000 */   nop      
-/* 7E1878 802809F8 080A0281 */  j         .L80280A04
-/* 7E187C 802809FC 862401B4 */   lh       $a0, 0x1b4($s1)
-.L80280A00:
-/* 7E1880 80280A00 862401C8 */  lh        $a0, 0x1c8($s1)
-.L80280A04:
-/* 7E1884 80280A04 10800014 */  beqz      $a0, .L80280A58
-/* 7E1888 80280A08 00041140 */   sll      $v0, $a0, 5
-/* 7E188C 80280A0C 00561821 */  addu      $v1, $v0, $s6
-/* 7E1890 80280A10 84620004 */  lh        $v0, 4($v1)
-/* 7E1894 80280A14 3C058009 */  lui       $a1, 0x8009
-/* 7E1898 80280A18 24A5A680 */  addiu     $a1, $a1, -0x5980
-/* 7E189C 80280A1C 000210C0 */  sll       $v0, $v0, 3
-/* 7E18A0 80280A20 00451021 */  addu      $v0, $v0, $a1
-/* 7E18A4 80280A24 8C420000 */  lw        $v0, ($v0)
-/* 7E18A8 80280A28 24050001 */  addiu     $a1, $zero, 1
-/* 7E18AC 80280A2C AE120108 */  sw        $s2, 0x108($s0)
-/* 7E18B0 80280A30 AE05018C */  sw        $a1, 0x18c($s0)
-/* 7E18B4 80280A34 AE020000 */  sw        $v0, ($s0)
-/* 7E18B8 80280A38 8C620000 */  lw        $v0, ($v1)
-/* 7E18BC 80280A3C AE020084 */  sw        $v0, 0x84($s0)
-/* 7E18C0 80280A40 8C620014 */  lw        $v0, 0x14($v1)
-/* 7E18C4 80280A44 02659821 */  addu      $s3, $s3, $a1
-/* 7E18C8 80280A48 0C0A02DE */  jal       func_80280B78
-/* 7E18CC 80280A4C AE020294 */   sw       $v0, 0x294($s0)
-/* 7E18D0 80280A50 AE020210 */  sw        $v0, 0x210($s0)
-/* 7E18D4 80280A54 26100004 */  addiu     $s0, $s0, 4
-.L80280A58:
-/* 7E18D8 80280A58 26520001 */  addiu     $s2, $s2, 1
-/* 7E18DC 80280A5C 0254102A */  slt       $v0, $s2, $s4
-/* 7E18E0 80280A60 1440FFE1 */  bnez      $v0, .L802809E8
-/* 7E18E4 80280A64 26310002 */   addiu    $s1, $s1, 2
-.L80280A68:
-/* 7E18E8 80280A68 8FA40010 */  lw        $a0, 0x10($sp)
-/* 7E18EC 80280A6C AC950318 */  sw        $s5, 0x318($a0)
-/* 7E18F0 80280A70 AC930324 */  sw        $s3, 0x324($a0)
-/* 7E18F4 80280A74 0C03D3F1 */  jal       func_800F4FC4
-/* 7E18F8 80280A78 AC800328 */   sw       $zero, 0x328($a0)
-/* 7E18FC 80280A7C 0C03A625 */  jal       func_800E9894
-/* 7E1900 80280A80 00000000 */   nop      
-/* 7E1904 80280A84 0C03A63B */  jal       func_800E98EC
-/* 7E1908 80280A88 00000000 */   nop      
-/* 7E190C 80280A8C 0C03A5E3 */  jal       open_status_menu_short
-/* 7E1910 80280A90 00000000 */   nop      
-/* 7E1914 80280A94 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 7E1918 80280A98 8FBE0038 */  lw        $fp, 0x38($sp)
-/* 7E191C 80280A9C 8FB70034 */  lw        $s7, 0x34($sp)
-/* 7E1920 80280AA0 8FB60030 */  lw        $s6, 0x30($sp)
-/* 7E1924 80280AA4 8FB5002C */  lw        $s5, 0x2c($sp)
-/* 7E1928 80280AA8 8FB40028 */  lw        $s4, 0x28($sp)
-/* 7E192C 80280AAC 8FB30024 */  lw        $s3, 0x24($sp)
-/* 7E1930 80280AB0 8FB20020 */  lw        $s2, 0x20($sp)
-/* 7E1934 80280AB4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 7E1938 80280AB8 8FB00018 */  lw        $s0, 0x18($sp)
-/* 7E193C 80280ABC 03E00008 */  jr        $ra
-/* 7E1940 80280AC0 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/asm/nonmatchings/code_7e0e80/func_80280AC4.s b/asm/nonmatchings/code_7e0e80/func_80280AC4.s
deleted file mode 100644
index d2636a902e..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280AC4.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280AC4
-/* 7E1944 80280AC4 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E1948 80280AC8 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E194C 80280ACC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E1950 80280AD0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7E1954 80280AD4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E1958 80280AD8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E195C 80280ADC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E1960 80280AE0 8C420144 */  lw        $v0, 0x144($v0)
-/* 7E1964 80280AE4 0080902D */  daddu     $s2, $a0, $zero
-/* 7E1968 80280AE8 84500354 */  lh        $s0, 0x354($v0)
-/* 7E196C 80280AEC 16000003 */  bnez      $s0, .L80280AFC
-/* 7E1970 80280AF0 24510028 */   addiu    $s1, $v0, 0x28
-/* 7E1974 80280AF4 080A02CB */  j         .L80280B2C
-/* 7E1978 80280AF8 0000102D */   daddu    $v0, $zero, $zero
-.L80280AFC:
-/* 7E197C 80280AFC 0C03C4EC */  jal       func_800F13B0
-/* 7E1980 80280B00 00000000 */   nop      
-/* 7E1984 80280B04 240200FF */  addiu     $v0, $zero, 0xff
-/* 7E1988 80280B08 16020003 */  bne       $s0, $v0, .L80280B18
-/* 7E198C 80280B0C 2602FFFF */   addiu    $v0, $s0, -1
-/* 7E1990 80280B10 080A02C9 */  j         .L80280B24
-/* 7E1994 80280B14 2402FFFF */   addiu    $v0, $zero, -1
-.L80280B18:
-/* 7E1998 80280B18 00021080 */  sll       $v0, $v0, 2
-/* 7E199C 80280B1C 02221021 */  addu      $v0, $s1, $v0
-/* 7E19A0 80280B20 8C420108 */  lw        $v0, 0x108($v0)
-.L80280B24:
-/* 7E19A4 80280B24 AE420000 */  sw        $v0, ($s2)
-/* 7E19A8 80280B28 24020001 */  addiu     $v0, $zero, 1
-.L80280B2C:
-/* 7E19AC 80280B2C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7E19B0 80280B30 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E19B4 80280B34 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E19B8 80280B38 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E19BC 80280B3C 03E00008 */  jr        $ra
-/* 7E19C0 80280B40 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/code_7e0e80/func_80280B44.s b/asm/nonmatchings/code_7e0e80/func_80280B44.s
deleted file mode 100644
index 7f6e120ee0..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280B44.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280B44
-/* 7E19C4 80280B44 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E19C8 80280B48 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7E19CC 80280B4C 0C03C54E */  jal       func_800F1538
-/* 7E19D0 80280B50 00000000 */   nop      
-/* 7E19D4 80280B54 0C03A640 */  jal       func_800E9900
-/* 7E19D8 80280B58 00000000 */   nop      
-/* 7E19DC 80280B5C 0C03A631 */  jal       func_800E98C4
-/* 7E19E0 80280B60 00000000 */   nop      
-/* 7E19E4 80280B64 0C03A5EE */  jal       func_800E97B8
-/* 7E19E8 80280B68 00000000 */   nop      
-/* 7E19EC 80280B6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7E19F0 80280B70 03E00008 */  jr        $ra
-/* 7E19F4 80280B74 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_7e0e80/func_80280B78.s b/asm/nonmatchings/code_7e0e80/func_80280B78.s
deleted file mode 100644
index 9f96c4c9fa..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280B78.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280B78
-/* 7E19F8 80280B78 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E19FC 80280B7C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E1A00 80280B80 8C420144 */  lw        $v0, 0x144($v0)
-/* 7E1A04 80280B84 84460004 */  lh        $a2, 4($v0)
-/* 7E1A08 80280B88 8C43001C */  lw        $v1, 0x1c($v0)
-/* 7E1A0C 80280B8C 18C0000A */  blez      $a2, .L80280BB8
-/* 7E1A10 80280B90 0000282D */   daddu    $a1, $zero, $zero
-.L80280B94:
-/* 7E1A14 80280B94 8C620000 */  lw        $v0, ($v1)
-/* 7E1A18 80280B98 14440004 */  bne       $v0, $a0, .L80280BAC
-/* 7E1A1C 80280B9C 24A50001 */   addiu    $a1, $a1, 1
-/* 7E1A20 80280BA0 8C620004 */  lw        $v0, 4($v1)
-/* 7E1A24 80280BA4 03E00008 */  jr        $ra
-/* 7E1A28 80280BA8 00000000 */   nop      
-.L80280BAC:
-/* 7E1A2C 80280BAC 00A6102A */  slt       $v0, $a1, $a2
-/* 7E1A30 80280BB0 1440FFF8 */  bnez      $v0, .L80280B94
-/* 7E1A34 80280BB4 2463000C */   addiu    $v1, $v1, 0xc
-.L80280BB8:
-/* 7E1A38 80280BB8 00041140 */  sll       $v0, $a0, 5
-/* 7E1A3C 80280BBC 3C018008 */  lui       $at, 0x8008
-/* 7E1A40 80280BC0 00220821 */  addu      $at, $at, $v0
-/* 7E1A44 80280BC4 842278EC */  lh        $v0, 0x78ec($at)
-/* 7E1A48 80280BC8 03E00008 */  jr        $ra
-/* 7E1A4C 80280BCC 00000000 */   nop      
diff --git a/asm/nonmatchings/code_7e0e80/func_80280BD0.s b/asm/nonmatchings/code_7e0e80/func_80280BD0.s
deleted file mode 100644
index b4e4d7c2fd..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80280BD0.s
+++ /dev/null
@@ -1,604 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80280BD0
-/* 7E1A50 80280BD0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E1A54 80280BD4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E1A58 80280BD8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E1A5C 80280BDC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E1A60 80280BE0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E1A64 80280BE4 3C128011 */  lui       $s2, %hi(gPlayerData)
-/* 7E1A68 80280BE8 2652F290 */  addiu     $s2, $s2, %lo(gPlayerData)
-/* 7E1A6C 80280BEC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E1A70 80280BF0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E1A74 80280BF4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E1A78 80280BF8 8C500144 */  lw        $s0, 0x144($v0)
-/* 7E1A7C 80280BFC 10A00006 */  beqz      $a1, .L80280C18
-/* 7E1A80 80280C00 0080882D */   daddu    $s1, $a0, $zero
-/* 7E1A84 80280C04 0C0A0000 */  jal       func_80280000
-/* 7E1A88 80280C08 24040004 */   addiu    $a0, $zero, 4
-/* 7E1A8C 80280C0C AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1A90 80280C10 24020004 */  addiu     $v0, $zero, 4
-/* 7E1A94 80280C14 AE220070 */  sw        $v0, 0x70($s1)
-.L80280C18:
-/* 7E1A98 80280C18 8E230070 */  lw        $v1, 0x70($s1)
-/* 7E1A9C 80280C1C 24130020 */  addiu     $s3, $zero, 0x20
-/* 7E1AA0 80280C20 10730117 */  beq       $v1, $s3, .L80281080
-/* 7E1AA4 80280C24 28620021 */   slti     $v0, $v1, 0x21
-/* 7E1AA8 80280C28 10400027 */  beqz      $v0, .L80280CC8
-/* 7E1AAC 80280C2C 24020007 */   addiu    $v0, $zero, 7
-/* 7E1AB0 80280C30 1062018C */  beq       $v1, $v0, .L80281264
-/* 7E1AB4 80280C34 28620008 */   slti     $v0, $v1, 8
-/* 7E1AB8 80280C38 10400011 */  beqz      $v0, .L80280C80
-/* 7E1ABC 80280C3C 24020003 */   addiu    $v0, $zero, 3
-/* 7E1AC0 80280C40 106200D9 */  beq       $v1, $v0, .L80280FA8
-/* 7E1AC4 80280C44 28620004 */   slti     $v0, $v1, 4
-/* 7E1AC8 80280C48 10400007 */  beqz      $v0, .L80280C68
-/* 7E1ACC 80280C4C 24020004 */   addiu    $v0, $zero, 4
-/* 7E1AD0 80280C50 106001DC */  beqz      $v1, .L802813C4
-/* 7E1AD4 80280C54 24020002 */   addiu    $v0, $zero, 2
-/* 7E1AD8 80280C58 106200AF */  beq       $v1, $v0, .L80280F18
-/* 7E1ADC 80280C5C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1AE0 80280C60 080A0506 */  j         .L80281418
-/* 7E1AE4 80280C64 00000000 */   nop      
-.L80280C68:
-/* 7E1AE8 80280C68 1062003F */  beq       $v1, $v0, .L80280D68
-/* 7E1AEC 80280C6C 24020005 */   addiu    $v0, $zero, 5
-/* 7E1AF0 80280C70 1062012B */  beq       $v1, $v0, .L80281120
-/* 7E1AF4 80280C74 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1AF8 80280C78 080A0506 */  j         .L80281418
-/* 7E1AFC 80280C7C 00000000 */   nop      
-.L80280C80:
-/* 7E1B00 80280C80 2402000C */  addiu     $v0, $zero, 0xc
-/* 7E1B04 80280C84 10620108 */  beq       $v1, $v0, .L802810A8
-/* 7E1B08 80280C88 2862000D */   slti     $v0, $v1, 0xd
-/* 7E1B0C 80280C8C 10400007 */  beqz      $v0, .L80280CAC
-/* 7E1B10 80280C90 24020009 */   addiu    $v0, $zero, 9
-/* 7E1B14 80280C94 106201CB */  beq       $v1, $v0, .L802813C4
-/* 7E1B18 80280C98 2402000A */   addiu    $v0, $zero, 0xa
-/* 7E1B1C 80280C9C 106201D1 */  beq       $v1, $v0, .L802813E4
-/* 7E1B20 80280CA0 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1B24 80280CA4 080A0506 */  j         .L80281418
-/* 7E1B28 80280CA8 00000000 */   nop      
-.L80280CAC:
-/* 7E1B2C 80280CAC 24020015 */  addiu     $v0, $zero, 0x15
-/* 7E1B30 80280CB0 106200A0 */  beq       $v1, $v0, .L80280F34
-/* 7E1B34 80280CB4 2402001F */   addiu    $v0, $zero, 0x1f
-/* 7E1B38 80280CB8 106200C5 */  beq       $v1, $v0, .L80280FD0
-/* 7E1B3C 80280CBC 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1B40 80280CC0 080A0506 */  j         .L80281418
-/* 7E1B44 80280CC4 00000000 */   nop      
-.L80280CC8:
-/* 7E1B48 80280CC8 24020047 */  addiu     $v0, $zero, 0x47
-/* 7E1B4C 80280CCC 1062016F */  beq       $v1, $v0, .L8028128C
-/* 7E1B50 80280CD0 28620048 */   slti     $v0, $v1, 0x48
-/* 7E1B54 80280CD4 10400012 */  beqz      $v0, .L80280D20
-/* 7E1B58 80280CD8 24020033 */   addiu    $v0, $zero, 0x33
-/* 7E1B5C 80280CDC 10620117 */  beq       $v1, $v0, .L8028113C
-/* 7E1B60 80280CE0 28620034 */   slti     $v0, $v1, 0x34
-/* 7E1B64 80280CE4 10400007 */  beqz      $v0, .L80280D04
-/* 7E1B68 80280CE8 24020029 */   addiu    $v0, $zero, 0x29
-/* 7E1B6C 80280CEC 10620027 */  beq       $v1, $v0, .L80280D8C
-/* 7E1B70 80280CF0 2402002A */   addiu    $v0, $zero, 0x2a
-/* 7E1B74 80280CF4 106201B3 */  beq       $v1, $v0, .L802813C4
-/* 7E1B78 80280CF8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1B7C 80280CFC 080A0506 */  j         .L80281418
-/* 7E1B80 80280D00 00000000 */   nop      
-.L80280D04:
-/* 7E1B84 80280D04 24020034 */  addiu     $v0, $zero, 0x34
-/* 7E1B88 80280D08 10620133 */  beq       $v1, $v0, .L802811D8
-/* 7E1B8C 80280D0C 24020035 */   addiu    $v0, $zero, 0x35
-/* 7E1B90 80280D10 1062013B */  beq       $v1, $v0, .L80281200
-/* 7E1B94 80280D14 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1B98 80280D18 080A0506 */  j         .L80281418
-/* 7E1B9C 80280D1C 00000000 */   nop      
-.L80280D20:
-/* 7E1BA0 80280D20 240200C9 */  addiu     $v0, $zero, 0xc9
-/* 7E1BA4 80280D24 10620072 */  beq       $v1, $v0, .L80280EF0
-/* 7E1BA8 80280D28 286200CA */   slti     $v0, $v1, 0xca
-/* 7E1BAC 80280D2C 10400007 */  beqz      $v0, .L80280D4C
-/* 7E1BB0 80280D30 24020048 */   addiu    $v0, $zero, 0x48
-/* 7E1BB4 80280D34 1062017E */  beq       $v1, $v0, .L80281330
-/* 7E1BB8 80280D38 24020049 */   addiu    $v0, $zero, 0x49
-/* 7E1BBC 80280D3C 1062018C */  beq       $v1, $v0, .L80281370
-/* 7E1BC0 80280D40 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1BC4 80280D44 080A0506 */  j         .L80281418
-/* 7E1BC8 80280D48 00000000 */   nop      
-.L80280D4C:
-/* 7E1BCC 80280D4C 240201F5 */  addiu     $v0, $zero, 0x1f5
-/* 7E1BD0 80280D50 106200EA */  beq       $v1, $v0, .L802810FC
-/* 7E1BD4 80280D54 240202BD */   addiu    $v0, $zero, 0x2bd
-/* 7E1BD8 80280D58 10620138 */  beq       $v1, $v0, .L8028123C
-/* 7E1BDC 80280D5C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1BE0 80280D60 080A0506 */  j         .L80281418
-/* 7E1BE4 80280D64 00000000 */   nop      
-.L80280D68:
-/* 7E1BE8 80280D68 0C0B1059 */  jal       does_script_exist
-/* 7E1BEC 80280D6C 8E240074 */   lw       $a0, 0x74($s1)
-/* 7E1BF0 80280D70 144001A9 */  bnez      $v0, .L80281418
-/* 7E1BF4 80280D74 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1BF8 80280D78 3C04001E */  lui       $a0, 0x1e
-/* 7E1BFC 80280D7C 34840003 */  ori       $a0, $a0, 3
-/* 7E1C00 80280D80 26250078 */  addiu     $a1, $s1, 0x78
-/* 7E1C04 80280D84 080A04D5 */  j         .L80281354
-/* 7E1C08 80280D88 24020029 */   addiu    $v0, $zero, 0x29
-.L80280D8C:
-/* 7E1C0C 80280D8C 8E240078 */  lw        $a0, 0x78($s1)
-/* 7E1C10 80280D90 24020001 */  addiu     $v0, $zero, 1
-/* 7E1C14 80280D94 148201A0 */  bne       $a0, $v0, .L80281418
-/* 7E1C18 80280D98 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1C1C 80280D9C 3C028028 */  lui       $v0, 0x8028
-/* 7E1C20 80280DA0 8C426538 */  lw        $v0, 0x6538($v0)
-/* 7E1C24 80280DA4 904304E8 */  lbu       $v1, 0x4e8($v0)
-/* 7E1C28 80280DA8 10640012 */  beq       $v1, $a0, .L80280DF4
-/* 7E1C2C 80280DAC 28620002 */   slti     $v0, $v1, 2
-/* 7E1C30 80280DB0 10400005 */  beqz      $v0, .L80280DC8
-/* 7E1C34 80280DB4 24020002 */   addiu    $v0, $zero, 2
-/* 7E1C38 80280DB8 10600009 */  beqz      $v1, .L80280DE0
-/* 7E1C3C 80280DBC 00000000 */   nop      
-/* 7E1C40 80280DC0 080A03B6 */  j         .L80280ED8
-/* 7E1C44 80280DC4 00000000 */   nop      
-.L80280DC8:
-/* 7E1C48 80280DC8 10620018 */  beq       $v1, $v0, .L80280E2C
-/* 7E1C4C 80280DCC 24020003 */   addiu    $v0, $zero, 3
-/* 7E1C50 80280DD0 1062002D */  beq       $v1, $v0, .L80280E88
-/* 7E1C54 80280DD4 00000000 */   nop      
-/* 7E1C58 80280DD8 080A03B6 */  j         .L80280ED8
-/* 7E1C5C 80280DDC 00000000 */   nop      
-.L80280DE0:
-/* 7E1C60 80280DE0 0C0A005F */  jal       func_8028017C
-/* 7E1C64 80280DE4 24040005 */   addiu    $a0, $zero, 5
-/* 7E1C68 80280DE8 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1C6C 80280DEC 080A0505 */  j         .L80281414
-/* 7E1C70 80280DF0 AE200070 */   sw       $zero, 0x70($s1)
-.L80280DF4:
-/* 7E1C74 80280DF4 0C039D7B */  jal       get_item_count
-/* 7E1C78 80280DF8 00000000 */   nop      
-/* 7E1C7C 80280DFC 14400005 */  bnez      $v0, .L80280E14
-/* 7E1C80 80280E00 00000000 */   nop      
-/* 7E1C84 80280E04 0C0A005F */  jal       func_8028017C
-/* 7E1C88 80280E08 24040006 */   addiu    $a0, $zero, 6
-/* 7E1C8C 80280E0C 080A04EE */  j         .L802813B8
-/* 7E1C90 80280E10 AE220074 */   sw       $v0, 0x74($s1)
-.L80280E14:
-/* 7E1C94 80280E14 0C0A005F */  jal       func_8028017C
-/* 7E1C98 80280E18 24040007 */   addiu    $a0, $zero, 7
-/* 7E1C9C 80280E1C AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1CA0 80280E20 240200C9 */  addiu     $v0, $zero, 0xc9
-/* 7E1CA4 80280E24 080A0505 */  j         .L80281414
-/* 7E1CA8 80280E28 AE220070 */   sw       $v0, 0x70($s1)
-.L80280E2C:
-/* 7E1CAC 80280E2C 0C039D7B */  jal       get_item_count
-/* 7E1CB0 80280E30 00000000 */   nop      
-/* 7E1CB4 80280E34 14400005 */  bnez      $v0, .L80280E4C
-/* 7E1CB8 80280E38 00000000 */   nop      
-/* 7E1CBC 80280E3C 0C0A005F */  jal       func_8028017C
-/* 7E1CC0 80280E40 2404000C */   addiu    $a0, $zero, 0xc
-/* 7E1CC4 80280E44 080A04EE */  j         .L802813B8
-/* 7E1CC8 80280E48 AE220074 */   sw       $v0, 0x74($s1)
-.L80280E4C:
-/* 7E1CCC 80280E4C 0C039E12 */  jal       get_stored_empty_count
-/* 7E1CD0 80280E50 00000000 */   nop      
-/* 7E1CD4 80280E54 14400005 */  bnez      $v0, .L80280E6C
-/* 7E1CD8 80280E58 00000000 */   nop      
-/* 7E1CDC 80280E5C 0C0A005F */  jal       func_8028017C
-/* 7E1CE0 80280E60 2404000D */   addiu    $a0, $zero, 0xd
-/* 7E1CE4 80280E64 080A04EE */  j         .L802813B8
-/* 7E1CE8 80280E68 AE220074 */   sw       $v0, 0x74($s1)
-.L80280E6C:
-/* 7E1CEC 80280E6C 0C039E12 */  jal       get_stored_empty_count
-/* 7E1CF0 80280E70 00000000 */   nop      
-/* 7E1CF4 80280E74 2404000E */  addiu     $a0, $zero, 0xe
-/* 7E1CF8 80280E78 0C0A0082 */  jal       func_80280208
-/* 7E1CFC 80280E7C 0040282D */   daddu    $a1, $v0, $zero
-/* 7E1D00 80280E80 080A048C */  j         .L80281230
-/* 7E1D04 80280E84 AE220074 */   sw       $v0, 0x74($s1)
-.L80280E88:
-/* 7E1D08 80280E88 0C039E05 */  jal       get_stored_count
-/* 7E1D0C 80280E8C 00000000 */   nop      
-/* 7E1D10 80280E90 14400005 */  bnez      $v0, .L80280EA8
-/* 7E1D14 80280E94 00000000 */   nop      
-/* 7E1D18 80280E98 0C0A005F */  jal       func_8028017C
-/* 7E1D1C 80280E9C 24040011 */   addiu    $a0, $zero, 0x11
-/* 7E1D20 80280EA0 080A04EE */  j         .L802813B8
-/* 7E1D24 80280EA4 AE220074 */   sw       $v0, 0x74($s1)
-.L80280EA8:
-/* 7E1D28 80280EA8 0C039D88 */  jal       get_item_empty_count
-/* 7E1D2C 80280EAC 00000000 */   nop      
-/* 7E1D30 80280EB0 14400005 */  bnez      $v0, .L80280EC8
-/* 7E1D34 80280EB4 00000000 */   nop      
-/* 7E1D38 80280EB8 0C0A005F */  jal       func_8028017C
-/* 7E1D3C 80280EBC 24040012 */   addiu    $a0, $zero, 0x12
-/* 7E1D40 80280EC0 080A04EE */  j         .L802813B8
-/* 7E1D44 80280EC4 AE220074 */   sw       $v0, 0x74($s1)
-.L80280EC8:
-/* 7E1D48 80280EC8 0C0A005F */  jal       func_8028017C
-/* 7E1D4C 80280ECC 24040013 */   addiu    $a0, $zero, 0x13
-/* 7E1D50 80280ED0 080A04E8 */  j         .L802813A0
-/* 7E1D54 80280ED4 AE220074 */   sw       $v0, 0x74($s1)
-.L80280ED8:
-/* 7E1D58 80280ED8 0C0A00D7 */  jal       func_8028035C
-/* 7E1D5C 80280EDC 00000000 */   nop      
-/* 7E1D60 80280EE0 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1D64 80280EE4 2402002A */  addiu     $v0, $zero, 0x2a
-/* 7E1D68 80280EE8 080A0505 */  j         .L80281414
-/* 7E1D6C 80280EEC AE220070 */   sw       $v0, 0x70($s1)
-.L80280EF0:
-/* 7E1D70 80280EF0 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E1D74 80280EF4 0C0B1059 */  jal       does_script_exist
-/* 7E1D78 80280EF8 00000000 */   nop      
-/* 7E1D7C 80280EFC 14400146 */  bnez      $v0, .L80281418
-/* 7E1D80 80280F00 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1D84 80280F04 0C0A0255 */  jal       func_80280954
-/* 7E1D88 80280F08 0000202D */   daddu    $a0, $zero, $zero
-/* 7E1D8C 80280F0C 24020002 */  addiu     $v0, $zero, 2
-/* 7E1D90 80280F10 080A0505 */  j         .L80281414
-/* 7E1D94 80280F14 AE220070 */   sw       $v0, 0x70($s1)
-.L80280F18:
-/* 7E1D98 80280F18 0C0A02B1 */  jal       func_80280AC4
-/* 7E1D9C 80280F1C 2604000C */   addiu    $a0, $s0, 0xc
-/* 7E1DA0 80280F20 24030001 */  addiu     $v1, $zero, 1
-/* 7E1DA4 80280F24 1443013C */  bne       $v0, $v1, .L80281418
-/* 7E1DA8 80280F28 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1DAC 80280F2C 080A049F */  j         .L8028127C
-/* 7E1DB0 80280F30 24020015 */   addiu    $v0, $zero, 0x15
-.L80280F34:
-/* 7E1DB4 80280F34 8E220074 */  lw        $v0, 0x74($s1)
-/* 7E1DB8 80280F38 1C4000D7 */  bgtz      $v0, .L80281298
-/* 7E1DBC 80280F3C 2442FFFF */   addiu    $v0, $v0, -1
-/* 7E1DC0 80280F40 0C0A02D1 */  jal       func_80280B44
-/* 7E1DC4 80280F44 00000000 */   nop      
-/* 7E1DC8 80280F48 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E1DCC 80280F4C 04400012 */  bltz      $v0, .L80280F98
-/* 7E1DD0 80280F50 00021040 */   sll      $v0, $v0, 1
-/* 7E1DD4 80280F54 00521021 */  addu      $v0, $v0, $s2
-/* 7E1DD8 80280F58 844401B4 */  lh        $a0, 0x1b4($v0)
-/* 7E1DDC 80280F5C 3C028008 */  lui       $v0, %hi(gItemTable)
-/* 7E1DE0 80280F60 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
-/* 7E1DE4 80280F64 00048140 */  sll       $s0, $a0, 5
-/* 7E1DE8 80280F68 0C0A02DE */  jal       func_80280B78
-/* 7E1DEC 80280F6C 02028021 */   addu     $s0, $s0, $v0
-/* 7E1DF0 80280F70 24040008 */  addiu     $a0, $zero, 8
-/* 7E1DF4 80280F74 0040302D */  daddu     $a2, $v0, $zero
-/* 7E1DF8 80280F78 8E050000 */  lw        $a1, ($s0)
-/* 7E1DFC 80280F7C 0C0A0022 */  jal       func_80280088
-/* 7E1E00 80280F80 2407FFFF */   addiu    $a3, $zero, -1
-/* 7E1E04 80280F84 0C03A546 */  jal       show_coin_counter
-/* 7E1E08 80280F88 AE220074 */   sw       $v0, 0x74($s1)
-/* 7E1E0C 80280F8C 24020003 */  addiu     $v0, $zero, 3
-/* 7E1E10 80280F90 080A0505 */  j         .L80281414
-/* 7E1E14 80280F94 AE220070 */   sw       $v0, 0x70($s1)
-.L80280F98:
-/* 7E1E18 80280F98 0C0A0000 */  jal       func_80280000
-/* 7E1E1C 80280F9C 24040016 */   addiu    $a0, $zero, 0x16
-/* 7E1E20 80280FA0 080A04EE */  j         .L802813B8
-/* 7E1E24 80280FA4 AE220074 */   sw       $v0, 0x74($s1)
-.L80280FA8:
-/* 7E1E28 80280FA8 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E1E2C 80280FAC 0C0B1059 */  jal       does_script_exist
-/* 7E1E30 80280FB0 00000000 */   nop      
-/* 7E1E34 80280FB4 14400118 */  bnez      $v0, .L80281418
-/* 7E1E38 80280FB8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1E3C 80280FBC 3C04001E */  lui       $a0, 0x1e
-/* 7E1E40 80280FC0 34840002 */  ori       $a0, $a0, 2
-/* 7E1E44 80280FC4 26250078 */  addiu     $a1, $s1, 0x78
-/* 7E1E48 80280FC8 080A04D5 */  j         .L80281354
-/* 7E1E4C 80280FCC 2402001F */   addiu    $v0, $zero, 0x1f
-.L80280FD0:
-/* 7E1E50 80280FD0 8E230078 */  lw        $v1, 0x78($s1)
-/* 7E1E54 80280FD4 24020001 */  addiu     $v0, $zero, 1
-/* 7E1E58 80280FD8 1462010F */  bne       $v1, $v0, .L80281418
-/* 7E1E5C 80280FDC 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1E60 80280FE0 3C028028 */  lui       $v0, 0x8028
-/* 7E1E64 80280FE4 8C426538 */  lw        $v0, 0x6538($v0)
-/* 7E1E68 80280FE8 904204E8 */  lbu       $v0, 0x4e8($v0)
-/* 7E1E6C 80280FEC 1440001D */  bnez      $v0, .L80281064
-/* 7E1E70 80280FF0 00000000 */   nop      
-/* 7E1E74 80280FF4 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E1E78 80280FF8 00021040 */  sll       $v0, $v0, 1
-/* 7E1E7C 80280FFC 00521021 */  addu      $v0, $v0, $s2
-/* 7E1E80 80281000 0C0A02DE */  jal       func_80280B78
-/* 7E1E84 80281004 844401B4 */   lh       $a0, 0x1b4($v0)
-/* 7E1E88 80281008 0C03A830 */  jal       add_coins
-/* 7E1E8C 8028100C 0040202D */   daddu    $a0, $v0, $zero
-/* 7E1E90 80281010 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E1E94 80281014 00021040 */  sll       $v0, $v0, 1
-/* 7E1E98 80281018 00521021 */  addu      $v0, $v0, $s2
-/* 7E1E9C 8028101C 0C039D7B */  jal       get_item_count
-/* 7E1EA0 80281020 A44001B4 */   sh       $zero, 0x1b4($v0)
-/* 7E1EA4 80281024 14400009 */  bnez      $v0, .L8028104C
-/* 7E1EA8 80281028 00000000 */   nop      
-/* 7E1EAC 8028102C 0C0A00B4 */  jal       func_802802D0
-/* 7E1EB0 80281030 2404000B */   addiu    $a0, $zero, 0xb
-/* 7E1EB4 80281034 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1EB8 80281038 24020009 */  addiu     $v0, $zero, 9
-/* 7E1EBC 8028103C 0C03A5A6 */  jal       hide_coin_counter
-/* 7E1EC0 80281040 AE220070 */   sw       $v0, 0x70($s1)
-/* 7E1EC4 80281044 080A0506 */  j         .L80281418
-/* 7E1EC8 80281048 0000102D */   daddu    $v0, $zero, $zero
-.L8028104C:
-/* 7E1ECC 8028104C 0C0A00B4 */  jal       func_802802D0
-/* 7E1ED0 80281050 2404000A */   addiu    $a0, $zero, 0xa
-/* 7E1ED4 80281054 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1ED8 80281058 24020020 */  addiu     $v0, $zero, 0x20
-/* 7E1EDC 8028105C 080A0505 */  j         .L80281414
-/* 7E1EE0 80281060 AE220070 */   sw       $v0, 0x70($s1)
-.L80281064:
-/* 7E1EE4 80281064 0C0A00B4 */  jal       func_802802D0
-/* 7E1EE8 80281068 24040009 */   addiu    $a0, $zero, 9
-/* 7E1EEC 8028106C AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1EF0 80281070 0C03A5A6 */  jal       hide_coin_counter
-/* 7E1EF4 80281074 AE330070 */   sw       $s3, 0x70($s1)
-/* 7E1EF8 80281078 080A0506 */  j         .L80281418
-/* 7E1EFC 8028107C 0000102D */   daddu    $v0, $zero, $zero
-.L80281080:
-/* 7E1F00 80281080 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E1F04 80281084 0C0B1059 */  jal       does_script_exist
-/* 7E1F08 80281088 00000000 */   nop      
-/* 7E1F0C 8028108C 144000E2 */  bnez      $v0, .L80281418
-/* 7E1F10 80281090 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1F14 80281094 3C04001E */  lui       $a0, 0x1e
-/* 7E1F18 80281098 34840004 */  ori       $a0, $a0, 4
-/* 7E1F1C 8028109C 26250078 */  addiu     $a1, $s1, 0x78
-/* 7E1F20 802810A0 080A04D5 */  j         .L80281354
-/* 7E1F24 802810A4 2402000C */   addiu    $v0, $zero, 0xc
-.L802810A8:
-/* 7E1F28 802810A8 8E230078 */  lw        $v1, 0x78($s1)
-/* 7E1F2C 802810AC 24020001 */  addiu     $v0, $zero, 1
-/* 7E1F30 802810B0 146200D9 */  bne       $v1, $v0, .L80281418
-/* 7E1F34 802810B4 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1F38 802810B8 3C028028 */  lui       $v0, 0x8028
-/* 7E1F3C 802810BC 8C426538 */  lw        $v0, 0x6538($v0)
-/* 7E1F40 802810C0 904204E8 */  lbu       $v0, 0x4e8($v0)
-/* 7E1F44 802810C4 14400009 */  bnez      $v0, .L802810EC
-/* 7E1F48 802810C8 00000000 */   nop      
-/* 7E1F4C 802810CC 0C0A00D7 */  jal       func_8028035C
-/* 7E1F50 802810D0 00000000 */   nop      
-/* 7E1F54 802810D4 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E1F58 802810D8 240200C9 */  addiu     $v0, $zero, 0xc9
-/* 7E1F5C 802810DC 0C03A5B2 */  jal       func_800E96C8
-/* 7E1F60 802810E0 AE220070 */   sw       $v0, 0x70($s1)
-/* 7E1F64 802810E4 080A0506 */  j         .L80281418
-/* 7E1F68 802810E8 0000102D */   daddu    $v0, $zero, $zero
-.L802810EC:
-/* 7E1F6C 802810EC 0C03A5B2 */  jal       func_800E96C8
-/* 7E1F70 802810F0 00000000 */   nop      
-/* 7E1F74 802810F4 080A04EB */  j         .L802813AC
-/* 7E1F78 802810F8 00000000 */   nop      
-.L802810FC:
-/* 7E1F7C 802810FC 0C0B1059 */  jal       does_script_exist
-/* 7E1F80 80281100 8E240074 */   lw       $a0, 0x74($s1)
-/* 7E1F84 80281104 144000C4 */  bnez      $v0, .L80281418
-/* 7E1F88 80281108 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1F8C 8028110C 0C0A0255 */  jal       func_80280954
-/* 7E1F90 80281110 24040001 */   addiu    $a0, $zero, 1
-/* 7E1F94 80281114 24020005 */  addiu     $v0, $zero, 5
-/* 7E1F98 80281118 080A0505 */  j         .L80281414
-/* 7E1F9C 8028111C AE220070 */   sw       $v0, 0x70($s1)
-.L80281120:
-/* 7E1FA0 80281120 0C0A02B1 */  jal       func_80280AC4
-/* 7E1FA4 80281124 2604000C */   addiu    $a0, $s0, 0xc
-/* 7E1FA8 80281128 24030001 */  addiu     $v1, $zero, 1
-/* 7E1FAC 8028112C 144300BA */  bne       $v0, $v1, .L80281418
-/* 7E1FB0 80281130 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1FB4 80281134 080A049F */  j         .L8028127C
-/* 7E1FB8 80281138 24020033 */   addiu    $v0, $zero, 0x33
-.L8028113C:
-/* 7E1FBC 8028113C 8E220074 */  lw        $v0, 0x74($s1)
-/* 7E1FC0 80281140 1C400055 */  bgtz      $v0, .L80281298
-/* 7E1FC4 80281144 2442FFFF */   addiu    $v0, $v0, -1
-/* 7E1FC8 80281148 0C0A02D1 */  jal       func_80280B44
-/* 7E1FCC 8028114C 00000000 */   nop      
-/* 7E1FD0 80281150 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E1FD4 80281154 0440001C */  bltz      $v0, .L802811C8
-/* 7E1FD8 80281158 00021040 */   sll      $v0, $v0, 1
-/* 7E1FDC 8028115C 00521021 */  addu      $v0, $v0, $s2
-/* 7E1FE0 80281160 0C039DF1 */  jal       store_item
-/* 7E1FE4 80281164 844401B4 */   lh       $a0, 0x1b4($v0)
-/* 7E1FE8 80281168 04400005 */  bltz      $v0, .L80281180
-/* 7E1FEC 8028116C 00000000 */   nop      
-/* 7E1FF0 80281170 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E1FF4 80281174 00021040 */  sll       $v0, $v0, 1
-/* 7E1FF8 80281178 00521021 */  addu      $v0, $v0, $s2
-/* 7E1FFC 8028117C A44001B4 */  sh        $zero, 0x1b4($v0)
-.L80281180:
-/* 7E2000 80281180 0C039D7B */  jal       get_item_count
-/* 7E2004 80281184 00000000 */   nop      
-/* 7E2008 80281188 10400005 */  beqz      $v0, .L802811A0
-/* 7E200C 8028118C 00000000 */   nop      
-/* 7E2010 80281190 0C039E12 */  jal       get_stored_empty_count
-/* 7E2014 80281194 00000000 */   nop      
-/* 7E2018 80281198 14400005 */  bnez      $v0, .L802811B0
-/* 7E201C 8028119C 00000000 */   nop      
-.L802811A0:
-/* 7E2020 802811A0 0C0A0000 */  jal       func_80280000
-/* 7E2024 802811A4 2404000F */   addiu    $a0, $zero, 0xf
-/* 7E2028 802811A8 080A04EE */  j         .L802813B8
-/* 7E202C 802811AC AE220074 */   sw       $v0, 0x74($s1)
-.L802811B0:
-/* 7E2030 802811B0 0C0A0000 */  jal       func_80280000
-/* 7E2034 802811B4 24040010 */   addiu    $a0, $zero, 0x10
-/* 7E2038 802811B8 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E203C 802811BC 24020034 */  addiu     $v0, $zero, 0x34
-/* 7E2040 802811C0 080A0505 */  j         .L80281414
-/* 7E2044 802811C4 AE220070 */   sw       $v0, 0x70($s1)
-.L802811C8:
-/* 7E2048 802811C8 0C0A0000 */  jal       func_80280000
-/* 7E204C 802811CC 24040016 */   addiu    $a0, $zero, 0x16
-/* 7E2050 802811D0 080A04EE */  j         .L802813B8
-/* 7E2054 802811D4 AE220074 */   sw       $v0, 0x74($s1)
-.L802811D8:
-/* 7E2058 802811D8 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E205C 802811DC 0C0B1059 */  jal       does_script_exist
-/* 7E2060 802811E0 00000000 */   nop      
-/* 7E2064 802811E4 1440008C */  bnez      $v0, .L80281418
-/* 7E2068 802811E8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E206C 802811EC 3C04001E */  lui       $a0, 0x1e
-/* 7E2070 802811F0 34840005 */  ori       $a0, $a0, 5
-/* 7E2074 802811F4 26250078 */  addiu     $a1, $s1, 0x78
-/* 7E2078 802811F8 080A04D5 */  j         .L80281354
-/* 7E207C 802811FC 24020035 */   addiu    $v0, $zero, 0x35
-.L80281200:
-/* 7E2080 80281200 8E230078 */  lw        $v1, 0x78($s1)
-/* 7E2084 80281204 24020001 */  addiu     $v0, $zero, 1
-/* 7E2088 80281208 14620083 */  bne       $v1, $v0, .L80281418
-/* 7E208C 8028120C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E2090 80281210 3C028028 */  lui       $v0, 0x8028
-/* 7E2094 80281214 8C426538 */  lw        $v0, 0x6538($v0)
-/* 7E2098 80281218 904204E8 */  lbu       $v0, 0x4e8($v0)
-/* 7E209C 8028121C 14400063 */  bnez      $v0, .L802813AC
-/* 7E20A0 80281220 00000000 */   nop      
-/* 7E20A4 80281224 0C0A00D7 */  jal       func_8028035C
-/* 7E20A8 80281228 00000000 */   nop      
-/* 7E20AC 8028122C AE220074 */  sw        $v0, 0x74($s1)
-.L80281230:
-/* 7E20B0 80281230 240201F5 */  addiu     $v0, $zero, 0x1f5
-/* 7E20B4 80281234 080A0505 */  j         .L80281414
-/* 7E20B8 80281238 AE220070 */   sw       $v0, 0x70($s1)
-.L8028123C:
-/* 7E20BC 8028123C 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E20C0 80281240 0C0B1059 */  jal       does_script_exist
-/* 7E20C4 80281244 00000000 */   nop      
-/* 7E20C8 80281248 14400073 */  bnez      $v0, .L80281418
-/* 7E20CC 8028124C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E20D0 80281250 0C0A0255 */  jal       func_80280954
-/* 7E20D4 80281254 24040002 */   addiu    $a0, $zero, 2
-/* 7E20D8 80281258 24020007 */  addiu     $v0, $zero, 7
-/* 7E20DC 8028125C 080A0505 */  j         .L80281414
-/* 7E20E0 80281260 AE220070 */   sw       $v0, 0x70($s1)
-.L80281264:
-/* 7E20E4 80281264 0C0A02B1 */  jal       func_80280AC4
-/* 7E20E8 80281268 2604000C */   addiu    $a0, $s0, 0xc
-/* 7E20EC 8028126C 24030001 */  addiu     $v1, $zero, 1
-/* 7E20F0 80281270 14430069 */  bne       $v0, $v1, .L80281418
-/* 7E20F4 80281274 0000102D */   daddu    $v0, $zero, $zero
-/* 7E20F8 80281278 24020047 */  addiu     $v0, $zero, 0x47
-.L8028127C:
-/* 7E20FC 8028127C AE220070 */  sw        $v0, 0x70($s1)
-/* 7E2100 80281280 2402000F */  addiu     $v0, $zero, 0xf
-/* 7E2104 80281284 080A0505 */  j         .L80281414
-/* 7E2108 80281288 AE220074 */   sw       $v0, 0x74($s1)
-.L8028128C:
-/* 7E210C 8028128C 8E220074 */  lw        $v0, 0x74($s1)
-/* 7E2110 80281290 18400003 */  blez      $v0, .L802812A0
-/* 7E2114 80281294 2442FFFF */   addiu    $v0, $v0, -1
-.L80281298:
-/* 7E2118 80281298 080A0505 */  j         .L80281414
-/* 7E211C 8028129C AE220074 */   sw       $v0, 0x74($s1)
-.L802812A0:
-/* 7E2120 802812A0 0C0A02D1 */  jal       func_80280B44
-/* 7E2124 802812A4 00000000 */   nop      
-/* 7E2128 802812A8 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E212C 802812AC 0440001C */  bltz      $v0, .L80281320
-/* 7E2130 802812B0 00021040 */   sll      $v0, $v0, 1
-/* 7E2134 802812B4 00521021 */  addu      $v0, $v0, $s2
-/* 7E2138 802812B8 0C039D5D */  jal       add_item
-/* 7E213C 802812BC 844401C8 */   lh       $a0, 0x1c8($v0)
-/* 7E2140 802812C0 04400005 */  bltz      $v0, .L802812D8
-/* 7E2144 802812C4 00000000 */   nop      
-/* 7E2148 802812C8 8E02000C */  lw        $v0, 0xc($s0)
-/* 7E214C 802812CC 00021040 */  sll       $v0, $v0, 1
-/* 7E2150 802812D0 00521021 */  addu      $v0, $v0, $s2
-/* 7E2154 802812D4 A44001C8 */  sh        $zero, 0x1c8($v0)
-.L802812D8:
-/* 7E2158 802812D8 0C039D88 */  jal       get_item_empty_count
-/* 7E215C 802812DC 00000000 */   nop      
-/* 7E2160 802812E0 10400005 */  beqz      $v0, .L802812F8
-/* 7E2164 802812E4 00000000 */   nop      
-/* 7E2168 802812E8 0C039E05 */  jal       get_stored_count
-/* 7E216C 802812EC 00000000 */   nop      
-/* 7E2170 802812F0 14400005 */  bnez      $v0, .L80281308
-/* 7E2174 802812F4 00000000 */   nop      
-.L802812F8:
-/* 7E2178 802812F8 0C0A0000 */  jal       func_80280000
-/* 7E217C 802812FC 24040014 */   addiu    $a0, $zero, 0x14
-/* 7E2180 80281300 080A04EE */  j         .L802813B8
-/* 7E2184 80281304 AE220074 */   sw       $v0, 0x74($s1)
-.L80281308:
-/* 7E2188 80281308 0C0A0000 */  jal       func_80280000
-/* 7E218C 8028130C 24040015 */   addiu    $a0, $zero, 0x15
-/* 7E2190 80281310 AE220074 */  sw        $v0, 0x74($s1)
-/* 7E2194 80281314 24020048 */  addiu     $v0, $zero, 0x48
-/* 7E2198 80281318 080A0505 */  j         .L80281414
-/* 7E219C 8028131C AE220070 */   sw       $v0, 0x70($s1)
-.L80281320:
-/* 7E21A0 80281320 0C0A0000 */  jal       func_80280000
-/* 7E21A4 80281324 24040016 */   addiu    $a0, $zero, 0x16
-/* 7E21A8 80281328 080A04EE */  j         .L802813B8
-/* 7E21AC 8028132C AE220074 */   sw       $v0, 0x74($s1)
-.L80281330:
-/* 7E21B0 80281330 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E21B4 80281334 0C0B1059 */  jal       does_script_exist
-/* 7E21B8 80281338 00000000 */   nop      
-/* 7E21BC 8028133C 14400036 */  bnez      $v0, .L80281418
-/* 7E21C0 80281340 0000102D */   daddu    $v0, $zero, $zero
-/* 7E21C4 80281344 3C04001E */  lui       $a0, 0x1e
-/* 7E21C8 80281348 34840005 */  ori       $a0, $a0, 5
-/* 7E21CC 8028134C 26250078 */  addiu     $a1, $s1, 0x78
-/* 7E21D0 80281350 24020049 */  addiu     $v0, $zero, 0x49
-.L80281354:
-/* 7E21D4 80281354 AE220070 */  sw        $v0, 0x70($s1)
-/* 7E21D8 80281358 0C049640 */  jal       load_string
-/* 7E21DC 8028135C AE200078 */   sw       $zero, 0x78($s1)
-/* 7E21E0 80281360 3C018028 */  lui       $at, 0x8028
-/* 7E21E4 80281364 AC226538 */  sw        $v0, 0x6538($at)
-/* 7E21E8 80281368 080A0506 */  j         .L80281418
-/* 7E21EC 8028136C 0000102D */   daddu    $v0, $zero, $zero
-.L80281370:
-/* 7E21F0 80281370 8E230078 */  lw        $v1, 0x78($s1)
-/* 7E21F4 80281374 24020001 */  addiu     $v0, $zero, 1
-/* 7E21F8 80281378 14620027 */  bne       $v1, $v0, .L80281418
-/* 7E21FC 8028137C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E2200 80281380 3C028028 */  lui       $v0, 0x8028
-/* 7E2204 80281384 8C426538 */  lw        $v0, 0x6538($v0)
-/* 7E2208 80281388 904204E8 */  lbu       $v0, 0x4e8($v0)
-/* 7E220C 8028138C 14400007 */  bnez      $v0, .L802813AC
-/* 7E2210 80281390 00000000 */   nop      
-/* 7E2214 80281394 0C0A00D7 */  jal       func_8028035C
-/* 7E2218 80281398 00000000 */   nop      
-/* 7E221C 8028139C AE220074 */  sw        $v0, 0x74($s1)
-.L802813A0:
-/* 7E2220 802813A0 240202BD */  addiu     $v0, $zero, 0x2bd
-/* 7E2224 802813A4 080A0505 */  j         .L80281414
-/* 7E2228 802813A8 AE220070 */   sw       $v0, 0x70($s1)
-.L802813AC:
-/* 7E222C 802813AC 0C0A00B4 */  jal       func_802802D0
-/* 7E2230 802813B0 24040016 */   addiu    $a0, $zero, 0x16
-/* 7E2234 802813B4 AE220074 */  sw        $v0, 0x74($s1)
-.L802813B8:
-/* 7E2238 802813B8 24020009 */  addiu     $v0, $zero, 9
-/* 7E223C 802813BC 080A0505 */  j         .L80281414
-/* 7E2240 802813C0 AE220070 */   sw       $v0, 0x70($s1)
-.L802813C4:
-/* 7E2244 802813C4 8E240074 */  lw        $a0, 0x74($s1)
-/* 7E2248 802813C8 0C0B1059 */  jal       does_script_exist
-/* 7E224C 802813CC 00000000 */   nop      
-/* 7E2250 802813D0 14400011 */  bnez      $v0, .L80281418
-/* 7E2254 802813D4 0000102D */   daddu    $v0, $zero, $zero
-/* 7E2258 802813D8 2402000A */  addiu     $v0, $zero, 0xa
-/* 7E225C 802813DC 080A0505 */  j         .L80281414
-/* 7E2260 802813E0 AE220070 */   sw       $v0, 0x70($s1)
-.L802813E4:
-/* 7E2264 802813E4 8E020010 */  lw        $v0, 0x10($s0)
-/* 7E2268 802813E8 10400006 */  beqz      $v0, .L80281404
-/* 7E226C 802813EC 00000000 */   nop      
-/* 7E2270 802813F0 8C440014 */  lw        $a0, 0x14($v0)
-/* 7E2274 802813F4 10800003 */  beqz      $a0, .L80281404
-/* 7E2278 802813F8 24050001 */   addiu    $a1, $zero, 1
-/* 7E227C 802813FC 0C0B0CF8 */  jal       start_script
-/* 7E2280 80281400 0000302D */   daddu    $a2, $zero, $zero
-.L80281404:
-/* 7E2284 80281404 0C03A5E3 */  jal       open_status_menu_short
-/* 7E2288 80281408 00000000 */   nop      
-/* 7E228C 8028140C 080A0506 */  j         .L80281418
-/* 7E2290 80281410 24020001 */   addiu    $v0, $zero, 1
-.L80281414:
-/* 7E2294 80281414 0000102D */  daddu     $v0, $zero, $zero
-.L80281418:
-/* 7E2298 80281418 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E229C 8028141C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E22A0 80281420 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E22A4 80281424 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E22A8 80281428 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E22AC 8028142C 03E00008 */  jr        $ra
-/* 7E22B0 80281430 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7e0e80/func_80281434.s b/asm/nonmatchings/code_7e0e80/func_80281434.s
deleted file mode 100644
index 5dcd366f21..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_80281434.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80281434
-/* 7E22B4 80281434 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E22B8 80281438 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E22BC 8028143C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E22C0 80281440 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 7E22C4 80281444 AFB20020 */  sw        $s2, 0x20($sp)
-/* 7E22C8 80281448 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 7E22CC 8028144C AFB00018 */  sw        $s0, 0x18($sp)
-/* 7E22D0 80281450 8C440144 */  lw        $a0, 0x144($v0)
-/* 7E22D4 80281454 00A0882D */  daddu     $s1, $a1, $zero
-/* 7E22D8 80281458 8C830008 */  lw        $v1, 8($a0)
-/* 7E22DC 8028145C 00C0902D */  daddu     $s2, $a2, $zero
-/* 7E22E0 80281460 00031040 */  sll       $v0, $v1, 1
-/* 7E22E4 80281464 00431021 */  addu      $v0, $v0, $v1
-/* 7E22E8 80281468 8C830018 */  lw        $v1, 0x18($a0)
-/* 7E22EC 8028146C 00021080 */  sll       $v0, $v0, 2
-/* 7E22F0 80281470 00621821 */  addu      $v1, $v1, $v0
-/* 7E22F4 80281474 8C700000 */  lw        $s0, ($v1)
-/* 7E22F8 80281478 3C028008 */  lui       $v0, %hi(gItemTable)
-/* 7E22FC 8028147C 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
-/* 7E2300 80281480 00108140 */  sll       $s0, $s0, 5
-/* 7E2304 80281484 02028021 */  addu      $s0, $s0, $v0
-/* 7E2308 80281488 8E040000 */  lw        $a0, ($s0)
-/* 7E230C 8028148C 0C04991D */  jal       get_string_width
-/* 7E2310 80281490 0000282D */   daddu    $a1, $zero, $zero
-/* 7E2314 80281494 00021043 */  sra       $v0, $v0, 1
-/* 7E2318 80281498 2442FFC4 */  addiu     $v0, $v0, -0x3c
-/* 7E231C 8028149C 02222823 */  subu      $a1, $s1, $v0
-/* 7E2320 802814A0 26460006 */  addiu     $a2, $s2, 6
-/* 7E2324 802814A4 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E2328 802814A8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E232C 802814AC 8E040000 */  lw        $a0, ($s0)
-/* 7E2330 802814B0 0C04993B */  jal       draw_string
-/* 7E2334 802814B4 240700FF */   addiu    $a3, $zero, 0xff
-/* 7E2338 802814B8 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 7E233C 802814BC 8FB20020 */  lw        $s2, 0x20($sp)
-/* 7E2340 802814C0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 7E2344 802814C4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 7E2348 802814C8 03E00008 */  jr        $ra
-/* 7E234C 802814CC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/code_7e0e80/func_802814D0.s b/asm/nonmatchings/code_7e0e80/func_802814D0.s
deleted file mode 100644
index 663497bde0..0000000000
--- a/asm/nonmatchings/code_7e0e80/func_802814D0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802814D0
-/* 7E2350 802814D0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 7E2354 802814D4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 7E2358 802814D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E235C 802814DC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E2360 802814E0 8C420144 */  lw        $v0, 0x144($v0)
-/* 7E2364 802814E4 24A50008 */  addiu     $a1, $a1, 8
-/* 7E2368 802814E8 8C440008 */  lw        $a0, 8($v0)
-/* 7E236C 802814EC 8C430018 */  lw        $v1, 0x18($v0)
-/* 7E2370 802814F0 2402000A */  addiu     $v0, $zero, 0xa
-/* 7E2374 802814F4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E2378 802814F8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E237C 802814FC 00041040 */  sll       $v0, $a0, 1
-/* 7E2380 80281500 00441021 */  addu      $v0, $v0, $a0
-/* 7E2384 80281504 00021080 */  sll       $v0, $v0, 2
-/* 7E2388 80281508 00621821 */  addu      $v1, $v1, $v0
-/* 7E238C 8028150C 8C640008 */  lw        $a0, 8($v1)
-/* 7E2390 80281510 0C04993B */  jal       draw_string
-/* 7E2394 80281514 240700FF */   addiu    $a3, $zero, 0xff
-/* 7E2398 80281518 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E239C 8028151C 03E00008 */  jr        $ra
-/* 7E23A0 80281520 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s
deleted file mode 100644
index 954b3db869..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802428C0_E07C20
-/* E07C20 802428C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E07C24 802428C4 2404005B */  addiu     $a0, $zero, 0x5b
-/* E07C28 802428C8 2405FFFF */  addiu     $a1, $zero, -1
-/* E07C2C 802428CC 24060001 */  addiu     $a2, $zero, 1
-/* E07C30 802428D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E07C34 802428D4 0C046E54 */  jal       func_8011B950
-/* E07C38 802428D8 0000382D */   daddu    $a3, $zero, $zero
-/* E07C3C 802428DC 0000202D */  daddu     $a0, $zero, $zero
-/* E07C40 802428E0 0080282D */  daddu     $a1, $a0, $zero
-/* E07C44 802428E4 0080302D */  daddu     $a2, $a0, $zero
-/* E07C48 802428E8 0C046F97 */  jal       set_background_color_blend
-/* E07C4C 802428EC 240700FF */   addiu    $a3, $zero, 0xff
-/* E07C50 802428F0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E07C54 802428F4 24020002 */  addiu     $v0, $zero, 2
-/* E07C58 802428F8 03E00008 */  jr        $ra
-/* E07C5C 802428FC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s
deleted file mode 100644
index f658cae9bb..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242900_E07C60
-/* E07C60 80242900 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E07C64 80242904 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07C68 80242908 0080802D */  daddu     $s0, $a0, $zero
-/* E07C6C 8024290C 10A00003 */  beqz      $a1, .L8024291C
-/* E07C70 80242910 AFBF0014 */   sw       $ra, 0x14($sp)
-/* E07C74 80242914 240200FF */  addiu     $v0, $zero, 0xff
-/* E07C78 80242918 AE020074 */  sw        $v0, 0x74($s0)
-.L8024291C:
-/* E07C7C 8024291C 8E020074 */  lw        $v0, 0x74($s0)
-/* E07C80 80242920 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* E07C84 80242924 04410002 */  bgez      $v0, .L80242930
-/* E07C88 80242928 AE020074 */   sw       $v0, 0x74($s0)
-/* E07C8C 8024292C AE000074 */  sw        $zero, 0x74($s0)
-.L80242930:
-/* E07C90 80242930 0000202D */  daddu     $a0, $zero, $zero
-/* E07C94 80242934 0080282D */  daddu     $a1, $a0, $zero
-/* E07C98 80242938 92070077 */  lbu       $a3, 0x77($s0)
-/* E07C9C 8024293C 0C046F97 */  jal       set_background_color_blend
-/* E07CA0 80242940 0080302D */   daddu    $a2, $a0, $zero
-/* E07CA4 80242944 8E020074 */  lw        $v0, 0x74($s0)
-/* E07CA8 80242948 14400007 */  bnez      $v0, .L80242968
-/* E07CAC 8024294C 0000102D */   daddu    $v0, $zero, $zero
-/* E07CB0 80242950 2404005B */  addiu     $a0, $zero, 0x5b
-/* E07CB4 80242954 2405FFFF */  addiu     $a1, $zero, -1
-/* E07CB8 80242958 0000302D */  daddu     $a2, $zero, $zero
-/* E07CBC 8024295C 0C046E54 */  jal       func_8011B950
-/* E07CC0 80242960 00C0382D */   daddu    $a3, $a2, $zero
-/* E07CC4 80242964 24020002 */  addiu     $v0, $zero, 2
-.L80242968:
-/* E07CC8 80242968 8FBF0014 */  lw        $ra, 0x14($sp)
-/* E07CCC 8024296C 8FB00010 */  lw        $s0, 0x10($sp)
-/* E07CD0 80242970 03E00008 */  jr        $ra
-/* E07CD4 80242974 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s
deleted file mode 100644
index 125c322ce3..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s
+++ /dev/null
@@ -1,67 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242978_E07CD8
-/* E07CD8 80242978 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* E07CDC 8024297C AFB20020 */  sw        $s2, 0x20($sp)
-/* E07CE0 80242980 AFBF0024 */  sw        $ra, 0x24($sp)
-/* E07CE4 80242984 AFB1001C */  sw        $s1, 0x1c($sp)
-/* E07CE8 80242988 AFB00018 */  sw        $s0, 0x18($sp)
-/* E07CEC 8024298C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* E07CF0 80242990 10A00006 */  beqz      $a1, .L802429AC
-/* E07CF4 80242994 0080902D */   daddu    $s2, $a0, $zero
-/* E07CF8 80242998 8E4400AC */  lw        $a0, 0xac($s2)
-/* E07CFC 8024299C 0C00EAD2 */  jal       get_npc_safe
-/* E07D00 802429A0 00000000 */   nop      
-/* E07D04 802429A4 AE420078 */  sw        $v0, 0x78($s2)
-/* E07D08 802429A8 AE400070 */  sw        $zero, 0x70($s2)
-.L802429AC:
-/* E07D0C 802429AC 3C05444A */  lui       $a1, 0x444a
-/* E07D10 802429B0 34A58000 */  ori       $a1, $a1, 0x8000
-/* E07D14 802429B4 8E510078 */  lw        $s1, 0x78($s2)
-/* E07D18 802429B8 4480A000 */  mtc1      $zero, $f20
-/* E07D1C 802429BC 2410002D */  addiu     $s0, $zero, 0x2d
-/* E07D20 802429C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07D24 802429C4 8E470070 */  lw        $a3, 0x70($s2)
-/* E07D28 802429C8 4406A000 */  mfc1      $a2, $f20
-/* E07D2C 802429CC 0C00A8ED */  jal       update_lerp
-/* E07D30 802429D0 24040004 */   addiu    $a0, $zero, 4
-/* E07D34 802429D4 4405A000 */  mfc1      $a1, $f20
-/* E07D38 802429D8 3C06437F */  lui       $a2, 0x437f
-/* E07D3C 802429DC E6200048 */  swc1      $f0, 0x48($s1)
-/* E07D40 802429E0 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07D44 802429E4 8E470070 */  lw        $a3, 0x70($s2)
-/* E07D48 802429E8 0C00A8ED */  jal       update_lerp
-/* E07D4C 802429EC 24040004 */   addiu    $a0, $zero, 4
-/* E07D50 802429F0 3C014F00 */  lui       $at, 0x4f00
-/* E07D54 802429F4 44811000 */  mtc1      $at, $f2
-/* E07D58 802429F8 00000000 */  nop       
-/* E07D5C 802429FC 4600103E */  c.le.s    $f2, $f0
-/* E07D60 80242A00 00000000 */  nop       
-/* E07D64 80242A04 45010005 */  bc1t      .L80242A1C
-/* E07D68 80242A08 263100AC */   addiu    $s1, $s1, 0xac
-/* E07D6C 80242A0C 4600010D */  trunc.w.s $f4, $f0
-/* E07D70 80242A10 44032000 */  mfc1      $v1, $f4
-/* E07D74 80242A14 08090A8E */  j         .L80242A38
-/* E07D78 80242A18 A2230000 */   sb       $v1, ($s1)
-.L80242A1C:
-/* E07D7C 80242A1C 46020001 */  sub.s     $f0, $f0, $f2
-/* E07D80 80242A20 3C028000 */  lui       $v0, 0x8000
-/* E07D84 80242A24 4600010D */  trunc.w.s $f4, $f0
-/* E07D88 80242A28 44032000 */  mfc1      $v1, $f4
-/* E07D8C 80242A2C 00000000 */  nop       
-/* E07D90 80242A30 00621825 */  or        $v1, $v1, $v0
-/* E07D94 80242A34 A2230000 */  sb        $v1, ($s1)
-.L80242A38:
-/* E07D98 80242A38 8E430070 */  lw        $v1, 0x70($s2)
-/* E07D9C 80242A3C 24630001 */  addiu     $v1, $v1, 1
-/* E07DA0 80242A40 2862002E */  slti      $v0, $v1, 0x2e
-/* E07DA4 80242A44 AE430070 */  sw        $v1, 0x70($s2)
-/* E07DA8 80242A48 8FBF0024 */  lw        $ra, 0x24($sp)
-/* E07DAC 80242A4C 8FB20020 */  lw        $s2, 0x20($sp)
-/* E07DB0 80242A50 8FB1001C */  lw        $s1, 0x1c($sp)
-/* E07DB4 80242A54 8FB00018 */  lw        $s0, 0x18($sp)
-/* E07DB8 80242A58 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* E07DBC 80242A5C 38420001 */  xori      $v0, $v0, 1
-/* E07DC0 80242A60 03E00008 */  jr        $ra
-/* E07DC4 80242A64 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s
deleted file mode 100644
index 63b94e3d1c..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A68_E07DC8
-/* E07DC8 80242A68 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E07DCC 80242A6C AFB10014 */  sw        $s1, 0x14($sp)
-/* E07DD0 80242A70 0080882D */  daddu     $s1, $a0, $zero
-/* E07DD4 80242A74 AFBF0018 */  sw        $ra, 0x18($sp)
-/* E07DD8 80242A78 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07DDC 80242A7C 8E22000C */  lw        $v0, 0xc($s1)
-/* E07DE0 80242A80 00A0802D */  daddu     $s0, $a1, $zero
-/* E07DE4 80242A84 0C0B1EAF */  jal       get_variable
-/* E07DE8 80242A88 8C450000 */   lw       $a1, ($v0)
-/* E07DEC 80242A8C 1200000C */  beqz      $s0, .L80242AC0
-/* E07DF0 80242A90 0220202D */   daddu    $a0, $s1, $zero
-/* E07DF4 80242A94 0C0B36B0 */  jal       resolve_npc
-/* E07DF8 80242A98 0040282D */   daddu    $a1, $v0, $zero
-/* E07DFC 80242A9C AE220074 */  sw        $v0, 0x74($s1)
-/* E07E00 80242AA0 C4420038 */  lwc1      $f2, 0x38($v0)
-/* E07E04 80242AA4 3C014334 */  lui       $at, 0x4334
-/* E07E08 80242AA8 44810000 */  mtc1      $at, $f0
-/* E07E0C 80242AAC 24020048 */  addiu     $v0, $zero, 0x48
-/* E07E10 80242AB0 AE220070 */  sw        $v0, 0x70($s1)
-/* E07E14 80242AB4 4600110D */  trunc.w.s $f4, $f2
-/* E07E18 80242AB8 E6240078 */  swc1      $f4, 0x78($s1)
-/* E07E1C 80242ABC E620007C */  swc1      $f0, 0x7c($s1)
-.L80242AC0:
-/* E07E20 80242AC0 C620007C */  lwc1      $f0, 0x7c($s1)
-/* E07E24 80242AC4 3C0140A0 */  lui       $at, 0x40a0
-/* E07E28 80242AC8 44816000 */  mtc1      $at, $f12
-/* E07E2C 80242ACC 8E300074 */  lw        $s0, 0x74($s1)
-/* E07E30 80242AD0 0C00A6C9 */  jal       clamp_angle
-/* E07E34 80242AD4 460C0301 */   sub.s    $f12, $f0, $f12
-/* E07E38 80242AD8 46000306 */  mov.s     $f12, $f0
-/* E07E3C 80242ADC 0C00A8D4 */  jal       cos_deg
-/* E07E40 80242AE0 E62C007C */   swc1     $f12, 0x7c($s1)
-/* E07E44 80242AE4 3C0140C0 */  lui       $at, 0x40c0
-/* E07E48 80242AE8 44811000 */  mtc1      $at, $f2
-/* E07E4C 80242AEC 00000000 */  nop       
-/* E07E50 80242AF0 46020002 */  mul.s     $f0, $f0, $f2
-/* E07E54 80242AF4 00000000 */  nop       
-/* E07E58 80242AF8 C6020038 */  lwc1      $f2, 0x38($s0)
-/* E07E5C 80242AFC 46001080 */  add.s     $f2, $f2, $f0
-/* E07E60 80242B00 E6020038 */  swc1      $f2, 0x38($s0)
-/* E07E64 80242B04 0C00A8BB */  jal       sin_deg
-/* E07E68 80242B08 C62C007C */   lwc1     $f12, 0x7c($s1)
-/* E07E6C 80242B0C 3C014020 */  lui       $at, 0x4020
-/* E07E70 80242B10 44811000 */  mtc1      $at, $f2
-/* E07E74 80242B14 00000000 */  nop       
-/* E07E78 80242B18 46020002 */  mul.s     $f0, $f0, $f2
-/* E07E7C 80242B1C 00000000 */  nop       
-/* E07E80 80242B20 C6020040 */  lwc1      $f2, 0x40($s0)
-/* E07E84 80242B24 46001080 */  add.s     $f2, $f2, $f0
-/* E07E88 80242B28 3C014334 */  lui       $at, 0x4334
-/* E07E8C 80242B2C 44816000 */  mtc1      $at, $f12
-/* E07E90 80242B30 E6020040 */  swc1      $f2, 0x40($s0)
-/* E07E94 80242B34 C620007C */  lwc1      $f0, 0x7c($s1)
-/* E07E98 80242B38 0C00A6C9 */  jal       clamp_angle
-/* E07E9C 80242B3C 46006301 */   sub.s    $f12, $f12, $f0
-/* E07EA0 80242B40 E6000034 */  swc1      $f0, 0x34($s0)
-/* E07EA4 80242B44 8E230070 */  lw        $v1, 0x70($s1)
-/* E07EA8 80242B48 2463FFFF */  addiu     $v1, $v1, -1
-/* E07EAC 80242B4C AE230070 */  sw        $v1, 0x70($s1)
-/* E07EB0 80242B50 8FBF0018 */  lw        $ra, 0x18($sp)
-/* E07EB4 80242B54 8FB10014 */  lw        $s1, 0x14($sp)
-/* E07EB8 80242B58 8FB00010 */  lw        $s0, 0x10($sp)
-/* E07EBC 80242B5C 2C620001 */  sltiu     $v0, $v1, 1
-/* E07EC0 80242B60 03E00008 */  jr        $ra
-/* E07EC4 80242B64 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s
deleted file mode 100644
index b6d654c039..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242B68_E07EC8
-/* E07EC8 80242B68 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E07ECC 80242B6C AFB10014 */  sw        $s1, 0x14($sp)
-/* E07ED0 80242B70 0080882D */  daddu     $s1, $a0, $zero
-/* E07ED4 80242B74 AFBF0018 */  sw        $ra, 0x18($sp)
-/* E07ED8 80242B78 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07EDC 80242B7C 8E22000C */  lw        $v0, 0xc($s1)
-/* E07EE0 80242B80 00A0802D */  daddu     $s0, $a1, $zero
-/* E07EE4 80242B84 0C0B1EAF */  jal       get_variable
-/* E07EE8 80242B88 8C450000 */   lw       $a1, ($v0)
-/* E07EEC 80242B8C 1200000C */  beqz      $s0, .L80242BC0
-/* E07EF0 80242B90 0220202D */   daddu    $a0, $s1, $zero
-/* E07EF4 80242B94 0C0B36B0 */  jal       resolve_npc
-/* E07EF8 80242B98 0040282D */   daddu    $a1, $v0, $zero
-/* E07EFC 80242B9C AE220074 */  sw        $v0, 0x74($s1)
-/* E07F00 80242BA0 C4420038 */  lwc1      $f2, 0x38($v0)
-/* E07F04 80242BA4 3C014334 */  lui       $at, 0x4334
-/* E07F08 80242BA8 44810000 */  mtc1      $at, $f0
-/* E07F0C 80242BAC 24020048 */  addiu     $v0, $zero, 0x48
-/* E07F10 80242BB0 AE220070 */  sw        $v0, 0x70($s1)
-/* E07F14 80242BB4 4600110D */  trunc.w.s $f4, $f2
-/* E07F18 80242BB8 E6240078 */  swc1      $f4, 0x78($s1)
-/* E07F1C 80242BBC E620007C */  swc1      $f0, 0x7c($s1)
-.L80242BC0:
-/* E07F20 80242BC0 C620007C */  lwc1      $f0, 0x7c($s1)
-/* E07F24 80242BC4 3C0140A0 */  lui       $at, 0x40a0
-/* E07F28 80242BC8 44816000 */  mtc1      $at, $f12
-/* E07F2C 80242BCC 8E300074 */  lw        $s0, 0x74($s1)
-/* E07F30 80242BD0 0C00A6C9 */  jal       clamp_angle
-/* E07F34 80242BD4 460C0300 */   add.s    $f12, $f0, $f12
-/* E07F38 80242BD8 46000306 */  mov.s     $f12, $f0
-/* E07F3C 80242BDC 0C00A8D4 */  jal       cos_deg
-/* E07F40 80242BE0 E62C007C */   swc1     $f12, 0x7c($s1)
-/* E07F44 80242BE4 3C0140C0 */  lui       $at, 0x40c0
-/* E07F48 80242BE8 44811000 */  mtc1      $at, $f2
-/* E07F4C 80242BEC 00000000 */  nop       
-/* E07F50 80242BF0 46020002 */  mul.s     $f0, $f0, $f2
-/* E07F54 80242BF4 00000000 */  nop       
-/* E07F58 80242BF8 C6020038 */  lwc1      $f2, 0x38($s0)
-/* E07F5C 80242BFC 46001080 */  add.s     $f2, $f2, $f0
-/* E07F60 80242C00 E6020038 */  swc1      $f2, 0x38($s0)
-/* E07F64 80242C04 0C00A8BB */  jal       sin_deg
-/* E07F68 80242C08 C62C007C */   lwc1     $f12, 0x7c($s1)
-/* E07F6C 80242C0C 3C014020 */  lui       $at, 0x4020
-/* E07F70 80242C10 44811000 */  mtc1      $at, $f2
-/* E07F74 80242C14 00000000 */  nop       
-/* E07F78 80242C18 46020002 */  mul.s     $f0, $f0, $f2
-/* E07F7C 80242C1C 00000000 */  nop       
-/* E07F80 80242C20 C6020040 */  lwc1      $f2, 0x40($s0)
-/* E07F84 80242C24 46001080 */  add.s     $f2, $f2, $f0
-/* E07F88 80242C28 3C014334 */  lui       $at, 0x4334
-/* E07F8C 80242C2C 44816000 */  mtc1      $at, $f12
-/* E07F90 80242C30 E6020040 */  swc1      $f2, 0x40($s0)
-/* E07F94 80242C34 C620007C */  lwc1      $f0, 0x7c($s1)
-/* E07F98 80242C38 0C00A6C9 */  jal       clamp_angle
-/* E07F9C 80242C3C 46006301 */   sub.s    $f12, $f12, $f0
-/* E07FA0 80242C40 E6000034 */  swc1      $f0, 0x34($s0)
-/* E07FA4 80242C44 8E230070 */  lw        $v1, 0x70($s1)
-/* E07FA8 80242C48 2463FFFF */  addiu     $v1, $v1, -1
-/* E07FAC 80242C4C AE230070 */  sw        $v1, 0x70($s1)
-/* E07FB0 80242C50 8FBF0018 */  lw        $ra, 0x18($sp)
-/* E07FB4 80242C54 8FB10014 */  lw        $s1, 0x14($sp)
-/* E07FB8 80242C58 8FB00010 */  lw        $s0, 0x10($sp)
-/* E07FBC 80242C5C 2C620001 */  sltiu     $v0, $v1, 1
-/* E07FC0 80242C60 03E00008 */  jr        $ra
-/* E07FC4 80242C64 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s
deleted file mode 100644
index cc8a7a58d1..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242C68_E07FC8
-/* E07FC8 80242C68 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E07FCC 80242C6C AFBF0010 */  sw        $ra, 0x10($sp)
-/* E07FD0 80242C70 8C82000C */  lw        $v0, 0xc($a0)
-/* E07FD4 80242C74 0C0B1EAF */  jal       get_variable
-/* E07FD8 80242C78 8C450000 */   lw       $a1, ($v0)
-/* E07FDC 80242C7C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E07FE0 80242C80 3C018024 */  lui       $at, 0x8024
-/* E07FE4 80242C84 AC225D34 */  sw        $v0, 0x5d34($at)
-/* E07FE8 80242C88 24020002 */  addiu     $v0, $zero, 2
-/* E07FEC 80242C8C 03E00008 */  jr        $ra
-/* E07FF0 80242C90 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s
deleted file mode 100644
index b21718ceab..0000000000
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242C94_E07FF4
-/* E07FF4 80242C94 3C06FC12 */  lui       $a2, 0xfc12
-/* E07FF8 80242C98 34C64624 */  ori       $a2, $a2, 0x4624
-/* E07FFC 80242C9C 3C05FF8F */  lui       $a1, 0xff8f
-/* E08000 80242CA0 3C04800A */  lui       $a0, 0x800a
-/* E08004 80242CA4 2484A66C */  addiu     $a0, $a0, -0x5994
-/* E08008 80242CA8 8C820000 */  lw        $v0, ($a0)
-/* E0800C 80242CAC 34A5FFFF */  ori       $a1, $a1, 0xffff
-/* E08010 80242CB0 0040182D */  daddu     $v1, $v0, $zero
-/* E08014 80242CB4 24420008 */  addiu     $v0, $v0, 8
-/* E08018 80242CB8 AC820000 */  sw        $v0, ($a0)
-/* E0801C 80242CBC AC660000 */  sw        $a2, ($v1)
-/* E08020 80242CC0 AC650004 */  sw        $a1, 4($v1)
-/* E08024 80242CC4 24430008 */  addiu     $v1, $v0, 8
-/* E08028 80242CC8 AC830000 */  sw        $v1, ($a0)
-/* E0802C 80242CCC 3C048024 */  lui       $a0, 0x8024
-/* E08030 80242CD0 90845D37 */  lbu       $a0, 0x5d37($a0)
-/* E08034 80242CD4 3C03FA00 */  lui       $v1, 0xfa00
-/* E08038 80242CD8 AC430000 */  sw        $v1, ($v0)
-/* E0803C 80242CDC 03E00008 */  jr        $ra
-/* E08040 80242CE0 AC440004 */   sw       $a0, 4($v0)
-/* E08044 80242CE4 00000000 */  nop       
-/* E08048 80242CE8 00000000 */  nop       
-/* E0804C 80242CEC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s
index 7793819346..047faa9710 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s
@@ -88,9 +88,9 @@ glabel func_80242B04_BA7284
 /* BA73C8 80242C48 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BA73CC 80242C4C 1040002C */  beqz      $v0, .L80242D00
 /* BA73D0 80242C50 00031080 */   sll      $v0, $v1, 2
-/* BA73D4 80242C54 3C018024 */  lui       $at, 0x8024
+/* BA73D4 80242C54 3C018024 */  lui       $at, %hi(pause_stats_draw_contents)
 /* BA73D8 80242C58 00220821 */  addu      $at, $at, $v0
-/* BA73DC 80242C5C 8C225980 */  lw        $v0, 0x5980($at)
+/* BA73DC 80242C5C 8C225980 */  lw        $v0, %lo(pause_stats_draw_contents)($at)
 /* BA73E0 80242C60 00400008 */  jr        $v0
 /* BA73E4 80242C64 00000000 */   nop      
 /* BA73E8 80242C68 0260202D */  daddu     $a0, $s3, $zero