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