diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-16 11:11:50 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-16 11:11:50 -0500 |
| commit | 707ba908f780d42e1f26af85bef0bf0eb478b877 (patch) | |
| tree | 88fba78e2d9c590c4860a2e63eed00a2e29d4005 /engine | |
| parent | ce3ec76762d9e2f0c560e2ea7868678418883143 (diff) | |
| parent | 28de20b9f6e1db97ec69643a907f78562f90ec74 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/cable_club.asm | 4 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 2 |
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 61ed65c8..f0749a06 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 |