Labeling of Vermilion Gym script and Player jumping y coordinates INCBIN.

This commit is contained in:
Marcus Huderle 2013-12-25 19:57:40 -06:00
parent 77f2adcc73
commit 4f03df7c46

View file

@ -98520,19 +98520,19 @@ GymTrashScript: ; 5ddfc (17:5dfc)
ld a, [$d773] ld a, [$d773]
bit 0, a bit 0, a
jr z, .asm_5de11 jr z, .asm_5de11
ld a, $26 ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash)
jp Func_3ef5 jp Func_3ef5
.asm_5de11 .asm_5de11
bit 1, a bit 1, a
jr nz, .asm_5de53 jr nz, .resetOrOpenLocks
ld a, [$d743] ld a, [$d743]
ld b, a ld b, a
ld a, [$cd5b] ld a, [$cd5b]
cp b cp b
jr z, .asm_5de23 jr z, .openFirstLock
ld a, $26 ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash)
jr .asm_5de7a jr .endTrashScript
.asm_5de23 .openFirstLock
ld hl, $d773 ld hl, $d773
set 1, [hl] set 1, [hl]
ld hl, Unknown_5de7d ; $5e7d ld hl, Unknown_5de7d ; $5e7d
@ -98560,28 +98560,28 @@ GymTrashScript: ; 5ddfc (17:5dfc)
ld a, [hl] ld a, [hl]
and $f and $f
ld [$d744], a ld [$d744], a
ld a, $3b ld a, $3b ; DisplayTextID $3b = VermilionGymTrashSuccesText1 (first lock opened!)
jr .asm_5de7a jr .endTrashScript
.asm_5de53 .resetOrOpenLocks
ld a, [$d744] ld a, [$d744]
ld b, a ld b, a
ld a, [$cd5b] ld a, [$cd5b]
cp b cp b
jr z, .asm_5de6e jr z, .openSecondLock
ld hl, $d773 ld hl, $d773
res 1, [hl] res 1, [hl]
call GenRandom call GenRandom
and $e and $e
ld [$d743], a ld [$d743], a
ld a, $3e ld a, $3e ; DisplayTextID $3e = VermilionGymTrashFailText (locks reset!)
jr .asm_5de7a jr .endTrashScript
.asm_5de6e .openSecondLock
ld hl, $d773 ld hl, $d773
set 0, [hl] set 0, [hl]
ld hl, $d126 ld hl, $d126
set 6, [hl] set 6, [hl]
ld a, $3d ld a, $3d ; DisplayTextID $3d = VermilionGymTrashSuccesText3 (2nd lock opened!)
.asm_5de7a .endTrashScript
jp Func_3ef5 jp Func_3ef5
Unknown_5de7d: ; 5de7d (17:5e7d) Unknown_5de7d: ; 5de7d (17:5e7d)
@ -103697,10 +103697,10 @@ _HandleMidJump: ; 7087e (1c:487e)
jr nc, .asm_70895 jr nc, .asm_70895
ld [$d714], a ld [$d714], a
ld b, $0 ld b, $0
ld hl, Unknown_708ba ; $48ba ld hl, PlayerJumpingYScreenCoords ; $48ba
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [$c104], a ld [$c104], a ; player's sprite y coordinate
ret ret
.asm_70895 .asm_70895
ld a, [wWalkCounter] ; $cfc5 ld a, [wWalkCounter] ; $cfc5
@ -103721,8 +103721,10 @@ _HandleMidJump: ; 7087e (1c:487e)
ld [wJoypadForbiddenButtonsMask], a ld [wJoypadForbiddenButtonsMask], a
ret ret
Unknown_708ba: ; 708ba (1c:48ba) PlayerJumpingYScreenCoords: ; 708ba (1c:48ba)
INCBIN "baserom.gbc",$708ba,$708ca - $708ba ; Sequence of y screen coordinates for player's sprite when jumping over a ledge.
db $38, $36, $34, $32, $31, $30, $30, $30, $31, $32, $33, $34, $36, $38, $3C, $3C
Func_708ca: ; 708ca (1c:48ca) Func_708ca: ; 708ca (1c:48ca)
ld a, $e4 ld a, $e4