mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-23 09:19:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- `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
This commit is contained in:
Roman971
2020-05-18 20:24:00 +02:00
committed by GitHub
parent 785011c33c
commit e29b77919b
227 changed files with 3739 additions and 8132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/z_eff_shield_particle.data.s → data/flg_set.bss.s
+3 -3
View File
@@ -5,7 +5,7 @@
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
.section .bss
glabel D_80115810
.incbin "baserom.z64", 0xB8C9B0, 0x50
glabel D_8015BB90
.space 0x10
data/overlays/actors/z_en_floormas.data.s
-32
View File
@@ -1,32 +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 purposee registers
.section .data
glabel En_Floormas_InitVars
.word 0x008E0500, 0x00000405, 0x000B0000, 0x00000314
.word EnFloormas_Init
.word EnFloormas_Destroy
.word EnFloormas_Update
.word EnFloormas_Draw
glabel D_80A1A470
.word 0x00110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x04100000, 0xFFCFFFFF, 0x00000000, 0x09050100, 0x00190028, 0x00000000, 0x00000000
glabel D_80A1A49C
.word 0x0400001E, 0x00289600
glabel D_80A1A4A4
.word 0x10020102, 0x10020210, 0x01020424, 0x02440402, 0x02240044, 0x00000104, 0x02020804, 0x00000400
glabel D_80A1A4C4
.word 0x89170031, 0xB04C157C, 0x386CFC18
glabel D_80A1A4D0
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A1A4DC
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A1A4E8
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A1A4F4
.word 0x00FF0000, 0x00000000, 0x00000000
data/overlays/actors/z_en_floormas.reloc.s
-11
View File
@@ -1,11 +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 purposee registers
.section .rodata
glabel D_80A1A5D0
.incbin "baserom/ovl_En_Floormas", 0x30C0, 0x000003D0
data/overlays/actors/z_en_heishi3.reloc.s
-11
View File
@@ -1,11 +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 purposee registers
.section .rodata
glabel D_80A56020
.incbin "baserom/ovl_En_Heishi3", 0x9E0, 0x000000B0
data/overlays/effects/z_eff_ss_blast.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Blast_InitVars
.word 0x00000004
.word func_8099EDB0
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_bomb.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Bomb_InitVars
.word 0x00000002
.word func_8099F1B0
glabel D_8099F588
data/overlays/effects/z_eff_ss_bomb2.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Bomb2_InitVars
.word 0x00000003
.word func_8099F650
glabel D_8099FED8
data/overlays/effects/z_eff_ss_bubble.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Bubble_InitVars
.word 0x00000007
.word func_809A0040
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_d_fire.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_D_Fire_InitVars
.word 0x00000006
.word func_809A0550
glabel D_809A09F8
data/overlays/effects/z_eff_ss_dead_db.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Dead_Db_InitVars
.word 0x00000020
.word func_809A0AA0
glabel D_809A0F28
data/overlays/effects/z_eff_ss_dead_dd.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Dead_Dd_InitVars
.word 0x00000021
.word func_809A0FE0
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_dead_ds.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Dead_Ds_InitVars
.word 0x00000022
.word func_809A1610
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_dead_sound.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Dead_Sound_InitVars
.word 0x00000023
.word func_809A1B30
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_dt_bubble.data.s
+3 -1
View File
@@ -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
data/overlays/effects/z_eff_ss_dust.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Dust_InitVars
.word 0x00000000
.word func_809A22D0
glabel D_809A2A48
data/overlays/effects/z_eff_ss_en_fire.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_En_Fire_InitVars
.word 0x0000001D
.word func_809A2B60
glabel D_809A3248
data/overlays/effects/z_eff_ss_en_ice.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_En_Ice_InitVars
.word 0x0000001B
.word func_809A3330
glabel D_809A3B88
data/overlays/effects/z_eff_ss_extra.data.s
+3 -1
View File
@@ -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
data/overlays/effects/z_eff_ss_fcircle.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Fcircle_InitVars
.word 0x0000001F
.word func_809A4120
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_fhg_flash.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Fhg_Flash_InitVars
.word 0x00000016
.word func_809A4660
glabel D_809A5088
data/overlays/effects/z_eff_ss_fire_tail.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Fire_Tail_InitVars
.word 0x0000001C
.word func_809A5740
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_g_fire.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_G_Fire_InitVars
.word 0x0000000C
.word func_809A5ED0
glabel D_809A60D8
data/overlays/effects/z_eff_ss_g_magma.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_G_Magma_InitVars
.word 0x0000000B
.word func_809A6150
glabel D_809A6328
data/overlays/effects/z_eff_ss_g_magma2.data.s
+3 -1
View File
@@ -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
data/overlays/effects/z_eff_ss_g_ripple.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_G_Ripple_InitVars
.word 0x00000009
.word func_809A6960
glabel D_809A6E88
data/overlays/effects/z_eff_ss_g_spk.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_G_Spk_InitVars
.word 0x00000005
.word func_809A6F30
glabel D_809A7498
data/overlays/effects/z_eff_ss_g_splash.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_G_Splash_InitVars
.word 0x0000000A
.word func_809A7540
glabel D_809A7948
data/overlays/effects/z_eff_ss_hahen.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Hahen_InitVars
.word 0x0000000F
.word func_809A7A60
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_hitmark.data.s
+3 -1
View File
@@ -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
data/overlays/effects/z_eff_ss_ice_piece.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Ice_Piece_InitVars
.word 0x0000001A
.word func_809A8700
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_ice_smoke.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Ice_Smoke_InitVars
.word 0x00000024
.word func_809A8BF0
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_k_fire.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_K_Fire_InitVars
.word 0x00000017
.word func_809A91B0
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_kakera.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Kakera_InitVars
.word 0x00000019
.word func_809A9680
glabel D_809AA528
data/overlays/effects/z_eff_ss_kirakira.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_KiraKira_InitVars
.word 0x00000001
.word func_809AA810
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_lightning.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Lightning_InitVars
.word 0x0000000D
.word func_809AAEF0
glabel D_809AB538
data/overlays/effects/z_eff_ss_sibuki.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Sibuki_InitVars
.word 0x00000011
.word func_809AB630
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_sibuki2.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Sibuki2_InitVars
.word 0x00000012
.word func_809ABD60
glabel D_809AC068
data/overlays/effects/z_eff_ss_solder_srch_ball.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Solder_Srch_Ball_InitVars
.word 0x00000018
.word func_809AC130
.word 0x00000000, 0x00000000
data/overlays/effects/z_eff_ss_stick.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Stick_InitVars
.word 0x00000010
.word func_809AC2D0
glabel D_809AC628
data/overlays/effects/z_eff_ss_stone1.data.s
+1
View File
@@ -7,6 +7,7 @@
.section .data
glabel Effect_Ss_Stone1_InitVars
.word 0x00000014
.word func_809AC700
glabel D_809ACA08
data/z_eff_blure.data.s
-41
View File
@@ -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 purposee registers
.section .data
glabel D_80115760
.incbin "baserom.z64", 0xB8C900, 0x10
glabel D_80115770
.incbin "baserom.z64", 0xB8C910, 0x10
glabel D_80115780
.incbin "baserom.z64", 0xB8C920, 0xC
glabel D_8011578C
.incbin "baserom.z64", 0xB8C92C, 0x10
glabel D_8011579C
.incbin "baserom.z64", 0xB8C93C, 0x10
glabel D_801157AC
.incbin "baserom.z64", 0xB8C94C, 0x10
glabel D_801157BC
.incbin "baserom.z64", 0xB8C95C, 0x10
glabel D_801157CC
.incbin "baserom.z64", 0xB8C96C, 0x10
glabel D_801157DC
.incbin "baserom.z64", 0xB8C97C, 0x10
glabel D_801157EC
.incbin "baserom.z64", 0xB8C98C, 0x10
glabel D_801157FC
.incbin "baserom.z64", 0xB8C99C, 0x14
data/z_effect.bss.s
-47
View File
@@ -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 purposee registers
.section .bss
glabel D_80157DA0
.space 0x4
glabel D_80157DA4
.space 0x4
glabel D_80157DA8
.space 0x55C
glabel D_80158304
.space 0x8F4
glabel D_80158BF8
.space 0x4
glabel D_80158BFC
.space 0x4
glabel D_80158C00
.space 0x50C
glabel D_8015910C
.space 0x16C4
glabel D_8015A7D0
.space 0xE5C
glabel D_8015B62C
.space 0x4
glabel D_8015B630
.space 0x560
glabel D_8015BB90
.space 0x4
glabel D_8015BB94
.space 0xC
data/z_effect.data.s
-23
View File
@@ -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 purposee registers
.section .data
glabel D_80115860
.incbin "baserom.z64", 0xB8CA00, 0x4
glabel D_80115864
.incbin "baserom.z64", 0xB8CA04, 0x4
glabel D_80115868
.incbin "baserom.z64", 0xB8CA08, 0x14
glabel D_8011587C
.incbin "baserom.z64", 0xB8CA1C, 0x28
glabel D_801158A4
.incbin "baserom.z64", 0xB8CA44, 0xC
data/z_effect_soft_sprite.data.s → data/z_effect_soft_sprite_old_init.data.s
-16
View File
@@ -7,15 +7,6 @@
.section .data
glabel EffectSS2Info
.incbin "baserom.z64", 0xB8CA50, 0x4
glabel D_801158B4
.incbin "baserom.z64", 0xB8CA54, 0x4
glabel D_801158B8
.incbin "baserom.z64", 0xB8CA58, 0x8
glabel D_801158C0
.incbin "baserom.z64", 0xB8CA60, 0xC
@@ -88,11 +79,4 @@ glabel D_801159A9
glabel D_801159AA
.incbin "baserom.z64", 0xB8CB4A, 0x6
glabel sParticleOverlayTable
.incbin "baserom.z64", 0xB8CB50, 0x10
glabel D_801159C0
.incbin "baserom.z64", 0xB8CB60, 0xC
glabel D_801159CC
.incbin "baserom.z64", 0xB8CB6C, 0x3F4