Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2025-02-20 04:41:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lots of renamings

Browse Source
This commit is contained in:
Faris Awan 2022-04-07 17:40:14 -04:00
parent 9bd90ea90c
commit 5d169d27c6
22 changed files with 211 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/non_matchings/ovl0/ovl0_2_5/func_80007380.s
View File

@ -133,7 +133,7 @@ glabel func_80007380
/* 008188 80007588 02202025 */ move $a0, $s1
/* 00818C 8000758C AE290064 */ sw $t1, 0x64($s1)
/* 008190 80007590 8E0A0084 */ lw $t2, 0x84($s0)
/* 008194 80007594 0C002BA1 */ jal func_8000AE84
/* 008194 80007594 0C002BA1 */ jal HS64_omInit
/* 008198 80007598 AE2A0068 */ sw $t2, 0x68($s1)
/* 00819C 8000759C 3C028005 */ lui $v0, %hi(gDynamicBuffer3) # $v0, 0x8005
/* 0081A0 800075A0 2442A418 */ addiu $v0, %lo(gDynamicBuffer3) # addiu $v0, $v0, -0x5be8

2
asm/non_matchings/ovl0/ovl0_2_5/func_80008EC4.s
View File

@ -81,7 +81,7 @@ glabel func_80008EC4
/* 009BD8 80008FD8 A20F0056 */ sb $t7, 0x56($s0)
/* 009BDC 80008FDC AFAC0020 */ sw $t4, 0x20($sp)
/* 009BE0 80008FE0 AFAA0028 */ sw $t2, 0x28($sp)
/* 009BE4 80008FE4 0C0021D5 */ jal object_manager_get_om_mtx
/* 009BE4 80008FE4 0C0021D5 */ jal HS64_OMMtxPop
/* 009BE8 80008FE8 AFA90024 */ sw $t1, 0x24($sp)
/* 009BEC 80008FEC 8FAE003C */ lw $t6, 0x3c($sp)
/* 009BF0 80008FF0 93A30037 */ lbu $v1, 0x37($sp)

2
asm/non_matchings/ovl0/ovl0_2_5/func_80009658.s
View File

@ -16,7 +16,7 @@ glabel func_80009658
/* 00A28C 8000968C 00000000 */ nop
/* 00A290 80009690 AFA40018 */ sw $a0, 0x18($sp)
.L80009694_ovl0:
/* 00A294 80009694 0C0021D5 */ jal object_manager_get_om_mtx
/* 00A294 80009694 0C0021D5 */ jal HS64_OMMtxPop
/* 00A298 80009698 A3A5001F */ sb $a1, 0x1f($sp)
/* 00A29C 8000969C 8FA40018 */ lw $a0, 0x18($sp)
/* 00A2A0 800096A0 93A5001F */ lbu $a1, 0x1f($sp)

2
asm/non_matchings/ovl0/ovl0_2_5/func_80009A44.s
View File

@ -2,7 +2,7 @@ glabel func_80009A44
/* 00A644 80009A44 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 00A648 80009A48 AFBF0014 */ sw $ra, 0x14($sp)
/* 00A64C 80009A4C AFA40018 */ sw $a0, 0x18($sp)
/* 00A650 80009A50 0C002223 */ jal object_manager_get_m_obj
/* 00A650 80009A50 0C002223 */ jal HS64_MObjPop
/* 00A654 80009A54 AFA5001C */ sw $a1, 0x1c($sp)
/* 00A658 80009A58 8FA30018 */ lw $v1, 0x18($sp)
/* 00A65C 80009A5C 8FA7001C */ lw $a3, 0x1c($sp)

4
asm/non_matchings/ovl0/ovl0_2_5/func_80009B5C.s
View File

@ -14,13 +14,13 @@ glabel func_80009B5C
/* 00A788 80009B88 8E500000 */ lw $s0, ($s2)
.L80009B8C_ovl0:
/* 00A78C 80009B8C 8E110000 */ lw $s1, ($s0)
/* 00A790 80009B90 0C002218 */ jal func_80008860
/* 00A790 80009B90 0C002218 */ jal HS64_AObjPush
/* 00A794 80009B94 02002025 */ move $a0, $s0
/* 00A798 80009B98 1620FFFC */ bnez $s1, .L80009B8C_ovl0
/* 00A79C 80009B9C 02208025 */ move $s0, $s1
/* 00A7A0 80009BA0 8E500000 */ lw $s0, ($s2)
.L80009BA4_ovl0:
/* 00A7A4 80009BA4 0C002239 */ jal func_800088E4
/* 00A7A4 80009BA4 0C002239 */ jal HS64_MObjPush
/* 00A7A8 80009BA8 02402025 */ move $a0, $s2
/* 00A7AC 80009BAC 1600FFF4 */ bnez $s0, .L80009B80_ovl0
/* 00A7B0 80009BB0 02009025 */ move $s2, $s0

2
asm/non_matchings/ovl0/ovl0_2_5/func_80009C38.s
View File

@ -7,7 +7,7 @@ glabel func_80009C38
/* 00A84C 80009C4C 3C068005 */ lui $a2, %hi(D_8004A7C4) # $a2, 0x8005
/* 00A850 80009C50 8CC6A7C4 */ lw $a2, %lo(D_8004A7C4)($a2)
.L80009C54_ovl0:
/* 00A854 80009C54 0C002244 */ jal object_manager_get_d_obj
/* 00A854 80009C54 0C002244 */ jal HS64_DObjPop
/* 00A858 80009C58 AFA60020 */ sw $a2, 0x20($sp)
/* 00A85C 80009C5C 8FA60020 */ lw $a2, 0x20($sp)
/* 00A860 80009C60 00402825 */ move $a1, $v0

2
asm/non_matchings/ovl0/ovl0_2_5/func_80009CE8.s
View File

@ -2,7 +2,7 @@ glabel func_80009CE8
/* 00A8E8 80009CE8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 00A8EC 80009CEC AFBF0014 */ sw $ra, 0x14($sp)
/* 00A8F0 80009CF0 AFA50024 */ sw $a1, 0x24($sp)
/* 00A8F4 80009CF4 0C002244 */ jal object_manager_get_d_obj
/* 00A8F4 80009CF4 0C002244 */ jal HS64_DObjPop
/* 00A8F8 80009CF8 AFA40020 */ sw $a0, 0x20($sp)
/* 00A8FC 80009CFC 8FA60020 */ lw $a2, 0x20($sp)
/* 00A900 80009D00 00402025 */ move $a0, $v0

2
asm/non_matchings/ovl0/ovl0_2_5/func_80009D5C.s
View File

@ -2,7 +2,7 @@ glabel func_80009D5C
/* 00A95C 80009D5C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 00A960 80009D60 AFBF0014 */ sw $ra, 0x14($sp)
/* 00A964 80009D64 AFA50024 */ sw $a1, 0x24($sp)
/* 00A968 80009D68 0C002244 */ jal object_manager_get_d_obj
/* 00A968 80009D68 0C002244 */ jal HS64_DObjPop
/* 00A96C 80009D6C AFA40020 */ sw $a0, 0x20($sp)
/* 00A970 80009D70 8FA70020 */ lw $a3, 0x20($sp)
/* 00A974 80009D74 00402825 */ move $a1, $v0

10
asm/non_matchings/ovl0/ovl0_2_5/func_80009DF4.s
View File

@ -57,7 +57,7 @@ glabel func_80009DF4
/* 00AAB4 80009EB4 8E240058 */ lw $a0, 0x58($s1)
/* 00AAB8 80009EB8 50800004 */ beql $a0, $zero, .L80009ECC_ovl0
/* 00AABC 80009EBC 26100004 */ addiu $s0, $s0, 4
/* 00AAC0 80009EC0 0C0021EB */ jal push_om_mtx
/* 00AAC0 80009EC0 0C0021EB */ jal HS64_OMMtxPush
/* 00AAC4 80009EC4 00000000 */ nop
/* 00AAC8 80009EC8 26100004 */ addiu $s0, $s0, 4
.L80009ECC_ovl0:
@ -78,7 +78,7 @@ glabel func_80009DF4
/* 00AB00 80009F00 8E720080 */ lw $s2, 0x80($s3)
.L80009F04_ovl0:
/* 00AB04 80009F04 8E300000 */ lw $s0, ($s1)
/* 00AB08 80009F08 0C002218 */ jal func_80008860
/* 00AB08 80009F08 0C002218 */ jal HS64_AObjPush
/* 00AB0C 80009F0C 02202025 */ move $a0, $s1
/* 00AB10 80009F10 1600FFFC */ bnez $s0, .L80009F04_ovl0
/* 00AB14 80009F14 02008825 */ move $s1, $s0
@ -92,18 +92,18 @@ glabel func_80009DF4
/* 00AB2C 80009F2C 8E500000 */ lw $s0, ($s2)
.L80009F30_ovl0:
/* 00AB30 80009F30 8E300000 */ lw $s0, ($s1)
/* 00AB34 80009F34 0C002218 */ jal func_80008860
/* 00AB34 80009F34 0C002218 */ jal HS64_AObjPush
/* 00AB38 80009F38 02202025 */ move $a0, $s1
/* 00AB3C 80009F3C 1600FFFC */ bnez $s0, .L80009F30_ovl0
/* 00AB40 80009F40 02008825 */ move $s1, $s0
/* 00AB44 80009F44 8E500000 */ lw $s0, ($s2)
.L80009F48_ovl0:
/* 00AB48 80009F48 0C002239 */ jal func_800088E4
/* 00AB48 80009F48 0C002239 */ jal HS64_MObjPush
/* 00AB4C 80009F4C 02402025 */ move $a0, $s2
/* 00AB50 80009F50 1600FFF4 */ bnez $s0, .L80009F24_ovl0
/* 00AB54 80009F54 02009025 */ move $s2, $s0
.L80009F58_ovl0:
/* 00AB58 80009F58 0C00225A */ jal func_80008968
/* 00AB58 80009F58 0C00225A */ jal HS64_DObjPush
/* 00AB5C 80009F5C 02602025 */ move $a0, $s3
/* 00AB60 80009F60 8FBF0024 */ lw $ra, 0x24($sp)
/* 00AB64 80009F64 8FB00014 */ lw $s0, 0x14($sp)

6
asm/non_matchings/ovl0/ovl0_2_5/func_8000A02C.s
View File

@ -15,7 +15,7 @@ glabel func_8000A02C
/* 00AC5C 8000A05C 8E240064 */ lw $a0, 0x64($s1)
/* 00AC60 8000A060 50800004 */ beql $a0, $zero, .L8000A074_ovl0
/* 00AC64 8000A064 26100004 */ addiu $s0, $s0, 4
/* 00AC68 8000A068 0C0021EB */ jal push_om_mtx
/* 00AC68 8000A068 0C0021EB */ jal HS64_OMMtxPush
/* 00AC6C 8000A06C 00000000 */ nop
/* 00AC70 8000A070 26100004 */ addiu $s0, $s0, 4
.L8000A074_ovl0:
@ -27,12 +27,12 @@ glabel func_8000A02C
/* 00AC88 8000A088 00000000 */ nop
.L8000A08C_ovl0:
/* 00AC8C 8000A08C 8E110000 */ lw $s1, ($s0)
/* 00AC90 8000A090 0C002218 */ jal func_80008860
/* 00AC90 8000A090 0C002218 */ jal HS64_AObjPush
/* 00AC94 8000A094 02002025 */ move $a0, $s0
/* 00AC98 8000A098 1620FFFC */ bnez $s1, .L8000A08C_ovl0
/* 00AC9C 8000A09C 02208025 */ move $s0, $s1
.L8000A0A0_ovl0:
/* 00ACA0 8000A0A0 0C00227B */ jal func_800089EC
/* 00ACA0 8000A0A0 0C00227B */ jal HS64_CameraPush
/* 00ACA4 8000A0A4 8FA40028 */ lw $a0, 0x28($sp)
/* 00ACA8 8000A0A8 8FBF0024 */ lw $ra, 0x24($sp)
/* 00ACAC 8000A0AC 8FB00018 */ lw $s0, 0x18($sp)

2
asm/non_matchings/ovl0/ovl0_2_5/func_8000A0C0.s
View File

@ -19,7 +19,7 @@ glabel omGAddCommon
/* 00AD00 8000A100 1000FFFF */ b .L8000A100_ovl0
/* 00AD04 8000A104 00000000 */ nop
.L8000A108_ovl0:
/* 00AD08 8000A108 0C0020D7 */ jal get_gobj
/* 00AD08 8000A108 0C0020D7 */ jal HS64_GObjPop
/* 00AD0C 8000A10C A3A6002B */ sb $a2, 0x2b($sp)
/* 00AD10 8000A110 93A6002B */ lbu $a2, 0x2b($sp)
/* 00AD14 8000A114 14400003 */ bnez $v0, .L8000A124_ovl0

46
asm/non_matchings/ovl0/ovl0_2_5/func_8000AE84.s
View File

@ -1,4 +1,4 @@
glabel func_8000AE84
glabel HS64_omInit
/* 00BA84 8000AE84 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 00BA88 8000AE88 AFBF0014 */ sw $ra, 0x14($sp)
/* 00BA8C 8000AE8C 8C8E0008 */ lw $t6, 8($a0)
@ -173,8 +173,8 @@ glabel func_8000AE84
/* 00BCDC 8000B0DC 11800013 */ beqz $t4, .L8000B12C_ovl0
/* 00BCE0 8000B0E0 00000000 */ nop
/* 00BCE4 8000B0E4 8CA30038 */ lw $v1, 0x38($a1)
/* 00BCE8 8000B0E8 3C018005 */ lui $at, %hi(D_8004A79C) # $at, 0x8005
/* 00BCEC 8000B0EC AC23A79C */ sw $v1, %lo(D_8004A79C)($at)
/* 00BCE8 8000B0E8 3C018005 */ lui $at, %hi(gAObjHead) # $at, 0x8005
/* 00BCEC 8000B0EC AC23A79C */ sw $v1, %lo(gAObjHead)($at)
/* 00BCF0 8000B0F0 8CAD003C */ lw $t5, 0x3c($a1)
/* 00BCF4 8000B0F4 25AEFFFF */ addiu $t6, $t5, -1
/* 00BCF8 8000B0F8 19C0000A */ blez $t6, .L8000B124_ovl0
@ -193,15 +193,15 @@ glabel func_8000AE84
/* 00BD24 8000B124 10000002 */ b .L8000B130_ovl0
/* 00BD28 8000B128 AC600000 */ sw $zero, ($v1)
.L8000B12C_ovl0:
/* 00BD2C 8000B12C AC20A79C */ sw $zero, %lo(D_8004A79C)($at)
/* 00BD2C 8000B12C AC20A79C */ sw $zero, %lo(gAObjHead)($at)
.L8000B130_ovl0:
/* 00BD30 8000B130 8CB90044 */ lw $t9, 0x44($a1)
/* 00BD34 8000B134 3C018005 */ lui $at, 0x8005
/* 00BD38 8000B138 13200013 */ beqz $t9, .L8000B188_ovl0
/* 00BD3C 8000B13C 00000000 */ nop
/* 00BD40 8000B140 8CA30040 */ lw $v1, 0x40($a1)
/* 00BD44 8000B144 3C018005 */ lui $at, %hi(D_8004A7A4) # $at, 0x8005
/* 00BD48 8000B148 AC23A7A4 */ sw $v1, %lo(D_8004A7A4)($at)
/* 00BD44 8000B144 3C018005 */ lui $at, %hi(gMObjHead) # $at, 0x8005
/* 00BD48 8000B148 AC23A7A4 */ sw $v1, %lo(gMObjHead)($at)
/* 00BD4C 8000B14C 8CAB0044 */ lw $t3, 0x44($a1)
/* 00BD50 8000B150 256CFFFF */ addiu $t4, $t3, -1
/* 00BD54 8000B154 1980000A */ blez $t4, .L8000B180_ovl0
@ -220,7 +220,7 @@ glabel func_8000AE84
/* 00BD80 8000B180 10000002 */ b .L8000B18C_ovl0
/* 00BD84 8000B184 AC600000 */ sw $zero, ($v1)
.L8000B188_ovl0:
/* 00BD88 8000B188 AC20A7A4 */ sw $zero, %lo(D_8004A7A4)($at)
/* 00BD88 8000B188 AC20A7A4 */ sw $zero, %lo(gMObjHead)($at)
.L8000B18C_ovl0:
/* 00BD8C 8000B18C 8CAF004C */ lw $t7, 0x4c($a1)
/* 00BD90 8000B190 3C038005 */ lui $v1, %hi(D_8004A5F8) # $v1, 0x8005
@ -228,8 +228,8 @@ glabel func_8000AE84
/* 00BD98 8000B198 11E00015 */ beqz $t7, .L8000B1F0_ovl0
/* 00BD9C 8000B19C 2463A5F8 */ addiu $v1, %lo(D_8004A5F8) # addiu $v1, $v1, -0x5a08
/* 00BDA0 8000B1A0 8CA20048 */ lw $v0, 0x48($a1)
/* 00BDA4 8000B1A4 3C018005 */ lui $at, %hi(D_8004A7AC) # $at, 0x8005
/* 00BDA8 8000B1A8 AC22A7AC */ sw $v0, %lo(D_8004A7AC)($at)
/* 00BDA4 8000B1A4 3C018005 */ lui $at, %hi(gDObjHead) # $at, 0x8005
/* 00BDA8 8000B1A8 AC22A7AC */ sw $v0, %lo(gDObjHead)($at)
/* 00BDAC 8000B1AC 8CB8004C */ lw $t8, 0x4c($a1)
/* 00BDB0 8000B1B0 2719FFFF */ addiu $t9, $t8, -1
/* 00BDB4 8000B1B4 1B20000C */ blez $t9, .L8000B1E8_ovl0
@ -250,7 +250,7 @@ glabel func_8000AE84
/* 00BDE8 8000B1E8 10000002 */ b .L8000B1F4_ovl0
/* 00BDEC 8000B1EC AC400000 */ sw $zero, ($v0)
.L8000B1F0_ovl0:
/* 00BDF0 8000B1F0 AC20A7AC */ sw $zero, %lo(D_8004A7AC)($at)
/* 00BDF0 8000B1F0 AC20A7AC */ sw $zero, %lo(gDObjHead)($at)
.L8000B1F4_ovl0:
/* 00BDF4 8000B1F4 8CAF0058 */ lw $t7, 0x58($a1)
/* 00BDF8 8000B1F8 3C018005 */ lui $at, 0x8005
@ -286,8 +286,8 @@ glabel func_8000AE84
/* 00BE60 8000B260 11E00014 */ beqz $t7, .L8000B2B4_ovl0
/* 00BE64 8000B264 00000000 */ nop
/* 00BE68 8000B268 8CA20060 */ lw $v0, 0x60($a1)
/* 00BE6C 8000B26C 3C018005 */ lui $at, %hi(D_8004A7BC) # $at, 0x8005
/* 00BE70 8000B270 AC22A7BC */ sw $v0, %lo(D_8004A7BC)($at)
/* 00BE6C 8000B26C 3C018005 */ lui $at, %hi(gCameraHead) # $at, 0x8005
/* 00BE70 8000B270 AC22A7BC */ sw $v0, %lo(gCameraHead)($at)
/* 00BE74 8000B274 8CB80064 */ lw $t8, 0x64($a1)
/* 00BE78 8000B278 2719FFFF */ addiu $t9, $t8, -1
/* 00BE7C 8000B27C 1B20000B */ blez $t9, .L8000B2AC_ovl0
@ -307,7 +307,7 @@ glabel func_8000AE84
/* 00BEAC 8000B2AC 10000002 */ b .L8000B2B8_ovl0
/* 00BEB0 8000B2B0 AC400000 */ sw $zero, ($v0)
.L8000B2B4_ovl0:
/* 00BEB4 8000B2B4 AC20A7BC */ sw $zero, %lo(D_8004A7BC)($at)
/* 00BEB4 8000B2B4 AC20A7BC */ sw $zero, %lo(gCameraHead)($at)
.L8000B2B8_ovl0:
/* 00BEB8 8000B2B8 3C028005 */ lui $v0, %hi(D_8004A578) # $v0, 0x8005
/* 00BEBC 8000B2BC 3C048005 */ lui $a0, %hi(D_8004A5F8) # $a0, 0x8005
@ -350,22 +350,22 @@ glabel func_8000AE84
/* 00BF48 8000B348 2484A7E0 */ addiu $a0, %lo(HS64_GObjProcMesgQ) # addiu $a0, $a0, -0x5820
/* 00BF4C 8000B34C 0C00CEB8 */ jal osCreateMesgQueue
/* 00BF50 8000B350 24060001 */ li $a2, 1
/* 00BF54 8000B354 3C028005 */ lui $v0, %hi(D_8004A7C0) # $v0, 0x8005
/* 00BF54 8000B354 3C028005 */ lui $v0, %hi(gCameraCount) # $v0, 0x8005
/* 00BF58 8000B358 3C038005 */ lui $v1, %hi(D_8004A7B8) # $v1, 0x8005
/* 00BF5C 8000B35C 3C058005 */ lui $a1, %hi(D_8004A7B0) # $a1, 0x8005
/* 00BF60 8000B360 3C068005 */ lui $a2, %hi(D_8004A7A0) # $a2, 0x8005
/* 00BF64 8000B364 3C078005 */ lui $a3, %hi(D_8004A794) # $a3, 0x8005
/* 00BF68 8000B368 3C088005 */ lui $t0, %hi(D_8004A78C) # $t0, 0x8005
/* 00BF5C 8000B35C 3C058005 */ lui $a1, %hi(gDObjCount) # $a1, 0x8005
/* 00BF60 8000B360 3C068005 */ lui $a2, %hi(gAObjCount) # $a2, 0x8005
/* 00BF64 8000B364 3C078005 */ lui $a3, %hi(gOMMtxCount) # $a3, 0x8005
/* 00BF68 8000B368 3C088005 */ lui $t0, %hi(gGObjCount) # $t0, 0x8005
/* 00BF6C 8000B36C 3C098005 */ lui $t1, %hi(D_8004A570) # $t1, 0x8005
/* 00BF70 8000B370 3C0A8005 */ lui $t2, %hi(D_8004A544) # $t2, 0x8005
/* 00BF74 8000B374 254AA544 */ addiu $t2, %lo(D_8004A544) # addiu $t2, $t2, -0x5abc
/* 00BF78 8000B378 2529A570 */ addiu $t1, %lo(D_8004A570) # addiu $t1, $t1, -0x5a90
/* 00BF7C 8000B37C 2508A78C */ addiu $t0, %lo(D_8004A78C) # addiu $t0, $t0, -0x5874
/* 00BF80 8000B380 24E7A794 */ addiu $a3, %lo(D_8004A794) # addiu $a3, $a3, -0x586c
/* 00BF84 8000B384 24C6A7A0 */ addiu $a2, %lo(D_8004A7A0) # addiu $a2, $a2, -0x5860
/* 00BF88 8000B388 24A5A7B0 */ addiu $a1, %lo(D_8004A7B0) # addiu $a1, $a1, -0x5850
/* 00BF7C 8000B37C 2508A78C */ addiu $t0, %lo(gGObjCount) # addiu $t0, $t0, -0x5874
/* 00BF80 8000B380 24E7A794 */ addiu $a3, %lo(gOMMtxCount) # addiu $a3, $a3, -0x586c
/* 00BF84 8000B384 24C6A7A0 */ addiu $a2, %lo(gAObjCount) # addiu $a2, $a2, -0x5860
/* 00BF88 8000B388 24A5A7B0 */ addiu $a1, %lo(gDObjCount) # addiu $a1, $a1, -0x5850
/* 00BF8C 8000B38C 2463A7B8 */ addiu $v1, %lo(D_8004A7B8) # addiu $v1, $v1, -0x5848
/* 00BF90 8000B390 2442A7C0 */ addiu $v0, %lo(D_8004A7C0) # addiu $v0, $v0, -0x5840
/* 00BF90 8000B390 2442A7C0 */ addiu $v0, %lo(gCameraCount) # addiu $v0, $v0, -0x5840
/* 00BF94 8000B394 AC400000 */ sw $zero, ($v0)
/* 00BF98 8000B398 AC600000 */ sw $zero, ($v1)
/* 00BF9C 8000B39C ACA00000 */ sw $zero, ($a1)

17
asm/non_matchings/ovl0/ovl0_2_5/func_8000B758.s
View File

@ -1,17 +0,0 @@
glabel func_8000B758
/* 00C358 8000B758 14800003 */ bnez $a0, .L8000B768_ovl0
/* 00C35C 8000B75C 24030001 */ li $v1, 1
/* 00C360 8000B760 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005
/* 00C364 8000B764 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0)
.L8000B768_ovl0:
/* 00C368 8000B768 8C820018 */ lw $v0, 0x18($a0)
/* 00C36C 8000B76C 10400005 */ beqz $v0, .L8000B784_ovl0
/* 00C370 8000B770 00000000 */ nop
/* 00C374 8000B774 A0430015 */ sb $v1, 0x15($v0)
.L8000B778_ovl0:
/* 00C378 8000B778 8C420000 */ lw $v0, ($v0)
/* 00C37C 8000B77C 5440FFFE */ bnezl $v0, .L8000B778_ovl0
/* 00C380 8000B780 A0430015 */ sb $v1, 0x15($v0)
.L8000B784_ovl0:
/* 00C384 8000B784 03E00008 */ jr $ra
/* 00C388 8000B788 00000000 */ nop

21
asm/non_matchings/ovl0/ovl0_2_5/func_8000B7F0.s
View File

@ -1,21 +0,0 @@
glabel func_8000B7F0
/* 00C3F0 8000B7F0 14800003 */ bnez $a0, .L8000B800_ovl0
/* 00C3F4 8000B7F4 24030001 */ li $v1, 1
/* 00C3F8 8000B7F8 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005
/* 00C3FC 8000B7FC 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0)
.L8000B800_ovl0:
/* 00C400 8000B800 8C820018 */ lw $v0, 0x18($a0)
/* 00C404 8000B804 10400008 */ beqz $v0, .L8000B828_ovl0
/* 00C408 8000B808 00000000 */ nop
/* 00C40C 8000B80C 8C4E0020 */ lw $t6, 0x20($v0)
.L8000B810_ovl0:
/* 00C410 8000B810 54AE0003 */ bnel $a1, $t6, .L8000B820_ovl0
/* 00C414 8000B814 8C420000 */ lw $v0, ($v0)
/* 00C418 8000B818 A0430015 */ sb $v1, 0x15($v0)
/* 00C41C 8000B81C 8C420000 */ lw $v0, ($v0)
.L8000B820_ovl0:
/* 00C420 8000B820 5440FFFB */ bnezl $v0, .L8000B810_ovl0
/* 00C424 8000B824 8C4E0020 */ lw $t6, 0x20($v0)
.L8000B828_ovl0:
/* 00C428 8000B828 03E00008 */ jr $ra
/* 00C42C 8000B82C 00000000 */ nop

21
asm/non_matchings/ovl0/ovl0_2_5/func_8000B830.s
View File

@ -1,21 +0,0 @@
glabel func_8000B830
/* 00C430 8000B830 54800004 */ bnezl $a0, .L8000B844_ovl0
/* 00C434 8000B834 8C820018 */ lw $v0, 0x18($a0)
/* 00C438 8000B838 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005
/* 00C43C 8000B83C 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0)
/* 00C440 8000B840 8C820018 */ lw $v0, 0x18($a0)
.L8000B844_ovl0:
/* 00C444 8000B844 10400008 */ beqz $v0, .L8000B868_ovl0
/* 00C448 8000B848 00000000 */ nop
/* 00C44C 8000B84C 8C4E0020 */ lw $t6, 0x20($v0)
.L8000B850_ovl0:
/* 00C450 8000B850 54AE0003 */ bnel $a1, $t6, .L8000B860_ovl0
/* 00C454 8000B854 8C420000 */ lw $v0, ($v0)
/* 00C458 8000B858 A0400015 */ sb $zero, 0x15($v0)
/* 00C45C 8000B85C 8C420000 */ lw $v0, ($v0)
.L8000B860_ovl0:
/* 00C460 8000B860 5440FFFB */ bnezl $v0, .L8000B850_ovl0
/* 00C464 8000B864 8C4E0020 */ lw $t6, 0x20($v0)
.L8000B868_ovl0:
/* 00C468 8000B868 03E00008 */ jr $ra
/* 00C46C 8000B86C 00000000 */ nop

14
asm/non_matchings/ovl0/ovl0_3/func_8000C3D8.s
View File

@ -170,7 +170,7 @@ glabel func_8000C3D8
/* 00D1EC 8000C5EC 26250001 */ addiu $a1, $s1, 1
/* 00D1F0 8000C5F0 54600006 */ bnezl $v1, .L8000C60C_ovl0
/* 00D1F4 8000C5F4 C46A0014 */ lwc1 $f10, 0x14($v1)
/* 00D1F8 8000C5F8 0C0025F8 */ jal func_800097E0
/* 00D1F8 8000C5F8 0C0025F8 */ jal HS64_AObjNew
/* 00D1FC 8000C5FC 30A500FF */ andi $a1, $a1, 0xff
/* 00D200 8000C600 AE020000 */ sw $v0, ($s0)
/* 00D204 8000C604 00401825 */ move $v1, $v0
@ -243,7 +243,7 @@ glabel func_8000C3D8
/* 00D2F0 8000C6F0 26250001 */ addiu $a1, $s1, 1
/* 00D2F4 8000C6F4 54600006 */ bnezl $v1, .L8000C710_ovl0
/* 00D2F8 8000C6F8 C46A0014 */ lwc1 $f10, 0x14($v1)
/* 00D2FC 8000C6FC 0C0025F8 */ jal func_800097E0
/* 00D2FC 8000C6FC 0C0025F8 */ jal HS64_AObjNew
/* 00D300 8000C700 30A500FF */ andi $a1, $a1, 0xff
/* 00D304 8000C704 AE020000 */ sw $v0, ($s0)
/* 00D308 8000C708 00401825 */ move $v1, $v0
@ -317,7 +317,7 @@ glabel func_8000C3D8
/* 00D3F8 8000C7F8 26250001 */ addiu $a1, $s1, 1
/* 00D3FC 8000C7FC 54600006 */ bnezl $v1, .L8000C818_ovl0
/* 00D400 8000C800 C4640014 */ lwc1 $f4, 0x14($v1)
/* 00D404 8000C804 0C0025F8 */ jal func_800097E0
/* 00D404 8000C804 0C0025F8 */ jal HS64_AObjNew
/* 00D408 8000C808 30A500FF */ andi $a1, $a1, 0xff
/* 00D40C 8000C80C AE020000 */ sw $v0, ($s0)
/* 00D410 8000C810 00401825 */ move $v1, $v0
@ -386,7 +386,7 @@ glabel func_8000C3D8
/* 00D4F0 8000C8F0 26250001 */ addiu $a1, $s1, 1
/* 00D4F4 8000C8F4 54600006 */ bnezl $v1, .L8000C910_ovl0
/* 00D4F8 8000C8F8 8E6C0070 */ lw $t4, 0x70($s3)
/* 00D4FC 8000C8FC 0C0025F8 */ jal func_800097E0
/* 00D4FC 8000C8FC 0C0025F8 */ jal HS64_AObjNew
/* 00D500 8000C900 30A500FF */ andi $a1, $a1, 0xff
/* 00D504 8000C904 AE020000 */ sw $v0, ($s0)
/* 00D508 8000C908 00401825 */ move $v1, $v0
@ -447,7 +447,7 @@ glabel func_8000C3D8
/* 00D5C4 8000C9C4 26250001 */ addiu $a1, $s1, 1
/* 00D5C8 8000C9C8 54600006 */ bnezl $v1, .L8000C9E4_ovl0
/* 00D5CC 8000C9CC C4700014 */ lwc1 $f16, 0x14($v1)
/* 00D5D0 8000C9D0 0C0025F8 */ jal func_800097E0
/* 00D5D0 8000C9D0 0C0025F8 */ jal HS64_AObjNew
/* 00D5D4 8000C9D4 30A500FF */ andi $a1, $a1, 0xff
/* 00D5D8 8000C9D8 AE020000 */ sw $v0, ($s0)
/* 00D5DC 8000C9DC 00401825 */ move $v1, $v0
@ -556,7 +556,7 @@ glabel func_8000C3D8
/* 00D74C 8000CB4C 26250001 */ addiu $a1, $s1, 1
/* 00D750 8000CB50 54600006 */ bnezl $v1, .L8000CB6C_ovl0
/* 00D754 8000CB54 C472000C */ lwc1 $f18, 0xc($v1)
/* 00D758 8000CB58 0C0025F8 */ jal func_800097E0
/* 00D758 8000CB58 0C0025F8 */ jal HS64_AObjNew
/* 00D75C 8000CB5C 30A500FF */ andi $a1, $a1, 0xff
/* 00D760 8000CB60 AE020000 */ sw $v0, ($s0)
/* 00D764 8000CB64 00401825 */ move $v1, $v0
@ -578,7 +578,7 @@ glabel func_8000C3D8
/* 00D794 8000CB94 02602025 */ move $a0, $s3
/* 00D798 8000CB98 57000005 */ bnezl $t8, .L8000CBB0_ovl0
/* 00D79C 8000CB9C 8E790070 */ lw $t9, 0x70($s3)
/* 00D7A0 8000CBA0 0C0025F8 */ jal func_800097E0
/* 00D7A0 8000CBA0 0C0025F8 */ jal HS64_AObjNew
/* 00D7A4 8000CBA4 24050004 */ li $a1, 4
/* 00D7A8 8000CBA8 AFA2008C */ sw $v0, 0x8c($sp)
/* 00D7AC 8000CBAC 8E790070 */ lw $t9, 0x70($s3)

2
asm/non_matchings/ovl0/ovl0_3/func_8000EC98.s
View File

@ -107,7 +107,7 @@ glabel func_8000EC98
/* 00FA28 8000EE28 45030069 */ bc1tl .L8000EFD0_ovl0
/* 00FA2C 8000EE2C 26100001 */ addiu $s0, $s0, 1
.L8000EE30_ovl0:
/* 00FA30 8000EE30 0C0025F8 */ jal func_800097E0
/* 00FA30 8000EE30 0C0025F8 */ jal HS64_AObjNew
/* 00FA34 8000EE34 320500FF */ andi $a1, $s0, 0xff
/* 00FA38 8000EE38 12140005 */ beq $s0, $s4, .L8000EE50_ovl0
/* 00FA3C 8000EE3C 00401825 */ move $v1, $v0

351
src/ovl0/object_manager.c
View File

@ -92,20 +92,20 @@ struct GObj *gGObjHead;
// 0x8004A67C? file boundary?
struct GObj* gHighestPrioDLLinkProcs[33]; // length 33?
struct GObj* gDLLinkProcs[33]; // length 33?
u32 D_8004A78C;
u32 gGObjCount;
struct OMMtx *gOMMtxHead;
u32 D_8004A794;
u32 gOMMtxCount;
void (*D_8004A798)();
struct AObj *D_8004A79C;
u32 D_8004A7A0;
struct MObj* D_8004A7A4;
u32 D_8004A7A8;
struct DObj* D_8004A7AC;
u32 D_8004A7B0;
struct AObj *gAObjHead;
u32 gAObjCount;
struct MObj* gMObjHead;
u32 gMObjCount;
struct DObj* gDObjHead;
u32 gDObjCount;
u32 D_8004A7B4;
u32 D_8004A7B8;
struct Camera* D_8004A7BC;
u32 D_8004A7C0;
struct Camera* gCameraHead;
u32 gCameraCount;
struct GObj *D_8004A7C4, *D_8004A7C8, *D_8004A7CC;
struct GObjProcess *D_8004A7D0;
s32 D_8004A7D4;
@ -119,8 +119,6 @@ static u32 pad1, pad2, pad3, pad4, pad5, pad6; // 0x8004AA78 - 0x8004AA8F?
extern struct GObj *D_800DE44C;
struct GObjThread *get_gobj_thread(void) {
struct GObjThread *ret;
if (gGObjThreadHead == NULL) {
@ -321,21 +319,19 @@ void func_8000831C(void (*arg0)(struct GObjThreadStack *)) {
// Unused?
s32 func_80008328(void) {
struct GObj *phi_v0;
s32 phi_v1;
struct GObj *gobj;
s32 listCount;
phi_v0 = gGObjHead;
phi_v1 = 0;
while (phi_v0 != 0) {
phi_v0 = phi_v0->unk4;
phi_v1 = phi_v1 + 1;
gobj = gGObjHead;
listCount = 0;
while (gobj != NULL) {
gobj = gobj->unk4;
listCount = listCount + 1;
}
return phi_v1 + D_8004A78C;
return listCount + gGObjCount;
}
// Another potential pop
// TODO: gGObjHead might be 8004A7C4 struct
struct GObj *get_gobj(void) {
struct GObj *HS64_GObjPop(void) {
struct GObj *head;
if (gGObjHead == NULL) {
@ -343,15 +339,14 @@ struct GObj *get_gobj(void) {
}
head = gGObjHead;
gGObjHead = gGObjHead->unk4;
D_8004A78C++;
gGObjCount++;
return head;
}
// Another potential push
void push_gobj(struct GObj *arg0) {
void HS64_GObjPush(struct GObj *arg0) {
arg0->unk4 = gGObjHead;
gGObjHead = arg0;
D_8004A78C--;
gGObjCount--;
}
void func_800083CC(struct GObj *arg0, struct GObj *arg1) {
@ -465,8 +460,7 @@ void omGDLLinkDestructor(struct GObj *arg0) {
}
}
// Another potential pop
struct OMMtx *object_manager_get_om_mtx(void) {
struct OMMtx *HS64_OMMtxPop(void) {
struct OMMtx *tmp;
if (gOMMtxHead == 0) {
@ -475,115 +469,106 @@ struct OMMtx *object_manager_get_om_mtx(void) {
}
tmp = gOMMtxHead;
gOMMtxHead = gOMMtxHead->next;
D_8004A794++;
gOMMtxCount++;
return tmp;
}
// Another potential push
void push_om_mtx(struct OMMtx *arg0) {
void HS64_OMMtxPush(struct OMMtx *arg0) {
arg0->next = gOMMtxHead;
gOMMtxHead = arg0;
D_8004A794--;
gOMMtxCount--;
}
// pops the top of D_8004A79C?
struct AObj *object_manager_get_animstack(void) {
struct AObj *HS64_AObjPop(void) {
struct AObj *toReturn;
if (D_8004A79C == 0) {
if (gAObjHead == 0) {
fatal_printf("om : couldn't get AObj\n");
while (TRUE);
}
toReturn = D_8004A79C;
D_8004A79C = D_8004A79C->next;
D_8004A7A0++;
toReturn = gAObjHead;
gAObjHead = gAObjHead->next;
gAObjCount++;
return toReturn;
}
// Sets a new head of the unk6C list in anim
void func_80008830(struct Animation *anim, struct AObj *element) {
element->next = anim->unk6C;
anim->unk6C = element;
void func_80008830(struct Animation *anim, struct AObj *aobj) {
aobj->next = anim->aobj;
anim->aobj = aobj;
}
void func_80008840(struct Animation *arg0, struct AObj *element) {
element->next = arg0->unk90;
arg0->unk90 = element;
void func_80008840(struct Animation *arg0, struct AObj *aobj) {
aobj->next = arg0->unk90;
arg0->unk90 = aobj;
}
// TODO: is this _really_ for Animations?
void func_80008850(struct Animation *anim, struct AObj *element) {
element->next = anim->unk6C;
anim->unk6C = element;
void func_80008850(struct Animation *anim, struct AObj *aobj) {
aobj->next = anim->aobj;
anim->aobj = aobj;
}
void func_80008860(struct AObj *arg0) {
arg0->next = D_8004A79C;
D_8004A7A0--;
D_8004A79C = arg0;
void HS64_AObjPush(struct AObj *arg0) {
arg0->next = gAObjHead;
gAObjCount--;
gAObjHead = arg0;
}
// Another potential pop
struct MObj* object_manager_get_m_obj(void) {
struct MObj* HS64_MObjPop(void) {
struct MObj *temp_v0;
if (D_8004A7A4 == 0) {
if (gMObjHead == 0) {
fatal_printf("om : couldn't get MObj\n");
while (TRUE);
}
temp_v0 = D_8004A7A4;
D_8004A7A4 = D_8004A7A4->next;
D_8004A7A8++;
temp_v0 = gMObjHead;
gMObjHead = gMObjHead->next;
gMObjCount++;
return temp_v0;
}
// Another potential push
void func_800088E4(struct MObj *arg0) {
arg0->next = D_8004A7A4;
D_8004A7A4 = arg0;
D_8004A7A8--;
void HS64_MObjPush(struct MObj *arg0) {
arg0->next = gMObjHead;
gMObjHead = arg0;
gMObjCount--;
}
// Another potential pop
struct DObj *object_manager_get_d_obj(void) {
struct DObj *HS64_DObjPop(void) {
struct DObj *temp_v0;
if (D_8004A7AC == 0) {
if (gDObjHead == 0) {
fatal_printf("om : couldn't get DObj\n");
while (TRUE);
}
temp_v0 = D_8004A7AC;
D_8004A7AC = D_8004A7AC->unk0;
D_8004A7B0++;
temp_v0 = gDObjHead;
gDObjHead = gDObjHead->unk0;
gDObjCount++;
return temp_v0;
}
// Another potential push
void func_80008968(struct DObj *arg0) {
arg0->unk0 = D_8004A7AC;
D_8004A7AC = arg0;
D_8004A7B0--;
void HS64_DObjPush(struct DObj *arg0) {
arg0->unk0 = gDObjHead;
gDObjHead = arg0;
gDObjCount--;
}
// Another potential pop
struct Camera *object_manager_get_camera(void) {
struct Camera *HS64_CameraPop(void) {
struct Camera *temp_v0;
if (D_8004A7BC == 0) {
if (gCameraHead == 0) {
fatal_printf("om : couldn't get Camera\n");
while (TRUE);
}
temp_v0 = D_8004A7BC;
D_8004A7BC = D_8004A7BC->unk0;
D_8004A7C0++;
temp_v0 = gCameraHead;
gCameraHead = gCameraHead->unk0;
gCameraCount++;
return temp_v0;
}
// Another potential push
void func_800089EC(struct Camera *arg0) {
arg0->unk0 = D_8004A7BC;
D_8004A7BC = arg0;
D_8004A7C0--;
void HS64_CameraPush(struct Camera *arg0) {
arg0->unk0 = gCameraHead;
gCameraHead = arg0;
gCameraCount--;
}
struct GObjThread *get_gobj_thread();
@ -751,10 +736,10 @@ GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_80009658.s")
extern void func_80008830(struct Animation *anim, struct AObj *stack);
// Initializes a new AObj with an index
struct AObj *func_800097E0(struct Animation *anim, u8 index) {
struct AObj *HS64_AObjNew(struct Animation *anim, u8 index) {
struct AObj *toReturn;
toReturn = object_manager_get_animstack();
toReturn = HS64_AObjPop();
toReturn->unk4 = index;
toReturn->unk5 = 0;
toReturn->unk20 = 0;
@ -777,7 +762,7 @@ void func_8000984C(struct unk8000BE90Func *arg0) {
phi_s0 = arg0->unk6C;
while (phi_s0 != 0) {
temp_s1 = phi_s0->next;
func_80008860(phi_s0);
HS64_AObjPush(phi_s0);
phi_s0 = temp_s1;
}
arg0->unk6C = 0;
@ -787,7 +772,7 @@ void func_8000984C(struct unk8000BE90Func *arg0) {
struct AObj *func_800098AC(s32 arg0, u8 index) {
struct AObj *toReturn;
toReturn = object_manager_get_animstack();
toReturn = HS64_AObjPop();
toReturn->unk4 = index;
toReturn->unk5 = 0;
toReturn->unk20 = 0;
@ -810,7 +795,7 @@ void func_80009918(struct unk80008840 *arg0) {
phi_s0 = arg0->unk90;
while (phi_s0 != 0) {
temp_s1 = phi_s0->next;
func_80008860(phi_s0);
HS64_AObjPush(phi_s0);
phi_s0 = temp_s1;
}
arg0->unk90 = 0;
@ -820,7 +805,7 @@ void func_80009918(struct unk80008840 *arg0) {
struct AObj *func_80009978(struct Animation* arg0, u8 arg1) {
struct AObj *temp_v0;
temp_v0 = object_manager_get_animstack();
temp_v0 = HS64_AObjPop();
temp_v0->unk4 = arg1;
temp_v0->unk5 = (u8)0;
temp_v0->unk20 = 0;
@ -837,18 +822,18 @@ struct AObj *func_80009978(struct Animation* arg0, u8 arg1) {
extern f32 D_80040654;
// Unused?
void func_800099E4(struct Animation *arg0) {
void func_800099E4(struct Animation *anim) {
struct AObj *temp_s1;
struct AObj *phi_s0;
phi_s0 = arg0->unk6C;
phi_s0 = anim->aobj;
while (phi_s0 != 0) {
temp_s1 = phi_s0->next;
func_80008860(phi_s0);
HS64_AObjPush(phi_s0);
phi_s0 = temp_s1;
}
arg0->unk6C = 0;
arg0->scale = D_80040654;
anim->aobj = 0;
anim->scale = D_80040654;
}
#ifdef MIPS_TO_C
@ -867,7 +852,7 @@ struct MObj *func_80009A44(void *arg0, void *arg1) {
void *phi_t9;
struct MObj *phi_t0;
temp_v0 = object_manager_get_m_obj();
temp_v0 = HS64_MObjPop();
temp_a2 = arg0->unk80;
if (temp_a2 != 0) {
temp_v1 = temp_a2->next;
@ -941,14 +926,14 @@ loop_1:
if (temp_s0 != 0) {
loop_2:
temp_s1 = phi_s0->next;
func_80008860(phi_s0);
HS64_AObjPush(phi_s0);
phi_s0 = temp_s1;
if (temp_s1 != 0) {
goto loop_2;
}
}
temp_s0_2 = phi_s2->next;
func_800088E4(phi_s2);
HS64_MObjPush(phi_s2);
phi_s2 = temp_s0_2;
if (temp_s0_2 != 0) {
goto loop_1;
@ -1006,7 +991,7 @@ struct DObj *func_80009C38(struct GObj *arg0, u8 *arg1) {
phi_a2 = D_8004A7C4;
}
arg0 = phi_a2;
temp_v0 = object_manager_get_d_obj();
temp_v0 = HS64_DObjPop();
temp_a3 = arg0->unk3C;
if (temp_a3 != 0) {
temp_v1 = temp_a3->unk8;
@ -1047,7 +1032,7 @@ struct DObj *func_80009CE8(void *arg0, u8 *arg1) {
struct DObj *temp_v0;
struct DObj *temp_v1;
temp_v0 = object_manager_get_d_obj();
temp_v0 = HS64_DObjPop();
temp_v1 = arg0->unk8;
if (temp_v1 != 0) {
temp_v1->unkC = temp_v0;
@ -1077,7 +1062,7 @@ struct DObj *func_80009D5C(void *arg0, u8 *arg1) {
struct DObj *phi_v1;
struct DObj *phi_a0;
temp_v0 = object_manager_get_d_obj();
temp_v0 = HS64_DObjPop();
temp_a2 = arg0->unk10;
if (temp_a2 != 0) {
temp_v1 = temp_a2->unk8;
@ -1176,7 +1161,7 @@ loop_1:
loop_12:
temp_a0 = phi_s1->unk58;
if (temp_a0 != 0) {
push_om_mtx(temp_a0);
HS64_OMMtxPush(temp_a0);
}
temp_s0_3 = phi_s0_2 + 4;
phi_s1 = phi_s1 + 4;
@ -1196,7 +1181,7 @@ loop_12:
if (temp_s1 != 0) {
loop_19:
temp_s0_4 = phi_s1_2->next;
func_80008860(phi_s1_2);
HS64_AObjPush(phi_s1_2);
phi_s1_2 = temp_s0_4;
if (temp_s0_4 != 0) {
goto loop_19;
@ -1211,20 +1196,20 @@ loop_21:
if (temp_s1_2 != 0) {
loop_22:
temp_s0_5 = phi_s1_3->next;
func_80008860(phi_s1_3);
HS64_AObjPush(phi_s1_3);
phi_s1_3 = temp_s0_5;
if (temp_s0_5 != 0) {
goto loop_22;
}
}
temp_s0_6 = phi_s2->next;
func_800088E4(phi_s2);
HS64_MObjPush(phi_s2);
phi_s2 = temp_s0_6;
if (temp_s0_6 != 0) {
goto loop_21;
}
}
func_80008968(arg0);
HS64_DObjPush(arg0);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_80009DF4.s")
@ -1240,7 +1225,7 @@ struct Camera *func_80009F7C(struct GObj *gobj) {
gobj = D_8004A7C4;
}
gobj->unkF = 3;
cam = object_manager_get_camera();
cam = HS64_CameraPop();
gobj->unk3C = cam;
@ -1288,7 +1273,7 @@ void func_8000A02C(struct Camera *arg0) {
loop_1:
temp_a0 = phi_s1->unk64;
if (temp_a0 != 0) {
push_om_mtx(temp_a0);
HS64_OMMtxPush(temp_a0);
}
temp_s0 = phi_s0 + 4;
phi_s1 = phi_s1 + 4;
@ -1301,13 +1286,13 @@ loop_1:
if (temp_s0_2 != 0) {
loop_5:
temp_s1 = phi_s0_2->next;
func_80008860(phi_s0_2);
HS64_AObjPush(phi_s0_2);
phi_s0_2 = temp_s1;
if (temp_s1 != 0) {
goto loop_5;
}
}
func_800089EC(arg0);
HS64_CameraPush(arg0);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_8000A02C.s")
@ -1320,7 +1305,7 @@ struct GObj *omGAddCommon(u32 id, void (*arg1)(void), u8 link, u32 arg3) {
fatal_printf(D_800403DC, link, id); // "omGAddCommon() : link num over : link = %d : id = %d\n"
while (1);
}
toReturn = get_gobj();
toReturn = HS64_GObjPop();
if (toReturn == NULL) {
return NULL;
}
@ -1406,7 +1391,7 @@ void func_8000A29C(struct GObj *arg0) {
omGDLLinkDestructor(arg0);
}
func_80008528(arg0);
push_gobj(arg0);
HS64_GObjPush(arg0);
}
// i genuinely don't know what's going on here
@ -1751,7 +1736,7 @@ void func_8000AD88(void) {
}
#ifdef MIPS_TO_C
void func_8000AE84(void *arg0) {
void HS64_omInit(void *arg0) {
? *temp_t4_2;
? *temp_v0_14;
? *temp_v0_4;
@ -1950,7 +1935,7 @@ void func_8000AE84(void *arg0) {
phi_a0_14 = phi_a0_13;
if (arg0->unk3C != 0) {
temp_v1_4 = arg0->unk38;
D_8004A79C = temp_v1_4;
gAObjHead = temp_v1_4;
phi_v1_7 = temp_v1_4;
phi_v1_8 = temp_v1_4;
if ((arg0->unk3C - 1) > 0) {
@ -1973,7 +1958,7 @@ void func_8000AE84(void *arg0) {
phi_a0_15 = phi_a0_14;
if (arg0->unk44 != 0) {
temp_v1_5 = arg0->unk40;
D_8004A7A4 = temp_v1_5;
gMObjHead = temp_v1_5;
phi_v1_9 = temp_v1_5;
phi_v1_10 = temp_v1_5;
if ((arg0->unk44 - 1) > 0) {
@ -1997,7 +1982,7 @@ void func_8000AE84(void *arg0) {
phi_a0_16 = phi_a0_15;
if (arg0->unk4C != 0) {
temp_v0_10 = arg0->unk48;
D_8004A7AC = temp_v0_10;
gDObjHead = temp_v0_10;
phi_v0_6 = temp_v0_10;
phi_v0_7 = temp_v0_10;
if ((arg0->unk4C - 1) > 0) {
@ -2040,7 +2025,7 @@ void func_8000AE84(void *arg0) {
}
if (arg0->unk64 != 0) {
temp_v0_12 = arg0->unk60;
D_8004A7BC = temp_v0_12;
gCameraHead = temp_v0_12;
phi_v0_10 = temp_v0_12;
phi_v0_11 = temp_v0_12;
if ((arg0->unk64 - 1) > 0) {
@ -2086,12 +2071,12 @@ void func_8000AE84(void *arg0) {
} while (temp_v0_14 != &D_8004A704);
func_8001479C(&D_8004A704, arg0, &gNewEntityStackSize);
osCreateMesgQueue(&HS64_GObjProcMesgQ, &D_8004A7D8, 1);
D_8004A7C0 = 0;
gCameraCount = 0;
D_8004A7B8 = 0;
D_8004A7B0 = 0;
D_8004A7A0 = 0;
D_8004A794 = 0;
D_8004A78C = 0;
gDObjCount = 0;
gAObjCount = 0;
gOMMtxCount = 0;
gGObjCount = 0;
D_8004A570 = 0;
D_8004A544 = 0;
D_8004A548 = 0;
@ -2237,47 +2222,30 @@ void finish_current_thread(s32 arg) {
}
}
#ifdef MIPS_TO_C
void *func_8000B758(struct GObj *arg0) {
void *temp_v0;
void *temp_v0_2;
struct GObj *phi_a0;
void *phi_v0;
void *phi_return;
phi_a0 = arg0;
if (arg0 == 0) {
phi_a0 = D_8004A7C4;
}
temp_v0 = phi_a0->unk18;
phi_v0 = temp_v0;
phi_return = temp_v0;
if (temp_v0 != 0) {
loop_3:
phi_v0->unk15 = 1;
temp_v0_2 = phi_v0->unk0;
phi_v0 = temp_v0_2;
phi_return = temp_v0_2;
if (temp_v0_2 != 0) {
goto loop_3;
}
}
return phi_return;
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_8000B758.s")
#endif
void func_8000B78C(struct GObj *arg0) {
struct GObjProcess *phi_v0;
void func_8000B758(struct GObj *arg0) {
struct GObjProcess *proc;
if (arg0 == NULL) {
arg0 = D_8004A7C4;
}
phi_v0 = arg0->proc;
while (phi_v0 != NULL) {
phi_v0->unk15 = 0;
phi_v0 = phi_v0->unk0;
proc = arg0->proc;
while (proc != NULL) {
proc->unk15 = 1;
proc = proc->unk0;
}
}
void func_8000B78C(struct GObj *arg0) {
struct GObjProcess *proc;
if (arg0 == NULL) {
arg0 = D_8004A7C4;
}
proc = arg0->proc;
while (proc != NULL) {
proc->unk15 = 0;
proc = proc->unk0;
}
}
@ -2296,58 +2264,35 @@ void func_8000B7D8(struct GObjProcess *arg0) {
arg0->unk15 = 0;
}
#ifdef MIPS_TO_C
void *func_8000B7F0(struct GObj *arg0, s32 arg1) {
if (arg0 == 0) {
arg0 = D_8004A7C4;
void func_8000B7F0(struct GObj *gobj, void (*entryPoint)(struct GObj *)) {
GObjProcess *proc;
if (gobj == 0) {
gobj = D_8004A7C4;
}
temp_v0 = arg0->unk18;
phi_v0 = arg0->unk18;
while (arg0->unk18 != 0) {
if (arg1 == phi_v0->unk20) {
phi_v0->unk15 = 1;
proc = gobj->proc;
while (proc != 0) {
if (entryPoint == proc->entryPoint) {
proc->unk15 = 1;
}
temp_v0_2 = phi_v0->unk0;
phi_v0 = temp_v0_2;
phi_return = temp_v0_2;
proc = proc->unk0;
}
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_8000B7F0.s")
#endif
#ifdef MIPS_TO_C
void *func_8000B830(struct GObj *arg0, s32 arg1) {
void *temp_v0;
void *temp_v0_2;
struct GObj *phi_a0;
void *phi_v0;
void *phi_return;
void func_8000B830(struct GObj *gobj, void (*entryPoint)(struct GObj *)) {
GObjProcess *proc;
phi_a0 = arg0;
if (arg0 == 0) {
phi_a0 = D_8004A7C4;
if (gobj == 0) {
gobj = D_8004A7C4;
}
temp_v0 = phi_a0->unk18;
phi_v0 = temp_v0;
phi_return = temp_v0;
if (temp_v0 != 0) {
loop_3:
if (arg1 == phi_v0->unk20) {
phi_v0->unk15 = 0;
}
temp_v0_2 = phi_v0->unk0;
phi_v0 = temp_v0_2;
phi_return = temp_v0_2;
if (temp_v0_2 != 0) {
goto loop_3;
proc = gobj->proc;
while (proc != 0) {
if (entryPoint == proc->entryPoint) {
proc->unk15 = 0;
}
proc = proc->unk0;
}
return phi_return;
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_2_5/func_8000B830.s")
#endif
void func_8000B870(struct GObj *arg0) {
struct GObjProcess *temp_s1;

2
src/ovl0/ovl0_2_5.c
View File

@ -1172,7 +1172,7 @@ void func_80007380(struct UnkStructFunc80007380 *arg0) {
D_8004A490.unk60 = alloc_with_alignment(arg0->unk84 * arg0->unk80, 8);
D_8004A490.unk64 = arg0->unk80;
D_8004A490.unk68 = arg0->unk84;
func_8000AE84(&D_8004A490);
HS64_omInit(&D_8004A490);
gDynamicBuffer3.buffer.poolEnd = &D_80006E94;
gDynamicBuffer3.unk10 = &D_80006EE4;
func_8000708C(arg0, arg0->unk88);

6
src/ovl0/ovl0_2_5.h
View File

@ -62,12 +62,12 @@ typedef struct GObjProcess {
u8 unk15;
u8 unk16;
u8 unk17;
struct GObj *gobj;
/* 0x18 */ struct GObj *gobj;
union {
struct GObjThread *thread;
void (*callback)(struct GObj *);
} payload;
void (*entryPoint)(struct GObj *);
} payload; // 0x1C
/* 0x20 */ void (*entryPoint)(struct GObj *);
u32 *ptr;
} GObjProcess;

16
src/ovl0/ovl0_3.c
View File

@ -499,7 +499,7 @@ loop_14:
if (phi_s2 != 0 && (phi_s2 & 1) != 0) {
// temp_s0_2 = &(&sp80)[phi_s1];
if (sp80[phi_s1] == 0) {
temp_v0_4 = func_800097E0(anim, (phi_s1 + 1) & 0xFF);
temp_v0_4 = HS64_AObjNew(anim, (phi_s1 + 1) & 0xFF);
sp80[phi_s1] = temp_v0_4;
}
phi_v1->unk10 = phi_v1->unk14;
@ -531,7 +531,7 @@ loop_14:
temp_s0_3 = &(&sp80)[phi_s1_2];
phi_v1_2 = *temp_s0_3;
if (*temp_s0_3 == 0) {
temp_v0_5 = func_800097E0(anim, (phi_s1_2 + 1) & 0xFF);
temp_v0_5 = HS64_AObjNew(anim, (phi_s1_2 + 1) & 0xFF);
*temp_s0_3 = temp_v0_5;
phi_v1_2 = temp_v0_5;
}
@ -569,7 +569,7 @@ loop_14:
temp_s0_4 = &(&sp80)[phi_s1_3];
phi_v1_3 = *temp_s0_4;
if (*temp_s0_4 == 0) {
temp_v0_6 = func_800097E0(anim, (phi_s1_3 + 1) & 0xFF);
temp_v0_6 = HS64_AObjNew(anim, (phi_s1_3 + 1) & 0xFF);
*temp_s0_4 = temp_v0_6;
phi_v1_3 = temp_v0_6;
}
@ -607,7 +607,7 @@ loop_14:
temp_s0_5 = &(&sp80)[phi_s1_4];
phi_v1_4 = *temp_s0_5;
if (*temp_s0_5 == 0) {
temp_v0_7 = func_800097E0(anim, (phi_s1_4 + 1) & 0xFF);
temp_v0_7 = HS64_AObjNew(anim, (phi_s1_4 + 1) & 0xFF);
*temp_s0_5 = temp_v0_7;
phi_v1_4 = temp_v0_7;
}
@ -640,7 +640,7 @@ loop_14:
temp_s0_6 = &(&sp80)[phi_s1_5];
phi_v1_5 = *temp_s0_6;
if (*temp_s0_6 == 0) {
temp_v0_8 = func_800097E0(anim, (phi_s1_5 + 1) & 0xFF);
temp_v0_8 = HS64_AObjNew(anim, (phi_s1_5 + 1) & 0xFF);
*temp_s0_6 = temp_v0_8;
phi_v1_5 = temp_v0_8;
}
@ -693,7 +693,7 @@ loop_14:
temp_s0_7 = &(&sp80)[phi_s1_6];
phi_v1_6 = *temp_s0_7;
if (*temp_s0_7 == 0) {
temp_v0_9 = func_800097E0(anim, (phi_s1_6 + 1) & 0xFF);
temp_v0_9 = HS64_AObjNew(anim, (phi_s1_6 + 1) & 0xFF);
*temp_s0_7 = temp_v0_9;
phi_v1_6 = temp_v0_9;
}
@ -710,7 +710,7 @@ loop_14:
case 13:
anim->command++;
if (sp8C == 0) {
sp8C = func_800097E0(anim, (u8)4U);
sp8C = HS64_AObjNew(anim, (u8)4U);
}
sp8C->unk20 = (s32) *anim->command;
anim->command++;
@ -1243,7 +1243,7 @@ loop_11:
if (func_8000E554(0, arg0, &spB0, &spA8, spC0, arg3, phi_s0, arg4, &sp80, &sp98) == 0) {
func_8000E554(1, arg0, &spB4, &spAC, spC4, arg3, phi_s0, arg4, &sp8C, &sp9C);
if ((spB0 != spB4) || (spA8 != spAC)) {
temp_v0_2 = func_800097E0(arg0, phi_s0 & 0xFF);
temp_v0_2 = HS64_AObjNew(arg0, phi_s0 & 0xFF);
temp_v1 = temp_v0_2;
if ((phi_s0 == 1) || (phi_s0 == 2) || (phi_s0 == 3)) {
temp_f0 = spB4 + temp_f24;

4
src/ovl0/ovl0_3.h
View File

@ -50,7 +50,7 @@ struct Animation {
u32 unk60;
u32 unk64;
u32 unk68;
struct AObj *unk6C;
struct AObj *aobj;
u32 *command;
f32 scale; // unk74
u32 unk78;
@ -63,7 +63,7 @@ struct Animation {
};
void func_8000C3D8(struct Animation *anim);
struct AObj *func_800097E0(struct Animation *anim, u8 something);
struct AObj *HS64_AObjNew(struct Animation *anim, u8 something);
// struct UnkStruct8004A7C4_3C