mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-26 10:54:27 +00:00
Code Issues Projects Releases Wiki Activity

Document Collision_Check (#468)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* some decomp

* still playing around with this

* rename functions

* ZAP again

* ZAP again

* the renaming begins

* more renaming. hopefully didn't break anything

* change all the things

* this and then merge

* and done

* one little thing

* small docs, small rename

* changed mind on cylinder and quad elements

* something

* more stuff

* more docs

* more adjustments

* Fixed some types

* more fixes

* all sorts of cleanup

* now with flags

* match!

* names and such

* update tools

* damage tables

* ColChkInfo

* one more thing

* formatting

* more formatting

* anime merge

* some stuff

* damage table

* again

* changes

* .s

* changes

* oc2 type

* a couple things

* format

* un-name magic arrows, not enough proof yet

* fix damage table script and remove old one

* EnAObj

* changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-01-17 20:13:36 -06:00 • committed by GitHub
parent f786f958bb
commit 02994f5339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
487 changed files with 14371 additions and 4713 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
asm/non_matchings/code/z_play/Gameplay_Update.s
View file

@ -1588,7 +1588,7 @@ glabel L800BE148
/* B35624 800BE484 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 /* B35624 800BE484 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60
/* B35628 800BE488 02012821 */ addu $a1, $s0, $at /* B35628 800BE488 02012821 */ addu $a1, $s0, $at
/* B3562C 800BE48C AFA50038 */ sw $a1, 0x38($sp) /* B3562C 800BE48C AFA50038 */ sw $a1, 0x38($sp)
/* B35630 800BE490 0C0184E7 */ jal func_8006139C /* B35630 800BE490 0C0184E7 */ jal CollisionCheck_AT
/* B35634 800BE494 02002025 */ move $a0, $s0 /* B35634 800BE494 02002025 */ move $a0, $s0
/* B35638 800BE498 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 /* B35638 800BE498 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016
/* B3563C 800BE49C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* B3563C 800BE49C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8)
@ -1620,7 +1620,7 @@ glabel L800BE148
/* B356A0 800BE500 24050001 */ li $a1, 1 /* B356A0 800BE500 24050001 */ li $a1, 1
.L800BE504: .L800BE504:
/* B356A4 800BE504 02002025 */ move $a0, $s0 /* B356A4 800BE504 02002025 */ move $a0, $s0
/* B356A8 800BE508 0C0188B9 */ jal func_800622E4 /* B356A8 800BE508 0C0188B9 */ jal CollisionCheck_Damage
/* B356AC 800BE50C 8FA50038 */ lw $a1, 0x38($sp) /* B356AC 800BE50C 8FA50038 */ lw $a1, 0x38($sp)
/* B356B0 800BE510 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* B356B0 800BE510 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016
/* B356B4 800BE514 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) /* B356B4 800BE514 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3)
@ -1636,7 +1636,7 @@ glabel L800BE148
/* B356DC 800BE53C 24050001 */ li $a1, 1 /* B356DC 800BE53C 24050001 */ li $a1, 1
.L800BE540: .L800BE540:
/* B356E0 800BE540 02002025 */ move $a0, $s0 /* B356E0 800BE540 02002025 */ move $a0, $s0
/* B356E4 800BE544 0C017503 */ jal CollisionCheck_InitContext /* B356E4 800BE544 0C017503 */ jal CollisionCheck_ClearContext
/* B356E8 800BE548 8FA50038 */ lw $a1, 0x38($sp) /* B356E8 800BE548 8FA50038 */ lw $a1, 0x38($sp)
/* B356EC 800BE54C 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016 /* B356EC 800BE54C 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016
/* B356F0 800BE550 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) /* B356F0 800BE550 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5)

2
asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s
View file

@ -80,7 +80,7 @@ glabel func_808705D8
/* 00AF4 808706D4 02002025 */ or $a0, $s0, $zero ## $a0 = 0000016C /* 00AF4 808706D4 02002025 */ or $a0, $s0, $zero ## $a0 = 0000016C
/* 00AF8 808706D8 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFAC /* 00AF8 808706D8 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFAC
/* 00AFC 808706DC 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFB8 /* 00AFC 808706DC 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFB8
/* 00B00 808706E0 0C0189CD */ jal func_80062734 /* 00B00 808706E0 0C0189CD */ jal Collider_SetQuadVertices
/* 00B04 808706E4 27A70064 */ addiu $a3, $sp, 0x0064 ## $a3 = FFFFFFC4 /* 00B04 808706E4 27A70064 */ addiu $a3, $sp, 0x0064 ## $a3 = FFFFFFC4
/* 00B08 808706E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B08 808706E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 00B0C 808706EC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00B0C 808706EC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60

2
asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s
View file

@ -133,7 +133,7 @@ glabel BgHakaZou_Init
/* 001AC 8088276C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001AC 8088276C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 001B0 80882770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001B0 80882770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 001B4 80882774 0C0189B7 */ jal Collider_CylinderUpdate /* 001B4 80882774 0C0189B7 */ jal Collider_UpdateCylinder
/* 001B8 80882778 8FA50020 */ lw $a1, 0x0020($sp) /* 001B8 80882778 8FA50020 */ lw $a1, 0x0020($sp)
/* 001BC 8088277C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001BC 8088277C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s
View file

@ -132,7 +132,7 @@ glabel BgHidanHrock_Init
/* 001CC 808892FC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 001CC 808892FC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000
/* 001D0 80889300 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFD4 /* 001D0 80889300 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFD4
/* 001D4 80889304 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFE0 /* 001D4 80889304 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFE0
/* 001D8 80889308 0C0189E8 */ jal func_800627A0 /* 001D8 80889308 0C0189E8 */ jal Collider_SetTrisVertices
/* 001DC 8088930C AFB60010 */ sw $s6, 0x0010($sp) /* 001DC 8088930C AFB60010 */ sw $s6, 0x0010($sp)
/* 001E0 80889310 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 /* 001E0 80889310 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001
/* 001E4 80889314 1657FFC5 */ bne $s2, $s7, .L8088922C /* 001E4 80889314 1657FFC5 */ bne $s2, $s7, .L8088922C

2
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s
View file

@ -93,7 +93,7 @@ glabel BgHidanSekizou_Init
/* 00500 8088D3C0 AE22014C */ sw $v0, 0x014C($s1) ## 0000014C /* 00500 8088D3C0 AE22014C */ sw $v0, 0x014C($s1) ## 0000014C
/* 00504 8088D3C4 24C6E268 */ addiu $a2, $a2, %lo(D_8088E268) ## $a2 = 8088E268 /* 00504 8088D3C4 24C6E268 */ addiu $a2, $a2, %lo(D_8088E268) ## $a2 = 8088E268
/* 00508 8088D3C8 26240098 */ addiu $a0, $s1, 0x0098 ## $a0 = 00000098 /* 00508 8088D3C8 26240098 */ addiu $a0, $s1, 0x0098 ## $a0 = 00000098
/* 0050C 8088D3CC 0C0187B5 */ jal func_80061ED4 /* 0050C 8088D3CC 0C0187B5 */ jal CollisionCheck_SetInfo
/* 00510 8088D3D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00510 8088D3D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00514 8088D3D4 8FBF002C */ lw $ra, 0x002C($sp) /* 00514 8088D3D4 8FBF002C */ lw $ra, 0x002C($sp)
/* 00518 8088D3D8 8FB00020 */ lw $s0, 0x0020($sp) /* 00518 8088D3D8 8FB00020 */ lw $s0, 0x0020($sp)

4
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s
View file

@ -46,7 +46,7 @@ glabel BgHidanSekizou_Update
/* 00A98 8088D958 8FA50024 */ lw $a1, 0x0024($sp) /* 00A98 8088D958 8FA50024 */ lw $a1, 0x0024($sp)
/* 00A9C 8088D95C 8FA60020 */ lw $a2, 0x0020($sp) /* 00A9C 8088D95C 8FA60020 */ lw $a2, 0x0020($sp)
/* 00AA0 8088D960 0C017713 */ jal CollisionCheck_SetOC /* 00AA0 8088D960 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00AA4 8088D964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AA4 8088D964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00AA8 8088D968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AA8 8088D968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00AAC 8088D96C 0C00BE5D */ jal func_8002F974 /* 00AAC 8088D96C 0C00BE5D */ jal func_8002F974
@ -78,7 +78,7 @@ glabel BgHidanSekizou_Update
/* 00B04 8088D9C4 8FA50024 */ lw $a1, 0x0024($sp) /* 00B04 8088D9C4 8FA50024 */ lw $a1, 0x0024($sp)
/* 00B08 8088D9C8 8FA60020 */ lw $a2, 0x0020($sp) /* 00B08 8088D9C8 8FA60020 */ lw $a2, 0x0020($sp)
/* 00B0C 8088D9CC 0C017713 */ jal CollisionCheck_SetOC /* 00B0C 8088D9CC 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00B10 8088D9D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B10 8088D9D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00B14 8088D9D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B14 8088D9D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00B18 8088D9D8 0C00BE5D */ jal func_8002F974 /* 00B18 8088D9D8 0C00BE5D */ jal func_8002F974

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

@ -21,7 +21,7 @@ glabel func_80890740
/* 00048 80890788 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00048 80890788 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 0004C 8089078C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0004C 8089078C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00050 80890790 0C0189B7 */ jal Collider_CylinderUpdate /* 00050 80890790 0C0189B7 */ jal Collider_UpdateCylinder
/* 00054 80890794 8FA5002C */ lw $a1, 0x002C($sp) /* 00054 80890794 8FA5002C */ lw $a1, 0x002C($sp)
/* 00058 80890798 8FA40030 */ lw $a0, 0x0030($sp) /* 00058 80890798 8FA40030 */ lw $a0, 0x0030($sp)
@ -59,7 +59,7 @@ glabel func_80890740
/* 000D0 80890810 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000D0 80890810 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 000D4 80890814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D4 80890814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 000D8 80890818 0C0189B7 */ jal Collider_CylinderUpdate /* 000D8 80890818 0C0189B7 */ jal Collider_UpdateCylinder
/* 000DC 8089081C 8FA50024 */ lw $a1, 0x0024($sp) /* 000DC 8089081C 8FA50024 */ lw $a1, 0x0024($sp)
/* 000E0 80890820 8FAD002C */ lw $t5, 0x002C($sp) /* 000E0 80890820 8FAD002C */ lw $t5, 0x002C($sp)

2
asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s
View file

@ -70,7 +70,7 @@ glabel func_8089107C
/* 00A34 80891174 AFA50028 */ sw $a1, 0x0028($sp) /* 00A34 80891174 AFA50028 */ sw $a1, 0x0028($sp)
/* 00A38 80891178 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000168 /* 00A38 80891178 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000168
/* 00A3C 8089117C 0C017713 */ jal CollisionCheck_SetOC /* 00A3C 8089117C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00A40 80891180 AFA70024 */ sw $a3, 0x0024($sp) /* 00A40 80891180 AFA70024 */ sw $a3, 0x0024($sp)
/* 00A44 80891184 8FA50028 */ lw $a1, 0x0028($sp) /* 00A44 80891184 8FA50028 */ lw $a1, 0x0028($sp)
/* 00A48 80891188 8FA4003C */ lw $a0, 0x003C($sp) /* 00A48 80891188 8FA4003C */ lw $a0, 0x003C($sp)

2
asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s
View file

@ -64,7 +64,7 @@ glabel func_808911D4
/* 00B64 808912A4 AFA5002C */ sw $a1, 0x002C($sp) /* 00B64 808912A4 AFA5002C */ sw $a1, 0x002C($sp)
/* 00B68 808912A8 26060168 */ addiu $a2, $s0, 0x0168 ## $a2 = 00000168 /* 00B68 808912A8 26060168 */ addiu $a2, $s0, 0x0168 ## $a2 = 00000168
/* 00B6C 808912AC 0C017713 */ jal CollisionCheck_SetOC /* 00B6C 808912AC 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00B70 808912B0 AFA30028 */ sw $v1, 0x0028($sp) /* 00B70 808912B0 AFA30028 */ sw $v1, 0x0028($sp)
/* 00B74 808912B4 8FA5002C */ lw $a1, 0x002C($sp) /* 00B74 808912B4 8FA5002C */ lw $a1, 0x002C($sp)
/* 00B78 808912B8 8FA40044 */ lw $a0, 0x0044($sp) /* 00B78 808912B8 8FA40044 */ lw $a0, 0x0044($sp)

2
asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s
View file

@ -28,7 +28,7 @@ glabel func_808988A0
/* 00060 80898900 A4D801A8 */ sh $t8, 0x01A8($a2) ## 000001A8 /* 00060 80898900 A4D801A8 */ sh $t8, 0x01A8($a2) ## 000001A8
/* 00064 80898904 A4D901AA */ sh $t9, 0x01AA($a2) ## 000001AA /* 00064 80898904 A4D901AA */ sh $t9, 0x01AA($a2) ## 000001AA
.L80898908: .L80898908:
/* 00068 80898908 0C0189B7 */ jal Collider_CylinderUpdate /* 00068 80898908 0C0189B7 */ jal Collider_UpdateCylinder
/* 0006C 8089890C 8FA50018 */ lw $a1, 0x0018($sp) /* 0006C 8089890C 8FA50018 */ lw $a1, 0x0018($sp)
/* 00070 80898910 8FBF0014 */ lw $ra, 0x0014($sp) /* 00070 80898910 8FBF0014 */ lw $ra, 0x0014($sp)

2
asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s
View file

@ -37,7 +37,7 @@ glabel BgSpot06Objects_Draw
/* 01034 808AF7B4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 01034 808AF7B4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001
/* 01038 808AF7B8 55CF000D */ bnel $t6, $t7, .L808AF7F0 /* 01038 808AF7B8 55CF000D */ bnel $t6, $t7, .L808AF7F0
/* 0103C 808AF7BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 0103C 808AF7BC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01040 808AF7C0 0C018A29 */ jal func_800628A4 /* 01040 808AF7C0 0C018A29 */ jal Collider_UpdateSpheres
/* 01044 808AF7C4 24C50170 */ addiu $a1, $a2, 0x0170 ## $a1 = 00000170 /* 01044 808AF7C4 24C50170 */ addiu $a1, $a2, 0x0170 ## $a1 = 00000170
/* 01048 808AF7C8 10000009 */ beq $zero, $zero, .L808AF7F0 /* 01048 808AF7C8 10000009 */ beq $zero, $zero, .L808AF7F0
/* 0104C 808AF7CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 0104C 808AF7CC 8FBF0014 */ lw $ra, 0x0014($sp)

2
asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s
View file

@ -15,7 +15,7 @@ glabel BgSpot06Objects_Update
/* 00D84 808AF504 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D84 808AF504 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 00D88 808AF508 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00D88 808AF508 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 00D8C 808AF50C 0C017713 */ jal CollisionCheck_SetOC /* 00D8C 808AF50C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00D90 808AF510 00812821 */ addu $a1, $a0, $at /* 00D90 808AF510 00812821 */ addu $a1, $a0, $at
.L808AF514: .L808AF514:
/* 00D94 808AF514 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D94 808AF514 8FBF0014 */ lw $ra, 0x0014($sp)

8
asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s
View file

@ -91,7 +91,7 @@ glabel BgYdanSp_Init
/* 00150 808BF560 8FA40030 */ lw $a0, 0x0030($sp) /* 00150 808BF560 8FA40030 */ lw $a0, 0x0030($sp)
/* 00154 808BF564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00154 808BF564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00158 808BF568 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 /* 00158 808BF568 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4
/* 0015C 808BF56C 0C0189E8 */ jal func_800627A0 /* 0015C 808BF56C 0C0189E8 */ jal Collider_SetTrisVertices
/* 00160 808BF570 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE0 /* 00160 808BF570 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE0
/* 00164 808BF574 C7B20054 */ lwc1 $f18, 0x0054($sp) /* 00164 808BF574 C7B20054 */ lwc1 $f18, 0x0054($sp)
/* 00168 808BF578 C7A40074 */ lwc1 $f4, 0x0074($sp) /* 00168 808BF578 C7A40074 */ lwc1 $f4, 0x0074($sp)
@ -102,7 +102,7 @@ glabel BgYdanSp_Init
/* 0017C 808BF58C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 /* 0017C 808BF58C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4
/* 00180 808BF590 27A7006C */ addiu $a3, $sp, 0x006C ## $a3 = FFFFFFEC /* 00180 808BF590 27A7006C */ addiu $a3, $sp, 0x006C ## $a3 = FFFFFFEC
/* 00184 808BF594 E7B20060 */ swc1 $f18, 0x0060($sp) /* 00184 808BF594 E7B20060 */ swc1 $f18, 0x0060($sp)
/* 00188 808BF598 0C0189E8 */ jal func_800627A0 /* 00188 808BF598 0C0189E8 */ jal Collider_SetTrisVertices
/* 0018C 808BF59C E7A40068 */ swc1 $f4, 0x0068($sp) /* 0018C 808BF59C E7A40068 */ swc1 $f4, 0x0068($sp)
/* 00190 808BF5A0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00190 808BF5A0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00
/* 00194 808BF5A4 10000080 */ beq $zero, $zero, .L808BF7A8 /* 00194 808BF5A4 10000080 */ beq $zero, $zero, .L808BF7A8
@ -207,7 +207,7 @@ glabel BgYdanSp_Init
/* 002FC 808BF70C E7A20040 */ swc1 $f2, 0x0040($sp) /* 002FC 808BF70C E7A20040 */ swc1 $f2, 0x0040($sp)
/* 00300 808BF710 E7AC0044 */ swc1 $f12, 0x0044($sp) /* 00300 808BF710 E7AC0044 */ swc1 $f12, 0x0044($sp)
/* 00304 808BF714 E7AE0038 */ swc1 $f14, 0x0038($sp) /* 00304 808BF714 E7AE0038 */ swc1 $f14, 0x0038($sp)
/* 00308 808BF718 0C0189E8 */ jal func_800627A0 /* 00308 808BF718 0C0189E8 */ jal Collider_SetTrisVertices
/* 0030C 808BF71C E7B0003C */ swc1 $f16, 0x003C($sp) /* 0030C 808BF71C E7B0003C */ swc1 $f16, 0x003C($sp)
/* 00310 808BF720 3C01808C */ lui $at, %hi(D_808C0984) ## $at = 808C0000 /* 00310 808BF720 3C01808C */ lui $at, %hi(D_808C0984) ## $at = 808C0000
/* 00314 808BF724 C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 00314 808BF724 C7AC0044 */ lwc1 $f12, 0x0044($sp)
@ -241,7 +241,7 @@ glabel BgYdanSp_Init
/* 00384 808BF794 46122201 */ sub.s $f8, $f4, $f18 /* 00384 808BF794 46122201 */ sub.s $f8, $f4, $f18
/* 00388 808BF798 460E3102 */ mul.s $f4, $f6, $f14 /* 00388 808BF798 460E3102 */ mul.s $f4, $f6, $f14
/* 0038C 808BF79C 46082480 */ add.s $f18, $f4, $f8 /* 0038C 808BF79C 46082480 */ add.s $f18, $f4, $f8
/* 00390 808BF7A0 0C0189E8 */ jal func_800627A0 /* 00390 808BF7A0 0C0189E8 */ jal Collider_SetTrisVertices
/* 00394 808BF7A4 E7B20068 */ swc1 $f18, 0x0068($sp) /* 00394 808BF7A4 E7B20068 */ swc1 $f18, 0x0068($sp)
.L808BF7A8: .L808BF7A8:
/* 00398 808BF7A8 8FA40084 */ lw $a0, 0x0084($sp) /* 00398 808BF7A8 8FA40084 */ lw $a0, 0x0084($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s
View file

@ -933,7 +933,7 @@ glabel BossDodongo_Update
/* 035C8 808C4758 00818021 */ addu $s0, $a0, $at /* 035C8 808C4758 00818021 */ addu $s0, $a0, $at
/* 035CC 808C475C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 035CC 808C475C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001
/* 035D0 808C4760 0C017713 */ jal CollisionCheck_SetOC /* 035D0 808C4760 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 035D4 808C4764 AFA60034 */ sw $a2, 0x0034($sp) /* 035D4 808C4764 AFA60034 */ sw $a2, 0x0034($sp)
/* 035D8 808C4768 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 035D8 808C4768 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190
/* 035DC 808C476C 3C03808C */ lui $v1, %hi(func_808C3704) ## $v1 = 808C0000 /* 035DC 808C476C 3C03808C */ lui $v1, %hi(func_808C3704) ## $v1 = 808C0000

2
asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4B90.s
View file

@ -53,7 +53,7 @@ glabel func_808C4B90
/* 03AC0 808C4C50 8FA50028 */ lw $a1, 0x0028($sp) /* 03AC0 808C4C50 8FA50028 */ lw $a1, 0x0028($sp)
.L808C4C54: .L808C4C54:
/* 03AC4 808C4C54 8FA4001C */ lw $a0, 0x001C($sp) /* 03AC4 808C4C54 8FA4001C */ lw $a0, 0x001C($sp)
/* 03AC8 808C4C58 0C018A29 */ jal func_800628A4 /* 03AC8 808C4C58 0C018A29 */ jal Collider_UpdateSpheres
/* 03ACC 808C4C5C 24A50440 */ addiu $a1, $a1, 0x0440 ## $a1 = 00000440 /* 03ACC 808C4C5C 24A50440 */ addiu $a1, $a1, 0x0440 ## $a1 = 00000440
/* 03AD0 808C4C60 8FBF0014 */ lw $ra, 0x0014($sp) /* 03AD0 808C4C60 8FBF0014 */ lw $ra, 0x0014($sp)
/* 03AD4 808C4C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 03AD4 808C4C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5354.s
View file

@ -76,7 +76,7 @@ glabel func_808C5354
/* 042D8 808C5468 55620011 */ bnel $t3, $v0, .L808C54B0 /* 042D8 808C5468 55620011 */ bnel $t3, $v0, .L808C54B0
/* 042DC 808C546C 8FBF001C */ lw $ra, 0x001C($sp) /* 042DC 808C546C 8FBF001C */ lw $ra, 0x001C($sp)
.L808C5470: .L808C5470:
/* 042E0 808C5470 0C018D74 */ jal func_800635D0 /* 042E0 808C5470 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 042E4 808C5474 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 042E4 808C5474 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000
/* 042E8 808C5478 1040000C */ beq $v0, $zero, .L808C54AC /* 042E8 808C5478 1040000C */ beq $v0, $zero, .L808C54AC
/* 042EC 808C547C A3A20027 */ sb $v0, 0x0027($sp) /* 042EC 808C547C A3A20027 */ sb $v0, 0x0027($sp)

4
asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s
View file

@ -572,7 +572,7 @@ glabel func_808D08F8
.L808D1084: .L808D1084:
/* 062C4 808D1084 1A200003 */ blez $s1, .L808D1094 /* 062C4 808D1084 1A200003 */ blez $s1, .L808D1094
/* 062C8 808D1088 26240001 */ addiu $a0, $s1, 0x0001 ## $a0 = 00000001 /* 062C8 808D1088 26240001 */ addiu $a0, $s1, 0x0001 ## $a0 = 00000001
/* 062CC 808D108C 0C018A29 */ jal func_800628A4 /* 062CC 808D108C 0C018A29 */ jal Collider_UpdateSpheres
/* 062D0 808D1090 8FA5007C */ lw $a1, 0x007C($sp) /* 062D0 808D1090 8FA5007C */ lw $a1, 0x007C($sp)
.L808D1094: .L808D1094:
/* 062D4 808D1094 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 062D4 808D1094 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001
@ -680,7 +680,7 @@ glabel func_808D08F8
/* 06460 808D1220 24841E1C */ addiu $a0, $a0, %lo(D_808D1E1C) ## $a0 = 808D1E1C /* 06460 808D1220 24841E1C */ addiu $a0, $a0, %lo(D_808D1E1C) ## $a0 = 808D1E1C
/* 06464 808D1224 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 06464 808D1224 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000
/* 06468 808D1228 0C018A29 */ jal func_800628A4 /* 06468 808D1228 0C018A29 */ jal Collider_UpdateSpheres
/* 0646C 808D122C 8FA5007C */ lw $a1, 0x007C($sp) /* 0646C 808D122C 8FA5007C */ lw $a1, 0x007C($sp)
/* 06470 808D1230 0C034221 */ jal Matrix_Pull /* 06470 808D1230 0C034221 */ jal Matrix_Pull
/* 06474 808D1234 00000000 */ nop /* 06474 808D1234 00000000 */ nop

2
asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s
View file

@ -77,7 +77,7 @@ glabel BossFd2_Update
/* 0285C 808D4ECC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0285C 808D4ECC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 02860 808D4ED0 8FA50028 */ lw $a1, 0x0028($sp) /* 02860 808D4ED0 8FA50028 */ lw $a1, 0x0028($sp)
/* 02864 808D4ED4 0C017713 */ jal CollisionCheck_SetOC /* 02864 808D4ED4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 02868 808D4ED8 8FA60024 */ lw $a2, 0x0024($sp) /* 02868 808D4ED8 8FA60024 */ lw $a2, 0x0024($sp)
/* 0286C 808D4EDC 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 /* 0286C 808D4EDC 92180194 */ lbu $t8, 0x0194($s0) ## 00000194
/* 02870 808D4EE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02870 808D4EE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4790.s
View file

@ -190,7 +190,7 @@ glabel func_808D4790
/* 02394 808D4A04 1000008F */ beq $zero, $zero, .L808D4C44 /* 02394 808D4A04 1000008F */ beq $zero, $zero, .L808D4C44
/* 02398 808D4A08 8FBF003C */ lw $ra, 0x003C($sp) /* 02398 808D4A08 8FBF003C */ lw $ra, 0x003C($sp)
.L808D4A0C: .L808D4A0C:
/* 0239C 808D4A0C 0C018D74 */ jal func_800635D0 /* 0239C 808D4A0C 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 023A0 808D4A10 8E040000 */ lw $a0, 0x0000($s0) ## 00000001 /* 023A0 808D4A10 8E040000 */ lw $a0, 0x0000($s0) ## 00000001
/* 023A4 808D4A14 14400009 */ bne $v0, $zero, .L808D4A3C /* 023A4 808D4A14 14400009 */ bne $v0, $zero, .L808D4A3C
/* 023A8 808D4A18 305100FF */ andi $s1, $v0, 0x00FF ## $s1 = 00000000 /* 023A8 808D4A18 305100FF */ andi $s1, $v0, 0x00FF ## $s1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D5228.s
View file

@ -35,7 +35,7 @@ glabel func_808D5228
.L808D52AC: .L808D52AC:
/* 02C3C 808D52AC 8FA50028 */ lw $a1, 0x0028($sp) /* 02C3C 808D52AC 8FA50028 */ lw $a1, 0x0028($sp)
/* 02C40 808D52B0 8FA4001C */ lw $a0, 0x001C($sp) /* 02C40 808D52B0 8FA4001C */ lw $a0, 0x001C($sp)
/* 02C44 808D52B4 0C018A29 */ jal func_800628A4 /* 02C44 808D52B4 0C018A29 */ jal Collider_UpdateSpheres
/* 02C48 808D52B8 24A5141C */ addiu $a1, $a1, 0x141C ## $a1 = 0000141C /* 02C48 808D52B8 24A5141C */ addiu $a1, $a1, 0x141C ## $a1 = 0000141C
/* 02C4C 808D52BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02C4C 808D52BC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02C50 808D52C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 02C50 808D52C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s
View file

@ -300,7 +300,7 @@ glabel BossGanon_Update
/* 0707C 808DD8EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 /* 0707C 808DD8EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001
/* 07080 808DD8F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 07080 808DD8F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000
/* 07084 808DD8F4 0C017713 */ jal CollisionCheck_SetOC /* 07084 808DD8F4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 07088 808DD8F8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 /* 07088 808DD8F8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610
/* 0708C 808DD8FC 86AA02D4 */ lh $t2, 0x02D4($s5) ## 000002D4 /* 0708C 808DD8FC 86AA02D4 */ lh $t2, 0x02D4($s5) ## 000002D4
/* 07090 808DD900 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 07090 808DD900 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s
View file

@ -94,7 +94,7 @@ glabel func_808DD20C
/* 06AEC 808DD35C 2A41001E */ slti $at, $s2, 0x001E /* 06AEC 808DD35C 2A41001E */ slti $at, $s2, 0x001E
/* 06AF0 808DD360 1420FFE3 */ bne $at, $zero, .L808DD2F0 /* 06AF0 808DD360 1420FFE3 */ bne $at, $zero, .L808DD2F0
/* 06AF4 808DD364 00000000 */ nop /* 06AF4 808DD364 00000000 */ nop
/* 06AF8 808DD368 0C018D74 */ jal func_800635D0 /* 06AF8 808DD368 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 06AFC 808DD36C 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 /* 06AFC 808DD36C 8E640000 */ lw $a0, 0x0000($s3) ## 00000000
/* 06B00 808DD370 14400003 */ bne $v0, $zero, .L808DD380 /* 06B00 808DD370 14400003 */ bne $v0, $zero, .L808DD380
/* 06B04 808DD374 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000000 /* 06B04 808DD374 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s
View file

@ -568,7 +568,7 @@ glabel L808E176C
.L808E17B4: .L808E17B4:
/* 0AF44 808E17B4 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610 /* 0AF44 808E17B4 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610
/* 0AF48 808E17B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610 /* 0AF48 808E17B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610
/* 0AF4C 808E17BC 0C0189B7 */ jal Collider_CylinderUpdate /* 0AF4C 808E17BC 0C0189B7 */ jal Collider_UpdateCylinder
/* 0AF50 808E17C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0AF50 808E17C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0AF54 808E17C4 862F01B8 */ lh $t7, 0x01B8($s1) ## 000001B8 /* 0AF54 808E17C4 862F01B8 */ lh $t7, 0x01B8($s1) ## 000001B8

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s
View file

@ -585,7 +585,7 @@ glabel L808E29A8
/* 0C4BC 808E2D2C 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610 /* 0C4BC 808E2D2C 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610
.L808E2D30: .L808E2D30:
/* 0C4C0 808E2D30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610 /* 0C4C0 808E2D30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610
/* 0C4C4 808E2D34 0C0189B7 */ jal Collider_CylinderUpdate /* 0C4C4 808E2D34 0C0189B7 */ jal Collider_UpdateCylinder
/* 0C4C8 808E2D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0C4C8 808E2D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0C4CC 808E2D3C 862A01B8 */ lh $t2, 0x01B8($s1) ## 000001B8 /* 0C4CC 808E2D3C 862A01B8 */ lh $t2, 0x01B8($s1) ## 000001B8

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s
View file

@ -471,7 +471,7 @@ glabel BossGanon2_Update
/* 05E64 80902DA4 AFA60034 */ sw $a2, 0x0034($sp) /* 05E64 80902DA4 AFA60034 */ sw $a2, 0x0034($sp)
/* 05E68 80902DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 05E68 80902DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001
/* 05E6C 80902DAC 0C017713 */ jal CollisionCheck_SetOC /* 05E6C 80902DAC 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 05E70 80902DB0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05E70 80902DB0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 05E74 80902DB4 8E380190 */ lw $t8, 0x0190($s1) ## 00000190 /* 05E74 80902DB4 8E380190 */ lw $t8, 0x0190($s1) ## 00000190
/* 05E78 80902DB8 3C0B8090 */ lui $t3, %hi(func_8090120C) ## $t3 = 80900000 /* 05E78 80902DB8 3C0B8090 */ lui $t3, %hi(func_8090120C) ## $t3 = 80900000
@ -490,7 +490,7 @@ glabel BossGanon2_Update
/* 05EA8 80902DE8 AFA60034 */ sw $a2, 0x0034($sp) /* 05EA8 80902DE8 AFA60034 */ sw $a2, 0x0034($sp)
/* 05EAC 80902DEC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05EAC 80902DEC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 05EB0 80902DF0 0C017713 */ jal CollisionCheck_SetOC /* 05EB0 80902DF0 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 05EB4 80902DF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 05EB4 80902DF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001
/* 05EB8 80902DF8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05EB8 80902DF8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 05EBC 80902DFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 05EBC 80902DFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905DA8.s
View file

@ -131,7 +131,7 @@ glabel func_80905DA8
/* 09004 80905F44 0C01E221 */ jal func_80078884 /* 09004 80905F44 0C01E221 */ jal func_80078884
/* 09008 80905F48 E7A6007C */ swc1 $f6, 0x007C($sp) /* 09008 80905F48 E7A6007C */ swc1 $f6, 0x007C($sp)
/* 0900C 80905F4C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0900C 80905F4C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000
/* 09010 80905F50 0C018B58 */ jal func_80062D60 /* 09010 80905F50 0C018B58 */ jal CollisionCheck_SpawnShieldParticlesMetal
/* 09014 80905F54 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFD8 /* 09014 80905F54 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFD8
/* 09018 80905F58 E6140014 */ swc1 $f20, 0x0014($s0) ## 00010014 /* 09018 80905F58 E6140014 */ swc1 $f20, 0x0014($s0) ## 00010014
.L80905F5C: .L80905F5C:

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s
View file

@ -144,7 +144,7 @@ glabel BossGanondrof_Update
/* 039E8 80914028 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 039E8 80914028 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 039EC 8091402C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 039EC 8091402C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 039F0 80914030 0C017713 */ jal CollisionCheck_SetOC /* 039F0 80914030 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 039F4 80914034 8FA6003C */ lw $a2, 0x003C($sp) /* 039F4 80914034 8FA6003C */ lw $a2, 0x003C($sp)
/* 039F8 80914038 1000001A */ beq $zero, $zero, .L809140A4 /* 039F8 80914038 1000001A */ beq $zero, $zero, .L809140A4
/* 039FC 8091403C 8FAC0038 */ lw $t4, 0x0038($sp) /* 039FC 8091403C 8FAC0038 */ lw $t4, 0x0038($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80913C54.s
View file

@ -81,7 +81,7 @@ glabel func_80913C54
/* 03718 80913D58 55000048 */ bnel $t0, $zero, .L80913E7C /* 03718 80913D58 55000048 */ bnel $t0, $zero, .L80913E7C
/* 0371C 80913D5C 8FBF001C */ lw $ra, 0x001C($sp) /* 0371C 80913D5C 8FBF001C */ lw $ra, 0x001C($sp)
/* 03720 80913D60 A3A00022 */ sb $zero, 0x0022($sp) /* 03720 80913D60 A3A00022 */ sb $zero, 0x0022($sp)
/* 03724 80913D64 0C018D74 */ jal func_800635D0 /* 03724 80913D64 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 03728 80913D68 AFA70028 */ sw $a3, 0x0028($sp) /* 03728 80913D68 AFA70028 */ sw $a3, 0x0028($sp)
/* 0372C 80913D6C 93A50022 */ lbu $a1, 0x0022($sp) /* 0372C 80913D6C 93A50022 */ lbu $a1, 0x0022($sp)
/* 03730 80913D70 8FA70028 */ lw $a3, 0x0028($sp) /* 03730 80913D70 8FA70028 */ lw $a3, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s
View file

@ -101,7 +101,7 @@ glabel BossGoma_Update
/* 04AE8 8091A4F8 8FA4003C */ lw $a0, 0x003C($sp) /* 04AE8 8091A4F8 8FA4003C */ lw $a0, 0x003C($sp)
/* 04AEC 8091A4FC 8FA5002C */ lw $a1, 0x002C($sp) /* 04AEC 8091A4FC 8FA5002C */ lw $a1, 0x002C($sp)
/* 04AF0 8091A500 0C017713 */ jal CollisionCheck_SetOC /* 04AF0 8091A500 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 04AF4 8091A504 8FA60028 */ lw $a2, 0x0028($sp) /* 04AF4 8091A504 8FA60028 */ lw $a2, 0x0028($sp)
/* 04AF8 8091A508 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 04AF8 8091A508 8E020190 */ lw $v0, 0x0190($s0) ## 00000190
/* 04AFC 8091A50C 3C0F8092 */ lui $t7, %hi(func_80919150) ## $t7 = 80920000 /* 04AFC 8091A50C 3C0F8092 */ lui $t7, %hi(func_80919150) ## $t7 = 80920000

2
asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s
View file

@ -51,7 +51,7 @@ glabel func_80919F8C
/* 04630 8091A040 1462001F */ bne $v1, $v0, .L8091A0C0 /* 04630 8091A040 1462001F */ bne $v1, $v0, .L8091A0C0
/* 04634 8091A044 8FAE002C */ lw $t6, 0x002C($sp) /* 04634 8091A044 8FAE002C */ lw $t6, 0x002C($sp)
/* 04638 8091A048 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 04638 8091A048 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000
/* 0463C 8091A04C 0C018D74 */ jal func_800635D0 /* 0463C 8091A04C 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 04640 8091A050 AFA30024 */ sw $v1, 0x0024($sp) /* 04640 8091A050 AFA30024 */ sw $v1, 0x0024($sp)
/* 04644 8091A054 1040001A */ beq $v0, $zero, .L8091A0C0 /* 04644 8091A054 1040001A */ beq $v0, $zero, .L8091A0C0
/* 04648 8091A058 8FA30024 */ lw $v1, 0x0024($sp) /* 04648 8091A058 8FA30024 */ lw $v1, 0x0024($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s
View file

@ -137,7 +137,7 @@ glabel func_8091A9E8
.L8091ABC8: .L8091ABC8:
/* 051B8 8091ABC8 8FA300B8 */ lw $v1, 0x00B8($sp) /* 051B8 8091ABC8 8FA300B8 */ lw $v1, 0x00B8($sp)
/* 051BC 8091ABCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 051BC 8091ABCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 051C0 8091ABD0 0C018A29 */ jal func_800628A4 /* 051C0 8091ABD0 0C018A29 */ jal Collider_UpdateSpheres
/* 051C4 8091ABD4 246507BC */ addiu $a1, $v1, 0x07BC ## $a1 = 000007BC /* 051C4 8091ABD4 246507BC */ addiu $a1, $v1, 0x07BC ## $a1 = 000007BC
/* 051C8 8091ABD8 8FBF003C */ lw $ra, 0x003C($sp) /* 051C8 8091ABD8 8FBF003C */ lw $ra, 0x003C($sp)
/* 051CC 8091ABDC 8FB00038 */ lw $s0, 0x0038($sp) /* 051CC 8091ABDC 8FB00038 */ lw $s0, 0x0038($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s
View file

@ -560,7 +560,7 @@ glabel BossMo_Update
/* 07C14 80923714 2651101C */ addiu $s1, $s2, 0x101C ## $s1 = 0000101C /* 07C14 80923714 2651101C */ addiu $s1, $s2, 0x101C ## $s1 = 0000101C
/* 07C18 80923718 02203025 */ or $a2, $s1, $zero ## $a2 = 0000101C /* 07C18 80923718 02203025 */ or $a2, $s1, $zero ## $a2 = 0000101C
/* 07C1C 8092371C 0C017713 */ jal CollisionCheck_SetOC /* 07C1C 8092371C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 07C20 80923720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 07C20 80923720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024
/* 07C24 80923724 8FA400BC */ lw $a0, 0x00BC($sp) /* 07C24 80923724 8FA400BC */ lw $a0, 0x00BC($sp)
/* 07C28 80923728 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 07C28 80923728 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024

2
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s
View file

@ -103,7 +103,7 @@ glabel func_80921280
/* 05864 80921364 862A0160 */ lh $t2, 0x0160($s1) ## 00000160 /* 05864 80921364 862A0160 */ lh $t2, 0x0160($s1) ## 00000160
/* 05868 80921368 154000CC */ bne $t2, $zero, .L8092169C /* 05868 80921368 154000CC */ bne $t2, $zero, .L8092169C
/* 0586C 8092136C 00000000 */ nop /* 0586C 8092136C 00000000 */ nop
/* 05870 80921370 0C018D74 */ jal func_800635D0 /* 05870 80921370 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 05874 80921374 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 /* 05874 80921374 8E040000 */ lw $a0, 0x0000($s0) ## 00000000
/* 05878 80921378 10400057 */ beq $v0, $zero, .L809214D8 /* 05878 80921378 10400057 */ beq $v0, $zero, .L809214D8
/* 0587C 8092137C A3A20063 */ sb $v0, 0x0063($sp) /* 0587C 8092137C A3A20063 */ sb $v0, 0x0063($sp)

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

@ -108,7 +108,7 @@ glabel func_80922D30
/* 073A4 80922EA4 260614FC */ addiu $a2, $s0, 0x14FC ## $a2 = 000014FC /* 073A4 80922EA4 260614FC */ addiu $a2, $s0, 0x14FC ## $a2 = 000014FC
/* 073A8 80922EA8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000014FC /* 073A8 80922EA8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000014FC
/* 073AC 80922EAC AFA60020 */ sw $a2, 0x0020($sp) /* 073AC 80922EAC AFA60020 */ sw $a2, 0x0020($sp)
/* 073B0 80922EB0 0C0189B7 */ jal Collider_CylinderUpdate /* 073B0 80922EB0 0C0189B7 */ jal Collider_UpdateCylinder
/* 073B4 80922EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 073B4 80922EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 073B8 80922EB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 073B8 80922EB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -143,7 +143,7 @@ glabel func_80922D30
/* 07420 80922F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 07420 80922F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L80922F24: .L80922F24:
/* 07424 80922F24 0C017713 */ jal CollisionCheck_SetOC /* 07424 80922F24 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 07428 80922F28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07428 80922F28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0742C 80922F2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0742C 80922F2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L80922F30: .L80922F30:

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s
View file

@ -31,7 +31,7 @@ glabel BossSst_Init
/* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000 /* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000
/* 0004C 8092C61C 24C67824 */ addiu $a2, $a2, %lo(D_80937824) ## $a2 = 80937824 /* 0004C 8092C61C 24C67824 */ addiu $a2, $a2, %lo(D_80937824) ## $a2 = 80937824
/* 00050 8092C620 24A5782C */ addiu $a1, $a1, %lo(D_8093782C) ## $a1 = 8093782C /* 00050 8092C620 24A5782C */ addiu $a1, $a1, %lo(D_8093782C) ## $a1 = 8093782C
/* 00054 8092C624 0C0187B5 */ jal func_80061ED4 /* 00054 8092C624 0C0187B5 */ jal CollisionCheck_SetInfo
/* 00058 8092C628 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00058 8092C628 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 0005C 8092C62C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0005C 8092C62C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00060 8092C630 0C00B2DD */ jal Flags_SetSwitch /* 00060 8092C630 0C00B2DD */ jal Flags_SetSwitch

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s
View file

@ -127,7 +127,7 @@ glabel BossSst_Update
/* 07C10 809341E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07C10 809341E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 07C14 809341E4 02212821 */ addu $a1, $s1, $at /* 07C14 809341E4 02212821 */ addu $a1, $s1, $at
/* 07C18 809341E8 0C017713 */ jal CollisionCheck_SetOC /* 07C18 809341E8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 07C1C 809341EC 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 /* 07C1C 809341EC 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4
.L809341F0: .L809341F0:
/* 07C20 809341F0 920D06C4 */ lbu $t5, 0x06C4($s0) ## 000006C4 /* 07C20 809341F0 920D06C4 */ lbu $t5, 0x06C4($s0) ## 000006C4

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s
View file

@ -81,7 +81,7 @@ glabel func_80930934
/* 04478 80930A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04478 80930A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0447C 80930A4C 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 /* 0447C 80930A4C 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4
/* 04480 80930A50 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 04480 80930A50 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001
/* 04484 80930A54 0C0189B7 */ jal Collider_CylinderUpdate /* 04484 80930A54 0C0189B7 */ jal Collider_UpdateCylinder
/* 04488 80930A58 A20D06C4 */ sb $t5, 0x06C4($s0) ## 000006C4 /* 04488 80930A58 A20D06C4 */ sb $t5, 0x06C4($s0) ## 000006C4
/* 0448C 80930A5C 3C0E8093 */ lui $t6, %hi(D_80937818) ## $t6 = 80930000 /* 0448C 80930A5C 3C0E8093 */ lui $t6, %hi(D_80937818) ## $t6 = 80930000

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s
View file

@ -109,7 +109,7 @@ glabel func_80934338
/* 07EEC 809344BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07EEC 809344BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 07EF0 809344C0 02212821 */ addu $a1, $s1, $at /* 07EF0 809344C0 02212821 */ addu $a1, $s1, $at
/* 07EF4 809344C4 0C017713 */ jal CollisionCheck_SetOC /* 07EF4 809344C4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 07EF8 809344C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 /* 07EF8 809344C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4
.L809344CC: .L809344CC:
/* 07EFC 809344CC 0C24CE7E */ jal func_809339F8 /* 07EFC 809344CC 0C24CE7E */ jal func_809339F8

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s
View file

@ -7,7 +7,7 @@ glabel func_809345F0
/* 08034 80934604 AFBF0014 */ sw $ra, 0x0014($sp) /* 08034 80934604 AFBF0014 */ sw $ra, 0x0014($sp)
/* 08038 80934608 AFA60020 */ sw $a2, 0x0020($sp) /* 08038 80934608 AFA60020 */ sw $a2, 0x0020($sp)
/* 0803C 8093460C AFA70024 */ sw $a3, 0x0024($sp) /* 0803C 8093460C AFA70024 */ sw $a3, 0x0024($sp)
/* 08040 80934610 0C018A29 */ jal func_800628A4 /* 08040 80934610 0C018A29 */ jal Collider_UpdateSpheres
/* 08044 80934614 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4 /* 08044 80934614 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4
/* 08048 80934618 8FBF0014 */ lw $ra, 0x0014($sp) /* 08048 80934618 8FBF0014 */ lw $ra, 0x0014($sp)
/* 0804C 8093461C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 0804C 8093461C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s
View file

@ -35,7 +35,7 @@ glabel func_80935238
.L809352BC: .L809352BC:
/* 08CEC 809352BC 8FA20038 */ lw $v0, 0x0038($sp) /* 08CEC 809352BC 8FA20038 */ lw $v0, 0x0038($sp)
/* 08CF0 809352C0 8FA4002C */ lw $a0, 0x002C($sp) /* 08CF0 809352C0 8FA4002C */ lw $a0, 0x002C($sp)
/* 08CF4 809352C4 0C018A29 */ jal func_800628A4 /* 08CF4 809352C4 0C018A29 */ jal Collider_UpdateSpheres
/* 08CF8 809352C8 244503D4 */ addiu $a1, $v0, 0x03D4 ## $a1 = 000003D4 /* 08CF8 809352C8 244503D4 */ addiu $a1, $v0, 0x03D4 ## $a1 = 000003D4
/* 08CFC 809352CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 08CFC 809352CC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 08D00 809352D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 08D00 809352D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s
View file

@ -207,7 +207,7 @@ glabel BossTw_Update
/* 07CC4 80940994 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 /* 07CC4 80940994 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000
/* 07CC8 80940998 A22805BD */ sb $t0, 0x05BD($s1) ## 000005BD /* 07CC8 80940998 A22805BD */ sb $t0, 0x05BD($s1) ## 000005BD
.L8094099C: .L8094099C:
/* 07CCC 8094099C 0C0189B7 */ jal Collider_CylinderUpdate /* 07CCC 8094099C 0C0189B7 */ jal Collider_UpdateCylinder
/* 07CD0 809409A0 02002825 */ or $a1, $s0, $zero ## $a1 = 000005AC /* 07CD0 809409A0 02002825 */ or $a1, $s0, $zero ## $a1 = 000005AC
/* 07CD4 809409A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 07CD4 809409A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000

6
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s
View file

@ -432,7 +432,7 @@ glabel func_80940D48
/* 08614 809412E4 A64E05F0 */ sh $t6, 0x05F0($s2) ## 000005F0 /* 08614 809412E4 A64E05F0 */ sh $t6, 0x05F0($s2) ## 000005F0
/* 08618 809412E8 264505AC */ addiu $a1, $s2, 0x05AC ## $a1 = 000005AC /* 08618 809412E8 264505AC */ addiu $a1, $s2, 0x05AC ## $a1 = 000005AC
/* 0861C 809412EC AFA5004C */ sw $a1, 0x004C($sp) /* 0861C 809412EC AFA5004C */ sw $a1, 0x004C($sp)
/* 08620 809412F0 0C0189B7 */ jal Collider_CylinderUpdate /* 08620 809412F0 0C0189B7 */ jal Collider_UpdateCylinder
/* 08624 809412F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 08624 809412F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 08628 809412F8 8648015A */ lh $t0, 0x015A($s2) ## 0000015A /* 08628 809412F8 8648015A */ lh $t0, 0x015A($s2) ## 0000015A
@ -482,7 +482,7 @@ glabel func_80940D48
/* 086CC 8094139C 8E5005E8 */ lw $s0, 0x05E8($s2) ## 000005E8 /* 086CC 8094139C 8E5005E8 */ lw $s0, 0x05E8($s2) ## 000005E8
/* 086D0 809413A0 A24805BD */ sb $t0, 0x05BD($s2) ## 000005BD /* 086D0 809413A0 A24805BD */ sb $t0, 0x05BD($s2) ## 000005BD
/* 086D4 809413A4 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 086D4 809413A4 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000
/* 086D8 809413A8 0C018D74 */ jal func_800635D0 /* 086D8 809413A8 0C018D74 */ jal CollisionCheck_GetSwordDamage
/* 086DC 809413AC 8E040000 */ lw $a0, 0x0000($s0) ## 00000001 /* 086DC 809413AC 8E040000 */ lw $a0, 0x0000($s0) ## 00000001
/* 086E0 809413B0 14400003 */ bne $v0, $zero, .L809413C0 /* 086E0 809413B0 14400003 */ bne $v0, $zero, .L809413C0
/* 086E4 809413B4 304600FF */ andi $a2, $v0, 0x00FF ## $a2 = 00000000 /* 086E4 809413B4 304600FF */ andi $a2, $v0, 0x00FF ## $a2 = 00000000
@ -523,7 +523,7 @@ glabel func_80940D48
/* 08754 80941424 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 08754 80941424 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 08758 80941428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 08758 80941428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001
/* 0875C 8094142C 0C017713 */ jal CollisionCheck_SetOC /* 0875C 8094142C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 08760 80941430 8FA6004C */ lw $a2, 0x004C($sp) /* 08760 80941430 8FA6004C */ lw $a2, 0x004C($sp)
/* 08764 80941434 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 08764 80941434 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 08768 80941438 24100002 */ addiu $s0, $zero, 0x0002 ## $s0 = 00000002 /* 08768 80941438 24100002 */ addiu $s0, $zero, 0x0002 ## $s0 = 00000002

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s
View file

@ -70,7 +70,7 @@ glabel func_80946B00
/* 0DF2C 80946BFC AE09003C */ sw $t1, 0x003C($s0) ## 0000003C /* 0DF2C 80946BFC AE09003C */ sw $t1, 0x003C($s0) ## 0000003C
/* 0DF30 80946C00 8CCA0008 */ lw $t2, 0x0008($a2) ## 00000008 /* 0DF30 80946C00 8CCA0008 */ lw $t2, 0x0008($a2) ## 00000008
/* 0DF34 80946C04 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 /* 0DF34 80946C04 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040
/* 0DF38 80946C08 0C0189B7 */ jal Collider_CylinderUpdate /* 0DF38 80946C08 0C0189B7 */ jal Collider_UpdateCylinder
/* 0DF3C 80946C0C AFA50024 */ sw $a1, 0x0024($sp) /* 0DF3C 80946C0C AFA50024 */ sw $a1, 0x0024($sp)
/* 0DF40 80946C10 920B0565 */ lbu $t3, 0x0565($s0) ## 00000565 /* 0DF40 80946C10 920B0565 */ lbu $t3, 0x0565($s0) ## 00000565

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

@ -294,7 +294,7 @@ glabel L80959578
/* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp) /* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp)
/* 0A2E8 809595A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 0A2E8 809595A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000
/* 0A2EC 809595AC 0C018A29 */ jal func_800628A4 /* 0A2EC 809595AC 0C018A29 */ jal Collider_UpdateSpheres
/* 0A2F0 809595B0 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 /* 0A2F0 809595B0 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8
/* 0A2F4 809595B4 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 /* 0A2F4 809595B4 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000
/* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) /* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3)
@ -375,7 +375,7 @@ glabel L80959578
/* 0A41C 809596DC 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 /* 0A41C 809596DC 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338
/* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp) /* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp)
/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp) /* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp)
/* 0A428 809596E8 0C0189CD */ jal func_80062734 /* 0A428 809596E8 0C0189CD */ jal Collider_SetQuadVertices
/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp) /* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp)
/* 0A430 809596F0 0C034221 */ jal Matrix_Pull /* 0A430 809596F0 0C034221 */ jal Matrix_Pull
/* 0A434 809596F4 00000000 */ nop /* 0A434 809596F4 00000000 */ nop

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

@ -169,7 +169,7 @@ glabel func_80951844
/* 027B8 80951A78 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C /* 027B8 80951A78 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C
.L80951A7C: .L80951A7C:
/* 027BC 80951A7C AFA50040 */ sw $a1, 0x0040($sp) /* 027BC 80951A7C AFA50040 */ sw $a1, 0x0040($sp)
/* 027C0 80951A80 0C0189B7 */ jal Collider_CylinderUpdate /* 027C0 80951A80 0C0189B7 */ jal Collider_UpdateCylinder
/* 027C4 80951A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 027C4 80951A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 027C8 80951A88 8FA4004C */ lw $a0, 0x004C($sp) /* 027C8 80951A88 8FA4004C */ lw $a0, 0x004C($sp)
@ -178,7 +178,7 @@ glabel func_80951844
/* 027D4 80951A94 00812821 */ addu $a1, $a0, $at /* 027D4 80951A94 00812821 */ addu $a1, $a0, $at
/* 027D8 80951A98 AFA5003C */ sw $a1, 0x003C($sp) /* 027D8 80951A98 AFA5003C */ sw $a1, 0x003C($sp)
/* 027DC 80951A9C 0C017713 */ jal CollisionCheck_SetOC /* 027DC 80951A9C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 027E0 80951AA0 8FA60040 */ lw $a2, 0x0040($sp) /* 027E0 80951AA0 8FA60040 */ lw $a2, 0x0040($sp)
/* 027E4 80951AA4 8FA5003C */ lw $a1, 0x003C($sp) /* 027E4 80951AA4 8FA5003C */ lw $a1, 0x003C($sp)
/* 027E8 80951AA8 8FA4004C */ lw $a0, 0x004C($sp) /* 027E8 80951AA8 8FA4004C */ lw $a0, 0x004C($sp)

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

@ -313,7 +313,7 @@ glabel func_80951C04
/* 02D80 80952040 46109180 */ add.s $f6, $f18, $f16 /* 02D80 80952040 46109180 */ add.s $f6, $f18, $f16
/* 02D84 80952044 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 /* 02D84 80952044 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040
/* 02D88 80952048 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C /* 02D88 80952048 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C
/* 02D8C 8095204C 0C0189B7 */ jal Collider_CylinderUpdate /* 02D8C 8095204C 0C0189B7 */ jal Collider_UpdateCylinder
/* 02D90 80952050 AFA50040 */ sw $a1, 0x0040($sp) /* 02D90 80952050 AFA50040 */ sw $a1, 0x0040($sp)
/* 02D94 80952054 8FA4005C */ lw $a0, 0x005C($sp) /* 02D94 80952054 8FA4005C */ lw $a0, 0x005C($sp)
@ -322,7 +322,7 @@ glabel func_80951C04
/* 02DA0 80952060 00812821 */ addu $a1, $a0, $at /* 02DA0 80952060 00812821 */ addu $a1, $a0, $at
/* 02DA4 80952064 AFA5003C */ sw $a1, 0x003C($sp) /* 02DA4 80952064 AFA5003C */ sw $a1, 0x003C($sp)
/* 02DA8 80952068 0C017713 */ jal CollisionCheck_SetOC /* 02DA8 80952068 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 02DAC 8095206C 8FA60040 */ lw $a2, 0x0040($sp) /* 02DAC 8095206C 8FA60040 */ lw $a2, 0x0040($sp)
/* 02DB0 80952070 92030114 */ lbu $v1, 0x0114($s0) ## 00000114 /* 02DB0 80952070 92030114 */ lbu $v1, 0x0114($s0) ## 00000114
/* 02DB4 80952074 8FA4005C */ lw $a0, 0x005C($sp) /* 02DB4 80952074 8FA4005C */ lw $a0, 0x005C($sp)

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

@ -427,7 +427,7 @@ glabel func_8095213C
/* 03434 809526F4 2670028C */ addiu $s0, $s3, 0x028C ## $s0 = 0000028C /* 03434 809526F4 2670028C */ addiu $s0, $s3, 0x028C ## $s0 = 0000028C
.L809526F8: .L809526F8:
/* 03438 809526F8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 03438 809526F8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C
/* 0343C 809526FC 0C0189B7 */ jal Collider_CylinderUpdate /* 0343C 809526FC 0C0189B7 */ jal Collider_UpdateCylinder
/* 03440 80952700 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 03440 80952700 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 03444 80952704 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03444 80952704 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -436,7 +436,7 @@ glabel func_8095213C
/* 03450 80952710 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0 /* 03450 80952710 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0
/* 03454 80952714 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03454 80952714 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000
/* 03458 80952718 0C017713 */ jal CollisionCheck_SetOC /* 03458 80952718 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 0345C 8095271C 02003025 */ or $a2, $s0, $zero ## $a2 = 0000028C /* 0345C 8095271C 02003025 */ or $a2, $s0, $zero ## $a2 = 0000028C
/* 03460 80952720 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03460 80952720 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000
/* 03464 80952724 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0 /* 03464 80952724 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0

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

@ -718,7 +718,7 @@ glabel func_80952858
/* 03F88 80953248 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03F88 80953248 E7AA0010 */ swc1 $f10, 0x0010($sp)
/* 03F8C 8095324C 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C /* 03F8C 8095324C 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C
/* 03F90 80953250 AFA5003C */ sw $a1, 0x003C($sp) /* 03F90 80953250 AFA5003C */ sw $a1, 0x003C($sp)
/* 03F94 80953254 0C0189B7 */ jal Collider_CylinderUpdate /* 03F94 80953254 0C0189B7 */ jal Collider_UpdateCylinder
/* 03F98 80953258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03F98 80953258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 03F9C 8095325C 8FA4005C */ lw $a0, 0x005C($sp) /* 03F9C 8095325C 8FA4005C */ lw $a0, 0x005C($sp)
@ -727,7 +727,7 @@ glabel func_80952858
/* 03FA8 80953268 00812821 */ addu $a1, $a0, $at /* 03FA8 80953268 00812821 */ addu $a1, $a0, $at
/* 03FAC 8095326C AFA50038 */ sw $a1, 0x0038($sp) /* 03FAC 8095326C AFA50038 */ sw $a1, 0x0038($sp)
/* 03FB0 80953270 0C017713 */ jal CollisionCheck_SetOC /* 03FB0 80953270 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 03FB4 80953274 8FA6003C */ lw $a2, 0x003C($sp) /* 03FB4 80953274 8FA6003C */ lw $a2, 0x003C($sp)
/* 03FB8 80953278 820B0196 */ lb $t3, 0x0196($s0) ## 00000196 /* 03FB8 80953278 820B0196 */ lb $t3, 0x0196($s0) ## 00000196
/* 03FBC 8095327C 8FA4005C */ lw $a0, 0x005C($sp) /* 03FBC 8095327C 8FA4005C */ lw $a0, 0x005C($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809586E4.s
View file

@ -35,7 +35,7 @@ glabel func_809586E4
/* 094A4 80958764 24C50038 */ addiu $a1, $a2, 0x0038 ## $a1 = 00000038 /* 094A4 80958764 24C50038 */ addiu $a1, $a2, 0x0038 ## $a1 = 00000038
/* 094A8 80958768 8FA60040 */ lw $a2, 0x0040($sp) /* 094A8 80958768 8FA60040 */ lw $a2, 0x0040($sp)
/* 094AC 8095876C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 094AC 8095876C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000
/* 094B0 80958770 0C018A29 */ jal func_800628A4 /* 094B0 80958770 0C018A29 */ jal Collider_UpdateSpheres
/* 094B4 80958774 24C502D8 */ addiu $a1, $a2, 0x02D8 ## $a1 = 000002D8 /* 094B4 80958774 24C502D8 */ addiu $a1, $a2, 0x02D8 ## $a1 = 000002D8
/* 094B8 80958778 1000006B */ beq $zero, $zero, .L80958928 /* 094B8 80958778 1000006B */ beq $zero, $zero, .L80958928
/* 094BC 8095877C 8FBF0014 */ lw $ra, 0x0014($sp) /* 094BC 8095877C 8FBF0014 */ lw $ra, 0x0014($sp)

2
asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s
View file

@ -281,7 +281,7 @@ glabel func_80958B0C
/* 09C7C 80958F3C 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 /* 09C7C 80958F3C 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338
/* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp) /* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp)
/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp) /* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp)
/* 09C88 80958F48 0C0189CD */ jal func_80062734 /* 09C88 80958F48 0C0189CD */ jal Collider_SetQuadVertices
/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp) /* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp)
/* 09C90 80958F50 0C034221 */ jal Matrix_Pull /* 09C90 80958F50 0C034221 */ jal Matrix_Pull
/* 09C94 80958F54 00000000 */ nop /* 09C94 80958F54 00000000 */ nop

2
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s
View file

@ -12,7 +12,7 @@ glabel func_8097895C
/* 00050 80978980 8FA4001C */ lw $a0, 0x001C($sp) /* 00050 80978980 8FA4001C */ lw $a0, 0x001C($sp)
/* 00054 80978984 8FA50020 */ lw $a1, 0x0020($sp) /* 00054 80978984 8FA50020 */ lw $a1, 0x0020($sp)
/* 00058 80978988 8FA60018 */ lw $a2, 0x0018($sp) /* 00058 80978988 8FA60018 */ lw $a2, 0x0018($sp)
/* 0005C 8097898C 0C017114 */ jal Collider_SetCylinder_Set3 /* 0005C 8097898C 0C017114 */ jal Collider_SetCylinderType1
/* 00060 80978990 8FA70024 */ lw $a3, 0x0024($sp) /* 00060 80978990 8FA70024 */ lw $a3, 0x0024($sp)
/* 00064 80978994 8FBF0014 */ lw $ra, 0x0014($sp) /* 00064 80978994 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00068 80978998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 00068 80978998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s
View file

@ -68,7 +68,7 @@ glabel func_8097BA48
.L8097BB3C: .L8097BB3C:
/* 0320C 8097BB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0320C 8097BB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097BB40: .L8097BB40:
/* 03210 8097BB40 0C0189B7 */ jal Collider_CylinderUpdate /* 03210 8097BB40 0C0189B7 */ jal Collider_UpdateCylinder
/* 03214 8097BB44 02402825 */ or $a1, $s2, $zero ## $a1 = 00000184 /* 03214 8097BB44 02402825 */ or $a1, $s2, $zero ## $a1 = 00000184
/* 03218 8097BB48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03218 8097BB48 3C010001 */ lui $at, 0x0001 ## $at = 00010000

4
asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s
View file

@ -54,11 +54,11 @@ glabel DemoKekkai_Init
/* 000C8 8098D098 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000C8 8098D098 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 000CC 8098D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000CC 8098D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 000D0 8098D0A0 0C0189B7 */ jal Collider_CylinderUpdate /* 000D0 8098D0A0 0C0189B7 */ jal Collider_UpdateCylinder
/* 000D4 8098D0A4 8FA50020 */ lw $a1, 0x0020($sp) /* 000D4 8098D0A4 8FA50020 */ lw $a1, 0x0020($sp)
/* 000D8 8098D0A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D8 8098D0A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 000DC 8098D0AC 0C0189B7 */ jal Collider_CylinderUpdate /* 000DC 8098D0AC 0C0189B7 */ jal Collider_UpdateCylinder
/* 000E0 8098D0B0 8FA50024 */ lw $a1, 0x0024($sp) /* 000E0 8098D0B0 8FA50024 */ lw $a1, 0x0024($sp)
/* 000E4 8098D0B4 8604001C */ lh $a0, 0x001C($s0) ## 0000001C /* 000E4 8098D0B4 8604001C */ lh $a0, 0x001C($s0) ## 0000001C

4
asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s
View file

@ -48,7 +48,7 @@ glabel DemoKekkai_Update
/* 006B8 8098D688 8FA60030 */ lw $a2, 0x0030($sp) /* 006B8 8098D688 8FA60030 */ lw $a2, 0x0030($sp)
/* 006BC 8098D68C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006BC 8098D68C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 006C0 8098D690 0C017713 */ jal CollisionCheck_SetOC /* 006C0 8098D690 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 006C4 8098D694 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 006C4 8098D694 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000
/* 006C8 8098D698 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 006C8 8098D698 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198
/* 006CC 8098D69C AFA60030 */ sw $a2, 0x0030($sp) /* 006CC 8098D69C AFA60030 */ sw $a2, 0x0030($sp)
@ -59,7 +59,7 @@ glabel DemoKekkai_Update
/* 006DC 8098D6AC 8FA60030 */ lw $a2, 0x0030($sp) /* 006DC 8098D6AC 8FA60030 */ lw $a2, 0x0030($sp)
/* 006E0 8098D6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006E0 8098D6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 006E4 8098D6B4 0C017713 */ jal CollisionCheck_SetOC /* 006E4 8098D6B4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 006E8 8098D6B8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 006E8 8098D6B8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000
/* 006EC 8098D6BC 8E1901F8 */ lw $t9, 0x01F8($s0) ## 000001F8 /* 006EC 8098D6BC 8E1901F8 */ lw $t9, 0x01F8($s0) ## 000001F8
.L8098D6C0: .L8098D6C0:

2
asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s
View file

@ -43,7 +43,7 @@ glabel func_8098D87C
/* 00910 8098D8E0 8FA60028 */ lw $a2, 0x0028($sp) /* 00910 8098D8E0 8FA60028 */ lw $a2, 0x0028($sp)
/* 00914 8098D8E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00914 8098D8E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00918 8098D8E8 0C017713 */ jal CollisionCheck_SetOC /* 00918 8098D8E8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 0091C 8098D8EC 8FA5002C */ lw $a1, 0x002C($sp) /* 0091C 8098D8EC 8FA5002C */ lw $a1, 0x002C($sp)
/* 00920 8098D8F0 921801A9 */ lbu $t8, 0x01A9($s0) ## 000001A9 /* 00920 8098D8F0 921801A9 */ lbu $t8, 0x01A9($s0) ## 000001A9
/* 00924 8098D8F4 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 /* 00924 8098D8F4 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s
View file

@ -5,7 +5,7 @@ glabel func_809952B8
/* 00674 809952C4 248601C8 */ addiu $a2, $a0, 0x01C8 ## $a2 = 000001C8 /* 00674 809952C4 248601C8 */ addiu $a2, $a0, 0x01C8 ## $a2 = 000001C8
/* 00678 809952C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001C8 /* 00678 809952C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001C8
/* 0067C 809952CC AFA6001C */ sw $a2, 0x001C($sp) /* 0067C 809952CC AFA6001C */ sw $a2, 0x001C($sp)
/* 00680 809952D0 0C0189B7 */ jal Collider_CylinderUpdate /* 00680 809952D0 0C0189B7 */ jal Collider_UpdateCylinder
/* 00684 809952D4 AFA40020 */ sw $a0, 0x0020($sp) /* 00684 809952D4 AFA40020 */ sw $a0, 0x0020($sp)
/* 00688 809952D8 8FA40024 */ lw $a0, 0x0024($sp) /* 00688 809952D8 8FA40024 */ lw $a0, 0x0024($sp)

8
asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s
View file

@ -172,12 +172,12 @@ glabel EnAm_Update
/* 01D34 809AFC54 26510274 */ addiu $s1, $s2, 0x0274 ## $s1 = 00000274 /* 01D34 809AFC54 26510274 */ addiu $s1, $s2, 0x0274 ## $s1 = 00000274
.L809AFC58: .L809AFC58:
/* 01D38 809AFC58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000274 /* 01D38 809AFC58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000274
/* 01D3C 809AFC5C 0C0189B7 */ jal Collider_CylinderUpdate /* 01D3C 809AFC5C 0C0189B7 */ jal Collider_UpdateCylinder
/* 01D40 809AFC60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01D40 809AFC60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 01D44 809AFC64 265002C0 */ addiu $s0, $s2, 0x02C0 ## $s0 = 000002C0 /* 01D44 809AFC64 265002C0 */ addiu $s0, $s2, 0x02C0 ## $s0 = 000002C0
/* 01D48 809AFC68 02002825 */ or $a1, $s0, $zero ## $a1 = 000002C0 /* 01D48 809AFC68 02002825 */ or $a1, $s0, $zero ## $a1 = 000002C0
/* 01D4C 809AFC6C 0C0189B7 */ jal Collider_CylinderUpdate /* 01D4C 809AFC6C 0C0189B7 */ jal Collider_UpdateCylinder
/* 01D50 809AFC70 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01D50 809AFC70 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 01D54 809AFC74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01D54 809AFC74 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -186,7 +186,7 @@ glabel EnAm_Update
/* 01D60 809AFC80 AFA5005C */ sw $a1, 0x005C($sp) /* 01D60 809AFC80 AFA5005C */ sw $a1, 0x005C($sp)
/* 01D64 809AFC84 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 01D64 809AFC84 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 01D68 809AFC88 0C017713 */ jal CollisionCheck_SetOC /* 01D68 809AFC88 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01D6C 809AFC8C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000274 /* 01D6C 809AFC8C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000274
/* 01D70 809AFC90 864A001C */ lh $t2, 0x001C($s2) ## 0000001C /* 01D70 809AFC90 864A001C */ lh $t2, 0x001C($s2) ## 0000001C
/* 01D74 809AFC94 3C01809B */ lui $at, %hi(D_809B0180) ## $at = 809B0000 /* 01D74 809AFC94 3C01809B */ lui $at, %hi(D_809B0180) ## $at = 809B0000
@ -254,7 +254,7 @@ glabel EnAm_Update
/* 01E4C 809AFD6C 8FBF004C */ lw $ra, 0x004C($sp) /* 01E4C 809AFD6C 8FBF004C */ lw $ra, 0x004C($sp)
.L809AFD70: .L809AFD70:
/* 01E50 809AFD70 0C017713 */ jal CollisionCheck_SetOC /* 01E50 809AFD70 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01E54 809AFD74 02003025 */ or $a2, $s0, $zero ## $a2 = 000002C0 /* 01E54 809AFD74 02003025 */ or $a2, $s0, $zero ## $a2 = 000002C0
/* 01E58 809AFD78 8FBF004C */ lw $ra, 0x004C($sp) /* 01E58 809AFD78 8FBF004C */ lw $ra, 0x004C($sp)
.L809AFD7C: .L809AFD7C:

2
asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF7CC.s
View file

@ -30,7 +30,7 @@ glabel func_809AF7CC
/* 0191C 809AF83C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 0191C 809AF83C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C
/* 01920 809AF840 8FA50034 */ lw $a1, 0x0034($sp) /* 01920 809AF840 8FA50034 */ lw $a1, 0x0034($sp)
/* 01924 809AF844 8FA60038 */ lw $a2, 0x0038($sp) /* 01924 809AF844 8FA60038 */ lw $a2, 0x0038($sp)
/* 01928 809AF848 0C0189CD */ jal func_80062734 /* 01928 809AF848 0C0189CD */ jal Collider_SetQuadVertices
/* 0192C 809AF84C AFAE0010 */ sw $t6, 0x0010($sp) /* 0192C 809AF84C AFAE0010 */ sw $t6, 0x0010($sp)
/* 01930 809AF850 8FBF0024 */ lw $ra, 0x0024($sp) /* 01930 809AF850 8FBF0024 */ lw $ra, 0x0024($sp)
/* 01934 809AF854 8FB00020 */ lw $s0, 0x0020($sp) /* 01934 809AF854 8FB00020 */ lw $s0, 0x0020($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF864.s
View file

@ -83,7 +83,7 @@ glabel func_809AF864
/* 01A78 809AF998 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFF8 /* 01A78 809AF998 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFF8
/* 01A7C 809AF99C C7A40024 */ lwc1 $f4, 0x0024($sp) /* 01A7C 809AF99C C7A40024 */ lwc1 $f4, 0x0024($sp)
/* 01A80 809AF9A0 46062200 */ add.s $f8, $f4, $f6 /* 01A80 809AF9A0 46062200 */ add.s $f8, $f4, $f6
/* 01A84 809AF9A4 0C018B58 */ jal func_80062D60 /* 01A84 809AF9A4 0C018B58 */ jal CollisionCheck_SpawnShieldParticlesMetal
/* 01A88 809AF9A8 E7A80024 */ swc1 $f8, 0x0024($sp) /* 01A88 809AF9A8 E7A80024 */ swc1 $f8, 0x0024($sp)
/* 01A8C 809AF9AC 10000010 */ beq $zero, $zero, .L809AF9F0 /* 01A8C 809AF9AC 10000010 */ beq $zero, $zero, .L809AF9F0
/* 01A90 809AF9B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A90 809AF9B0 8FBF0014 */ lw $ra, 0x0014($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s
View file

@ -251,7 +251,7 @@ glabel EnAnubice_Update
/* 00F6C 809B208C 8E05027C */ lw $a1, 0x027C($s0) ## 0000027C /* 00F6C 809B208C 8E05027C */ lw $a1, 0x027C($s0) ## 0000027C
/* 00F70 809B2090 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 00F70 809B2090 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8
/* 00F74 809B2094 AFA50030 */ sw $a1, 0x0030($sp) /* 00F74 809B2094 AFA50030 */ sw $a1, 0x0030($sp)
/* 00F78 809B2098 0C0189B7 */ jal Collider_CylinderUpdate /* 00F78 809B2098 0C0189B7 */ jal Collider_UpdateCylinder
/* 00F7C 809B209C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F7C 809B209C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00F80 809B20A0 8FA40064 */ lw $a0, 0x0064($sp) /* 00F80 809B20A0 8FA40064 */ lw $a0, 0x0064($sp)
@ -260,7 +260,7 @@ glabel EnAnubice_Update
/* 00F8C 809B20AC 00812821 */ addu $a1, $a0, $at /* 00F8C 809B20AC 00812821 */ addu $a1, $a0, $at
/* 00F90 809B20B0 AFA50034 */ sw $a1, 0x0034($sp) /* 00F90 809B20B0 AFA50034 */ sw $a1, 0x0034($sp)
/* 00F94 809B20B4 0C017713 */ jal CollisionCheck_SetOC /* 00F94 809B20B4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00F98 809B20B8 8FA60030 */ lw $a2, 0x0030($sp) /* 00F98 809B20B8 8FA60030 */ lw $a2, 0x0030($sp)
/* 00F9C 809B20BC 860D0262 */ lh $t5, 0x0262($s0) ## 00000262 /* 00F9C 809B20BC 860D0262 */ lh $t5, 0x0262($s0) ## 00000262
/* 00FA0 809B20C0 8FA50034 */ lw $a1, 0x0034($sp) /* 00FA0 809B20C0 8FA50034 */ lw $a1, 0x0034($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s
View file

@ -100,7 +100,7 @@ glabel EnAnubiceFire_Update
/* 008B8 809B2E58 44189000 */ mfc1 $t8, $f18 /* 008B8 809B2E58 44189000 */ mfc1 $t8, $f18
/* 008BC 809B2E5C 1120000E */ beq $t1, $zero, .L809B2E98 /* 008BC 809B2E5C 1120000E */ beq $t1, $zero, .L809B2E98
/* 008C0 809B2E60 A61801EC */ sh $t8, 0x01EC($s0) ## 000001EC /* 008C0 809B2E60 A61801EC */ sh $t8, 0x01EC($s0) ## 000001EC
/* 008C4 809B2E64 0C0189B7 */ jal Collider_CylinderUpdate /* 008C4 809B2E64 0C0189B7 */ jal Collider_UpdateCylinder
/* 008C8 809B2E68 AFA50028 */ sw $a1, 0x0028($sp) /* 008C8 809B2E68 AFA50028 */ sw $a1, 0x0028($sp)
/* 008CC 809B2E6C 8FA4004C */ lw $a0, 0x004C($sp) /* 008CC 809B2E6C 8FA4004C */ lw $a0, 0x004C($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s
View file

@ -167,7 +167,7 @@ glabel EnBa_Draw
/* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74 /* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74
/* 01B0C 809B7E5C 26500320 */ addiu $s0, $s2, 0x0320 ## $s0 = 00000320 /* 01B0C 809B7E5C 26500320 */ addiu $s0, $s2, 0x0320 ## $s0 = 00000320
/* 01B10 809B7E60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01B10 809B7E60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 01B14 809B7E64 0C018A29 */ jal func_800628A4 /* 01B14 809B7E64 0C018A29 */ jal Collider_UpdateSpheres
/* 01B18 809B7E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 /* 01B18 809B7E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320
/* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94 /* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94
/* 01B20 809B7E70 00000000 */ nop /* 01B20 809B7E70 00000000 */ nop
@ -178,7 +178,7 @@ glabel EnBa_Draw
/* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale /* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale
/* 01B34 809B7E84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01B34 809B7E84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001
/* 01B38 809B7E88 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008 /* 01B38 809B7E88 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008
/* 01B3C 809B7E8C 0C018A29 */ jal func_800628A4 /* 01B3C 809B7E8C 0C018A29 */ jal Collider_UpdateSpheres
/* 01B40 809B7E90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 /* 01B40 809B7E90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320
.L809B7E94: .L809B7E94:
/* 01B44 809B7E94 3C05809C */ lui $a1, %hi(D_809B8140) ## $a1 = 809C0000 /* 01B44 809B7E94 3C05809C */ lui $a1, %hi(D_809B8140) ## $a1 = 809C0000

2
asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s
View file

@ -68,7 +68,7 @@ glabel EnBigokuta_Init
/* 000E4 809BCD44 3C06809C */ lui $a2, %hi(D_809BF460) ## $a2 = 809C0000 /* 000E4 809BCD44 3C06809C */ lui $a2, %hi(D_809BF460) ## $a2 = 809C0000
/* 000E8 809BCD48 24C6F460 */ addiu $a2, $a2, %lo(D_809BF460) ## $a2 = 809BF460 /* 000E8 809BCD48 24C6F460 */ addiu $a2, $a2, %lo(D_809BF460) ## $a2 = 809BF460
/* 000EC 809BCD4C 24A5F468 */ addiu $a1, $a1, %lo(D_809BF468) ## $a1 = 809BF468 /* 000EC 809BCD4C 24A5F468 */ addiu $a1, $a1, %lo(D_809BF468) ## $a1 = 809BF468
/* 000F0 809BCD50 0C0187B5 */ jal func_80061ED4 /* 000F0 809BCD50 0C0187B5 */ jal CollisionCheck_SetInfo
/* 000F4 809BCD54 26440098 */ addiu $a0, $s2, 0x0098 ## $a0 = 00000098 /* 000F4 809BCD54 26440098 */ addiu $a0, $s2, 0x0098 ## $a0 = 00000098
/* 000F8 809BCD58 8649001C */ lh $t1, 0x001C($s2) ## 0000001C /* 000F8 809BCD58 8649001C */ lh $t1, 0x001C($s2) ## 0000001C
/* 000FC 809BCD5C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 000FC 809BCD5C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001

4
asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s
View file

@ -67,7 +67,7 @@ glabel EnBigokuta_Update
/* 01E60 809BEAC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01E60 809BEAC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 01E64 809BEAC4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01E64 809BEAC4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000
/* 01E68 809BEAC8 0C017713 */ jal CollisionCheck_SetOC /* 01E68 809BEAC8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01E6C 809BEACC 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC /* 01E6C 809BEACC 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC
/* 01E70 809BEAD0 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 00000098 /* 01E70 809BEAD0 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 00000098
/* 01E74 809BEAD4 1615FFFA */ bne $s0, $s5, .L809BEAC0 /* 01E74 809BEAD4 1615FFFA */ bne $s0, $s5, .L809BEAC0
@ -104,7 +104,7 @@ glabel EnBigokuta_Update
/* 01EDC 809BEB3C 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C /* 01EDC 809BEB3C 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C
/* 01EE0 809BEB40 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01EE0 809BEB40 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 01EE4 809BEB44 0C017713 */ jal CollisionCheck_SetOC /* 01EE4 809BEB44 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01EE8 809BEB48 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01EE8 809BEB48 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000
/* 01EEC 809BEB4C 10000005 */ beq $zero, $zero, .L809BEB64 /* 01EEC 809BEB4C 10000005 */ beq $zero, $zero, .L809BEB64
/* 01EF0 809BEB50 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01EF0 809BEB50 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000

2
asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s
View file

@ -47,7 +47,7 @@ glabel EnBili_Init
/* 000A0 809BF940 3C06809C */ lui $a2, %hi(D_809C166C) ## $a2 = 809C0000 /* 000A0 809BF940 3C06809C */ lui $a2, %hi(D_809C166C) ## $a2 = 809C0000
/* 000A4 809BF944 24C6166C */ addiu $a2, $a2, %lo(D_809C166C) ## $a2 = 809C166C /* 000A4 809BF944 24C6166C */ addiu $a2, $a2, %lo(D_809C166C) ## $a2 = 809C166C
/* 000A8 809BF948 24A51678 */ addiu $a1, $a1, %lo(D_809C1678) ## $a1 = 809C1678 /* 000A8 809BF948 24A51678 */ addiu $a1, $a1, %lo(D_809C1678) ## $a1 = 809C1678
/* 000AC 809BF94C 0C0187BF */ jal func_80061EFC /* 000AC 809BF94C 0C0187BF */ jal CollisionCheck_SetInfo2
/* 000B0 809BF950 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000B0 809BF950 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 000B4 809BF954 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 000B4 809BF954 8608001C */ lh $t0, 0x001C($s0) ## 0000001C
/* 000B8 809BF958 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 000B8 809BF958 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF

4
asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s
View file

@ -90,7 +90,7 @@ glabel EnBili_Update
/* 014D8 809C0D78 E7A80010 */ swc1 $f8, 0x0010($sp) /* 014D8 809C0D78 E7A80010 */ swc1 $f8, 0x0010($sp)
/* 014DC 809C0D7C 260501D4 */ addiu $a1, $s0, 0x01D4 ## $a1 = 000001D4 /* 014DC 809C0D7C 260501D4 */ addiu $a1, $s0, 0x01D4 ## $a1 = 000001D4
/* 014E0 809C0D80 AFA50028 */ sw $a1, 0x0028($sp) /* 014E0 809C0D80 AFA50028 */ sw $a1, 0x0028($sp)
/* 014E4 809C0D84 0C0189B7 */ jal Collider_CylinderUpdate /* 014E4 809C0D84 0C0189B7 */ jal Collider_UpdateCylinder
/* 014E8 809C0D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014E8 809C0D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 014EC 809C0D8C 920A01E4 */ lbu $t2, 0x01E4($s0) ## 000001E4 /* 014EC 809C0D8C 920A01E4 */ lbu $t2, 0x01E4($s0) ## 000001E4
@ -119,7 +119,7 @@ glabel EnBili_Update
.L809C0DDC: .L809C0DDC:
/* 0153C 809C0DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0153C 809C0DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 01540 809C0DE0 0C017713 */ jal CollisionCheck_SetOC /* 01540 809C0DE0 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01544 809C0DE4 8FA60028 */ lw $a2, 0x0028($sp) /* 01544 809C0DE4 8FA60028 */ lw $a2, 0x0028($sp)
/* 01548 809C0DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01548 809C0DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0154C 809C0DEC 0C00B56E */ jal Actor_SetHeight /* 0154C 809C0DEC 0C00B56E */ jal Actor_SetHeight

2
asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s
View file

@ -106,7 +106,7 @@ glabel EnBomChu_Update
/* 00F30 809C6760 13380003 */ beq $t9, $t8, .L809C6770 /* 00F30 809C6760 13380003 */ beq $t9, $t8, .L809C6770
/* 00F34 809C6764 8FA6002C */ lw $a2, 0x002C($sp) /* 00F34 809C6764 8FA6002C */ lw $a2, 0x002C($sp)
/* 00F38 809C6768 0C017713 */ jal CollisionCheck_SetOC /* 00F38 809C6768 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00F3C 809C676C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00F3C 809C676C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
.L809C6770: .L809C6770:
/* 00F40 809C6770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F40 809C6770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s
View file

@ -71,7 +71,7 @@ glabel EnBrob_Init
/* 000D4 809CABE4 3C06809D */ lui $a2, %hi(D_809CBAAC) ## $a2 = 809D0000 /* 000D4 809CABE4 3C06809D */ lui $a2, %hi(D_809CBAAC) ## $a2 = 809D0000
/* 000D8 809CABE8 24C6BAAC */ addiu $a2, $a2, %lo(D_809CBAAC) ## $a2 = 809CBAAC /* 000D8 809CABE8 24C6BAAC */ addiu $a2, $a2, %lo(D_809CBAAC) ## $a2 = 809CBAAC
/* 000DC 809CABEC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000DC 809CABEC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 000E0 809CABF0 0C0187B5 */ jal func_80061ED4 /* 000E0 809CABF0 0C0187B5 */ jal CollisionCheck_SetInfo
/* 000E4 809CABF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000E4 809CABF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 000E8 809CABF8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 000E8 809CABF8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C
/* 000EC 809CABFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000EC 809CABFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

4
asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s
View file

@ -173,12 +173,12 @@ glabel EnBrob_Update
/* 00DC8 809CB8D8 AFA50034 */ sw $a1, 0x0034($sp) /* 00DC8 809CB8D8 AFA50034 */ sw $a1, 0x0034($sp)
/* 00DCC 809CB8DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DCC 809CB8DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00DD0 809CB8E0 0C017713 */ jal CollisionCheck_SetOC /* 00DD0 809CB8E0 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00DD4 809CB8E4 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228 /* 00DD4 809CB8E4 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228
/* 00DD8 809CB8E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DD8 809CB8E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00DDC 809CB8EC 8FA50034 */ lw $a1, 0x0034($sp) /* 00DDC 809CB8EC 8FA50034 */ lw $a1, 0x0034($sp)
/* 00DE0 809CB8F0 0C017713 */ jal CollisionCheck_SetOC /* 00DE0 809CB8F0 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00DE4 809CB8F4 8FA60030 */ lw $a2, 0x0030($sp) /* 00DE4 809CB8F4 8FA60030 */ lw $a2, 0x0030($sp)
.L809CB8F8: .L809CB8F8:
/* 00DE8 809CB8F8 8FBF0024 */ lw $ra, 0x0024($sp) /* 00DE8 809CB8F8 8FBF0024 */ lw $ra, 0x0024($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s
View file

@ -584,7 +584,7 @@ glabel EnClearTag_Update
/* 00E34 809D43E4 A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6 /* 00E34 809D43E4 A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6
/* 00E38 809D43E8 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8 /* 00E38 809D43E8 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8
/* 00E3C 809D43EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 /* 00E3C 809D43EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194
/* 00E40 809D43F0 0C0189B7 */ jal Collider_CylinderUpdate /* 00E40 809D43F0 0C0189B7 */ jal Collider_UpdateCylinder
/* 00E44 809D43F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E44 809D43F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00E48 809D43F8 8FA400CC */ lw $a0, 0x00CC($sp) /* 00E48 809D43F8 8FA400CC */ lw $a0, 0x00CC($sp)
@ -680,7 +680,7 @@ glabel EnClearTag_Update
/* 00F8C 809D453C A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6 /* 00F8C 809D453C A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6
/* 00F90 809D4540 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8 /* 00F90 809D4540 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8
/* 00F94 809D4544 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 /* 00F94 809D4544 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194
/* 00F98 809D4548 0C0189B7 */ jal Collider_CylinderUpdate /* 00F98 809D4548 0C0189B7 */ jal Collider_UpdateCylinder
/* 00F9C 809D454C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00F9C 809D454C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00FA0 809D4550 8FA400CC */ lw $a0, 0x00CC($sp) /* 00FA0 809D4550 8FA400CC */ lw $a0, 0x00CC($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s
View file

@ -49,7 +49,7 @@ glabel EnCs_Init
/* 001C8 809E1A78 3C06809E */ lui $a2, %hi(D_809E28EC) ## $a2 = 809E0000 /* 001C8 809E1A78 3C06809E */ lui $a2, %hi(D_809E28EC) ## $a2 = 809E0000
/* 001CC 809E1A7C 24C628EC */ addiu $a2, $a2, %lo(D_809E28EC) ## $a2 = 809E28EC /* 001CC 809E1A7C 24C628EC */ addiu $a2, $a2, %lo(D_809E28EC) ## $a2 = 809E28EC
/* 001D0 809E1A80 24A528F8 */ addiu $a1, $a1, %lo(D_809E28F8) ## $a1 = 809E28F8 /* 001D0 809E1A80 24A528F8 */ addiu $a1, $a1, %lo(D_809E28F8) ## $a1 = 809E28F8
/* 001D4 809E1A84 0C0187BF */ jal func_80061EFC /* 001D4 809E1A84 0C0187BF */ jal CollisionCheck_SetInfo2
/* 001D8 809E1A88 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001D8 809E1A88 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 001DC 809E1A8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001DC 809E1A8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00
/* 001E0 809E1A90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 001E0 809E1A90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004

4
asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s
View file

@ -62,7 +62,7 @@ glabel EnCs_Update
.L809E24F8: .L809E24F8:
/* 00C48 809E24F8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00C48 809E24F8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194
/* 00C4C 809E24FC AFA60024 */ sw $a2, 0x0024($sp) /* 00C4C 809E24FC AFA60024 */ sw $a2, 0x0024($sp)
/* 00C50 809E2500 0C0189B7 */ jal Collider_CylinderUpdate /* 00C50 809E2500 0C0189B7 */ jal Collider_UpdateCylinder
/* 00C54 809E2504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C54 809E2504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00C58 809E2508 8FA40034 */ lw $a0, 0x0034($sp) /* 00C58 809E2508 8FA40034 */ lw $a0, 0x0034($sp)
@ -70,7 +70,7 @@ glabel EnCs_Update
/* 00C60 809E2510 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00C60 809E2510 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 00C64 809E2514 8FA60024 */ lw $a2, 0x0024($sp) /* 00C64 809E2514 8FA60024 */ lw $a2, 0x0024($sp)
/* 00C68 809E2518 0C017713 */ jal CollisionCheck_SetOC /* 00C68 809E2518 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00C6C 809E251C 00812821 */ addu $a1, $a0, $at /* 00C6C 809E251C 00812821 */ addu $a1, $a0, $at
/* 00C70 809E2520 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 /* 00C70 809E2520 8E190190 */ lw $t9, 0x0190($s0) ## 00000190
/* 00C74 809E2524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C74 809E2524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s
View file

@ -108,7 +108,7 @@ glabel EnDaikuKakariko_Init
/* 00228 809E4548 3C06809E */ lui $a2, %hi(D_809E54DC) ## $a2 = 809E0000 /* 00228 809E4548 3C06809E */ lui $a2, %hi(D_809E54DC) ## $a2 = 809E0000
/* 0022C 809E454C 24C654DC */ addiu $a2, $a2, %lo(D_809E54DC) ## $a2 = 809E54DC /* 0022C 809E454C 24C654DC */ addiu $a2, $a2, %lo(D_809E54DC) ## $a2 = 809E54DC
/* 00230 809E4550 24A554E8 */ addiu $a1, $a1, %lo(D_809E54E8) ## $a1 = 809E54E8 /* 00230 809E4550 24A554E8 */ addiu $a1, $a1, %lo(D_809E54E8) ## $a1 = 809E54E8
/* 00234 809E4554 0C0187BF */ jal func_80061EFC /* 00234 809E4554 0C0187BF */ jal CollisionCheck_SetInfo2
/* 00238 809E4558 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00238 809E4558 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 0023C 809E455C 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 /* 0023C 809E455C 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000
/* 00240 809E4560 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 /* 00240 809E4560 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508

4
asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s
View file

@ -28,7 +28,7 @@ glabel EnDaikuKakariko_Update
.L809E4FA0: .L809E4FA0:
/* 00C80 809E4FA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00C80 809E4FA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194
/* 00C84 809E4FA4 AFA6002C */ sw $a2, 0x002C($sp) /* 00C84 809E4FA4 AFA6002C */ sw $a2, 0x002C($sp)
/* 00C88 809E4FA8 0C0189B7 */ jal Collider_CylinderUpdate /* 00C88 809E4FA8 0C0189B7 */ jal Collider_UpdateCylinder
/* 00C8C 809E4FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C8C 809E4FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00C90 809E4FB0 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 /* 00C90 809E4FB0 96080200 */ lhu $t0, 0x0200($s0) ## 00000200
@ -48,7 +48,7 @@ glabel EnDaikuKakariko_Update
/* 00CC4 809E4FE4 8FA40044 */ lw $a0, 0x0044($sp) /* 00CC4 809E4FE4 8FA40044 */ lw $a0, 0x0044($sp)
/* 00CC8 809E4FE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00CC8 809E4FE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 00CCC 809E4FEC 0C017713 */ jal CollisionCheck_SetOC /* 00CCC 809E4FEC 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00CD0 809E4FF0 00812821 */ addu $a1, $a0, $at /* 00CD0 809E4FF0 00812821 */ addu $a1, $a0, $at
/* 00CD4 809E4FF4 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 /* 00CD4 809E4FF4 8E190190 */ lw $t9, 0x0190($s0) ## 00000190
/* 00CD8 809E4FF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CD8 809E4FF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

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

@ -92,7 +92,7 @@ glabel EnDekubaba_Init
/* 00154 809E5924 3C01809F */ lui $at, %hi(D_809E9000+0x1B) ## $at = 809F0000 /* 00154 809E5924 3C01809F */ lui $at, %hi(D_809E9000+0x1B) ## $at = 809F0000
/* 00158 809E5928 A028901B */ sb $t0, %lo(D_809E9000+0x1B)($at) /* 00158 809E5928 A028901B */ sb $t0, %lo(D_809E9000+0x1B)($at)
.L809E592C: .L809E592C:
/* 0015C 809E592C 0C0187B5 */ jal func_80061ED4 /* 0015C 809E592C 0C0187B5 */ jal CollisionCheck_SetInfo
/* 00160 809E5930 24A59000 */ addiu $a1, $a1, %lo(D_809E9000) ## $a1 = 809E9000 /* 00160 809E5930 24A59000 */ addiu $a1, $a1, %lo(D_809E9000) ## $a1 = 809E9000
/* 00164 809E5934 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 00164 809E5934 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004
/* 00168 809E5938 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 /* 00168 809E5938 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008
@ -132,7 +132,7 @@ glabel EnDekubaba_Init
/* 001E4 809E59B4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001E4 809E59B4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 001E8 809E59B8 A0398FFB */ sb $t9, %lo(D_809E8FE0+0x1B)($at) /* 001E8 809E59B8 A0398FFB */ sb $t9, %lo(D_809E8FE0+0x1B)($at)
.L809E59BC: .L809E59BC:
/* 001EC 809E59BC 0C0187B5 */ jal func_80061ED4 /* 001EC 809E59BC 0C0187B5 */ jal CollisionCheck_SetInfo
/* 001F0 809E59C0 24C68FD8 */ addiu $a2, $a2, %lo(D_809E8FD8) ## $a2 = 809E8FD8 /* 001F0 809E59C0 24C68FD8 */ addiu $a2, $a2, %lo(D_809E8FD8) ## $a2 = 809E8FD8
/* 001F4 809E59C4 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 001F4 809E59C4 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007
/* 001F8 809E59C8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 001F8 809E59C8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001

2
asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s
View file

@ -105,7 +105,7 @@ glabel EnDekubaba_Update
/* 02D98 809E8568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02D98 809E8568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 02D9C 809E856C 02212821 */ addu $a1, $s1, $at /* 02D9C 809E856C 02212821 */ addu $a1, $s1, $at
/* 02DA0 809E8570 0C017713 */ jal CollisionCheck_SetOC /* 02DA0 809E8570 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 02DA4 809E8574 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 /* 02DA4 809E8574 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238
.L809E8578: .L809E8578:
/* 02DA8 809E8578 8FBF0024 */ lw $ra, 0x0024($sp) /* 02DA8 809E8578 8FBF0024 */ lw $ra, 0x0024($sp)

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

@ -157,10 +157,10 @@ glabel func_809E86B8
/* 030EC 809E88BC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 030EC 809E88BC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000
/* 030F0 809E88C0 8EB80000 */ lw $t8, 0x0000($s5) ## 809E902C /* 030F0 809E88C0 8EB80000 */ lw $t8, 0x0000($s5) ## 809E902C
/* 030F4 809E88C4 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 /* 030F4 809E88C4 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238
/* 030F8 809E88C8 0C018A29 */ jal func_800628A4 /* 030F8 809E88C8 0C018A29 */ jal Collider_UpdateSpheres
/* 030FC 809E88CC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 030FC 809E88CC AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 03100 809E88D0 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000034 /* 03100 809E88D0 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000034
/* 03104 809E88D4 0C018A29 */ jal func_800628A4 /* 03104 809E88D4 0C018A29 */ jal Collider_UpdateSpheres
/* 03108 809E88D8 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 /* 03108 809E88D8 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238
/* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934 /* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934
/* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002 /* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002

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

@ -57,10 +57,10 @@ glabel func_809E89E4
/* 032B8 809E8A88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 032B8 809E8A88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000
/* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp) /* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp)
/* 032C0 809E8A90 26100238 */ addiu $s0, $s0, 0x0238 ## $s0 = 00000238 /* 032C0 809E8A90 26100238 */ addiu $s0, $s0, 0x0238 ## $s0 = 00000238
/* 032C4 809E8A94 0C018A29 */ jal func_800628A4 /* 032C4 809E8A94 0C018A29 */ jal Collider_UpdateSpheres
/* 032C8 809E8A98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 /* 032C8 809E8A98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238
/* 032CC 809E8A9C 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 /* 032CC 809E8A9C 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038
/* 032D0 809E8AA0 0C018A29 */ jal func_800628A4 /* 032D0 809E8AA0 0C018A29 */ jal Collider_UpdateSpheres
/* 032D4 809E8AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 /* 032D4 809E8AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238
/* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp) /* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp)
/* 032DC 809E8AAC 3C06809F */ lui $a2, %hi(D_809E90E0) ## $a2 = 809F0000 /* 032DC 809E8AAC 3C06809F */ lui $a2, %hi(D_809E90E0) ## $a2 = 809F0000

2
asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8C0C.s
View file

@ -8,7 +8,7 @@ glabel func_809E8C0C
/* 03454 809E8C24 14A10004 */ bne $a1, $at, .L809E8C38 /* 03454 809E8C24 14A10004 */ bne $a1, $at, .L809E8C38
/* 03458 809E8C28 AFA70024 */ sw $a3, 0x0024($sp) /* 03458 809E8C28 AFA70024 */ sw $a3, 0x0024($sp)
/* 0345C 809E8C2C 8FA50028 */ lw $a1, 0x0028($sp) /* 0345C 809E8C2C 8FA50028 */ lw $a1, 0x0028($sp)
/* 03460 809E8C30 0C018A29 */ jal func_800628A4 /* 03460 809E8C30 0C018A29 */ jal Collider_UpdateSpheres
/* 03464 809E8C34 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 00000238 /* 03464 809E8C34 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 00000238
.L809E8C38: .L809E8C38:
/* 03468 809E8C38 8FBF0014 */ lw $ra, 0x0014($sp) /* 03468 809E8C38 8FBF0014 */ lw $ra, 0x0014($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s
View file

@ -55,7 +55,7 @@ glabel EnDekunuts_Init
/* 000BC 809E961C 3C06809F */ lui $a2, %hi(D_809EAB7C) ## $a2 = 809F0000 /* 000BC 809E961C 3C06809F */ lui $a2, %hi(D_809EAB7C) ## $a2 = 809F0000
/* 000C0 809E9620 24C6AB7C */ addiu $a2, $a2, %lo(D_809EAB7C) ## $a2 = 809EAB7C /* 000C0 809E9620 24C6AB7C */ addiu $a2, $a2, %lo(D_809EAB7C) ## $a2 = 809EAB7C
/* 000C4 809E9624 24A5AB84 */ addiu $a1, $a1, %lo(D_809EAB84) ## $a1 = 809EAB84 /* 000C4 809E9624 24A5AB84 */ addiu $a1, $a1, %lo(D_809EAB84) ## $a1 = 809EAB84
/* 000C8 809E9628 0C0187B5 */ jal func_80061ED4 /* 000C8 809E9628 0C0187B5 */ jal CollisionCheck_SetInfo
/* 000CC 809E962C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000CC 809E962C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 000D0 809E9630 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 000D0 809E9630 860A001C */ lh $t2, 0x001C($s0) ## 0000001C
/* 000D4 809E9634 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 000D4 809E9634 860D001C */ lh $t5, 0x001C($s0) ## 0000001C

4
asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s
View file

@ -34,7 +34,7 @@ glabel EnDekunuts_Update
/* 01348 809EA8A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01348 809EA8A8 E7A80010 */ swc1 $f8, 0x0010($sp)
/* 0134C 809EA8AC 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 0134C 809EA8AC 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8
/* 01350 809EA8B0 AFA50028 */ sw $a1, 0x0028($sp) /* 01350 809EA8B0 AFA50028 */ sw $a1, 0x0028($sp)
/* 01354 809EA8B4 0C0189B7 */ jal Collider_CylinderUpdate /* 01354 809EA8B4 0C0189B7 */ jal Collider_UpdateCylinder
/* 01358 809EA8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01358 809EA8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0135C 809EA8BC 920902D9 */ lbu $t1, 0x02D9($s0) ## 000002D9 /* 0135C 809EA8BC 920902D9 */ lbu $t1, 0x02D9($s0) ## 000002D9
@ -53,7 +53,7 @@ glabel EnDekunuts_Update
/* 01388 809EA8E8 02212821 */ addu $a1, $s1, $at /* 01388 809EA8E8 02212821 */ addu $a1, $s1, $at
/* 0138C 809EA8EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0138C 809EA8EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 01390 809EA8F0 0C017713 */ jal CollisionCheck_SetOC /* 01390 809EA8F0 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01394 809EA8F4 8FA60028 */ lw $a2, 0x0028($sp) /* 01394 809EA8F4 8FA60028 */ lw $a2, 0x0028($sp)
/* 01398 809EA8F8 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 /* 01398 809EA8F8 8E030190 */ lw $v1, 0x0190($s0) ## 00000190
/* 0139C 809EA8FC 3C0B809F */ lui $t3, %hi(func_809E9B98) ## $t3 = 809F0000 /* 0139C 809EA8FC 3C0B809F */ lui $t3, %hi(func_809E9B98) ## $t3 = 809F0000

4
asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s
View file

@ -134,7 +134,7 @@ glabel EnDivingGame_Update
/* 01508 809EED78 2606034C */ addiu $a2, $s0, 0x034C ## $a2 = 0000034C /* 01508 809EED78 2606034C */ addiu $a2, $s0, 0x034C ## $a2 = 0000034C
/* 0150C 809EED7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000034C /* 0150C 809EED7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000034C
/* 01510 809EED80 AFA6002C */ sw $a2, 0x002C($sp) /* 01510 809EED80 AFA6002C */ sw $a2, 0x002C($sp)
/* 01514 809EED84 0C0189B7 */ jal Collider_CylinderUpdate /* 01514 809EED84 0C0189B7 */ jal Collider_UpdateCylinder
/* 01518 809EED88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01518 809EED88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0151C 809EED8C 8FA4004C */ lw $a0, 0x004C($sp) /* 0151C 809EED8C 8FA4004C */ lw $a0, 0x004C($sp)
@ -142,7 +142,7 @@ glabel EnDivingGame_Update
/* 01524 809EED94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01524 809EED94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 01528 809EED98 8FA6002C */ lw $a2, 0x002C($sp) /* 01528 809EED98 8FA6002C */ lw $a2, 0x002C($sp)
/* 0152C 809EED9C 0C017713 */ jal CollisionCheck_SetOC /* 0152C 809EED9C 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01530 809EEDA0 00812821 */ addu $a1, $a0, $at /* 01530 809EEDA0 00812821 */ addu $a1, $a0, $at
/* 01534 809EEDA4 8FBF0024 */ lw $ra, 0x0024($sp) /* 01534 809EEDA4 8FBF0024 */ lw $ra, 0x0024($sp)
/* 01538 809EEDA8 8FB00020 */ lw $s0, 0x0020($sp) /* 01538 809EEDA8 8FB00020 */ lw $s0, 0x0020($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s
View file

@ -135,7 +135,7 @@ glabel EnDntJiji_Update
/* 012D8 809F2DB8 2606025C */ addiu $a2, $s0, 0x025C ## $a2 = 0000025C /* 012D8 809F2DB8 2606025C */ addiu $a2, $s0, 0x025C ## $a2 = 0000025C
/* 012DC 809F2DBC 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000025C /* 012DC 809F2DBC 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000025C
/* 012E0 809F2DC0 AFA60028 */ sw $a2, 0x0028($sp) /* 012E0 809F2DC0 AFA60028 */ sw $a2, 0x0028($sp)
/* 012E4 809F2DC4 0C0189B7 */ jal Collider_CylinderUpdate /* 012E4 809F2DC4 0C0189B7 */ jal Collider_UpdateCylinder
/* 012E8 809F2DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 012E8 809F2DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 012EC 809F2DCC 9208023C */ lbu $t0, 0x023C($s0) ## 0000023C /* 012EC 809F2DCC 9208023C */ lbu $t0, 0x023C($s0) ## 0000023C
@ -145,7 +145,7 @@ glabel EnDntJiji_Update
/* 012FC 809F2DDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 012FC 809F2DDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 01300 809F2DE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01300 809F2DE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 01304 809F2DE4 0C017713 */ jal CollisionCheck_SetOC /* 01304 809F2DE4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01308 809F2DE8 00812821 */ addu $a1, $a0, $at /* 01308 809F2DE8 00812821 */ addu $a1, $a0, $at
.L809F2DEC: .L809F2DEC:
/* 0130C 809F2DEC 8FBF0024 */ lw $ra, 0x0024($sp) /* 0130C 809F2DEC 8FBF0024 */ lw $ra, 0x0024($sp)

6
asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s
View file

@ -184,7 +184,7 @@ glabel L809F57B0
/* 025B4 809F5874 AFA4002C */ sw $a0, 0x002C($sp) /* 025B4 809F5874 AFA4002C */ sw $a0, 0x002C($sp)
/* 025B8 809F5878 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 /* 025B8 809F5878 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228
/* 025BC 809F587C 26060234 */ addiu $a2, $s0, 0x0234 ## $a2 = 00000234 /* 025BC 809F587C 26060234 */ addiu $a2, $s0, 0x0234 ## $a2 = 00000234
/* 025C0 809F5880 0C0189CD */ jal func_80062734 /* 025C0 809F5880 0C0189CD */ jal Collider_SetQuadVertices
/* 025C4 809F5884 26070240 */ addiu $a3, $s0, 0x0240 ## $a3 = 00000240 /* 025C4 809F5884 26070240 */ addiu $a3, $s0, 0x0240 ## $a3 = 00000240
/* 025C8 809F5888 8FA4003C */ lw $a0, 0x003C($sp) /* 025C8 809F5888 8FA4003C */ lw $a0, 0x003C($sp)
/* 025CC 809F588C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 025CC 809F588C 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -196,7 +196,7 @@ glabel L809F57B0
/* 025E0 809F58A0 1000000C */ beq $zero, $zero, .L809F58D4 /* 025E0 809F58A0 1000000C */ beq $zero, $zero, .L809F58D4
/* 025E4 809F58A4 8FBF0024 */ lw $ra, 0x0024($sp) /* 025E4 809F58A4 8FBF0024 */ lw $ra, 0x0024($sp)
.L809F58A8: .L809F58A8:
/* 025E8 809F58A8 0C0189B7 */ jal Collider_CylinderUpdate /* 025E8 809F58A8 0C0189B7 */ jal Collider_UpdateCylinder
/* 025EC 809F58AC AFA6002C */ sw $a2, 0x002C($sp) /* 025EC 809F58AC AFA6002C */ sw $a2, 0x002C($sp)
/* 025F0 809F58B0 920B0218 */ lbu $t3, 0x0218($s0) ## 00000218 /* 025F0 809F58B0 920B0218 */ lbu $t3, 0x0218($s0) ## 00000218
@ -206,7 +206,7 @@ glabel L809F57B0
/* 02600 809F58C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02600 809F58C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 02604 809F58C4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02604 809F58C4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 02608 809F58C8 0C017713 */ jal CollisionCheck_SetOC /* 02608 809F58C8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 0260C 809F58CC 00812821 */ addu $a1, $a0, $at /* 0260C 809F58CC 00812821 */ addu $a1, $a0, $at
.L809F58D0: .L809F58D0:
/* 02610 809F58D0 8FBF0024 */ lw $ra, 0x0024($sp) /* 02610 809F58D0 8FBF0024 */ lw $ra, 0x0024($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s
View file

@ -42,7 +42,7 @@ glabel EnDodojr_Init
/* 0008C 809F644C 3C06809F */ lui $a2, %hi(D_809F7EDC) ## $a2 = 809F0000 /* 0008C 809F644C 3C06809F */ lui $a2, %hi(D_809F7EDC) ## $a2 = 809F0000
/* 00090 809F6450 24C67EDC */ addiu $a2, $a2, %lo(D_809F7EDC) ## $a2 = 809F7EDC /* 00090 809F6450 24C67EDC */ addiu $a2, $a2, %lo(D_809F7EDC) ## $a2 = 809F7EDC
/* 00094 809F6454 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00094 809F6454 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 00098 809F6458 0C0187BF */ jal func_80061EFC /* 00098 809F6458 0C0187BF */ jal CollisionCheck_SetInfo2
/* 0009C 809F645C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 0009C 809F645C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000
/* 000A0 809F6460 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 000A0 809F6460 8E080004 */ lw $t0, 0x0004($s0) ## 00000004
/* 000A4 809F6464 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000A4 809F6464 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE

4
asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s
View file

@ -4,7 +4,7 @@ glabel func_809F72A4
/* 00EEC 809F72AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00EEC 809F72AC AFBF0014 */ sw $ra, 0x0014($sp)
/* 00EF0 809F72B0 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 /* 00EF0 809F72B0 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194
/* 00EF4 809F72B4 AFA50024 */ sw $a1, 0x0024($sp) /* 00EF4 809F72B4 AFA50024 */ sw $a1, 0x0024($sp)
/* 00EF8 809F72B8 0C0189B7 */ jal Collider_CylinderUpdate /* 00EF8 809F72B8 0C0189B7 */ jal Collider_UpdateCylinder
/* 00EFC 809F72BC AFA40028 */ sw $a0, 0x0028($sp) /* 00EFC 809F72BC AFA40028 */ sw $a0, 0x0028($sp)
/* 00F00 809F72C0 8FA70028 */ lw $a3, 0x0028($sp) /* 00F00 809F72C0 8FA70028 */ lw $a3, 0x0028($sp)
@ -67,7 +67,7 @@ glabel func_809F72A4
/* 00FD0 809F7390 8FA4002C */ lw $a0, 0x002C($sp) /* 00FD0 809F7390 8FA4002C */ lw $a0, 0x002C($sp)
.L809F7394: .L809F7394:
/* 00FD4 809F7394 0C017713 */ jal CollisionCheck_SetOC /* 00FD4 809F7394 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00FD8 809F7398 8FA60024 */ lw $a2, 0x0024($sp) /* 00FD8 809F7398 8FA60024 */ lw $a2, 0x0024($sp)
.L809F739C: .L809F739C:
/* 00FDC 809F739C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00FDC 809F739C 8FBF0014 */ lw $ra, 0x0014($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s
View file

@ -39,7 +39,7 @@ glabel EnDu_Init
/* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000 /* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000
/* 00604 809FE234 24C6F25C */ addiu $a2, $a2, %lo(D_809FF25C) ## $a2 = 809FF25C /* 00604 809FE234 24C6F25C */ addiu $a2, $a2, %lo(D_809FF25C) ## $a2 = 809FF25C
/* 00608 809FE238 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00608 809FE238 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098
/* 0060C 809FE23C 0C0187BF */ jal func_80061EFC /* 0060C 809FE23C 0C0187BF */ jal CollisionCheck_SetInfo2
/* 00610 809FE240 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00610 809FE240 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000
/* 00614 809FE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00614 809FE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 /* 00618 809FE248 0C27F76D */ jal func_809FDDB4

4
asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s
View file

@ -7,7 +7,7 @@ glabel EnDu_Update
/* 01100 809FED30 AFBF0024 */ sw $ra, 0x0024($sp) /* 01100 809FED30 AFBF0024 */ sw $ra, 0x0024($sp)
/* 01104 809FED34 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 01104 809FED34 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194
/* 01108 809FED38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 01108 809FED38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194
/* 0110C 809FED3C 0C0189B7 */ jal Collider_CylinderUpdate /* 0110C 809FED3C 0C0189B7 */ jal Collider_UpdateCylinder
/* 01110 809FED40 AFA6002C */ sw $a2, 0x002C($sp) /* 01110 809FED40 AFA6002C */ sw $a2, 0x002C($sp)
/* 01114 809FED44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01114 809FED44 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -15,7 +15,7 @@ glabel EnDu_Update
/* 0111C 809FED4C 8FA6002C */ lw $a2, 0x002C($sp) /* 0111C 809FED4C 8FA6002C */ lw $a2, 0x002C($sp)
/* 01120 809FED50 02212821 */ addu $a1, $s1, $at /* 01120 809FED50 02212821 */ addu $a1, $s1, $at
/* 01124 809FED54 0C017713 */ jal CollisionCheck_SetOC /* 01124 809FED54 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01128 809FED58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01128 809FED58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0112C 809FED5C 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 /* 0112C 809FED5C 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154
/* 01130 809FED60 3C0E0600 */ lui $t6, %hi(D_060041F4) ## $t6 = 06000000 /* 01130 809FED60 3C0E0600 */ lui $t6, %hi(D_060041F4) ## $t6 = 06000000

2
asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s
View file

@ -46,7 +46,7 @@ glabel EnEiyer_Init
/* 0009C 80A0003C 3C0680A0 */ lui $a2, %hi(D_80A0199C) ## $a2 = 80A00000 /* 0009C 80A0003C 3C0680A0 */ lui $a2, %hi(D_80A0199C) ## $a2 = 80A00000
/* 000A0 80A00040 24C6199C */ addiu $a2, $a2, %lo(D_80A0199C) ## $a2 = 80A0199C /* 000A0 80A00040 24C6199C */ addiu $a2, $a2, %lo(D_80A0199C) ## $a2 = 80A0199C
/* 000A4 80A00044 24A519A4 */ addiu $a1, $a1, %lo(D_80A019A4) ## $a1 = 80A019A4 /* 000A4 80A00044 24A519A4 */ addiu $a1, $a1, %lo(D_80A019A4) ## $a1 = 80A019A4
/* 000A8 80A00048 0C0187B5 */ jal func_80061ED4 /* 000A8 80A00048 0C0187B5 */ jal CollisionCheck_SetInfo
/* 000AC 80A0004C 26240098 */ addiu $a0, $s1, 0x0098 ## $a0 = 00000098 /* 000AC 80A0004C 26240098 */ addiu $a0, $s1, 0x0098 ## $a0 = 00000098
/* 000B0 80A00050 8622001C */ lh $v0, 0x001C($s1) ## 0000001C /* 000B0 80A00050 8622001C */ lh $v0, 0x001C($s1) ## 0000001C
/* 000B4 80A00054 28410003 */ slti $at, $v0, 0x0003 /* 000B4 80A00054 28410003 */ slti $at, $v0, 0x0003

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

@ -87,7 +87,7 @@ glabel EnEiyer_Update
/* 01700 80A016A0 1483001F */ bne $a0, $v1, .L80A01720 /* 01700 80A016A0 1483001F */ bne $a0, $v1, .L80A01720
/* 01704 80A016A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01704 80A016A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L80A016A8: .L80A016A8:
/* 01708 80A016A8 0C0189B7 */ jal Collider_CylinderUpdate /* 01708 80A016A8 0C0189B7 */ jal Collider_UpdateCylinder
/* 0170C 80A016AC AFA5002C */ sw $a1, 0x002C($sp) /* 0170C 80A016AC AFA5002C */ sw $a1, 0x002C($sp)
/* 01710 80A016B0 92090298 */ lbu $t1, 0x0298($s0) ## 00000298 /* 01710 80A016B0 92090298 */ lbu $t1, 0x0298($s0) ## 00000298
@ -121,7 +121,7 @@ glabel EnEiyer_Update
/* 01770 80A01710 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01770 80A01710 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 01774 80A01714 00812821 */ addu $a1, $a0, $at /* 01774 80A01714 00812821 */ addu $a1, $a0, $at
/* 01778 80A01718 0C017713 */ jal CollisionCheck_SetOC /* 01778 80A01718 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 0177C 80A0171C 8FA6002C */ lw $a2, 0x002C($sp) /* 0177C 80A0171C 8FA6002C */ lw $a2, 0x002C($sp)
.L80A01720: .L80A01720:
/* 01780 80A01720 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 01780 80A01720 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004

2
asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s
View file

@ -883,7 +883,7 @@ glabel func_80A10220
/* 01BC4 80A10E24 8FBF0044 */ lw $ra, 0x0044($sp) /* 01BC4 80A10E24 8FBF0044 */ lw $ra, 0x0044($sp)
.L80A10E28: .L80A10E28:
/* 01BC8 80A10E28 260501B0 */ addiu $a1, $s0, 0x01B0 ## $a1 = 000001B0 /* 01BC8 80A10E28 260501B0 */ addiu $a1, $s0, 0x01B0 ## $a1 = 000001B0
/* 01BCC 80A10E2C 0C0189B7 */ jal Collider_CylinderUpdate /* 01BCC 80A10E2C 0C0189B7 */ jal Collider_UpdateCylinder
/* 01BD0 80A10E30 AFA50050 */ sw $a1, 0x0050($sp) /* 01BD0 80A10E30 AFA50050 */ sw $a1, 0x0050($sp)
/* 01BD4 80A10E34 3C0480A1 */ lui $a0, %hi(D_80A118CC) ## $a0 = 80A10000 /* 01BD4 80A10E34 3C0480A1 */ lui $a0, %hi(D_80A118CC) ## $a0 = 80A10000

2
asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s
View file

@ -182,7 +182,7 @@ glabel EnFireRock_Update
/* 00E5C 80A12A7C 1040000F */ beq $v0, $zero, .L80A12ABC /* 00E5C 80A12A7C 1040000F */ beq $v0, $zero, .L80A12ABC
/* 00E60 80A12A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E60 80A12A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00E64 80A12A84 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00E64 80A12A84 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194
/* 00E68 80A12A88 0C0189B7 */ jal Collider_CylinderUpdate /* 00E68 80A12A88 0C0189B7 */ jal Collider_UpdateCylinder
/* 00E6C 80A12A8C AFA5002C */ sw $a1, 0x002C($sp) /* 00E6C 80A12A8C AFA5002C */ sw $a1, 0x002C($sp)
/* 00E70 80A12A90 8FA4004C */ lw $a0, 0x004C($sp) /* 00E70 80A12A90 8FA4004C */ lw $a0, 0x004C($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s
View file

@ -16,7 +16,7 @@ glabel EnFish_Draw
/* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp) /* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp)
/* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp) /* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp)
/* 01D6C 80A16FEC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 01D6C 80A16FEC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000
/* 01D70 80A16FF0 0C018A29 */ jal func_800628A4 /* 01D70 80A16FF0 0C018A29 */ jal Collider_UpdateSpheres
/* 01D74 80A16FF4 2445014C */ addiu $a1, $v0, 0x014C ## $a1 = 0000014C /* 01D74 80A16FF4 2445014C */ addiu $a1, $v0, 0x014C ## $a1 = 0000014C
/* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp)
/* 01D7C 80A16FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 /* 01D7C 80A16FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s
View file

@ -65,7 +65,7 @@ glabel func_80A16C68
/* 01AB8 80A16D38 45000003 */ bc1f .L80A16D48 /* 01AB8 80A16D38 45000003 */ bc1f .L80A16D48
/* 01ABC 80A16D3C 00000000 */ nop /* 01ABC 80A16D3C 00000000 */ nop
/* 01AC0 80A16D40 0C017713 */ jal CollisionCheck_SetOC /* 01AC0 80A16D40 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01AC4 80A16D44 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 01AC4 80A16D44 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C
.L80A16D48: .L80A16D48:
/* 01AC8 80A16D48 3C0180A1 */ lui $at, %hi(D_80A171EC) ## $at = 80A10000 /* 01AC8 80A16D48 3C0180A1 */ lui $at, %hi(D_80A171EC) ## $at = 80A10000

6
asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s
View file

@ -23,7 +23,7 @@ glabel EnFz_Init
/* 0004C 80A1FE0C 8FA50020 */ lw $a1, 0x0020($sp) /* 0004C 80A1FE0C 8FA50020 */ lw $a1, 0x0020($sp)
/* 00050 80A1FE10 24E71B90 */ addiu $a3, $a3, %lo(D_80A21B90) ## $a3 = 80A21B90 /* 00050 80A1FE10 24E71B90 */ addiu $a3, $a3, %lo(D_80A21B90) ## $a3 = 80A21B90
/* 00054 80A1FE14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00054 80A1FE14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00058 80A1FE18 0C017114 */ jal Collider_SetCylinder_Set3 /* 00058 80A1FE18 0C017114 */ jal Collider_SetCylinderType1
/* 0005C 80A1FE1C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0005C 80A1FE1C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 00060 80A1FE20 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 00060 80A1FE20 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C
/* 00064 80A1FE24 AFA50020 */ sw $a1, 0x0020($sp) /* 00064 80A1FE24 AFA50020 */ sw $a1, 0x0020($sp)
@ -34,7 +34,7 @@ glabel EnFz_Init
/* 00074 80A1FE34 8FA50020 */ lw $a1, 0x0020($sp) /* 00074 80A1FE34 8FA50020 */ lw $a1, 0x0020($sp)
/* 00078 80A1FE38 24E71BBC */ addiu $a3, $a3, %lo(D_80A21BBC) ## $a3 = 80A21BBC /* 00078 80A1FE38 24E71BBC */ addiu $a3, $a3, %lo(D_80A21BBC) ## $a3 = 80A21BBC
/* 0007C 80A1FE3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0007C 80A1FE3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00080 80A1FE40 0C017114 */ jal Collider_SetCylinder_Set3 /* 00080 80A1FE40 0C017114 */ jal Collider_SetCylinderType1
/* 00084 80A1FE44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80A1FE44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 00088 80A1FE48 260501E8 */ addiu $a1, $s0, 0x01E8 ## $a1 = 000001E8 /* 00088 80A1FE48 260501E8 */ addiu $a1, $s0, 0x01E8 ## $a1 = 000001E8
/* 0008C 80A1FE4C AFA50020 */ sw $a1, 0x0020($sp) /* 0008C 80A1FE4C AFA50020 */ sw $a1, 0x0020($sp)
@ -45,7 +45,7 @@ glabel EnFz_Init
/* 0009C 80A1FE5C 8FA50020 */ lw $a1, 0x0020($sp) /* 0009C 80A1FE5C 8FA50020 */ lw $a1, 0x0020($sp)
/* 000A0 80A1FE60 24E71BE8 */ addiu $a3, $a3, %lo(D_80A21BE8) ## $a3 = 80A21BE8 /* 000A0 80A1FE60 24E71BE8 */ addiu $a3, $a3, %lo(D_80A21BE8) ## $a3 = 80A21BE8
/* 000A4 80A1FE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A4 80A1FE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 000A8 80A1FE68 0C017114 */ jal Collider_SetCylinder_Set3 /* 000A8 80A1FE68 0C017114 */ jal Collider_SetCylinderType1
/* 000AC 80A1FE6C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000AC 80A1FE6C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 000B0 80A1FE70 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 /* 000B0 80A1FE70 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000
/* 000B4 80A1FE74 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F /* 000B4 80A1FE74 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F

6
asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s
View file

@ -40,12 +40,12 @@ glabel EnFz_Update
/* 01384 80A21144 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 01384 80A21144 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150
/* 01388 80A21148 5520001E */ bnel $t1, $zero, .L80A211C4 /* 01388 80A21148 5520001E */ bnel $t1, $zero, .L80A211C4
/* 0138C 80A2114C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0138C 80A2114C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000
/* 01390 80A21150 0C0189B7 */ jal Collider_CylinderUpdate /* 01390 80A21150 0C0189B7 */ jal Collider_UpdateCylinder
/* 01394 80A21154 AFA50030 */ sw $a1, 0x0030($sp) /* 01394 80A21154 AFA50030 */ sw $a1, 0x0030($sp)
/* 01398 80A21158 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 01398 80A21158 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C
/* 0139C 80A2115C AFA5002C */ sw $a1, 0x002C($sp) /* 0139C 80A2115C AFA5002C */ sw $a1, 0x002C($sp)
/* 013A0 80A21160 0C0189B7 */ jal Collider_CylinderUpdate /* 013A0 80A21160 0C0189B7 */ jal Collider_UpdateCylinder
/* 013A4 80A21164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013A4 80A21164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 013A8 80A21168 920A0248 */ lbu $t2, 0x0248($s0) ## 00000248 /* 013A8 80A21168 920A0248 */ lbu $t2, 0x0248($s0) ## 00000248
@ -72,7 +72,7 @@ glabel EnFz_Update
/* 013F0 80A211B0 02212821 */ addu $a1, $s1, $at /* 013F0 80A211B0 02212821 */ addu $a1, $s1, $at
/* 013F4 80A211B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 013F4 80A211B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 013F8 80A211B8 0C017713 */ jal CollisionCheck_SetOC /* 013F8 80A211B8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 013FC 80A211BC 8FA60030 */ lw $a2, 0x0030($sp) /* 013FC 80A211BC 8FA60030 */ lw $a2, 0x0030($sp)
/* 01400 80A211C0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01400 80A211C0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000
.L80A211C4: .L80A211C4:

2
asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s
View file

@ -122,7 +122,7 @@ glabel func_80A20100
/* 004DC 80A2029C 00000000 */ nop /* 004DC 80A2029C 00000000 */ nop
.L80A202A0: .L80A202A0:
/* 004E0 80A202A0 8FA400BC */ lw $a0, 0x00BC($sp) /* 004E0 80A202A0 8FA400BC */ lw $a0, 0x00BC($sp)
/* 004E4 80A202A4 0C018B35 */ jal func_80062CD4 /* 004E4 80A202A4 0C018B35 */ jal CollisionCheck_SpawnShieldParticles
/* 004E8 80A202A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 004E8 80A202A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000
/* 004EC 80A202AC 8FBF007C */ lw $ra, 0x007C($sp) /* 004EC 80A202AC 8FBF007C */ lw $ra, 0x007C($sp)
/* 004F0 80A202B0 D7B40028 */ ldc1 $f20, 0x0028($sp) /* 004F0 80A202B0 D7B40028 */ ldc1 $f20, 0x0028($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s
View file

@ -61,7 +61,7 @@ glabel EnGb_Init
/* 000F4 80A2F274 24E70690 */ addiu $a3, $a3, %lo(D_80A30690) ## $a3 = 80A30690 /* 000F4 80A2F274 24E70690 */ addiu $a3, $a3, %lo(D_80A30690) ## $a3 = 80A30690
/* 000F8 80A2F278 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000F8 80A2F278 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 000FC 80A2F27C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C /* 000FC 80A2F27C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C
/* 00100 80A2F280 0C017114 */ jal Collider_SetCylinder_Set3 /* 00100 80A2F280 0C017114 */ jal Collider_SetCylinderType1
/* 00104 80A2F284 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00104 80A2F284 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000
/* 00108 80A2F288 3C1080A3 */ lui $s0, %hi(D_80A306BC) ## $s0 = 80A30000 /* 00108 80A2F288 3C1080A3 */ lui $s0, %hi(D_80A306BC) ## $s0 = 80A30000
/* 0010C 80A2F28C 3C1480A3 */ lui $s4, %hi(D_80A30740) ## $s4 = 80A30000 /* 0010C 80A2F28C 3C1480A3 */ lui $s4, %hi(D_80A30740) ## $s4 = 80A30000
@ -76,7 +76,7 @@ glabel EnGb_Init
/* 00128 80A2F2A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00128 80A2F2A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 0012C 80A2F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 0012C 80A2F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288
/* 00130 80A2F2B0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00130 80A2F2B0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000
/* 00134 80A2F2B4 0C017114 */ jal Collider_SetCylinder_Set3 /* 00134 80A2F2B4 0C017114 */ jal Collider_SetCylinderType1
/* 00138 80A2F2B8 02003825 */ or $a3, $s0, $zero ## $a3 = 80A306BC /* 00138 80A2F2B8 02003825 */ or $a3, $s0, $zero ## $a3 = 80A306BC
/* 0013C 80A2F2BC 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 80A306E8 /* 0013C 80A2F2BC 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 80A306E8
/* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 /* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4

4
asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s
View file

@ -30,7 +30,7 @@ glabel EnGb_Update
/* 00C60 80A2FDE0 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 00C60 80A2FDE0 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 00C64 80A2FDE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C64 80A2FDE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 00C68 80A2FDE8 0C017713 */ jal CollisionCheck_SetOC /* 00C68 80A2FDE8 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00C6C 80A2FDEC 2646023C */ addiu $a2, $s2, 0x023C ## $a2 = 0000023C /* 00C6C 80A2FDEC 2646023C */ addiu $a2, $s2, 0x023C ## $a2 = 0000023C
/* 00C70 80A2FDF0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 00C70 80A2FDF0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000
/* 00C74 80A2FDF4 26510288 */ addiu $s1, $s2, 0x0288 ## $s1 = 00000288 /* 00C74 80A2FDF4 26510288 */ addiu $s1, $s2, 0x0288 ## $s1 = 00000288
@ -39,7 +39,7 @@ glabel EnGb_Update
/* 00C7C 80A2FDFC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C7C 80A2FDFC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 00C80 80A2FE00 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 00C80 80A2FE00 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 00C84 80A2FE04 0C017713 */ jal CollisionCheck_SetOC /* 00C84 80A2FE04 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 00C88 80A2FE08 02203025 */ or $a2, $s1, $zero ## $a2 = 00000288 /* 00C88 80A2FE08 02203025 */ or $a2, $s1, $zero ## $a2 = 00000288
/* 00C8C 80A2FE0C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C /* 00C8C 80A2FE0C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C
/* 00C90 80A2FE10 1615FFFA */ bne $s0, $s5, .L80A2FDFC /* 00C90 80A2FE10 1615FFFA */ bne $s0, $s5, .L80A2FDFC

4
asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s
View file

@ -7,7 +7,7 @@ glabel EnGe1_Update
/* 01910 80A32280 AFBF0024 */ sw $ra, 0x0024($sp) /* 01910 80A32280 AFBF0024 */ sw $ra, 0x0024($sp)
/* 01914 80A32284 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 01914 80A32284 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C
/* 01918 80A32288 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C /* 01918 80A32288 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C
/* 0191C 80A3228C 0C0189B7 */ jal Collider_CylinderUpdate /* 0191C 80A3228C 0C0189B7 */ jal Collider_UpdateCylinder
/* 01920 80A32290 AFA6002C */ sw $a2, 0x002C($sp) /* 01920 80A32290 AFA6002C */ sw $a2, 0x002C($sp)
/* 01924 80A32294 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01924 80A32294 3C010001 */ lui $at, 0x0001 ## $at = 00010000
@ -15,7 +15,7 @@ glabel EnGe1_Update
/* 0192C 80A3229C 8FA6002C */ lw $a2, 0x002C($sp) /* 0192C 80A3229C 8FA6002C */ lw $a2, 0x002C($sp)
/* 01930 80A322A0 02212821 */ addu $a1, $s1, $at /* 01930 80A322A0 02212821 */ addu $a1, $s1, $at
/* 01934 80A322A4 0C017713 */ jal CollisionCheck_SetOC /* 01934 80A322A4 0C017713 */ jal CollisionCheck_SetOC
## CollisionCheck_setOT ## CollisionCheck_setOC
/* 01938 80A322A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01938 80A322A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0193C 80A322AC 0C00B638 */ jal Actor_MoveForward /* 0193C 80A322AC 0C00B638 */ jal Actor_MoveForward

Some files were not shown because too many files have changed in this diff Show more