mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Big actor cleanup (fixed) (#69)

Browse source 
* Started doing cleanup

* did more work

* did more migration

* migrated more rodata and worked on some structs

* did more work

* Removal of ROOM field from initvars, some rodata migration, some string decompilation

* General update

* Decompiled vt strings

* Tool work

* Tool improvements

* 270 overlay rodata files remaining

* better float handling

* floats

* Many more floats

* migrated boss_mo

* assorted fixes

* Migrated 10

* tool improvements

* migrated 10

* 10 more

* 1 more

* did a few more

* fixes

* 10 more

* more floats

* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.

* removed changes made to script by accident

* migrated largest rodata - ovl_fishing

* Did some more

* 114 remaining

* 99 left !

* almost done migrating rodata

* did some more, done for tonight

* almost done, tried add support to the script for z_player

* All possible rodata migrated in actor overlays

* update

* removed static from all overlays, ran format.sh

* Removed unknown actor structs

* converted a few floats

* Added new lines to header files that were missing them. Removed unused asm files

* Removed unused asm files

* Formatting newlines

Further formatting

spacing

.float spacing

More space formatting

More spacing formatting

Removing .balign 4 after floats

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Lucas Shaw 2020-04-14 11:16:34 -07:00 • committed by GitHub
parent 5aef81071e
commit 045a92d7c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10327 changed files with 33390 additions and 45661 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/overlays/effects/z_effect_ss_blast.rodata.s
View file

@ -20,6 +20,8 @@ glabel D_8099F148
.balign 4
glabel D_8099F15C
.word 0x3B23D70A
.float 0.0025
.balign 4

12
data/overlays/effects/z_effect_ss_bomb.rodata.s
View file

@ -16,11 +16,17 @@ glabel D_8099F5B4
.balign 4
glabel D_8099F5C8
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_8099F5CC
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_8099F5D0
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_8099F5D4
.word 0x3E4CCCCD, 0x00000000, 0x00000000

12
data/overlays/effects/z_effect_ss_bomb2.rodata.s
View file

@ -28,13 +28,19 @@ glabel D_8099FF70
.balign 4
glabel D_8099FF84
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_8099FF88
.word 0x3F6CCCCD
glabel D_8099FF8C
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_8099FF90
.word 0x3CA3D70A
.float 0.02
.balign 4
glabel D_8099FF94
.word 0x3E19999A, 0x00000000, 0x00000000

8
data/overlays/effects/z_effect_ss_bubble.rodata.s
View file

@ -20,8 +20,12 @@ glabel D_809A04D0
.balign 4
glabel D_809A04E8
.word 0x3E99999A
.float 0.3
.balign 4
glabel D_809A04EC
.word 0x3E4CCCCD
.float 0.2
.balign 4

4
data/overlays/effects/z_effect_ss_dead_dd.rodata.s
View file

@ -20,6 +20,8 @@ glabel D_809A1594
.balign 4
glabel D_809A15AC
.word 0x3C23D70A
.float 0.01
.balign 4

4
data/overlays/effects/z_effect_ss_dead_ds.rodata.s
View file

@ -20,7 +20,9 @@ glabel D_809A1AB0
.balign 4
glabel D_809A1AC8
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A1ACC
.word 0x3FC8F5C3

32
data/overlays/effects/z_effect_ss_dust.rodata.s
View file

@ -16,21 +16,37 @@ glabel D_809A2A84
.balign 4
glabel D_809A2A98
.word 0x3B23D70A
.float 0.0025
.balign 4
glabel D_809A2A9C
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809A2AA0
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809A2AA4
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809A2AA8
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809A2AAC
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809A2AB0
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809A2AB4
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809A2AB8
.word 0x3E4CCCCD, 0x00000000

12
data/overlays/effects/z_effect_ss_en_fire.rodata.s
View file

@ -20,14 +20,20 @@ glabel D_809A3288
.balign 4
glabel D_809A329C
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A32A0
.word 0x3851B717
glabel D_809A32A4
.word 0x414B3333
glabel D_809A32A8
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A32AC
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4

12
data/overlays/effects/z_effect_ss_en_ice.rodata.s
View file

@ -24,11 +24,17 @@ glabel D_809A3BFC
.balign 4
glabel D_809A3C10
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A3C14
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A3C18
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A3C1C
.word 0x42B3999A
glabel D_809A3C20

12
data/overlays/effects/z_effect_ss_fcircle.rodata.s
View file

@ -20,11 +20,17 @@ glabel D_809A45C8
.balign 4
glabel D_809A45DC
.word 0x3A83126F
.float 0.001
.balign 4
glabel D_809A45E0
.word 0x3CCCCCCD
.float 0.025
.balign 4
glabel D_809A45E4
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A45E8
.word 0x38C90FDB, 0x00000000

16
data/overlays/effects/z_effect_ss_fire_tail.rodata.s
View file

@ -20,17 +20,25 @@ glabel D_809A5E10
.balign 4
glabel D_809A5E28
.word 0x3DCCCCCD
.float 0.1
.balign 4
glabel D_809A5E2C
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A5E30
.word 0x3C8EFA35
glabel D_809A5E34
.word 0x3727C5AD
glabel D_809A5E38
.word 0x3DCCCCCD
.float 0.1
.balign 4
glabel D_809A5E3C
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A5E40
.word 0x3F666666, 0x00000000, 0x00000000, 0x00000000

4
data/overlays/effects/z_effect_ss_g_magma2.rodata.s
View file

@ -16,6 +16,8 @@ glabel D_809A68C8
.balign 4
glabel D_809A68E0
.word 0x2E2E2F7A, 0x5F656666, 0x5F73735F, 0x675F6D61, 0x676D6132, 0x2E630000, 0x00000000, 0x00000000
.asciz "../z_eff_ss_g_magma2.c"
.balign 4
.align 4

24
data/overlays/effects/z_effect_ss_hahen.rodata.s
View file

@ -32,16 +32,28 @@ glabel D_809A8084
.balign 4
glabel D_809A8098
.word 0x3A83126F
.float 0.001
.balign 4
glabel D_809A809C
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A80A0
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A80A4
.word 0x3A83126F
.float 0.001
.balign 4
glabel D_809A80A8
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A80AC
.word 0x3C23D70A
.float 0.01
.balign 4

12
data/overlays/effects/z_effect_ss_ice_piece.rodata.s
View file

@ -20,11 +20,17 @@ glabel D_809A8B50
.balign 4
glabel D_809A8B68
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809A8B6C
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A8B70
.word 0x38C90FDB
.float 9.58738019108e-05
.balign 4
glabel D_809A8B74
.word 0x3F59999A, 0x00000000, 0x00000000

4
data/overlays/effects/z_effect_ss_k_fire.rodata.s
View file

@ -20,7 +20,9 @@ glabel D_809A95F8
.balign 4
glabel D_809A960C
.word 0x461C4000
.float 10000.0
.balign 4
glabel D_809A9610
.word 0x40490FDB, 0x00000000, 0x00000000, 0x00000000

32
data/overlays/effects/z_effect_ss_kakera.rodata.s
View file

@ -40,20 +40,36 @@ glabel D_809AA668
glabel D_809AA66C
.word 0x46FFFE00
glabel D_809AA670
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AA674
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AA678
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AA67C
.word 0x3F666666
.float 0.9
.balign 4
glabel D_809AA680
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809AA684
.word 0xBF4CCCCD
.float -0.8
.balign 4
glabel D_809AA688
.word 0x3F666666
.float 0.9
.balign 4
glabel D_809AA68C
.word 0x3E4CCCCD
.float 0.2
.balign 4

28
data/overlays/effects/z_effect_ss_kirakira.rodata.s
View file

@ -16,20 +16,34 @@ glabel D_809AAE28
.balign 4
glabel D_809AAE40
.word 0x461C4000
.float 10000.0
.balign 4
glabel D_809AAE44
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809AAE48
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809AAE4C
.word 0x3ECCCCCD
.float 0.4
.balign 4
glabel D_809AAE50
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809AAE54
.word 0x3F733333
glabel D_809AAE58
.word 0x3E4CCCCD
.float 0.2
.balign 4
glabel D_809AAE5C
.word 0x3E4CCCCD
.float 0.2
.balign 4

12
data/overlays/effects/z_effect_ss_lightning.rodata.s
View file

@ -16,13 +16,19 @@ glabel D_809AB578
.balign 4
glabel D_809AB590
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AB594
.word 0x3F19999A
.float 0.6
.balign 4
glabel D_809AB598
.word 0x45638000
glabel D_809AB59C
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AB5A0
.word 0x3DCCCCCD, 0x00000000, 0x00000000, 0x00000000

16
data/overlays/effects/z_effect_ss_sibuki.rodata.s
View file

@ -20,13 +20,21 @@ glabel D_809ABCC0
.balign 4
glabel D_809ABCD8
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809ABCDC
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809ABCE0
.word 0x3DCCCCCD
.float 0.1
.balign 4
glabel D_809ABCE4
.word 0x3DCCCCCD
.float 0.1
.balign 4
glabel D_809ABCE8
.word 0x3DCCCCCD, 0x00000000

4
data/overlays/effects/z_effect_ss_sibuki2.rodata.s
View file

@ -16,6 +16,8 @@ glabel D_809AC0A8
.balign 4
glabel D_809AC0C0
.word 0x2E2E2F7A, 0x5F656666, 0x5F73735F, 0x73696275, 0x6B69322E, 0x63000000, 0x00000000, 0x00000000
.asciz "../z_eff_ss_sibuki2.c"
.balign 4
.align 4

8
data/overlays/effects/z_effect_ss_stick.rodata.s
View file

@ -20,9 +20,13 @@ glabel D_809AC668
.balign 4
glabel D_809AC67C
.word 0x3C23D70A
.float 0.01
.balign 4
glabel D_809AC680
.word 0x3B23D70A
.float 0.0025
.balign 4
glabel D_809AC684
.word 0x3C23D70A, 0x00000000, 0x00000000