mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove some unaligned fake symbols (#535)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* a few fake syms

* two more

* format
This commit is contained in:
petrie911 2020-12-16 21:10:42 -06:00 committed by GitHub
parent 5632df406b
commit 6e78efd0c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 60 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s
View file

@ -27,12 +27,12 @@ glabel BgHidanRock_Update
/* 00B58 8088BBD8 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C
.L8088BBDC:
/* 00B5C 8088BBDC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00
/* 00B60 8088BBE0 3C088089 */ lui $t0, %hi(D_8088BFAE) ## $t0 = 80890000
/* 00B60 8088BBE0 3C088089 */ lui $t0, %hi(D_8088BF8C+0x22) ## $t0 = 80890000
/* 00B64 8088BBE4 4600203C */ c.lt.s $f4, $f0
/* 00B68 8088BBE8 00000000 */ nop
/* 00B6C 8088BBEC 45020010 */ bc1fl .L8088BC30
/* 00B70 8088BBF0 8FBF0024 */ lw $ra, 0x0024($sp)
/* 00B74 8088BBF4 8508BFAE */ lh $t0, %lo(D_8088BFAE)($t0)
/* 00B74 8088BBF4 8508BFAE */ lh $t0, %lo(D_8088BF8C+0x22)($t0)
/* 00B78 8088BBF8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 00B7C 8088BBFC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 00B80 8088BC00 44883000 */ mtc1 $t0, $f6 ## $f6 = -0.00

12
asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s
View file

@ -35,13 +35,13 @@ glabel func_80890740
/* 00078 808907B8 00491821 */ addu $v1, $v0, $t1
/* 0007C 808907BC A60801A8 */ sh $t0, 0x01A8($s0) ## 000001A8
/* 00080 808907C0 846A0000 */ lh $t2, 0x0000($v1) ## 00000000
/* 00084 808907C4 3C0B8089 */ lui $t3, %hi(D_80891772) ## $t3 = 80890000
/* 00084 808907C4 3C0B8089 */ lui $t3, %hi(D_80891770+2) ## $t3 = 80890000
/* 00088 808907C8 10800006 */ beq $a0, $zero, .L808907E4
/* 0008C 808907CC A60A01AA */ sh $t2, 0x01AA($s0) ## 000001AA
/* 00090 808907D0 256B1772 */ addiu $t3, $t3, %lo(D_80891772) ## $t3 = 80891772
/* 00090 808907D0 256B1772 */ addiu $t3, $t3, %lo(D_80891770+2) ## $t3 = 80891772
/* 00094 808907D4 106B0003 */ beq $v1, $t3, .L808907E4
/* 00098 808907D8 3C0C8089 */ lui $t4, %hi(D_80891778) ## $t4 = 80890000
/* 0009C 808907DC 258C1778 */ addiu $t4, $t4, %lo(D_80891778) ## $t4 = 80891778
/* 00098 808907D8 3C0C8089 */ lui $t4, %hi(D_80891770+8) ## $t4 = 80890000
/* 0009C 808907DC 258C1778 */ addiu $t4, $t4, %lo(D_80891770+8) ## $t4 = 80891778
/* 000A0 808907E0 146C0015 */ bne $v1, $t4, .L80890838
.L808907E4:
/* 000A4 808907E4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4
@ -69,8 +69,8 @@ glabel func_80890740
/* 000F0 80890830 846F0000 */ lh $t7, 0x0000($v1) ## 00000000
/* 000F4 80890834 A60F01F6 */ sh $t7, 0x01F6($s0) ## 000001F6
.L80890838:
/* 000F8 80890838 3C188089 */ lui $t8, %hi(D_80891778) ## $t8 = 80890000
/* 000FC 8089083C 27181778 */ addiu $t8, $t8, %lo(D_80891778) ## $t8 = 80891778
/* 000F8 80890838 3C188089 */ lui $t8, %hi(D_80891770+8) ## $t8 = 80890000
/* 000FC 8089083C 27181778 */ addiu $t8, $t8, %lo(D_80891770+8) ## $t8 = 80891778
/* 00100 80890840 54780008 */ bnel $v1, $t8, .L80890864
/* 00104 80890844 8FBF001C */ lw $ra, 0x001C($sp)
/* 00108 80890848 861901B2 */ lh $t9, 0x01B2($s0) ## 000001B2

4
asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s
View file

@ -70,12 +70,12 @@ glabel func_80898920
/* 00118 808989B8 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 0011C 808989BC 4481F000 */ mtc1 $at, $f30 ## $f30 = 10.00
/* 00120 808989C0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000
/* 00124 808989C4 3C18808A */ lui $t8, %hi(D_808994D6) ## $t8 = 808A0000
/* 00124 808989C4 3C18808A */ lui $t8, %hi(D_808994AC+0x2A) ## $t8 = 808A0000
/* 00128 808989C8 4481E000 */ mtc1 $at, $f28 ## $f28 = 6.00
/* 0012C 808989CC 000E7840 */ sll $t7, $t6, 1
/* 00130 808989D0 030FC021 */ addu $t8, $t8, $t7
/* 00134 808989D4 3C014100 */ lui $at, 0x4100 ## $at = 41000000
/* 00138 808989D8 871894D6 */ lh $t8, %lo(D_808994D6)($t8)
/* 00138 808989D8 871894D6 */ lh $t8, %lo(D_808994AC+0x2A)($t8)
/* 0013C 808989DC 4481D000 */ mtc1 $at, $f26 ## $f26 = 8.00
/* 00140 808989E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000
/* 00144 808989E4 4481C000 */ mtc1 $at, $f24 ## $f24 = 20.00

4
asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s
View file

@ -68,12 +68,12 @@ glabel func_80898DB4
/* 005A4 80898E44 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 005A8 80898E48 820E02FF */ lb $t6, 0x02FF($s0) ## 000002FF
/* 005AC 80898E4C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000
/* 005B0 80898E50 3C18808A */ lui $t8, %hi(D_808994D6) ## $t8 = 808A0000
/* 005B0 80898E50 3C18808A */ lui $t8, %hi(D_808994AC+0x2A) ## $t8 = 808A0000
/* 005B4 80898E54 4481E000 */ mtc1 $at, $f28 ## $f28 = 6.00
/* 005B8 80898E58 000E7840 */ sll $t7, $t6, 1
/* 005BC 80898E5C 030FC021 */ addu $t8, $t8, $t7
/* 005C0 80898E60 3C014100 */ lui $at, 0x4100 ## $at = 41000000
/* 005C4 80898E64 871894D6 */ lh $t8, %lo(D_808994D6)($t8)
/* 005C4 80898E64 871894D6 */ lh $t8, %lo(D_808994AC+0x2A)($t8)
/* 005C8 80898E68 4481D000 */ mtc1 $at, $f26 ## $f26 = 8.00
/* 005CC 80898E6C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000
/* 005D0 80898E70 4481C000 */ mtc1 $at, $f24 ## $f24 = 80.00

4
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096712C.s
View file

@ -75,11 +75,11 @@ glabel func_8096712C
/* 008B0 80967200 5521000D */ bnel $t1, $at, .L80967238
/* 008B4 80967204 8FBF0014 */ lw $ra, 0x0014($sp)
/* 008B8 80967208 848B001C */ lh $t3, 0x001C($a0) ## 0000001C
/* 008BC 8096720C 3C0D8097 */ lui $t5, %hi(D_80969326) ## $t5 = 80970000
/* 008BC 8096720C 3C0D8097 */ lui $t5, %hi(D_8096932C-6) ## $t5 = 80970000
/* 008C0 80967210 94CA1D74 */ lhu $t2, 0x1D74($a2) ## 00001D74
/* 008C4 80967214 000B6040 */ sll $t4, $t3, 1
/* 008C8 80967218 01AC6821 */ addu $t5, $t5, $t4
/* 008CC 8096721C 95AD9326 */ lhu $t5, %lo(D_80969326)($t5)
/* 008CC 8096721C 95AD9326 */ lhu $t5, %lo(D_8096932C-6)($t5)
/* 008D0 80967220 014D082A */ slt $at, $t2, $t5
/* 008D4 80967224 50200004 */ beql $at, $zero, .L80967238
/* 008D8 80967228 8FBF0014 */ lw $ra, 0x0014($sp)

4
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s
View file

@ -98,14 +98,14 @@ glabel func_80967244
/* 00A38 80967388 91AE0001 */ lbu $t6, 0x0001($t5) ## 00000001
/* 00A3C 8096738C 3C0C8097 */ lui $t4, %hi(D_80969354) ## $t4 = 80970000
/* 00A40 80967390 258C9354 */ addiu $t4, $t4, %lo(D_80969354) ## $t4 = 80969354
/* 00A44 80967394 A02E9355 */ sb $t6, %lo(D_80969355)($at)
/* 00A44 80967394 A02E9355 */ sb $t6, %lo(D_80969354+1)($at)
/* 00A48 80967398 920F0293 */ lbu $t7, 0x0293($s0) ## 00000293
/* 00A4C 8096739C 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014
/* 00A50 809673A0 01E30019 */ multu $t7, $v1
/* 00A54 809673A4 0000C012 */ mflo $t8
/* 00A58 809673A8 0058C821 */ addu $t9, $v0, $t8
/* 00A5C 809673AC 93280002 */ lbu $t0, 0x0002($t9) ## 00000002
/* 00A60 809673B0 A0289356 */ sb $t0, %lo(D_80969356)($at)
/* 00A60 809673B0 A0289356 */ sb $t0, %lo(D_80969354+2)($at)
/* 00A64 809673B4 848900A4 */ lh $t1, 0x00A4($a0) ## 000000A4
/* 00A68 809673B8 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043
/* 00A6C 809673BC 55210004 */ bnel $t1, $at, .L809673D0

8
asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s
View file

@ -89,8 +89,8 @@ glabel EnDekubaba_Init
/* 00148 809E5918 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 0014C 809E591C 13200003 */ beq $t9, $zero, .L809E592C
/* 00150 809E5920 3C05809F */ lui $a1, %hi(D_809E9000) ## $a1 = 809F0000
/* 00154 809E5924 3C01809F */ lui $at, %hi(D_809E901B) ## $at = 809F0000
/* 00158 809E5928 A028901B */ sb $t0, %lo(D_809E901B)($at)
/* 00154 809E5924 3C01809F */ lui $at, %hi(D_809E9000+0x1B) ## $at = 809F0000
/* 00158 809E5928 A028901B */ sb $t0, %lo(D_809E9000+0x1B)($at)
.L809E592C:
/* 0015C 809E592C 0C0187B5 */ jal func_80061ED4
/* 00160 809E5930 24A59000 */ addiu $a1, $a1, %lo(D_809E9000) ## $a1 = 809E9000
@ -127,10 +127,10 @@ glabel EnDekubaba_Init
.L809E59A4:
/* 001D4 809E59A4 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8)
/* 001D8 809E59A8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004
/* 001DC 809E59AC 3C01809F */ lui $at, %hi(D_809E8FFB) ## $at = 809F0000
/* 001DC 809E59AC 3C01809F */ lui $at, %hi(D_809E8FE0+0x1B) ## $at = 809F0000
/* 001E0 809E59B0 13000002 */ beq $t8, $zero, .L809E59BC
/* 001E4 809E59B4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 001E8 809E59B8 A0398FFB */ sb $t9, %lo(D_809E8FFB)($at)
/* 001E8 809E59B8 A0398FFB */ sb $t9, %lo(D_809E8FE0+0x1B)($at)
.L809E59BC:
/* 001EC 809E59BC 0C0187B5 */ jal func_80061ED4
/* 001F0 809E59C0 24C68FD8 */ addiu $a2, $a2, %lo(D_809E8FD8) ## $a2 = 809E8FD8

4
asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s
View file

@ -13,14 +13,14 @@ glabel func_80A00588
/* 00614 80A005B4 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF
/* 00618 80A005B8 90EE0298 */ lbu $t6, 0x0298($a3) ## 00000298
/* 0061C 80A005BC 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004
/* 00620 80A005C0 3C0980A0 */ lui $t1, %hi(D_80A01992) ## $t1 = 80A00000
/* 00620 80A005C0 3C0980A0 */ lui $t1, %hi(D_80A01970+0x22) ## $t1 = 80A00000
/* 00624 80A005C4 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000
/* 00628 80A005C8 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010
/* 0062C 80A005CC A0EF0298 */ sb $t7, 0x0298($a3) ## 00000298
/* 00630 80A005D0 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004
/* 00634 80A005D4 A4E80194 */ sh $t0, 0x0194($a3) ## 00000194
/* 00638 80A005D8 E4E4006C */ swc1 $f4, 0x006C($a3) ## 0000006C
/* 0063C 80A005DC 85291992 */ lh $t1, %lo(D_80A01992)($t1)
/* 0063C 80A005DC 85291992 */ lh $t1, %lo(D_80A01970+0x22)($t1)
/* 00640 80A005E0 3C0A80A0 */ lui $t2, %hi(func_80A01010) ## $t2 = 80A00000
/* 00644 80A005E4 254A1010 */ addiu $t2, $t2, %lo(func_80A01010) ## $t2 = 80A01010
/* 00648 80A005E8 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190

4
asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s
View file

@ -21,11 +21,11 @@ glabel func_80A00794
/* 0083C 80A007DC 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00
/* 00840 80A007E0 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050
/* 00844 80A007E4 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194
/* 00848 80A007E8 3C0F80A0 */ lui $t7, %hi(D_80A01992) ## $t7 = 80A00000
/* 00848 80A007E8 3C0F80A0 */ lui $t7, %hi(D_80A01970+0x22) ## $t7 = 80A00000
/* 0084C 80A007EC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068
/* 00850 80A007F0 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060
/* 00854 80A007F4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C
/* 00858 80A007F8 85EF1992 */ lh $t7, %lo(D_80A01992)($t7)
/* 00858 80A007F8 85EF1992 */ lh $t7, %lo(D_80A01970+0x22)($t7)
/* 0085C 80A007FC 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050
/* 00860 80A00800 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00864 80A00804 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 80A00008

4
asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01374.s
View file

@ -40,11 +40,11 @@ glabel func_80A01374
/* 01450 80A013F0 5720000A */ bnel $t9, $zero, .L80A0141C
/* 01454 80A013F4 8FBF001C */ lw $ra, 0x001C($sp)
/* 01458 80A013F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00
/* 0145C 80A013FC 3C0880A0 */ lui $t0, %hi(D_80A01992) ## $t0 = 80A00000
/* 0145C 80A013FC 3C0880A0 */ lui $t0, %hi(D_80A01970+0x22) ## $t0 = 80A00000
/* 01460 80A01400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01464 80A01404 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C
/* 01468 80A01408 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060
/* 0146C 80A0140C 85081992 */ lh $t0, %lo(D_80A01992)($t0)
/* 0146C 80A0140C 85081992 */ lh $t0, %lo(D_80A01970+0x22)($t0)
/* 01470 80A01410 0C28012F */ jal func_80A004BC
/* 01474 80A01414 A60802CA */ sh $t0, 0x02CA($s0) ## 000002CA
/* 01478 80A01418 8FBF001C */ lw $ra, 0x001C($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A0142C.s
View file

@ -69,7 +69,7 @@ glabel func_80A0142C
/* 01580 80A01520 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF
.L80A01524:
/* 01584 80A01524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01588 80A01528 3C1880A0 */ lui $t8, %hi(D_80A01992) ## $t8 = 80A00000
/* 01588 80A01528 3C1880A0 */ lui $t8, %hi(D_80A01970+0x22) ## $t8 = 80A00000
/* 0158C 80A0152C 11E00007 */ beq $t7, $zero, .L80A0154C
/* 01590 80A01530 00000000 */ nop
/* 01594 80A01534 0C00BE0A */ jal Audio_PlayActorSound2
@ -80,7 +80,7 @@ glabel func_80A0142C
/* 015A4 80A01544 10000006 */ beq $zero, $zero, .L80A01560
/* 015A8 80A01548 8FBF001C */ lw $ra, 0x001C($sp)
.L80A0154C:
/* 015AC 80A0154C 87181992 */ lh $t8, %lo(D_80A01992)($t8)
/* 015AC 80A0154C 87181992 */ lh $t8, %lo(D_80A01970+0x22)($t8)
/* 015B0 80A01550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 015B4 80A01554 0C2801AC */ jal func_80A006B0
/* 015B8 80A01558 A61802CA */ sh $t8, 0x02CA($s0) ## 000002CA

4
asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s
View file

@ -37,8 +37,8 @@ glabel func_80B325A0
/* 00398 80B32628 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8
/* 0039C 80B3262C 0C00D09B */ jal func_8003426C
/* 003A0 80B32630 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 003A4 80B32634 3C0A80B3 */ lui $t2, %hi(D_80B33AB2) ## $t2 = 80B30000
/* 003A8 80B32638 854A3AB2 */ lh $t2, %lo(D_80B33AB2)($t2)
/* 003A4 80B32634 3C0A80B3 */ lui $t2, %hi(D_80B33A90+0x22) ## $t2 = 80B30000
/* 003A8 80B32638 854A3AB2 */ lh $t2, %lo(D_80B33A90+0x22)($t2)
/* 003AC 80B3263C 3C0B80B3 */ lui $t3, %hi(func_80B331CC) ## $t3 = 80B30000
/* 003B0 80B32640 256B31CC */ addiu $t3, $t3, %lo(func_80B331CC) ## $t3 = 80B331CC
/* 003B4 80B32644 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190

4
asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s
View file

@ -21,11 +21,11 @@ glabel func_80B32660
/* 00418 80B326A8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00
/* 0041C 80B326AC 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050
/* 00420 80B326B0 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194
/* 00424 80B326B4 3C0F80B3 */ lui $t7, %hi(D_80B33AB2) ## $t7 = 80B30000
/* 00424 80B326B4 3C0F80B3 */ lui $t7, %hi(D_80B33A90+0x22) ## $t7 = 80B30000
/* 00428 80B326B8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068
/* 0042C 80B326BC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060
/* 00430 80B326C0 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C
/* 00434 80B326C4 85EF3AB2 */ lh $t7, %lo(D_80B33AB2)($t7)
/* 00434 80B326C4 85EF3AB2 */ lh $t7, %lo(D_80B33A90+0x22)($t7)
/* 00438 80B326C8 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050
/* 0043C 80B326CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00440 80B326D0 25F8000F */ addiu $t8, $t7, 0x000F ## $t8 = 80B3000F

4
asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B333B8.s
View file

@ -52,10 +52,10 @@ glabel func_80B333B8
/* 011D0 80B33460 8FBF001C */ lw $ra, 0x001C($sp)
/* 011D4 80B33464 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00
/* 011D8 80B33468 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00
/* 011DC 80B3346C 3C0880B3 */ lui $t0, %hi(D_80B33AB2) ## $t0 = 80B30000
/* 011DC 80B3346C 3C0880B3 */ lui $t0, %hi(D_80B33A90+0x22) ## $t0 = 80B30000
/* 011E0 80B33470 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C
/* 011E4 80B33474 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060
/* 011E8 80B33478 85083AB2 */ lh $t0, %lo(D_80B33AB2)($t0)
/* 011E8 80B33478 85083AB2 */ lh $t0, %lo(D_80B33A90+0x22)($t0)
/* 011EC 80B3347C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 011F0 80B33480 0C2CC8E1 */ jal func_80B32384
/* 011F4 80B33484 A60802C6 */ sh $t0, 0x02C6($s0) ## 000002C6

8
asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s
View file

@ -251,8 +251,8 @@ glabel L80B3B470
/* 00620 80B3B590 A7A20032 */ sh $v0, 0x0032($sp)
/* 00624 80B3B594 0C2CEC25 */ jal func_80B3B094
/* 00628 80B3B598 8FA50054 */ lw $a1, 0x0054($sp)
/* 0062C 80B3B59C 3C0A80B4 */ lui $t2, %hi(D_80B3BF4E) ## $t2 = 80B40000
/* 00630 80B3B5A0 854ABF4E */ lh $t2, %lo(D_80B3BF4E)($t2)
/* 0062C 80B3B59C 3C0A80B4 */ lui $t2, %hi(D_80B3BF44+0xA) ## $t2 = 80B40000
/* 00630 80B3B5A0 854ABF4E */ lh $t2, %lo(D_80B3BF44+0xA)($t2)
/* 00634 80B3B5A4 860B0032 */ lh $t3, 0x0032($s0) ## 00000032
/* 00638 80B3B5A8 87A20032 */ lh $v0, 0x0032($sp)
/* 0063C 80B3B5AC 014B6021 */ addu $t4, $t2, $t3
@ -263,8 +263,8 @@ glabel L80B3B470
/* 0064C 80B3B5BC 00042403 */ sra $a0, $a0, 16
/* 00650 80B3B5C0 3C0180B4 */ lui $at, %hi(D_80B3C1D0) ## $at = 80B40000
/* 00654 80B3B5C4 E420C1D0 */ swc1 $f0, %lo(D_80B3C1D0)($at)
/* 00658 80B3B5C8 3C0D80B4 */ lui $t5, %hi(D_80B3BF4E) ## $t5 = 80B40000
/* 0065C 80B3B5CC 85ADBF4E */ lh $t5, %lo(D_80B3BF4E)($t5)
/* 00658 80B3B5C8 3C0D80B4 */ lui $t5, %hi(D_80B3BF44+0xA) ## $t5 = 80B40000
/* 0065C 80B3B5CC 85ADBF4E */ lh $t5, %lo(D_80B3BF44+0xA)($t5)
/* 00660 80B3B5D0 860E0032 */ lh $t6, 0x0032($s0) ## 00000032
/* 00664 80B3B5D4 87A20032 */ lh $v0, 0x0032($sp)
/* 00668 80B3B5D8 01AEC021 */ addu $t8, $t5, $t6

4
data/overlays/actors/z_bg_hidan_rock.data.s
View file

@ -20,9 +20,7 @@ glabel Bg_Hidan_Rock_InitVars
.word BgHidanRock_Update
.word BgHidanRock_Draw
glabel D_8088BF8C
.byte 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x2D
glabel D_8088BFAE
.byte 0x00, 0x4D, 0xFF, 0xD8, 0x0C, 0xEE, 0x00, 0x78, 0x00, 0x00
.byte 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x4D, 0xFF, 0xD8, 0x0C, 0xEE, 0x00, 0x78, 0x00, 0x00
glabel D_8088BFB8
.word 0xC8500064, 0x386CFDA8
glabel D_8088BFC0

6
data/overlays/actors/z_bg_ice_shelter.data.s
View file

@ -28,11 +28,7 @@ glabel D_80891738
glabel D_80891764
.word 0x002F0021, 0x002C0029, 0x00640000
glabel D_80891770
.byte 0x00, 0x50
glabel D_80891772
.byte 0x00, 0x36, 0x00, 0x5A, 0x00, 0x3C
glabel D_80891778
.word 0x00C80000
.byte 0x00, 0x50, 0x00, 0x36, 0x00, 0x5A, 0x00, 0x3C, 0x00, 0xC8, 0x00, 0x00
glabel D_8089177C
.word 0xB0F404B0, 0xB0F801F4, 0x30FC03E8
glabel D_80891788

4
data/overlays/actors/z_bg_jya_ironobj.data.s
View file

@ -17,9 +17,7 @@ glabel Bg_Jya_Ironobj_InitVars
glabel D_808994A4
.word 0x06000240, 0x06001050
glabel D_808994AC
.byte 0x0A, 0x00, 0x11, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_808994D6
.byte 0x00, 0x00, 0x87, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x11, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x00, 0x00
glabel D_808994E0
.word 0x00050008, 0x000B000E, 0x00110014, 0x0017001A
glabel D_808994F0

12
data/overlays/actors/z_demo_6k.data.s
View file

@ -22,9 +22,9 @@ glabel D_809692F8
glabel D_8096930C
.word 0x3F800000, 0x3F851EB8, 0x3F800000, 0x3F75C28F
glabel D_8096931C
.byte 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66
glabel D_80969326
.byte 0x66, 0x66, 0x3F, 0x4C, 0xCC, 0xCD, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13
.byte 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x4C, 0xCC, 0xCD
glabel D_8096932C
.byte 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13, 0x01, 0x13
glabel D_80969338
.word 0x00000000
glabel D_8096933C
@ -38,11 +38,7 @@ glabel D_80969348
glabel D_80969350
.word 0xFFFFFF00
glabel D_80969354
.byte 0xFF
glabel D_80969355
.byte 0x96
glabel D_80969356
.byte 0x00, 0x00
.byte 0xFF, 0x96, 0x00, 0x00
glabel D_80969358
.word 0x00000000
glabel D_8096935C

8
data/overlays/actors/z_en_dekubaba.data.s
View file

@ -25,13 +25,9 @@ glabel D_809E8FC8
glabel D_809E8FD8
.word 0x02000019, 0x0019FF00
glabel D_809E8FE0
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x02, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8
glabel D_809E8FFB
.byte 0xF4, 0x00, 0x00, 0x04, 0x00
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x02, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0x00, 0x00, 0x04, 0x00
glabel D_809E9000
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x10, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8
glabel D_809E901B
.byte 0xF4, 0x00, 0x00, 0x04, 0x00
.byte 0x10, 0x02, 0x01, 0x02, 0xE2, 0x02, 0x02, 0x10, 0xF1, 0xF2, 0xF4, 0x24, 0x02, 0x02, 0x02, 0x02, 0x02, 0x24, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0x00, 0x00, 0x04, 0x00
glabel D_809E9020
.word 0x304C05DC
glabel D_809E9024

4
data/overlays/actors/z_en_eiyer.data.s
View file

@ -16,9 +16,7 @@ glabel En_Eiyer_InitVars
.word EnEiyer_Update
.word EnEiyer_Draw
glabel D_80A01970
.byte 0x00, 0x11, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x1B
glabel D_80A01992
.byte 0x00, 0x11, 0xFF, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x11, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x1B, 0x00, 0x11, 0xFF, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_80A0199C
.word 0x0200002D, 0x000F6400
glabel D_80A019A4

4
data/overlays/actors/z_en_weiyer.data.s
View file

@ -16,9 +16,7 @@ glabel En_Weiyer_InitVars
.word EnWeiyer_Update
.word EnWeiyer_Draw
glabel D_80B33A90
.byte 0x00, 0x10, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x10
glabel D_80B33AB2
.byte 0x00, 0x0A, 0xFF, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x00, 0xFF, 0xCF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x01, 0x00, 0x00, 0x10, 0x00, 0x0A, 0xFF, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_80B33ABC
.word 0x0200002D, 0x000F6400
glabel D_80B33AC4

4
data/overlays/actors/z_en_wood02.data.s
View file

@ -20,9 +20,7 @@ glabel D_80B3BF00
glabel D_80B3BF2C
.word 0x4430C000, 0x44034000, 0x43FF0000, 0x43FA0000, 0x440D8000, 0x430D0000
glabel D_80B3BF44
.byte 0x1F, 0xFF, 0x4C, 0x9E, 0x77, 0xF5, 0xA5, 0xC9, 0xD6, 0xC3
glabel D_80B3BF4E
.byte 0xA0, 0x00
.byte 0x1F, 0xFF, 0x4C, 0x9E, 0x77, 0xF5, 0xA5, 0xC9, 0xD6, 0xC3, 0xA0, 0x00
glabel D_80B3BF50
.word 0x304C15E0
glabel D_80B3BF54

3
src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View file

@ -1478,8 +1478,7 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else {
this->timer--;
if (this->timer == 0) {
if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) ||
(INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) {
if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) {
globalCtx->nextEntranceIndex = 0x1A5;
} else if (gSaveContext.eventChkInf[12] & 0x80) {
globalCtx->nextEntranceIndex = 0x5F8;

6
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View file

@ -257,7 +257,8 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, GlobalContext* globalCtx) {
this->actor.parent = NULL;
if (LINK_IS_CHILD) {
if (!(gSaveContext.itemGetInf[0] & 0x2000)) {
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" VT_RST, CUR_UPG_VALUE(UPG_BULLET_BAG));
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" VT_RST,
CUR_UPG_VALUE(UPG_BULLET_BAG));
if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) {
this->getItemId = GI_BULLET_BAG_40;
} else {
@ -268,7 +269,8 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, GlobalContext* globalCtx) {
}
} else {
if (!(gSaveContext.itemGetInf[0] & 0x4000)) {
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" VT_RST, CUR_UPG_VALUE(UPG_QUIVER));
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" VT_RST,
CUR_UPG_VALUE(UPG_QUIVER));
switch (CUR_UPG_VALUE(UPG_QUIVER)) {
case 0:
this->getItemId = GI_RUPEE_PURPLE;

4
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -2029,8 +2029,8 @@ void func_80834298(Player* this, GlobalContext* globalCtx) {
if ((this->actor.type == ACTORTYPE_PLAYER) && !(this->stateFlags1 & 0x100) &&
((this->heldItemActionParam == this->itemActionParam) || (this->stateFlags1 & 0x400000)) &&
(gSaveContext.health != 0) && (globalCtx->csCtx.state == 0) && (this->csMode == 0) &&
(globalCtx->shootingGalleryStatus == 0) && (globalCtx->activeCamera == 0) && (globalCtx->sceneLoadFlag != 0x14) &&
(gSaveContext.timer1State != 10)) {
(globalCtx->shootingGalleryStatus == 0) && (globalCtx->activeCamera == 0) &&
(globalCtx->sceneLoadFlag != 0x14) && (gSaveContext.timer1State != 10)) {
func_80833DF8(this, globalCtx);
}