Big actor cleanup (fixed) (#69)

* Started doing cleanup * did more work * did more migration * migrated more rodata and worked on some structs * did more work * Removal of ROOM field from initvars, some rodata migration, some string decompilation * General update * Decompiled vt strings * Tool work * Tool improvements * 270 overlay rodata files remaining * better float handling * floats * Many more floats * migrated boss_mo * assorted fixes * Migrated 10 * tool improvements * migrated 10 * 10 more * 1 more * did a few more * fixes * 10 more * more floats * Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed. * removed changes made to script by accident * migrated largest rodata - ovl_fishing * Did some more * 114 remaining * 99 left ! * almost done migrating rodata * did some more, done for tonight * almost done, tried add support to the script for z_player * All possible rodata migrated in actor overlays * update * removed static from all overlays, ran format.sh * Removed unknown actor structs * converted a few floats * Added new lines to header files that were missing them. Removed unused asm files * Removed unused asm files * Formatting newlines Further formatting spacing .float spacing More space formatting More spacing formatting Removing .balign 4 after floats Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2025-02-02 09:34:27 +00:00 · 2020-04-14 11:16:34 -07:00 · 2020-04-14 11:16:34 -07:00 · 045a92d7c3
commit 045a92d7c3
parent 5aef81071e
10327 changed files with 33390 additions and 45661 deletions
--- a/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s
+++ b/asm/non_matchings/code/fault/Fault_AddAddrConvClient.s
@ -1,5 +1,4 @@
 .rdata
-
 glabel D_80146DD4
    .asciz "\x1b[41;37mfault_AddressConverterAddClient: %08x は既にリスト中にある\n\x1b[m"
    .balign 4
--- a/asm/non_matchings/code/fault/Fault_DrawStackTrace.s
+++ b/asm/non_matchings/code/fault/Fault_DrawStackTrace.s
@ -1,5 +1,4 @@
 .rdata
-
 glabel D_801472D0
    .asciz    "SP       PC       (VPC)"
    .balign 4
--- a/asm/non_matchings/code/fault/Fault_LogStackTrace.s
+++ b/asm/non_matchings/code/fault/Fault_LogStackTrace.s
@ -1,6 +1,4 @@
 .rdata
-
-
 glabel D_80147300
    .asciz    "STACK TRACE\nSP       PC       (VPC)\n"
    .balign 4
@ -15,7 +13,6 @@ glabel D_80147340
    .balign 4

 .text
-
 glabel Fault_LogStackTrace
 /* B4CEA8 800D5D08 3C08FFFA */  lui   $t0, (0xFFFA5A5A >> 16) # lui $t0, 0xfffa
 /* B4CEAC 800D5D0C 03A04825 */  move  $t1, $sp
--- a/asm/non_matchings/code/fault/Fault_ThreadEntry.s
+++ b/asm/non_matchings/code/fault/Fault_ThreadEntry.s
@ -1,5 +1,4 @@
 .rdata
-
 glabel D_80147368
    .asciz "フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n"
    .balign 4
--- a/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s
+++ b/asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s
@ -14,7 +14,6 @@ glabel jtbl_8014753C


 .rdata
-
 glabel D_801471F8
    .asciz "\x1B[37mKeyWaitB (ＬＲＺ \x1B[37m上\x1B[33m下 \x1B[33m上\x1B[37m下 \x1B[37m左\x1B[33m左 \x1B[33m右\x1B[37m右 \x1B[32mＢ\x1B[34mＡ\x1B[31mSTART\x1B[37m)\x1B[m\n"
    .balign 4
--- a/asm/non_matchings/code/graph/Graph_Update.s
+++ b/asm/non_matchings/code/graph/Graph_Update.s
@ -126,7 +126,6 @@ glabel D_801454DC
    .balign 4

 .text
-
 glabel Graph_Update
 /* B3D378 800C61D8 27BDFF38 */  addiu $sp, $sp, -0xc8
 /* B3D37C 800C61DC AFBF001C */  sw    $ra, 0x1c($sp)
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s
@ -17,5 +17,3 @@ glabel ArmsHook_Destroy
 /* 000B8 80864FB8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 000BC 80864FBC 03E00008 */  jr      $ra                        
 /* 000C0 80864FC0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s
@ -1,3 +1,28 @@
+.rdata
+glabel D_80865BC0
+    .asciz "../z_arms_hook.c"
+    .balign 4
+
+glabel D_80865BD4
+    .asciz "../z_arms_hook.c"
+    .balign 4
+
+glabel D_80865BE8
+    .asciz "../z_arms_hook.c"
+    .balign 4
+
+glabel D_80865BFC
+    .asciz "../z_arms_hook.c"
+    .balign 4
+
+.late_rodata
+glabel D_80865C14
+    .float 0.015
+
+glabel D_80865C18
+    .float 0.01
+
+.text
 glabel ArmsHook_Draw
 /* 00930 80865830 27BDFF70 */  addiu   $sp, $sp, 0xFF70           ## $sp = FFFFFF70
 /* 00934 80865834 AFBF0024 */  sw      $ra, 0x0024($sp)           
@ -177,4 +202,3 @@ glabel ArmsHook_Draw
 /* 00BD4 80865AD4 00000000 */  nop
 /* 00BD8 80865AD8 00000000 */  nop
 /* 00BDC 80865ADC 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s
@ -16,7 +16,7 @@ glabel ArmsHook_Init
 /* 00040 80864F40 02003025 */  or      $a2, $s0, $zero            ## $a2 = 00000000
 /* 00044 80864F44 3C058086 */  lui     $a1, %hi(func_80864FC4)    ## $a1 = 80860000
 /* 00048 80864F48 24A54FC4 */  addiu   $a1, $a1, %lo(func_80864FC4) ## $a1 = 80864FC4
-/* 0004C 80864F4C 0C2193C0 */  jal     func_80864F00              
+/* 0004C 80864F4C 0C2193C0 */  jal     ArmsHook_SetupAction              
 /* 00050 80864F50 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 00054 80864F54 8E0F0024 */  lw      $t7, 0x0024($s0)           ## 00000024
 /* 00058 80864F58 8E0E0028 */  lw      $t6, 0x0028($s0)           ## 00000028
@ -29,5 +29,3 @@ glabel ArmsHook_Init
 /* 00074 80864F74 27BD0028 */  addiu   $sp, $sp, 0x0028           ## $sp = 00000000
 /* 00078 80864F78 03E00008 */  jr      $ra                        
 /* 0007C 80864F7C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_SetupAction.s
@ -1,5 +1,3 @@
-glabel func_80864F00
+glabel ArmsHook_SetupAction
 /* 00000 80864F00 03E00008 */  jr      $ra                        
 /* 00004 80864F04 AC850214 */  sw      $a1, 0x0214($a0)           ## 00000214
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Update.s
@ -16,5 +16,3 @@ glabel ArmsHook_Update
 /* 00924 80865824 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00928 80865828 03E00008 */  jr      $ra                        
 /* 0092C 8086582C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80864FC4.s
@ -17,7 +17,7 @@ glabel func_80864FC4
 /* 00100 80865000 2402000D */  addiu   $v0, $zero, 0x000D         ## $v0 = 0000000D
 .L80865004:
 /* 00104 80865004 AFA20018 */  sw      $v0, 0x0018($sp)           
-/* 00108 80865008 0C2193C0 */  jal     func_80864F00              
+/* 00108 80865008 0C2193C0 */  jal     ArmsHook_SetupAction              
 /* 0010C 8086500C AFA40020 */  sw      $a0, 0x0020($sp)           
 /* 00110 80865010 8FA40020 */  lw      $a0, 0x0020($sp)           
 /* 00114 80865014 0C00B669 */  jal     func_8002D9A4              
@ -33,5 +33,3 @@ glabel func_80864FC4
 /* 00138 80865038 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 0013C 8086503C 03E00008 */  jr      $ra                        
 /* 00140 80865040 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865044.s
@ -3,5 +3,3 @@ glabel func_80865044
 /* 00148 80865048 AC82011C */  sw      $v0, 0x011C($a0)           ## 0000011C
 /* 0014C 8086504C 03E00008 */  jr      $ra                        
 /* 00150 80865050 AC440118 */  sw      $a0, 0x0118($v0)           ## 00000118
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865054.s
@ -12,5 +12,3 @@ glabel func_80865054
 .L8086507C:
 /* 0017C 8086507C 03E00008 */  jr      $ra                        
 /* 00180 80865080 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865084.s
@ -10,5 +10,3 @@ glabel func_80865084
 .L808650A4:
 /* 001A4 808650A4 03E00008 */  jr      $ra                        
 /* 001A8 808650A8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_808650AC.s
@ -42,5 +42,3 @@ glabel func_808650AC
 /* 0023C 8086513C 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 00240 80865140 03E00008 */  jr      $ra                        
 /* 00244 80865144 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_80865148.s
@ -17,5 +17,3 @@ glabel func_80865148
 /* 00280 80865180 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00284 80865184 03E00008 */  jr      $ra                        
 /* 00288 80865188 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/func_8086518C.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_80865C10
+    .float 3.051851E-5
+
+.text
 glabel func_8086518C
 /* 0028C 8086518C 27BDFF38 */  addiu   $sp, $sp, 0xFF38           ## $sp = FFFFFF38
 /* 00290 80865190 AFBF0034 */  sw      $ra, 0x0034($sp)           
@ -272,7 +277,7 @@ glabel func_8086518C
 /* 0064C 8086554C 00000000 */  nop
 /* 00650 80865550 450200A2 */  bc1fl   .L808657DC                 
 /* 00654 80865554 8FBF0034 */  lw      $ra, 0x0034($sp)           
-/* 00658 80865558 0C2193C0 */  jal     func_80864F00              
+/* 00658 80865558 0C2193C0 */  jal     ArmsHook_SetupAction              
 /* 0065C 8086555C 24A54FC4 */  addiu   $a1, $a1, %lo(func_80864FC4) ## $a1 = 80864FC4
 /* 00660 80865560 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 00664 80865564 0C219415 */  jal     func_80865054              
@ -452,5 +457,3 @@ glabel func_8086518C
 /* 008E0 808657E0 27BD00C8 */  addiu   $sp, $sp, 0x00C8           ## $sp = 00000000
 /* 008E4 808657E4 03E00008 */  jr      $ra                        
 /* 008E8 808657E8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Destroy.s
@ -7,5 +7,3 @@ glabel BgBombwall_Destroy
 /* 00380 8086EB50 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00384 8086EB54 03E00008 */  jr      $ra                        
 /* 00388 8086EB58 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s
@ -11,4 +11,3 @@ glabel BgBombwall_Draw
 /* 00744 8086EF14 03E00008 */  jr      $ra                        
 /* 00748 8086EF18 00000000 */  nop
 /* 0074C 8086EF1C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s
@ -1,3 +1,9 @@
+.rdata
+glabel D_8086F088
+    .asciz "(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n"
+    .balign 4
+
+.text
 glabel BgBombwall_Init
 /* 000CC 8086E89C 27BDFF48 */  addiu   $sp, $sp, 0xFF48           ## $sp = FFFFFF48
 /* 000D0 8086E8A0 AFB30044 */  sw      $s3, 0x0044($sp)           
@ -146,5 +152,3 @@ glabel BgBombwall_Init
 /* 002E4 8086EAB4 8FBE0058 */  lw      $s8, 0x0058($sp)           
 /* 002E8 8086EAB8 03E00008 */  jr      $ra                        
 /* 002EC 8086EABC 27BD00B8 */  addiu   $sp, $sp, 0x00B8           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Update.s
@ -11,5 +11,3 @@ glabel BgBombwall_Update
 /* 00718 8086EEE8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 0071C 8086EEEC 03E00008 */  jr      $ra                        
 /* 00720 8086EEF0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E7D0.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_8086F040
+    .asciz "Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n"
+    .balign 4
+
+glabel D_8086F074
+    .asciz "../z_bg_bombwall.c"
+    .balign 4
+
+.text
 glabel func_8086E7D0
 /* 00000 8086E7D0 27BDFFD8 */  addiu   $sp, $sp, 0xFFD8           ## $sp = FFFFFFD8
 /* 00004 8086E7D4 AFBF0014 */  sw      $ra, 0x0014($sp)           
@ -36,5 +46,3 @@ glabel func_8086E7D0
 /* 00074 8086E844 27BD0028 */  addiu   $sp, $sp, 0x0028           ## $sp = 00000000
 /* 00078 8086E848 03E00008 */  jr      $ra                        
 /* 0007C 8086E84C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086E850.s
@ -18,5 +18,3 @@ glabel func_8086E850
 /* 000C0 8086E890 460A4401 */  sub.s   $f16, $f8, $f10            
 /* 000C4 8086E894 03E00008 */  jr      $ra                        
 /* 000C8 8086E898 E4900008 */  swc1    $f16, 0x0008($a0)          ## 00000008
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s
@ -33,5 +33,3 @@ glabel func_8086EAC0
 /* 00360 8086EB30 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00364 8086EB34 03E00008 */  jr      $ra                        
 /* 00368 8086EB38 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EB5C.s
@ -129,5 +129,3 @@ glabel func_8086EB5C
 /* 00574 8086ED44 8FB50060 */  lw      $s5, 0x0060($sp)           
 /* 00578 8086ED48 03E00008 */  jr      $ra                        
 /* 0057C 8086ED4C 27BD0098 */  addiu   $sp, $sp, 0x0098           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED50.s
@ -7,5 +7,3 @@ glabel func_8086ED50
 /* 00594 8086ED64 AC8E029C */  sw      $t6, 0x029C($a0)           ## 0000029C
 /* 00598 8086ED68 03E00008 */  jr      $ra                        
 /* 0059C 8086ED6C AC8F0298 */  sw      $t7, 0x0298($a0)           ## 00000298
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s
@ -38,5 +38,3 @@ glabel func_8086ED70
 /* 00620 8086EDF0 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00624 8086EDF4 03E00008 */  jr      $ra                        
 /* 00628 8086EDF8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EDFC.s
@ -16,5 +16,3 @@ glabel func_8086EDFC
 /* 00664 8086EE34 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00668 8086EE38 03E00008 */  jr      $ra                        
 /* 0066C 8086EE3C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE40.s
@ -23,5 +23,3 @@ glabel func_8086EE40
 /* 006B8 8086EE88 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 006BC 8086EE8C 03E00008 */  jr      $ra                        
 /* 006C0 8086EE90 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EE94.s
@ -12,5 +12,3 @@ glabel func_8086EE94
 /* 006EC 8086EEBC 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 006F0 8086EEC0 03E00008 */  jr      $ra                        
 /* 006F4 8086EEC4 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Destroy.s
@ -12,5 +12,3 @@ glabel BgBowlWall_Destroy
 /* 000F4 8086F254 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 000F8 8086F258 03E00008 */  jr      $ra                        
 /* 000FC 8086F25C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s
@ -1,3 +1,17 @@
+.rdata
+glabel D_8086FAD4
+    .asciz "../z_bg_bowl_wall.c"
+    .balign 4
+
+glabel D_8086FAE8
+    .asciz "../z_bg_bowl_wall.c"
+    .balign 4
+
+glabel D_8086FAFC
+    .asciz "../z_bg_bowl_wall.c"
+    .balign 4
+
+.text
 glabel BgBowlWall_Draw
 /* 00764 8086F8C4 27BDFFA0 */  addiu   $sp, $sp, 0xFFA0           ## $sp = FFFFFFA0
 /* 00768 8086F8C8 AFB10020 */  sw      $s1, 0x0020($sp)           
@ -88,4 +102,3 @@ glabel BgBowlWall_Draw
 /* 008B4 8086FA14 27BD0060 */  addiu   $sp, $sp, 0x0060           ## $sp = 00000000
 /* 008B8 8086FA18 00000000 */  nop
 /* 008BC 8086FA1C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Init.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_8086FA90
+    .asciz "\n\n"
+    .balign 4
+
+glabel D_8086FA94
+    .asciz "[32m ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n[m"
+    .balign 4
+
+.text
 glabel BgBowlWall_Init
 /* 00000 8086F160 27BDFFC8 */  addiu   $sp, $sp, 0xFFC8           ## $sp = FFFFFFC8
 /* 00004 8086F164 AFBF001C */  sw      $ra, 0x001C($sp)           
@ -59,5 +69,3 @@ glabel BgBowlWall_Init
 /* 000C4 8086F224 27BD0038 */  addiu   $sp, $sp, 0x0038           ## $sp = 00000000
 /* 000C8 8086F228 03E00008 */  jr      $ra                        
 /* 000CC 8086F22C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Update.s
@ -13,5 +13,3 @@ glabel BgBowlWall_Update
 /* 00758 8086F8B8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 0075C 8086F8BC 03E00008 */  jr      $ra                        
 /* 00760 8086F8C0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_8086FAD0
+    .asciz "\n\n"
+    .balign 4
+
+.late_rodata
+glabel D_8086FB10
+    .float 2.990000009536743
+
+.text
 glabel func_8086F260
 /* 00100 8086F260 27BDFF90 */  addiu   $sp, $sp, 0xFF90           ## $sp = FFFFFF90
 /* 00104 8086F264 AFBF003C */  sw      $ra, 0x003C($sp)           
@ -129,5 +139,3 @@ glabel func_8086F260
 /* 002D4 8086F434 27BD0070 */  addiu   $sp, $sp, 0x0070           ## $sp = 00000000
 /* 002D8 8086F438 03E00008 */  jr      $ra                        
 /* 002DC 8086F43C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F440.s
@ -9,5 +9,3 @@ glabel func_8086F440
 .L8086F45C:
 /* 002FC 8086F45C 03E00008 */  jr      $ra                        
 /* 00300 8086F460 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s
@ -182,5 +182,3 @@ glabel func_8086F464
 /* 005AC 8086F70C 8FB60070 */  lw      $s6, 0x0070($sp)           
 /* 005B0 8086F710 03E00008 */  jr      $ra                        
 /* 005B4 8086F714 27BD00B0 */  addiu   $sp, $sp, 0x00B0           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F718.s
@ -61,5 +61,3 @@ glabel func_8086F718
 /* 0068C 8086F7EC 27BD0028 */  addiu   $sp, $sp, 0x0028           ## $sp = 00000000
 /* 00690 8086F7F0 03E00008 */  jr      $ra                        
 /* 00694 8086F7F4 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F7F8.s
@ -40,5 +40,3 @@ glabel func_8086F7F8
 /* 00724 8086F884 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 00728 8086F888 03E00008 */  jr      $ra                        
 /* 0072C 8086F88C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Destroy.s
@ -12,5 +12,3 @@ glabel BgBreakwall_Destroy
 /* 001D4 8086FDB4 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 001D8 8086FDB8 03E00008 */  jr      $ra                        
 /* 001DC 8086FDBC 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s
@ -113,7 +113,7 @@ glabel BgBreakwall_Init
 /* 0018C 8086FD6C 10000004 */  beq     $zero, $zero, .L8086FD80   
 /* 00190 8086FD70 8FBF001C */  lw      $ra, 0x001C($sp)           
 .L8086FD74:
-/* 00194 8086FD74 0C21BEF8 */  jal     func_8086FBE0              
+/* 00194 8086FD74 0C21BEF8 */  jal     BgBreakwall_SetupAction              
 /* 00198 8086FD78 24A50290 */  addiu   $a1, $a1, %lo(func_80870290) ## $a1 = 00000290
 /* 0019C 8086FD7C 8FBF001C */  lw      $ra, 0x001C($sp)           
 .L8086FD80:
@ -121,5 +121,3 @@ glabel BgBreakwall_Init
 /* 001A4 8086FD84 27BD0038 */  addiu   $sp, $sp, 0x0038           ## $sp = 00000000
 /* 001A8 8086FD88 03E00008 */  jr      $ra                        
 /* 001AC 8086FD8C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_SetupAction.s
@ -1,5 +1,3 @@
-glabel func_8086FBE0
+glabel BgBreakwall_SetupAction
 /* 00000 8086FBE0 03E00008 */  jr      $ra                        
 /* 00004 8086FBE4 AC8501EC */  sw      $a1, 0x01EC($a0)           ## 000001EC
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Update.s
@ -8,5 +8,3 @@ glabel BgBreakwall_Update
 /* 009EC 808705CC 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 009F0 808705D0 03E00008 */  jr      $ra                        
 /* 009F4 808705D4 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s
@ -1,3 +1,17 @@
+.late_rodata
+glabel D_808709AC
+    .float 3500.0
+
+glabel D_808709B0
+    .float 0.001
+
+glabel D_808709B4
+    .float 0.6
+
+glabel D_808709B8
+    .float 3000.0
+
+.text
 glabel func_8086FDC0
 /* 001E0 8086FDC0 27BDFE08 */  addiu   $sp, $sp, 0xFE08           ## $sp = FFFFFE08
 /* 001E4 8086FDC4 3C0F8087 */  lui     $t7, %hi(D_808707F0)       ## $t7 = 80870000
@ -332,5 +346,3 @@ glabel func_8086FDC0
 /* 006A4 80870284 8FBE0080 */  lw      $s8, 0x0080($sp)
 /* 006A8 80870288 03E00008 */  jr      $ra
 /* 006AC 8087028C 27BD01F8 */  addiu   $sp, $sp, 0x01F8           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870290.s
@ -56,13 +56,13 @@ glabel func_80870290
 /* 00778 80870358 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 0077C 8087035C 3C058087 */  lui     $a1, %hi(func_80870564)    ## $a1 = 80870000
 /* 00780 80870360 24A50564 */  addiu   $a1, $a1, %lo(func_80870564) ## $a1 = 80870564
-/* 00784 80870364 0C21BEF8 */  jal     func_8086FBE0              
+/* 00784 80870364 0C21BEF8 */  jal     BgBreakwall_SetupAction              
 /* 00788 80870368 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 0078C 8087036C 10000005 */  beq     $zero, $zero, .L80870384   
 /* 00790 80870370 8FBF001C */  lw      $ra, 0x001C($sp)           
 .L80870374:
 /* 00794 80870374 3C058087 */  lui     $a1, %hi(func_80870394)    ## $a1 = 80870000
-/* 00798 80870378 0C21BEF8 */  jal     func_8086FBE0              
+/* 00798 80870378 0C21BEF8 */  jal     BgBreakwall_SetupAction              
 /* 0079C 8087037C 24A50394 */  addiu   $a1, $a1, %lo(func_80870394) ## $a1 = 80870394
 /* 007A0 80870380 8FBF001C */  lw      $ra, 0x001C($sp)           
 .L80870384:
@ -70,5 +70,3 @@ glabel func_80870290
 /* 007A8 80870388 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 007AC 8087038C 03E00008 */  jr      $ra                        
 /* 007B0 80870390 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870394.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808709BC
+    .float 6.400000095367432
+
+.text
 glabel func_80870394
 /* 007B4 80870394 27BDFFC0 */  addiu   $sp, $sp, 0xFFC0           ## $sp = FFFFFFC0
 /* 007B8 80870398 AFBF002C */  sw      $ra, 0x002C($sp)           
@ -132,5 +137,3 @@ glabel func_80870394
 /* 00978 80870558 27BD0040 */  addiu   $sp, $sp, 0x0040           ## $sp = 00000000
 /* 0097C 8087055C 03E00008 */  jr      $ra                        
 /* 00980 80870560 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_80870564.s
@ -20,5 +20,3 @@ glabel func_80870564
 /* 009C8 808705A8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 009CC 808705AC 03E00008 */  jr      $ra                        
 /* 009D0 808705B0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s
@ -1,3 +1,17 @@
+.rdata
+glabel D_80870970
+    .asciz "../z_bg_breakwall.c"
+    .balign 4
+
+glabel D_80870984
+    .asciz "../z_bg_breakwall.c"
+    .balign 4
+
+glabel D_80870998
+    .asciz "../z_bg_breakwall.c"
+    .balign 4
+
+.text
 glabel func_808705D8
 /* 009F8 808705D8 27BDFF60 */  addiu   $sp, $sp, 0xFF60           ## $sp = FFFFFF60
 /* 009FC 808705DC AFBF0034 */  sw      $ra, 0x0034($sp)           
@ -93,4 +107,3 @@ glabel func_808705D8
 /* 00B54 80870734 03E00008 */  jr      $ra                        
 /* 00B58 80870738 27BD00A0 */  addiu   $sp, $sp, 0x00A0           ## $sp = 00000000
 /* 00B5C 8087073C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s
@ -12,5 +12,3 @@ glabel BgDdanJd_Destroy
 /* 000CC 80870B7C 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 000D0 80870B80 03E00008 */  jr      $ra                        
 /* 000D4 80870B84 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s
@ -14,4 +14,3 @@ glabel BgDdanJd_Draw
 /* 005A4 80871054 00000000 */  nop
 /* 005A8 80871058 00000000 */  nop
 /* 005AC 8087105C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s
@ -48,5 +48,3 @@ glabel BgDdanJd_Init
 /* 0009C 80870B4C 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 000A0 80870B50 03E00008 */  jr      $ra                        
 /* 000A4 80870B54 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s
@ -8,5 +8,3 @@ glabel BgDdanJd_Update
 /* 0056C 8087101C 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00570 80871020 03E00008 */  jr      $ra                        
 /* 00574 80871024 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s
@ -115,5 +115,3 @@ glabel func_80870B88
 /* 00270 80870D20 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 00274 80870D24 03E00008 */  jr      $ra                        
 /* 00278 80870D28 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s
@ -123,5 +123,3 @@ glabel func_80870D2C
 /* 00444 80870EF4 8FB10028 */  lw      $s1, 0x0028($sp)           
 /* 00448 80870EF8 03E00008 */  jr      $ra                        
 /* 0044C 80870EFC 27BD0040 */  addiu   $sp, $sp, 0x0040           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s
@ -72,5 +72,3 @@ glabel func_80870F00
 /* 00548 80870FF8 27BD0028 */  addiu   $sp, $sp, 0x0028           ## $sp = 00000000
 /* 0054C 80870FFC 03E00008 */  jr      $ra                        
 /* 00550 80871000 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s
@ -19,5 +19,3 @@ glabel BgDdanKd_Destroy
 /* 00138 80871228 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 0013C 8087122C 03E00008 */  jr      $ra                        
 /* 00140 80871230 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s
@ -14,4 +14,3 @@ glabel BgDdanKd_Draw
 /* 007A4 80871894 00000000 */  nop
 /* 007A8 80871898 00000000 */  nop
 /* 007AC 8087189C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s
@ -47,7 +47,7 @@ glabel BgDdanKd_Init
 /* 000A0 80871190 3C014348 */  lui     $at, 0x4348                ## $at = 43480000
 /* 000A4 80871194 3C058087 */  lui     $a1, %hi(func_80871234)    ## $a1 = 80870000
 /* 000A8 80871198 24A51234 */  addiu   $a1, $a1, %lo(func_80871234) ## $a1 = 80871234
-/* 000AC 8087119C 0C21C43C */  jal     func_808710F0              
+/* 000AC 8087119C 0C21C43C */  jal     BgDdanKd_SetupAction              
 /* 000B0 808711A0 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 000B4 808711A4 1000000D */  beq     $zero, $zero, .L808711DC   
 /* 000B8 808711A8 8FBF001C */  lw      $ra, 0x001C($sp)           
@ -61,7 +61,7 @@ glabel BgDdanKd_Init
 /* 000D4 808711C4 24A51838 */  addiu   $a1, $a1, %lo(func_80871838) ## $a1 = 80871838
 /* 000D8 808711C8 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 000DC 808711CC 460A4401 */  sub.s   $f16, $f8, $f10            
-/* 000E0 808711D0 0C21C43C */  jal     func_808710F0              
+/* 000E0 808711D0 0C21C43C */  jal     BgDdanKd_SetupAction              
 /* 000E4 808711D4 E6100028 */  swc1    $f16, 0x0028($s0)          ## 00000028
 /* 000E8 808711D8 8FBF001C */  lw      $ra, 0x001C($sp)           
 .L808711DC:
@ -69,5 +69,3 @@ glabel BgDdanKd_Init
 /* 000F0 808711E0 8FB10018 */  lw      $s1, 0x0018($sp)           
 /* 000F4 808711E4 03E00008 */  jr      $ra                        
 /* 000F8 808711E8 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_SetupAction.s
@ -1,5 +1,3 @@
-glabel func_808710F0
+glabel BgDdanKd_SetupAction
 /* 00000 808710F0 03E00008 */  jr      $ra                        
 /* 00004 808710F4 AC8501C4 */  sw      $a1, 0x01C4($a0)           ## 000001C4
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Update.s
@ -8,5 +8,3 @@ glabel BgDdanKd_Update
 /* 0076C 8087185C 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00770 80871860 03E00008 */  jr      $ra                        
 /* 00774 80871864 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s
@ -1,3 +1,9 @@
+.rdata
+glabel D_80871920
+    .asciz "dam    %d\n"
+    .balign 4
+
+.text
 glabel func_80871234
 /* 00144 80871234 27BDFFD0 */  addiu   $sp, $sp, 0xFFD0           ## $sp = FFFFFFD0
 /* 00148 80871238 AFB00020 */  sw      $s0, 0x0020($sp)           
@ -39,7 +45,7 @@ glabel func_80871234
 /* 001CC 808712BC 3C058087 */  lui     $a1, %hi(func_80871364)    ## $a1 = 80870000
 /* 001D0 808712C0 4502000C */  bc1fl   .L808712F4                 
 /* 001D4 808712C4 86020168 */  lh      $v0, 0x0168($s0)           ## 00000168
-/* 001D8 808712C8 0C21C43C */  jal     func_808710F0              
+/* 001D8 808712C8 0C21C43C */  jal     BgDdanKd_SetupAction              
 /* 001DC 808712CC 24A51364 */  addiu   $a1, $a1, %lo(func_80871364) ## $a1 = 80871364
 /* 001E0 808712D0 8FA40034 */  lw      $a0, 0x0034($sp)           
 /* 001E4 808712D4 24050BEA */  addiu   $a1, $zero, 0x0BEA         ## $a1 = 00000BEA
@ -85,5 +91,3 @@ glabel func_80871234
 /* 00268 80871358 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 0026C 8087135C 03E00008 */  jr      $ra                        
 /* 00270 80871360 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871364.s
@ -1,3 +1,11 @@
+.late_rodata
+glabel D_8087192C
+    .float 0.007499999832361937
+
+glabel D_80871930
+    .float 0.6
+
+.text
 glabel func_80871364
 /* 00274 80871364 27BDFF98 */  addiu   $sp, $sp, 0xFF98           ## $sp = FFFFFF98
 /* 00278 80871368 44802000 */  mtc1    $zero, $f4                 ## $f4 = 0.00
@ -49,7 +57,7 @@ glabel func_80871364
 /* 00324 80871414 8605001C */  lh      $a1, 0x001C($s0)           ## 0000001C
 /* 00328 80871418 3C058087 */  lui     $a1, %hi(func_80871838)    ## $a1 = 80870000
 /* 0032C 8087141C 24A51838 */  addiu   $a1, $a1, %lo(func_80871838) ## $a1 = 80871838
-/* 00330 80871420 0C21C43C */  jal     func_808710F0              
+/* 00330 80871420 0C21C43C */  jal     BgDdanKd_SetupAction              
 /* 00334 80871424 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 00338 80871428 100000FF */  beq     $zero, $zero, .L80871828   
 /* 0033C 8087142C 8FBF002C */  lw      $ra, 0x002C($sp)           
@ -330,5 +338,3 @@ glabel func_80871364
 /* 0073C 8087182C 8FB10028 */  lw      $s1, 0x0028($sp)           
 /* 00740 80871830 03E00008 */  jr      $ra                        
 /* 00744 80871834 27BD0068 */  addiu   $sp, $sp, 0x0068           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871838.s
@ -2,5 +2,3 @@ glabel func_80871838
 /* 00748 80871838 AFA40000 */  sw      $a0, 0x0000($sp)           
 /* 0074C 8087183C 03E00008 */  jr      $ra                        
 /* 00750 80871840 AFA50004 */  sw      $a1, 0x0004($sp)           
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s
@ -30,5 +30,3 @@ glabel BgDodoago_Destroy
 /* 002E8 80871CE8 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 002EC 80871CEC 03E00008 */  jr      $ra                        
 /* 002F0 80871CF0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s
@ -1,3 +1,17 @@
+.rdata
+glabel D_80872650
+    .asciz "../z_bg_dodoago.c"
+    .balign 4
+
+glabel D_80872664
+    .asciz "../z_bg_dodoago.c"
+    .balign 4
+
+glabel D_80872678
+    .asciz "../z_bg_dodoago.c"
+    .balign 4
+
+.text
 glabel BgDodoago_Draw
 /* 00A40 80872440 27BDFFC0 */  addiu   $sp, $sp, 0xFFC0           ## $sp = FFFFFFC0
 /* 00A44 80872444 AFBF001C */  sw      $ra, 0x001C($sp)           
@ -57,4 +71,3 @@ glabel BgDodoago_Draw
 /* 00B14 80872514 00000000 */  nop
 /* 00B18 80872518 00000000 */  nop
 /* 00B1C 8087251C 00000000 */  nop
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s
@ -42,7 +42,7 @@ glabel BgDodoago_Init
 /* 001B0 80871BB0 02202025 */  or      $a0, $s1, $zero            ## $a0 = 00000000
 /* 001B4 80871BB4 3C058087 */  lui     $a1, %hi(func_8087227C)    ## $a1 = 80870000
 /* 001B8 80871BB8 24A5227C */  addiu   $a1, $a1, %lo(func_8087227C) ## $a1 = 8087227C
-/* 001BC 80871BBC 0C21C680 */  jal     func_80871A00              
+/* 001BC 80871BBC 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 001C0 80871BC0 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 001C4 80871BC4 240E1333 */  addiu   $t6, $zero, 0x1333         ## $t6 = 00001333
 /* 001C8 80871BC8 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
@ -91,7 +91,7 @@ glabel BgDodoago_Init
 /* 00258 80871C58 02003025 */  or      $a2, $s0, $zero            ## $a2 = 00000000
 /* 0025C 80871C5C 3C058087 */  lui     $a1, %hi(func_80871CF4)    ## $a1 = 80870000
 /* 00260 80871C60 24A51CF4 */  addiu   $a1, $a1, %lo(func_80871CF4) ## $a1 = 80871CF4
-/* 00264 80871C64 0C21C680 */  jal     func_80871A00              
+/* 00264 80871C64 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 00268 80871C68 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 0026C 80871C6C 3C018087 */  lui     $at, %hi(D_808727C0)       ## $at = 80870000
 /* 00270 80871C70 A02027C0 */  sb      $zero, %lo(D_808727C0)($at) 
@ -101,5 +101,3 @@ glabel BgDodoago_Init
 /* 0027C 80871C7C 8FB10018 */  lw      $s1, 0x0018($sp)           
 /* 00280 80871C80 03E00008 */  jr      $ra                        
 /* 00284 80871C84 27BD0038 */  addiu   $sp, $sp, 0x0038           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_SetupAction.s
@ -1,5 +1,3 @@
-glabel func_80871A00
+glabel BgDodoago_SetupAction
 /* 00000 80871A00 03E00008 */  jr      $ra                        
 /* 00004 80871A04 AC85024C */  sw      $a1, 0x024C($a0)           ## 0000024C
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s
@ -93,5 +93,3 @@ glabel BgDodoago_Update
 /* 00A34 80872434 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 00A38 80872438 03E00008 */  jr      $ra                        
 /* 00A3C 8087243C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871A08.s
@ -75,5 +75,3 @@ glabel func_80871A08
 /* 0011C 80871B1C 8FB70048 */  lw      $s7, 0x0048($sp)           
 /* 00120 80871B20 03E00008 */  jr      $ra                        
 /* 00124 80871B24 27BD0068 */  addiu   $sp, $sp, 0x0068           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s
@ -62,7 +62,7 @@ glabel func_80871CF4
 /* 003C8 80871DC8 24060004 */  addiu   $a2, $zero, 0x0004         ## $a2 = 00000004
 /* 003CC 80871DCC 3C058087 */  lui     $a1, %hi(func_80871FB8)    ## $a1 = 80870000
 /* 003D0 80871DD0 24A51FB8 */  addiu   $a1, $a1, %lo(func_80871FB8) ## $a1 = 80871FB8
-/* 003D4 80871DD4 0C21C680 */  jal     func_80871A00              
+/* 003D4 80871DD4 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 003D8 80871DD8 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 003DC 80871DDC 02202025 */  or      $a0, $s1, $zero            ## $a0 = 00000000
 /* 003E0 80871DE0 24050D34 */  addiu   $a1, $zero, 0x0D34         ## $a1 = 00000D34
@ -101,7 +101,7 @@ glabel func_80871CF4
 /* 00458 80871E58 AFA00010 */  sw      $zero, 0x0010($sp)         
 /* 0045C 80871E5C 3C058087 */  lui     $a1, %hi(func_80872288)    ## $a1 = 80870000
 /* 00460 80871E60 24A52288 */  addiu   $a1, $a1, %lo(func_80872288) ## $a1 = 80872288
-/* 00464 80871E64 0C21C680 */  jal     func_80871A00              
+/* 00464 80871E64 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 00468 80871E68 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
 /* 0046C 80871E6C 3C078013 */  lui     $a3, 0x8013                ## $a3 = 80130000
 /* 00470 80871E70 3C088013 */  lui     $t0, 0x8013                ## $t0 = 80130000
@ -198,5 +198,3 @@ glabel func_80871CF4
 /* 005AC 80871FAC 8FB10020 */  lw      $s1, 0x0020($sp)           
 /* 005B0 80871FB0 03E00008 */  jr      $ra                        
 /* 005B4 80871FB4 27BD0040 */  addiu   $sp, $sp, 0x0040           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871FB8.s
@ -153,7 +153,7 @@ glabel func_80871FB8
 /* 007F0 808721F0 3C078013 */  lui     $a3, 0x8013                ## $a3 = 80130000
 /* 007F4 808721F4 3C058087 */  lui     $a1, %hi(func_8087227C)    ## $a1 = 80870000
 /* 007F8 808721F8 24A5227C */  addiu   $a1, $a1, %lo(func_8087227C) ## $a1 = 8087227C
-/* 007FC 808721FC 0C21C680 */  jal     func_80871A00              
+/* 007FC 808721FC 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 00800 80872200 02202025 */  or      $a0, $s1, $zero            ## $a0 = 00000000
 /* 00804 80872204 3C078013 */  lui     $a3, 0x8013                ## $a3 = 80130000
 /* 00808 80872208 3C0C8013 */  lui     $t4, 0x8013                ## $t4 = 80130000
@ -190,5 +190,3 @@ glabel func_80871FB8
 /* 00870 80872270 8FB40040 */  lw      $s4, 0x0040($sp)           
 /* 00874 80872274 03E00008 */  jr      $ra                        
 /* 00878 80872278 27BD00E8 */  addiu   $sp, $sp, 0x00E8           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_8087227C.s
@ -2,5 +2,3 @@ glabel func_8087227C
 /* 0087C 8087227C AFA40000 */  sw      $a0, 0x0000($sp)           
 /* 00880 80872280 03E00008 */  jr      $ra                        
 /* 00884 80872284 AFA50004 */  sw      $a1, 0x0004($sp)           
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80872288.s
@ -18,12 +18,10 @@ glabel func_80872288
 /* 008C8 808722C8 3C058087 */  lui     $a1, %hi(func_80871CF4)    ## $a1 = 80870000
 /* 008CC 808722CC 55A10004 */  bnel    $t5, $at, .L808722E0       
 /* 008D0 808722D0 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 008D4 808722D4 0C21C680 */  jal     func_80871A00              
+/* 008D4 808722D4 0C21C680 */  jal     BgDodoago_SetupAction              
 /* 008D8 808722D8 24A51CF4 */  addiu   $a1, $a1, %lo(func_80871CF4) ## $a1 = 80871CF4
 /* 008DC 808722DC 8FBF0014 */  lw      $ra, 0x0014($sp)           
 .L808722E0:
 /* 008E0 808722E0 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 008E4 808722E4 03E00008 */  jr      $ra                        
 /* 008E8 808722E8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s
@ -2,5 +2,3 @@ glabel BgDyYoseizo_Destroy
 /* 00124 80872954 AFA40000 */  sw      $a0, 0x0000($sp)           
 /* 00128 80872958 03E00008 */  jr      $ra                        
 /* 0012C 8087295C AFA50004 */  sw      $a1, 0x0004($sp)           
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_808754E0
+    .asciz "[32m☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n[m"
+    .balign 4
+
+glabel D_80875510
+    .asciz "[32m☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n[m"
+    .balign 4
+
+.text
 glabel BgDyYoseizo_Init
 /* 00000 80872830 27BDFFD0 */  addiu   $sp, $sp, 0xFFD0           ## $sp = FFFFFFD0
 /* 00004 80872834 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
@ -77,5 +87,3 @@ glabel BgDyYoseizo_Init
 /* 00118 80872948 8FB00024 */  lw      $s0, 0x0024($sp)
 /* 0011C 8087294C 03E00008 */  jr      $ra
 /* 00120 80872950 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756B4
+    .float 7500.0
+
+.text
 glabel BgDyYoseizo_Update
 /* 02120 80874950 27BDFFC0 */  addiu   $sp, $sp, 0xFFC0           ## $sp = FFFFFFC0
 /* 02124 80874954 AFBF002C */  sw      $ra, 0x002C($sp)           
@ -158,5 +163,3 @@ glabel BgDyYoseizo_Update
 /* 02340 80874B70 8FB10028 */  lw      $s1, 0x0028($sp)           
 /* 02344 80874B74 03E00008 */  jr      $ra                        
 /* 02348 80874B78 27BD0040 */  addiu   $sp, $sp, 0x0040           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s
@ -1,3 +1,20 @@
+.late_rodata
+glabel D_80875680
+    .float 0.01
+
+glabel D_80875684
+    .float 3500.0
+
+glabel D_80875688
+    .float 0.4
+
+glabel D_8087568C
+    .float 0.2
+
+glabel D_80875690
+    .float 0.1
+
+.text
 glabel func_80872960
 /* 00130 80872960 27BDFF30 */  addiu   $sp, $sp, 0xFF30           ## $sp = FFFFFF30
 /* 00134 80872964 3C0F8087 */  lui     $t7, %hi(D_808754A4)       ## $t7 = 80870000
@ -202,5 +219,3 @@ glabel func_80872960
 /* 0041C 80872C4C 8FBE0080 */  lw      $s8, 0x0080($sp)           
 /* 00420 80872C50 03E00008 */  jr      $ra                        
 /* 00424 80872C54 27BD00D0 */  addiu   $sp, $sp, 0x00D0           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_80875694
+    .float 0.4
+
+ .text
 glabel func_80872C58
 /* 00428 80872C58 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 0042C 80872C5C AFBF001C */  sw      $ra, 0x001C($sp)           
@ -55,5 +60,3 @@ glabel func_80872C58
 /* 004E4 80872D14 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 004E8 80872D18 03E00008 */  jr      $ra                        
 /* 004EC 80872D1C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s
@ -55,5 +55,3 @@ glabel func_80872D20
 /* 005A8 80872DD8 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 005AC 80872DDC 03E00008 */  jr      $ra                        
 /* 005B0 80872DE0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s
@ -1,3 +1,22 @@
+.rdata 
+
+glabel D_80875540
+    .asciz "[33m☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n[m"
+    .balign 4
+
+glabel D_8087556C
+    .asciz "[32m ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n[m"
+    .balign 4
+
+glabel D_808755A0
+    .asciz "[33m ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n[m"
+    .balign 4
+
+glabel D_808755D8
+    .asciz "[35m ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n[m"
+    .balign 4
+
+.text
 glabel func_80872DE4
 /* 005B4 80872DE4 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 005B8 80872DE8 AFA40020 */  sw      $a0, 0x0020($sp)           
@ -325,5 +344,3 @@ glabel func_80872DE4
 /* 00A50 80873280 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 00A54 80873284 03E00008 */  jr      $ra                        
 /* 00A58 80873288 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s
@ -67,5 +67,3 @@ glabel func_8087328C
 /* 00B44 80873374 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 00B48 80873378 03E00008 */  jr      $ra
 /* 00B4C 8087337C 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_80875698
+    .float 0.03400000184774399
+
+.text
 glabel func_80873380
 /* 00B50 80873380 27BDFFD8 */  addiu   $sp, $sp, 0xFFD8           ## $sp = FFFFFFD8
 /* 00B54 80873384 AFB00020 */  sw      $s0, 0x0020($sp)           
@ -96,5 +101,3 @@ glabel func_80873380
 /* 00CA0 808734D0 27BD0028 */  addiu   $sp, $sp, 0x0028           ## $sp = 00000000
 /* 00CA4 808734D4 03E00008 */  jr      $ra                        
 /* 00CA8 808734D8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_8087569C
+    .float 1273.0
+
+.text
 glabel func_808734DC
 /* 00CAC 808734DC 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 00CB0 808734E0 AFBF0014 */  sw      $ra, 0x0014($sp)           
@ -46,5 +51,3 @@ glabel func_808734DC
 /* 00D50 80873580 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 00D54 80873584 03E00008 */  jr      $ra                        
 /* 00D58 80873588 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s
@ -75,5 +75,3 @@ glabel func_8087358C
 /* 00E68 80873698 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 00E6C 8087369C 03E00008 */  jr      $ra
 /* 00E70 808736A0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756A0
+ .word 0x449F2000
+
+.text
 glabel func_808736A4
 /* 00E74 808736A4 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 00E78 808736A8 AFB00014 */  sw      $s0, 0x0014($sp)           
@ -57,5 +62,3 @@ glabel func_808736A4
 /* 00F44 80873774 8FB10018 */  lw      $s1, 0x0018($sp)           
 /* 00F48 80873778 03E00008 */  jr      $ra                        
 /* 00F4C 8087377C 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s
@ -64,5 +64,3 @@ glabel func_80873780
 /* 0102C 8087385C 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 01030 80873860 03E00008 */  jr      $ra
 /* 01034 80873864 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756A4
+    .float 1300.0
+
+ .text
 glabel func_80873868
 /* 01038 80873868 27BDFFA0 */  addiu   $sp, $sp, 0xFFA0           ## $sp = FFFFFFA0
 /* 0103C 8087386C AFBF003C */  sw      $ra, 0x003C($sp)
@ -202,5 +207,3 @@ glabel func_80873868
 /* 01300 80873B30 27BD0060 */  addiu   $sp, $sp, 0x0060           ## $sp = 00000000
 /* 01304 80873B34 03E00008 */  jr      $ra
 /* 01308 80873B38 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s
@ -56,5 +56,3 @@ glabel func_80873B3C
 /* 013D8 80873C08 8FB10018 */  lw      $s1, 0x0018($sp)           
 /* 013DC 80873C0C 03E00008 */  jr      $ra                        
 /* 013E0 80873C10 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s
@ -71,5 +71,3 @@ glabel func_80873C14
 /* 014D8 80873D08 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 014DC 80873D0C 03E00008 */  jr      $ra
 /* 014E0 80873D10 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756A8
+    .float 0.003000000026077032
+
+.text
 glabel func_80873D14
 /* 014E4 80873D14 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 014E8 80873D18 AFB00018 */  sw      $s0, 0x0018($sp)           
@ -67,5 +72,3 @@ glabel func_80873D14
 /* 015C8 80873DF8 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 015CC 80873DFC 03E00008 */  jr      $ra                        
 /* 015D0 80873E00 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s
@ -48,5 +48,3 @@ glabel func_80873E04
 /* 01668 80873E98 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
 /* 0166C 80873E9C 03E00008 */  jr      $ra                        
 /* 01670 80873EA0 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s
@ -85,5 +85,3 @@ glabel func_80873EA4
 /* 0179C 80873FCC 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
 /* 017A0 80873FD0 03E00008 */  jr      $ra
 /* 017A4 80873FD4 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756AC
+    .float 0.03400000184774399
+
+ .text
 glabel func_80873FD8
 /* 017A8 80873FD8 27BDFFC8 */  addiu   $sp, $sp, 0xFFC8           ## $sp = FFFFFFC8
 /* 017AC 80873FDC AFBF002C */  sw      $ra, 0x002C($sp)
@ -227,5 +232,3 @@ glabel func_80873FD8
 /* 01AC8 808742F8 27BD0038 */  addiu   $sp, $sp, 0x0038           ## $sp = 00000000
 /* 01ACC 808742FC 03E00008 */  jr      $ra
 /* 01AD0 80874300 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756B0
+    .float 0.3
+
+ .text
 glabel func_80874304
 /* 01AD4 80874304 27BDFFA0 */  addiu   $sp, $sp, 0xFFA0           ## $sp = FFFFFFA0
 /* 01AD8 80874308 AFBF003C */  sw      $ra, 0x003C($sp)
@ -444,5 +449,3 @@ glabel func_80874304
 /* 02114 80874944 8FB10038 */  lw      $s1, 0x0038($sp)
 /* 02118 80874948 03E00008 */  jr      $ra
 /* 0211C 8087494C 27BD0060 */  addiu   $sp, $sp, 0x0060           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s
@ -26,5 +26,3 @@ glabel func_80874B7C
 .L80874BD8:
 /* 023A8 80874BD8 03E00008 */  jr      $ra                        
 /* 023AC 80874BDC 00001025 */  or      $v0, $zero, $zero          ## $v0 = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_80875608
+    .asciz "../z_bg_dy_yoseizo.c"
+    .balign 4
+
+glabel D_80875620
+    .asciz "../z_bg_dy_yoseizo.c"
+    .balign 4
+
+.text
 glabel func_80874BE0
 /* 023B0 80874BE0 27BDFFA8 */  addiu   $sp, $sp, 0xFFA8           ## $sp = FFFFFFA8
 /* 023B4 80874BE4 AFB10028 */  sw      $s1, 0x0028($sp)
@ -111,5 +121,3 @@ glabel func_80874BE0
 /* 02560 80874D90 8FB10028 */  lw      $s1, 0x0028($sp)
 /* 02564 80874D94 03E00008 */  jr      $ra
 /* 02568 80874D98 27BD0058 */  addiu   $sp, $sp, 0x0058           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s
@ -1,3 +1,8 @@
+.late_rodata
+glabel D_808756B8
+    .float 30000.0
+
+ .text
 glabel func_80874D9C
 /* 0256C 80874D9C 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
 /* 02570 80874DA0 AFBF0014 */  sw      $ra, 0x0014($sp)           
@ -71,5 +76,3 @@ glabel func_80874D9C
 /* 02670 80874EA0 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
 /* 02674 80874EA4 03E00008 */  jr      $ra                        
 /* 02678 80874EA8 00000000 */  nop
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s
@ -1,3 +1,20 @@
+.late_rodata
+glabel D_808756BC
+    .float 5000.0
+
+ glabel D_808756C0
+    .float 0.9
+
+ glabel D_808756C4
+    .float 3000.0
+
+ glabel D_808756C8
+    .float 3.14159274101
+
+ glabel D_808756CC
+    .float 3.14159274101
+ 
+ .text
 glabel func_80874EAC
 /* 0267C 80874EAC 27BDFF58 */  addiu   $sp, $sp, 0xFF58           ## $sp = FFFFFF58
 /* 02680 80874EB0 F7BE0040 */  sdc1    $f30, 0x0040($sp)          
@ -200,5 +217,3 @@ glabel func_80874EAC
 /* 02964 80875194 8FBE0068 */  lw      $s8, 0x0068($sp)           
 /* 02968 80875198 03E00008 */  jr      $ra                        
 /* 0296C 8087519C 27BD00A8 */  addiu   $sp, $sp, 0x00A8           ## $sp = 00000000
-
-
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s
+++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s
@ -1,3 +1,17 @@
+.rdata
+glabel D_80875638
+    .asciz "../z_bg_dy_yoseizo.c"
+    .balign 4
+
+glabel D_80875650
+    .asciz "../z_bg_dy_yoseizo.c"
+    .balign 4
+
+glabel D_80875668
+    .asciz "../z_bg_dy_yoseizo.c"
+    .balign 4
+
+.text
 glabel func_808751A0
 /* 02970 808751A0 27BDFF60 */  addiu   $sp, $sp, 0xFF60           ## $sp = FFFFFF60
 /* 02974 808751A4 AFBF0044 */  sw      $ra, 0x0044($sp)           
@ -170,4 +184,3 @@ glabel func_808751A0
 /* 02C04 80875434 27BD00A0 */  addiu   $sp, $sp, 0x00A0           ## $sp = 00000000
 /* 02C08 80875438 00000000 */  nop
 /* 02C0C 8087543C 00000000 */  nop
-
--- a/Show more
+++ b/Show more