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

Decompile Gameplay_Keep and fix all existing decompiled objects (#595)

Browse source 
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "f84d8337b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "f84d8337b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-01-24 18:36:40 -06:00 • committed by GitHub
parent 84195fcef6
commit 20c1f4e648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
198 changed files with 4775 additions and 4232 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s
View file

@ -111,14 +111,14 @@ glabel func_808AA2B0
/* 00C74 808AA3F4 3C014300 */ lui $at, 0x4300 ## $at = 43000000
/* 00C78 808AA3F8 4481B000 */ mtc1 $at, $f22 ## $f22 = 128.00
/* 00C7C 808AA3FC 3C014382 */ lui $at, 0x4382 ## $at = 43820000
/* 00C80 808AA400 3C140405 */ lui $s4, %hi(D_0404D4E0) ## $s4 = 04050000
/* 00C80 808AA400 3C140405 */ lui $s4, %hi(gEffFire1DL) ## $s4 = 04050000
/* 00C84 808AA404 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000
/* 00C88 808AA408 3C16DB06 */ lui $s6, 0xDB06 ## $s6 = DB060000
/* 00C8C 808AA40C 4481A000 */ mtc1 $at, $f20 ## $f20 = 260.00
/* 00C90 808AA410 46062702 */ mul.s $f28, $f4, $f6
/* 00C94 808AA414 36D60020 */ ori $s6, $s6, 0x0020 ## $s6 = DB060020
/* 00C98 808AA418 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003
/* 00C9C 808AA41C 2694D4E0 */ addiu $s4, $s4, %lo(D_0404D4E0) ## $s4 = 0404D4E0
/* 00C9C 808AA41C 2694D4E0 */ addiu $s4, $s4, %lo(gEffFire1DL) ## $s4 = 0404D4E0
/* 00CA0 808AA420 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000
/* 00CA4 808AA424 2417FFEC */ addiu $s7, $zero, 0xFFEC ## $s7 = FFFFFFEC
.L808AA428:

4
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s
View file

@ -356,8 +356,8 @@ glabel func_80924228
/* 08BD8 809246D8 0C0346A2 */ jal Matrix_NewMtx
/* 08BDC 809246DC AFA20094 */ sw $v0, 0x0094($sp)
/* 08BE0 809246E0 8FA30094 */ lw $v1, 0x0094($sp)
/* 08BE4 809246E4 3C040405 */ lui $a0, %hi(D_04049210) ## $a0 = 04050000
/* 08BE8 809246E8 24849210 */ addiu $a0, $a0, %lo(D_04049210) ## $a0 = 04049210
/* 08BE4 809246E4 3C040405 */ lui $a0, %hi(gCircleShadowDL) ## $a0 = 04050000
/* 08BE8 809246E8 24849210 */ addiu $a0, $a0, %lo(gCircleShadowDL) ## $a0 = 04049210
/* 08BEC 809246EC AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 08BF0 809246F0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 08BF4 809246F4 00046900 */ sll $t5, $a0, 4

16
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s
View file

@ -66,11 +66,11 @@ glabel func_80925480
/* 09A08 80925508 24130002 */ addiu $s3, $zero, 0x0002 ## $s3 = 00000002
.L8092550C:
/* 09A0C 8092550C 922F0024 */ lbu $t7, 0x0024($s1) ## 00000024
/* 09A10 80925510 3C120402 */ lui $s2, %hi(D_040254B0) ## $s2 = 04020000
/* 09A10 80925510 3C120402 */ lui $s2, %hi(gEffWaterRippleDL) ## $s2 = 04020000
/* 09A14 80925514 566F0035 */ bnel $s3, $t7, .L809255EC
/* 09A18 80925518 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001
/* 09A1C 8092551C 16C0000B */ bne $s6, $zero, .L8092554C
/* 09A20 80925520 265254B0 */ addiu $s2, $s2, %lo(D_040254B0) ## $s2 = 040254B0
/* 09A20 80925520 265254B0 */ addiu $s2, $s2, %lo(gEffWaterRippleDL) ## $s2 = 040254B0
/* 09A24 80925524 0C0252F1 */ jal func_80094BC4
/* 09A28 80925528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 09A2C 8092552C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
@ -136,11 +136,11 @@ glabel func_80925480
/* 09B14 80925614 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001
.L80925618:
/* 09B18 80925618 92380024 */ lbu $t8, 0x0024($s1) ## 00000064
/* 09B1C 8092561C 3C120402 */ lui $s2, %hi(D_0401A0B0) ## $s2 = 04020000
/* 09B1C 8092561C 3C120402 */ lui $s2, %hi(gEffShockwaveDL) ## $s2 = 04020000
/* 09B20 80925620 56780036 */ bnel $s3, $t8, .L809256FC
/* 09B24 80925624 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001
/* 09B28 80925628 16C0000C */ bne $s6, $zero, .L8092565C
/* 09B2C 8092562C 2652A0B0 */ addiu $s2, $s2, %lo(D_0401A0B0) ## $s2 = 0401A0B0
/* 09B2C 8092562C 2652A0B0 */ addiu $s2, $s2, %lo(gEffShockwaveDL) ## $s2 = 0401A0B0
/* 09B30 80925630 8FB900F4 */ lw $t9, 0x00F4($sp)
/* 09B34 80925634 0C024F61 */ jal func_80093D84
/* 09B38 80925638 8F240000 */ lw $a0, 0x0000($t9) ## 00000000
@ -219,8 +219,8 @@ glabel func_80925480
/* 09C4C 8092574C AFA80054 */ sw $t0, 0x0054($sp)
/* 09C50 80925750 16C0002B */ bne $s6, $zero, .L80925800
/* 09C54 80925754 02E1B821 */ addu $s7, $s7, $at
/* 09C58 80925758 3C020405 */ lui $v0, %hi(D_04051DB0) ## $v0 = 04050000
/* 09C5C 8092575C 24421DB0 */ addiu $v0, $v0, %lo(D_04051DB0) ## $v0 = 04051DB0
/* 09C58 80925758 3C020405 */ lui $v0, %hi(gDust1Tex) ## $v0 = 04050000
/* 09C5C 8092575C 24421DB0 */ addiu $v0, $v0, %lo(gDust1Tex) ## $v0 = 04051DB0
/* 09C60 80925760 00024900 */ sll $t1, $v0, 4
/* 09C64 80925764 00095702 */ srl $t2, $t1, 28
/* 09C68 80925768 3C0C8016 */ lui $t4, %hi(gSegments)
@ -334,8 +334,8 @@ glabel func_80925480
/* 09E0C 8092590C 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001
/* 09E10 80925910 16C0002A */ bne $s6, $zero, .L809259BC
/* 09E14 80925914 26F70FC8 */ addiu $s7, $s7, 0x0FC8 ## $s7 = 06000FC8
/* 09E18 80925918 3C020405 */ lui $v0, %hi(D_04051DB0) ## $v0 = 04050000
/* 09E1C 8092591C 24421DB0 */ addiu $v0, $v0, %lo(D_04051DB0) ## $v0 = 04051DB0
/* 09E18 80925918 3C020405 */ lui $v0, %hi(gDust1Tex) ## $v0 = 04050000
/* 09E1C 8092591C 24421DB0 */ addiu $v0, $v0, %lo(gDust1Tex) ## $v0 = 04051DB0
/* 09E20 80925920 0002C900 */ sll $t9, $v0, 4
/* 09E24 80925924 00194F02 */ srl $t1, $t9, 28
/* 09E28 80925928 3C0A8016 */ lui $t2, %hi(gSegments)

4
asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s
View file

@ -255,12 +255,12 @@ glabel func_8093639C
/* 0A118 809366E8 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700
/* 0A11C 809366EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC
/* 0A124 809366F4 3C150402 */ lui $s5, %hi(D_040184B0) ## $s5 = 04020000
/* 0A124 809366F4 3C150402 */ lui $s5, %hi(gEffFireCircleDL) ## $s5 = 04020000
/* 0A128 809366F8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700
/* 0A12C 809366FC C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704
/* 0A130 80936700 8E060008 */ lw $a2, 0x0008($s0) ## 00000708
/* 0A134 80936704 0C034261 */ jal Matrix_Translate
/* 0A138 80936708 26B584B0 */ addiu $s5, $s5, %lo(D_040184B0) ## $s5 = 040184B0
/* 0A138 80936708 26B584B0 */ addiu $s5, $s5, %lo(gEffFireCircleDL) ## $s5 = 040184B0
/* 0A13C 8093670C 9618001E */ lhu $t8, 0x001E($s0) ## 0000071E
/* 0A140 80936710 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000
/* 0A144 80936714 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00

4
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s
View file

@ -130,8 +130,8 @@ glabel func_80943028
/* 0A510 809431E0 0C0346A2 */ jal Matrix_NewMtx
/* 0A514 809431E4 AFA2002C */ sw $v0, 0x002C($sp)
/* 0A518 809431E8 8FA3002C */ lw $v1, 0x002C($sp)
/* 0A51C 809431EC 3C040405 */ lui $a0, %hi(D_04049210) ## $a0 = 04050000
/* 0A520 809431F0 24849210 */ addiu $a0, $a0, %lo(D_04049210) ## $a0 = 04049210
/* 0A51C 809431EC 3C040405 */ lui $a0, %hi(gCircleShadowDL) ## $a0 = 04050000
/* 0A520 809431F0 24849210 */ addiu $a0, $a0, %lo(gCircleShadowDL) ## $a0 = 04049210
/* 0A524 809431F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 0A528 809431F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 0A52C 809431FC 00044900 */ sll $t1, $a0, 4

4
asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s
View file

@ -368,8 +368,8 @@ glabel func_8095A188
/* 0B334 8095A5F4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001
/* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C
/* 0B33C 8095A5FC 26529468 */ addiu $s2, $s2, %lo(D_06009468) ## $s2 = 06009468
/* 0B340 8095A600 3C020405 */ lui $v0, %hi(D_04055DB0) ## $v0 = 04050000
/* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, %lo(D_04055DB0) ## $v0 = 04055DB0
/* 0B340 8095A600 3C020405 */ lui $v0, %hi(gEffBubble1Tex) ## $v0 = 04050000
/* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, %lo(gEffBubble1Tex) ## $v0 = 04055DB0
/* 0B348 8095A608 00027100 */ sll $t6, $v0, 4
/* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28
/* 0B350 8095A610 3C098016 */ lui $t1, %hi(gSegments)

8
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s
View file

@ -42,12 +42,12 @@ glabel func_8096865C
/* 01D48 80968698 5700007F */ bnel $t8, $zero, .L80968898
/* 01D4C 8096869C 8FAA0064 */ lw $t2, 0x0064($sp)
/* 01D50 809686A0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C
/* 01D54 809686A4 3C090401 */ lui $t1, %hi(D_040101A8) ## $t1 = 04010000
/* 01D58 809686A8 3C080401 */ lui $t0, %hi(gGameKeepMoteDL0) ## $t0 = 04010000
/* 01D54 809686A4 3C090401 */ lui $t1, %hi(gEffFlash2DL) ## $t1 = 04010000
/* 01D58 809686A8 3C080401 */ lui $t0, %hi(gEffFlash1DL) ## $t0 = 04010000
/* 01D5C 809686AC 2B210009 */ slti $at, $t9, 0x0009
/* 01D60 809686B0 14200004 */ bne $at, $zero, .L809686C4
/* 01D64 809686B4 252901A8 */ addiu $t1, $t1, %lo(D_040101A8) ## $t1 = 040101A8
/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(gGameKeepMoteDL0) ## $t0 = 04010130
/* 01D64 809686B4 252901A8 */ addiu $t1, $t1, %lo(gEffFlash2DL) ## $t1 = 040101A8
/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(gEffFlash1DL) ## $t0 = 04010130
/* 01D6C 809686BC 10000002 */ beq $zero, $zero, .L809686C8
/* 01D70 809686C0 AFA80054 */ sw $t0, 0x0054($sp)
.L809686C4:

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

@ -79,10 +79,10 @@ glabel func_809688C4
/* 0205C 809689AC 46083302 */ mul.s $f12, $f6, $f8
/* 02060 809689B0 0C034348 */ jal Matrix_RotateY
/* 02064 809689B4 00000000 */ nop
/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(gGameKeepMoteDL0) ## $t7 = 04010000
/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(gEffFlash1DL) ## $t7 = 04010000
/* 0206C 809689BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 02070 809689C0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(gGameKeepMoteDL0) ## $t7 = 04010130
/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(gEffFlash1DL) ## $t7 = 04010130
/* 02078 809689C8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00
/* 0207C 809689CC AFAF0058 */ sw $t7, 0x0058($sp)
/* 02080 809689D0 02E1F021 */ addu $s8, $s7, $at

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

@ -130,8 +130,8 @@ glabel func_80968FB0
/* 02814 80969164 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000010
/* 02818 80969168 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000014
/* 0281C 8096916C 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0
/* 02820 80969170 3C180401 */ lui $t8, %hi(D_04015780) ## $t8 = 04010000
/* 02824 80969174 27185780 */ addiu $t8, $t8, %lo(D_04015780) ## $t8 = 04015780
/* 02820 80969170 3C180401 */ lui $t8, %hi(gGlowCircleSmallDL) ## $t8 = 04010000
/* 02824 80969174 27185780 */ addiu $t8, $t8, %lo(gGlowCircleSmallDL) ## $t8 = 04015780
/* 02828 80969178 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000018
/* 0282C 8096917C AD2E02D0 */ sw $t6, 0x02D0($t1) ## 000002D0
/* 02830 80969180 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000

8
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s
View file

@ -39,10 +39,10 @@ glabel func_8098A4F0
/* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591
/* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisps
/* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000
/* 016D8 8098A558 3C020405 */ lui $v0, %hi(D_04052DB0) ## $v0 = 04050000
/* 016D8 8098A558 3C020405 */ lui $v0, %hi(gDust5Tex) ## $v0 = 04050000
/* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 016E0 8098A560 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, %lo(D_04052DB0) ## $v0 = 04052DB0
/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, %lo(gDust5Tex) ## $v0 = 04052DB0
/* 016E8 8098A568 0041B824 */ and $s7, $v0, $at
/* 016EC 8098A56C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000
/* 016F0 8098A570 4481F000 */ mtc1 $at, $f30 ## $f30 = 30.00
@ -50,8 +50,8 @@ glabel func_8098A4F0
/* 016F8 8098A578 000E7F02 */ srl $t7, $t6, 28
/* 016FC 8098A57C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000
/* 01700 8098A580 3C198016 */ lui $t9, %hi(gSegments)
/* 01704 8098A584 3C080401 */ lui $t0, %hi(D_04010050) ## $t0 = 04010000
/* 01708 8098A588 25080050 */ addiu $t0, $t0, %lo(D_04010050) ## $t0 = 04010050
/* 01704 8098A584 3C080401 */ lui $t0, %hi(gEffDustDL) ## $t0 = 04010000
/* 01708 8098A588 25080050 */ addiu $t0, $t0, %lo(gEffDustDL) ## $t0 = 04010050
/* 0170C 8098A58C 27396FA8 */ addiu $t9, %lo(gSegments)
/* 01710 8098A590 000FC080 */ sll $t8, $t7, 2
/* 01714 8098A594 3C1E0100 */ lui $s8, %hi(D_01000000) ## $s8 = 01000000

4
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s
View file

@ -390,8 +390,8 @@ glabel func_8098ABC0
/* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp)
/* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gGameKeepMoteDL0) ## $t5 = 04010000
/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gGameKeepMoteDL0) ## $t5 = 04010130
/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gEffFlash1DL) ## $t5 = 04010000
/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gEffFlash1DL) ## $t5 = 04010130
/* 02288 8098B108 02417021 */ addu $t6, $s2, $at
/* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp)
/* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130

4
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s
View file

@ -309,8 +309,8 @@ glabel func_8098B354
/* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0
/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gGameKeepMoteDL0) ## $s5 = 04010000
/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gGameKeepMoteDL0) ## $s5 = 04010130
/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gEffFlash1DL) ## $s5 = 04010000
/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gEffFlash1DL) ## $s5 = 04010130
/* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at
/* 028FC 8098B77C 0C034261 */ jal Matrix_Translate
/* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000

4
asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s
View file

@ -83,9 +83,9 @@ glabel func_8099E4F4
/* 00D2C 8099E5FC C6220550 */ lwc1 $f2, 0x0550($s1) ## 00000550
/* 00D30 8099E600 C6300554 */ lwc1 $f16, 0x0554($s1) ## 00000554
/* 00D34 8099E604 C6320558 */ lwc1 $f18, 0x0558($s1) ## 00000558
/* 00D38 8099E608 3C020403 */ lui $v0, %hi(D_04037880) ## $v0 = 04030000
/* 00D38 8099E608 3C020403 */ lui $v0, %hi(gEffFairySparklesDL) ## $v0 = 04030000
/* 00D3C 8099E60C 4602B201 */ sub.s $f8, $f22, $f2
/* 00D40 8099E610 24427880 */ addiu $v0, $v0, %lo(D_04037880) ## $v0 = 04037880
/* 00D40 8099E610 24427880 */ addiu $v0, $v0, %lo(gEffFairySparklesDL) ## $v0 = 04037880
/* 00D44 8099E614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 00D48 8099E618 4604B001 */ sub.s $f0, $f22, $f4
/* 00D4C 8099E61C C6440000 */ lwc1 $f4, 0x0000($s2) ## 0000024C

4
asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s
View file

@ -116,9 +116,9 @@ glabel func_8099E784
/* 01028 8099E8F8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000
/* 0102C 8099E8FC C62A0000 */ lwc1 $f10, 0x0000($s1) ## 0000014C
/* 01030 8099E900 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001
/* 01034 8099E904 3C020403 */ lui $v0, %hi(D_04037880) ## $v0 = 04030000
/* 01034 8099E904 3C020403 */ lui $v0, %hi(gEffFairySparklesDL) ## $v0 = 04030000
/* 01038 8099E908 46185402 */ mul.s $f16, $f10, $f24
/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, %lo(D_04037880) ## $v0 = 04037880
/* 0103C 8099E90C 24427880 */ addiu $v0, $v0, %lo(gEffFairySparklesDL) ## $v0 = 04037880
/* 01040 8099E910 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 01044 8099E914 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 01048 8099E918 0041B024 */ and $s6, $v0, $at

4
asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s
View file

@ -238,10 +238,10 @@ glabel EnArrow_Draw
/* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp)
/* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp)
/* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp)
/* 01388 809B4CA8 3C0C0403 */ lui $t4, %hi(D_04037880) ## $t4 = 04030000
/* 01388 809B4CA8 3C0C0403 */ lui $t4, %hi(gEffFairySparklesDL) ## $t4 = 04030000
/* 0138C 809B4CAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 01390 809B4CB0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0
/* 01394 809B4CB4 258C7880 */ addiu $t4, $t4, %lo(D_04037880) ## $t4 = 04037880
/* 01394 809B4CB4 258C7880 */ addiu $t4, $t4, %lo(gEffFairySparklesDL) ## $t4 = 04037880
/* 01398 809B4CB8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000
/* 0139C 809B4CBC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 013A0 809B4CC0 AD0A02D0 */ sw $t2, 0x02D0($t0) ## 000002D0

8
asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s
View file

@ -32,10 +32,10 @@ glabel EnArrow_Init
/* 00050 809B3970 28410009 */ slti $at, $v0, 0x0009
/* 00054 809B3974 1020000B */ beq $at, $zero, .L809B39A4
/* 00058 809B3978 8FA4003C */ lw $a0, 0x003C($sp)
/* 0005C 809B397C 3C060400 */ lui $a2, %hi(D_04006010) ## $a2 = 04000000
/* 00060 809B3980 3C070400 */ lui $a3, %hi(D_0400436C) ## $a3 = 04000000
/* 00064 809B3984 24E7436C */ addiu $a3, $a3, %lo(D_0400436C) ## $a3 = 0400436C
/* 00068 809B3988 24C66010 */ addiu $a2, $a2, %lo(D_04006010) ## $a2 = 04006010
/* 0005C 809B397C 3C060400 */ lui $a2, %hi(gArrowSkel) ## $a2 = 04000000
/* 00060 809B3980 3C070400 */ lui $a3, %hi(gArrow2Anim) ## $a3 = 04000000
/* 00064 809B3984 24E7436C */ addiu $a3, $a3, %lo(gArrow2Anim) ## $a3 = 0400436C
/* 00068 809B3988 24C66010 */ addiu $a2, $a2, %lo(gArrowSkel) ## $a2 = 04006010
/* 0006C 809B398C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C
/* 00070 809B3990 AFA00010 */ sw $zero, 0x0010($sp)
/* 00074 809B3994 AFA00014 */ sw $zero, 0x0014($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s
View file

@ -17,8 +17,8 @@ glabel func_809B3CEC
/* 003E4 809B3D04 3C05809B */ lui $a1, %hi(func_809B4640) ## $a1 = 809B0000
/* 003E8 809B3D08 0C26CE48 */ jal func_809B3920
/* 003EC 809B3D0C 24A54640 */ addiu $a1, $a1, %lo(func_809B4640) ## $a1 = 809B4640
/* 003F0 809B3D10 3C050400 */ lui $a1, %hi(D_04004310) ## $a1 = 04000000
/* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, %lo(D_04004310) ## $a1 = 04004310
/* 003F0 809B3D10 3C050400 */ lui $a1, %hi(gArrow1Anim) ## $a1 = 04000000
/* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, %lo(gArrow1Anim) ## $a1 = 04004310
/* 003F8 809B3D18 0C02947A */ jal Animation_PlayOnce
/* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C
/* 00400 809B3D20 0C03F66B */ jal Rand_ZeroOne

4
asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s
View file

@ -226,8 +226,8 @@ glabel func_809B3FDC
/* 009D4 809B42F4 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C
/* 009D8 809B42F8 0C26CE48 */ jal func_809B3920
/* 009DC 809B42FC 24A545E0 */ addiu $a1, $a1, %lo(func_809B45E0) ## $a1 = 809B45E0
/* 009E0 809B4300 3C050400 */ lui $a1, %hi(D_0400436C) ## $a1 = 04000000
/* 009E4 809B4304 24A5436C */ addiu $a1, $a1, %lo(D_0400436C) ## $a1 = 0400436C
/* 009E0 809B4300 3C050400 */ lui $a1, %hi(gArrow2Anim) ## $a1 = 04000000
/* 009E4 809B4304 24A5436C */ addiu $a1, $a1, %lo(gArrow2Anim) ## $a1 = 0400436C
/* 009E8 809B4308 0C02947A */ jal Animation_PlayOnce
/* 009EC 809B430C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C
/* 009F0 809B4310 8609001C */ lh $t1, 0x001C($s0) ## 0000001C

4
asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s
View file

@ -227,8 +227,8 @@ glabel EnBomChu_Draw
/* 0147C 809C6CAC 8F040000 */ lw $a0, 0x0000($t8) ## 00000000
/* 01480 809C6CB0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004
/* 01484 809C6CB4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0
/* 01488 809C6CB8 3C0A0400 */ lui $t2, %hi(D_04007E10) ## $t2 = 04000000
/* 0148C 809C6CBC 254A7E10 */ addiu $t2, $t2, %lo(D_04007E10) ## $t2 = 04007E10
/* 01488 809C6CB8 3C0A0400 */ lui $t2, %hi(gBombchuDL) ## $t2 = 04000000
/* 0148C 809C6CBC 254A7E10 */ addiu $t2, $t2, %lo(gBombchuDL) ## $t2 = 04007E10
/* 01490 809C6CC0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008
/* 01494 809C6CC4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0
/* 01498 809C6CC8 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000

4
asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s
View file

@ -75,8 +75,8 @@ glabel func_809E8AD8
/* 033E4 809E8BB4 8D840000 */ lw $a0, 0x0000($t4) ## 00000000
/* 033E8 809E8BB8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004
/* 033EC 809E8BBC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 033F0 809E8BC0 3C0F0405 */ lui $t7, %hi(D_04049210) ## $t7 = 04050000
/* 033F4 809E8BC4 25EF9210 */ addiu $t7, $t7, %lo(D_04049210) ## $t7 = 04049210
/* 033F0 809E8BC0 3C0F0405 */ lui $t7, %hi(gCircleShadowDL) ## $t7 = 04050000
/* 033F4 809E8BC4 25EF9210 */ addiu $t7, $t7, %lo(gCircleShadowDL) ## $t7 = 04049210
/* 033F8 809E8BC8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008
/* 033FC 809E8BCC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0
/* 03400 809E8BD0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000

8
asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s
View file

@ -17,16 +17,16 @@ glabel EnFish_Init
/* 00208 80A15488 0C01E037 */ jal Actor_ProcessInitChain
/* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp)
/* 00210 80A15490 3C060402 */ lui $a2, %hi(D_04018FE0) ## $a2 = 04020000
/* 00214 80A15494 3C070402 */ lui $a3, %hi(D_0401909C) ## $a3 = 04020000
/* 00210 80A15490 3C060402 */ lui $a2, %hi(gFishSkel) ## $a2 = 04020000
/* 00214 80A15494 3C070402 */ lui $a3, %hi(gFish2Anim) ## $a3 = 04020000
/* 00218 80A15498 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0
/* 0021C 80A1549C 2618021A */ addiu $t8, $s0, 0x021A ## $t8 = 0000021A
/* 00220 80A154A0 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007
/* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp)
/* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp)
/* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp)
/* 00230 80A154B0 24E7909C */ addiu $a3, $a3, %lo(D_0401909C) ## $a3 = 0401909C
/* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, %lo(D_04018FE0) ## $a2 = 04018FE0
/* 00230 80A154B0 24E7909C */ addiu $a3, $a3, %lo(gFish2Anim) ## $a3 = 0401909C
/* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, %lo(gFishSkel) ## $a2 = 04018FE0
/* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp)
/* 0023C 80A154BC 0C0291BE */ jal SkelAnime_InitFlex
/* 00240 80A154C0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC

8
asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s
View file

@ -2,19 +2,19 @@ glabel func_80A152AC
/* 0002C 80A152AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
/* 00030 80A152B0 AFA40028 */ sw $a0, 0x0028($sp)
/* 00034 80A152B4 AFBF0024 */ sw $ra, 0x0024($sp)
/* 00038 80A152B8 3C040402 */ lui $a0, %hi(D_0401909C) ## $a0 = 04020000
/* 00038 80A152B8 3C040402 */ lui $a0, %hi(gFish2Anim) ## $a0 = 04020000
/* 0003C 80A152BC 0C028800 */ jal Animation_GetLastFrame
/* 00040 80A152C0 2484909C */ addiu $a0, $a0, %lo(D_0401909C) ## $a0 = 0401909C
/* 00040 80A152C0 2484909C */ addiu $a0, $a0, %lo(gFish2Anim) ## $a0 = 0401909C
/* 00044 80A152C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00
/* 00048 80A152C8 3C014000 */ lui $at, 0x4000 ## $at = 40000000
/* 0004C 80A152CC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00
/* 00050 80A152D0 468021A0 */ cvt.s.w $f6, $f4
/* 00054 80A152D4 8FA40028 */ lw $a0, 0x0028($sp)
/* 00058 80A152D8 3C050402 */ lui $a1, %hi(D_0401909C) ## $a1 = 04020000
/* 00058 80A152D8 3C050402 */ lui $a1, %hi(gFish2Anim) ## $a1 = 04020000
/* 0005C 80A152DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001
/* 00060 80A152E0 AFAE0014 */ sw $t6, 0x0014($sp)
/* 00064 80A152E4 24A5909C */ addiu $a1, $a1, %lo(D_0401909C) ## $a1 = 0401909C
/* 00064 80A152E4 24A5909C */ addiu $a1, $a1, %lo(gFish2Anim) ## $a1 = 0401909C
/* 00068 80A152E8 E7A60010 */ swc1 $f6, 0x0010($sp)
/* 0006C 80A152EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000
/* 00070 80A152F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000

8
asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s
View file

@ -2,19 +2,19 @@ glabel func_80A15310
/* 00090 80A15310 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
/* 00094 80A15314 AFA40028 */ sw $a0, 0x0028($sp)
/* 00098 80A15318 AFBF0024 */ sw $ra, 0x0024($sp)
/* 0009C 80A1531C 3C040402 */ lui $a0, %hi(D_040185FC) ## $a0 = 04020000
/* 0009C 80A1531C 3C040402 */ lui $a0, %hi(gFish1Anim) ## $a0 = 04020000
/* 000A0 80A15320 0C028800 */ jal Animation_GetLastFrame
/* 000A4 80A15324 248485FC */ addiu $a0, $a0, %lo(D_040185FC) ## $a0 = 040185FC
/* 000A4 80A15324 248485FC */ addiu $a0, $a0, %lo(gFish1Anim) ## $a0 = 040185FC
/* 000A8 80A15328 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00
/* 000AC 80A1532C 3C014000 */ lui $at, 0x4000 ## $at = 40000000
/* 000B0 80A15330 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00
/* 000B4 80A15334 468021A0 */ cvt.s.w $f6, $f4
/* 000B8 80A15338 8FA40028 */ lw $a0, 0x0028($sp)
/* 000BC 80A1533C 3C050402 */ lui $a1, %hi(D_040185FC) ## $a1 = 04020000
/* 000BC 80A1533C 3C050402 */ lui $a1, %hi(gFish1Anim) ## $a1 = 04020000
/* 000C0 80A15340 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001
/* 000C4 80A15344 AFAE0014 */ sw $t6, 0x0014($sp)
/* 000C8 80A15348 24A585FC */ addiu $a1, $a1, %lo(D_040185FC) ## $a1 = 040185FC
/* 000C8 80A15348 24A585FC */ addiu $a1, $a1, %lo(gFish1Anim) ## $a1 = 040185FC
/* 000CC 80A1534C E7A60010 */ swc1 $f6, 0x0010($sp)
/* 000D0 80A15350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000
/* 000D4 80A15354 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000

20
asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s
View file

@ -184,16 +184,16 @@ glabel EnMThunder_Draw
/* 00F38 80A9FF18 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004
/* 00F3C 80A9FF1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00F40 80A9FF20 44D8F800 */ ctc1 $t8, $31
/* 00F44 80A9FF24 3C190401 */ lui $t9, %hi(D_04012AF0) ## $t9 = 04010000
/* 00F44 80A9FF24 3C190401 */ lui $t9, %hi(gSpinAttack3DL) ## $t9 = 04010000
/* 00F48 80A9FF28 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008
/* 00F4C 80A9FF2C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0
/* 00F50 80A9FF30 27392AF0 */ addiu $t9, $t9, %lo(D_04012AF0) ## $t9 = 04012AF0
/* 00F50 80A9FF30 27392AF0 */ addiu $t9, $t9, %lo(gSpinAttack3DL) ## $t9 = 04012AF0
/* 00F54 80A9FF34 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000
/* 00F58 80A9FF38 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
/* 00F5C 80A9FF3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 00F60 80A9FF40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00F64 80A9FF44 3C0F0401 */ lui $t7, %hi(D_04012C10) ## $t7 = 04010000
/* 00F68 80A9FF48 25EF2C10 */ addiu $t7, $t7, %lo(D_04012C10) ## $t7 = 04012C10
/* 00F64 80A9FF44 3C0F0401 */ lui $t7, %hi(gSpinAttack4DL) ## $t7 = 04010000
/* 00F68 80A9FF48 25EF2C10 */ addiu $t7, $t7, %lo(gSpinAttack4DL) ## $t7 = 04012C10
/* 00F6C 80A9FF4C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008
/* 00F70 80A9FF50 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0
/* 00F74 80A9FF54 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000
@ -253,16 +253,16 @@ glabel EnMThunder_Draw
/* 0103C 80AA001C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004
/* 01040 80AA0020 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 01044 80AA0024 44D9F800 */ ctc1 $t9, $31
/* 01048 80AA0028 3C0C0401 */ lui $t4, %hi(D_04012570) ## $t4 = 04010000
/* 01048 80AA0028 3C0C0401 */ lui $t4, %hi(gSpinAttack1DL) ## $t4 = 04010000
/* 0104C 80AA002C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008
/* 01050 80AA0030 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0
/* 01054 80AA0034 258C2570 */ addiu $t4, $t4, %lo(D_04012570) ## $t4 = 04012570
/* 01054 80AA0034 258C2570 */ addiu $t4, $t4, %lo(gSpinAttack1DL) ## $t4 = 04012570
/* 01058 80AA0038 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000
/* 0105C 80AA003C AC590000 */ sw $t9, 0x0000($v0) ## 00000000
/* 01060 80AA0040 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 01064 80AA0044 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 01068 80AA0048 3C0E0401 */ lui $t6, %hi(D_04012690) ## $t6 = 04010000
/* 0106C 80AA004C 25CE2690 */ addiu $t6, $t6, %lo(D_04012690) ## $t6 = 04012690
/* 01068 80AA0048 3C0E0401 */ lui $t6, %hi(gSpinAttack2DL) ## $t6 = 04010000
/* 0106C 80AA004C 25CE2690 */ addiu $t6, $t6, %lo(gSpinAttack2DL) ## $t6 = 04012690
/* 01070 80AA0050 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008
/* 01074 80AA0054 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0
/* 01078 80AA0058 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000
@ -485,8 +485,8 @@ glabel EnMThunder_Draw
/* 013BC 80AA039C 0C0253D0 */ jal Gfx_TwoTexScroll
/* 013C0 80AA03A0 AFA20050 */ sw $v0, 0x0050($sp)
/* 013C4 80AA03A4 8FA80050 */ lw $t0, 0x0050($sp)
/* 013C8 80AA03A8 3C0C0401 */ lui $t4, %hi(D_04013610) ## $t4 = 04010000
/* 013CC 80AA03AC 258C3610 */ addiu $t4, $t4, %lo(D_04013610) ## $t4 = 04013610
/* 013C8 80AA03A8 3C0C0401 */ lui $t4, %hi(gSpinAttackChargingDL) ## $t4 = 04010000
/* 013CC 80AA03AC 258C3610 */ addiu $t4, $t4, %lo(gSpinAttackChargingDL) ## $t4 = 04013610
/* 013D0 80AA03B0 AD020004 */ sw $v0, 0x0004($t0) ## 00000004
/* 013D4 80AA03B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 013D8 80AA03B8 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000

4
asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s
View file

@ -54,8 +54,8 @@ glabel func_80AC7528
/* 04930 80AC75D0 016E6025 */ or $t4, $t3, $t6 ## $t4 = 00000000
/* 04934 80AC75D4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 04938 80AC75D8 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0
/* 0493C 80AC75DC 3C090401 */ lui $t1, %hi(D_0400CDC0) ## $t1 = 04010000
/* 04940 80AC75E0 2529CDC0 */ addiu $t1, $t1, %lo(D_0400CDC0) ## $t1 = 0400CDC0
/* 0493C 80AC75DC 3C090401 */ lui $t1, %hi(gSelectionCursorTex) ## $t1 = 04010000
/* 04940 80AC75E0 2529CDC0 */ addiu $t1, $t1, %lo(gSelectionCursorTex) ## $t1 = 0400CDC0
/* 04944 80AC75E4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008
/* 04948 80AC75E8 AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0
/* 0494C 80AC75EC 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000

8
asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s
View file

@ -47,8 +47,8 @@ glabel func_80AC79C8
/* 04DB0 80AC7A50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004
/* 04DB4 80AC7A54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000
/* 04DB8 80AC7A58 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0
/* 04DBC 80AC7A5C 3C180401 */ lui $t8, %hi(D_0400CF40) ## $t8 = 04010000
/* 04DC0 80AC7A60 2718CF40 */ addiu $t8, $t8, %lo(D_0400CF40) ## $t8 = 0400CF40
/* 04DBC 80AC7A5C 3C180401 */ lui $t8, %hi(gArrowCursorTex) ## $t8 = 04010000
/* 04DC0 80AC7A60 2718CF40 */ addiu $t8, $t8, %lo(gArrowCursorTex) ## $t8 = 0400CF40
/* 04DC4 80AC7A64 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008
/* 04DC8 80AC7A68 AD0E02B0 */ sw $t6, 0x02B0($t0) ## 000002B0
/* 04DCC 80AC7A6C 3C0FFD70 */ lui $t7, 0xFD70 ## $t7 = FD700000
@ -151,8 +151,8 @@ glabel func_80AC79C8
/* 04F4C 80AC7BEC 8FA80094 */ lw $t0, 0x0094($sp)
/* 04F50 80AC7BF0 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0
.L80AC7BF4:
/* 04F54 80AC7BF4 3C0C0401 */ lui $t4, %hi(D_0400CE40) ## $t4 = 04010000
/* 04F58 80AC7BF8 258CCE40 */ addiu $t4, $t4, %lo(D_0400CE40) ## $t4 = 0400CE40
/* 04F54 80AC7BF4 3C0C0401 */ lui $t4, %hi(gControlStickTex) ## $t4 = 04010000
/* 04F58 80AC7BF8 258CCE40 */ addiu $t4, $t4, %lo(gControlStickTex) ## $t4 = 0400CE40
/* 04F5C 80AC7BFC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 04F60 80AC7C00 AD0A02B0 */ sw $t2, 0x02B0($t0) ## 000002B0
/* 04F64 80AC7C04 3C0BFD70 */ lui $t3, 0xFD70 ## $t3 = FD700000

4
asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s
View file

@ -136,8 +136,8 @@ glabel EnVbBall_Draw
/* 00FAC 80B29F4C 0C0346A2 */ jal Matrix_NewMtx
/* 00FB0 80B29F50 AFA20028 */ sw $v0, 0x0028($sp)
/* 00FB4 80B29F54 8FA30028 */ lw $v1, 0x0028($sp)
/* 00FB8 80B29F58 3C040405 */ lui $a0, %hi(D_04049210) ## $a0 = 04050000
/* 00FBC 80B29F5C 24849210 */ addiu $a0, $a0, %lo(D_04049210) ## $a0 = 04049210
/* 00FB8 80B29F58 3C040405 */ lui $a0, %hi(gCircleShadowDL) ## $a0 = 04050000
/* 00FBC 80B29F5C 24849210 */ addiu $a0, $a0, %lo(gCircleShadowDL) ## $a0 = 04049210
/* 00FC0 80B29F60 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 00FC4 80B29F64 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00FC8 80B29F68 00046900 */ sll $t5, $a0, 4

12
asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s
View file

@ -66,8 +66,8 @@ glabel func_80BA3C94
/* 012A0 80BA3D40 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0
/* 012A4 80BA3D44 0C024DDD */ jal Gfx_CallSetupDL
/* 012A8 80BA3D48 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 012AC 80BA3D4C 3C040405 */ lui $a0, %hi(D_0404C160) ## $a0 = 04050000
/* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, %lo(D_0404C160) ## $a0 = 0404C160
/* 012AC 80BA3D4C 3C040405 */ lui $a0, %hi(gSun1Tex) ## $a0 = 04050000
/* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, %lo(gSun1Tex) ## $a0 = 0404C160
/* 012B4 80BA3D54 0004C900 */ sll $t9, $a0, 4
/* 012B8 80BA3D58 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0
/* 012BC 80BA3D5C 00194702 */ srl $t0, $t9, 28
@ -88,8 +88,8 @@ glabel func_80BA3C94
/* 012F8 80BA3D98 01816821 */ addu $t5, $t4, $at
/* 012FC 80BA3D9C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004
/* 01300 80BA3DA0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0
/* 01304 80BA3DA4 3C180405 */ lui $t8, %hi(D_0404D160) ## $t8 = 04050000
/* 01308 80BA3DA8 2718D160 */ addiu $t8, $t8, %lo(D_0404D160) ## $t8 = 0404D160
/* 01304 80BA3DA4 3C180405 */ lui $t8, %hi(gKokiriDustMoteTextureLoadDL ) ## $t8 = 04050000
/* 01308 80BA3DA8 2718D160 */ addiu $t8, $t8, %lo(gKokiriDustMoteTextureLoadDL ) ## $t8 = 0404D160
/* 0130C 80BA3DAC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008
/* 01310 80BA3DB0 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0
/* 01314 80BA3DB4 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000
@ -105,8 +105,8 @@ glabel func_80BA3C94
/* 0133C 80BA3DDC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 01340 80BA3DE0 02815021 */ addu $t2, $s4, $at
/* 01344 80BA3DE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000
/* 01348 80BA3DE8 3C090405 */ lui $t1, %hi(D_0404D1A8) ## $t1 = 04050000
/* 0134C 80BA3DEC 2529D1A8 */ addiu $t1, $t1, %lo(D_0404D1A8) ## $t1 = 0404D1A8
/* 01348 80BA3DE8 3C090405 */ lui $t1, %hi(gKokiriDustMoteDL) ## $t1 = 04050000
/* 0134C 80BA3DEC 2529D1A8 */ addiu $t1, $t1, %lo(gKokiriDustMoteDL) ## $t1 = 0404D1A8
/* 01350 80BA3DF0 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00
/* 01354 80BA3DF4 AFA90048 */ sw $t1, 0x0048($sp)
/* 01358 80BA3DF8 AFAA0040 */ sw $t2, 0x0040($sp)

8
asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s
View file

@ -104,8 +104,8 @@ glabel func_80BA414C
/* 017D0 80BA4270 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000
/* 017D4 80BA4274 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 017D8 80BA4278 02015821 */ addu $t3, $s0, $at
/* 017DC 80BA427C 3C020405 */ lui $v0, %hi(D_04052DB0) ## $v0 = 04050000
/* 017E0 80BA4280 24422DB0 */ addiu $v0, $v0, %lo(D_04052DB0) ## $v0 = 04052DB0
/* 017DC 80BA427C 3C020405 */ lui $v0, %hi(gDust5Tex) ## $v0 = 04050000
/* 017E0 80BA4280 24422DB0 */ addiu $v0, $v0, %lo(gDust5Tex) ## $v0 = 04052DB0
/* 017E4 80BA4284 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 017E8 80BA4288 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 017EC 80BA428C 0041C824 */ and $t9, $v0, $at
@ -116,8 +116,8 @@ glabel func_80BA414C
/* 01800 80BA42A0 25EF6FA8 */ addiu $t7, %lo(gSegments)
/* 01804 80BA42A4 000D7080 */ sll $t6, $t5, 2
/* 01808 80BA42A8 3C080100 */ lui $t0, %hi(D_01000000) ## $t0 = 01000000
/* 0180C 80BA42AC 3C090401 */ lui $t1, %hi(D_04010050) ## $t1 = 04010000
/* 01810 80BA42B0 25290050 */ addiu $t1, $t1, %lo(D_04010050) ## $t1 = 04010050
/* 0180C 80BA42AC 3C090401 */ lui $t1, %hi(gEffDustDL) ## $t1 = 04010000
/* 01810 80BA42B0 25290050 */ addiu $t1, $t1, %lo(gEffDustDL) ## $t1 = 04010050
/* 01814 80BA42B4 25080000 */ addiu $t0, $t0, %lo(D_01000000) ## $t0 = 01000000
/* 01818 80BA42B8 01CFC021 */ addu $t8, $t6, $t7
/* 0181C 80BA42BC 4481F000 */ mtc1 $at, $f30 ## $f30 = 80.00

4
asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s
View file

@ -135,13 +135,13 @@ glabel func_80BA49BC
/* 020DC 80BA4B7C AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 020E0 80BA4B80 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 020E4 80BA4B84 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000
/* 020E8 80BA4B88 3C090403 */ lui $t1, %hi(D_0402CF30) ## $t1 = 04030000
/* 020E8 80BA4B88 3C090403 */ lui $t1, %hi(gEffLightningDL) ## $t1 = 04030000
/* 020EC 80BA4B8C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008
/* 020F0 80BA4B90 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0
/* 020F4 80BA4B94 AC400004 */ sw $zero, 0x0004($v0) ## 00000004
/* 020F8 80BA4B98 AC440000 */ sw $a0, 0x0000($v0) ## 00000000
/* 020FC 80BA4B9C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 02100 80BA4BA0 2529CF30 */ addiu $t1, $t1, %lo(D_0402CF30) ## $t1 = 0402CF30
/* 02100 80BA4BA0 2529CF30 */ addiu $t1, $t1, %lo(gEffLightningDL) ## $t1 = 0402CF30
/* 02104 80BA4BA4 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000
/* 02108 80BA4BA8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008
/* 0210C 80BA4BAC AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0