Use *Coord instead of FuncCoord

Using 'Coord =' doesn't like using wTileMap
So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord
to avoid static addresses
This commit is contained in:
U-Fish-PC\Daniel 2014-06-25 16:58:27 -04:00
parent b36f793667
commit bd533aa79b
53 changed files with 519 additions and 975 deletions

View file

@ -16,8 +16,7 @@ HallOfFamePC: ; 7405c (1d:405c)
call FillMemory call FillMemory
ld hl, wTileMap ld hl, wTileMap
call Func_7417b call Func_7417b
FuncCoord 0, 14 hlCoord 0, 14
ld hl, Coord
call Func_7417b call Func_7417b
ld a, $c0 ld a, $c0
ld [rBGP], a ; $ff47 ld [rBGP], a ; $ff47
@ -62,8 +61,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb)
ld a,[hl] ld a,[hl]
ld [wcf91],a ld [wcf91],a
ld [wd0b5],a ld [wd0b5],a
FuncCoord 8, 6 hlCoord 8, 6
ld hl,Coord
call GetMonHeader call GetMonHeader
call LoadFrontSpriteByMonIndex call LoadFrontSpriteByMonIndex
ld hl,vBGMap0 + $c ld hl,vBGMap0 + $c
@ -153,8 +151,7 @@ Func_7417b: ; 7417b (1d:417b)
jp FillMemory jp FillMemory
FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) FillMiddleOfScreenWithWhite: ; 74183 (1d:4183)
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld bc, $c8 ; 10 rows of 20 tiles each ld bc, $c8 ; 10 rows of 20 tiles each
ld a, $7f ; blank white tile ld a, $7f ; blank white tile
jp FillMemory jp FillMemory
@ -164,8 +161,7 @@ Credits: ; 7418e (1d:418e)
push de push de
.asm_74192 .asm_74192
pop de pop de
FuncCoord 9, 6 hlCoord 9, 6
ld hl, Coord
push hl push hl
call FillMiddleOfScreenWithWhite call FillMiddleOfScreenWithWhite
pop hl pop hl
@ -241,12 +237,10 @@ Credits: ; 7418e (1d:418e)
ld hl, vChars2 + $600 ld hl, vChars2 + $600
ld bc, (BANK(TheEndGfx) << 8) + $0a ld bc, (BANK(TheEndGfx) << 8) + $0a
call CopyVideoData call CopyVideoData
FuncCoord 4, 8 hlCoord 4, 8
ld hl, Coord
ld de, TheEndTextString ld de, TheEndTextString
call PlaceString call PlaceString
FuncCoord 4, 9 hlCoord 4, 9
ld hl, Coord
inc de inc de
call PlaceString call PlaceString
jp Func_740ba jp Func_740ba

View file

@ -67,12 +67,10 @@ Func_7861: ; 7861 (1:7861)
.asm_789c .asm_789c
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
FuncCoord 10, 9 hlCoord 10, 9
ld hl, Coord
ld a, $1 ld a, $1
jr z, .asm_78aa jr z, .asm_78aa
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
xor a xor a
.asm_78aa .asm_78aa
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID

View file

@ -2,8 +2,7 @@ Func_708ca: ; 708ca (1c:48ca)
ld a, $e4 ld a, $e4
ld [rOBP1], a ; $ff49 ld [rOBP1], a ; $ff49
call Func_7092a call Func_7092a
FuncCoord 12, 0 hlCoord 12, 0
ld hl, Coord
ld bc, $707 ld bc, $707
call ClearScreenArea call ClearScreenArea
call Delay3 call Delay3
@ -287,8 +286,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
call BattleTransition_InwardSpiral call BattleTransition_InwardSpiral
jr .done jr .done
.outwardSpiral .outwardSpiral
FuncCoord 10, 10 hlCoord 10, 10
ld hl, Coord
ld a, $3 ld a, $3
ld [wd09f], a ld [wd09f], a
ld a, l ld a, l
@ -457,28 +455,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f)
push bc push bc
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
FuncCoord 0, 7 hlCoord 0, 7
ld hl, Coord deCoord 0, 8
FuncCoord 0, 8
ld de, Coord
ld bc, $ffd8 ld bc, $ffd8
call BattleTransition_CopyTiles1 call BattleTransition_CopyTiles1
FuncCoord 0, 10 hlCoord 0, 10
ld hl, Coord deCoord 0, 9
FuncCoord 0, 9
ld de, Coord
ld bc, $28 ld bc, $28
call BattleTransition_CopyTiles1 call BattleTransition_CopyTiles1
FuncCoord 8, 0 hlCoord 8, 0
ld hl, Coord deCoord 9, 0
FuncCoord 9, 0
ld de, Coord
ld bc, $fffe ld bc, $fffe
call BattleTransition_CopyTiles2 call BattleTransition_CopyTiles2
FuncCoord 11, 0 hlCoord 11, 0
ld hl, Coord deCoord 10, 0
FuncCoord 10, 0
ld de, Coord
ld bc, $2 ld bc, $2
call BattleTransition_CopyTiles2 call BattleTransition_CopyTiles2
ld a, $1 ld a, $1
@ -499,25 +489,19 @@ BattleTransition_Split: ; 70bca (1c:4bca)
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
.loop .loop
push bc push bc
FuncCoord 0, 16 hlCoord 0, 16
ld hl, Coord deCoord 0, 17
FuncCoord 0, 17
ld de, Coord
ld bc, $ffd8 ld bc, $ffd8
call BattleTransition_CopyTiles1 call BattleTransition_CopyTiles1
FuncCoord 0, 1 hlCoord 0, 1
ld hl, Coord
ld de, wTileMap ld de, wTileMap
ld bc, $28 ld bc, $28
call BattleTransition_CopyTiles1 call BattleTransition_CopyTiles1
FuncCoord 18, 0 hlCoord 18, 0
ld hl, Coord deCoord 19, 0
FuncCoord 19, 0
ld de, Coord
ld bc, $fffe ld bc, $fffe
call BattleTransition_CopyTiles2 call BattleTransition_CopyTiles2
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
ld de, wTileMap ld de, wTileMap
ld bc, $2 ld bc, $2
call BattleTransition_CopyTiles2 call BattleTransition_CopyTiles2
@ -615,8 +599,7 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f)
BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e) BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
ld c, $12 ld c, $12
ld hl, wTileMap ld hl, wTileMap
FuncCoord 1, 17 deCoord 1, 17
ld de, Coord
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
.loop .loop
@ -655,8 +638,7 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa)
BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4) BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
ld c, $14 ld c, $14
ld hl, wTileMap ld hl, wTileMap
FuncCoord 19, 1 deCoord 19, 1
ld de, Coord
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
.loop .loop
@ -777,104 +759,84 @@ BattleTransition_Circle_Sub2: ; 70d50 (1c:4d50)
BattleTransition_HalfCircle1: ; 70d61 (1c:4d61) BattleTransition_HalfCircle1: ; 70d61 (1c:4d61)
db $01 db $01
dw BattleTransition_CircleData1 dw BattleTransition_CircleData1
FuncCoord 18, 6 dwCoord 18, 6
dw Coord
db $01 db $01
dw BattleTransition_CircleData2 dw BattleTransition_CircleData2
FuncCoord 19, 3 dwCoord 19, 3
dw Coord
db $01 db $01
dw BattleTransition_CircleData3 dw BattleTransition_CircleData3
FuncCoord 18, 0 dwCoord 18, 0
dw Coord
db $01 db $01
dw BattleTransition_CircleData4 dw BattleTransition_CircleData4
FuncCoord 14, 0 dwCoord 14, 0
dw Coord
db $01 db $01
dw BattleTransition_CircleData5 dw BattleTransition_CircleData5
FuncCoord 10, 0 dwCoord 10, 0
dw Coord
db $00 db $00
dw BattleTransition_CircleData5 dw BattleTransition_CircleData5
FuncCoord 9, 0 dwCoord 9, 0
dw Coord
db $00 db $00
dw BattleTransition_CircleData4 dw BattleTransition_CircleData4
FuncCoord 5, 0 dwCoord 5, 0
dw Coord
db $00 db $00
dw BattleTransition_CircleData3 dw BattleTransition_CircleData3
FuncCoord 1, 0 dwCoord 1, 0
dw Coord
db $00 db $00
dw BattleTransition_CircleData2 dw BattleTransition_CircleData2
FuncCoord 0, 3 dwCoord 0, 3
dw Coord
db $00 db $00
dw BattleTransition_CircleData1 dw BattleTransition_CircleData1
FuncCoord 1, 6 dwCoord 1, 6
dw Coord
BattleTransition_HalfCircle2: ; 70d93 (1c:4d93) BattleTransition_HalfCircle2: ; 70d93 (1c:4d93)
db $00 db $00
dw BattleTransition_CircleData1 dw BattleTransition_CircleData1
FuncCoord 1, 11 dwCoord 1, 11
dw Coord
db $00 db $00
dw BattleTransition_CircleData2 dw BattleTransition_CircleData2
FuncCoord 0, 14 dwCoord 0, 14
dw Coord
db $00 db $00
dw BattleTransition_CircleData3 dw BattleTransition_CircleData3
FuncCoord 1, 17 dwCoord 1, 17
dw Coord
db $00 db $00
dw BattleTransition_CircleData4 dw BattleTransition_CircleData4
FuncCoord 5, 17 dwCoord 5, 17
dw Coord
db $00 db $00
dw BattleTransition_CircleData5 dw BattleTransition_CircleData5
FuncCoord 9, 17 dwCoord 9, 17
dw Coord
db $01 db $01
dw BattleTransition_CircleData5 dw BattleTransition_CircleData5
FuncCoord 10, 17 dwCoord 10, 17
dw Coord
db $01 db $01
dw BattleTransition_CircleData4 dw BattleTransition_CircleData4
FuncCoord 14, 17 dwCoord 14, 17
dw Coord
db $01 db $01
dw BattleTransition_CircleData3 dw BattleTransition_CircleData3
FuncCoord 18, 17 dwCoord 18, 17
dw Coord
db $01 db $01
dw BattleTransition_CircleData2 dw BattleTransition_CircleData2
FuncCoord 19, 14 dwCoord 19, 14
dw Coord
db $01 db $01
dw BattleTransition_CircleData1 dw BattleTransition_CircleData1
FuncCoord 18, 11 dwCoord 18, 11
dw Coord
BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5) BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5)
push hl push hl

View file

@ -18,8 +18,7 @@ Func_137aa: ; 137aa (4:77aa)
jr z, .asm_137de jr z, .asm_137de
ld de, DrawText ld de, DrawText
.asm_137de .asm_137de
FuncCoord 6, 8 hlCoord 6, 8
ld hl, Coord
call PlaceString call PlaceString
ld c, $c8 ld c, $c8
call DelayFrames call DelayFrames
@ -110,8 +109,7 @@ Func_13870: ; 13870 (4:7870)
jr z, .asm_13905 jr z, .asm_13905
ld [wd0db], a ld [wd0db], a
.asm_1389e .asm_1389e
FuncCoord 9, 9 hlCoord 9, 9
ld hl, Coord
ld c, [hl] ld c, [hl]
ld a, [W_GRASSTILE] ld a, [W_GRASSTILE]
cp c cp c
@ -145,8 +143,7 @@ Func_13870: ; 13870 (4:7870)
.asm_138d7 .asm_138d7
ld c, [hl] ld c, [hl]
ld hl, W_GRASSMONS ; wd888 ld hl, W_GRASSMONS ; wd888
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
cp $14 cp $14
jr nz, .asm_138e5 jr nz, .asm_138e5
ld hl, W_WATERMONS ; wd8a5 (aliases: wEnemyMon1HP) ld hl, W_WATERMONS ; wd8a5 (aliases: wEnemyMon1HP)
@ -250,14 +247,12 @@ RecoilEffect_: ; 1392c (4:792c)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
.asm_13982 .asm_13982
FuncCoord 10, 9 hlCoord 10, 9
ld hl, Coord
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
ld a, $1 ld a, $1
jr z, .asm_13990 jr z, .asm_13990
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
xor a xor a
.asm_13990 .asm_13990
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID

View file

@ -754,8 +754,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
cp a,1 cp a,1
ret nz ret nz
.moveGhostMarowakLeft .moveGhostMarowakLeft
FuncCoord 17,0 hlCoord 17, 0
ld hl,Coord
ld de,20 ld de,20
ld bc,$0707 ; 7 rows and 7 columns ld bc,$0707 ; 7 rows and 7 columns
.loop .loop
@ -854,8 +853,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009)
cp a,1 ; is it the end of the subanimation? cp a,1 ; is it the end of the subanimation?
jr nz,FlashScreenEveryFourFrameBlocks jr nz,FlashScreenEveryFourFrameBlocks
; if it's the end of the subanimation, make the attacking pokemon disappear ; if it's the end of the subanimation, make the attacking pokemon disappear
FuncCoord 1, 5 hlCoord 1, 5
ld hl,Coord
jp AnimationHideMonPic ; make pokemon disappear jp AnimationHideMonPic ; make pokemon disappear
; flashes the screen when subanimation counter is 1 modulo 4 ; flashes the screen when subanimation counter is 1 modulo 4
@ -1561,11 +1559,9 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9)
call AnimationHideMonPic call AnimationHideMonPic
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
FuncCoord 2, 5 hlCoord 2, 5
ld hl, Coord
jr z, .asm_79407 jr z, .asm_79407
FuncCoord 11, 0 hlCoord 11, 0
ld hl, Coord
.asm_79407 .asm_79407
xor a xor a
push hl push hl
@ -1676,16 +1672,12 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1)
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
jr z, .asm_794b1 jr z, .asm_794b1
FuncCoord 16, 0 hlCoord 16, 0
ld hl, Coord deCoord 14, 0
FuncCoord 14, 0
ld de, Coord
jr .asm_794b7 jr .asm_794b7
.asm_794b1 .asm_794b1
FuncCoord 5, 5 hlCoord 5, 5
ld hl, Coord deCoord 3, 5
FuncCoord 3, 5
ld de, Coord
.asm_794b7 .asm_794b7
push de push de
xor a xor a
@ -1889,12 +1881,10 @@ Func_795f8: ; 795f8 (1e:55f8)
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
jr z, .asm_79602 jr z, .asm_79602
FuncCoord 12, 0 hlCoord 12, 0
ld hl, Coord
jr .asm_79605 jr .asm_79605
.asm_79602 .asm_79602
FuncCoord 0, 5 hlCoord 0, 5
ld hl, Coord
.asm_79605 .asm_79605
ld d, $8 ld d, $8
.asm_79607 .asm_79607
@ -2128,8 +2118,7 @@ Func_79793: ; 79793 (1e:5793)
xor a xor a
ld [W_SPRITEFLIPPED], a ld [W_SPRITEFLIPPED], a
call GetMonHeader call GetMonHeader
FuncCoord 12, 0 hlCoord 12, 0
ld hl, Coord
call LoadFrontSpriteByMonIndex call LoadFrontSpriteByMonIndex
jr .asm_797d3 jr .asm_797d3
.asm_797b0 .asm_797b0

View file

@ -96,8 +96,7 @@ Func_3c04c: ; 3c04c (f:404c)
ld a, $1 ld a, $1
ld [wd125], a ld [wd125], a
call DisplayTextBoxID call DisplayTextBoxID
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
ld bc, $307 ld bc, $307
call ClearScreenArea call ClearScreenArea
call DisableLCD call DisableLCD
@ -171,8 +170,7 @@ Func_3c04c: ; 3c04c (f:404c)
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $31 ld a, $31
ld [$ffe1], a ld [$ffe1], a
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
predef Func_3f0c6 predef Func_3f0c6
xor a xor a
ld [$ffb0], a ld [$ffb0], a
@ -309,8 +307,7 @@ Func_3c1ad: ; 3c1ad (f:41ad)
ld [wcf91], a ld [wcf91], a
ld [wBattleMonSpecies2], a ld [wBattleMonSpecies2], a
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
ld a, $9 ld a, $9
call Func_3c8df call Func_3c8df
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
@ -736,14 +733,12 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
ret ret
UpdateCurMonHPBar: ; 3c4f6 (f:44f6) UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
FuncCoord 10, 9 hlCoord 10, 9 ; tile pointer to player HP bar
ld hl, Coord ; tile pointer to player HP bar
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
ld a, $1 ld a, $1
jr z, .playersTurn jr z, .playersTurn
FuncCoord 2, 2 hlCoord 2, 2 ; tile pointer to enemy HP bar
ld hl, Coord ; tile pointer to enemy HP bar
xor a xor a
.playersTurn .playersTurn
push bc push bc
@ -828,10 +823,8 @@ FaintEnemyPokemon ; 0x3c567
ld hl, wccf1 ld hl, wccf1
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
FuncCoord 12, 5 hlCoord 12, 5
ld hl, Coord deCoord 12, 6
FuncCoord 12, 6
ld de, Coord
call Func_3c893 call Func_3c893
ld hl, wTileMap ld hl, wTileMap
ld bc, $40b ld bc, $40b
@ -1063,14 +1056,11 @@ Func_3c741: ; 3c741 (f:4741)
ld [hl], a ld [hl], a
ld [wBattleMonStatus], a ; wBattleMonStatus ld [wBattleMonStatus], a ; wBattleMonStatus
call ReadPlayerMonCurHPAndStatus call ReadPlayerMonCurHPAndStatus
FuncCoord 9, 7 hlCoord 9, 7
ld hl, Coord
ld bc, $50b ld bc, $50b
call ClearScreenArea call ClearScreenArea
FuncCoord 1, 10 hlCoord 1, 10
ld hl, Coord deCoord 1, 11
FuncCoord 1, 11
ld de, Coord
call Func_3c893 call Func_3c893
ld a, $1 ld a, $1
ld [wcf0b], a ld [wcf0b], a
@ -1096,8 +1086,7 @@ Func_3c79b: ; 3c79b (f:479b)
ld hl, UseNextMonText ld hl, UseNextMonText
call PrintText call PrintText
.asm_3c7ad .asm_3c7ad
FuncCoord 13, 9 hlCoord 13, 9
ld hl, Coord
ld bc, $a0e ld bc, $a0e
ld a, $14 ld a, $14
ld [wd125], a ld [wd125], a
@ -1333,8 +1322,7 @@ Func_3c92a: ; 3c92a (f:492a)
ld [wAICount],a ld [wAICount],a
ld hl,W_PLAYERBATTSTATUS1 ld hl,W_PLAYERBATTSTATUS1
res 5,[hl] res 5,[hl]
FuncCoord 18, 0 hlCoord 18, 0
ld hl,Coord
ld a,8 ld a,8
call Func_3c8df call Func_3c8df
call Func_3ee94 call Func_3ee94
@ -1404,8 +1392,7 @@ Func_3c92a: ; 3c92a (f:492a)
jr nz,.next4 jr nz,.next4
ld hl, TrainerAboutToUseText ld hl, TrainerAboutToUseText
call PrintText call PrintText
FuncCoord 0, 7 hlCoord 0, 7
ld hl,Coord
ld bc,$0801 ld bc,$0801
ld a,$14 ld a,$14
ld [wd125],a ld [wd125],a
@ -1456,8 +1443,7 @@ Func_3c92a: ; 3c92a (f:492a)
call LoadMonFrontSprite call LoadMonFrontSprite
ld a,$CF ld a,$CF
ld [$FFE1],a ld [$FFE1],a
FuncCoord 15, 6 hlCoord 15, 6
ld hl,Coord
predef Func_3f073 predef Func_3f073
ld a,[wEnemyMonSpecies2] ld a,[wEnemyMonSpecies2]
call PlayCry call PlayCry
@ -1777,8 +1763,7 @@ Func_3cca4: ; 3cca4 (f:4ca4)
ld [H_WHOSETURN], a ; $fff3 ld [H_WHOSETURN], a ; $fff3
ld a, POOF_ANIM ld a, POOF_ANIM
call PlayMoveAnimation call PlayMoveAnimation
FuncCoord 4, 11 hlCoord 4, 11
ld hl, Coord
predef Func_3f073 predef Func_3f073
ld a, [wcf91] ld a, [wcf91]
call PlayCry call PlayCry
@ -1786,12 +1771,10 @@ Func_3cca4: ; 3cca4 (f:4ca4)
jp SaveScreenTilesToBuffer1 jp SaveScreenTilesToBuffer1
Func_3ccfa: ; 3ccfa (f:4cfa) Func_3ccfa: ; 3ccfa (f:4cfa)
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
ld bc, $707 ld bc, $707
call ClearScreenArea call ClearScreenArea
FuncCoord 3, 7 hlCoord 3, 7
ld hl, Coord
ld bc, $505 ld bc, $505
xor a xor a
ld [wcd6c], a ld [wcd6c], a
@ -1800,8 +1783,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
ld c, $4 ld c, $4
call DelayFrames call DelayFrames
call Func_3cd3a call Func_3cd3a
FuncCoord 4, 9 hlCoord 4, 9
ld hl, Coord
ld bc, $303 ld bc, $303
ld a, $1 ld a, $1
ld [wcd6c], a ld [wcd6c], a
@ -1811,12 +1793,10 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
call Delay3 call Delay3
call Func_3cd3a call Func_3cd3a
ld a, $4c ld a, $4c
FuncCoord 5, 11 Coorda 5, 11
ld [Coord], a
Func_3cd3a: ; 3cd3a (f:4d3a) Func_3cd3a: ; 3cd3a (f:4d3a)
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
ld bc, $707 ld bc, $707
jp ClearScreenArea jp ClearScreenArea
@ -1839,17 +1819,14 @@ Func_3cd5a: ; 3cd5a (f:4d5a)
Func_3cd60: ; 3cd60 (f:4d60) Func_3cd60: ; 3cd60 (f:4d60)
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
FuncCoord 9, 7 hlCoord 9, 7
ld hl, Coord
ld bc, $50b ld bc, $50b
call ClearScreenArea call ClearScreenArea
callab PlacePlayerHUDTiles callab PlacePlayerHUDTiles
FuncCoord 18, 9 hlCoord 18, 9
ld hl, Coord
ld [hl], $73 ld [hl], $73
ld de, wBattleMonNick ld de, wBattleMonNick
FuncCoord 10, 7 hlCoord 10, 7
ld hl, Coord
call Func_3ce9c call Func_3ce9c
call PlaceString call PlaceString
ld hl, wBattleMonSpecies ld hl, wBattleMonSpecies
@ -1860,8 +1837,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
ld de, wcfb9 ld de, wcfb9
ld bc, $b ld bc, $b
call CopyData call CopyData
FuncCoord 14, 8 hlCoord 14, 8
ld hl, Coord
push hl push hl
inc hl inc hl
ld de, wcf9c ld de, wcf9c
@ -1872,8 +1848,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
.asm_3cdae .asm_3cdae
ld a, [wcf98] ld a, [wcf98]
ld [wcf91], a ld [wcf91], a
FuncCoord 10, 9 hlCoord 10, 9
ld hl, Coord
predef DrawHP predef DrawHP
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@ -1910,12 +1885,10 @@ Func_3cdec: ; 3cdec (f:4dec)
call ClearScreenArea call ClearScreenArea
callab PlaceEnemyHUDTiles callab PlaceEnemyHUDTiles
ld de, wEnemyMonNick ld de, wEnemyMonNick
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
call Func_3ce9c call Func_3ce9c
call PlaceString call PlaceString
FuncCoord 4, 1 hlCoord 4, 1
ld hl, Coord
push hl push hl
inc hl inc hl
ld de, wEnemyMonStatus ; wcfe9 ld de, wEnemyMonStatus ; wcfe9
@ -1984,8 +1957,7 @@ Func_3cdec: ; 3cdec (f:4dec)
Func_3ce7f: ; 3ce7f (f:4e7f) Func_3ce7f: ; 3ce7f (f:4e7f)
xor a xor a
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
call DrawHPBar call DrawHPBar
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@ -2055,14 +2027,12 @@ InitBattleMenu: ; 3ceb3 (f:4eb3)
ld bc, $b ld bc, $b
call CopyData call CopyData
; the following simulates the keystrokes by drawing menus on screen ; the following simulates the keystrokes by drawing menus on screen
FuncCoord 9, 14 hlCoord 9, 14
ld hl, Coord
ld [hl], "▶" ld [hl], "▶"
ld c, $50 ld c, $50
call DelayFrames call DelayFrames
ld [hl], $7f ld [hl], $7f
FuncCoord 9, 16 hlCoord 9, 16
ld hl, Coord
ld [hl], "▶" ld [hl], "▶"
ld c, $32 ld c, $32
call DelayFrames call DelayFrames
@ -2087,19 +2057,14 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
cp $2 cp $2
ld a, " " ld a, " "
jr z, .safaribattle jr z, .safaribattle
FuncCoord 15, 14 Coorda 15, 14
ld [Coord], a Coorda 15, 16
FuncCoord 15, 16
ld [Coord], a
ld b, $9 ld b, $9
jr .notsafari jr .notsafari
.safaribattle .safaribattle
FuncCoord 13, 14 Coorda 13, 14
ld [Coord], a Coorda 13, 16
FuncCoord 13, 16 hlCoord 7, 14
ld [Coord], a
FuncCoord 7, 14
ld hl, Coord
ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102 ld bc, $102
call PrintNumber call PrintNumber
@ -2124,19 +2089,14 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
cp $2 cp $2
ld a, " " ld a, " "
jr z, .safarirightcolumn jr z, .safarirightcolumn
FuncCoord 9, 14 Coorda 9, 14
ld [Coord], a Coorda 9, 16
FuncCoord 9, 16
ld [Coord], a
ld b, $f ld b, $f
jr .notsafarirightcolumn jr .notsafarirightcolumn
.safarirightcolumn .safarirightcolumn
FuncCoord 1, 14 Coorda 1, 14
ld [Coord], a Coorda 1, 16
FuncCoord 1, 16 hlCoord 7, 14
ld [Coord], a
FuncCoord 7, 14
ld hl, Coord
ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102 ld bc, $102
call PrintNumber call PrintNumber
@ -2328,8 +2288,7 @@ asm_3d0f0: ; 3d0f0 (f:50f0)
jp InitBattleMenu jp InitBattleMenu
Func_3d105: ; 3d105 (f:5105) Func_3d105: ; 3d105 (f:5105)
FuncCoord 11, 11 hlCoord 11, 11
ld hl, Coord
ld bc, $81 ld bc, $81
ld a, $7f ld a, $7f
call FillMemory call FillMemory
@ -2484,21 +2443,17 @@ MoveSelectionMenu: ; 3d219 (f:5219)
ret z ret z
ld hl, wBattleMonMoves ld hl, wBattleMonMoves
call .loadmoves call .loadmoves
FuncCoord 4, 12 hlCoord 4, 12
ld hl, Coord
ld b, $4 ld b, $4
ld c, $e ld c, $e
di di
call TextBoxBorder call TextBoxBorder
FuncCoord 4, 12 hlCoord 4, 12
ld hl, Coord
ld [hl], $7a ld [hl], $7a
FuncCoord 10, 12 hlCoord 10, 12
ld hl, Coord
ld [hl], $7e ld [hl], $7e
ei ei
FuncCoord 6, 13 hlCoord 6, 13
ld hl, Coord
call .writemoves call .writemoves
ld b, $5 ld b, $5
ld a, $c ld a, $c
@ -2506,13 +2461,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
.mimicmenu .mimicmenu
ld hl, wEnemyMonMoves ld hl, wEnemyMonMoves
call .loadmoves call .loadmoves
FuncCoord 0, 7 hlCoord 0, 7
ld hl, Coord
ld b, $4 ld b, $4
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
FuncCoord 2, 8 hlCoord 2, 8
ld hl, Coord
call .writemoves call .writemoves
ld b, $1 ld b, $1
ld a, $7 ld a, $7
@ -2523,13 +2476,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
ld bc, $2c ld bc, $2c
call AddNTimes call AddNTimes
call .loadmoves call .loadmoves
FuncCoord 4, 7 hlCoord 4, 7
ld hl, Coord
ld b, $4 ld b, $4
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
FuncCoord 6, 8 hlCoord 6, 8
ld hl, Coord
call .writemoves call .writemoves
ld b, $5 ld b, $5
ld a, $7 ld a, $7
@ -2584,8 +2535,7 @@ Func_3d2fe: ; 3d2fe (f:52fe)
jr z, .battleselect jr z, .battleselect
dec a dec a
jr nz, .select jr nz, .select
FuncCoord 1, 14 hlCoord 1, 14
ld hl, Coord
ld de, WhichTechniqueString ; $53b8 ld de, WhichTechniqueString ; $53b8
call PlaceString call PlaceString
jr .select jr .select
@ -2597,8 +2547,7 @@ Func_3d2fe: ; 3d2fe (f:52fe)
ld a, [wcc35] ld a, [wcc35]
and a and a
jr z, .select jr z, .select
FuncCoord 5, 13 hlCoord 5, 13
ld hl, Coord
dec a dec a
ld bc, $14 ld bc, $14
call AddNTimes call AddNTimes
@ -2834,8 +2783,7 @@ asm_3d4ad: ; 3d4ad (f:54ad)
Func_3d4b6: ; 3d4b6 (f:54b6) Func_3d4b6: ; 3d4b6 (f:54b6)
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
FuncCoord 0, 8 hlCoord 0, 8
ld hl, Coord
ld b, $3 ld b, $3
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
@ -2848,8 +2796,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp b cp b
jr nz, .asm_3d4df jr nz, .asm_3d4df
FuncCoord 1, 10 hlCoord 1, 10
ld hl, Coord
ld de, DisabledText ld de, DisabledText
call PlaceString call PlaceString
jr .asm_3d54e jr .asm_3d54e
@ -2879,29 +2826,23 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
ld a, [hl] ld a, [hl]
and $3f and $3f
ld [wcd6d], a ld [wcd6d], a
FuncCoord 1, 9 hlCoord 1, 9
ld hl, Coord
ld de, TypeText ld de, TypeText
call PlaceString call PlaceString
FuncCoord 7, 11 hlCoord 7, 11
ld hl, Coord
ld [hl], "/" ld [hl], "/"
FuncCoord 5, 9 hlCoord 5, 9
ld hl, Coord
ld [hl], "/" ld [hl], "/"
FuncCoord 5, 11 hlCoord 5, 11
ld hl, Coord
ld de, wcd6d ld de, wcd6d
ld bc, $102 ld bc, $102
call PrintNumber call PrintNumber
FuncCoord 8, 11 hlCoord 8, 11
ld hl, Coord
ld de, wd11e ld de, wd11e
ld bc, $102 ld bc, $102
call PrintNumber call PrintNumber
call GetCurrentMove call GetCurrentMove
FuncCoord 2, 10 hlCoord 2, 10
ld hl, Coord
predef Func_27d98 predef Func_27d98
.asm_3d54e .asm_3d54e
ld a, $1 ld a, $1
@ -4773,8 +4714,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
ld [wHPBarNewHP+1],a ld [wHPBarNewHP+1],a
ld a,[hl] ld a,[hl]
ld [wHPBarNewHP],a ld [wHPBarNewHP],a
FuncCoord 2, 2 hlCoord 2, 2
ld hl,Coord
xor a xor a
ld [wListMenuID],a ld [wListMenuID],a
predef UpdateHPBar2 ; animate the HP bar shortening predef UpdateHPBar2 ; animate the HP bar shortening
@ -4892,8 +4832,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
ld [wHPBarMaxHP+1],a ld [wHPBarMaxHP+1],a
ld a,[hl] ld a,[hl]
ld [wHPBarMaxHP],a ld [wHPBarMaxHP],a
FuncCoord 10, 9 hlCoord 10, 9
ld hl,Coord
ld a,$01 ld a,$01
ld [wListMenuID],a ld [wListMenuID],a
predef UpdateHPBar2 ; animate the HP bar shortening predef UpdateHPBar2 ; animate the HP bar shortening
@ -6274,8 +6213,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
ld [$0], a ld [$0], a
ld a, $31 ld a, $31
ld [$ffe1], a ld [$ffe1], a
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
predef_jump Func_3f0c6 predef_jump Func_3f0c6
Func_3ed02: ; 3ed02 (f:6d02) Func_3ed02: ; 3ed02 (f:6d02)
@ -6676,8 +6614,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
ld [$ffe1], a ld [$ffe1], a
dec a dec a
ld [wAICount], a ; wccdf ld [wAICount], a ; wccdf
FuncCoord 12, 0 hlCoord 12, 0
ld hl, Coord
predef Func_3f0c6 predef Func_3f0c6
ld a, $ff ld a, $ff
ld [wEnemyMonPartyPos], a ld [wEnemyMonPartyPos], a
@ -6731,8 +6668,7 @@ InitWildBattle: ; 3ef8b (f:6f8b)
xor a xor a
ld [W_TRAINERCLASS], a ; wd031 ld [W_TRAINERCLASS], a ; wd031
ld [$ffe1], a ld [$ffe1], a
FuncCoord 12, 0 hlCoord 12, 0
ld hl, Coord
predef Func_3f0c6 predef Func_3f0c6
Func_3efeb: ; 3efeb (f:6feb) Func_3efeb: ; 3efeb (f:6feb)
@ -6753,12 +6689,10 @@ Func_3efeb: ; 3efeb (f:6feb)
ld a, $9c ld a, $9c
ld [$ffbd], a ld [$ffbd], a
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
FuncCoord 9, 7 hlCoord 9, 7
ld hl, Coord
ld bc, $50a ld bc, $50a
call ClearScreenArea call ClearScreenArea
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
ld bc, $40a ld bc, $40a
call ClearScreenArea call ClearScreenArea
call ClearSprites call ClearSprites
@ -6900,8 +6834,7 @@ LoadMonBackPic:
; been loaded with GetMonHeader. ; been loaded with GetMonHeader.
ld a, [wBattleMonSpecies2] ld a, [wBattleMonSpecies2]
ld [wcf91], a ld [wcf91], a
FuncCoord 1, 5 hlCoord 1, 5
ld hl, Coord
ld b, $7 ld b, $7
ld c, $8 ld c, $8
call ClearScreenArea call ClearScreenArea

View file

@ -1,20 +1,16 @@
Func_372d6: ; 372d6 (d:72d6) Func_372d6: ; 372d6 (d:72d6)
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns
FuncCoord 3, 4 hlCoord 3, 4
ld hl, Coord
ld b, $7 ld b, $7
ld c, $c ld c, $c
call TextBoxBorder call TextBoxBorder
FuncCoord 4, 5 hlCoord 4, 5
ld hl, Coord
ld de, wPlayerName ; wd158 ld de, wPlayerName ; wd158
call PlaceString call PlaceString
FuncCoord 4, 10 hlCoord 4, 10
ld hl, Coord
ld de, W_GRASSRATE ; W_GRASSRATE ld de, W_GRASSRATE ; W_GRASSRATE
call PlaceString call PlaceString
FuncCoord 9, 8 hlCoord 9, 8
ld hl, Coord
ld a, $69 ld a, $69
ld [hli], a ld [hli], a
ld [hl], $6a ld [hl], $6a

View file

@ -67,8 +67,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
ld b, $1 ld b, $1
call GoPAL_SET call GoPAL_SET
callab _LoadTrainerPic callab _LoadTrainerPic
FuncCoord 19, 0 hlCoord 19, 0
ld hl, Coord
ld c, $0 ld c, $0
.asm_396e9 .asm_396e9
inc c inc c
@ -1173,8 +1172,7 @@ AIRecoverHP: ; 3a6da (e:66da)
Func_3a718: ; 3a718 (e:6718) Func_3a718: ; 3a718 (e:6718)
call AIPrintItemUse_ call AIPrintItemUse_
FuncCoord 2, 2 hlCoord 2, 2
ld hl,Coord
xor a xor a
ld [wListMenuID],a ld [wListMenuID],a
predef UpdateHPBar2 predef UpdateHPBar2
@ -1489,8 +1487,7 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902)
ld de, wTrainerFacingDirection ld de, wTrainerFacingDirection
ld bc, $3 ld bc, $3
call CopyData call CopyData
FuncCoord 18, 10 hlCoord 18, 10
ld hl, Coord
ld de, rIE ; $ffff ld de, rIE ; $ffff
jr PlaceHUDTiles jr PlaceHUDTiles
@ -1505,8 +1502,7 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919)
ld de, wTrainerFacingDirection ld de, wTrainerFacingDirection
ld bc, $3 ld bc, $3
call CopyData call CopyData
FuncCoord 1, 2 hlCoord 1, 2
ld hl, Coord
ld de, $1 ld de, $1
jr PlaceHUDTiles jr PlaceHUDTiles

View file

@ -85,12 +85,10 @@ HealEffect_: ; 3b9ec (e:79ec)
call BankswitchEtoF call BankswitchEtoF
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
FuncCoord 10, 9 hlCoord 10, 9
ld hl, Coord
ld a, $1 ld a, $1
jr z, .asm_3ba83 jr z, .asm_3ba83
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
xor a xor a
.asm_3ba83 .asm_3ba83
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID

View file

@ -6,13 +6,11 @@ Func_5317: ; 5317 (1:5317)
call LoadFontTilePatterns call LoadFontTilePatterns
call LoadHpBarAndStatusTilePatterns call LoadHpBarAndStatusTilePatterns
call LoadTrainerInfoTextBoxTiles call LoadTrainerInfoTextBoxTiles
FuncCoord 3, 8 hlCoord 3, 8
ld hl, Coord
ld b, $2 ld b, $2
ld c, $c ld c, $c
call Func_5ab3 call Func_5ab3
FuncCoord 4, 10 hlCoord 4, 10
ld hl, Coord
ld de, PleaseWaitString ; $550f ld de, PleaseWaitString ; $550f
call PlaceString call PlaceString
ld hl, W_NUMHITS ; wd074 ld hl, W_NUMHITS ; wd074

View file

@ -5,8 +5,7 @@ Func_1c98a: ; 1c98a (7:498a)
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns
ld hl, ClearSaveDataText ld hl, ClearSaveDataText
call PrintText call PrintText
FuncCoord 14, 7 hlCoord 14, 7
ld hl, Coord
ld bc, $80f ld bc, $80f
ld a, $7 ld a, $7
ld [wd12c], a ld [wd12c], a

View file

@ -99,8 +99,7 @@ Func_7beb4: ; 7beb4 (1e:7eb4)
Func_7beb9: ; 7beb9 (1e:7eb9) Func_7beb9: ; 7beb9 (1e:7eb9)
call GetMonHeader call GetMonHeader
FuncCoord 7, 2 hlCoord 7, 2
ld hl, Coord
jp LoadFlippedFrontSpriteByMonIndex jp LoadFlippedFrontSpriteByMonIndex
asm_7bec2: ; 7bec2 (1e:7ec2) asm_7bec2: ; 7bec2 (1e:7ec2)
ld a, $31 ld a, $31
@ -117,8 +116,7 @@ Func_7bed6: ; 7bed6 (1e:7ed6)
push bc push bc
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
FuncCoord 7, 2 hlCoord 7, 2
ld hl, Coord
ld bc, $707 ld bc, $707
ld de, $d ld de, $d
.asm_7bee3 .asm_7bee3

View file

@ -57,13 +57,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0)
call Func_702e1 call Func_702e1
ld c, $50 ld c, $50
call DelayFrames call DelayFrames
FuncCoord 2, 13 hlCoord 2, 13
ld hl, Coord
ld b, $3 ld b, $3
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
FuncCoord 4, 15 hlCoord 4, 15
ld hl, Coord
ld de, HallOfFameText ld de, HallOfFameText
call PlaceString call PlaceString
ld c, 180 ld c, 180
@ -113,8 +111,7 @@ Func_70278: ; 70278 (1c:4278)
call Func_7033e call Func_7033e
jr .asm_702ab jr .asm_702ab
.asm_7029d .asm_7029d
FuncCoord 12, 5 hlCoord 12, 5
ld hl, Coord
call GetMonHeader call GetMonHeader
call LoadFrontSpriteByMonIndex call LoadFrontSpriteByMonIndex
predef LoadMonBackPic predef LoadMonBackPic
@ -157,27 +154,22 @@ Func_702e1: ; 702e1 (1c:42e1)
jp Func_70404 jp Func_70404
Func_702f0: ; 702f0 (1c:42f0) Func_702f0: ; 702f0 (1c:42f0)
FuncCoord 0, 2 hlCoord 0, 2
ld hl, Coord
ld b, $9 ld b, $9
ld c, $a ld c, $a
call TextBoxBorder call TextBoxBorder
FuncCoord 2, 6 hlCoord 2, 6
ld hl, Coord
ld de, HoFMonInfoText ld de, HoFMonInfoText
call PlaceString call PlaceString
FuncCoord 1, 4 hlCoord 1, 4
ld hl, Coord
ld de, wcd6d ld de, wcd6d
call PlaceString call PlaceString
ld a, [wTrainerFacingDirection] ld a, [wTrainerFacingDirection]
FuncCoord 8, 7 hlCoord 8, 7
ld hl, Coord
call PrintLevelCommon call PrintLevelCommon
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
ld [wd0b5], a ld [wd0b5], a
FuncCoord 3, 9 hlCoord 3, 9
ld hl, Coord
predef Func_27d6b predef Func_27d6b
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
jp PlayCry jp PlayCry
@ -207,34 +199,28 @@ Func_7033e: ; 7033e (1c:433e)
Func_7036d: ; 7036d (1c:436d) Func_7036d: ; 7036d (1c:436d)
ld b, $0 ld b, $0
FuncCoord 12, 5 hlCoord 12, 5
ld hl, Coord
predef_jump Func_79dda predef_jump Func_79dda
Func_70377: ; 70377 (1c:4377) Func_70377: ; 70377 (1c:4377)
ld hl, wd747 ld hl, wd747
set 3, [hl] set 3, [hl]
predef DisplayDexRating predef DisplayDexRating
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld b, $6 ld b, $6
ld c, $a ld c, $a
call TextBoxBorder call TextBoxBorder
FuncCoord 5, 0 hlCoord 5, 0
ld hl, Coord
ld b, $2 ld b, $2
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
FuncCoord 7, 2 hlCoord 7, 2
ld hl, Coord
ld de, wPlayerName ; wd158 ld de, wPlayerName ; wd158
call PlaceString call PlaceString
FuncCoord 1, 6 hlCoord 1, 6
ld hl, Coord
ld de, HoFPlayTimeText ld de, HoFPlayTimeText
call PlaceString call PlaceString
FuncCoord 5, 7 hlCoord 5, 7
ld hl, Coord
ld de, W_PLAYTIMEHOURS + 1 ld de, W_PLAYTIMEHOURS + 1
ld bc, $103 ld bc, $103
call PrintNumber call PrintNumber
@ -243,12 +229,10 @@ Func_70377: ; 70377 (1c:4377)
ld de, W_PLAYTIMEMINUTES + 1 ld de, W_PLAYTIMEMINUTES + 1
ld bc, $8102 ld bc, $8102
call PrintNumber call PrintNumber
FuncCoord 1, 9 hlCoord 1, 9
ld hl, Coord
ld de, HoFMoneyText ld de, HoFMoneyText
call PlaceString call PlaceString
FuncCoord 4, 10 hlCoord 4, 10
ld hl, Coord
ld de, wPlayerMoney ; wPlayerMoney ld de, wPlayerMoney ; wPlayerMoney
ld c, $a3 ld c, $a3
call PrintBCDNumber call PrintBCDNumber

View file

@ -77,8 +77,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
call LoadMonFrontSprite call LoadMonFrontSprite
ld a, $80 ld a, $80
ld [$ffe1], a ld [$ffe1], a
FuncCoord 10, 11 hlCoord 10, 11
ld hl, Coord
predef Func_3f073 predef Func_3f073
call WaitForTextScrollButtonPress call WaitForTextScrollButtonPress
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1

View file

@ -5,8 +5,7 @@ PrintBookshelfText: ; fb50 (3:7b50)
jr nz, .asm_fb7f jr nz, .asm_fb7f
ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld b, a ld b, a
FuncCoord 8, 7 aCoord 8, 7
ld a, [Coord]
ld c, a ld c, a
ld hl, BookshelfTileIDs ; $7b8b ld hl, BookshelfTileIDs ; $7b8b
.asm_fb62 .asm_fb62

View file

@ -204,8 +204,7 @@ Func_417f0: ; 417f0 (10:57f0)
jr asm_417fe jr asm_417fe
Func_417f8: ; 417f8 (10:57f8) Func_417f8: ; 417f8 (10:57f8)
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld bc, $c8 ld bc, $c8
asm_417fe: ; 417fe (10:57fe) asm_417fe: ; 417fe (10:57fe)
ld [hl], $0 ld [hl], $0
@ -259,8 +258,7 @@ Func_4180e: ; 4180e (10:580e)
ret ret
Func_4183f: ; 4183f (10:583f) Func_4183f: ; 4183f (10:583f)
FuncCoord 13, 7 hlCoord 13, 7
ld hl, Coord
Func_41842: ; 41842 (10:5842) Func_41842: ; 41842 (10:5842)
ld c, $0 ld c, $0
@ -335,8 +333,7 @@ Func_418e9: ; 418e9 (10:58e9)
ld hl, wTileMap ld hl, wTileMap
ld c, $50 ld c, $50
call Func_41807 call Func_41807
FuncCoord 0, 14 hlCoord 0, 14
ld hl, Coord
ld c, $50 ld c, $50
call Func_41807 call Func_41807
ld hl, vBGMap1 ld hl, vBGMap1

View file

@ -913,8 +913,7 @@ ItemUseMedicine: ; dabb (3:5abb)
sbc b sbc b
ld [hl],a ld [hl],a
ld [wHPBarNewHP+1],a ld [wHPBarNewHP+1],a
FuncCoord 4, 1 hlCoord 4, 1
ld hl,Coord
ld a,[wWhichPokemon] ld a,[wWhichPokemon]
ld bc,2 * 20 ld bc,2 * 20
call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled
@ -2096,8 +2095,7 @@ ItemUseTMHM: ; e479 (3:6479)
call PrintText call PrintText
ld hl,TeachMachineMoveText ld hl,TeachMachineMoveText
call PrintText call PrintText
FuncCoord 14,7 hlCoord 14, 7
ld hl,Coord
ld bc,$080f ld bc,$080f
ld a,$14 ld a,$14
ld [wd125],a ld [wd125],a
@ -2488,8 +2486,7 @@ TossItem_: ; e6f1 (3:66f1)
call CopyStringToCF4B ; copy name to wcf4b call CopyStringToCF4B ; copy name to wcf4b
ld hl,IsItOKToTossItemText ld hl,IsItOKToTossItemText
call PrintText call PrintText
FuncCoord 14,7 hlCoord 14, 7
ld hl,Coord
ld bc,$080f ld bc,$080f
ld a,$14 ld a,$14
ld [wd125],a ld [wd125],a

View file

@ -76,8 +76,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
AbandonLearning: ; 6eda (1:6eda) AbandonLearning: ; 6eda (1:6eda)
ld hl, AbandonLearningText ld hl, AbandonLearningText
call PrintText call PrintText
FuncCoord 14, 7 hlCoord 14, 7
ld hl, Coord
ld bc, $80f ld bc, $80f
ld a, $14 ld a, $14
ld [wd125], a ld [wd125], a
@ -100,8 +99,7 @@ TryingToLearn: ; 6f07 (1:6f07)
push hl push hl
ld hl, TryingToLearnText ld hl, TryingToLearnText
call PrintText call PrintText
FuncCoord 14, 7 hlCoord 14, 7
ld hl, Coord
ld bc, $80f ld bc, $80f
ld a, $14 ld a, $14
ld [wd125], a ld [wd125], a
@ -122,13 +120,11 @@ TryingToLearn: ; 6f07 (1:6f07)
push hl push hl
ld hl, WhichMoveToForgetText ld hl, WhichMoveToForgetText
call PrintText call PrintText
FuncCoord 4, 7 hlCoord 4, 7
ld hl, Coord
ld b, $4 ld b, $4
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
FuncCoord 6, 8 hlCoord 6, 8
ld hl, Coord
ld de, wd0e1 ld de, wd0e1
ld a, [$fff6] ld a, [$fff6]
set 2, a set 2, a

View file

@ -32,18 +32,15 @@ Func_213c8:: ; 213c8 (8:53c8)
ld a, [wd7f1] ld a, [wd7f1]
bit 0, a bit 0, a
jr nz, .asm_21414 jr nz, .asm_21414
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld de, SomeonesPCText ; $548b ld de, SomeonesPCText ; $548b
jr .asm_2141a jr .asm_2141a
.asm_21414 .asm_21414
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld de, BillsPCText ; $5497 ld de, BillsPCText ; $5497
.asm_2141a .asm_2141a
call PlaceString call PlaceString
FuncCoord 2, 4 hlCoord 2, 4
ld hl, Coord
ld de, wPlayerName ; wd158 ld de, wPlayerName ; wd158
call PlaceString call PlaceString
ld l, c ld l, c
@ -53,8 +50,7 @@ Func_213c8:: ; 213c8 (8:53c8)
ld a, [wd74b] ld a, [wd74b]
bit 5, a bit 5, a
jr z, .asm_21462 jr z, .asm_21462
FuncCoord 2, 6 hlCoord 2, 6
ld hl, Coord
ld de, OaksPCText ; $54a5 ld de, OaksPCText ; $54a5
call PlaceString call PlaceString
ld a, [wd5a2] ld a, [wd5a2]
@ -62,24 +58,20 @@ Func_213c8:: ; 213c8 (8:53c8)
jr z, .asm_2145a jr z, .asm_2145a
ld a, $4 ld a, $4
ld [wMaxMenuItem], a ; wMaxMenuItem ld [wMaxMenuItem], a ; wMaxMenuItem
FuncCoord 2, 8 hlCoord 2, 8
ld hl, Coord
ld de, PKMNLeaguePCText ; $54b2 ld de, PKMNLeaguePCText ; $54b2
call PlaceString call PlaceString
FuncCoord 2, 10 hlCoord 2, 10
ld hl, Coord
ld de, LogOffPCText ; $54ba ld de, LogOffPCText ; $54ba
jr .asm_2146d jr .asm_2146d
.asm_2145a .asm_2145a
FuncCoord 2, 8 hlCoord 2, 8
ld hl, Coord
ld de, LogOffPCText ; $54ba ld de, LogOffPCText ; $54ba
jr .asm_2146d jr .asm_2146d
.asm_21462 .asm_21462
ld a, $2 ld a, $2
ld [wMaxMenuItem], a ; wMaxMenuItem ld [wMaxMenuItem], a ; wMaxMenuItem
FuncCoord 2, 6 hlCoord 2, 6
ld hl, Coord
ld de, LogOffPCText ; $54ba ld de, LogOffPCText ; $54ba
.asm_2146d .asm_2146d
call PlaceString call PlaceString
@ -146,8 +138,7 @@ BillsPCMenu:
ld b, $a ld b, $a
ld c, $c ld c, $c
call TextBoxBorder call TextBoxBorder
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld de, BillsPCMenuText ; $56e1 ld de, BillsPCMenuText ; $56e1
call PlaceString call PlaceString
ld hl, wTopMenuItemY ; wTopMenuItemY ld hl, wTopMenuItemY ; wTopMenuItemY
@ -170,8 +161,7 @@ BillsPCMenu:
ld [wPlayerMonNumber], a ; wPlayerMonNumber ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld hl, WhatText ld hl, WhatText
call PrintText call PrintText
FuncCoord 9, 14 hlCoord 9, 14
ld hl, Coord
ld b, $2 ld b, $2
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
@ -180,18 +170,15 @@ BillsPCMenu:
cp $9 cp $9
jr c, .asm_2154f jr c, .asm_2154f
sub $9 sub $9
FuncCoord 17, 16 hlCoord 17, 16
ld hl, Coord
ld [hl], $f7 ld [hl], $f7
add $f6 add $f6
jr .asm_21551 jr .asm_21551
.asm_2154f .asm_2154f
add $f7 add $f7
.asm_21551 .asm_21551
FuncCoord 18, 16 Coorda 18, 16
ld [Coord], a hlCoord 10, 16
FuncCoord 10, 16
ld hl, Coord
ld de, BoxNoPCText ; $5713 ld de, BoxNoPCText ; $5713
call PlaceString call PlaceString
ld a, $1 ld a, $1
@ -405,8 +392,7 @@ HMMoveArray: ; 21745 (8:5745)
db $ff db $ff
Func_2174b: ; 2174b (8:574b) Func_2174b: ; 2174b (8:574b)
FuncCoord 9, 10 hlCoord 9, 10
ld hl, Coord
ld b, $6 ld b, $6
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
@ -416,11 +402,9 @@ Func_2174b: ; 2174b (8:574b)
jr nz, .asm_21761 jr nz, .asm_21761
ld de, WithdrawPCText ; $57d3 ld de, WithdrawPCText ; $57d3
.asm_21761 .asm_21761
FuncCoord 11, 12 hlCoord 11, 12
ld hl, Coord
call PlaceString call PlaceString
FuncCoord 11, 14 hlCoord 11, 14
ld hl, Coord
ld de, StatsCancelPCText ; $57dc ld de, StatsCancelPCText ; $57dc
call PlaceString call PlaceString
ld hl, wTopMenuItemY ; wTopMenuItemY ld hl, wTopMenuItemY ; wTopMenuItemY

View file

@ -33,8 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
pop bc pop bc
dec c dec c
jr nz, .asm_56715 ; 0x56725 $ee jr nz, .asm_56715 ; 0x56725 $ee
FuncCoord 10, 4 hlCoord 10, 4
ld hl, Coord
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString
callba Func_44dd callba Func_44dd

View file

@ -93,22 +93,18 @@ Func_76610: ; 76610 (1d:6610)
ld b, $0B ld b, $0B
ld c, 0 ld c, 0
call GoPAL_SET call GoPAL_SET
FuncCoord 12, 5 hlCoord 12, 5
ld hl, Coord
call GetMonHeader call GetMonHeader
call LoadFrontSpriteByMonIndex call LoadFrontSpriteByMonIndex
call GBPalNormal call GBPalNormal
FuncCoord 0, 13 hlCoord 0, 13
ld hl, Coord
ld b, 2 ld b, 2
ld c, $12 ld c, $12
call TextBoxBorder call TextBoxBorder
FuncCoord 1, 15 hlCoord 1, 15
ld hl, Coord
ld de, HallOfFameNoText ld de, HallOfFameNoText
call PlaceString call PlaceString
FuncCoord 16, 15 hlCoord 16, 15
ld hl, Coord
ld de, wcd42 ld de, wcd42
ld bc, $0103 ld bc, $0103
call PrintNumber call PrintNumber

View file

@ -33,24 +33,20 @@ MainMenu: ; 5af2 (1:5af2)
ld a,[wd088] ld a,[wd088]
cp a,1 cp a,1
jr z,.next1 jr z,.next1
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
ld b,6 ld b,6
ld c,13 ld c,13
call TextBoxBorder call TextBoxBorder
FuncCoord 2,2 hlCoord 2, 2
ld hl,Coord
ld de,ContinueText ld de,ContinueText
call PlaceString call PlaceString
jr .next2 jr .next2
.next1 .next1
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
ld b,4 ld b,4
ld c,13 ld c,13
call TextBoxBorder call TextBoxBorder
FuncCoord 2,2 hlCoord 2, 2
ld hl,Coord
ld de,NewGameText ld de,NewGameText
call PlaceString call PlaceString
.next2 .next2
@ -142,14 +138,12 @@ LinkMenu: ; 5c0a (1:5c0a)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
ld hl, WhereWouldYouLikeText ld hl, WhereWouldYouLikeText
call PrintText call PrintText
FuncCoord 5, 5 hlCoord 5, 5
ld hl, Coord
ld b, $6 ld b, $6
ld c, $d ld c, $d
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 7, 7 hlCoord 7, 7
ld hl, Coord
ld de, TradeCenterText ld de, TradeCenterText
call PlaceString call PlaceString
xor a xor a
@ -238,14 +232,11 @@ LinkMenu: ; 5c0a (1:5c0a)
ld c, d ld c, d
.asm_5ccc .asm_5ccc
ld a, b ld a, b
FuncCoord 6, 7 Coorda 6, 7
ld [Coord], a
ld a, c ld a, c
FuncCoord 6, 9 Coorda 6, 9
ld [Coord], a
ld a, d ld a, d
FuncCoord 6, 11 Coorda 6, 11
ld [Coord], a
ld c, $28 ld c, $28
call DelayFrames call DelayFrames
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
@ -343,27 +334,21 @@ TradeCenterText: ; 5d97 (1:5d97)
ContinueGame: ; 5db5 (1:5db5) ContinueGame: ; 5db5 (1:5db5)
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
FuncCoord 4, 7 hlCoord 4, 7
ld hl, Coord
ld b, $8 ld b, $8
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
FuncCoord 5, 9 hlCoord 5, 9
ld hl, Coord
ld de, SaveScreenInfoText ld de, SaveScreenInfoText
call PlaceString call PlaceString
FuncCoord 12, 9 hlCoord 12, 9
ld hl, Coord
ld de, wPlayerName ; wd158 ld de, wPlayerName ; wd158
call PlaceString call PlaceString
FuncCoord 17, 11 hlCoord 17, 11
ld hl, Coord
call Func_5e2f call Func_5e2f
FuncCoord 16, 13 hlCoord 16, 13
ld hl, Coord
call Func_5e42 call Func_5e42
FuncCoord 13, 15 hlCoord 13, 15
ld hl, Coord
call Func_5e55 call Func_5e55
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@ -433,35 +418,28 @@ SaveScreenInfoText: ; 5e6a (1:5e6a)
next "TIME@" next "TIME@"
DisplayOptionMenu: ; 5e8a (1:5e8a) DisplayOptionMenu: ; 5e8a (1:5e8a)
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
ld b,3 ld b,3
ld c,18 ld c,18
call TextBoxBorder call TextBoxBorder
FuncCoord 0,5 hlCoord 0, 5
ld hl,Coord
ld b,3 ld b,3
ld c,18 ld c,18
call TextBoxBorder call TextBoxBorder
FuncCoord 0,10 hlCoord 0, 10
ld hl,Coord
ld b,3 ld b,3
ld c,18 ld c,18
call TextBoxBorder call TextBoxBorder
FuncCoord 1,1 hlCoord 1, 1
ld hl,Coord
ld de,TextSpeedOptionText ld de,TextSpeedOptionText
call PlaceString call PlaceString
FuncCoord 1,6 hlCoord 1, 6
ld hl,Coord
ld de,BattleAnimationOptionText ld de,BattleAnimationOptionText
call PlaceString call PlaceString
FuncCoord 1,11 hlCoord 1, 11
ld hl,Coord
ld de,BattleStyleOptionText ld de,BattleStyleOptionText
call PlaceString call PlaceString
FuncCoord 2,16 hlCoord 2, 16
ld hl,Coord
ld de,OptionMenuCancelText ld de,OptionMenuCancelText
call PlaceString call PlaceString
xor a xor a
@ -655,8 +633,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
dec hl dec hl
ld a,[hl] ld a,[hl]
ld [wWhichTrade],a ; text speed cursor X coordinate ld [wWhichTrade],a ; text speed cursor X coordinate
FuncCoord 0,3 hlCoord 0, 3
ld hl,Coord
call .placeUnfilledRightArrow call .placeUnfilledRightArrow
sla c sla c
ld a,1 ; On ld a,1 ; On
@ -664,8 +641,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
ld a,10 ; Off ld a,10 ; Off
.storeBattleAnimationCursorX .storeBattleAnimationCursorX
ld [wTrainerEngageDistance],a ; battle animation cursor X coordinate ld [wTrainerEngageDistance],a ; battle animation cursor X coordinate
FuncCoord 0,8 hlCoord 0, 8
ld hl,Coord
call .placeUnfilledRightArrow call .placeUnfilledRightArrow
sla c sla c
ld a,1 ld a,1
@ -673,12 +649,10 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
ld a,10 ld a,10
.storeBattleStyleCursorX .storeBattleStyleCursorX
ld [wTrainerFacingDirection],a ; battle style cursor X coordinate ld [wTrainerFacingDirection],a ; battle style cursor X coordinate
FuncCoord 0,13 hlCoord 0, 13
ld hl,Coord
call .placeUnfilledRightArrow call .placeUnfilledRightArrow
; cursor in front of Cancel ; cursor in front of Cancel
FuncCoord 0,16 hlCoord 0, 16
ld hl,Coord
ld a,1 ld a,1
.placeUnfilledRightArrow .placeUnfilledRightArrow
ld e,a ld e,a

View file

@ -13,8 +13,7 @@ AskName: ; 64eb (1:64eb)
call GetMonName call GetMonName
ld hl, DoYouWantToNicknameText ld hl, DoYouWantToNicknameText
call PrintText call PrintText
FuncCoord 14, 7 hlCoord 14, 7
ld hl, Coord
ld bc, $80f ld bc, $80f
ld a, $14 ld a, $14
ld [wd125], a ld [wd125], a
@ -94,8 +93,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
call LoadHpBarAndStatusTilePatterns call LoadHpBarAndStatusTilePatterns
call LoadEDTile call LoadEDTile
callba Func_7176c callba Func_7176c
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld b, $9 ld b, $9
ld c, $12 ld c, $12
call TextBoxBorder call TextBoxBorder
@ -341,8 +339,7 @@ PrintAlphabet: ; 676f (1:676f)
jr nz, .asm_677e jr nz, .asm_677e
ld de, UpperCaseAlphabet ; $67d6 ld de, UpperCaseAlphabet ; $67d6
.asm_677e .asm_677e
FuncCoord 2, 5 hlCoord 2, 5
ld hl, Coord
ld bc, $509 ld bc, $509
.asm_6784 .asm_6784
push bc push bc
@ -373,16 +370,13 @@ Func_680e: ; 680e (1:680e)
call CalcStringLength call CalcStringLength
ld a, c ld a, c
ld [wHPBarMaxHP], a ld [wHPBarMaxHP], a
FuncCoord 10, 2 hlCoord 10, 2
ld hl, Coord
ld bc, $10a ld bc, $10a
call ClearScreenArea call ClearScreenArea
FuncCoord 10, 2 hlCoord 10, 2
ld hl, Coord
ld de, wcf4b ld de, wcf4b
call PlaceString call PlaceString
FuncCoord 10, 3 hlCoord 10, 3
ld hl, Coord
ld a, [wd07d] ld a, [wd07d]
cp $2 cp $2
jr nc, .asm_6835 jr nc, .asm_6835
@ -419,8 +413,7 @@ Func_680e: ; 680e (1:680e)
.asm_6867 .asm_6867
ld c, a ld c, a
ld b, $0 ld b, $0
FuncCoord 10, 3 hlCoord 10, 3
ld hl, Coord
add hl, bc add hl, bc
ld [hl], $77 ld [hl], $77
ret ret
@ -468,8 +461,7 @@ CalcStringLength: ; 68eb (1:68eb)
jr .asm_68f0 jr .asm_68f0
PrintNamingText: ; 68f8 (1:68f8) PrintNamingText: ; 68f8 (1:68f8)
FuncCoord 0, 1 hlCoord 0, 1
ld hl, Coord
ld a, [wd07d] ld a, [wd07d]
ld de, YourTextString ; $693f ld de, YourTextString ; $693f
and a and a
@ -484,14 +476,12 @@ PrintNamingText: ; 68f8 (1:68f8)
pop af pop af
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
FuncCoord 4, 1 hlCoord 4, 1
ld hl, Coord
call PlaceString call PlaceString
ld hl, $1 ld hl, $1
add hl, bc add hl, bc
ld [hl], $c9 ld [hl], $c9
FuncCoord 1, 3 hlCoord 1, 3
ld hl, Coord
ld de, NicknameTextString ; $6953 ld de, NicknameTextString ; $6953
jr .placeString jr .placeString
.notNickname .notNickname

View file

@ -30,8 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
jp z,.printMessage jp z,.printMessage
call ErasePartyMenuCursors call ErasePartyMenuCursors
callba SendBlkPacket_PartyMenu ; loads some data to wcf2e callba SendBlkPacket_PartyMenu ; loads some data to wcf2e
FuncCoord 3,0 hlCoord 3, 0
ld hl,Coord
ld de,wPartySpecies ld de,wPartySpecies
xor a xor a
ld c,a ld c,a

View file

@ -26,8 +26,7 @@ Func_790c: ; 790c (1:790c)
ld c, $e ld c, $e
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld de, PlayersPCMenuEntries ; $7af5 ld de, PlayersPCMenuEntries ; $7af5
call PlaceString call PlaceString
ld hl, wTopMenuItemY ; wTopMenuItemY ld hl, wTopMenuItemY ; wTopMenuItemY

View file

@ -118,8 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
pop af pop af
ld [wCurrentMenuItem],a ld [wCurrentMenuItem],a
push bc push bc
FuncCoord 0,3 hlCoord 0, 3
ld hl,Coord
ld de,20 ld de,20
ld bc,$7f0d ; 13 blank tiles ld bc,$7f0d ; 13 blank tiles
call DrawTileLine ; cover up the menu cursor in the pokemon list call DrawTileLine ; cover up the menu cursor in the pokemon list
@ -127,8 +126,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
ret ret
.buttonBPressed .buttonBPressed
push bc push bc
FuncCoord 15,10 hlCoord 15, 10
ld hl,Coord
ld de,20 ld de,20
ld bc,$7f07 ; 7 blank tiles ld bc,$7f07 ; 7 blank tiles
call DrawTileLine ; cover up the menu cursor in the side menu call DrawTileLine ; cover up the menu cursor in the side menu
@ -155,53 +153,43 @@ HandlePokedexListMenu: ; 40111 (10:4111)
xor a xor a
ld [H_AUTOBGTRANSFERENABLED],a ld [H_AUTOBGTRANSFERENABLED],a
; draw the horizontal line separating the seen and owned amounts from the menu ; draw the horizontal line separating the seen and owned amounts from the menu
FuncCoord 15,8 hlCoord 15, 8
ld hl,Coord
ld a,$7a ; horizontal line tile ld a,$7a ; horizontal line tile
ld [hli],a ld [hli],a
ld [hli],a ld [hli],a
ld [hli],a ld [hli],a
ld [hli],a ld [hli],a
ld [hli],a ld [hli],a
FuncCoord 14,0 hlCoord 14, 0
ld hl,Coord
ld [hl],$71 ; vertical line tile ld [hl],$71 ; vertical line tile
FuncCoord 14,1 hlCoord 14, 1
ld hl,Coord
call DrawPokedexVerticalLine call DrawPokedexVerticalLine
FuncCoord 14,9 hlCoord 14, 9
ld hl,Coord
call DrawPokedexVerticalLine call DrawPokedexVerticalLine
ld hl,wPokedexSeen ld hl,wPokedexSeen
ld b,wPokedexSeenEnd - wPokedexSeen ld b,wPokedexSeenEnd - wPokedexSeen
call CountSetBits call CountSetBits
ld de,wd11e ld de,wd11e
FuncCoord 16,3 hlCoord 16, 3
ld hl,Coord
ld bc,$0103 ld bc,$0103
call PrintNumber ; print number of seen pokemon call PrintNumber ; print number of seen pokemon
ld hl,wPokedexOwned ld hl,wPokedexOwned
ld b,wPokedexOwnedEnd - wPokedexOwned ld b,wPokedexOwnedEnd - wPokedexOwned
call CountSetBits call CountSetBits
ld de,wd11e ld de,wd11e
FuncCoord 16,6 hlCoord 16, 6
ld hl,Coord
ld bc,$0103 ld bc,$0103
call PrintNumber ; print number of owned pokemon call PrintNumber ; print number of owned pokemon
FuncCoord 16,2 hlCoord 16, 2
ld hl,Coord
ld de,PokedexSeenText ld de,PokedexSeenText
call PlaceString call PlaceString
FuncCoord 16,5 hlCoord 16, 5
ld hl,Coord
ld de,PokedexOwnText ld de,PokedexOwnText
call PlaceString call PlaceString
FuncCoord 1,1 hlCoord 1, 1
ld hl,Coord
ld de,PokedexContentsText ld de,PokedexContentsText
call PlaceString call PlaceString
FuncCoord 16,10 hlCoord 16, 10
ld hl,Coord
ld de,PokedexMenuItemsText ld de,PokedexMenuItemsText
call PlaceString call PlaceString
; find the highest pokedex number among the pokemon the player has seen ; find the highest pokedex number among the pokemon the player has seen
@ -223,12 +211,10 @@ HandlePokedexListMenu: ; 40111 (10:4111)
.loop .loop
xor a xor a
ld [H_AUTOBGTRANSFERENABLED],a ld [H_AUTOBGTRANSFERENABLED],a
FuncCoord 4,2 hlCoord 4, 2
ld hl,Coord
ld bc,$0e0a ld bc,$0e0a
call ClearScreenArea call ClearScreenArea
FuncCoord 1,3 hlCoord 1, 3
ld hl,Coord
ld a,[wListScrollOffset] ld a,[wListScrollOffset]
ld [wd11e],a ld [wd11e],a
ld d,7 ld d,7
@ -422,47 +408,36 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
push af push af
xor a xor a
ld [$ffd7],a ld [$ffd7],a
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
ld de,1 ld de,1
ld bc,$6414 ld bc,$6414
call DrawTileLine ; draw top border call DrawTileLine ; draw top border
FuncCoord 0,17 hlCoord 0, 17
ld hl,Coord
ld b,$6f ld b,$6f
call DrawTileLine ; draw bottom border call DrawTileLine ; draw bottom border
FuncCoord 0,1 hlCoord 0, 1
ld hl,Coord
ld de,20 ld de,20
ld bc,$6610 ld bc,$6610
call DrawTileLine ; draw left border call DrawTileLine ; draw left border
FuncCoord 19,1 hlCoord 19, 1
ld hl,Coord
ld b,$67 ld b,$67
call DrawTileLine ; draw right border call DrawTileLine ; draw right border
FuncCoord 0,0
ld a,$63 ; upper left corner tile ld a,$63 ; upper left corner tile
ld [Coord],a Coorda 0, 0
FuncCoord 19,0
ld a,$65 ; upper right corner tile ld a,$65 ; upper right corner tile
ld [Coord],a Coorda 19, 0
FuncCoord 0,17
ld a,$6c ; lower left corner tile ld a,$6c ; lower left corner tile
ld [Coord],a Coorda 0, 17
FuncCoord 19,17
ld a,$6e ; lower right corner tile ld a,$6e ; lower right corner tile
ld [Coord],a Coorda 19, 17
FuncCoord 0,9 hlCoord 0, 9
ld hl,Coord
ld de,PokedexDataDividerLine ld de,PokedexDataDividerLine
call PlaceString ; draw horizontal divider line call PlaceString ; draw horizontal divider line
FuncCoord 9,6 hlCoord 9, 6
ld hl,Coord
ld de,HeightWeightText ld de,HeightWeightText
call PlaceString call PlaceString
call GetMonName call GetMonName
FuncCoord 9,2 hlCoord 9, 2
ld hl,Coord
call PlaceString call PlaceString
ld hl,PokedexEntryPointers ld hl,PokedexEntryPointers
ld a,[wd11e] ld a,[wd11e]
@ -474,8 +449,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
ld a,[hli] ld a,[hli]
ld e,a ld e,a
ld d,[hl] ; de = address of pokedex entry ld d,[hl] ; de = address of pokedex entry
FuncCoord 9,4 hlCoord 9, 4
ld hl,Coord
call PlaceString ; print species name call PlaceString ; print species name
ld h,b ld h,b
ld l,c ld l,c
@ -483,8 +457,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
ld a,[wd11e] ld a,[wd11e]
push af push af
call IndexToPokedex call IndexToPokedex
FuncCoord 2,8 hlCoord 2, 8
ld hl,Coord
ld a, "№" ld a, "№"
ld [hli],a ld [hli],a
ld a,$f2 ld a,$f2
@ -506,8 +479,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
call Delay3 call Delay3
call GBPalNormal call GBPalNormal
call GetMonHeader ; load pokemon picture location call GetMonHeader ; load pokemon picture location
FuncCoord 1,1 hlCoord 1, 1
ld hl,Coord
call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
ld a,[wcf91] ld a,[wcf91]
call PlayCry ; play pokemon cry call PlayCry ; play pokemon cry
@ -520,16 +492,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
inc de ; de = address of feet (height) inc de ; de = address of feet (height)
ld a,[de] ; reads feet, but a is overwritten without being used ld a,[de] ; reads feet, but a is overwritten without being used
FuncCoord 12,6 hlCoord 12, 6
ld hl,Coord
ld bc,$0102 ld bc,$0102
call PrintNumber ; print feet (height) call PrintNumber ; print feet (height)
ld a,$60 ; feet symbol tile (one tick) ld a,$60 ; feet symbol tile (one tick)
ld [hl],a ld [hl],a
inc de inc de
inc de ; de = address of inches (height) inc de ; de = address of inches (height)
FuncCoord 15,6 hlCoord 15, 6
ld hl,Coord
ld bc,$8102 ld bc,$8102
call PrintNumber ; print inches (height) call PrintNumber ; print inches (height)
ld a,$61 ; inches symbol tile (two ticks) ld a,$61 ; inches symbol tile (two ticks)
@ -550,13 +520,11 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
dec de dec de
ld a,[de] ; a = lower byte of weight ld a,[de] ; a = lower byte of weight
ld [hl],a ; store lower byte of weight in [$ff8c] ld [hl],a ; store lower byte of weight in [$ff8c]
FuncCoord 11,8
ld de,$ff8b ld de,$ff8b
ld hl,Coord hlCoord 11, 8
ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits
call PrintNumber ; print weight call PrintNumber ; print weight
FuncCoord 14,8 hlCoord 14, 8
ld hl,Coord
ld a,[$ff8c] ld a,[$ff8c]
sub a,10 sub a,10
ld a,[$ff8b] ld a,[$ff8b]
@ -574,8 +542,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
ld [$ff8b],a ; restore original value of [$ff8b] ld [$ff8b],a ; restore original value of [$ff8b]
pop hl pop hl
inc hl ; hl = address of pokedex description text inc hl ; hl = address of pokedex description text
FuncCoord 1,11 bcCoord 1, 11
ld bc,Coord
ld a,2 ld a,2
ld [$fff4],a ld [$fff4],a
call TextCommandProcessor ; print pokedex description text call TextCommandProcessor ; print pokedex description text

View file

@ -22,8 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b)
ld a,$01 ld a,$01
ld [wTopMenuItemX],a ld [wTopMenuItemX],a
call PrintPrizePrice ; 687A call PrintPrizePrice ; 687A
FuncCoord 0,2 hlCoord 0, 2
ld hl,Coord
ld b,$08 ld b,$08
ld c,$10 ld c,$10
call TextBoxBorder call TextBoxBorder
@ -94,50 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e)
ld a,[W_PRIZE1] ld a,[W_PRIZE1]
ld [wd11e],a ld [wd11e],a
call GetItemName call GetItemName
FuncCoord 2,4 hlCoord 2, 4
ld hl,Coord
call PlaceString call PlaceString
ld a,[W_PRIZE2] ld a,[W_PRIZE2]
ld [wd11e],a ld [wd11e],a
call GetItemName call GetItemName
FuncCoord 2,6 hlCoord 2, 6
ld hl,Coord
call PlaceString call PlaceString
ld a,[W_PRIZE3] ld a,[W_PRIZE3]
ld [wd11e],a ld [wd11e],a
call GetItemName call GetItemName
FuncCoord 2,8 hlCoord 2, 8
ld hl,Coord
call PlaceString call PlaceString
jr .putNoThanksText jr .putNoThanksText
.putMonName ; 14:67EC .putMonName ; 14:67EC
ld a,[W_PRIZE1] ld a,[W_PRIZE1]
ld [wd11e],a ld [wd11e],a
call GetMonName call GetMonName
FuncCoord 2,4 hlCoord 2, 4
ld hl,Coord
call PlaceString call PlaceString
ld a,[W_PRIZE2] ld a,[W_PRIZE2]
ld [wd11e],a ld [wd11e],a
call GetMonName call GetMonName
FuncCoord 2,6 hlCoord 2, 6
ld hl,Coord
call PlaceString call PlaceString
ld a,[W_PRIZE3] ld a,[W_PRIZE3]
ld [wd11e],a ld [wd11e],a
call GetMonName call GetMonName
FuncCoord 2,8 hlCoord 2, 8
ld hl,Coord
call PlaceString call PlaceString
.putNoThanksText ; 14:6819 .putNoThanksText ; 14:6819
FuncCoord 2,10 hlCoord 2, 10
ld hl,Coord
ld de,NoThanksText ld de,NoThanksText
call PlaceString call PlaceString
; put prices on the right side of the textbox ; put prices on the right side of the textbox
ld de,wd141 ld de,wd141
FuncCoord 13,5 hlCoord 13, 5
ld hl,Coord
; reg. c: ; reg. c:
; [low nybble] number of bytes ; [low nybble] number of bytes
; [bit 765 = %100] space-padding (not zero-padding) ; [bit 765 = %100] space-padding (not zero-padding)
@ -146,35 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e)
; used by text-command $02) ; used by text-command $02)
call PrintBCDNumber ; Print_BCD call PrintBCDNumber ; Print_BCD
ld de,wd143 ld de,wd143
FuncCoord 13,7 hlCoord 13, 7
ld hl,Coord
ld c,(%1 << 7 | 2) ld c,(%1 << 7 | 2)
call PrintBCDNumber call PrintBCDNumber
ld de,wd145 ld de,wd145
FuncCoord 13,9 hlCoord 13, 9
ld hl,Coord
ld c,(1 << 7 | 2) ld c,(1 << 7 | 2)
jp PrintBCDNumber jp PrintBCDNumber
INCLUDE "data/prizes.asm" INCLUDE "data/prizes.asm"
PrintPrizePrice: ; 5287a (14:687a) PrintPrizePrice: ; 5287a (14:687a)
FuncCoord 11,0 hlCoord 11, 0
ld hl,Coord
ld b,$01 ld b,$01
ld c,$07 ld c,$07
call TextBoxBorder call TextBoxBorder
call UpdateSprites ; XXX save OAM? call UpdateSprites ; XXX save OAM?
FuncCoord 12,0 hlCoord 12, 0
ld hl,Coord
ld de,.CoinText ld de,.CoinText
call PlaceString call PlaceString
FuncCoord 13,1 hlCoord 13, 1
ld hl,Coord
ld de,.SixSpacesText ld de,.SixSpacesText
call PlaceString call PlaceString
FuncCoord 13,1 hlCoord 13, 1
ld hl,Coord
ld de,wPlayerCoins ld de,wPlayerCoins
ld c,%10000010 ld c,%10000010
call PrintBCDNumber call PrintBCDNumber

View file

@ -285,8 +285,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
; writes a blank tile to all possible menu cursor positions on the party menu ; writes a blank tile to all possible menu cursor positions on the party menu
ErasePartyMenuCursors: ; 132ed (4:72ed) ErasePartyMenuCursors: ; 132ed (4:72ed)
FuncCoord 0,1 hlCoord 0, 1
ld hl,Coord
ld bc,2 * 20 ; menu cursor positions are 2 rows apart ld bc,2 * 20 ; menu cursor positions are 2 rows apart
ld a,6 ; 6 menu cursor positions ld a,6 ; 6 menu cursor positions
.loop .loop
@ -331,14 +330,10 @@ StartMenu_Item: ; 13302 (4:7302)
.choseItem .choseItem
; erase menu cursor (blank each tile in front of an item name) ; erase menu cursor (blank each tile in front of an item name)
ld a," " ld a," "
FuncCoord 5,4 Coorda 5, 4
ld [Coord],a Coorda 5, 6
FuncCoord 5,6 Coorda 5, 8
ld [Coord],a Coorda 5, 10
FuncCoord 5,8
ld [Coord],a
FuncCoord 5,10
ld [Coord],a
call PlaceUnfilledArrowMenuCursor call PlaceUnfilledArrowMenuCursor
xor a xor a
ld [wcc35],a ld [wcc35],a
@ -531,12 +526,10 @@ DrawTrainerInfo: ; 1349a (4:749a)
ld bc,(BANK(RedPicFront) << 8) | $01 ld bc,(BANK(RedPicFront) << 8) | $01
predef Predef3B predef Predef3B
call DisableLCD call DisableLCD
FuncCoord 0,2 hlCoord 0, 2
ld hl,Coord
ld a," " ld a," "
call TrainerInfo_DrawVerticalLine call TrainerInfo_DrawVerticalLine
FuncCoord 1,2 hlCoord 1, 2
ld hl,Coord
call TrainerInfo_DrawVerticalLine call TrainerInfo_DrawVerticalLine
ld hl,vChars2 + $70 ld hl,vChars2 + $70
ld de,vChars2 ld de,vChars2
@ -579,8 +572,7 @@ DrawTrainerInfo: ; 1349a (4:749a)
dec a dec a
ld [hli],a ld [hli],a
ld [hl],1 ld [hl],1
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
call TrainerInfo_DrawTextBox call TrainerInfo_DrawTextBox
ld hl,wWhichTrade ld hl,wWhichTrade
ld a,16 + 1 ld a,16 + 1
@ -588,35 +580,27 @@ DrawTrainerInfo: ; 1349a (4:749a)
dec a dec a
ld [hli],a ld [hli],a
ld [hl],3 ld [hl],3
FuncCoord 1,10 hlCoord 1, 10
ld hl,Coord
call TrainerInfo_DrawTextBox call TrainerInfo_DrawTextBox
FuncCoord 0,10 hlCoord 0, 10
ld hl,Coord
ld a,$d7 ld a,$d7
call TrainerInfo_DrawVerticalLine call TrainerInfo_DrawVerticalLine
FuncCoord 19,10 hlCoord 19, 10
ld hl,Coord
call TrainerInfo_DrawVerticalLine call TrainerInfo_DrawVerticalLine
FuncCoord 6,9 hlCoord 6, 9
ld hl,Coord
ld de,TrainerInfo_BadgesText ld de,TrainerInfo_BadgesText
call PlaceString call PlaceString
FuncCoord 2,2 hlCoord 2, 2
ld hl,Coord
ld de,TrainerInfo_NameMoneyTimeText ld de,TrainerInfo_NameMoneyTimeText
call PlaceString call PlaceString
FuncCoord 7,2 hlCoord 7, 2
ld hl,Coord
ld de,wPlayerName ld de,wPlayerName
call PlaceString call PlaceString
FuncCoord 8,4 hlCoord 8, 4
ld hl,Coord
ld de,wPlayerMoney ld de,wPlayerMoney
ld c,$e3 ld c,$e3
call PrintBCDNumber call PrintBCDNumber
FuncCoord 9,6 hlCoord 9, 6
ld hl,Coord
ld de,W_PLAYTIMEHOURS + 1 ; hours ld de,W_PLAYTIMEHOURS + 1 ; hours
ld bc,$4103 ld bc,$4103
call PrintNumber call PrintNumber

View file

@ -40,8 +40,7 @@ StatusScreen: ; 12953 (4:6953)
push af push af
xor a xor a
ld [$ffd7], a ld [$ffd7], a
FuncCoord 19,1 hlCoord 19, 1
ld hl, Coord
ld bc, $060a ld bc, $060a
call DrawLineBox ; Draws the box around name, HP and status call DrawLineBox ; Draws the box around name, HP and status
ld de, $fffa ld de, $fffa
@ -49,66 +48,54 @@ StatusScreen: ; 12953 (4:6953)
ld [hl], $f2 ; . after No ("." is a different one) ld [hl], $f2 ; . after No ("." is a different one)
dec hl dec hl
ld [hl], "№" ld [hl], "№"
FuncCoord 19,9 hlCoord 19, 9
ld hl, Coord
ld bc, $0806 ld bc, $0806
call DrawLineBox ; Draws the box around types, ID No. and OT call DrawLineBox ; Draws the box around types, ID No. and OT
FuncCoord 10,9 hlCoord 10, 9
ld hl, Coord
ld de, Type1Text ld de, Type1Text
call PlaceString ; "TYPE1/" call PlaceString ; "TYPE1/"
FuncCoord 11,3 hlCoord 11, 3
ld hl, Coord
predef DrawHP ; predef $5f predef DrawHP ; predef $5f
ld hl, wcf25 ld hl, wcf25
call GetHealthBarColor call GetHealthBarColor
ld b, $3 ld b, $3
call GoPAL_SET ; SGB palette call GoPAL_SET ; SGB palette
FuncCoord 16,6 hlCoord 16, 6
ld hl, Coord
ld de, wcf9c ld de, wcf9c
call PrintStatusCondition call PrintStatusCondition
jr nz, .StatusWritten ; 0x129fc $9 jr nz, .StatusWritten ; 0x129fc $9
FuncCoord 16,6 hlCoord 16, 6
ld hl, Coord
ld de, OKText ld de, OKText
call PlaceString ; "OK" call PlaceString ; "OK"
.StatusWritten .StatusWritten
FuncCoord 9,6 hlCoord 9, 6
ld hl, Coord
ld de, StatusText ld de, StatusText
call PlaceString ; "STATUS/" call PlaceString ; "STATUS/"
FuncCoord 14,2 hlCoord 14, 2
ld hl, Coord
call PrintLevel ; Pokémon level call PrintLevel ; Pokémon level
ld a, [W_MONHDEXNUM] ld a, [W_MONHDEXNUM]
ld [wd11e], a ld [wd11e], a
ld [wd0b5], a ld [wd0b5], a
predef IndexToPokedex predef IndexToPokedex
FuncCoord 3,7 hlCoord 3, 7
ld hl, Coord
ld de, wd11e ld de, wd11e
ld bc, $8103 ; Zero-padded, 3 ld bc, $8103 ; Zero-padded, 3
call PrintNumber ; Pokémon no. call PrintNumber ; Pokémon no.
FuncCoord 11,10 hlCoord 11, 10
ld hl, Coord
predef Func_27d6b ; Prints the type (?) predef Func_27d6b ; Prints the type (?)
ld hl, NamePointers2 ; $6a9d ld hl, NamePointers2 ; $6a9d
call .unk_12a7e call .unk_12a7e
ld d, h ld d, h
ld e, l ld e, l
FuncCoord 9,1 hlCoord 9, 1
ld hl, Coord
call PlaceString ; Pokémon name call PlaceString ; Pokémon name
ld hl, OTPointers ; $6a95 ld hl, OTPointers ; $6a95
call .unk_12a7e call .unk_12a7e
ld d, h ld d, h
ld e, l ld e, l
FuncCoord 12,16 hlCoord 12, 16
ld hl, Coord
call PlaceString ; OT call PlaceString ; OT
FuncCoord 12,14 hlCoord 12, 14
ld hl, Coord
ld de, wcfa4 ld de, wcfa4
ld bc, $8205 ; 5 ld bc, $8205 ; 5
call PrintNumber ; ID Number call PrintNumber ; ID Number
@ -116,8 +103,7 @@ StatusScreen: ; 12953 (4:6953)
call PrintStatsBox call PrintStatsBox
call Delay3 call Delay3
call GBPalNormal call GBPalNormal
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
ld a, [wcf91] ld a, [wcf91]
call PlayCry ; play Pokémon cry call PlayCry ; play Pokémon cry
@ -195,23 +181,19 @@ PrintStatsBox: ; 12ae4 (4:6ae4)
ld a, d ld a, d
and a ; a is 0 from the status screen and a ; a is 0 from the status screen
jr nz, .DifferentBox ; 0x12ae6 $12 jr nz, .DifferentBox ; 0x12ae6 $12
FuncCoord 0,8 hlCoord 0, 8
ld hl, Coord
ld b, $8 ld b, $8
ld c, $8 ld c, $8
call TextBoxBorder ; Draws the box call TextBoxBorder ; Draws the box
FuncCoord 1,9 ; Start printing stats from here hlCoord 1, 9 ; Start printing stats from here
ld hl, Coord
ld bc, $0019 ; Number offset ld bc, $0019 ; Number offset
jr .PrintStats ; 0x12af8 $10 jr .PrintStats ; 0x12af8 $10
.DifferentBox .DifferentBox
FuncCoord 9,2 hlCoord 9, 2
ld hl, Coord
ld b, $8 ld b, $8
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
FuncCoord 11, 3 hlCoord 11, 3
ld hl, Coord
ld bc, $0018 ld bc, $0018
.PrintStats .PrintStats
push bc push bc
@ -258,20 +240,16 @@ StatusScreen2: ; 12b57 (4:6b57)
ld bc, $0004 ld bc, $0004
call CopyData call CopyData
callab Func_39b87 callab Func_39b87
FuncCoord 9,2 hlCoord 9, 2
ld hl, Coord
ld bc, $050a ld bc, $050a
call ClearScreenArea ; Clear under name call ClearScreenArea ; Clear under name
FuncCoord 19, 3 hlCoord 19, 3
ld hl, Coord
ld [hl], $78 ld [hl], $78
FuncCoord 0,8 hlCoord 0, 8
ld hl, Coord
ld b, $8 ld b, $8
ld c, $12 ld c, $12
call TextBoxBorder ; Draw move container call TextBoxBorder ; Draw move container
FuncCoord 2,9 hlCoord 2, 9
ld hl, Coord
ld de, wd0e1 ld de, wd0e1
call PlaceString ; Print moves call PlaceString ; Print moves
ld a, [wcd6c] ld a, [wcd6c]
@ -280,8 +258,7 @@ StatusScreen2: ; 12b57 (4:6b57)
ld a, $4 ld a, $4
sub c sub c
ld b, a ; Number of moves ? ld b, a ; Number of moves ?
FuncCoord 11,10 hlCoord 11, 10
ld hl, Coord
ld de, $0028 ld de, $0028
ld a, $72 ld a, $72
call Func_12ccb ; Print "PP" call Func_12ccb ; Print "PP"
@ -293,8 +270,7 @@ StatusScreen2: ; 12b57 (4:6b57)
call Func_12ccb ; Fill the rest with -- call Func_12ccb ; Fill the rest with --
.InitPP ; 12bbb .InitPP ; 12bbb
ld hl, wcfa0 ld hl, wcfa0
FuncCoord 14,10 deCoord 14, 10
ld de, Coord
ld b, $0 ld b, $0
.PrintPP ; 12bc3 .PrintPP ; 12bc3
ld a, [hli] ld a, [hli]
@ -344,8 +320,7 @@ StatusScreen2: ; 12b57 (4:6b57)
cp $4 cp $4
jr nz, .PrintPP ; 0x12c0f $b2 jr nz, .PrintPP ; 0x12c0f $b2
.PPDone .PPDone
FuncCoord 9,3 hlCoord 9, 3
ld hl, Coord
ld de, EXPPointsText ld de, EXPPointsText
call PlaceString call PlaceString
ld a, [wcfb9] ; level ld a, [wcfb9] ; level
@ -355,8 +330,7 @@ StatusScreen2: ; 12b57 (4:6b57)
inc a inc a
ld [wcfb9], a ; Increase temporarily if not 100 ld [wcfb9], a ; Increase temporarily if not 100
.Level100 .Level100
FuncCoord 14,6 hlCoord 14, 6
ld hl, Coord
ld [hl], $70 ; 1-tile "to" ld [hl], $70 ; 1-tile "to"
inc hl inc hl
inc hl inc hl
@ -364,27 +338,22 @@ StatusScreen2: ; 12b57 (4:6b57)
pop af pop af
ld [wcfb9], a ld [wcfb9], a
ld de, wcfa6 ld de, wcfa6
FuncCoord 12,4 hlCoord 12, 4
ld hl, Coord
ld bc, $0307 ld bc, $0307
call PrintNumber ; exp call PrintNumber ; exp
call .asm_12c86 call .asm_12c86
ld de, wcfa6 ld de, wcfa6
FuncCoord 7,6 hlCoord 7, 6
ld hl, Coord
ld bc, $0307 ld bc, $0307
call PrintNumber call PrintNumber
FuncCoord 9,0 hlCoord 9, 0
ld hl, Coord
call Func_12cc3 call Func_12cc3
FuncCoord 9,1 hlCoord 9, 1
ld hl, Coord
call Func_12cc3 call Func_12cc3
ld a, [W_MONHDEXNUM] ld a, [W_MONHDEXNUM]
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
FuncCoord 9,1 hlCoord 9, 1
ld hl, Coord
call PlaceString call PlaceString
ld a, $1 ld a, $1
ld [$ffba], a ld [$ffba], a

View file

@ -17,18 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld [wTopMenuItemX], a ; wTopMenuItemX ld [wTopMenuItemX], a ; wTopMenuItemX
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
FuncCoord 0, 3 hlCoord 0, 3
ld hl, Coord
ld b, $8 ld b, $8
ld c, $c ld c, $c
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 2, 5 hlCoord 2, 5
ld hl, Coord
ld de, DrinkText ld de, DrinkText
call PlaceString call PlaceString
FuncCoord 9, 6 hlCoord 9, 6
ld hl, Coord
ld de, DrinkPriceText ld de, DrinkPriceText
call PlaceString call PlaceString
ld hl, wd730 ld hl, wd730

View file

@ -68,8 +68,7 @@ OakSpeech: ; 6115 (1:6115)
ld [wd0b5],a ; pic displayed is stored at this location ld [wd0b5],a ; pic displayed is stored at this location
ld [wcf91],a ld [wcf91],a
call GetMonHeader ; this is also related to the pic call GetMonHeader ; this is also related to the pic
FuncCoord 6, 4 hlCoord 6, 4 ; position on tilemap the pic is displayed
ld hl,Coord ; position on tilemap the pic is displayed
call LoadFlippedFrontSpriteByMonIndex ; displays pic? call LoadFlippedFrontSpriteByMonIndex ; displays pic?
call MovePicLeft call MovePicLeft
ld hl,OakSpeechText2 ld hl,OakSpeechText2
@ -143,8 +142,7 @@ Func_61bc: ; 61bc (1:61bc)
ld [$2000],a ld [$2000],a
ld c,$14 ld c,$14
call DelayFrames call DelayFrames
FuncCoord 6, 5 hlCoord 6, 5
ld hl,Coord
ld b,7 ld b,7
ld c,7 ld c,7
call ClearScreenArea call ClearScreenArea
@ -225,11 +223,9 @@ IntroPredef3B: ; 62a4 (1:62a4)
pop bc pop bc
ld a,c ld a,c
and a and a
FuncCoord 15, 1 hlCoord 15, 1
ld hl,Coord
jr nz,.next jr nz,.next
FuncCoord 6, 4 hlCoord 6, 4
ld hl,Coord
.next .next
xor a xor a
ld [$FFE1],a ld [$FFE1],a

View file

@ -76,15 +76,13 @@ Func_69ec: ; 69ec (1:69ec)
ld bc, $b ld bc, $b
call CopyData call CopyData
call Delay3 call Delay3
FuncCoord 12, 4 hlCoord 12, 4
ld hl, Coord
ld de, $67d ld de, $67d
ld a, $ff ld a, $ff
jr asm_6a19 jr asm_6a19
Func_6a12: ; 6a12 (1:6a12) Func_6a12: ; 6a12 (1:6a12)
FuncCoord 5, 4 hlCoord 5, 4
ld hl, Coord
ld de, $67d ld de, $67d
xor a xor a
asm_6a19: ; 6a19 (1:6a19) asm_6a19: ; 6a19 (1:6a19)
@ -161,13 +159,11 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
ld b, $a ld b, $a
ld c, $9 ld c, $9
call TextBoxBorder call TextBoxBorder
FuncCoord 3, 0 hlCoord 3, 0
ld hl, Coord
ld de, .namestring ; $6aa3 ld de, .namestring ; $6aa3
call PlaceString call PlaceString
pop de pop de
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
call PlaceString call PlaceString
call UpdateSprites call UpdateSprites
xor a xor a

View file

@ -101,8 +101,7 @@ Func_610c2: ; 610c2 (18:50c2)
push hl push hl
ld [wd11e], a ld [wd11e], a
call GetItemName call GetItemName
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld a, [$ffdb] ld a, [$ffdb]
ld bc, $28 ld bc, $28
call AddNTimes call AddNTimes

View file

@ -10,8 +10,7 @@ HandleDoors: ; 1a609 (6:6609)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
ld b, a ld b, a
.asm_1a621 .asm_1a621
ld a, [hli] ld a, [hli]

View file

@ -8,8 +8,7 @@ HandleLedges: ; 1a672 (6:6672)
predef Func_c586 predef Func_c586
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
ld b, a ld b, a
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
ld c, a ld c, a
ld a, [wcfc6] ld a, [wcfc6]
ld d, a ld d, a

View file

@ -8,8 +8,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31)
ld [wSpriteStateData2], a ld [wSpriteStateData2], a
jr .asm_4e4a jr .asm_4e4a
.asm_4e41 .asm_4e41
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
ld [$ff93], a ld [$ff93], a
cp $60 cp $60
jr c, .asm_4e50 jr c, .asm_4e50

View file

@ -349,8 +349,7 @@ Func_70787: ; 70787 (1c:4787)
jr z, .asm_707a4 jr z, .asm_707a4
cp c cp c
jr nz, .asm_7079e jr nz, .asm_7079e
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
cp [hl] cp [hl]
jr z, .asm_707a2 jr z, .asm_707a2
.asm_7079e .asm_7079e

View file

@ -77,8 +77,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
ld hl,PokemartTellSellPriceText ld hl,PokemartTellSellPriceText
ld bc,$0e01 ld bc,$0e01
call PrintText call PrintText
FuncCoord 14,7 hlCoord 14, 7
ld hl,Coord
ld bc,$080f ld bc,$080f
ld a,$14 ld a,$14
ld [wd125],a ld [wd125],a
@ -149,8 +148,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
call CopyStringToCF4B ; copy name to wcf4b call CopyStringToCF4B ; copy name to wcf4b
ld hl,PokemartTellBuyPriceText ld hl,PokemartTellBuyPriceText
call PrintText call PrintText
FuncCoord 14,7 hlCoord 14, 7
ld hl,Coord
ld bc,$080f ld bc,$080f
ld a,$14 ld a,$14
ld [wd125],a ld [wd125],a

View file

@ -151,12 +151,10 @@ SaveSAV: ;$770a
ret nz ret nz
.save ;$772d .save ;$772d
call SaveSAVtoSRAM ;$7848 call SaveSAVtoSRAM ;$7848
FuncCoord 1,13 hlCoord 1, 13
ld hl,Coord
ld bc,$0412 ld bc,$0412
call ClearScreenArea ; clear area 4x12 starting at 13,1 call ClearScreenArea ; clear area 4x12 starting at 13,1
FuncCoord 1,14 hlCoord 1, 14
ld hl,Coord
ld de,NowSavingString ld de,NowSavingString
call PlaceString call PlaceString
ld c,$78 ld c,$78
@ -174,8 +172,7 @@ NowSavingString:
SaveSAVConfirm: ; 73768 (1c:7768) SaveSAVConfirm: ; 73768 (1c:7768)
call PrintText call PrintText
FuncCoord 0, 7 hlCoord 0, 7
ld hl,Coord
ld bc,$0801 ;arrow's coordinates |b = Y|c = X| ld bc,$0801 ;arrow's coordinates |b = Y|c = X|
ld a,$14 ;one line shifting ($28 = 2 lines) ld a,$14 ;one line shifting ($28 = 2 lines)
ld [wd125],a ld [wd125],a
@ -435,16 +432,14 @@ Func_7393f: ; 7393f (1c:793f)
call TextBoxBorder call TextBoxBorder
ld hl, ChooseABoxText ld hl, ChooseABoxText
call PrintText call PrintText
FuncCoord 11, 0 hlCoord 11, 0
ld hl, Coord
ld b, $c ld b, $c
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
ld hl, $fff6 ld hl, $fff6
set 2, [hl] set 2, [hl]
ld de, BoxNames ; $79d9 ld de, BoxNames ; $79d9
FuncCoord 13, 1 hlCoord 13, 1
ld hl, Coord
call PlaceString call PlaceString
ld hl, $fff6 ld hl, $fff6
res 2, [hl] res 2, [hl]
@ -453,23 +448,19 @@ Func_7393f: ; 7393f (1c:793f)
cp $9 cp $9
jr c, .asm_739a6 jr c, .asm_739a6
sub $9 sub $9
FuncCoord 8, 2 hlCoord 8, 2
ld hl, Coord
ld [hl], $f7 ld [hl], $f7
add $f6 add $f6
jr .asm_739a8 jr .asm_739a8
.asm_739a6 .asm_739a6
add $f7 add $f7
.asm_739a8 .asm_739a8
FuncCoord 9, 2 Coorda 9, 2
ld [Coord], a hlCoord 1, 2
FuncCoord 1, 2
ld hl, Coord
ld de, BoxNoText ld de, BoxNoText
call PlaceString call PlaceString
call Func_73a84 call Func_73a84
FuncCoord 18, 1 hlCoord 18, 1
ld hl, Coord
ld de, wWhichTrade ; wWhichTrade ld de, wWhichTrade ; wWhichTrade
ld bc, $14 ld bc, $14
ld a, $c ld a, $c

View file

@ -68,8 +68,7 @@ ENDC
ld a, BANK(Version_GFX) ld a, BANK(Version_GFX)
call FarCopyDataDouble call FarCopyDataDouble
call Func_4519 call Func_4519
FuncCoord 2, 1 hlCoord 2, 1
ld hl, Coord
ld a, $80 ld a, $80
ld de, $14 ld de, $14
ld c, $6 ld c, $6
@ -85,8 +84,7 @@ ENDC
add hl, de add hl, de
dec c dec c
jr nz, .asm_434d jr nz, .asm_434d
FuncCoord 2, 7 hlCoord 2, 7
ld hl, Coord
ld a, $31 ld a, $31
ld b, $10 ld b, $10
.asm_4361 .asm_4361
@ -98,8 +96,7 @@ ENDC
ld hl, wOAMBuffer + $28 ld hl, wOAMBuffer + $28
ld a, $74 ld a, $74
ld [hl], a ld [hl], a
FuncCoord 2, 17 hlCoord 2, 17
ld hl, Coord
ld de, .titlescreenTilemap ; $437f ld de, .titlescreenTilemap ; $437f
ld b, $10 ld b, $10
.asm_4377 .asm_4377
@ -346,8 +343,7 @@ Func_4519: ; 4519 (1:4519)
Func_4524: ; 4524 (1:4524) Func_4524: ; 4524 (1:4524)
ld [wcf91], a ld [wcf91], a
ld [wd0b5], a ld [wd0b5], a
FuncCoord 5, 10 hlCoord 5, 10
ld hl, Coord
call GetMonHeader call GetMonHeader
jp LoadFrontSpriteByMonIndex jp LoadFrontSpriteByMonIndex
@ -366,8 +362,7 @@ LoadCopyrightTiles: ; 4541 (1:4541)
ld hl, vChars2 + $600 ld hl, vChars2 + $600
ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c
call CopyVideoData call CopyVideoData
FuncCoord 2, 7 hlCoord 2, 7
ld hl, Coord
ld de, CopyrightTextString ; $4556 ld de, CopyrightTextString ; $4556
jp PlaceString jp PlaceString
@ -381,8 +376,7 @@ INCLUDE "data/title_mons.asm"
; prints version text (red, blue) ; prints version text (red, blue)
PrintGameVersionOnTitleScreen: ; 4598 (1:4598) PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
FuncCoord 7, 8 hlCoord 7, 8
ld hl, Coord
ld de, VersionOnTitleScreenText ld de, VersionOnTitleScreenText
jp PlaceString jp PlaceString

View file

@ -11,8 +11,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e)
push af push af
ld b, $0 ld b, $0
call Func_711c4 call Func_711c4
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
ld de, wcd6d ld de, wcd6d
call PlaceString call PlaceString
ld hl, wOAMBuffer ld hl, wOAMBuffer
@ -57,8 +56,7 @@ Func_70e92: ; 70e92 (1c:4e92)
inc de inc de
cp $50 cp $50
jr nz, .asm_70eac jr nz, .asm_70eac
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
ld de, wcd6d ld de, wcd6d
call PlaceString call PlaceString
ld hl, wOAMBuffer + $10 ld hl, wOAMBuffer + $10
@ -120,8 +118,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
push hl push hl
call Func_711ef call Func_711ef
call GetMonName call GetMonName
FuncCoord 1, 0 hlCoord 1, 0
ld hl, Coord
call PlaceString call PlaceString
ld h, b ld h, b
ld l, c ld l, c
@ -163,33 +160,28 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
ld b, $0 ld b, $0
call Func_711c4 call Func_711c4
ld hl, wTrainerEngageDistance ld hl, wTrainerEngageDistance
FuncCoord 18, 0 deCoord 18, 0
ld de, Coord
.townMapFlyLoop .townMapFlyLoop
ld a, $7f ld a, $7f
ld [de], a ld [de], a
push hl push hl
push hl push hl
FuncCoord 3, 0 hlCoord 3, 0
ld hl, Coord
ld bc, $10f ld bc, $10f
call ClearScreenArea call ClearScreenArea
pop hl pop hl
ld a, [hl] ld a, [hl]
ld b, $4 ld b, $4
call Func_711c4 call Func_711c4
FuncCoord 3, 0 hlCoord 3, 0
ld hl, Coord
ld de, wcd6d ld de, wcd6d
call PlaceString call PlaceString
ld c, $f ld c, $f
call DelayFrames call DelayFrames
FuncCoord 18, 0 hlCoord 18, 0
ld hl, Coord
ld [hl], $ed ld [hl], $ed
FuncCoord 19, 0 hlCoord 19, 0
ld hl, Coord
ld [hl], $ee ld [hl], $ee
pop hl pop hl
.asm_71004 .asm_71004
@ -228,8 +220,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
ld [hl], a ld [hl], a
ret ret
.asm_71042 .asm_71042
FuncCoord 18, 0 deCoord 18, 0
ld de, Coord
inc hl inc hl
ld a, [hl] ld a, [hl]
cp $ff cp $ff
@ -241,8 +232,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
ld hl, wTrainerEngageDistance ld hl, wTrainerEngageDistance
jp .townMapFlyLoop jp .townMapFlyLoop
.asm_71058 .asm_71058
FuncCoord 19, 0 deCoord 19, 0
ld de, Coord
dec hl dec hl
ld a, [hl] ld a, [hl]
cp $ff cp $ff
@ -402,13 +392,11 @@ Func_711ef: ; 711ef (1c:51ef)
ld a, l ld a, l
and a and a
jr nz, .asm_71236 jr nz, .asm_71236
FuncCoord 1, 7 hlCoord 1, 7
ld hl, Coord
ld b, $2 ld b, $2
ld c, $f ld c, $f
call TextBoxBorder call TextBoxBorder
FuncCoord 2, 9 hlCoord 2, 9
ld hl, Coord
ld de, AreaUnknownText ld de, AreaUnknownText
call PlaceString call PlaceString
jr .asm_7123e jr .asm_7123e

View file

@ -181,8 +181,7 @@ Func_41245: ; 41245 (10:5245)
ld [$ffae], a ld [$ffae], a
xor a xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
FuncCoord 4, 0 hlCoord 4, 0
ld hl, Coord
ld b, $6 ld b, $6
ld c, $a ld c, $a
call TextBoxBorder call TextBoxBorder
@ -227,8 +226,7 @@ Func_41298: ; 41298 (10:5298)
call DelayFrame call DelayFrame
ld a, $8b ld a, $8b
ld [rLCDC], a ; $ff40 ld [rLCDC], a ; $ff40
FuncCoord 6, 2 hlCoord 6, 2
ld hl, Coord
ld b, $7 ld b, $7
call Func_41842 call Func_41842
call Func_41186 call Func_41186
@ -300,8 +298,7 @@ Func_41336: ; 41336 (10:5336)
ld a, $ac ld a, $ac
call Func_41676 call Func_41676
call Func_415c8 call Func_415c8
FuncCoord 4, 10 hlCoord 4, 10
ld hl, Coord
ld b, $6 ld b, $6
ld c, $a ld c, $a
call TextBoxBorder call TextBoxBorder
@ -318,8 +315,7 @@ Func_41336: ; 41336 (10:5336)
ld a, [wTrainerEngageDistance] ld a, [wTrainerEngageDistance]
call PlayCry call PlayCry
call Func_41181 call Func_41181
FuncCoord 4, 10 hlCoord 4, 10
ld hl, Coord
ld bc, $80c ld bc, $80c
call ClearScreenArea call ClearScreenArea
jp PrintTradeTakeCareText jp PrintTradeTakeCareText
@ -406,8 +402,7 @@ Func_41411: ; 41411 (10:5411)
Func_4142d: ; 4142d (10:542d) Func_4142d: ; 4142d (10:542d)
call Func_41196 call Func_41196
FuncCoord 11, 4 hlCoord 11, 4
ld hl, Coord
ld a, $5d ld a, $5d
ld [hli], a ld [hli], a
ld a, $5e ld a, $5e
@ -416,25 +411,21 @@ Func_4142d: ; 4142d (10:542d)
ld [hli], a ld [hli], a
dec c dec c
jr nz, .asm_4143a jr nz, .asm_4143a
FuncCoord 5, 3 hlCoord 5, 3
ld hl, Coord
ld b, $6 ld b, $6
call Func_41842 call Func_41842
FuncCoord 4, 12 hlCoord 4, 12
ld hl, Coord
ld b, $2 ld b, $2
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
FuncCoord 5, 14 hlCoord 5, 14
ld hl, Coord
ld de, wPlayerName ; wd158 ld de, wPlayerName ; wd158
call PlaceString call PlaceString
jp DelayFrame jp DelayFrame
Func_4145c: ; 4145c (10:545c) Func_4145c: ; 4145c (10:545c)
call Func_41196 call Func_41196
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld a, $5e ld a, $5e
ld c, $e ld c, $e
.asm_41466 .asm_41466
@ -458,25 +449,21 @@ Func_4145c: ; 4145c (10:545c)
ld [hld], a ld [hld], a
ld a, $5d ld a, $5d
ld [hl], a ld [hl], a
FuncCoord 7, 8 hlCoord 7, 8
ld hl, Coord
ld b, $6 ld b, $6
call Func_41842 call Func_41842
FuncCoord 6, 0 hlCoord 6, 0
ld hl, Coord
ld b, $2 ld b, $2
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
FuncCoord 7, 2 hlCoord 7, 2
ld hl, Coord
ld de, W_GRASSRATE ; W_GRASSRATE ld de, W_GRASSRATE ; W_GRASSRATE
call PlaceString call PlaceString
jp DelayFrame jp DelayFrame
Func_4149f: ; 4149f (10:549f) Func_4149f: ; 4149f (10:549f)
call Func_41196 call Func_41196
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
ld a, $5e ld a, $5e
ld c, $14 ld c, $14
.asm_414a9 .asm_414a9
@ -487,8 +474,7 @@ Func_4149f: ; 4149f (10:549f)
Func_414ae: ; 414ae (10:54ae) Func_414ae: ; 414ae (10:54ae)
push hl push hl
FuncCoord 0, 4 hlCoord 0, 4
ld hl, Coord
call ScheduleRowRedrawHelper call ScheduleRowRedrawHelper
pop hl pop hl
ld a, h ld a, h
@ -655,8 +641,7 @@ Func_415a4: ; 415a4 (10:55a4)
xor $1 xor $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call GetMonHeader call GetMonHeader
FuncCoord 7, 2 hlCoord 7, 2
ld hl, Coord
call LoadFlippedFrontSpriteByMonIndex call LoadFlippedFrontSpriteByMonIndex
ld c, $a ld c, $a
jp DelayFrames jp DelayFrames

View file

@ -1,53 +1,43 @@
Func_42769: ; 42769 (10:6769) Func_42769: ; 42769 (10:6769)
FuncCoord 5,0 hlCoord 5, 0
ld hl,Coord
ld de,OTString67E5 ld de,OTString67E5
call PlaceString call PlaceString
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld [wd11e],a ld [wd11e],a
predef IndexToPokedex predef IndexToPokedex
FuncCoord 9, 0 hlCoord 9, 0
ld hl,Coord
ld de,wd11e ld de,wd11e
ld bc,$8103 ld bc,$8103
call PrintNumber call PrintNumber
FuncCoord 5,2 hlCoord 5, 2
ld hl,Coord
ld de,wcf4b ld de,wcf4b
call PlaceString call PlaceString
FuncCoord 8,4 hlCoord 8, 4
ld hl,Coord
ld de,wTrainerScreenX ld de,wTrainerScreenX
call PlaceString call PlaceString
FuncCoord 8, 6 hlCoord 8, 6
ld hl,Coord
ld de,wcd4c ld de,wcd4c
ld bc,$8205 ld bc,$8205
jp PrintNumber jp PrintNumber
Func_427a7: ; 427a7 (10:67a7) Func_427a7: ; 427a7 (10:67a7)
FuncCoord 5,10 hlCoord 5, 10
ld hl,Coord
ld de,OTString67E5 ld de,OTString67E5
call PlaceString call PlaceString
ld a,[wTrainerEngageDistance] ld a,[wTrainerEngageDistance]
ld [wd11e],a ld [wd11e],a
predef IndexToPokedex predef IndexToPokedex
FuncCoord 9, 10 hlCoord 9, 10
ld hl,Coord
ld de,wd11e ld de,wd11e
ld bc,$8103 ld bc,$8103
call PrintNumber call PrintNumber
FuncCoord 5,12 hlCoord 5, 12
ld hl,Coord
ld de,wcd6d ld de,wcd6d
call PlaceString call PlaceString
FuncCoord 8,14 hlCoord 8, 14
ld hl,Coord
ld de,wcd4e ld de,wcd4e
call PlaceString call PlaceString
FuncCoord 8, 16 hlCoord 8, 16
ld hl,Coord
ld de,wcd59 ld de,wcd59
ld bc,$8205 ld bc,$8205
jp PrintNumber jp PrintNumber

View file

@ -1937,8 +1937,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6)
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 ; move sprites
FuncCoord 4,2 ; coordinates of upper left corner of menu text box hlCoord 4, 2 ; coordinates of upper left corner of menu text box
ld hl,Coord
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]
and a ; is it a PC pokemon list? and a ; is it a PC pokemon list?
@ -1974,13 +1973,12 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
jr z,.notOldManBattle jr z,.notOldManBattle
.oldManBattle .oldManBattle
ld a,"▶" ld a,"▶"
FuncCoord 5,4 Coorda 5, 4 ; place menu cursor in front of first menu entry
ld [Coord],a ; place menu cursor in front of first menu entry
ld c,80 ld c,80
call DelayFrames call DelayFrames
xor a xor a
ld [wCurrentMenuItem],a ld [wCurrentMenuItem],a
ld hl,Coord hlCoord 5, 4
ld a,l ld a,l
ld [wMenuCursorLocation],a ld [wMenuCursorLocation],a
ld a,h ld a,h
@ -2099,27 +2097,23 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
; text box dimensions/coordinates for just quantity ; text box dimensions/coordinates for just quantity
FuncCoord 15,9 hlCoord 15, 9
ld hl,Coord
ld b,1 ; height ld b,1 ; height
ld c,3 ; width ld c,3 ; width
ld a,[wListMenuID] ld a,[wListMenuID]
cp a,PRICEDITEMLISTMENU cp a,PRICEDITEMLISTMENU
jr nz,.drawTextBox jr nz,.drawTextBox
; text box dimensions/coordinates for quantity and price ; text box dimensions/coordinates for quantity and price
FuncCoord 7,9 hlCoord 7, 9
ld hl,Coord
ld b,1 ; height ld b,1 ; height
ld c,11 ; width ld c,11 ; width
.drawTextBox .drawTextBox
call TextBoxBorder call TextBoxBorder
FuncCoord 16,10 hlCoord 16, 10
ld hl,Coord
ld a,[wListMenuID] ld a,[wListMenuID]
cp a,PRICEDITEMLISTMENU cp a,PRICEDITEMLISTMENU
jr nz,.printInitialQuantity jr nz,.printInitialQuantity
FuncCoord 8,10 hlCoord 8, 10
ld hl,Coord
.printInitialQuantity .printInitialQuantity
ld de,InitialQuantityText ld de,InitialQuantityText
call PlaceString call PlaceString
@ -2159,8 +2153,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
ld a,[wcf97] ; max quantity ld a,[wcf97] ; max quantity
ld [hl],a ld [hl],a
.handleNewQuantity .handleNewQuantity
FuncCoord 17,10 hlCoord 17, 10
ld hl,Coord
ld a,[wListMenuID] ld a,[wListMenuID]
cp a,PRICEDITEMLISTMENU cp a,PRICEDITEMLISTMENU
jr nz,.printQuantity jr nz,.printQuantity
@ -2199,15 +2192,13 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
ld a,[$ffa4] ld a,[$ffa4]
ld [$ffa1],a ld [$ffa1],a
.skipHalvingPrice .skipHalvingPrice
FuncCoord 12,10 hlCoord 12, 10
ld hl,Coord
ld de,SpacesBetweenQuantityAndPriceText ld de,SpacesBetweenQuantityAndPriceText
call PlaceString call PlaceString
ld de,$ff9f ; total price ld de,$ff9f ; total price
ld c,$a3 ld c,$a3
call PrintBCDNumber call PrintBCDNumber
FuncCoord 9,10 hlCoord 9, 10
ld hl,Coord
.printQuantity .printQuantity
ld de,wcf96 ; current quantity ld de,wcf96 ; current quantity
ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits
@ -2246,8 +2237,7 @@ ExitListMenu:: ; 2e3b (0:2e3b)
ret ret
PrintListMenuEntries:: ; 2e5a (0:2e5a) PrintListMenuEntries:: ; 2e5a (0:2e5a)
FuncCoord 5, 3 hlCoord 5, 3
ld hl,Coord
ld b,$09 ld b,$09
ld c,$0e ld c,$0e
call ClearScreenArea call ClearScreenArea
@ -2272,8 +2262,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a)
jr nc,.noCarry jr nc,.noCarry
inc d inc d
.noCarry .noCarry
FuncCoord 6,4 ; coordinates of first list entry name hlCoord 6, 4 ; coordinates of first list entry name
ld hl,Coord
ld b,4 ; print 4 names ld b,4 ; print 4 names
.loop .loop
ld a,b ld a,b
@ -3539,8 +3528,7 @@ Func_35f4:: ; 35f4 (0:35f4)
InitYesNoTextBoxParameters:: ; 35ff (0:35ff) InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
xor a xor a
ld [wd12c], a ld [wd12c], a
FuncCoord 14, 7 hlCoord 14, 7
ld hl, Coord
ld bc, $80f ld bc, $80f
ret ret
@ -3548,8 +3536,7 @@ YesNoChoicePokeCenter:: ; 360a (0:360a)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
ld a, $6 ld a, $6
ld [wd12c], a ld [wd12c], a
FuncCoord 11, 6 hlCoord 11, 6
ld hl, Coord
ld bc, $80c ld bc, $80c
jr DisplayYesNoChoice jr DisplayYesNoChoice
@ -3557,8 +3544,7 @@ Func_361a:: ; 361a (0:361a)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
ld a, $3 ld a, $3
ld [wd12c], a ld [wd12c], a
FuncCoord 12, 7 hlCoord 12, 7
ld hl, Coord
ld bc, $080d ld bc, $080d
DisplayYesNoChoice:: ; 3628 (0:3628) DisplayYesNoChoice:: ; 3628 (0:3628)
ld a, $14 ld a, $14
@ -3995,8 +3981,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865)
jr z, .asm_387c jr z, .asm_387c
call Func_716c6 call Func_716c6
.asm_387c .asm_387c
FuncCoord 18, 16 hlCoord 18, 16
ld hl, Coord
call HandleDownArrowBlinkTiming call HandleDownArrowBlinkTiming
pop hl pop hl
call JoypadLowSensitivity call JoypadLowSensitivity
@ -4472,8 +4457,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2)
and a ; was a key pressed? and a ; was a key pressed?
jr nz,.keyPressed jr nz,.keyPressed
push hl push hl
FuncCoord 18,11 ; coordinates of blinking down arrow in some menus hlCoord 18, 11 ; coordinates of blinking down arrow in some menus
ld hl,Coord
call HandleDownArrowBlinkTiming ; blink down arrow (if any) call HandleDownArrowBlinkTiming ; blink down arrow (if any)
pop hl pop hl
ld a,[wMenuJoypadPollCount] ld a,[wMenuJoypadPollCount]
@ -4734,8 +4718,7 @@ PrintText:: ; 3c49 (0:3c49)
call Delay3 call Delay3
pop hl pop hl
Func_3c59:: ; 3c59 (0:3c59) Func_3c59:: ; 3c59 (0:3c59)
FuncCoord 1,14 bcCoord 1, 14
ld bc,Coord
jp TextCommandProcessor jp TextCommandProcessor
; converts a big-endian binary number into decimal and prints it ; converts a big-endian binary number into decimal and prints it

View file

@ -105,8 +105,7 @@ OverworldLoopLessDelay::
jr nz,.checkForOpponent jr nz,.checkForOpponent
bit 0,a bit 0,a
jr nz,.checkForOpponent jr nz,.checkForOpponent
FuncCoord 8, 9 aCoord 8, 9
ld a,[Coord]
ld [wcf0e],a ld [wcf0e],a
call DisplayTextID ; display either the start menu or the NPC/sign text call DisplayTextID ; display either the start menu or the NPC/sign text
ld a,[wcc47] ld a,[wcc47]
@ -670,8 +669,7 @@ CheckMapConnections:: ; 07ba (0:07ba)
; function to play a sound when changing maps ; function to play a sound when changing maps
PlayMapChangeSound:: ; 08c9 (0:08c9) PlayMapChangeSound:: ; 08c9 (0:08c9)
FuncCoord 8, 8 aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
ld a,[Coord] ; upper left tile of the 4x4 square the player's sprite is standing on
cp a,$0b ; door tile in tileset 0 cp a,$0b ; door tile in tileset 0
jr nz,.didNotGoThroughDoor jr nz,.didNotGoThroughDoor
ld a,(SFX_02_57 - SFX_Headers_02) / 3 ld a,(SFX_02_57 - SFX_Headers_02) / 3
@ -1279,8 +1277,7 @@ CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a)
; if not jumping ; if not jumping
Func_c44:: ; 0c44 (0:0c44) Func_c44:: ; 0c44 (0:0c44)
FuncCoord 8, 9 aCoord 8, 9 ; tile the player is on
ld a,[Coord] ; tile the player is on
ld [wcf0e],a ld [wcf0e],a
CheckForTilePairCollisions:: ; 0c4a (0:0c4a) CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
@ -1694,8 +1691,7 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85)
; the portion of the map that was newly exposed due to the player's movement ; the portion of the map that was newly exposed due to the player's movement
ScheduleNorthRowRedraw:: ; 0e91 (0:0e91) ScheduleNorthRowRedraw:: ; 0e91 (0:0e91)
FuncCoord 0, 0 hlCoord 0, 0
ld hl,Coord
call ScheduleRowRedrawHelper call ScheduleRowRedrawHelper
ld a,[wd526] ld a,[wd526]
ld [H_SCREENEDGEREDRAWADDR],a ld [H_SCREENEDGEREDRAWADDR],a
@ -1717,8 +1713,7 @@ ScheduleRowRedrawHelper:: ; 0ea6 (0:0ea6)
ret ret
ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
FuncCoord 0,16 hlCoord 0, 16
ld hl,Coord
call ScheduleRowRedrawHelper call ScheduleRowRedrawHelper
ld a,[wd526] ld a,[wd526]
ld l,a ld l,a
@ -1737,8 +1732,7 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
ret ret
ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3) ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3)
FuncCoord 18,0 hlCoord 18, 0
ld hl,Coord
call ScheduleColumnRedrawHelper call ScheduleColumnRedrawHelper
ld a,[wd526] ld a,[wd526]
ld c,a ld c,a
@ -1776,8 +1770,7 @@ ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2)
ret ret
ScheduleWestColumnRedraw:: ; 0f08 (0:0f08) ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
call ScheduleColumnRedrawHelper call ScheduleColumnRedrawHelper
ld a,[wd526] ld a,[wd526]
ld [H_SCREENEDGEREDRAWADDR],a ld [H_SCREENEDGEREDRAWADDR],a

View file

@ -76,8 +76,7 @@ PlaceNextChar:: ; 1956 (0:1956)
cp $4F cp $4F
jr nz,.next3 jr nz,.next3
pop hl pop hl
FuncCoord 1, 16 hlCoord 1, 16
ld hl,Coord
push hl push hl
jp Next19E8 jp Next19E8
@ -270,14 +269,12 @@ Char58:: ; 1a95 (0:1a95)
cp 4 cp 4
jp z,Next1AA2 jp z,Next1AA2
ld a,$EE ld a,$EE
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
Next1AA2:: ; 1aa2 (0:1aa2) Next1AA2:: ; 1aa2 (0:1aa2)
call ProtectedDelay3 call ProtectedDelay3
call ManualTextScroll call ManualTextScroll
ld a,$7F ld a,$7F
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
Char57:: ; 1aad (0:1aad) Char57:: ; 1aad (0:1aad)
pop hl pop hl
ld de,Char58Text ld de,Char58Text
@ -290,67 +287,56 @@ Char58Text:: ; 1ab3 (0:1ab3)
Char51:: ; 1ab4 (0:1ab4) Char51:: ; 1ab4 (0:1ab4)
push de push de
ld a,$EE ld a,$EE
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
call ProtectedDelay3 call ProtectedDelay3
call ManualTextScroll call ManualTextScroll
FuncCoord 1, 13 hlCoord 1, 13
ld hl,Coord
ld bc,$0412 ld bc,$0412
call ClearScreenArea call ClearScreenArea
ld c,$14 ld c,$14
call DelayFrames call DelayFrames
pop de pop de
FuncCoord 1, 14 hlCoord 1, 14
ld hl,Coord
jp Next19E8 jp Next19E8
Char49:: ; 1ad5 (0:1ad5) Char49:: ; 1ad5 (0:1ad5)
push de push de
ld a,$EE ld a,$EE
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
call ProtectedDelay3 call ProtectedDelay3
call ManualTextScroll call ManualTextScroll
FuncCoord 1, 10 hlCoord 1, 10
ld hl,Coord
ld bc,$0712 ld bc,$0712
call ClearScreenArea call ClearScreenArea
ld c,$14 ld c,$14
call DelayFrames call DelayFrames
pop de pop de
pop hl pop hl
FuncCoord 1, 11 hlCoord 1, 11
ld hl,Coord
push hl push hl
jp Next19E8 jp Next19E8
Char4B:: ; 1af8 (0:1af8) Char4B:: ; 1af8 (0:1af8)
ld a,$EE ld a,$EE
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
call ProtectedDelay3 call ProtectedDelay3
push de push de
call ManualTextScroll call ManualTextScroll
pop de pop de
ld a,$7F ld a,$7F
FuncCoord 18, 16 Coorda 18, 16
ld [Coord],a
;fall through ;fall through
Char4C:: ; 1b0a (0:1b0a) Char4C:: ; 1b0a (0:1b0a)
push de push de
call Next1B18 call Next1B18
call Next1B18 call Next1B18
FuncCoord 1, 16 hlCoord 1, 16
ld hl,Coord
pop de pop de
jp Next19E8 jp Next19E8
Next1B18:: ; 1b18 (0:1b18) Next1B18:: ; 1b18 (0:1b18)
FuncCoord 0, 14 hlCoord 0, 14
ld hl,Coord deCoord 0, 13
FuncCoord 0, 13
ld de,Coord
ld b,$3C ld b,$3C
.next .next
ld a,[hli] ld a,[hli]
@ -358,8 +344,7 @@ Next1B18:: ; 1b18 (0:1b18)
inc de inc de
dec b dec b
jr nz,.next jr nz,.next
FuncCoord 1, 16 hlCoord 1, 16
ld hl,Coord
ld a,$7F ld a,$7F
ld b,$12 ld b,$12
.next2 .next2
@ -514,8 +499,7 @@ TextCommand03:: ; 1bb7 (0:1bb7)
; (no arguments) ; (no arguments)
TextCommand05:: ; 1bc5 (0:1bc5) TextCommand05:: ; 1bc5 (0:1bc5)
pop hl pop hl
FuncCoord 1, 16 bcCoord 1, 16 ; address of second line of dialogue text box
ld bc,Coord ; address of second line of dialogue text box
jp NextTextCommand jp NextTextCommand
; blink arrow and wait for A or B to be pressed ; blink arrow and wait for A or B to be pressed
@ -526,14 +510,12 @@ TextCommand06:: ; 1bcc (0:1bcc)
cp a,$04 cp a,$04
jp z,TextCommand0D jp z,TextCommand0D
ld a,$ee ; down arrow ld a,$ee ; down arrow
FuncCoord 18, 16 Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box
ld [Coord],a ; place down arrow in lower right corner of dialogue text box
push bc push bc
call ManualTextScroll ; blink arrow and wait for A or B to be pressed call ManualTextScroll ; blink arrow and wait for A or B to be pressed
pop bc pop bc
ld a," " ld a," "
FuncCoord 18, 16 Coorda 18, 16 ; overwrite down arrow with blank space
ld [Coord],a ; overwrite down arrow with blank space
pop hl pop hl
jp NextTextCommand jp NextTextCommand
@ -542,13 +524,11 @@ TextCommand06:: ; 1bcc (0:1bcc)
; (no arguments) ; (no arguments)
TextCommand07:: ; 1be7 (0:1be7) TextCommand07:: ; 1be7 (0:1be7)
ld a," " ld a," "
FuncCoord 18, 16 Coorda 18, 16 ; place blank space in lower right corner of dialogue text box
ld [Coord],a ; place blank space in lower right corner of dialogue text box
call Next1B18 ; scroll up text call Next1B18 ; scroll up text
call Next1B18 call Next1B18
pop hl pop hl
FuncCoord 1, 16 bcCoord 1, 16 ; address of second line of dialogue text box
ld bc,Coord ; address of second line of dialogue text box
jp NextTextCommand jp NextTextCommand
; execute asm inline ; execute asm inline

View file

@ -130,8 +130,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
dec a dec a
jr z,.transferMiddleThird jr z,.transferMiddleThird
.transferBottomThird .transferBottomThird
FuncCoord 0,12 hlCoord 0, 12
ld hl,Coord
ld sp,hl ld sp,hl
ld a,[H_AUTOBGTRANSFERDEST + 1] ld a,[H_AUTOBGTRANSFERDEST + 1]
ld h,a ld h,a
@ -142,8 +141,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
xor a ; TRANSFERTOP xor a ; TRANSFERTOP
jr .doTransfer jr .doTransfer
.transferTopThird .transferTopThird
FuncCoord 0,0 hlCoord 0, 0
ld hl,Coord
ld sp,hl ld sp,hl
ld a,[H_AUTOBGTRANSFERDEST + 1] ld a,[H_AUTOBGTRANSFERDEST + 1]
ld h,a ld h,a
@ -152,8 +150,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
ld a,TRANSFERMIDDLE ld a,TRANSFERMIDDLE
jr .doTransfer jr .doTransfer
.transferMiddleThird .transferMiddleThird
FuncCoord 0,6 hlCoord 0, 6
ld hl,Coord
ld sp,hl ld sp,hl
ld a,[H_AUTOBGTRANSFERDEST + 1] ld a,[H_AUTOBGTRANSFERDEST + 1]
ld h,a ld h,a

View file

@ -37,8 +37,38 @@ callab: MACRO
;\1 = X ;\1 = X
;\2 = Y ;\2 = Y
FuncCoord: MACRO hlCoord: MACRO
Coord = $C3A0 + 20 * \2 + \1 ld hl, wTileMap + 20 * \2 + \1
ENDM
;\1 = X
;\2 = Y
deCoord: MACRO
ld de, wTileMap + 20 * \2 + \1
ENDM
;\1 = X
;\2 = Y
bcCoord: MACRO
ld bc, wTileMap + 20 * \2 + \1
ENDM
;\1 = X
;\2 = Y
aCoord: MACRO
ld a, [wTileMap + 20 * \2 + \1]
ENDM
;\1 = X
;\2 = Y
Coorda: MACRO
ld [wTileMap + 20 * \2 + \1], a
ENDM
;\1 = X
;\2 = Y
dwCoord: MACRO
dw wTileMap + 20 * \2 + \1
ENDM ENDM
;\1 = Map Width ;\1 = Map Width

View file

@ -158,8 +158,7 @@ INCLUDE "engine/overworld/oam.asm"
INCLUDE "engine/oam_dma.asm" INCLUDE "engine/oam_dma.asm"
PrintWaitingText: PrintWaitingText:
FuncCoord 3, 10 hlCoord 3, 10
ld hl, Coord
ld b, $1 ld b, $1
ld c, $b ld c, $b
ld a, [W_ISINBATTLE] ld a, [W_ISINBATTLE]
@ -170,8 +169,7 @@ PrintWaitingText:
.asm_4c17 .asm_4c17
call Func_5ab3 call Func_5ab3
.asm_4c1a .asm_4c1a
FuncCoord 4, 11 hlCoord 4, 11
ld hl, Coord
ld de, WaitingText ld de, WaitingText
call PlaceString call PlaceString
ld c, 50 ld c, 50
@ -920,21 +918,18 @@ DisplayTextIDInit: ; 7096 (1:7096)
ld a,[wd74b] ld a,[wd74b]
bit 5,a ; does the player have the pokedex? bit 5,a ; does the player have the pokedex?
; start menu with pokedex ; start menu with pokedex
FuncCoord 10, 0 hlCoord 10, 0
ld hl,Coord
ld b,$0e ld b,$0e
ld c,$08 ld c,$08
jr nz,.drawTextBoxBorder jr nz,.drawTextBoxBorder
; start menu without pokedex ; start menu without pokedex
FuncCoord 10, 0 hlCoord 10, 0
ld hl,Coord
ld b,$0c ld b,$0c
ld c,$08 ld c,$08
jr .drawTextBoxBorder jr .drawTextBoxBorder
; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box ; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box
.notStartMenu .notStartMenu
FuncCoord 0, 12 hlCoord 0, 12
ld hl,Coord
ld b,$04 ld b,$04
ld c,$12 ld c,$12
.drawTextBoxBorder .drawTextBoxBorder
@ -992,14 +987,12 @@ DrawStartMenu: ; 710b (1:710b)
ld a,[wd74b] ld a,[wd74b]
bit 5,a ; does the player have the pokedex? bit 5,a ; does the player have the pokedex?
; menu with pokedex ; menu with pokedex
FuncCoord 10, 0 hlCoord 10, 0
ld hl,Coord
ld b,$0e ld b,$0e
ld c,$08 ld c,$08
jr nz,.drawTextBoxBorder jr nz,.drawTextBoxBorder
; shorter menu if the player doesn't have the pokedex ; shorter menu if the player doesn't have the pokedex
FuncCoord 10, 0 hlCoord 10, 0
ld hl,Coord
ld b,$0c ld b,$0c
ld c,$08 ld c,$08
.drawTextBoxBorder .drawTextBoxBorder
@ -1017,8 +1010,7 @@ DrawStartMenu: ; 710b (1:710b)
ld [wcc37],a ld [wcc37],a
ld hl,wd730 ld hl,wd730
set 6,[hl] ; no pauses between printing each letter set 6,[hl] ; no pauses between printing each letter
FuncCoord 12, 2 hlCoord 12, 2
ld hl,Coord
ld a,[wd74b] ld a,[wd74b]
bit 5,a ; does the player have the pokedex? bit 5,a ; does the player have the pokedex?
; case for not having pokdex ; case for not having pokdex
@ -1360,13 +1352,11 @@ Func_74ba: ; 74ba (1:74ba)
ld a, $f ld a, $f
ld [wd125], a ld [wd125], a
call DisplayTextBoxID call DisplayTextBoxID
FuncCoord 13, 1 hlCoord 13, 1
ld hl, Coord
ld b, $1 ld b, $1
ld c, $6 ld c, $6
call ClearScreenArea call ClearScreenArea
FuncCoord 12, 1 hlCoord 12, 1
ld hl, Coord
ld de, wPlayerMoney ; wPlayerMoney ld de, wPlayerMoney ; wPlayerMoney
ld c, $a3 ld c, $a3
call PrintBCDNumber call PrintBCDNumber
@ -1637,22 +1627,19 @@ Func_76e1: ; 76e1 (1:36e1)
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
and a and a
jr nz, .asm_770f jr nz, .asm_770f
FuncCoord 11, 11 hlCoord 11, 11
ld hl, Coord
ld b, $5 ld b, $5
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
ld a, $c ld a, $c
ld [$fff7], a ld [$fff7], a
FuncCoord 13, 12 hlCoord 13, 12
ld hl, Coord
ld de, PokemonMenuEntries ; $77c2 ld de, PokemonMenuEntries ; $77c2
jp PlaceString jp PlaceString
.asm_770f .asm_770f
push af push af
FuncCoord 0, 11 hlCoord 0, 11
ld hl, Coord
ld a, [wcd42] ld a, [wcd42]
dec a dec a
ld e, a ld e, a
@ -1675,8 +1662,7 @@ Func_76e1: ; 76e1 (1:36e1)
inc b inc b
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 0, 12 hlCoord 0, 12
ld hl, Coord
ld a, [wcd42] ld a, [wcd42]
inc a inc a
ld e, a ld e, a
@ -1723,8 +1709,7 @@ Func_76e1: ; 76e1 (1:36e1)
pop hl pop hl
ld a, [wcd42] ld a, [wcd42]
ld [$fff7], a ld [$fff7], a
FuncCoord 0, 12 hlCoord 0, 12
ld hl, Coord
ld a, [wcd42] ld a, [wcd42]
inc a inc a
ld e, a ld e, a
@ -2191,8 +2176,7 @@ Func_c49d: ; c49d (3:449d)
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, $1 ld de, $1
FuncCoord 8, 9 aCoord 8, 9
ld a, [Coord]
call IsInArray call IsInArray
jr nc, .asm_c4c8 jr nc, .asm_c4c8
ld hl, wd736 ld hl, wd736
@ -2215,29 +2199,24 @@ PrintSafariZoneSteps: ; c52f (3:452f)
ld b, $3 ld b, $3
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
FuncCoord 1, 1 hlCoord 1, 1
ld hl, Coord
ld de, wSafariSteps ; wd70d ld de, wSafariSteps ; wd70d
ld bc, $203 ld bc, $203
call PrintNumber call PrintNumber
FuncCoord 4, 1 hlCoord 4, 1
ld hl, Coord
ld de, SafariSteps ; $4579 ld de, SafariSteps ; $4579
call PlaceString call PlaceString
FuncCoord 1, 3 hlCoord 1, 3
ld hl, Coord
ld de, SafariBallText ld de, SafariBallText
call PlaceString call PlaceString
ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
cp $a cp $a
jr nc, .asm_c56d jr nc, .asm_c56d
FuncCoord 5, 3 hlCoord 5, 3
ld hl, Coord
ld a, $7f ld a, $7f
ld [hl], a ld [hl], a
.asm_c56d .asm_c56d
FuncCoord 6, 3 hlCoord 6, 3
ld hl, Coord
ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102 ld bc, $102
jp PrintNumber jp PrintNumber
@ -2259,29 +2238,25 @@ Func_c589: ; c589 (3:4589)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
and a and a
jr nz, .asm_c59d jr nz, .asm_c59d
FuncCoord 8, 11 aCoord 8, 11
ld a, [Coord]
inc d inc d
jr .asm_c5b9 jr .asm_c5b9
.asm_c59d .asm_c59d
cp $4 cp $4
jr nz, .asm_c5a7 jr nz, .asm_c5a7
FuncCoord 8, 7 aCoord 8, 7
ld a, [Coord]
dec d dec d
jr .asm_c5b9 jr .asm_c5b9
.asm_c5a7 .asm_c5a7
cp $8 cp $8
jr nz, .asm_c5b1 jr nz, .asm_c5b1
FuncCoord 6, 9 aCoord 6, 9
ld a, [Coord]
dec e dec e
jr .asm_c5b9 jr .asm_c5b9
.asm_c5b1 .asm_c5b1
cp $c cp $c
jr nz, .asm_c5b9 jr nz, .asm_c5b9
FuncCoord 10, 9 aCoord 10, 9
ld a, [Coord]
inc e inc e
.asm_c5b9 .asm_c5b9
ld c, a ld c, a
@ -2300,8 +2275,7 @@ Func_c5be: ; c5be (3:45be)
jr nz, .asm_c5d8 jr nz, .asm_c5d8
ld hl, $ffdb ld hl, $ffdb
set 0, [hl] set 0, [hl]
FuncCoord 8, 13 aCoord 8, 13
ld a, [Coord]
inc d inc d
jr .asm_c603 jr .asm_c603
.asm_c5d8 .asm_c5d8
@ -2309,8 +2283,7 @@ Func_c5be: ; c5be (3:45be)
jr nz, .asm_c5e7 jr nz, .asm_c5e7
ld hl, $ffdb ld hl, $ffdb
set 1, [hl] set 1, [hl]
FuncCoord 8, 5 aCoord 8, 5
ld a, [Coord]
dec d dec d
jr .asm_c603 jr .asm_c603
.asm_c5e7 .asm_c5e7
@ -2318,8 +2291,7 @@ Func_c5be: ; c5be (3:45be)
jr nz, .asm_c5f6 jr nz, .asm_c5f6
ld hl, $ffdb ld hl, $ffdb
set 2, [hl] set 2, [hl]
FuncCoord 4, 9 aCoord 4, 9
ld a, [Coord]
dec e dec e
jr .asm_c603 jr .asm_c603
.asm_c5f6 .asm_c5f6
@ -2327,8 +2299,7 @@ Func_c5be: ; c5be (3:45be)
jr nz, .asm_c603 jr nz, .asm_c603
ld hl, $ffdb ld hl, $ffdb
set 3, [hl] set 3, [hl]
FuncCoord 12, 9 aCoord 12, 9
ld a, [Coord]
inc e inc e
.asm_c603 .asm_c603
ld c, a ld c, a
@ -2919,13 +2890,11 @@ DrawBadges: ; ea03 (3:6a03)
ld [hli], a ld [hli], a
ld [hl], $60 ; First name ld [hl], $60 ; First name
FuncCoord 2, 11 hlCoord 2, 11
ld hl, Coord
ld de, wcd49 ld de, wcd49
call .DrawBadgeRow call .DrawBadgeRow
FuncCoord 2, 14 hlCoord 2, 14
ld hl, Coord
ld de, wcd49 + 4 ld de, wcd49 + 4
; call .DrawBadgeRow ; call .DrawBadgeRow
; ret ; ret

View file

@ -56,12 +56,10 @@ BikeShopText1: ; 1d745 (7:5745)
ld c, $f ld c, $f
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld de, BikeShopMenuText ld de, BikeShopMenuText
call PlaceString call PlaceString
FuncCoord 8, 3 hlCoord 8, 3
ld hl, Coord
ld de, BikeShopMenuPrice ld de, BikeShopMenuPrice
call PlaceString call PlaceString
ld hl, BikeShopText_1d815 ld hl, BikeShopText_1d815

View file

@ -467,40 +467,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19)
CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e)
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
FuncCoord 11, 0 hlCoord 11, 0
ld hl, Coord
ld b, $5 ld b, $5
ld c, $7 ld c, $7
call TextBoxBorder call TextBoxBorder
call UpdateSprites call UpdateSprites
FuncCoord 12, 1 hlCoord 12, 1
ld hl, Coord
ld b, $4 ld b, $4
ld c, $7 ld c, $7
call ClearScreenArea call ClearScreenArea
FuncCoord 12, 2 hlCoord 12, 2
ld hl, Coord
ld de, GameCornerMoneyText ld de, GameCornerMoneyText
call PlaceString call PlaceString
FuncCoord 12, 3 hlCoord 12, 3
ld hl, Coord
ld de, GameCornerBlankText1 ld de, GameCornerBlankText1
call PlaceString call PlaceString
FuncCoord 12, 3 hlCoord 12, 3
ld hl, Coord
ld de, wPlayerMoney ld de, wPlayerMoney
ld c, $a3 ld c, $a3
call PrintBCDNumber call PrintBCDNumber
FuncCoord 12, 4 hlCoord 12, 4
ld hl, Coord
ld de, GameCornerCoinText ld de, GameCornerCoinText
call PlaceString call PlaceString
FuncCoord 12, 5 hlCoord 12, 5
ld hl, Coord
ld de, GameCornerBlankText2 ld de, GameCornerBlankText2
call PlaceString call PlaceString
FuncCoord 15, 5 hlCoord 15, 5
ld hl, Coord
ld de, wPlayerCoins ld de, wPlayerCoins
ld c, $82 ld c, $82
call PrintBCDNumber call PrintBCDNumber

View file

@ -200,8 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532)
push hl push hl
ld [wd11e], a ld [wd11e], a
call GetItemName call GetItemName
FuncCoord 2, 2 hlCoord 2, 2
ld hl, Coord
ld a, [$ffdb] ld a, [$ffdb]
ld bc, $28 ld bc, $28
call AddNTimes call AddNTimes

View file

@ -53,8 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
call DelayFrames call DelayFrames
ld b, $9c ld b, $9c
call CopyScreenTileBufferToVRAM call CopyScreenTileBufferToVRAM
FuncCoord 0, 10 hlCoord 0, 10
ld hl, Coord
ld bc, $0078 ld bc, $0078
ld a, $14 ld a, $14
call FillMemory call FillMemory