aboutsummaryrefslogtreecommitdiffstats
path: root/engine/bank3d
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
commit2b7961759b3786725b95ee8f4a0b6e556091db7a (patch)
tree6287d4bb7bad7d012f804dc18856341a09fc015b /engine/bank3d
parentMerge branch 'master' of https://github.com/iimarckus/pokered (diff)
downloadpokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip
Fixes.
Diffstat (limited to 'engine/bank3d')
-rw-r--r--engine/bank3d/bank3d_battle.asm10
-rw-r--r--engine/bank3d/link_menu.asm18
-rw-r--r--engine/bank3d/main.asm20
3 files changed, 24 insertions, 24 deletions
diff --git a/engine/bank3d/bank3d_battle.asm b/engine/bank3d/bank3d_battle.asm
index ac4cd849..9a9b60f1 100644
--- a/engine/bank3d/bank3d_battle.asm
+++ b/engine/bank3d/bank3d_battle.asm
@@ -42,7 +42,7 @@ asm_f601d: ; f601d (f:601d)
ld [$ffe1], a
dec a
ld [wAICount], a
- hlCoord 12, 0
+ coord hl, 12, 0
predef Func_3f0c6
ld a, $ff
ld [wEnemyMonPartyPos], a
@@ -103,7 +103,7 @@ InitWildBattle: ; f607c (3d:607c)
xor a
ld [W_TRAINERCLASS], a
ld [$ffe1], a
- hlCoord 12, 0
+ coord hl, 12, 0
predef Func_3f0c6
; common code that executes after init battle code specific to trainer or wild battles
@@ -125,10 +125,10 @@ InitBattle_Common: ; f60eb (3d:60eb)
ld a, $9c
ld [$ffbd], a
call LoadScreenTilesFromBuffer1
- hlCoord 9, 7
+ coord hl, 9, 7
ld bc, $50a
call ClearScreenArea
- hlCoord 1, 0
+ coord hl, 1, 0
ld bc, $40a
call ClearScreenArea
call ClearSprites
@@ -173,7 +173,7 @@ LoadMonBackPic: ; f6178 (3d:6178)
; been loaded with GetMonHeader.
ld a, [wBattleMonSpecies2]
ld [wcf91], a
- hlCoord 1, 5
+ coord hl, 1, 5
ld bc,$708
call ClearScreenArea
ld hl, W_MONHBACKSPRITE - W_MONHEADER
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm
index a460eb00..69d0458e 100644
--- a/engine/bank3d/link_menu.asm
+++ b/engine/bank3d/link_menu.asm
@@ -5,19 +5,19 @@ Func_f531b:: ; f531b (3d:531b)
ld [wBuffer],a
xor a
ld [wUnknownSerialFlag_d499],a
- hlCoord 0,0
+ coord hl, 0,0
ld bc,$405
call TextBoxBorder
ld de,Text_f5791
- hlCoord 1,2
+ coord hl, 1,2
call PlaceString
- hlCoord 8,0
+ coord hl, 8,0
ld bc,$80a
call TextBoxBorder
- hlCoord 10,2
+ coord hl, 10,2
ld de,Text_f579c
call PlaceString
- hlCoord 0,10
+ coord hl, 0,10
ld bc,$612
call TextBoxBorder
call UpdateSprites
@@ -513,7 +513,7 @@ asm_f56ad:: ; f56ad (3d:56ad)
Func_f56bd:: ; f56bd (3d:56bd)
xor a
ld [H_AUTOBGTRANSFERENABLED],a
- hlCoord 1,11
+ coord hl, 1,11
ld bc,$612
call ClearScreenArea
ld a,[wCurrentMenuItem]
@@ -530,7 +530,7 @@ Func_f56bd:: ; f56bd (3d:56bd)
ld l,a
ld d,h
ld e,l
- hlCoord 1,12
+ coord hl, 1,12
call PlaceString
.asm_f56e6
call Delay3
@@ -642,11 +642,11 @@ LinkMenu: ; f580c (3d:580c)
call SaveScreenTilesToBuffer1
ld hl, ColosseumWhereToText
call PrintText
- hlCoord 5, 3
+ coord hl, 5, 3
ld bc, $80d
call TextBoxBorder
call UpdateSprites
- hlCoord 7, 5
+ coord hl, 7, 5
ld de, TradeCenterText
call PlaceString
xor a
diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm
index 7b3326c9..cdacf431 100644
--- a/engine/bank3d/main.asm
+++ b/engine/bank3d/main.asm
@@ -4,7 +4,7 @@ INCLUDE "engine/battle/unused_stats_functions.asm"
INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
Func_f429f:: ; f429f (3d:429f)
- hlCoord 0,5
+ coord hl, 0,5
ld c,$0
.asm_f42a4
inc c
@@ -169,35 +169,35 @@ Func_f453f:: ; f453f (3d:453f)
ret
Func_f4578:: ; f4578 (3d:4578)
- hlCoord 2,1
+ coord hl, 2,1
ld de,Pointer_f45f9
ld bc,7 << 8 | 16 ; 16x7 (xy)
call CopyScreenArea
ret
Func_f4585:: ; f4585 (3d:4585)
- hlCoord 6,4
+ coord hl, 6,4
ld de,Pointer_f4673
ld bc,4 << 8 | 7 ; 7x4 (xy)
call CopyScreenArea
- hlCoord 9,8
+ coord hl, 9,8
ld [hl],$64
inc hl
ld [hl],$65
ret
Func_f459a:: ; f459a (3d:459a)
- hlCoord 4,8
+ coord hl, 4,8
ld de,Pointer_f468f
ld bc,9 << 8 | 12 ; 12x9 (xy)
call CopyScreenArea
- hlCoord 16,10
+ coord hl, 16,10
ld [hl],$96
- hlCoord 16,11
+ coord hl, 16,11
ld [hl],$9d
- hlCoord 16,12
+ coord hl, 16,12
ld [hl],$a7
- hlCoord 16,13
+ coord hl, 16,13
ld [hl],$b1
ld hl,Pointer_f45c7
ld de,wOAMBuffer
@@ -349,7 +349,7 @@ Func_f5ab0:: ; f5ab0 (3d:5ab0)
ld a,[wTopMenuItemY]
and a
jr z,.asm_f5ac0
- hlCoord 0,0
+ coord hl, 0,0
ld bc,$14
.loop
add hl,bc