mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 05:51:18 +00:00
Code Issues Projects Releases Wiki Activity

More actor cleanup Part 1 (#107)

Browse source 
* Fix naming and structs in z_en_item00.c and z_en_a_keep.c

* Decompile init vars in z_en_item00.c and z_en_a_keep.c

* Create missing .h files for the last few actors

* Fix some collider member names in actor structs

* Fix old actors not properly using "actionFunc" / "SetupAction"

* Remove some local temporary actor structs

* Fix some actor header includes to be absolute instead of relative
This commit is contained in:
Roman971 2020-05-01 20:26:16 +02:00 • committed by GitHub
parent 2b38920d7e
commit 3ca6082084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 625 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

6
asm/non_matchings/code/z_en_item00/En_Item00_Init.s → asm/non_matchings/code/z_en_item00/EnItem00_Init.s
View file

@ -116,7 +116,7 @@ glabel jtbl_80134F7C
.word L8001DF3C
.text
glabel En_Item00_Init
glabel EnItem00_Init
/* A94AD8 8001D938 3C014475 */ li $at, 0x44750000 # 0.000000
/* A94ADC 8001D93C 44811000 */ mtc1 $at, $f2
/* A94AE0 8001D940 27BDFFC0 */ addiu $sp, $sp, -0x40
@ -420,7 +420,7 @@ glabel L8001DCFC
/* A94F44 8001DDA4 44800000 */ mtc1 $zero, $f0
/* A94F48 8001DDA8 3C058002 */ lui $a1, %hi(func_8001DFC8)
/* A94F4C 8001DDAC 24A5DFC8 */ addiu $a1, %lo(func_8001DFC8) # addiu $a1, $a1, -0x2038
/* A94F50 8001DDB0 0C00764C */ jal En_Item00_SetNewUpdate
/* A94F50 8001DDB0 0C00764C */ jal EnItem00_SetupAction
/* A94F54 8001DDB4 02002025 */ move $a0, $s0
/* A94F58 8001DDB8 2409FFFF */ li $t1, -1
/* A94F5C 8001DDBC 10000073 */ b .L8001DF8C
@ -555,7 +555,7 @@ glabel L8001DF3C
.L8001DF68:
/* A95108 8001DF68 3C058002 */ lui $a1, %hi(func_8001E5C8) # $a1, 0x8002
/* A9510C 8001DF6C 24A5E5C8 */ addiu $a1, %lo(func_8001E5C8) # addiu $a1, $a1, -0x1a38
/* A95110 8001DF70 0C00764C */ jal En_Item00_SetNewUpdate
/* A95110 8001DF70 0C00764C */ jal EnItem00_SetupAction
/* A95114 8001DF74 02002025 */ move $a0, $s0
/* A95118 8001DF78 8E19014C */ lw $t9, 0x14c($s0)
/* A9511C 8001DF7C 02002025 */ move $a0, $s0

4
asm/non_matchings/code/z_en_item00/En_Item00_Update.s → asm/non_matchings/code/z_en_item00/EnItem00_Update.s
View file

@ -55,7 +55,7 @@ glabel jtbl_80135064
.word L8001EC60
.text
glabel En_Item00_Update
glabel EnItem00_Update
/* A958BC 8001E71C 27BDFFB8 */ addiu $sp, $sp, -0x48
/* A958C0 8001E720 AFBF0024 */ sw $ra, 0x24($sp)
/* A958C4 8001E724 AFB10020 */ sw $s1, 0x20($sp)
@ -518,7 +518,7 @@ glabel L8001EC8C
/* A95F14 8001ED74 3C058002 */ lui $a1, %hi(func_8001E5C8) # $a1, 0x8002
/* A95F18 8001ED78 A6000152 */ sh $zero, 0x152($s0)
/* A95F1C 8001ED7C 24A5E5C8 */ addiu $a1, %lo(func_8001E5C8) # addiu $a1, $a1, -0x1a38
/* A95F20 8001ED80 0C00764C */ jal En_Item00_SetNewUpdate
/* A95F20 8001ED80 0C00764C */ jal EnItem00_SetupAction
/* A95F24 8001ED84 02002025 */ move $a0, $s0
.L8001ED88:
/* A95F28 8001ED88 8FBF0024 */ lw $ra, 0x24($sp)