summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 11:51:28 -0700
committerGitHub <noreply@github.com>2016-06-12 11:51:28 -0700
commita0161ada5d90464e11be2469c6a2ee27533d2557 (patch)
treea93c42f00eec7d9f356c1e9e4b12ec0a46e419d1 /engine
parentbcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff)
parentf978cc0cc9557581a4fa712b00f0f2ad321fa22b (diff)
Merge pull request #17 from YamaArashi/master
sync tileset WRAM labels
Diffstat (limited to 'engine')
-rwxr-xr-xengine/cable_club.asm4
-rwxr-xr-xengine/hall_of_fame.asm2
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index d7b5bdc8..88f7b2f7 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -907,9 +907,9 @@ CableClub_Run:
call CableClub_DoBattleOrTrade
ld hl, Club_GFX
ld a, h
- ld [wTilesetGFXPtr + 1], a
+ ld [wTilesetGfxPtr + 1], a
ld a, l
- ld [wTilesetGFXPtr], a
+ ld [wTilesetGfxPtr], a
ld a, Bank(Club_GFX)
ld [wTilesetBank], a
ld hl, Club_Coll
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 554893a9..833313a6 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -58,7 +58,7 @@ AnimateHallOfFame:
ld c, 80
call DelayFrames
coord hl, 2, 13
- lb bc, $3, $e
+ lb bc, 3, 14
call TextBoxBorder
coord hl, 4, 15
ld de, HallOfFameText