thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add comments regarding menus and sprites

Browse source
This commit is contained in:
YamaArashi 2014-09-08 23:32:33 -07:00
parent 59f0507e4c
commit daf4fc87ae
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
engine/overworld/movement.asm
View file

@ -1,22 +1,25 @@
UpdatePlayerSprite: ; 4e31 (1:4e31) UpdatePlayerSprite: ; 4e31 (1:4e31)
ld a, [wSpriteStateData2] ld a, [wSpriteStateData2]
and a and a
jr z, .asm_4e41 jr z, .checkIfTextBoxInFrontOfSprite
cp $ff cp $ff
jr z, .asm_4e4a jr z, .disableSprite
dec a dec a
ld [wSpriteStateData2], a ld [wSpriteStateData2], a
jr .asm_4e4a jr .disableSprite
.asm_4e41 ; check if a text box is in front of the sprite by checking if the lower left
; background tile the sprite is standing on is greater than $5F, which is
; the maximum number for map tiles
.checkIfTextBoxInFrontOfSprite
aCoord 8, 9 aCoord 8, 9
ld [$ff93], a ld [$ff93], a
cp $60 cp $60
jr c, .asm_4e50 jr c, .lowerLeftTileIsMapTile
.asm_4e4a .disableSprite
ld a, $ff ld a, $ff
ld [wSpriteStateData1 + 2], a ld [wSpriteStateData1 + 2], a
ret ret
.asm_4e50 .lowerLeftTileIsMapTile
call DetectCollisionBetweenSprites call DetectCollisionBetweenSprites
ld h, $c1 ld h, $c1
ld a, [wWalkCounter] ; wcfc5 ld a, [wWalkCounter] ; wcfc5

6
engine/overworld/pokemart.asm
View file

@ -173,13 +173,13 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
ld [wcf0a],a ld [wcf0a],a
.skipSettingFlag2 .skipSettingFlag2
ld a,(SFX_02_5a - SFX_Headers_02) / 3 ld a,(SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent ; play sound call PlaySoundWaitForCurrent
call WaitForSoundToFinish ; wait until sound is done playing call WaitForSoundToFinish
ld hl,PokemartBoughtItemText ld hl,PokemartBoughtItemText
call PrintText call PrintText
jp .buyMenuLoop jp .buyMenuLoop
.returnToMainPokemartMenu .returnToMainPokemartMenu
call LoadScreenTilesFromBuffer1 ; restore save screen call LoadScreenTilesFromBuffer1
ld a,$13 ld a,$13
ld [wd125],a ld [wd125],a
call DisplayTextBoxID ; draw money text box call DisplayTextBoxID ; draw money text box

3
home.asm
View file

@ -1936,7 +1936,8 @@ DisplayListMenuID:: ; 2be6 (0:2be6)
ld a,$0d ; list menu text box ID ld a,$0d ; list menu text box ID
ld [wd125],a ld [wd125],a
call DisplayTextBoxID ; draw the menu text box call DisplayTextBoxID ; draw the menu text box
call UpdateSprites ; move sprites call UpdateSprites ; disable sprites behind the text box
; the code up to .skipMovingSprites appears to be useless
hlCoord 4, 2 ; coordinates of upper left corner of menu text box hlCoord 4, 2 ; coordinates of upper left corner of menu text box
ld de,$090e ; height and width of menu text box ld de,$090e ; height and width of menu text box
ld a,[wListMenuID] ld a,[wListMenuID]