diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s index 49d86bb459..9a9ae355fc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s @@ -1,3 +1,21 @@ +.rdata +glabel D_8099F120 + .asciz "../z_eff_ss_blast.c" + .balign 4 + +glabel D_8099F134 + .asciz "../z_eff_ss_blast.c" + .balign 4 + +glabel D_8099F148 + .asciz "../z_eff_ss_blast.c" + .balign 4 + +.late_rodata +glabel D_8099F15C + .float 0.0025 + +.text glabel func_8099EF08 /* 00158 8099EF08 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 0015C 8099EF0C AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s index 41a22662d7..5e685bf284 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s @@ -1,3 +1,13 @@ +.rdata +glabel D_8099F5A0 + .asciz "../z_eff_ss_bomb.c" + .balign 4 + +glabel D_8099F5B4 + .asciz "../z_eff_ss_bomb.c" + .balign 4 + +.text glabel func_8099F274 /* 000C4 8099F274 27BDFE90 */ addiu $sp, $sp, 0xFE90 ## $sp = FFFFFE90 /* 000C8 8099F278 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s index d69f5412cb..68c8ea8b45 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_8099F5C8 + .float 0.4 + +glabel D_8099F5CC + .float 0.2 + +glabel D_8099F5D0 + .float 0.4 + +glabel D_8099F5D4 + .float 0.2 + +.text glabel func_8099F4D8 /* 00328 8099F4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0032C 8099F4DC AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s index 28de7274e2..8cb33cd8b3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s @@ -1,3 +1,17 @@ +.rdata +glabel D_8099FF20 + .asciz "../z_eff_ss_bomb2.c" + .balign 4 + +glabel D_8099FF34 + .asciz "../z_eff_ss_bomb2.c" + .balign 4 + +.late_rodata +glabel D_8099FF84 + .float 0.01 + +.text glabel func_8099F748 /* 000F8 8099F748 27BDFEA0 */ addiu $sp, $sp, 0xFEA0 ## $sp = FFFFFEA0 /* 000FC 8099F74C AFB00014 */ sw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s index 86f41e3fcf..47ab031349 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s @@ -1,3 +1,30 @@ +.rdata +glabel D_8099FF48 + .asciz "../z_eff_ss_bomb2.c" + .balign 4 + +glabel D_8099FF5C + .asciz "../z_eff_ss_bomb2.c" + .balign 4 + +glabel D_8099FF70 + .asciz "../z_eff_ss_bomb2.c" + .balign 4 + +.late_rodata +glabel D_8099FF88 + .float 0.925 + +glabel D_8099FF8C + .float 0.01 + +glabel D_8099FF90 + .float 0.02 + +glabel D_8099FF94 + .float 0.15 + +.text glabel func_8099F960 /* 00310 8099F960 27BDFE08 */ addiu $sp, $sp, 0xFE08 ## $sp = FFFFFE08 /* 00314 8099F964 AFB40040 */ sw $s4, 0x0040($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s index 79fdb88b5b..c0a6c8311e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A04A0 + .asciz "../z_eff_ss_bubble.c" + .balign 4 + +glabel D_809A04B8 + .asciz "../z_eff_ss_bubble.c" + .balign 4 + +glabel D_809A04D0 + .asciz "../z_eff_ss_bubble.c" + .balign 4 + +.text glabel func_809A01CC /* 0018C 809A01CC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00190 809A01D0 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s index 02d5eee27f..7a92919d5f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809A04E8 + .float 0.3 + +glabel D_809A04EC + .float 0.2 + +.text glabel func_809A0360 /* 00320 809A0360 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 00324 809A0364 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s index 6edc3c3916..ebf06e3cef 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809A0A10 + .asciz "../z_eff_ss_d_fire.c" + .balign 4 + +glabel D_809A0A28 + .asciz "../z_eff_ss_d_fire.c" + .balign 4 + +.text glabel func_809A0698 /* 00148 809A0698 27BDFE98 */ addiu $sp, $sp, 0xFE98 ## $sp = FFFFFE98 /* 0014C 809A069C AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s index 207a5cddfc..fafd1740f9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A0A40 + .float 0.01 + +.text glabel func_809A090C /* 003BC 809A090C AFA40000 */ sw $a0, 0x0000($sp) /* 003C0 809A0910 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s index 220aac405a..4ddc66ce27 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A0F50 + .asciz "../z_eff_ss_dead_db.c" + .balign 4 + +glabel D_809A0F68 + .asciz "../z_eff_ss_dead_db.c" + .balign 4 + +.late_rodata +glabel D_809A0F80 + .float 0.01 + +.text glabel func_809A0BB8 /* 00118 809A0BB8 27BDFEE8 */ addiu $sp, $sp, 0xFEE8 ## $sp = FFFFFEE8 /* 0011C 809A0BBC AFB00014 */ sw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s index 31b058bcc5..982868d7ba 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A0FE0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809A1550 + .asciz "Effect_SS_Dd_disp_mode():mode_swが変です。\n" + .balign 4 + +.text glabel func_809A0FE0 /* 000000 809A0FE0 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 000004 809A0FE4 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s index 8d447a6283..b75b85237e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A157C + .asciz "../z_eff_ss_dead_dd.c" + .balign 4 + +glabel D_809A1594 + .asciz "../z_eff_ss_dead_dd.c" + .balign 4 + +.late_rodata +glabel D_809A15AC + .float 0.01 + +.text glabel func_809A12B4 /* 0002D4 809A12B4 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 0002D8 809A12B8 AFB00014 */ sw $s0, 0x14($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index 9230447706..fefd377be7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -1,3 +1,24 @@ +.rdata +glabel D_809A1A80 + .asciz "../z_eff_ss_dead_ds.c" + .balign 4 + +glabel D_809A1A98 + .asciz "../z_eff_ss_dead_ds.c" + .balign 4 + +glabel D_809A1AB0 + .asciz "../z_eff_ss_dead_ds.c" + .balign 4 + +.late_rodata +glabel D_809A1AC8 + .float 0.01 + +glabel D_809A1ACC + .float 1.57 + +.text glabel func_809A16F4 /* 000E4 809A16F4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s index 0a7dc4cc68..ffe7642f36 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s @@ -1,3 +1,9 @@ +.late_rodata +glabel D_809A1C60 + .word 0xA5B3A5F3, 0xA5B9A5C8, 0xA5E9A5AF, 0xA5BFA1BC, 0x330A0000, 0x00000000, 0x00000000, 0x00000000 + + +.text glabel func_809A1B30 /* 000000 809A1B30 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 000004 809A1B34 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s index 10ff1f873b..51e2f65751 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809A2220 + .asciz "../z_eff_ss_dt_bubble.c" + .balign 4 + +glabel D_809A2238 + .asciz "../z_eff_ss_dt_bubble.c" + .balign 4 + +glabel D_809A2250 + .asciz "../z_eff_ss_dt_bubble.c" + .balign 4 + +.late_rodata +glabel D_809A2268 + .float 0.004 + +.text glabel func_809A1F04 /* 00254 809A1F04 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00258 809A1F08 AFB00014 */ sw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index c39074ff06..539a080f80 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A2A70 + .asciz "../z_eff_ss_dust.c" + .balign 4 + +glabel D_809A2A84 + .asciz "../z_eff_ss_dust.c" + .balign 4 + +.late_rodata +glabel D_809A2A98 + .float 0.0025 + +.text glabel func_809A2480 /* 001B0 809A2480 27BDFE78 */ addiu $sp, $sp, 0xFE78 ## $sp = FFFFFE78 /* 001B4 809A2484 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s index 4d92a79d79..2137072985 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809A2A9C + .float 0.4 + +glabel D_809A2AA0 + .float 0.2 + +glabel D_809A2AA4 + .float 0.4 + +glabel D_809A2AA8 + .float 0.2 + +.text glabel func_809A27F0 /* 00520 809A27F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00524 809A27F4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s index 74c01d37af..2944f460cf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809A2AAC + .float 0.4 + +glabel D_809A2AB0 + .float 0.2 + +glabel D_809A2AB4 + .float 0.4 + +glabel D_809A2AB8 + .float 0.2 + +.text glabel func_809A28EC /* 0061C 809A28EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00620 809A28F0 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s index 62499564ce..656737e7db 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809A3260 + .asciz "../z_eff_en_fire.c" + .balign 4 + +glabel D_809A3274 + .asciz "../z_eff_en_fire.c" + .balign 4 + +glabel D_809A3288 + .asciz "../z_eff_en_fire.c" + .balign 4 + +.late_rodata +glabel D_809A329C + .float 9.58738019108e-05 + +glabel D_809A32A0 + .float 0.00005 + +glabel D_809A32A4 + .float 12.7 + +.text glabel func_809A2D28 /* 001C8 809A2D28 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 001CC 809A2D2C AFB10038 */ sw $s1, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s index d71ef90ce7..04b4c971f2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s @@ -1,3 +1,11 @@ +.late_rodata +glabel D_809A32A8 + .float 9.58738019108e-05 + +glabel D_809A32AC + .float 9.58738019108e-05 + +.text glabel func_809A3060 /* 00500 809A3060 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00504 809A3064 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s index 87f2132b16..87f103a5a5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3330.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809A3BA0 + .asciz "Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n" + .balign 4 + +.text glabel func_809A3330 /* 00000 809A3330 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 809A3334 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s index a832ce7d92..88e6f4d790 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s @@ -1,3 +1,30 @@ +.rdata +glabel D_809A3BD4 + .asciz "../z_eff_en_ice.c" + .balign 4 + +glabel D_809A3BE8 + .asciz "../z_eff_en_ice.c" + .balign 4 + +glabel D_809A3BFC + .asciz "../z_eff_en_ice.c" + .balign 4 + +.late_rodata +glabel D_809A3C10 + .float 0.01 + +glabel D_809A3C14 + .float 9.58738019108e-05 + +glabel D_809A3C18 + .float 9.58738019108e-05 + +glabel D_809A3C1C + .float 89.8 + +.text glabel func_809A35DC /* 002AC 809A35DC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 /* 002B0 809A35E0 AFBF003C */ sw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s index da05efb196..6380d915d2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A3C20 + .float 65535.0 + +.text glabel func_809A3988 /* 00658 809A3988 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0065C 809A398C AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s index 52823ef8e5..aef93af9ac 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A4080 + .asciz "../z_eff_ss_extra.c" + .balign 4 + +glabel D_809A4094 + .asciz "../z_eff_ss_extra.c" + .balign 4 + +glabel D_809A40A8 + .asciz "../z_eff_ss_extra.c" + .balign 4 + +.text glabel func_809A3E00 /* 000140 809A3E00 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 000144 809A3E04 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s index 9787ee5978..9bf2577b91 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s @@ -1,3 +1,30 @@ +.rdata +glabel D_809A45A0 + .asciz "../z_eff_fcircle.c" + .balign 4 + +glabel D_809A45B4 + .asciz "../z_eff_fcircle.c" + .balign 4 + +glabel D_809A45C8 + .asciz "../z_eff_fcircle.c" + .balign 4 + +.late_rodata +glabel D_809A45DC + .float 0.001 + +glabel D_809A45E0 + .float 0.025 + +glabel D_809A45E4 + .float 0.01 + +glabel D_809A45E8 + .float 9.58738019108e-05 + +.text glabel func_809A41DC /* 000BC 809A41DC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 000C0 809A41E0 AFB10038 */ sw $s1, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s index 35ddd5af7e..41649da233 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4660.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809A5580 + .asciz "Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n" + .balign 4 + +.text glabel func_809A4660 /* 00000 809A4660 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 00004 809A4664 3C0E809A */ lui $t6, %hi(D_809A5088) ## $t6 = 809A0000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s index ea3880ca66..c6711f3df9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809A55AC + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +glabel D_809A55C4 + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +glabel D_809A55DC + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +.late_rodata +glabel D_809A563C + .float 3.1416 + +.text glabel func_809A49B8 /* 00358 809A49B8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0035C 809A49BC AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s index 73e90bccd3..1eeb71d308 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s @@ -1,3 +1,24 @@ +.rdata +glabel D_809A55F4 + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +glabel D_809A560C + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +glabel D_809A5624 + .asciz "../z_eff_fhg_flash.c" + .balign 4 + +.late_rodata +glabel D_809A5640 + .float 1.1416 + +glabel D_809A5644 + .float 3.1416 + +.text glabel func_809A4BE8 /* 00588 809A4BE8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 0058C 809A4BEC AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s index 27c20e2a23..e2a70abd3b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A5648 + .float 20000.0 + +.text glabel func_809A4E28 /* 007C8 809A4E28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 007CC 809A4E2C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s index 6bf7c91663..97135dd6ea 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809A564C + .float 20000.0 + +glabel D_809A5650 + .float 17.9 + +glabel D_809A5654 + .float 23.9 + +.text glabel func_809A4EC0 /* 00860 809A4EC0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00864 809A4EC4 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s index 030e3c080f..49719284ae 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s @@ -1,3 +1,36 @@ +.rdata +glabel D_809A5DE0 + .asciz "../z_eff_fire_tail.c" + .balign 4 + +glabel D_809A5DF8 + .asciz "../z_eff_fire_tail.c" + .balign 4 + +glabel D_809A5E10 + .asciz "../z_eff_fire_tail.c" + .balign 4 + +.late_rodata +glabel D_809A5E28 + .float 0.1 + +glabel D_809A5E2C + .float 9.58738019108e-05 + +glabel D_809A5E30 + .float 0.0174532923847 + +glabel D_809A5E34 + .float 1.00000006569e-05 + +glabel D_809A5E38 + .float 0.1 + +glabel D_809A5E3C + .float 0.01 + +.text glabel func_809A5858 /* 00118 809A5858 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0011C 809A585C AFB00038 */ sw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s index 4d59c9c91d..cccee9c051 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A5E40 + .float 0.9 + +.text glabel func_809A5D98 /* 00658 809A5D98 AFA40000 */ sw $a0, 0x0000($sp) /* 0065C 809A5D9C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index b3cbfc58e8..76bff7b37c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A68B0 + .asciz "../z_eff_ss_g_magma2.c" + .balign 4 + +glabel D_809A68C8 + .asciz "../z_eff_ss_g_magma2.c" + .balign 4 + +glabel D_809A68E0 + .asciz "../z_eff_ss_g_magma2.c" + .balign 4 + +.text glabel func_809A6568 /* 001C8 809A6568 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 001CC 809A656C AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s index 7e3e0e961e..152f6fdb04 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A6EA0 + .asciz "../z_eff_ss_g_ripple.c" + .balign 4 + +glabel D_809A6EB8 + .asciz "../z_eff_ss_g_ripple.c" + .balign 4 + +.late_rodata +glabel D_809A6ED0 + .float 0.0025 + +.text glabel func_809A6AD8 /* 00178 809A6AD8 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 /* 0017C 809A6ADC AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s index 2996ee178d..e6457b1fd0 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809A74B0 + .asciz "../z_eff_ss_g_spk.c" + .balign 4 + +glabel D_809A74C4 + .asciz "../z_eff_ss_g_spk.c" + .balign 4 + +.late_rodata +glabel D_809A74D8 + .float 0.0025 + +.text glabel func_809A70A0 /* 00170 809A70A0 27BDFEA0 */ addiu $sp, $sp, 0xFEA0 ## $sp = FFFFFEA0 /* 00174 809A70A4 AFB00014 */ sw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s index 137783a17f..c2ce8cd8b7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A7980 + .float 0.002 + +.text glabel func_809A7864 /* 00324 809A7864 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00328 809A7868 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s index 699fffd911..7f27dff838 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809A8020 + .asciz "../z_eff_hahen.c" + .balign 4 + +glabel D_809A8034 + .asciz "../z_eff_hahen.c" + .balign 4 + +glabel D_809A8048 + .asciz "../z_eff_hahen.c" + .balign 4 + +.late_rodata +glabel D_809A8098 + .float 0.001 + +glabel D_809A809C + .float 0.01 + +glabel D_809A80A0 + .float 0.01 + +.text glabel func_809A7BFC /* 0020C 809A7BFC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00210 809A7C00 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s index 8c3bdfce0c..765a279256 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809A805C + .asciz "../z_eff_hahen.c" + .balign 4 + +glabel D_809A8070 + .asciz "../z_eff_hahen.c" + .balign 4 + +glabel D_809A8084 + .asciz "../z_eff_hahen.c" + .balign 4 + +.late_rodata +glabel D_809A80A4 + .float 0.001 + +glabel D_809A80A8 + .float 0.01 + +glabel D_809A80AC + .float 0.01 + +.text glabel func_809A7D9C /* 003AC 809A7D9C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 003B0 809A7DA0 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s index eaf8430d65..67ebfb4834 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_809A8670 + .asciz "../z_eff_ss_hitmark.c" + .balign 4 + +glabel D_809A8688 + .asciz "../z_eff_ss_hitmark.c" + .balign 4 + +.text glabel func_809A824C /* 000FC 809A824C 27BDFEA0 */ addiu $sp, $sp, 0xFEA0 ## $sp = FFFFFEA0 /* 00100 809A8250 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s index e699fe221c..be6052fb60 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809A8B20 + .asciz "../z_eff_ice_piece.c" + .balign 4 + +glabel D_809A8B38 + .asciz "../z_eff_ice_piece.c" + .balign 4 + +glabel D_809A8B50 + .asciz "../z_eff_ice_piece.c" + .balign 4 + +.late_rodata +glabel D_809A8B68 + .float 0.01 + +glabel D_809A8B6C + .float 9.58738019108e-05 + +glabel D_809A8B70 + .float 9.58738019108e-05 + +.text glabel func_809A8850 /* 00150 809A8850 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 00154 809A8854 AFBF003C */ sw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s index 9a176b37c3..779f7296a5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809A8B74 + .float 0.85 + +.text glabel func_809A8AC0 /* 003C0 809A8AC0 AFA40000 */ sw $a0, 0x0000($sp) /* 003C4 809A8AC4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s index f418efa342..aa8272c6c4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8BF0.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809A90C0 + .asciz "Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n" + .balign 4 + +.text glabel func_809A8BF0 /* 00000 809A8BF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809A8BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 79ef6768bc..90ec342365 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -1,3 +1,22 @@ +.rdata +glabel D_809A9100 + .asciz "../z_eff_ss_ice_smoke.c" + .balign 4 + +glabel D_809A9118 + .asciz "../z_eff_ss_ice_smoke.c" + .balign 4 + +glabel D_809A9130 + .asciz "../z_eff_ss_ice_smoke.c" + .balign 4 + +.late_rodata +glabel D_809A9148 + .word 0x38D1B717, 0x00000000 + + +.text glabel func_809A8D18 /* 00128 809A8D18 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 0012C 809A8D1C AFBF003C */ sw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s index afb24ea92e..4d205b23dc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s @@ -1,3 +1,24 @@ +.rdata +glabel D_809A95D0 + .asciz "../z_eff_k_fire.c" + .balign 4 + +glabel D_809A95E4 + .asciz "../z_eff_k_fire.c" + .balign 4 + +glabel D_809A95F8 + .asciz "../z_eff_k_fire.c" + .balign 4 + +.late_rodata +glabel D_809A960C + .float 10000.0 + +glabel D_809A9610 + .float 3.14159274101 + +.text glabel func_809A9280 /* 000D0 809A9280 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 000D4 809A9284 AFBF003C */ sw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s index 4b58aef4db..c5f309b143 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9680.s @@ -1,3 +1,20 @@ +.rdata +glabel D_809AA5C0 + .asciz "shape_modelがNULL\n" + .balign 4 + +glabel D_809AA5D4 + .asciz "../z_eff_kakera.c" + .balign 4 + +.late_rodata +glabel D_809AA668 + .float 32767.0 + +glabel D_809AA66C + .float 32767.0 + +.text glabel func_809A9680 /* 00000 809A9680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00004 809A9684 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s index 295d617a3a..aa5c3cf2b1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s @@ -1,3 +1,9 @@ +.rdata +glabel D_809AA5E8 + .asciz "範囲がマイナス！！(randomD_sectionUniformity)\n" + .balign 4 + +.text glabel func_809A9818 /* 00198 809A9818 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0019C 809A981C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s index 7e18c805ca..790fe56292 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s @@ -1,3 +1,28 @@ +.rdata +glabel D_809AA618 + .asciz "../z_eff_kakera.c" + .balign 4 + +glabel D_809AA62C + .asciz "../z_eff_kakera.c" + .balign 4 + +glabel D_809AA640 + .asciz "../z_eff_kakera.c" + .balign 4 + +glabel D_809AA654 + .asciz "../z_eff_kakera.c" + .balign 4 + +.late_rodata +glabel D_809AA670 + .float 0.01 + +glabel D_809AA674 + .float 0.01 + +.text glabel func_809A9874 /* 001F4 809A9874 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 001F8 809A9878 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s index f0eb8d241f..761379052c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809AA678 + .float 0.01 + +.text glabel func_809A9FD8 /* 00958 809A9FD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0095C 809A9FDC AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s index c393eb3113..04ff4fe5cc 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_809AA67C + .float 0.9 + +glabel D_809AA680 + .float 0.2 + +glabel D_809AA684 + .float -0.8 + +glabel D_809AA688 + .float 0.9 + +glabel D_809AA68C + .float 0.2 + +.text glabel func_809AA230 /* 00BB0 809AA230 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00BB4 809AA234 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s index 6bfbccc7c8..5b267019c8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809AAE10 + .asciz "../z_eff_ss_kirakira.c" + .balign 4 + +glabel D_809AAE28 + .asciz "../z_eff_ss_kirakira.c" + .balign 4 + +.late_rodata +glabel D_809AAE40 + .float 10000.0 + +.text glabel func_809AA9AC /* 0019C 809AA9AC 27BDFE20 */ addiu $sp, $sp, 0xFE20 ## $sp = FFFFFE20 /* 001A0 809AA9B0 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s index 313e9e4bbe..f7cd51e3db 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809AAE44 + .float 0.4 + +glabel D_809AAE48 + .float 0.2 + +glabel D_809AAE4C + .float 0.4 + +glabel D_809AAE50 + .float 0.2 + +.text glabel func_809AABF0 /* 003E0 809AABF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 003E4 809AABF4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s index c057cbd69e..f3d056f650 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809AAE54 + .float 0.95 + +glabel D_809AAE58 + .float 0.2 + +glabel D_809AAE5C + .float 0.2 + +.text glabel func_809AACAC /* 0049C 809AACAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 004A0 809AACB0 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s index 20e5215302..9a8bac85c6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s @@ -1,3 +1,20 @@ +.rdata +glabel D_809AB560 + .asciz "../z_eff_ss_lightning.c" + .balign 4 + +glabel D_809AB578 + .asciz "../z_eff_ss_lightning.c" + .balign 4 + +.late_rodata +glabel D_809AB590 + .float 0.01 + +glabel D_809AB594 + .float 0.6 + +.text glabel func_809AB078 /* 00188 809AB078 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 /* 0018C 809AB07C AFB00014 */ sw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s index 62f5929ec3..7872d7eb9a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_809AB598 + .float 3640.0 + +glabel D_809AB59C + .float 0.01 + +glabel D_809AB5A0 + .float 0.1 + +.text glabel func_809AB338 /* 00448 809AB338 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 0044C 809AB33C AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s index 1b08059b99..c34aea18bf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB630.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_809ABCD8 + .float 0.01 + +.text glabel func_809AB630 /* 00000 809AB630 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 809AB634 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s index b6726c304b..8738767ac4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809ABC90 + .asciz "../z_eff_ss_sibuki.c" + .balign 4 + +glabel D_809ABCA8 + .asciz "../z_eff_ss_sibuki.c" + .balign 4 + +glabel D_809ABCC0 + .asciz "../z_eff_ss_sibuki.c" + .balign 4 + +.text glabel func_809AB7EC /* 001BC 809AB7EC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 001C0 809AB7F0 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s index 0a4c65e96e..6c168b136c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_809ABCDC + .float 0.01 + +glabel D_809ABCE0 + .float 0.1 + +glabel D_809ABCE4 + .float 0.1 + +glabel D_809ABCE8 + .float 0.1 + +.text glabel func_809AB9DC /* 003AC 809AB9DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 003B0 809AB9E0 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s index e48057ce5e..e978d04741 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s @@ -1,3 +1,17 @@ +.rdata +glabel D_809AC090 + .asciz "../z_eff_ss_sibuki2.c" + .balign 4 + +glabel D_809AC0A8 + .asciz "../z_eff_ss_sibuki2.c" + .balign 4 + +glabel D_809AC0C0 + .asciz "../z_eff_ss_sibuki2.c" + .balign 4 + +.text glabel func_809ABE0C /* 000AC 809ABE0C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 000B0 809ABE10 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index 97b1e3794e..6ba7a383b9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -1,3 +1,27 @@ +.rdata +glabel D_809AC640 + .asciz "../z_eff_ss_stick.c" + .balign 4 + +glabel D_809AC654 + .asciz "../z_eff_ss_stick.c" + .balign 4 + +glabel D_809AC668 + .asciz "../z_eff_ss_stick.c" + .balign 4 + +.late_rodata +glabel D_809AC67C + .float 0.01 + +glabel D_809AC680 + .float 0.0025 + +glabel D_809AC684 + .float 0.01 + +.text glabel func_809AC42C /* 0015C 809AC42C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s index 7e06b31ecf..6720d0a771 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s @@ -1,3 +1,21 @@ +.rdata +glabel D_809ACA70 + .asciz "../z_eff_ss_stone1.c" + .balign 4 + +glabel D_809ACA88 + .asciz "../z_eff_ss_stone1.c" + .balign 4 + +glabel D_809ACAA0 + .asciz "../z_eff_ss_stone1.c" + .balign 4 + +.late_rodata +glabel D_809ACAB8 + .float 1500.0 + +.text glabel func_809AC78C /* 0008C 809AC78C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 00090 809AC790 AFBF001C */ sw $ra, 0x001C($sp) diff --git a/data/overlays/effects/z_eff_ss_blast.rodata.s b/data/overlays/effects/z_eff_ss_blast.rodata.s deleted file mode 100644 index c496d63106..0000000000 --- a/data/overlays/effects/z_eff_ss_blast.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_8099F120 - .asciz "../z_eff_ss_blast.c" - .balign 4 - -glabel D_8099F134 - .asciz "../z_eff_ss_blast.c" - .balign 4 - -glabel D_8099F148 - .asciz "../z_eff_ss_blast.c" - .balign 4 - -glabel D_8099F15C - .float 0.0025 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_bomb.rodata.s b/data/overlays/effects/z_eff_ss_bomb.rodata.s deleted file mode 100644 index d013650f1b..0000000000 --- a/data/overlays/effects/z_eff_ss_bomb.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_8099F5A0 - .asciz "../z_eff_ss_bomb.c" - .balign 4 - -glabel D_8099F5B4 - .asciz "../z_eff_ss_bomb.c" - .balign 4 - -glabel D_8099F5C8 - .float 0.4 - .balign 4 - -glabel D_8099F5CC - .float 0.2 - .balign 4 - -glabel D_8099F5D0 - .float 0.4 - .balign 4 - -glabel D_8099F5D4 - .word 0x3E4CCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_bomb2.rodata.s b/data/overlays/effects/z_eff_ss_bomb2.rodata.s deleted file mode 100644 index 517da63a50..0000000000 --- a/data/overlays/effects/z_eff_ss_bomb2.rodata.s +++ /dev/null @@ -1,49 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_8099FF20 - .asciz "../z_eff_ss_bomb2.c" - .balign 4 - -glabel D_8099FF34 - .asciz "../z_eff_ss_bomb2.c" - .balign 4 - -glabel D_8099FF48 - .asciz "../z_eff_ss_bomb2.c" - .balign 4 - -glabel D_8099FF5C - .asciz "../z_eff_ss_bomb2.c" - .balign 4 - -glabel D_8099FF70 - .asciz "../z_eff_ss_bomb2.c" - .balign 4 - -glabel D_8099FF84 - .float 0.01 - .balign 4 - -glabel D_8099FF88 - .word 0x3F6CCCCD -glabel D_8099FF8C - .float 0.01 - .balign 4 - -glabel D_8099FF90 - .float 0.02 - .balign 4 - -glabel D_8099FF94 - .word 0x3E19999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_bubble.rodata.s b/data/overlays/effects/z_eff_ss_bubble.rodata.s deleted file mode 100644 index 75054a7a4a..0000000000 --- a/data/overlays/effects/z_eff_ss_bubble.rodata.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A04A0 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -glabel D_809A04B8 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -glabel D_809A04D0 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -glabel D_809A04E8 - .float 0.3 - .balign 4 - -glabel D_809A04EC - .float 0.2 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_d_fire.rodata.s b/data/overlays/effects/z_eff_ss_d_fire.rodata.s deleted file mode 100644 index b4305acaf7..0000000000 --- a/data/overlays/effects/z_eff_ss_d_fire.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A0A10 - .asciz "../z_eff_ss_d_fire.c" - .balign 4 - -glabel D_809A0A28 - .asciz "../z_eff_ss_d_fire.c" - .balign 4 - -glabel D_809A0A40 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_dead_db.rodata.s b/data/overlays/effects/z_eff_ss_dead_db.rodata.s deleted file mode 100644 index eed46bbe71..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_db.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A0F50 - .asciz "../z_eff_ss_dead_db.c" - .balign 4 - -glabel D_809A0F68 - .asciz "../z_eff_ss_dead_db.c" - .balign 4 - -glabel D_809A0F80 - .word 0x3C23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_dead_dd.rodata.s b/data/overlays/effects/z_eff_ss_dead_dd.rodata.s deleted file mode 100644 index 645921dd4c..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_dd.rodata.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A1550 - .asciz "Effect_SS_Dd_disp_mode():mode_swが変です。\n" - .balign 4 - -glabel D_809A157C - .asciz "../z_eff_ss_dead_dd.c" - .balign 4 - -glabel D_809A1594 - .asciz "../z_eff_ss_dead_dd.c" - .balign 4 - -glabel D_809A15AC - .float 0.01 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_dead_ds.rodata.s b/data/overlays/effects/z_eff_ss_dead_ds.rodata.s deleted file mode 100644 index 939c1df355..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_ds.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A1A80 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -glabel D_809A1A98 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -glabel D_809A1AB0 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -glabel D_809A1AC8 - .float 0.01 - .balign 4 - -glabel D_809A1ACC - .word 0x3FC8F5C3 - - diff --git a/data/overlays/effects/z_eff_ss_dead_sound.rodata.s b/data/overlays/effects/z_eff_ss_dead_sound.rodata.s deleted file mode 100644 index 4a0babbd80..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_sound.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A1C60 - .word 0xA5B3A5F3, 0xA5B9A5C8, 0xA5E9A5AF, 0xA5BFA1BC, 0x330A0000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s b/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s deleted file mode 100644 index 8738e69277..0000000000 --- a/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A2220 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -glabel D_809A2238 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -glabel D_809A2250 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -glabel D_809A2268 - .word 0x3B83126F, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_dust.rodata.s b/data/overlays/effects/z_eff_ss_dust.rodata.s deleted file mode 100644 index 6a370f565a..0000000000 --- a/data/overlays/effects/z_eff_ss_dust.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A2A70 - .asciz "../z_eff_ss_dust.c" - .balign 4 - -glabel D_809A2A84 - .asciz "../z_eff_ss_dust.c" - .balign 4 - -glabel D_809A2A98 - .float 0.0025 - .balign 4 - -glabel D_809A2A9C - .float 0.4 - .balign 4 - -glabel D_809A2AA0 - .float 0.2 - .balign 4 - -glabel D_809A2AA4 - .float 0.4 - .balign 4 - -glabel D_809A2AA8 - .float 0.2 - .balign 4 - -glabel D_809A2AAC - .float 0.4 - .balign 4 - -glabel D_809A2AB0 - .float 0.2 - .balign 4 - -glabel D_809A2AB4 - .float 0.4 - .balign 4 - -glabel D_809A2AB8 - .word 0x3E4CCCCD, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_en_fire.rodata.s b/data/overlays/effects/z_eff_ss_en_fire.rodata.s deleted file mode 100644 index 251a1c67de..0000000000 --- a/data/overlays/effects/z_eff_ss_en_fire.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A3260 - .asciz "../z_eff_en_fire.c" - .balign 4 - -glabel D_809A3274 - .asciz "../z_eff_en_fire.c" - .balign 4 - -glabel D_809A3288 - .asciz "../z_eff_en_fire.c" - .balign 4 - -glabel D_809A329C - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A32A0 - .word 0x3851B717 -glabel D_809A32A4 - .word 0x414B3333 -glabel D_809A32A8 - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A32AC - .float 9.58738019108e-05 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_en_ice.rodata.s b/data/overlays/effects/z_eff_ss_en_ice.rodata.s deleted file mode 100644 index fbf302ebec..0000000000 --- a/data/overlays/effects/z_eff_ss_en_ice.rodata.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A3BA0 - .asciz "Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n" - .balign 4 - -glabel D_809A3BD4 - .asciz "../z_eff_en_ice.c" - .balign 4 - -glabel D_809A3BE8 - .asciz "../z_eff_en_ice.c" - .balign 4 - -glabel D_809A3BFC - .asciz "../z_eff_en_ice.c" - .balign 4 - -glabel D_809A3C10 - .float 0.01 - .balign 4 - -glabel D_809A3C14 - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A3C18 - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A3C1C - .word 0x42B3999A -glabel D_809A3C20 - .word 0x477FFF00, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_extra.rodata.s b/data/overlays/effects/z_eff_ss_extra.rodata.s deleted file mode 100644 index c861de87cd..0000000000 --- a/data/overlays/effects/z_eff_ss_extra.rodata.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A4080 - .asciz "../z_eff_ss_extra.c" - .balign 4 - -glabel D_809A4094 - .asciz "../z_eff_ss_extra.c" - .balign 4 - -glabel D_809A40A8 - .asciz "../z_eff_ss_extra.c" - .balign 4 diff --git a/data/overlays/effects/z_eff_ss_fcircle.rodata.s b/data/overlays/effects/z_eff_ss_fcircle.rodata.s deleted file mode 100644 index 5a811f817f..0000000000 --- a/data/overlays/effects/z_eff_ss_fcircle.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A45A0 - .asciz "../z_eff_fcircle.c" - .balign 4 - -glabel D_809A45B4 - .asciz "../z_eff_fcircle.c" - .balign 4 - -glabel D_809A45C8 - .asciz "../z_eff_fcircle.c" - .balign 4 - -glabel D_809A45DC - .float 0.001 - .balign 4 - -glabel D_809A45E0 - .float 0.025 - .balign 4 - -glabel D_809A45E4 - .float 0.01 - .balign 4 - -glabel D_809A45E8 - .word 0x38C90FDB, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s b/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s deleted file mode 100644 index f5a3c63645..0000000000 --- a/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s +++ /dev/null @@ -1,55 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A5580 - .asciz "Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n" - .balign 4 - -glabel D_809A55AC - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A55C4 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A55DC - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A55F4 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A560C - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A5624 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A563C - .word 0x40490FF9 -glabel D_809A5640 - .word 0x3F921FF3 -glabel D_809A5644 - .word 0x40490FF9 -glabel D_809A5648 - .word 0x469C4000 -glabel D_809A564C - .word 0x469C4000 -glabel D_809A5650 - .word 0x418F3333 -glabel D_809A5654 - .word 0x41BF3333, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_fire_tail.rodata.s b/data/overlays/effects/z_eff_ss_fire_tail.rodata.s deleted file mode 100644 index 1e51fb8237..0000000000 --- a/data/overlays/effects/z_eff_ss_fire_tail.rodata.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A5DE0 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -glabel D_809A5DF8 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -glabel D_809A5E10 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -glabel D_809A5E28 - .float 0.1 - .balign 4 - -glabel D_809A5E2C - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A5E30 - .word 0x3C8EFA35 -glabel D_809A5E34 - .word 0x3727C5AD -glabel D_809A5E38 - .float 0.1 - .balign 4 - -glabel D_809A5E3C - .float 0.01 - .balign 4 - -glabel D_809A5E40 - .word 0x3F666666, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_g_magma2.rodata.s b/data/overlays/effects/z_eff_ss_g_magma2.rodata.s deleted file mode 100644 index 1332b2716c..0000000000 --- a/data/overlays/effects/z_eff_ss_g_magma2.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A68B0 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - -glabel D_809A68C8 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - -glabel D_809A68E0 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - diff --git a/data/overlays/effects/z_eff_ss_g_ripple.rodata.s b/data/overlays/effects/z_eff_ss_g_ripple.rodata.s deleted file mode 100644 index 08da7740b0..0000000000 --- a/data/overlays/effects/z_eff_ss_g_ripple.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A6EA0 - .asciz "../z_eff_ss_g_ripple.c" - .balign 4 - -glabel D_809A6EB8 - .asciz "../z_eff_ss_g_ripple.c" - .balign 4 - -glabel D_809A6ED0 - .word 0x3B23D70A, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_g_spk.rodata.s b/data/overlays/effects/z_eff_ss_g_spk.rodata.s deleted file mode 100644 index 631c4fa5dd..0000000000 --- a/data/overlays/effects/z_eff_ss_g_spk.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A74B0 - .asciz "../z_eff_ss_g_spk.c" - .balign 4 - -glabel D_809A74C4 - .asciz "../z_eff_ss_g_spk.c" - .balign 4 - -glabel D_809A74D8 - .word 0x3B23D70A, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_g_splash.rodata.s b/data/overlays/effects/z_eff_ss_g_splash.rodata.s deleted file mode 100644 index 88d8045924..0000000000 --- a/data/overlays/effects/z_eff_ss_g_splash.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A7980 - .word 0x3B03126F, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_hahen.rodata.s b/data/overlays/effects/z_eff_ss_hahen.rodata.s deleted file mode 100644 index da566d777a..0000000000 --- a/data/overlays/effects/z_eff_ss_hahen.rodata.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A8020 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8034 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8048 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A805C - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8070 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8084 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8098 - .float 0.001 - .balign 4 - -glabel D_809A809C - .float 0.01 - .balign 4 - -glabel D_809A80A0 - .float 0.01 - .balign 4 - -glabel D_809A80A4 - .float 0.001 - .balign 4 - -glabel D_809A80A8 - .float 0.01 - .balign 4 - -glabel D_809A80AC - .float 0.01 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_hitmark.rodata.s b/data/overlays/effects/z_eff_ss_hitmark.rodata.s deleted file mode 100644 index e162768549..0000000000 --- a/data/overlays/effects/z_eff_ss_hitmark.rodata.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A8670 - .asciz "../z_eff_ss_hitmark.c" - .balign 4 - -glabel D_809A8688 - .asciz "../z_eff_ss_hitmark.c" - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_ice_piece.rodata.s b/data/overlays/effects/z_eff_ss_ice_piece.rodata.s deleted file mode 100644 index 17719ba40f..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_piece.rodata.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A8B20 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -glabel D_809A8B38 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -glabel D_809A8B50 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -glabel D_809A8B68 - .float 0.01 - .balign 4 - -glabel D_809A8B6C - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A8B70 - .float 9.58738019108e-05 - .balign 4 - -glabel D_809A8B74 - .word 0x3F59999A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s b/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s deleted file mode 100644 index 565333b5d9..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A90C0 - .asciz "Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n" - .balign 4 - -glabel D_809A9100 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -glabel D_809A9118 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -glabel D_809A9130 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -glabel D_809A9148 - .word 0x38D1B717, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_k_fire.rodata.s b/data/overlays/effects/z_eff_ss_k_fire.rodata.s deleted file mode 100644 index e6cfe92b7e..0000000000 --- a/data/overlays/effects/z_eff_ss_k_fire.rodata.s +++ /dev/null @@ -1,31 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809A95D0 - .asciz "../z_eff_k_fire.c" - .balign 4 - -glabel D_809A95E4 - .asciz "../z_eff_k_fire.c" - .balign 4 - -glabel D_809A95F8 - .asciz "../z_eff_k_fire.c" - .balign 4 - -glabel D_809A960C - .float 10000.0 - .balign 4 - -glabel D_809A9610 - .word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_kakera.rodata.s b/data/overlays/effects/z_eff_ss_kakera.rodata.s deleted file mode 100644 index bcf1b7ec4c..0000000000 --- a/data/overlays/effects/z_eff_ss_kakera.rodata.s +++ /dev/null @@ -1,77 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809AA5C0 - .asciz "shape_modelがNULL\n" - .balign 4 - -glabel D_809AA5D4 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA5E8 - .asciz "範囲がマイナス！！(randomD_sectionUniformity)\n" - .balign 4 - -glabel D_809AA618 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA62C - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA640 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA654 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA668 - .word 0x46FFFE00 -glabel D_809AA66C - .word 0x46FFFE00 -glabel D_809AA670 - .float 0.01 - .balign 4 - -glabel D_809AA674 - .float 0.01 - .balign 4 - -glabel D_809AA678 - .float 0.01 - .balign 4 - -glabel D_809AA67C - .float 0.9 - .balign 4 - -glabel D_809AA680 - .float 0.2 - .balign 4 - -glabel D_809AA684 - .float -0.8 - .balign 4 - -glabel D_809AA688 - .float 0.9 - .balign 4 - -glabel D_809AA68C - .float 0.2 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_kirakira.rodata.s b/data/overlays/effects/z_eff_ss_kirakira.rodata.s deleted file mode 100644 index 76e70a27cc..0000000000 --- a/data/overlays/effects/z_eff_ss_kirakira.rodata.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809AAE10 - .asciz "../z_eff_ss_kirakira.c" - .balign 4 - -glabel D_809AAE28 - .asciz "../z_eff_ss_kirakira.c" - .balign 4 - -glabel D_809AAE40 - .float 10000.0 - .balign 4 - -glabel D_809AAE44 - .float 0.4 - .balign 4 - -glabel D_809AAE48 - .float 0.2 - .balign 4 - -glabel D_809AAE4C - .float 0.4 - .balign 4 - -glabel D_809AAE50 - .float 0.2 - .balign 4 - -glabel D_809AAE54 - .word 0x3F733333 -glabel D_809AAE58 - .float 0.2 - .balign 4 - -glabel D_809AAE5C - .float 0.2 - .balign 4 - - - diff --git a/data/overlays/effects/z_eff_ss_lightning.rodata.s b/data/overlays/effects/z_eff_ss_lightning.rodata.s deleted file mode 100644 index 834860b12c..0000000000 --- a/data/overlays/effects/z_eff_ss_lightning.rodata.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809AB560 - .asciz "../z_eff_ss_lightning.c" - .balign 4 - -glabel D_809AB578 - .asciz "../z_eff_ss_lightning.c" - .balign 4 - -glabel D_809AB590 - .float 0.01 - .balign 4 - -glabel D_809AB594 - .float 0.6 - .balign 4 - -glabel D_809AB598 - .word 0x45638000 -glabel D_809AB59C - .float 0.01 - .balign 4 - -glabel D_809AB5A0 - .word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_sibuki.rodata.s b/data/overlays/effects/z_eff_ss_sibuki.rodata.s deleted file mode 100644 index b15045a350..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki.rodata.s +++ /dev/null @@ -1,43 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809ABC90 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -glabel D_809ABCA8 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -glabel D_809ABCC0 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -glabel D_809ABCD8 - .float 0.01 - .balign 4 - -glabel D_809ABCDC - .float 0.01 - .balign 4 - -glabel D_809ABCE0 - .float 0.1 - .balign 4 - -glabel D_809ABCE4 - .float 0.1 - .balign 4 - -glabel D_809ABCE8 - .word 0x3DCCCCCD, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_sibuki2.rodata.s b/data/overlays/effects/z_eff_ss_sibuki2.rodata.s deleted file mode 100644 index 87f724feaf..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki2.rodata.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809AC090 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - -glabel D_809AC0A8 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - -glabel D_809AC0C0 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - diff --git a/data/overlays/effects/z_eff_ss_stick.rodata.s b/data/overlays/effects/z_eff_ss_stick.rodata.s deleted file mode 100644 index 2b22311573..0000000000 --- a/data/overlays/effects/z_eff_ss_stick.rodata.s +++ /dev/null @@ -1,35 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809AC640 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -glabel D_809AC654 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -glabel D_809AC668 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -glabel D_809AC67C - .float 0.01 - .balign 4 - -glabel D_809AC680 - .float 0.0025 - .balign 4 - -glabel D_809AC684 - .word 0x3C23D70A, 0x00000000, 0x00000000 - - diff --git a/data/overlays/effects/z_eff_ss_stone1.rodata.s b/data/overlays/effects/z_eff_ss_stone1.rodata.s deleted file mode 100644 index 845f15c4d3..0000000000 --- a/data/overlays/effects/z_eff_ss_stone1.rodata.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809ACA70 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -glabel D_809ACA88 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -glabel D_809ACAA0 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -glabel D_809ACAB8 - .word 0x44BB8000, 0x00000000 - - diff --git a/spec b/spec index d3d616a5f7..a30aa8341c 100644 --- a/spec +++ b/spec @@ -1736,7 +1736,6 @@ beginseg name "ovl_Effect_Ss_Blast" include "build/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.o" include "build/data/overlays/effects/z_eff_ss_blast.data.o" - include "build/data/overlays/effects/z_eff_ss_blast.rodata.o" include "build/data/overlays/effects/z_eff_ss_blast.reloc.o" endseg @@ -1744,7 +1743,6 @@ beginseg name "ovl_Effect_Ss_Bomb" include "build/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.o" include "build/data/overlays/effects/z_eff_ss_bomb.data.o" - include "build/data/overlays/effects/z_eff_ss_bomb.rodata.o" include "build/data/overlays/effects/z_eff_ss_bomb.reloc.o" endseg @@ -1752,7 +1750,6 @@ beginseg name "ovl_Effect_Ss_Bomb2" include "build/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.o" include "build/data/overlays/effects/z_eff_ss_bomb2.data.o" - include "build/data/overlays/effects/z_eff_ss_bomb2.rodata.o" include "build/data/overlays/effects/z_eff_ss_bomb2.reloc.o" endseg @@ -1760,7 +1757,6 @@ beginseg name "ovl_Effect_Ss_Bubble" include "build/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.o" include "build/data/overlays/effects/z_eff_ss_bubble.data.o" - include "build/data/overlays/effects/z_eff_ss_bubble.rodata.o" include "build/data/overlays/effects/z_eff_ss_bubble.reloc.o" endseg @@ -1768,7 +1764,6 @@ beginseg name "ovl_Effect_Ss_D_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.o" include "build/data/overlays/effects/z_eff_ss_d_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_d_fire.rodata.o" include "build/data/overlays/effects/z_eff_ss_d_fire.reloc.o" endseg @@ -1776,7 +1771,6 @@ beginseg name "ovl_Effect_Ss_Dead_Db" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.o" include "build/data/overlays/effects/z_eff_ss_dead_db.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_db.rodata.o" include "build/data/overlays/effects/z_eff_ss_dead_db.reloc.o" endseg @@ -1784,7 +1778,6 @@ beginseg name "ovl_Effect_Ss_Dead_Dd" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.o" include "build/data/overlays/effects/z_eff_ss_dead_dd.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_dd.rodata.o" include "build/data/overlays/effects/z_eff_ss_dead_dd.reloc.o" endseg @@ -1792,7 +1785,6 @@ beginseg name "ovl_Effect_Ss_Dead_Ds" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.o" include "build/data/overlays/effects/z_eff_ss_dead_ds.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_ds.rodata.o" include "build/data/overlays/effects/z_eff_ss_dead_ds.reloc.o" endseg @@ -1800,7 +1792,6 @@ beginseg name "ovl_Effect_Ss_Dead_Sound" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.o" include "build/data/overlays/effects/z_eff_ss_dead_sound.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_sound.rodata.o" include "build/data/overlays/effects/z_eff_ss_dead_sound.reloc.o" endseg @@ -1808,7 +1799,6 @@ beginseg name "ovl_Effect_Ss_Dt_Bubble" include "build/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.o" include "build/data/overlays/effects/z_eff_ss_dt_bubble.data.o" - include "build/data/overlays/effects/z_eff_ss_dt_bubble.rodata.o" include "build/data/overlays/effects/z_eff_ss_dt_bubble.reloc.o" endseg @@ -1816,7 +1806,6 @@ beginseg name "ovl_Effect_Ss_Dust" include "build/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.o" include "build/data/overlays/effects/z_eff_ss_dust.data.o" - include "build/data/overlays/effects/z_eff_ss_dust.rodata.o" include "build/data/overlays/effects/z_eff_ss_dust.reloc.o" endseg @@ -1824,7 +1813,6 @@ beginseg name "ovl_Effect_Ss_En_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.o" include "build/data/overlays/effects/z_eff_ss_en_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_en_fire.rodata.o" include "build/data/overlays/effects/z_eff_ss_en_fire.reloc.o" endseg @@ -1832,7 +1820,6 @@ beginseg name "ovl_Effect_Ss_En_Ice" include "build/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.o" include "build/data/overlays/effects/z_eff_ss_en_ice.data.o" - include "build/data/overlays/effects/z_eff_ss_en_ice.rodata.o" include "build/data/overlays/effects/z_eff_ss_en_ice.reloc.o" endseg @@ -1840,7 +1827,6 @@ beginseg name "ovl_Effect_Ss_Extra" include "build/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.o" include "build/data/overlays/effects/z_eff_ss_extra.data.o" - include "build/data/overlays/effects/z_eff_ss_extra.rodata.o" include "build/data/overlays/effects/z_eff_ss_extra.reloc.o" endseg @@ -1848,7 +1834,6 @@ beginseg name "ovl_Effect_Ss_Fcircle" include "build/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.o" include "build/data/overlays/effects/z_eff_ss_fcircle.data.o" - include "build/data/overlays/effects/z_eff_ss_fcircle.rodata.o" include "build/data/overlays/effects/z_eff_ss_fcircle.reloc.o" endseg @@ -1856,7 +1841,6 @@ beginseg name "ovl_Effect_Ss_Fhg_Flash" include "build/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.o" include "build/data/overlays/effects/z_eff_ss_fhg_flash.data.o" - include "build/data/overlays/effects/z_eff_ss_fhg_flash.rodata.o" include "build/data/overlays/effects/z_eff_ss_fhg_flash.reloc.o" endseg @@ -1864,7 +1848,6 @@ beginseg name "ovl_Effect_Ss_Fire_Tail" include "build/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.o" include "build/data/overlays/effects/z_eff_ss_fire_tail.data.o" - include "build/data/overlays/effects/z_eff_ss_fire_tail.rodata.o" include "build/data/overlays/effects/z_eff_ss_fire_tail.reloc.o" endseg @@ -1886,7 +1869,6 @@ beginseg name "ovl_Effect_Ss_G_Magma2" include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.o" include "build/data/overlays/effects/z_eff_ss_g_magma2.data.o" - include "build/data/overlays/effects/z_eff_ss_g_magma2.rodata.o" include "build/data/overlays/effects/z_eff_ss_g_magma2.reloc.o" endseg @@ -1894,7 +1876,6 @@ beginseg name "ovl_Effect_Ss_G_Ripple" include "build/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.o" include "build/data/overlays/effects/z_eff_ss_g_ripple.data.o" - include "build/data/overlays/effects/z_eff_ss_g_ripple.rodata.o" include "build/data/overlays/effects/z_eff_ss_g_ripple.reloc.o" endseg @@ -1902,7 +1883,6 @@ beginseg name "ovl_Effect_Ss_G_Spk" include "build/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.o" include "build/data/overlays/effects/z_eff_ss_g_spk.data.o" - include "build/data/overlays/effects/z_eff_ss_g_spk.rodata.o" include "build/data/overlays/effects/z_eff_ss_g_spk.reloc.o" endseg @@ -1910,7 +1890,6 @@ beginseg name "ovl_Effect_Ss_G_Splash" include "build/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.o" include "build/data/overlays/effects/z_eff_ss_g_splash.data.o" - include "build/data/overlays/effects/z_eff_ss_g_splash.rodata.o" include "build/data/overlays/effects/z_eff_ss_g_splash.reloc.o" endseg @@ -1918,7 +1897,6 @@ beginseg name "ovl_Effect_Ss_Hahen" include "build/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.o" include "build/data/overlays/effects/z_eff_ss_hahen.data.o" - include "build/data/overlays/effects/z_eff_ss_hahen.rodata.o" include "build/data/overlays/effects/z_eff_ss_hahen.reloc.o" endseg @@ -1926,7 +1904,6 @@ beginseg name "ovl_Effect_Ss_HitMark" include "build/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.o" include "build/data/overlays/effects/z_eff_ss_hitmark.data.o" - include "build/data/overlays/effects/z_eff_ss_hitmark.rodata.o" include "build/data/overlays/effects/z_eff_ss_hitmark.reloc.o" endseg @@ -1934,7 +1911,6 @@ beginseg name "ovl_Effect_Ss_Ice_Piece" include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.o" include "build/data/overlays/effects/z_eff_ss_ice_piece.data.o" - include "build/data/overlays/effects/z_eff_ss_ice_piece.rodata.o" include "build/data/overlays/effects/z_eff_ss_ice_piece.reloc.o" endseg @@ -1942,7 +1918,6 @@ beginseg name "ovl_Effect_Ss_Ice_Smoke" include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.o" include "build/data/overlays/effects/z_eff_ss_ice_smoke.data.o" - include "build/data/overlays/effects/z_eff_ss_ice_smoke.rodata.o" include "build/data/overlays/effects/z_eff_ss_ice_smoke.reloc.o" endseg @@ -1950,7 +1925,6 @@ beginseg name "ovl_Effect_Ss_K_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.o" include "build/data/overlays/effects/z_eff_ss_k_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_k_fire.rodata.o" include "build/data/overlays/effects/z_eff_ss_k_fire.reloc.o" endseg @@ -1958,7 +1932,6 @@ beginseg name "ovl_Effect_Ss_Kakera" include "build/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.o" include "build/data/overlays/effects/z_eff_ss_kakera.data.o" - include "build/data/overlays/effects/z_eff_ss_kakera.rodata.o" include "build/data/overlays/effects/z_eff_ss_kakera.reloc.o" endseg @@ -1966,7 +1939,6 @@ beginseg name "ovl_Effect_Ss_KiraKira" include "build/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.o" include "build/data/overlays/effects/z_eff_ss_kirakira.data.o" - include "build/data/overlays/effects/z_eff_ss_kirakira.rodata.o" include "build/data/overlays/effects/z_eff_ss_kirakira.reloc.o" endseg @@ -1974,7 +1946,6 @@ beginseg name "ovl_Effect_Ss_Lightning" include "build/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.o" include "build/data/overlays/effects/z_eff_ss_lightning.data.o" - include "build/data/overlays/effects/z_eff_ss_lightning.rodata.o" include "build/data/overlays/effects/z_eff_ss_lightning.reloc.o" endseg @@ -1982,7 +1953,6 @@ beginseg name "ovl_Effect_Ss_Sibuki" include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.o" include "build/data/overlays/effects/z_eff_ss_sibuki.data.o" - include "build/data/overlays/effects/z_eff_ss_sibuki.rodata.o" include "build/data/overlays/effects/z_eff_ss_sibuki.reloc.o" endseg @@ -1990,7 +1960,6 @@ beginseg name "ovl_Effect_Ss_Sibuki2" include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.o" include "build/data/overlays/effects/z_eff_ss_sibuki2.data.o" - include "build/data/overlays/effects/z_eff_ss_sibuki2.rodata.o" include "build/data/overlays/effects/z_eff_ss_sibuki2.reloc.o" endseg @@ -2004,7 +1973,6 @@ beginseg name "ovl_Effect_Ss_Stick" include "build/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.o" include "build/data/overlays/effects/z_eff_ss_stick.data.o" - include "build/data/overlays/effects/z_eff_ss_stick.rodata.o" include "build/data/overlays/effects/z_eff_ss_stick.reloc.o" endseg @@ -2012,7 +1980,6 @@ beginseg name "ovl_Effect_Ss_Stone1" include "build/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.o" include "build/data/overlays/effects/z_eff_ss_stone1.data.o" - include "build/data/overlays/effects/z_eff_ss_stone1.rodata.o" include "build/data/overlays/effects/z_eff_ss_stone1.reloc.o" endseg diff --git a/tools/decompile_data.py b/tools/decompile_data.py index 7fdc0cc231..01b2e05197 100755 --- a/tools/decompile_data.py +++ b/tools/decompile_data.py @@ -114,4 +114,4 @@ def main(): i += 1 -#main() +main() diff --git a/tools/migrate-rodata.py b/tools/migrate-rodata.py index ab63785e1c..74e5b1fa7c 100644 --- a/tools/migrate-rodata.py +++ b/tools/migrate-rodata.py @@ -166,6 +166,7 @@ def modify_spec(filenames, identifier, delete): changed = False files = filenames.split(",") for filename in files: + eff_filename = filename.lower().replace("effect_", "eff_") if identifier == "code" and " include \"build/data/" + filename + ".rodata.o\"" in lines: e = lines.index(" include \"build/data/" + filename + ".rodata.o\"") if delete: @@ -173,12 +174,12 @@ def modify_spec(filenames, identifier, delete): else: lines[e] = " //include \"build/data/" + filename + ".rodata.o\"" changed = True - elif " include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"" in lines: - e = lines.index(" include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"") + elif " include \"build/data/overlays/" + identifier + "/z_" + eff_filename + ".rodata.o\"" in lines: + e = lines.index(" include \"build/data/overlays/" + identifier + "/z_" + eff_filename + ".rodata.o\"") if delete: del lines[e] else: - lines[e] = " //include \"build/data/overlays/" + identifier + "/z_" + filename.lower() + ".rodata.o\"" + lines[e] = " //include \"build/data/overlays/" + identifier + "/z_" + eff_filename + ".rodata.o\"" changed = True if changed: modified = "\n".join(lines) @@ -198,6 +199,7 @@ def process_file(filename, identifier, delete_rodata): rodata_path = "data" + sep + (sep if identifier=="code" else "overlays" + sep + identifier.lower() + sep + "z_") + filename.lower() + ".rodata.s" if filename == "player": folder_path = "asm" + sep + "non_matchings" + sep + "overlays" + sep + "actors" + sep + "ovl_player_actor" + sep + rodata_path = rodata_path.replace("effect_", "eff_") print("ASM at: " + folder_path) print("Data at: " + rodata_path) if not exists(folder_path): @@ -291,14 +293,11 @@ Enter 'q' to the code or overlay question to quit.""") #run(False) #bigs = ["Boss_Ganon", "Boss_Ganondrof","En_Wf", "Door_Warp1",] -ovls = ["En_Elf"] +#ovls = ["En_Elf"] +effects = [x[0] for x in os.walk("src/overlays/effects")][1:] -for i, ovl in enumerate(ovls): - if i == 10: - break - process_files(ovl, "actors", "Delete", True) - command = "echo >> src/overlays/actors/ovl_" + ovls[i] + "/z_" + ovls[i].lower() + ".c" - if ovls[0] == "player": - command = "echo >> src/overlays/actors/ovl_player_actor/z_player.c" - os.system(command) # purpose of this is to "modify" each C file in order to prevent undefined symbol errors. - # the new line will be removed by format.sh \ No newline at end of file +for i, ovl in enumerate(effects): + process_files(ovl.split("/")[-1][4:], "effects", "Delete", True) + # command = "echo >> src/overlays/effects/ovl_" + effects[i] + "/z_" + effects[i].lower() + ".c" + # os.system(command) # purpose of this is to "modify" each C file in order to prevent undefined symbol errors. + # # the new line will be removed by format.sh \ No newline at end of file