Rodata migration (#253)

* all non-world rodata migrated * data disasm
2024-09-16 14:32:37 +02:00 · 2021-04-06 21:59:55 +09:00 · 2021-04-06 21:59:55 +09:00 · eefa9014e2
commit eefa9014e2
parent e1e6231338
33 changed files with 285 additions and 193 deletions
--- a/src/world/area_dgb/dgb_01/BFD880.c
+++ b/src/world/area_dgb/dgb_01/BFD880.c
@ -2,6 +2,6 @@
 #include "ld_addrs.h"

 ApiStatus func_80240000_BFD880(void) {
-    dma_copy(&data_C20F40_ROM_START, &data_C20F40_ROM_END, &gBackgroundImage);
+    dma_copy(&code_code_C20F40_ROM_START, &code_code_C20F40_ROM_END, &gBackgroundImage);
    return ApiStatus_DONE2;
 }
--- a/ver/us/asm/data/code_10CC10.data.s
+++ b/ver/us/asm/data/code_10CC10.data.s
@ -0,0 +1,90 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_802EB3D0
+.word 0x0B08080A, 0x09090904, 0x08080909, 0x0509050A, 0x09070909, 0x09090909, 0x09090505, 0x08090809, 0x0A090909, 0x09090909, 0x09070909, 0x09090909, 0x09090909, 0x09090909, 0x09090907, 0x09060709, 0x06090808, 0x09080808, 0x07040708, 0x04090807, 0x09080808, 0x08080809, 0x08080807, 0x03070A07, 0x09090909, 0x09090909, 0x09070707, 0x08090909, 0x09090909, 0x09090909, 0x09090908, 0x08080808, 0x06060607, 0x09070707, 0x08080808, 0x08060907, 0x0B0B0B0B, 0x0C0C0B0B, 0x0D0D0E0E, 0x0C0D0D0D, 0x0D100909, 0x05050000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0AFE0000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, D_802EE8D0, D_802EB3D0, 0x09FE0000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, 0x00000000, 0x00000000, 0x00000000, 0x10100E10, 0x00800000, 0x802EB478, 0x10100E10, 0x00800000, 0x802EB4B4, 0x08080809, 0x08080808, 0x05080908, 0x0A080809, 0x08090808, 0x08080A09, 0x09080403, 0x04090909, 0x09090909, 0x0909090A, 0x0A000000, 0x09090808, 0x07070807, 0x03070707, 0x08070808, 0x08070708, 0x07070808, 0x08070403, 0x04080808, 0x08080808, 0x08080808, 0x08000000, D_802ED970, 0x802EB508, 0x0E000000, 0x00000000, 0x00000000, 0x00000000, D_802F39D0, 0x802EB534, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, 0x0C0F0E10, 0x00600000, 0x802EB560, 0x0C0C0A0A, 0x00480000, 0x802EB578
+
+glabel D_802EB5A8
+.word 0x802EB4F0, 0x802EB4FC, 0x802EB4FC, 0x802EB590, 0x802EB59C, 0x00000000
+
+glabel D_802EB5C0
+.word 0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, 0x00014178, 0x00015D78, 0x00017978, 0x00019578, 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578
+
+glabel D_802EB5F0
+.word 0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78
+
+glabel D_802EB620
+.word 0x00000011, 0x00000012, 0x00000000, 0x00000017, 0x00000018, 0xFFFFFFCE, 0x0000001B, 0x0000001B, 0x00000000
+
+glabel D_802EB644
+.short 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+
+glabel D_802EB670
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01111111, 0x00000000, 0x00000000, 0x00000111, 0x12233334, 0x00000000, 0x00000000, 0x00111233, 0x44444444, 0x00000000, 0x00000000, 0x11234444, 0x44444444, 0x00000000, 0x00000011, 0x23444444, 0x44444444, 0x00000000, 0x00000123, 0x44444444, 0x44444444, 0x00000000, 0x00011344, 0x44444444, 0x44444444, 0x00000000, 0x00123444, 0x44444444, 0x44444444, 0x00000000, 0x01244444, 0x44444444, 0x44444444, 0x00000000, 0x12444444, 0x44444444, 0x44444444, 0x00000001, 0x24444444, 0x44444444, 0x44444444, 0x00000012, 0x44444444, 0x44444444, 0x44444444, 0x00000013, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00000014, 0x44444444, 0x44444444, 0x44444444, 0x00000099, 0x44444444, 0x44444444, 0x44444444, 0x00000009, 0x34444444, 0x44444444, 0x44444444, 0x00000000, 0x88444444, 0x44444444, 0x44444444, 0x00000000, 0x08544444, 0x44444444, 0x44444444, 0x00000000, 0x00AA4444, 0x44444444, 0x44444444, 0x00000000, 0x000A7544, 0x44444444, 0x44444444, 0x00000000, 0x00000765, 0x44444444, 0x44444444, 0x00000000, 0x00000077, 0x65444444, 0x44444444, 0x00000000, 0x00000000, 0x77654444, 0x44444444, 0x00000000, 0x00000000, 0x00777655, 0x44444444, 0x00000000, 0x00000000, 0x00000777, 0x76655554, 0x00000000, 0x00000000, 0x00000000, 0x07777777, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+
+glabel D_802EBA70
+.ascii "\0\0\0\0\0\0\0\0\0\0\0\0DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDwwww\0\0\0\0\0\0\0\0\0\0\0\0"
+
+glabel D_802EBB70
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x43333221, 0x11100000, 0x00000000, 0x00000000, 0x44444444, 0x33211100, 0x00000000, 0x00000000, 0x44444444, 0x44443211, 0x00000000, 0x00000000, 0x44444444, 0x44444432, 0x11000000, 0x00000000, 0x44444444, 0x44444444, 0x32100000, 0x00000000, 0x44444444, 0x44444444, 0x44319000, 0x00000000, 0x44444444, 0x44444444, 0x44449900, 0x00000000, 0x44444444, 0x44444444, 0x44444380, 0x00000000, 0x44444444, 0x44444444, 0x44444488, 0x00000000, 0x44444444, 0x44444444, 0x44444445, D_A0000000, 0x44444444, 0x44444444, 0x44444444, 0xAA000000, 0x44444444, 0x44444444, 0x44444444, 0x47000000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x57000000, 0x44444444, 0x44444444, 0x44444444, 0x67000000, 0x44444444, 0x44444444, 0x44444446, 0x70000000, 0x44444444, 0x44444444, 0x44444467, 0x00000000, 0x44444444, 0x44444444, 0x44444670, 0x00000000, 0x44444444, 0x44444444, 0x44456700, 0x00000000, 0x44444444, 0x44444444, 0x44577000, 0x00000000, 0x44444444, 0x44444444, 0x56700000, 0x00000000, 0x44444444, 0x44444456, 0x77000000, 0x00000000, 0x44444444, 0x44445677, 0x00000000, 0x00000000, 0x44444444, 0x55677700, 0x00000000, 0x00000000, 0x45555667, 0x77700000, 0x00000000, 0x00000000, 0x77777770, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+
+glabel D_802EBF70
+.word 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78888888, 0x88888870, 0x77777777, 0x77777770, 0x00000000, 0x00000000, 0x00000001, 0x00000112, 0x00011344, 0x00123444, 0x00134444, 0x01344444, 0x01444444, 0x12444444, 0x11111111, 0x33344444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444333, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x10000000, 0x21100000, 0x44398000, 0x44449A00, 0x44444A00, 0x44444570, 0x44444470, 0x44444467, 0x13444444, 0x13444444, 0x13444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444457, 0x44444457, 0x44444457, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x13444444, 0x13444444, 0x13444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444457, 0x44444457, 0x44444457, 0x12444444, 0x01444444, 0x01344444, 0x00944444, 0x00894444, 0x000AA544, 0x00000776, 0x00000007, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x55544444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444555, 0x77777777, 0x44444467, 0x44444470, 0x44444570, 0x44445700, 0x44456700, 0x44577000, 0x67700000, 0x70000000, 0x00000008, 0x00000812, 0x00001245, 0x000145BB, 0x00146B00, 0x0825B000, 0x014B0000, 0x825B0000, 0x11111111, 0x33444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x21800000, 0x54210000, 0xBB541000, 0x00B64100, 0x000B5280, 0x0000B410, 0x0000B528, 0x13B00000, 0x13B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B31, 0x00000B31, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x13B00000, 0x13B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B31, 0x00000B31, 0x825B0000, 0x014B0000, 0x0825B000, 0x00146B00, 0x000145BB, 0x00001245, 0x00000812, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x33444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444433, 0x11111111, 0x0000B528, 0x0000B410, 0x000B5280, 0x00B64100, 0xBB541000, 0x54210000, 0x21800000, D_80000000
+
+glabel D_802EC3F0
+.word 0x739EFFFF, 0xF7BBE739
+
+glabel D_802EC3F8
+.short 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE73B, 0xDEF9, 0xD6B7, 0xCE75, 0xB5AF, 0x8C65, 0x6B5D, 0xAD6D, 0xCE75, 0x8C65, 0x631B, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF6F5, 0xF671, 0xF5AB, 0xCCE5, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xD6BD, 0xC63F, 0xB5BF, 0x9CF5, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B3, 0xF7A9, 0xF75F, 0xCE1D, 0xA51D, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xF69F, 0x8B4F, 0xABCF, 0xB455, 0xD559, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0xBC51, 0xA83F, 0xB455, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0x830D, 0xA83F, 0xB413, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xFFFF, 0xF7BB, 0xE739, 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0x420F, 0x841D, 0xB5AB, 0xD6B3, 0xB5AB, 0x7BDD, 0x420F, 0x420F, 0x420F, 0x420F, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF739, 0xEEF7, 0xE673, 0xC56B, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xE73D, 0xD6BB, 0xCE79, 0xAD71, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B7, 0xEF73, 0xE72D, 0xC627, 0xA51F, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xE61D, 0x938F, 0xBC15, 0xC44F, 0xD557, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0xAC53, 0xAC13, 0xC44F, 0xD557, 0xA38D, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0x9B4B, 0xA83F, 0xC44F, 0xCD17, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001
+
+glabel D_802EC5F0
+.word 0x00006666, 0x66666666, 0x00666666, 0x66666666, 0x06666666, 0x66666666, 0x06666FEE, 0xEEEEEEEE, 0x6666EEEE, 0xBBBBBBBB, 0x666FEEBB, 0xBBAAAAAA, 0x666EEBBA, 0xAAAAAAAA, 0x666EEBAA, 0xCCCCCCCC, 0x666EBBAC, 0x23333333, 0x666EBAAC, 0x99CCC923, 0x666EBAAC, 0x2C11DC23, 0x666EBAAC, 0x9C12DD23, 0x666EBAAC, 0x2CDDDC32, 0x666EBAAC, 0x23CDC332, 0x666EBAAC, 0x22333332, 0x666EBBAC, 0x22333323
+
+glabel D_802EC670
+.word 0x66666666, 0x66660000, 0x66666666, 0x66666600, 0x66666666, 0x66666770, 0xEEEEEEEE, 0xEEF67770, 0xBBBBBBBB, 0xEEEE7777, 0xBAAAAABB, 0xBBEEF777, 0xAAAAAAAA, 0xABBEE777, 0xCCCCCCCC, 0xCBBEE777, 0x33332992, 0xDABBE777, 0x3239CC39, 0xDABBE777, 0x22922DC2, 0xDAABE777, 0x32C22DD9, 0xDAABE777, 0x23CDDDC9, 0xDAABE777, 0x233CDC33, 0xDAABE777, 0x23333333, 0xDAABE777, 0x32333333, 0xDAABE777
+
+glabel D_802EC6F0
+.word 0x666EBAAC, 0x39993332, 0x666EBAAC, 0x33939322, 0x666EBAAC, 0x39393322, 0x666EBAAC, 0x39CCC322, 0x666EBAAC, 0x9C11DC22, 0x666EBAAC, 0x3D22DD22, 0x666EBAAC, 0x3CDDDC22, 0x666EBBBC, 0x33CDC322, 0x666EEBBC, 0xDDDDDDDD, 0x666EEBBB, 0xAAAAAAAA, 0x666FEEBB, 0xBBAAAAAA, 0x6666EEEE, 0xBBBBBBBB, 0x06667FEE, 0xEEEEEEEE, 0x06677777, 0x77777777, 0x00777777, 0x77777777, 0x00007777, 0x77777777
+
+glabel D_802EC770
+.word 0x22323322, 0xDAABE777, 0x2222232C, 0xDAABE777, 0x22CCCCCD, 0xAABBE777, 0x22CCDDDA, 0xAABBE777, 0x39CCDDBA, 0xAABBE777, 0x3CCDDEAA, 0xABBBE777, 0xCDDDEAAA, 0xAABBE777, 0xDDEAAAAA, 0xABBBE777, 0xBAAAAAAA, 0xABBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000
+
+glabel D_802EC7F0
+.word 0x22323322, 0xDAABF777, 0x22222322, 0xDAABF777, 0x229CCC92, 0xDABBF777, 0x22C11DC2, 0xDABBE777, 0x22C12DD2, 0xDABBE777, 0x22CDDDC2, 0xDBBBE777, 0x223CDC32, 0xDABBE777, 0x22222222, 0xDBBBE777, 0xBDDDDDDD, 0xDBBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000
+
+glabel D_802EC870
+.word 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xAAAAAAAB, 0xBAAABBBB, 0xBBBAAAAA, 0xAABBBBBA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0x33339999, 0x99999993, 0x33399999, 0x99999333, 0x22332333, 0x33333333, 0x33333333, 0x33333332, 0x22222333, 0x33333333, 0x33222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222
+
+glabel D_802EC970
+.word 0x666EBBAC, 0x22332323, 0x666EBBAC, 0x23323233, 0x666EBAAC, 0x23392322, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x23332222, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x39332222, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99332329, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99932322, 0x666EBAAC, 0x99933323, 0x666EBAAC, 0x99993232, 0x666EBBAC, 0x99933222, 0x666EBBBC, 0x99933322, 0x666EBBBC, 0x99933222, 0x666EBBBC, 0x99932322, 0x666EBBAC, 0x99932222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332223, 0x666EBAAC, 0x93332222, 0x666EBAAC, 0x93322322, 0x666EBAAC, 0x93332222, 0x666EBBAC, 0x93332322, 0x666EBBAC, 0x93333233, 0x666EBBAC, 0x93332323, 0x666EBBAC, 0x93333233, 0x666EBAAC, 0x93332323, 0x666EBAAC, 0x93333233, 0x666EBAAC, 0x99222322, 0x666EBAAC, 0x99933233, 0x666EBAAC, 0x99332322, 0x666EAAAC, 0x93333232, 0x666EAAAC, 0x93333332, 0x666EAAAC, 0x93333332, 0x666EBAAC, 0x33333332, 0x666EBAAC, 0x33333332
+
+glabel D_802ECAB0
+.word 0x23333399, 0xDAABE777, 0x23333999, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339333, 0xDAABE777, 0x22332333, 0xDAABE777, 0x22332339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22223399, 0xDAABE777, 0x22222399, 0xDAABE777, 0x32222399, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22332339, 0xDAABE777, 0x32333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x22333333, 0xDAABE777, 0x32232339, 0xDAABE777, 0x22333339, 0xDAABE777, 0x22233339, 0xDAABE777, 0x23232399, 0xDAABE777, 0x22323999, 0xDAABE777, 0x22222399, 0xDABBE777, 0x22223399, 0xDABBE777, 0x23222399, 0xDAABE777, 0x32323339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23232333, 0xDABBE777, 0x32323333, 0xDABBE777, 0x23232933, 0xDABBE777, 0x32323333, 0xDAABE777, 0x23232322, 0xDAABE777
+
+glabel D_802ECBF0
+.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x32222222, 0x22222222, 0x22222222, 0x22222222, 0x32232222, 0x22222222, 0x22222222, 0x33339932, 0x33333333, 0x33333333, 0x22222222, 0x33333332, 0x93399999, 0x33333333, 0x22332322, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAABBBB, 0xBAAABBBB, 0xBBAAAAAA, 0xABBAAAAA, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777
+
+glabel D_802ECCF0
+.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222
+
+glabel D_802ECD10
+.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x51834143, 0xF801B565, 0xB459A3D3, 0x8C1B7353, 0x82CB6205
+
+glabel D_802ECD30
+.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x218F210B, 0xF801B5E5, 0x2BDD2BDD, 0x5C1D2B59, 0x02D70211
+
+glabel D_802ECD50
+.ascii "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DDD333333333333333333333333333343D3C3333333333333333334C3333333DC34D333333333333333333DD3333334DDDDDC33333333333333333C43333333DDDDD333333333333333333CD33333344333CC33333333333333333CC33333343DDD3C33333333333333333D4DC333344CD4CC333333334DD33333344DC333334CD4C3333333334343333334D4C333334DDDC3333333334343333334C3C333333DDD333333334CD343333334D4C333333333333333334DC34C333333DD3333333333333333334DC4DC333333343333333333333333333DC4DD333333343333333333333333333334D33333334D3333333333333333333333333333334D33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333C3333333333333333333333333333333D3333333333333333333333333333333DD333333333333333333333333333333C43333333333333333333333333333DD333333333333333333333333333333DD3333333333333333333333333333334D333333333333333C3333333333333333333333333333434D34333333333333333333333333334CDDCD333333333333333333333333334DDDDD333333333333333333333333334D4D4D333333333333333333333333334D4D4D333333333333333333333333334DDDDD333333333333333333333333333DDDDC3333333333333333333333333334DDD333333333333333333333333333D33C34C33333333333333333333333334DCCDD333333333333333333333333333DDDDC33333333333C3333333333333333333333333333334D3333333333333333333333333333334D333333333333333333333333333333DDC3333333DDD33333333333333333DDDDDDC33333D34333333333333333334DCCDD333333C34333333333333333333DCCDC333333C34C333333333333333334DDD3333333C33D3333333D3333333334DDD3333333C3DD3333333DC33333333DDDDC33334DC3DD3333333C433333333DC3DC33334DC3333333333C3C3333334C333D33333D33333333334C4C3333333333333333333333333334D3433333333333333333333333333334D3433333333333333333333333333333D4D3333333333333333333333333333334D3333333333333333333333333333334C3333333333333333333333333333333333333333333333333333333333333333333"
+
+glabel D_802ED550
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05000000, 0x00000000, 0x00000000, 0x55500000, 0x00000000, 0x00000005, 0x52550000, 0x00000000, 0x00000055, 0x21255000, 0x00000000, 0x00000552, 0x11125500, 0x00000000, 0x00005521, 0x11112550, 0x00000000, 0x00005555, 0x11155550, 0x00000000, 0x00000055, 0x11155005, 0x55500000, 0x00000055, 0x11155055, 0x55550000, 0x00000055, 0x11155055, 0x11550000, 0x00000055, 0x11155555, 0x11550000, 0x00000055, 0x31135553, 0x12550000, 0x00000055, 0x42112221, 0x14550000, 0x00000005, 0x54311113, 0x45500000, 0x00000005, 0x55555555, 0x55000000, 0x00000000, 0x05555555, 0x50000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+
+glabel D_802ED670
+.word 0x294AE729, 0xC623AD61, 0x84194209, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001
+
+glabel D_802ED690
+.word 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xC553DE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7C553, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBB44B, 0xC553C553, 0xDE55DE9B, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xB44BDDCF, 0xDDCFDE55, 0xDE55DE55, 0xDE55DE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xD549D549, 0xDDCFDDCF, 0xDDCFDE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9B87CC87, 0xD549D549, 0xD549D549, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xCC87CC87, 0xCC87CC87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7B44B, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7BC05, 0xBC05B3C5, 0xB3C5B3C5, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xB3C5B3C5, 0x9B878B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xA3C78B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B079B87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7
+
+glabel D_802ED8D0
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x0000004F, 0x00000000, 0x000000CF, 0x00000000, 0x000003FF, 0x00000000, 0x00000BFF, 0x00000000, 0x69BDEFFF, 0x00000000, 0xAFFFFFFF, 0x00000000, 0x08FFFFFF, 0x00000000, 0x006FFFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x000EFFFF, 0x00000000, 0x000FFFFF, 0x00000000, 0x002FFFC6, 0x00000000, 0x004FE500, 0x00000000, 0x00280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
--- a/ver/us/asm/data/code_16C7D0.rodata.s
+++ b/ver/us/asm/data/code_16C7D0.rodata.s
@ -1,36 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel jtbl_8024BF70
-.word L80244C74_1654D4, L80244C80_1654E0, L80244CA4_165504, L80244C8C_1654EC, L80244C98_1654F8, 0
-
-glabel jtbl_8024BF88
-.word L80245C10_166470, L80245C38_166498, L80245C38_166498, L80245C38_166498, L80245C38_166498, 0
-
-glabel jtbl_8024BFA0
-.word L80245DD0_166630, L802461E8_166A48, L8024672C_166F8C, L80246370_166BD0, L80246420_166C80, 0
-
-glabel jtbl_8024BFB8
-.word L80246920_167180, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, 0
-
-glabel jtbl_8024BFD0
-.word L80246960_1671C0, L80246A04_167264, L80246AFC_16735C, L80246A60_1672C0, L80246ABC_16731C, 0
-
-glabel jtbl_8024BFE8
-.word L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, 0
-
-glabel jtbl_8024C000
-.word L80246E6C_1676CC, L80246F9C_1677FC, L80246FDC_16783C, L80246F00_167760, L802470D4_167934, 0
-
-glabel jtbl_8024C018
-.word L80247370_167BD0, L80247664_167EC4, L802477F8_168058, L802474E4_167D44, L80247A3C_16829C, 0
-
-glabel jtbl_8024C030
-.word L80247AC4_168324, L80247AC4_168324, L80247ADC_16833C, L80247AC4_168324, L80247AF8_168358, 0
-
-glabel jtbl_8024C048
-.word L80247C08_168468, L80247C08_168468, L80247C20_168480, L80247C08_168468, L80247C3C_16849C, 0
-
-glabel jtbl_8024C060
-.word L80248E34_169694, L80248E64_1696C4, L80248E90_1696F0, L80249034_169894, L80248ED4_169734, 0, 0, 0
--- a/ver/us/asm/data/code_31B080.rodata.s
+++ b/ver/us/asm/data/code_31B080.rodata.s
@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_802BEB10_31B080
-.double 0.8
-
-glabel jtbl_802BEB18_31B088
-.word L802BDAF8_31A068, L802BE210_31A780, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE764_31ACD4, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BD848_319DB8, L802BD904_319E74, 0
-
-glabel D_802BEB98_31B108
-.double 1.3
-
-glabel D_802BEBA0_31B110
-.double 0.1
-
-glabel D_802BEBA8_31B118
-.double 0.05
--- a/ver/us/asm/data/code_31CBE0.rodata.s
+++ b/ver/us/asm/data/code_31CBE0.rodata.s
@ -1,27 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_802BEBC0_31CBE0
-.double 0.8
-
-glabel jtbl_802BEBC8_31CBE8
-.word L802BDAA8_31BAC8, L802BDD4C_31BD6C, L802BE23C_31C25C, L802BE37C_31C39C, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BD73C_31B75C, L802BD7F0_31B810
-
-glabel D_802BEC18_31CC38
-.double 0.01
-
-glabel D_802BEC20_31CC40
-.double 0.01
-
-glabel D_802BEC28_31CC48
-.double 0.01
-
-glabel D_802BEC30_31CC50
-.double 1.3333333333333333
-
-glabel D_802BEC38_31CC58
-.double 0.55
-
-glabel D_802BEC40_31CC60
-.double 0.8, 0.0
--- a/ver/us/asm/data/code_320BC0.rodata.s
+++ b/ver/us/asm/data/code_320BC0.rodata.s
@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_802BFE50_320BC0
-.double 0.15
-
-glabel D_802BFE58_320BC8
-.double 0.14
-
-glabel D_802BFE60_320BD0
-.double 1.8
-
-glabel jtbl_802BFE68_320BD8
-.word L802BE474_31F1E4, L802BEB18_31F888, L802BF4F0_320260, L802BF204_31FF74, L802BF21C_31FF8C, L802BF24C_31FFBC, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF400_320170, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BE58C_31F2FC, L802BE77C_31F4EC, L802BE9D8_31F748, L802BE998_31F708, L802BE9D8_31F748, L802BE9E4_31F754
-
-glabel D_802BFED0_320C40
-.double 0.6
-
-glabel D_802BFED8_320C48
-.double 0.8
--- a/ver/us/asm/data/code_3249B0.rodata.s
+++ b/ver/us/asm/data/code_3249B0.rodata.s
@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_802BE060_3249B0
-.double 0.8
-
-glabel jtbl_802BE068_3249B8
-.word L802BDB88_3244D8, L802BDC64_3245B4, L802BDD74_3246C4, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BD894_3241E4, L802BDA20_324370, 0
--- a/ver/us/asm/data/code_421FC0.rodata.s
+++ b/ver/us/asm/data/code_421FC0.rodata.s
@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel jtbl_802A95D0_421FC0
-.word L802A927C_421C6C, L802A92A0_421C90, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A9344_421D34, L802A9404_421DF4, L802A950C_421EFC, 0, 0, 0
--- a/ver/us/asm/data/world/area_arn/arn_02/BDE190.data.s
+++ b/ver/us/asm/data/world/area_arn/arn_02/BDE190.data.s
@ -1,5 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel , 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
--- a/ver/us/asm/data/world/area_arn/arn_02/BDE2A0.data.s
+++ b/ver/us/asm/data/world/area_arn/arn_02/BDE2A0.data.s
@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_802410F0_BDE2A0
-.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241AD0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241AD8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802410F0_BDE2A0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024114C, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241A9C, 0x00000046, 0x00000001, 0x802412D0, 0x00000044, 0x00000001, 0x80241040, 0x00000024, 0x00000002, 0xFE363C80, 0x802411A8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
--- a/ver/us/asm/data/world/area_arn/arn_02/BDE480.data.s
+++ b/ver/us/asm/data/world/area_arn/arn_02/BDE480.data.s
@ -1,7 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_802412D0_BDE480
-
-0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x8024147C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000, 0x00000000, 0x802414A0, 0xC3440000, 0x43020000, 0x42D00000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF3C, 0x00000082, 0x00000068, 0x00000032, 0x0000001E, 0xFFFF8001, 0x00000001, 0xFFFFFF3C, 0x00000082, 0x00000068, 0x00000078, 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, 0x00300102, 0x00300106, 0x00300107, 0x00300107, 0x00300102, 0x00300102, 0x00300108, 0x00300108, 0x00300114, 0x00300117, 0x00300113, 0x00300115, 0x00300110, 0x00300111, 0x00300116, 0x00300100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802414A0, 0x44204000, 0x43860000, 0x434A0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000281, 0x0000010C, 0x000000CA, 0x00000032, 0x0000001E, 0xFFFF8001, 0x00000001, 0x00000281, 0x0000010C, 0x000000CA, 0x00000078, 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, 0x00300102, 0x00300106, 0x00300107, 0x00300107, 0x00300102, 0x00300102, 0x00300108, 0x00300108, 0x00300114, 0x00300117, 0x00300113, 0x00300115, 0x00300110, 0x00300111, 0x00300116, 0x00300100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80241420, 0x43A68000, 0x43570000, 0x42AA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014008D, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x0000014D, 0x000000D7, 0x00000055, 0x00000028, 0x0000001E, 0xFFFF8001, 0x00000001, 0x00000168, 0x000000D7, 0x00000096, 0x00000078, 0x00000089, 0x00000001, 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, 0x00260201, 0x00260202, 0x00260203, 0x00260203, 0x00260201, 0x00260201, 0x00260205, 0x00260205, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802414CC, 0x0E0A0001, 0x00000001, 0x802416BC, 0x0E0D0001, 0x00000001, 0x802418AC, 0x0E030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
--- a/ver/us/asm/data/world/area_arn/arn_02/BDEC80.rodata.s
+++ b/ver/us/asm/data/world/area_arn/arn_02/BDEC80.rodata.s
@ -1,7 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_80241AD0_BDEC80
-.word 0x61726E5F, 0x30350000, 0x61726E5F, 0x30340000
-
--- a/ver/us/asm/data/world/partner/goompa.rodata.s
+++ b/ver/us/asm/data/world/partner/goompa.rodata.s
@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_802BD5F0_324F00
-.double 0.8, 0.0
--- a/ver/us/asm/nonmatchings/code_165490/func_80244C30.s
+++ b/ver/us/asm/nonmatchings/code_165490/func_80244C30.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024BF70
+.word L80244C74_1654D4, L80244C80_1654E0, L80244CA4_165504, L80244C8C_1654EC, L80244C98_1654F8, 0
+
+.section .text
+
 glabel func_80244C30
 /* 165490 80244C30 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 165494 80244C34 AFB20020 */  sw        $s2, 0x20($sp)
--- a/ver/us/asm/nonmatchings/code_165490/func_80245A40.s
+++ b/ver/us/asm/nonmatchings/code_165490/func_80245A40.s
@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024BF88
+.word L80245C10_166470, L80245C38_166498, L80245C38_166498, L80245C38_166498, L80245C38_166498, 0
+
+glabel jtbl_8024BFA0
+.word L80245DD0_166630, L802461E8_166A48, L8024672C_166F8C, L80246370_166BD0, L80246420_166C80, 0
+
+glabel jtbl_8024BFB8
+.word L80246920_167180, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, L8024692C_16718C, 0
+
+glabel jtbl_8024BFD0
+.word L80246960_1671C0, L80246A04_167264, L80246AFC_16735C, L80246A60_1672C0, L80246ABC_16731C, 0
+
+.section .text
+
 glabel func_80245A40
 /* 1662A0 80245A40 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 1662A4 80245A44 AFB3001C */  sw        $s3, 0x1c($sp)
--- a/ver/us/asm/nonmatchings/code_167570/func_80246D10.s
+++ b/ver/us/asm/nonmatchings/code_167570/func_80246D10.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024BFE8
+.word L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, L80246D64_1675C4, 0
+
+.section .text
+
 glabel func_80246D10
 /* 167570 80246D10 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 167574 80246D14 AFB60030 */  sw        $s6, 0x30($sp)
--- a/ver/us/asm/nonmatchings/code_167570/func_80246E24.s
+++ b/ver/us/asm/nonmatchings/code_167570/func_80246E24.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024C000
+.word L80246E6C_1676CC, L80246F9C_1677FC, L80246FDC_16783C, L80246F00_167760, L802470D4_167934, 0
+
+.section .text
+
 glabel func_80246E24
 /* 167684 80246E24 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 167688 80246E28 AFB3002C */  sw        $s3, 0x2c($sp)
--- a/ver/us/asm/nonmatchings/code_167570/func_802471EC.s
+++ b/ver/us/asm/nonmatchings/code_167570/func_802471EC.s
@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024C018
+.word L80247370_167BD0, L80247664_167EC4, L802477F8_168058, L802474E4_167D44, L80247A3C_16829C, 0
+
+glabel jtbl_8024C030
+.word L80247AC4_168324, L80247AC4_168324, L80247ADC_16833C, L80247AC4_168324, L80247AF8_168358, 0
+
+glabel jtbl_8024C048
+.word L80247C08_168468, L80247C08_168468, L80247C20_168480, L80247C08_168468, L80247C3C_16849C, 0
+
+.section .text
+
 glabel func_802471EC
 /* 167A4C 802471EC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 167A50 802471F0 AFB20018 */  sw        $s2, 0x18($sp)
--- a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s
+++ b/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_8024C060
+.word L80248E34_169694, L80248E64_1696C4, L80248E90_1696F0, L80249034_169894, L80248ED4_169734, 0, 0, 0
+
+.section .text
+
 glabel func_80248BF4
 /* 169454 80248BF4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 169458 80248BF8 AFB00010 */  sw        $s0, 0x10($sp)
--- a/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s
+++ b/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_802A95D0_421FC0
+.word L802A927C_421C6C, L802A92A0_421C90, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A952C_421F1C, L802A9344_421D34, L802A9404_421DF4, L802A950C_421EFC, 0, 0, 0
+
+.section .text
+
 glabel func_802A9234_421C24
 /* 421C24 802A9234 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 421C28 802A9238 AFB10014 */  sw        $s1, 0x14($sp)
--- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD168_323AB8.s
+++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD168_323AB8.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BE060_3249B0
+.double 0.8
+
+.section .text
+
 glabel func_802BD168_323AB8
 /* 323AB8 802BD168 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 323ABC 802BD16C AFB00018 */  sw        $s0, 0x18($sp)
--- a/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s
+++ b/ver/us/asm/nonmatchings/world/partner/bow/func_802BD694_323FE4.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_802BE068_3249B8
+.word L802BDB88_3244D8, L802BDC64_3245B4, L802BDD74_3246C4, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BDDC4_324714, L802BD894_3241E4, L802BDA20_324370, 0
+
+.section .text
+
 glabel func_802BD694_323FE4
 /* 323FE4 802BD694 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 323FE8 802BD698 AFB40030 */  sw        $s4, 0x30($sp)
--- a/ver/us/asm/nonmatchings/world/partner/goompa/func_802BD14C_324A5C.s
+++ b/ver/us/asm/nonmatchings/world/partner/goompa/func_802BD14C_324A5C.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BD5F0_324F00
+.double 0.8, 0.0
+
+.section .text
+
 glabel func_802BD14C_324A5C
 /* 324A5C 802BD14C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 324A60 802BD150 AFB00018 */  sw        $s0, 0x18($sp)
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD260_31B280.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD260_31B280.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BEBC0_31CBE0
+.double 0.8
+
+.section .text
+
 glabel func_802BD260_31B280
 /* 31B280 802BD260 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 31B284 802BD264 AFB00018 */  sw        $s0, 0x18($sp)
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_802BEBC8_31CBE8
+.word L802BDAA8_31BAC8, L802BDD4C_31BD6C, L802BE23C_31C25C, L802BE37C_31C39C, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BE3A0_31C3C0, L802BD73C_31B75C, L802BD7F0_31B810
+
+glabel D_802BEC18_31CC38
+.double 0.01
+
+glabel D_802BEC20_31CC40
+.double 0.01
+
+glabel D_802BEC28_31CC48
+.double 0.01
+
+glabel D_802BEC30_31CC50
+.double 1.3333333333333333
+
+.section .text
+
 glabel func_802BD638_31B658
 /* 31B658 802BD638 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
 /* 31B65C 802BD63C 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BE818_31C838.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BE818_31C838.s
@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BEC38_31CC58
+.double 0.55
+
+glabel D_802BEC40_31CC60
+.double 0.8, 0.0
+
+.section .text
+
 glabel func_802BE818_31C838
 /* 31C838 802BE818 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 31C83C 802BE81C AFB10044 */  sw        $s1, 0x44($sp)
--- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD180_3196F0.s
+++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD180_3196F0.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BEB10_31B080
+.double 0.8
+
+.section .text
+
 glabel func_802BD180_3196F0
 /* 3196F0 802BD180 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3196F4 802BD184 AFB00018 */  sw        $s0, 0x18($sp)
--- a/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s
+++ b/ver/us/asm/nonmatchings/world/partner/parakarry/func_802BD660_319BD0.s
@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_802BEB18_31B088
+.word L802BDAF8_31A068, L802BE210_31A780, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE764_31ACD4, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BE78C_31ACFC, L802BD848_319DB8, L802BD904_319E74, 0
+
+glabel D_802BEB98_31B108
+.double 1.3
+
+glabel D_802BEBA0_31B110
+.double 0.1
+
+glabel D_802BEBA8_31B118
+.double 0.05
+
+.section .text
+
 glabel func_802BD660_319BD0
 /* 319BD0 802BD660 3C02800B */  lui       $v0, %hi(gCurrentEncounter+0x8)
 /* 319BD4 802BD664 80420F18 */  lb        $v0, %lo(gCurrentEncounter+0x8)($v0)
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BFE50_320BC0
+.double 0.15
+
+glabel D_802BFE58_320BC8
+.double 0.14
+
+glabel D_802BFE60_320BD0
+.double 1.8
+
+.section .text
+
 glabel func_802BD414_31E184
 /* 31E184 802BD414 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 31E188 802BD418 AFB00040 */  sw        $s0, 0x40($sp)
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel jtbl_802BFE68_320BD8
+.word L802BE474_31F1E4, L802BEB18_31F888, L802BF4F0_320260, L802BF204_31FF74, L802BF21C_31FF8C, L802BF24C_31FFBC, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF400_320170, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BF4F0_320260, L802BE58C_31F2FC, L802BE77C_31F4EC, L802BE9D8_31F748, L802BE998_31F708, L802BE9D8_31F748, L802BE9E4_31F754
+
+glabel D_802BFED0_320C40
+.double 0.6
+
+.section .text
+
 glabel func_802BE3A4_31F114
 /* 31F114 802BE3A4 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 31F118 802BE3A8 AFB5005C */  sw        $s5, 0x5c($sp)
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF5A0_320310.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BF5A0_320310.s
@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches

+.section .rodata
+
+glabel D_802BFED8_320C48
+.double 0.8
+
+.section .text
+
 glabel func_802BF5A0_320310
 /* 320310 802BF5A0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 320314 802BF5A4 AFBF0028 */  sw        $ra, 0x28($sp)
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@ -453,7 +453,7 @@ segments:
    start: 0x10CC10
    vram: 0x802EB3D0
    subsections:
-    - [0x10CC10, bin]
+    - [0x10CC10, data]
  - [0x10F1B0, bin]
  - [0x1164B8, ci8,     peach_letter, 150, 105]
  - [0x11A240, palette, peach_letter]
@ -507,12 +507,14 @@ segments:
    vram: 0x80242BA0
    subsections:
    - [0x163400, c]
-    - [0x165490, c]
-    - [0x167570, c]
-    - [0x168590, c]
+    - [0x165490, c, code_165490]
+    - [0x167570, c, code_167570]
+    - [0x168590, c, code_168590]
    - [0x169BE0, c]
    - [0x16A3E0, data]
-    - [0x16C7D0, rodata]
+    - [0x16C7D0, .rodata, code_165490]
+    - [0x16C848, .rodata, code_167570]
+    - [0x16C8C0, .rodata, code_168590]
  - type: code
    start: 0x16C8E0
    vram: 0x8023E000
@ -538,8 +540,7 @@ segments:
    - [0x1AF230, c]
    - [0x1AF2D0, .data, code_16c8e0]
    - [0x1AF8A0, .data, code_190B20]
-    #- [0x1B21E0, bin] # begins with image
-    - [0x1B21E0, data, code_1AF2D0]
+    - [0x1B21E0, data, code_1AF2D0] # begins with image?
    - [0x1CB240, .rodata, code_16c8e0]
    - [0x1CB368, .rodata, code_16F740]
    - [0x1CB4E0, .rodata, code_1776B0]
@ -1629,7 +1630,7 @@ segments:
    subsections:
    - [0x319670, c, world/partner/parakarry]
    - [0x31b000, data]
-    - [0x31B080, rodata]
+    - [0x31B080, .rodata, world/partner/parakarry]
  - type: code
    ld_name: world_partner_kooper
    start: 0x31b120
@ -1638,7 +1639,7 @@ segments:
    subsections:
    - [0x31b120, c, world/partner/kooper]
    - [0x31cb60, data]
-    - [0x31CBE0, rodata]
+    - [0x31CBE0, .rodata, world/partner/kooper]
  - type: code
    ld_name: world_partner_watt
    start: 0x31cc70
@ -1655,7 +1656,7 @@ segments:
    subsections:
    - [0x31de70, c, world/partner/sushie]
    - [0x320b20, data]
-    - [0x320BC0, rodata]
+    - [0x320BC0, .rodata, world/partner/sushie]
  - type: code
    ld_name: world_partner_lakilester
    start: 0x320c50
@ -1672,7 +1673,7 @@ segments:
    subsections:
    - [0x323A50, c, world/partner/bow]
    - [0x324930, data]
-    - [0x3249B0, rodata]
+    - [0x3249B0, .rodata, world/partner/bow]
  - type: code
    ld_name: world_partner_goompa
    start: 0x324a10
@ -1681,7 +1682,7 @@ segments:
    subsections:
    - [0x324a10, c, world/partner/goompa]
    - [0x324e80, .data, world/partner/goompa]
-    - [0x324F00, rodata, world/partner/goompa] # rodata with single f64 0.8
+    - [0x324F00, .rodata, world/partner/goompa]
  - type: code
    ld_name: world_partner_goombaria
    start: 0x324f10
@ -2539,8 +2540,8 @@ segments:
    vram: 0x802A9000
    overlay: True
    subsections:
-    - [0x4219F0, c]
-    - [0x421FC0, rodata]
+    - [0x4219F0, c, code_4219F0]
+    - [0x421FC0, .rodata, code_4219F0]
  - type: code
    start: 0x422000
    vram: 0x802A9000
@ -7892,7 +7893,11 @@ segments:
    - [0xC047F0, data]
    - [0xC20C70, rodata]
    - [0xC20CF8, rodata]
-  - [0xC20F40, bin]
+  - type: code
+    start: 0xC20F40
+    vram: 0x80200000
+    subsections:
+    - [0xC20F40, bin] # DMAd at the beginning of tubba blubba's castle (bridge cutscene)
  - name: world/area_dgb/dgb_02/
    type: code
    overlay: True
--- a/ver/us/undefined_syms_auto.txt
+++ b/ver/us/undefined_syms_auto.txt
@ -2230,35 +2230,6 @@ D_802EB39C = 0x802EB39C;
 D_802EB3A0 = 0x802EB3A0;
 D_802EB3B0 = 0x802EB3B0;
 D_802EB3C0 = 0x802EB3C0;
-D_802EB3D0 = 0x802EB3D0;
-D_802EB5A8 = 0x802EB5A8;
-D_802EB5C0 = 0x802EB5C0;
-D_802EB5F0 = 0x802EB5F0;
-D_802EB620 = 0x802EB620;
-D_802EB644 = 0x802EB644;
-D_802EB670 = 0x802EB670;
-D_802EBA70 = 0x802EBA70;
-D_802EBB70 = 0x802EBB70;
-D_802EBF70 = 0x802EBF70;
-D_802EC3F0 = 0x802EC3F0;
-D_802EC3F8 = 0x802EC3F8;
-D_802EC5F0 = 0x802EC5F0;
-D_802EC670 = 0x802EC670;
-D_802EC6F0 = 0x802EC6F0;
-D_802EC770 = 0x802EC770;
-D_802EC7F0 = 0x802EC7F0;
-D_802EC870 = 0x802EC870;
-D_802EC970 = 0x802EC970;
-D_802ECAB0 = 0x802ECAB0;
-D_802ECBF0 = 0x802ECBF0;
-D_802ECCF0 = 0x802ECCF0;
-D_802ECD10 = 0x802ECD10;
-D_802ECD30 = 0x802ECD30;
-D_802ECD50 = 0x802ECD50;
-D_802ED550 = 0x802ED550;
-D_802ED670 = 0x802ED670;
-D_802ED690 = 0x802ED690;
-D_802ED8D0 = 0x802ED8D0;
 D_802ED970 = 0x802ED970;
 D_802EE8D0 = 0x802EE8D0;
 D_802F39D0 = 0x802F39D0;