From 889520b045f70b073ec1616f8d27621af76c5178 Mon Sep 17 00:00:00 2001
From: Tyler McGavran <tyler.taggerung@gmail.com>
Date: Sun, 26 Mar 2023 18:53:41 -0400
Subject: [PATCH] Relocated rodata for code_800431B0 (#293)

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
---
 .../code_800431B0/func_8004A630.s             | 49 -----------
 .../code_800431B0/func_8004A6EC.s             | 50 -----------
 .../code_800431B0/func_8004A7AC.s             | 51 -----------
 .../code_800431B0/func_8004A870.s             | 84 ------------------
 .../code_800431B0/func_800508C0.s             |  8 ++
 .../code_800431B0/func_80050C68.s             |  7 ++
 .../code_800431B0/func_800534E8.s             |  8 ++
 .../code_800431B0/func_80054E10.s             | 44 ----------
 .../code_800431B0/func_800568A0.s             | 86 -------------------
 data/data_0DD0A0_3_0_1.s                      | 41 ---------
 mk64.ld                                       |  2 +-
 src/code_800431B0.c                           | 44 +---------
 12 files changed, 25 insertions(+), 449 deletions(-)
 delete mode 100644 asm/non_matchings/code_800431B0/func_8004A630.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_8004A6EC.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_8004A7AC.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_8004A870.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_80054E10.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_800568A0.s
 delete mode 100644 data/data_0DD0A0_3_0_1.s

diff --git a/asm/non_matchings/code_800431B0/func_8004A630.s b/asm/non_matchings/code_800431B0/func_8004A630.s
deleted file mode 100644
index 6331702b4..000000000
--- a/asm/non_matchings/code_800431B0/func_8004A630.s
+++ /dev/null
@@ -1,49 +0,0 @@
-glabel func_8004A630
-/* 04B230 8004A630 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 04B234 8004A634 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 04B238 8004A638 AFB00018 */  sw    $s0, 0x18($sp)
-/* 04B23C 8004A63C 00A08025 */  move  $s0, $a1
-/* 04B240 8004A640 AFA40020 */  sw    $a0, 0x20($sp)
-/* 04B244 8004A644 0C010649 */  jal   func_80041924
-/* 04B248 8004A648 AFA60028 */   sw    $a2, 0x28($sp)
-/* 04B24C 8004A64C 10400022 */  beqz  $v0, .L8004A6D8
-/* 04B250 8004A650 3C048018 */   lui   $a0, %hi(D_80183E50) # $a0, 0x8018
-/* 04B254 8004A654 C6040000 */  lwc1  $f4, ($s0)
-/* 04B258 8004A658 24843E50 */  addiu $a0, %lo(D_80183E50) # addiu $a0, $a0, 0x3e50
-/* 04B25C 8004A65C 8FAE0020 */  lw    $t6, 0x20($sp)
-/* 04B260 8004A660 E4840000 */  swc1  $f4, ($a0)
-/* 04B264 8004A664 44807000 */  mtc1  $zero, $f14
-/* 04B268 8004A668 8E060008 */  lw    $a2, 8($s0)
-/* 04B26C 8004A66C C60C0000 */  lwc1  $f12, ($s0)
-/* 04B270 8004A670 0C0AAF8C */  jal   func_802ABE30
-/* 04B274 8004A674 95C7000A */   lhu   $a3, 0xa($t6)
-/* 04B278 8004A678 3C01800F */  lui   $at, %hi(D_800EE030)
-/* 04B27C 8004A67C D428E030 */  ldc1  $f8, %lo(D_800EE030)($at)
-/* 04B280 8004A680 460001A1 */  cvt.d.s $f6, $f0
-/* 04B284 8004A684 3C048018 */  lui   $a0, %hi(D_80183E50) # $a0, 0x8018
-/* 04B288 8004A688 46283280 */  add.d $f10, $f6, $f8
-/* 04B28C 8004A68C 24843E50 */  addiu $a0, %lo(D_80183E50) # addiu $a0, $a0, 0x3e50
-/* 04B290 8004A690 8FA50020 */  lw    $a1, 0x20($sp)
-/* 04B294 8004A694 8FA60028 */  lw    $a2, 0x28($sp)
-/* 04B298 8004A698 46205420 */  cvt.s.d $f16, $f10
-/* 04B29C 8004A69C 24A50030 */  addiu $a1, $a1, 0x30
-/* 04B2A0 8004A6A0 E4900004 */  swc1  $f16, 4($a0)
-/* 04B2A4 8004A6A4 C6120008 */  lwc1  $f18, 8($s0)
-/* 04B2A8 8004A6A8 0C010C14 */  jal   func_80043050
-/* 04B2AC 8004A6AC E4920008 */   swc1  $f18, 8($a0)
-/* 04B2B0 8004A6B0 3C048015 */  lui   $a0, %hi(gDisplayListHead) # $a0, 0x8015
-/* 04B2B4 8004A6B4 24840298 */  addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298
-/* 04B2B8 8004A6B8 8C830000 */  lw    $v1, ($a0)
-/* 04B2BC 8004A6BC 3C190D00 */  lui   $t9, %hi(D_0D007B98) # $t9, 0xd00
-/* 04B2C0 8004A6C0 27397B98 */  addiu $t9, %lo(D_0D007B98) # addiu $t9, $t9, 0x7b98
-/* 04B2C4 8004A6C4 246F0008 */  addiu $t7, $v1, 8
-/* 04B2C8 8004A6C8 AC8F0000 */  sw    $t7, ($a0)
-/* 04B2CC 8004A6CC 3C180600 */  lui   $t8, 0x600
-/* 04B2D0 8004A6D0 AC780000 */  sw    $t8, ($v1)
-/* 04B2D4 8004A6D4 AC790004 */  sw    $t9, 4($v1)
-.L8004A6D8:
-/* 04B2D8 8004A6D8 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 04B2DC 8004A6DC 8FB00018 */  lw    $s0, 0x18($sp)
-/* 04B2E0 8004A6E0 27BD0020 */  addiu $sp, $sp, 0x20
-/* 04B2E4 8004A6E4 03E00008 */  jr    $ra
-/* 04B2E8 8004A6E8 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_8004A6EC.s b/asm/non_matchings/code_800431B0/func_8004A6EC.s
deleted file mode 100644
index 45e8285ec..000000000
--- a/asm/non_matchings/code_800431B0/func_8004A6EC.s
+++ /dev/null
@@ -1,50 +0,0 @@
-glabel func_8004A6EC
-/* 04B2EC 8004A6EC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 04B2F0 8004A6F0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 04B2F4 8004A6F4 AFA5001C */  sw    $a1, 0x1c($sp)
-/* 04B2F8 8004A6F8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 04B2FC 8004A6FC 0C01C88F */  jal   func_8007223C
-/* 04B300 8004A700 24050020 */   li    $a1, 32
-/* 04B304 8004A704 10400025 */  beqz  $v0, .L8004A79C
-/* 04B308 8004A708 8FA40018 */   lw    $a0, 0x18($sp)
-/* 04B30C 8004A70C 0C01C88F */  jal   func_8007223C
-/* 04B310 8004A710 3C050080 */   lui   $a1, 0x80
-/* 04B314 8004A714 10400021 */  beqz  $v0, .L8004A79C
-/* 04B318 8004A718 3C048018 */   lui   $a0, %hi(D_80183E50) # $a0, 0x8018
-/* 04B31C 8004A71C 8FAE0018 */  lw    $t6, 0x18($sp)
-/* 04B320 8004A720 3C188016 */  lui   $t8, %hi(D_80165C18) # $t8, 0x8016
-/* 04B324 8004A724 27185C18 */  addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
-/* 04B328 8004A728 000E78C0 */  sll   $t7, $t6, 3
-/* 04B32C 8004A72C 01EE7823 */  subu  $t7, $t7, $t6
-/* 04B330 8004A730 000F7940 */  sll   $t7, $t7, 5
-/* 04B334 8004A734 01F81021 */  addu  $v0, $t7, $t8
-/* 04B338 8004A738 C4440004 */  lwc1  $f4, 4($v0)
-/* 04B33C 8004A73C C4460044 */  lwc1  $f6, 0x44($v0)
-/* 04B340 8004A740 24843E50 */  addiu $a0, %lo(D_80183E50) # addiu $a0, $a0, 0x3e50
-/* 04B344 8004A744 3C01800F */  lui   $at, %hi(D_800EE038)
-/* 04B348 8004A748 E4840000 */  swc1  $f4, ($a0)
-/* 04B34C 8004A74C D42AE038 */  ldc1  $f10, %lo(D_800EE038)($at)
-/* 04B350 8004A750 46003221 */  cvt.d.s $f8, $f6
-/* 04B354 8004A754 C444000C */  lwc1  $f4, 0xc($v0)
-/* 04B358 8004A758 462A4400 */  add.d $f16, $f8, $f10
-/* 04B35C 8004A75C 244500B8 */  addiu $a1, $v0, 0xb8
-/* 04B360 8004A760 8FA6001C */  lw    $a2, 0x1c($sp)
-/* 04B364 8004A764 E4840008 */  swc1  $f4, 8($a0)
-/* 04B368 8004A768 462084A0 */  cvt.s.d $f18, $f16
-/* 04B36C 8004A76C 0C010B80 */  jal   func_80042E00
-/* 04B370 8004A770 E4920004 */   swc1  $f18, 4($a0)
-/* 04B374 8004A774 3C048015 */  lui   $a0, %hi(gDisplayListHead) # $a0, 0x8015
-/* 04B378 8004A778 24840298 */  addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298
-/* 04B37C 8004A77C 8C830000 */  lw    $v1, ($a0)
-/* 04B380 8004A780 3C090D00 */  lui   $t1, %hi(D_0D007B20) # $t1, 0xd00
-/* 04B384 8004A784 25297B20 */  addiu $t1, %lo(D_0D007B20) # addiu $t1, $t1, 0x7b20
-/* 04B388 8004A788 24790008 */  addiu $t9, $v1, 8
-/* 04B38C 8004A78C AC990000 */  sw    $t9, ($a0)
-/* 04B390 8004A790 3C080600 */  lui   $t0, 0x600
-/* 04B394 8004A794 AC680000 */  sw    $t0, ($v1)
-/* 04B398 8004A798 AC690004 */  sw    $t1, 4($v1)
-.L8004A79C:
-/* 04B39C 8004A79C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 04B3A0 8004A7A0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 04B3A4 8004A7A4 03E00008 */  jr    $ra
-/* 04B3A8 8004A7A8 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_8004A7AC.s b/asm/non_matchings/code_800431B0/func_8004A7AC.s
deleted file mode 100644
index c72c88b0b..000000000
--- a/asm/non_matchings/code_800431B0/func_8004A7AC.s
+++ /dev/null
@@ -1,51 +0,0 @@
-glabel func_8004A7AC
-/* 04B3AC 8004A7AC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 04B3B0 8004A7B0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 04B3B4 8004A7B4 AFA5001C */  sw    $a1, 0x1c($sp)
-/* 04B3B8 8004A7B8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 04B3BC 8004A7BC 0C01C88F */  jal   func_8007223C
-/* 04B3C0 8004A7C0 24050020 */   li    $a1, 32
-/* 04B3C4 8004A7C4 10400026 */  beqz  $v0, .L8004A860
-/* 04B3C8 8004A7C8 3C048018 */   lui   $a0, %hi(D_80183E50) # $a0, 0x8018
-/* 04B3CC 8004A7CC 8FAE0018 */  lw    $t6, 0x18($sp)
-/* 04B3D0 8004A7D0 3C188016 */  lui   $t8, %hi(D_80165C18) # $t8, 0x8016
-/* 04B3D4 8004A7D4 27185C18 */  addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
-/* 04B3D8 8004A7D8 000E78C0 */  sll   $t7, $t6, 3
-/* 04B3DC 8004A7DC 01EE7823 */  subu  $t7, $t7, $t6
-/* 04B3E0 8004A7E0 000F7940 */  sll   $t7, $t7, 5
-/* 04B3E4 8004A7E4 01F81021 */  addu  $v0, $t7, $t8
-/* 04B3E8 8004A7E8 C4440004 */  lwc1  $f4, 4($v0)
-/* 04B3EC 8004A7EC C4460044 */  lwc1  $f6, 0x44($v0)
-/* 04B3F0 8004A7F0 24843E50 */  addiu $a0, %lo(D_80183E50) # addiu $a0, $a0, 0x3e50
-/* 04B3F4 8004A7F4 3C01800F */  lui   $at, %hi(D_800EE040)
-/* 04B3F8 8004A7F8 E4840000 */  swc1  $f4, ($a0)
-/* 04B3FC 8004A7FC D42AE040 */  ldc1  $f10, %lo(D_800EE040)($at)
-/* 04B400 8004A800 46003221 */  cvt.d.s $f8, $f6
-/* 04B404 8004A804 3C058018 */  lui   $a1, %hi(D_80183E98) # $a1, 0x8018
-/* 04B408 8004A808 462A4400 */  add.d $f16, $f8, $f10
-/* 04B40C 8004A80C C444000C */  lwc1  $f4, 0xc($v0)
-/* 04B410 8004A810 24A53E98 */  addiu $a1, %lo(D_80183E98) # addiu $a1, $a1, 0x3e98
-/* 04B414 8004A814 24194000 */  li    $t9, 16384
-/* 04B418 8004A818 462084A0 */  cvt.s.d $f18, $f16
-/* 04B41C 8004A81C A4B90000 */  sh    $t9, ($a1)
-/* 04B420 8004A820 A4A00002 */  sh    $zero, 2($a1)
-/* 04B424 8004A824 A4A00004 */  sh    $zero, 4($a1)
-/* 04B428 8004A828 E4920004 */  swc1  $f18, 4($a0)
-/* 04B42C 8004A82C 8FA6001C */  lw    $a2, 0x1c($sp)
-/* 04B430 8004A830 0C010B80 */  jal   func_80042E00
-/* 04B434 8004A834 E4840008 */   swc1  $f4, 8($a0)
-/* 04B438 8004A838 3C048015 */  lui   $a0, %hi(gDisplayListHead) # $a0, 0x8015
-/* 04B43C 8004A83C 24840298 */  addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298
-/* 04B440 8004A840 8C830000 */  lw    $v1, ($a0)
-/* 04B444 8004A844 3C0A0D00 */  lui   $t2, %hi(D_0D007B20) # $t2, 0xd00
-/* 04B448 8004A848 254A7B20 */  addiu $t2, %lo(D_0D007B20) # addiu $t2, $t2, 0x7b20
-/* 04B44C 8004A84C 24680008 */  addiu $t0, $v1, 8
-/* 04B450 8004A850 AC880000 */  sw    $t0, ($a0)
-/* 04B454 8004A854 3C090600 */  lui   $t1, 0x600
-/* 04B458 8004A858 AC690000 */  sw    $t1, ($v1)
-/* 04B45C 8004A85C AC6A0004 */  sw    $t2, 4($v1)
-.L8004A860:
-/* 04B460 8004A860 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 04B464 8004A864 27BD0018 */  addiu $sp, $sp, 0x18
-/* 04B468 8004A868 03E00008 */  jr    $ra
-/* 04B46C 8004A86C 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_8004A870.s b/asm/non_matchings/code_800431B0/func_8004A870.s
deleted file mode 100644
index affe1365d..000000000
--- a/asm/non_matchings/code_800431B0/func_8004A870.s
+++ /dev/null
@@ -1,84 +0,0 @@
-glabel func_8004A870
-/* 04B470 8004A870 27BDFF90 */  addiu $sp, $sp, -0x70
-/* 04B474 8004A874 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 04B478 8004A878 AFA50074 */  sw    $a1, 0x74($sp)
-/* 04B47C 8004A87C AFA40070 */  sw    $a0, 0x70($sp)
-/* 04B480 8004A880 0C01C88F */  jal   func_8007223C
-/* 04B484 8004A884 24050020 */   li    $a1, 32
-/* 04B488 8004A888 10400047 */  beqz  $v0, .L8004A9A8
-/* 04B48C 8004A88C 8FA40070 */   lw    $a0, 0x70($sp)
-/* 04B490 8004A890 0C01C88F */  jal   func_8007223C
-/* 04B494 8004A894 3C050080 */   lui   $a1, 0x80
-/* 04B498 8004A898 10400043 */  beqz  $v0, .L8004A9A8
-/* 04B49C 8004A89C 3C068018 */   lui   $a2, %hi(D_80183E50) # $a2, 0x8018
-/* 04B4A0 8004A8A0 8FAE0070 */  lw    $t6, 0x70($sp)
-/* 04B4A4 8004A8A4 3C188016 */  lui   $t8, %hi(D_80165C18) # $t8, 0x8016
-/* 04B4A8 8004A8A8 27185C18 */  addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
-/* 04B4AC 8004A8AC 000E78C0 */  sll   $t7, $t6, 3
-/* 04B4B0 8004A8B0 01EE7823 */  subu  $t7, $t7, $t6
-/* 04B4B4 8004A8B4 000F7940 */  sll   $t7, $t7, 5
-/* 04B4B8 8004A8B8 01F81021 */  addu  $v0, $t7, $t8
-/* 04B4BC 8004A8BC C4440004 */  lwc1  $f4, 4($v0)
-/* 04B4C0 8004A8C0 C4460044 */  lwc1  $f6, 0x44($v0)
-/* 04B4C4 8004A8C4 24C63E50 */  addiu $a2, %lo(D_80183E50) # addiu $a2, $a2, 0x3e50
-/* 04B4C8 8004A8C8 3C01800F */  lui   $at, %hi(D_800EE048)
-/* 04B4CC 8004A8CC E4C40000 */  swc1  $f4, ($a2)
-/* 04B4D0 8004A8D0 D42AE048 */  ldc1  $f10, %lo(D_800EE048)($at)
-/* 04B4D4 8004A8D4 46003221 */  cvt.d.s $f8, $f6
-/* 04B4D8 8004A8D8 C444000C */  lwc1  $f4, 0xc($v0)
-/* 04B4DC 8004A8DC 462A4400 */  add.d $f16, $f8, $f10
-/* 04B4E0 8004A8E0 C7A60074 */  lwc1  $f6, 0x74($sp)
-/* 04B4E4 8004A8E4 2445001C */  addiu $a1, $v0, 0x1c
-/* 04B4E8 8004A8E8 27A40030 */  addiu $a0, $sp, 0x30
-/* 04B4EC 8004A8EC 462084A0 */  cvt.s.d $f18, $f16
-/* 04B4F0 8004A8F0 00003825 */  move  $a3, $zero
-/* 04B4F4 8004A8F4 E4C40008 */  swc1  $f4, 8($a2)
-/* 04B4F8 8004A8F8 E7A60010 */  swc1  $f6, 0x10($sp)
-/* 04B4FC 8004A8FC 0C010A88 */  jal   func_80042A20
-/* 04B500 8004A900 E4D20004 */   swc1  $f18, 4($a2)
-/* 04B504 8004A904 3C068019 */  lui   $a2, %hi(D_8018D120) # $a2, 0x8019
-/* 04B508 8004A908 24C6D120 */  addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0
-/* 04B50C 8004A90C 8CC80000 */  lw    $t0, ($a2)
-/* 04B510 8004A910 3C198015 */  lui   $t9, %hi(gGfxPool) # $t9, 0x8015
-/* 04B514 8004A914 8F39EF40 */  lw    $t9, %lo(gGfxPool)($t9)
-/* 04B518 8004A918 00084980 */  sll   $t1, $t0, 6
-/* 04B51C 8004A91C 27A50030 */  addiu $a1, $sp, 0x30
-/* 04B520 8004A920 03292021 */  addu  $a0, $t9, $t1
-/* 04B524 8004A924 0C008860 */  jal   func_80022180
-/* 04B528 8004A928 248402C0 */   addiu $a0, $a0, 0x2c0
-/* 04B52C 8004A92C 3C058015 */  lui   $a1, %hi(gDisplayListHead) # $a1, 0x8015
-/* 04B530 8004A930 24A50298 */  addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298
-/* 04B534 8004A934 8CA20000 */  lw    $v0, ($a1)
-/* 04B538 8004A938 3C0B0102 */  lui   $t3, (0x01020040 >> 16) # lui $t3, 0x102
-/* 04B53C 8004A93C 3C068019 */  lui   $a2, %hi(D_8018D120) # $a2, 0x8019
-/* 04B540 8004A940 244A0008 */  addiu $t2, $v0, 8
-/* 04B544 8004A944 ACAA0000 */  sw    $t2, ($a1)
-/* 04B548 8004A948 356B0040 */  ori   $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40
-/* 04B54C 8004A94C 24C6D120 */  addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0
-/* 04B550 8004A950 AC4B0000 */  sw    $t3, ($v0)
-/* 04B554 8004A954 8CCD0000 */  lw    $t5, ($a2)
-/* 04B558 8004A958 3C0C8015 */  lui   $t4, %hi(gGfxPool) # $t4, 0x8015
-/* 04B55C 8004A95C 8D8CEF40 */  lw    $t4, %lo(gGfxPool)($t4)
-/* 04B560 8004A960 000D7180 */  sll   $t6, $t5, 6
-/* 04B564 8004A964 3C011FFF */  lui   $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff
-/* 04B568 8004A968 018E7821 */  addu  $t7, $t4, $t6
-/* 04B56C 8004A96C 25F802C0 */  addiu $t8, $t7, 0x2c0
-/* 04B570 8004A970 3421FFFF */  ori   $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff
-/* 04B574 8004A974 03014024 */  and   $t0, $t8, $at
-/* 04B578 8004A978 AC480004 */  sw    $t0, 4($v0)
-/* 04B57C 8004A97C 8CD90000 */  lw    $t9, ($a2)
-/* 04B580 8004A980 8CA20000 */  lw    $v0, ($a1)
-/* 04B584 8004A984 3C0D0D00 */  lui   $t5, %hi(D_0D007B98) # $t5, 0xd00
-/* 04B588 8004A988 27290001 */  addiu $t1, $t9, 1
-/* 04B58C 8004A98C 244A0008 */  addiu $t2, $v0, 8
-/* 04B590 8004A990 ACC90000 */  sw    $t1, ($a2)
-/* 04B594 8004A994 ACAA0000 */  sw    $t2, ($a1)
-/* 04B598 8004A998 25AD7B98 */  addiu $t5, %lo(D_0D007B98) # addiu $t5, $t5, 0x7b98
-/* 04B59C 8004A99C 3C0B0600 */  lui   $t3, 0x600
-/* 04B5A0 8004A9A0 AC4B0000 */  sw    $t3, ($v0)
-/* 04B5A4 8004A9A4 AC4D0004 */  sw    $t5, 4($v0)
-.L8004A9A8:
-/* 04B5A8 8004A9A8 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 04B5AC 8004A9AC 27BD0070 */  addiu $sp, $sp, 0x70
-/* 04B5B0 8004A9B0 03E00008 */  jr    $ra
-/* 04B5B4 8004A9B4 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_800508C0.s b/asm/non_matchings/code_800431B0/func_800508C0.s
index 4012cb222..63274ba67 100644
--- a/asm/non_matchings/code_800431B0/func_800508C0.s
+++ b/asm/non_matchings/code_800431B0/func_800508C0.s
@@ -1,3 +1,11 @@
+.section .late_rodata
+
+glabel jpt_800EE050
+.word L80050C50, L80050A88, L80050AC0, L80050B1C
+.word L80050BA8
+
+.section .text
+
 glabel func_800508C0
 /* 0514C0 800508C0 3C0E800E */  lui   $t6, %hi(gModeSelection) # $t6, 0x800e
 /* 0514C4 800508C4 8DCEC53C */  lw    $t6, %lo(gModeSelection)($t6)
diff --git a/asm/non_matchings/code_800431B0/func_80050C68.s b/asm/non_matchings/code_800431B0/func_80050C68.s
index 4a1428ae9..ddea16185 100644
--- a/asm/non_matchings/code_800431B0/func_80050C68.s
+++ b/asm/non_matchings/code_800431B0/func_80050C68.s
@@ -1,3 +1,10 @@
+.section .late_rodata
+
+glabel D_800EE064
+.float 0.6
+
+.section .text
+
 glabel func_80050C68
 /* 051868 80050C68 27BDFF70 */  addiu $sp, $sp, -0x90
 /* 05186C 80050C6C AFB20028 */  sw    $s2, 0x28($sp)
diff --git a/asm/non_matchings/code_800431B0/func_800534E8.s b/asm/non_matchings/code_800431B0/func_800534E8.s
index f010ff51b..a17e4b6a8 100644
--- a/asm/non_matchings/code_800431B0/func_800534E8.s
+++ b/asm/non_matchings/code_800431B0/func_800534E8.s
@@ -1,3 +1,11 @@
+.section .late_rodata
+
+glabel jpt_800EE068
+.word L80053520, L80053574, L800535C8, L8005361C
+.word L80053670
+
+.section .text
+
 glabel func_800534E8
 /* 0540E8 800534E8 000470C0 */  sll   $t6, $a0, 3
 /* 0540EC 800534EC 01C47023 */  subu  $t6, $t6, $a0
diff --git a/asm/non_matchings/code_800431B0/func_80054E10.s b/asm/non_matchings/code_800431B0/func_80054E10.s
deleted file mode 100644
index c6aa7de81..000000000
--- a/asm/non_matchings/code_800431B0/func_80054E10.s
+++ /dev/null
@@ -1,44 +0,0 @@
-glabel func_80054E10
-/* 055A10 80054E10 000470C0 */  sll   $t6, $a0, 3
-/* 055A14 80054E14 01C47023 */  subu  $t6, $t6, $a0
-/* 055A18 80054E18 3C0F8016 */  lui   $t7, %hi(D_80165C18) # $t7, 0x8016
-/* 055A1C 80054E1C 25EF5C18 */  addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18
-/* 055A20 80054E20 000E7140 */  sll   $t6, $t6, 5
-/* 055A24 80054E24 01CF1821 */  addu  $v1, $t6, $t7
-/* 055A28 80054E28 847800A6 */  lh    $t8, 0xa6($v1)
-/* 055A2C 80054E2C 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 055A30 80054E30 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 055A34 80054E34 1B00001C */  blez  $t8, .L80054EA8
-/* 055A38 80054E38 3C050080 */   lui   $a1, 0x80
-/* 055A3C 80054E3C 0C01C88F */  jal   func_8007223C
-/* 055A40 80054E40 AFA3001C */   sw    $v1, 0x1c($sp)
-/* 055A44 80054E44 10400018 */  beqz  $v0, .L80054EA8
-/* 055A48 80054E48 8FA3001C */   lw    $v1, 0x1c($sp)
-/* 055A4C 80054E4C C4640004 */  lwc1  $f4, 4($v1)
-/* 055A50 80054E50 3C028018 */  lui   $v0, %hi(D_80183E50) # $v0, 0x8018
-/* 055A54 80054E54 C4660044 */  lwc1  $f6, 0x44($v1)
-/* 055A58 80054E58 24423E50 */  addiu $v0, %lo(D_80183E50) # addiu $v0, $v0, 0x3e50
-/* 055A5C 80054E5C 3C01800F */  lui   $at, %hi(D_800EE080)
-/* 055A60 80054E60 E4440000 */  swc1  $f4, ($v0)
-/* 055A64 80054E64 D42AE080 */  ldc1  $f10, %lo(D_800EE080)($at)
-/* 055A68 80054E68 46003221 */  cvt.d.s $f8, $f6
-/* 055A6C 80054E6C 3C048018 */  lui   $a0, %hi(D_80183E70) # $a0, 0x8018
-/* 055A70 80054E70 462A4400 */  add.d $f16, $f8, $f10
-/* 055A74 80054E74 C464000C */  lwc1  $f4, 0xc($v1)
-/* 055A78 80054E78 C4660038 */  lwc1  $f6, 0x38($v1)
-/* 055A7C 80054E7C C468003C */  lwc1  $f8, 0x3c($v1)
-/* 055A80 80054E80 462084A0 */  cvt.s.d $f18, $f16
-/* 055A84 80054E84 C46A0040 */  lwc1  $f10, 0x40($v1)
-/* 055A88 80054E88 24843E70 */  addiu $a0, %lo(D_80183E70) # addiu $a0, $a0, 0x3e70
-/* 055A8C 80054E8C C46C0000 */  lwc1  $f12, ($v1)
-/* 055A90 80054E90 E4520004 */  swc1  $f18, 4($v0)
-/* 055A94 80054E94 E4440008 */  swc1  $f4, 8($v0)
-/* 055A98 80054E98 E4860000 */  swc1  $f6, ($a0)
-/* 055A9C 80054E9C E4880004 */  swc1  $f8, 4($a0)
-/* 055AA0 80054EA0 0C012A6E */  jal   func_8004A9B8
-/* 055AA4 80054EA4 E48A0008 */   swc1  $f10, 8($a0)
-.L80054EA8:
-/* 055AA8 80054EA8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 055AAC 80054EAC 27BD0020 */  addiu $sp, $sp, 0x20
-/* 055AB0 80054EB0 03E00008 */  jr    $ra
-/* 055AB4 80054EB4 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_800568A0.s b/asm/non_matchings/code_800431B0/func_800568A0.s
deleted file mode 100644
index 98c38c793..000000000
--- a/asm/non_matchings/code_800431B0/func_800568A0.s
+++ /dev/null
@@ -1,86 +0,0 @@
-glabel func_800568A0
-/* 0574A0 800568A0 000440C0 */  sll   $t0, $a0, 3
-/* 0574A4 800568A4 01044023 */  subu  $t0, $t0, $a0
-/* 0574A8 800568A8 3C098016 */  lui   $t1, %hi(D_80165C18) # $t1, 0x8016
-/* 0574AC 800568AC 25295C18 */  addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18
-/* 0574B0 800568B0 00084140 */  sll   $t0, $t0, 5
-/* 0574B4 800568B4 01091021 */  addu  $v0, $t0, $t1
-/* 0574B8 800568B8 C4440004 */  lwc1  $f4, 4($v0)
-/* 0574BC 800568BC 3C068018 */  lui   $a2, %hi(D_80183E50) # $a2, 0x8018
-/* 0574C0 800568C0 3C18800E */  lui   $t8, %hi(gPlayerOne) # $t8, 0x800e
-/* 0574C4 800568C4 8F18C4DC */  lw    $t8, %lo(gPlayerOne)($t8)
-/* 0574C8 800568C8 C4460044 */  lwc1  $f6, 0x44($v0)
-/* 0574CC 800568CC 24C63E50 */  addiu $a2, %lo(D_80183E50) # addiu $a2, $a2, 0x3e50
-/* 0574D0 800568D0 3C01800F */  lui   $at, %hi(D_800EE088)
-/* 0574D4 800568D4 E4C40000 */  swc1  $f4, ($a2)
-/* 0574D8 800568D8 D42AE088 */  ldc1  $f10, %lo(D_800EE088)($at)
-/* 0574DC 800568DC 46003221 */  cvt.d.s $f8, $f6
-/* 0574E0 800568E0 000578C0 */  sll   $t7, $a1, 3
-/* 0574E4 800568E4 462A4400 */  add.d $f16, $f8, $f10
-/* 0574E8 800568E8 01E57823 */  subu  $t7, $t7, $a1
-/* 0574EC 800568EC 000F7900 */  sll   $t7, $t7, 4
-/* 0574F0 800568F0 01E57823 */  subu  $t7, $t7, $a1
-/* 0574F4 800568F4 27BDFF90 */  addiu $sp, $sp, -0x70
-/* 0574F8 800568F8 000F7880 */  sll   $t7, $t7, 2
-/* 0574FC 800568FC 462084A0 */  cvt.s.d $f18, $f16
-/* 057500 80056900 01E57823 */  subu  $t7, $t7, $a1
-/* 057504 80056904 3C013F00 */  li    $at, 0x3F000000 # 0.500000
-/* 057508 80056908 C444000C */  lwc1  $f4, 0xc($v0)
-/* 05750C 8005690C 44813000 */  mtc1  $at, $f6
-/* 057510 80056910 000F78C0 */  sll   $t7, $t7, 3
-/* 057514 80056914 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 057518 80056918 AFA40070 */  sw    $a0, 0x70($sp)
-/* 05751C 8005691C AFA50074 */  sw    $a1, 0x74($sp)
-/* 057520 80056920 01F81821 */  addu  $v1, $t7, $t8
-/* 057524 80056924 E4D20004 */  swc1  $f18, 4($a2)
-/* 057528 80056928 24650140 */  addiu $a1, $v1, 0x140
-/* 05752C 8005692C 27A40030 */  addiu $a0, $sp, 0x30
-/* 057530 80056930 00003825 */  move  $a3, $zero
-/* 057534 80056934 E4C40008 */  swc1  $f4, 8($a2)
-/* 057538 80056938 0C010A88 */  jal   func_80042A20
-/* 05753C 8005693C E7A60010 */   swc1  $f6, 0x10($sp)
-/* 057540 80056940 3C068019 */  lui   $a2, %hi(D_8018D120) # $a2, 0x8019
-/* 057544 80056944 24C6D120 */  addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0
-/* 057548 80056948 8CCB0000 */  lw    $t3, ($a2)
-/* 05754C 8005694C 3C0A8015 */  lui   $t2, %hi(gGfxPool) # $t2, 0x8015
-/* 057550 80056950 8D4AEF40 */  lw    $t2, %lo(gGfxPool)($t2)
-/* 057554 80056954 000B6180 */  sll   $t4, $t3, 6
-/* 057558 80056958 27A50030 */  addiu $a1, $sp, 0x30
-/* 05755C 8005695C 014C2021 */  addu  $a0, $t2, $t4
-/* 057560 80056960 0C008860 */  jal   func_80022180
-/* 057564 80056964 248402C0 */   addiu $a0, $a0, 0x2c0
-/* 057568 80056968 3C058015 */  lui   $a1, %hi(gDisplayListHead) # $a1, 0x8015
-/* 05756C 8005696C 24A50298 */  addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298
-/* 057570 80056970 8CA20000 */  lw    $v0, ($a1)
-/* 057574 80056974 3C0E0102 */  lui   $t6, (0x01020040 >> 16) # lui $t6, 0x102
-/* 057578 80056978 3C068019 */  lui   $a2, %hi(D_8018D120) # $a2, 0x8019
-/* 05757C 8005697C 244D0008 */  addiu $t5, $v0, 8
-/* 057580 80056980 ACAD0000 */  sw    $t5, ($a1)
-/* 057584 80056984 35CE0040 */  ori   $t6, (0x01020040 & 0xFFFF) # ori $t6, $t6, 0x40
-/* 057588 80056988 24C6D120 */  addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0
-/* 05758C 8005698C AC4E0000 */  sw    $t6, ($v0)
-/* 057590 80056990 8CD80000 */  lw    $t8, ($a2)
-/* 057594 80056994 3C0F8015 */  lui   $t7, %hi(gGfxPool) # $t7, 0x8015
-/* 057598 80056998 8DEFEF40 */  lw    $t7, %lo(gGfxPool)($t7)
-/* 05759C 8005699C 0018C980 */  sll   $t9, $t8, 6
-/* 0575A0 800569A0 3C011FFF */  lui   $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff
-/* 0575A4 800569A4 01F94021 */  addu  $t0, $t7, $t9
-/* 0575A8 800569A8 250902C0 */  addiu $t1, $t0, 0x2c0
-/* 0575AC 800569AC 3421FFFF */  ori   $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff
-/* 0575B0 800569B0 01215824 */  and   $t3, $t1, $at
-/* 0575B4 800569B4 AC4B0004 */  sw    $t3, 4($v0)
-/* 0575B8 800569B8 8CCA0000 */  lw    $t2, ($a2)
-/* 0575BC 800569BC 8CA20000 */  lw    $v0, ($a1)
-/* 0575C0 800569C0 3C180D00 */  lui   $t8, %hi(D_0D007B98) # $t8, 0xd00
-/* 0575C4 800569C4 254C0001 */  addiu $t4, $t2, 1
-/* 0575C8 800569C8 244D0008 */  addiu $t5, $v0, 8
-/* 0575CC 800569CC ACCC0000 */  sw    $t4, ($a2)
-/* 0575D0 800569D0 ACAD0000 */  sw    $t5, ($a1)
-/* 0575D4 800569D4 27187B98 */  addiu $t8, %lo(D_0D007B98) # addiu $t8, $t8, 0x7b98
-/* 0575D8 800569D8 3C0E0600 */  lui   $t6, 0x600
-/* 0575DC 800569DC AC4E0000 */  sw    $t6, ($v0)
-/* 0575E0 800569E0 AC580004 */  sw    $t8, 4($v0)
-/* 0575E4 800569E4 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 0575E8 800569E8 27BD0070 */  addiu $sp, $sp, 0x70
-/* 0575EC 800569EC 03E00008 */  jr    $ra
-/* 0575F0 800569F0 00000000 */   nop
diff --git a/data/data_0DD0A0_3_0_1.s b/data/data_0DD0A0_3_0_1.s
deleted file mode 100644
index e3ce38213..000000000
--- a/data/data_0DD0A0_3_0_1.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.include "macros.inc"
-
-.section .rodata
-
-glabel D_800EE030
-.double 0.8
-
-glabel D_800EE038
-.double 0.8
-
-glabel D_800EE040
-.double 0.8
-
-glabel D_800EE048
-.double 0.8
-
-glabel jpt_800EE050
-.word L80050C50, L80050A88, L80050AC0, L80050B1C
-.word L80050BA8
-
-glabel D_800EE064
-.float 0.6
-
-glabel jpt_800EE068
-.word L80053520, L80053574, L800535C8, L8005361C
-.word L80053670
-
-.word 0x00000000
-
-glabel D_800EE080
-.double 0.8
-
-glabel D_800EE088
-.double 0.8
-
-
-
-#glabel jpt_800EE090
-#.word L80057D14, L80057D28, L80057D3C, L80057D50
-#.word L80057D64, L80057DC0, L80057DC0, L80057DC0
-#.word L80057D78, L80057D8C, L80057DA0, L80057DB4
diff --git a/mk64.ld b/mk64.ld
index b13de4f22..01b1c4bcc 100644
--- a/mk64.ld
+++ b/mk64.ld
@@ -273,7 +273,7 @@ SECTIONS
       BUILD_DIR/data/data_0DD0A0_3_0_0.o(.rodata);
       BUILD_DIR/src/spawn_players.o(.rodata);
       BUILD_DIR/src/code_8003DC40.o(.rodata);
-      BUILD_DIR/data/data_0DD0A0_3_0_1.o(.rodata);
+      BUILD_DIR/src/code_800431B0.o(.rodata);
       BUILD_DIR/src/code_80057C60.o(.rodata);
       BUILD_DIR/data/data_0DD0A0_3_0.o(.rodata);
       BUILD_DIR/src/code_800AF9B0.o(.rodata);
diff --git a/src/code_800431B0.c b/src/code_800431B0.c
index 82a62d92f..76f3a2046 100644
--- a/src/code_800431B0.c
+++ b/src/code_800431B0.c
@@ -1614,10 +1614,6 @@ UNUSED void func_8004A5E4(Vec3f arg0, Vec3su arg1, f32 arg2, s32 arg3, Vtx *arg4
     func_8004A414(arg0, arg1, arg2, arg3, arg4, 16, 16, 16, 16);
 }
 
-#ifdef NEEDS_RODATA
-// data_0DD0A0_3_0_1.s
-// D_800EE030
-
 void func_8004A630(UnkActorInner *arg0, Vec3f arg1, f32 arg2) {
     if (func_80041924(arg0, arg1) != 0) {
         D_80183E50[0] = arg1[0];
@@ -1627,13 +1623,6 @@ void func_8004A630(UnkActorInner *arg0, Vec3f arg1, f32 arg2) {
         gSPDisplayList(gDisplayListHead++, D_0D007B98);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A630.s")
-#endif
-
-#ifdef NEEDS_RODATA
-// data_0DD0A0_3_0_1.s
-// D_800EE038
 
 void func_8004A6EC(s32 objectIndex, f32 arg1) {
     struct_80165C18_entry *temp_v0;
@@ -1647,13 +1636,6 @@ void func_8004A6EC(s32 objectIndex, f32 arg1) {
         gSPDisplayList(gDisplayListHead++, D_0D007B20);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A6EC.s")
-#endif
-
-#ifdef NEEDS_RODATA
-// data_0DD0A0_3_0_1.s
-// D_800EE040
 
 void func_8004A7AC(s32 objectIndex, f32 arg1) {
     struct_80165C18_entry *temp_v0;
@@ -1670,13 +1652,6 @@ void func_8004A7AC(s32 objectIndex, f32 arg1) {
         gSPDisplayList(gDisplayListHead++, D_0D007B20);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A7AC.s")
-#endif
-
-#if NEEDS_RODATA
-// data_0DD0A0_3_0_1.s
-// D_800EE048
 
 void func_8004A870(s32 objectIndex, f32 arg1) {
     Mat4 sp30;
@@ -1694,9 +1669,6 @@ void func_8004A870(s32 objectIndex, f32 arg1) {
         gSPDisplayList(gDisplayListHead++, D_0D007B98);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A870.s")
-#endif
 
 void func_8004A9B8(f32 arg0) {
     func_80043050(D_80183E50, D_80183E70, arg0);
@@ -3978,7 +3950,7 @@ block_20:
 #else
 GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800508C0.s")
 #endif
-
+ 
 #ifdef MIPS_TO_C
 //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
 ? func_800507D8(s32, s32 *, s32 *);                 /* extern */
@@ -5862,10 +5834,6 @@ void func_80054D00(s32 objectIndex, s32 cameraId) {
     }
 }
 
-#ifdef NEEDS_RODATA
-// data/data_0DD0A0_3_0_1.s
-extern f64 D_800EE080; // = 0.8;
-
 void func_80054E10(s32 objectIndex) {
     if (D_80165C18[objectIndex].unk_0A6 > 0) {
         if (func_8007223C(objectIndex, 0x00800000) != 0) {
@@ -5879,9 +5847,6 @@ void func_80054E10(s32 objectIndex) {
         }
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054E10.s")
-#endif
 
 // Almost certainly responsible for spawning/handling the moles on Moo Moo farm
 void func_80054EB8(s32 unused) {
@@ -6508,10 +6473,6 @@ void func_8005669C(s32 objectIndex, s32 arg1, s32 arg2) {
     gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF);
 }
 
-#ifdef NEEDS_RODATA
-// data_0DD0A0_3_0_1.s
-extern f64 D_800EE088;// = 0.8;
-
 void func_800568A0(s32 objectIndex, s32 playerId) {
     Mat4 sp30;
     Player *player;
@@ -6526,9 +6487,6 @@ void func_800568A0(s32 objectIndex, s32 playerId) {
     D_8018D120++;
     gSPDisplayList(gDisplayListHead++, D_0D007B98);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800568A0.s")
-#endif
 
 void func_800569F4(s32 arg0) {
     s32 objectIndex;