Start using text predef macros

also sprite direction constants
This commit is contained in:
dannye 2015-07-04 00:44:12 -05:00
parent bc6f0bc08a
commit f702fc7840
36 changed files with 225 additions and 219 deletions

View file

@ -27,7 +27,7 @@ PrintCardKeyText: ; 52673 (14:6673)
jr z, .noCardKey
call GetCoordsInFrontOfPlayer
push de
ld a, $1
tx_pre_id CardKeySuccessText
ld [H_DOWNARROWBLINKCNT2], a
call PrintPredefTextID
pop de
@ -54,7 +54,7 @@ PrintCardKeyText: ; 52673 (14:6673)
ld a, (SFX_1f_57 - SFX_Headers_1f) / 3
jp PlaySound
.noCardKey
ld a, $2
tx_pre_id CardKeyFailText
ld [H_DOWNARROWBLINKCNT2], a
jp PrintPredefTextID

View file

@ -185,26 +185,26 @@ Func_f09f: ; f09f (3:709f)
add hl, bc
ld a, [wSpriteStateData1 + 9]
and a
jr z, .asm_f0c7
cp $4
jr z, .asm_f0cf
cp $8
jr z, .asm_f0d7
jr z, .down
cp SPRITE_FACING_UP
jr z, .up
cp SPRITE_FACING_LEFT
jr z, .left
ld a, [W_XBLOCKCOORD]
and a
jr z, .asm_f0e0
jr .asm_f0ec
.asm_f0c7
.down
ld a, [W_YBLOCKCOORD]
and a
jr z, .asm_f0e0
jr .asm_f0df
.asm_f0cf
.up
ld a, [W_YBLOCKCOORD]
and a
jr z, .asm_f0e1
jr .asm_f0e0
.asm_f0d7
.left
ld a, [W_XBLOCKCOORD]
and a
jr z, .asm_f0e6

View file

@ -16,8 +16,7 @@ HiddenItems: ; 76688 (1d:6688)
ld a, [wWhichTrade] ; item ID
ld [wd11e], a
call GetItemName
ld a, $24
jp PrintPredefTextID
tx_pre_jump FoundHiddenItemText
INCLUDE "data/hidden_item_coords.asm"
@ -112,10 +111,10 @@ HiddenCoins: ; 76799 (1d:6799)
ld a, [wPlayerCoins + 1]
cp $99
jr nz, .RoomInCoinCase
ld a, $2c
tx_pre_id DroppedHiddenCoinsText
jr .done
.RoomInCoinCase
ld a, $2b
tx_pre_id FoundHiddenCoinsText
.done
jp PrintPredefTextID

View file

@ -27,34 +27,34 @@ UpdatePlayerSprite: ; 4e31 (1:4e31)
jr nz, .asm_4e90
ld a, [wd528]
bit 2, a
jr z, .asm_4e65
xor a
jr .asm_4e86
.asm_4e65
jr z, .notDown
xor a ; ld a, SPRITE_FACING_DOWN
jr .done
.notDown
bit 3, a
jr z, .asm_4e6d
ld a, $4
jr .asm_4e86
.asm_4e6d
jr z, .notUp
ld a, SPRITE_FACING_UP
jr .done
.notUp
bit 1, a
jr z, .asm_4e75
ld a, $8
jr .asm_4e86
.asm_4e75
jr z, .notLeft
ld a, SPRITE_FACING_LEFT
jr .done
.notLeft
bit 0, a
jr z, .asm_4e7d
ld a, $c
jr .asm_4e86
.asm_4e7d
jr z, .notRight
ld a, SPRITE_FACING_RIGHT
jr .done
.notRight
xor a
ld [wSpriteStateData1 + 7], a
ld [wSpriteStateData1 + 8], a
jr .asm_4eab
.asm_4e86
.done
ld [wSpriteStateData1 + 9], a
ld a, [wFontLoaded]
bit 0, a
jr nz, .asm_4e7d
jr nz, .notRight
.asm_4e90
ld a, [wd736]
bit 7, a