Decompile most effect files in "code" (#144)

- `z_effect`: Matched and essentially all documented. - `z_eff_spark.c`: Decompiled (1 non matching left) and mostly documented. - `z_eff_shield_particle.c`: Matched and mostly documented. - `z_eff_blure.c`: Decompiled (5 non matchings left) and partially documented. - `z_effect_soft_sprite.c`: Matched and mostly documented. - `z_eff_ss_dead.c`: Matched but not documented. - `z_effect_soft_sprite_dlftbls.c`: "Matched" (only data, contains the effect ss overlay table). - `z_effect_soft_sprite_old_init.c`: Not decompiled, but functions are categorized by effect ss overlay. And they should be decompiled at the same time as their corresponding effect ss in the future. Other changes: - Added a lot of types/enums to `z64effect.h`and moved+renamed some structs from `z64.h` to this header - Added effect ss overlay segments to `segment_symbols.h` and effect ss init vars to `initvars.h` - Added a macro called `VTX_T` to generate a `Vtx_t` in the same style as `VTX` - Fixed `flg_set.c` .bss to be in the right file - Removed `tools/overlayhelpers/batchdisasm` since it's no longer relevant - Removed unused leftover asm from recent PRs
2025-07-02 22:14:33 +00:00 · 2020-05-18 20:24:00 +02:00 · 2020-05-18 20:24:00 +02:00 · e29b77919b
commit e29b77919b
parent 785011c33c
227 changed files with 3739 additions and 8132 deletions
--- a/data/overlays/effects/z_eff_ss_blast.data.s
+++ b/data/overlays/effects/z_eff_ss_blast.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Blast_InitVars
 .word 0x00000004
 .word func_8099EDB0
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_bomb.data.s
+++ b/data/overlays/effects/z_eff_ss_bomb.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Bomb_InitVars
 .word 0x00000002
 .word func_8099F1B0
 glabel D_8099F588
--- a/data/overlays/effects/z_eff_ss_bomb2.data.s
+++ b/data/overlays/effects/z_eff_ss_bomb2.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Bomb2_InitVars
 .word 0x00000003
 .word func_8099F650
 glabel D_8099FED8
--- a/data/overlays/effects/z_eff_ss_bubble.data.s
+++ b/data/overlays/effects/z_eff_ss_bubble.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Bubble_InitVars
 .word 0x00000007
 .word func_809A0040
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_d_fire.data.s
+++ b/data/overlays/effects/z_eff_ss_d_fire.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_D_Fire_InitVars
 .word 0x00000006
 .word func_809A0550
 glabel D_809A09F8
--- a/data/overlays/effects/z_eff_ss_dead_db.data.s
+++ b/data/overlays/effects/z_eff_ss_dead_db.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Dead_Db_InitVars
 .word 0x00000020
 .word func_809A0AA0
 glabel D_809A0F28
--- a/data/overlays/effects/z_eff_ss_dead_dd.data.s
+++ b/data/overlays/effects/z_eff_ss_dead_dd.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Dead_Dd_InitVars
 .word 0x00000021
 .word func_809A0FE0
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_dead_ds.data.s
+++ b/data/overlays/effects/z_eff_ss_dead_ds.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Dead_Ds_InitVars
 .word 0x00000022
 .word func_809A1610
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_dead_sound.data.s
+++ b/data/overlays/effects/z_eff_ss_dead_sound.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Dead_Sound_InitVars
 .word 0x00000023
 .word func_809A1B30
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_dt_bubble.data.s
+++ b/data/overlays/effects/z_eff_ss_dt_bubble.data.s
@ -10,6 +10,8 @@
 glabel D_809A2200
 .word 0xFFFF64FF, 0x96FFFFFF, 0x64FFFFFF
 glabel D_809A220C
- .word 0xAA0000FF, 0x006400FF, 0x0000FFFF, 0x0000000E
+ .word 0xAA0000FF, 0x006400FF, 0x0000FFFF
+glabel Effect_Ss_Dt_Bubble_InitVars
+.word 0x0000000E
 .word func_809A1CB0

--- a/data/overlays/effects/z_eff_ss_dust.data.s
+++ b/data/overlays/effects/z_eff_ss_dust.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Dust_InitVars
 .word 0x00000000
 .word func_809A22D0
 glabel D_809A2A48
--- a/data/overlays/effects/z_eff_ss_en_fire.data.s
+++ b/data/overlays/effects/z_eff_ss_en_fire.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_En_Fire_InitVars
 .word 0x0000001D
 .word func_809A2B60
 glabel D_809A3248
--- a/data/overlays/effects/z_eff_ss_en_ice.data.s
+++ b/data/overlays/effects/z_eff_ss_en_ice.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_En_Ice_InitVars
 .word 0x0000001B
 .word func_809A3330
 glabel D_809A3B88
--- a/data/overlays/effects/z_eff_ss_extra.data.s
+++ b/data/overlays/effects/z_eff_ss_extra.data.s
@ -8,7 +8,9 @@
 .section .data

 glabel D_809A4060
- .word 0x001E003C, 0x00640000, 0x0000001E
+ .word 0x001E003C, 0x00640000
+glabel Effect_Ss_Extra_InitVars
+.word 0x0000001E
 .word func_809A3CC0
 glabel D_809A4070
 .word 0x06000000, 0x06000480, 0x06000900, 0x00000000
--- a/data/overlays/effects/z_eff_ss_fcircle.data.s
+++ b/data/overlays/effects/z_eff_ss_fcircle.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Fcircle_InitVars
 .word 0x0000001F
 .word func_809A4120
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_fhg_flash.data.s
+++ b/data/overlays/effects/z_eff_ss_fhg_flash.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Fhg_Flash_InitVars
 .word 0x00000016
 .word func_809A4660
 glabel D_809A5088
--- a/data/overlays/effects/z_eff_ss_fire_tail.data.s
+++ b/data/overlays/effects/z_eff_ss_fire_tail.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Fire_Tail_InitVars
 .word 0x0000001C
 .word func_809A5740
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_g_fire.data.s
+++ b/data/overlays/effects/z_eff_ss_g_fire.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_G_Fire_InitVars
 .word 0x0000000C
 .word func_809A5ED0
 glabel D_809A60D8
--- a/data/overlays/effects/z_eff_ss_g_magma.data.s
+++ b/data/overlays/effects/z_eff_ss_g_magma.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_G_Magma_InitVars
 .word 0x0000000B
 .word func_809A6150
 glabel D_809A6328
--- a/data/overlays/effects/z_eff_ss_g_magma2.data.s
+++ b/data/overlays/effects/z_eff_ss_g_magma2.data.s
@ -8,7 +8,9 @@
 .section .data

 glabel D_809A6860
- .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x00000013
+ .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0
+glabel Effect_Ss_G_Magma2_InitVars
+.word 0x00000013
 .word func_809A63A0
 glabel D_809A689C
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_g_ripple.data.s
+++ b/data/overlays/effects/z_eff_ss_g_ripple.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_G_Ripple_InitVars
 .word 0x00000009
 .word func_809A6960
 glabel D_809A6E88
--- a/data/overlays/effects/z_eff_ss_g_spk.data.s
+++ b/data/overlays/effects/z_eff_ss_g_spk.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_G_Spk_InitVars
 .word 0x00000005
 .word func_809A6F30
 glabel D_809A7498
--- a/data/overlays/effects/z_eff_ss_g_splash.data.s
+++ b/data/overlays/effects/z_eff_ss_g_splash.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_G_Splash_InitVars
 .word 0x0000000A
 .word func_809A7540
 glabel D_809A7948
--- a/data/overlays/effects/z_eff_ss_hahen.data.s
+++ b/data/overlays/effects/z_eff_ss_hahen.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Hahen_InitVars
 .word 0x0000000F
 .word func_809A7A60
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_hitmark.data.s
+++ b/data/overlays/effects/z_eff_ss_hitmark.data.s
@ -10,7 +10,9 @@
 glabel D_809A85B0
 .word 0xFFFFFFFF, 0xFF00FFFF, 0xFFFF0000, 0xFFC864C8, 0x96009664, 0x00643200, 0xFFFFFFFF, 0x0000FFFF, 0x00FF0000, 0xFFFFFF00, 0xFFC8FFFF, 0xFF9600FF
 glabel D_809A85E0
- .word 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, 0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0, 0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0, 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, 0x00000015
+ .word 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, 0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0, 0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0, 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0
+glabel Effect_Ss_HitMark_InitVars
+.word 0x00000015
 .word func_809A8150
 .word 0x00000000, 0x00000000

--- a/data/overlays/effects/z_eff_ss_ice_piece.data.s
+++ b/data/overlays/effects/z_eff_ss_ice_piece.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Ice_Piece_InitVars
 .word 0x0000001A
 .word func_809A8700
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_ice_smoke.data.s
+++ b/data/overlays/effects/z_eff_ss_ice_smoke.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Ice_Smoke_InitVars
 .word 0x00000024
 .word func_809A8BF0
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_k_fire.data.s
+++ b/data/overlays/effects/z_eff_ss_k_fire.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_K_Fire_InitVars
 .word 0x00000017
 .word func_809A91B0
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_kakera.data.s
+++ b/data/overlays/effects/z_eff_ss_kakera.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Kakera_InitVars
 .word 0x00000019
 .word func_809A9680
 glabel D_809AA528
--- a/data/overlays/effects/z_eff_ss_kirakira.data.s
+++ b/data/overlays/effects/z_eff_ss_kirakira.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_KiraKira_InitVars
 .word 0x00000001
 .word func_809AA810
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_lightning.data.s
+++ b/data/overlays/effects/z_eff_ss_lightning.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Lightning_InitVars
 .word 0x0000000D
 .word func_809AAEF0
 glabel D_809AB538
--- a/data/overlays/effects/z_eff_ss_sibuki.data.s
+++ b/data/overlays/effects/z_eff_ss_sibuki.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Sibuki_InitVars
 .word 0x00000011
 .word func_809AB630
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_sibuki2.data.s
+++ b/data/overlays/effects/z_eff_ss_sibuki2.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Sibuki2_InitVars
 .word 0x00000012
 .word func_809ABD60
 glabel D_809AC068
--- a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s
+++ b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Solder_Srch_Ball_InitVars
 .word 0x00000018
 .word func_809AC130
 .word 0x00000000, 0x00000000
--- a/data/overlays/effects/z_eff_ss_stick.data.s
+++ b/data/overlays/effects/z_eff_ss_stick.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Stick_InitVars
 .word 0x00000010
 .word func_809AC2D0
 glabel D_809AC628
--- a/data/overlays/effects/z_eff_ss_stone1.data.s
+++ b/data/overlays/effects/z_eff_ss_stone1.data.s
@ -7,6 +7,7 @@

 .section .data

+glabel Effect_Ss_Stone1_InitVars
 .word 0x00000014
 .word func_809AC700
 glabel D_809ACA08