summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-03-25 14:27:43 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-03-25 14:27:43 -0700
commit23a462511307ce7461d490a892926c60d0851a2e (patch)
treedb86a83b17b10254b9db8e1b8509e4cc45bf6ed1
parent6c7eeeb363233140390ad7a3572cd747622221ad (diff)
Label Seel Bonus Stage's game object collision routines
-rwxr-xr-xmain.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/main.asm b/main.asm
index 1744d89..fa48692 100755
--- a/main.asm
+++ b/main.asm
@@ -31203,64 +31203,64 @@ Func_25b97: ; 0x25b97
ret
CheckSeelBonusStageGameObjectCollisions: ; 0x25bbc
- call Func_25bc0
+ call CheckSeelBonusStageSeelHeadCollisions
ret
-Func_25bc0: ; 0x25bc0
+CheckSeelBonusStageSeelHeadCollisions: ; 0x25bc0
ld a, [wd76c]
cp $0
- jr nz, .asm_25bd8
+ jr nz, .seel2
ld a, [wd76e]
ld b, a
ld a, [wd770]
add $14
ld c, a
- call Func_25c12
+ call CheckSeelHeadCollision
ld a, $0
- jr c, .asm_25c09
-.asm_25bd8
+ jr c, .hitSeelHead
+.seel2
ld a, [wd776]
cp $0
- jr nz, .asm_25bf0
+ jr nz, .seel3
ld a, [wd778]
ld b, a
ld a, [wd77a]
add $14
ld c, a
- call Func_25c12
+ call CheckSeelHeadCollision
ld a, $1
- jr c, .asm_25c09
-.asm_25bf0
+ jr c, .hitSeelHead
+.seel3
ld a, [wd780]
cp $0
- jr nz, .asm_25c08
+ jr nz, .done
ld a, [wd782]
ld b, a
ld a, [wd784]
add $14
ld c, a
- call Func_25c12
+ call CheckSeelHeadCollision
ld a, $2
- jr c, .asm_25c09
-.asm_25c08
+ jr c, .hitSeelHead
+.done
ret
-.asm_25c09
+.hitSeelHead
ld [wd768], a
ld a, $1
ld [wd767], a
ret
-Func_25c12: ; 0x25c12
+CheckSeelHeadCollision: ; 0x25c12
ld a, [wBallXPos + 1]
sub b
cp $20
- jr nc, .asm_25c58
+ jr nc, .noCollision
ld b, a
ld a, [wBallYPos + 1]
sub c
cp $20
- jr nc, .asm_25c58
+ jr nc, .noCollision
ld c, a
ld e, c
ld d, $0
@@ -31282,7 +31282,7 @@ Func_25c12: ; 0x25c12
ld a, BANK(CircularCollisionAngles)
call ReadByteFromBank
bit 7, a
- jr nz, .asm_25c58
+ jr nz, .noCollision
sla a
ld [wd7ea], a
ld a, $1
@@ -31290,7 +31290,7 @@ Func_25c12: ; 0x25c12
scf
ret
-.asm_25c58
+.noCollision
and a
ret