diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 11:51:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 11:51:59 -0700 |
| commit | bfaabd08be0a790dff961276d76af3e1af4e6e24 (patch) | |
| tree | 60742e693805fd75031079e8d3b8a87847452d1e /engine/cable_club.asm | |
| parent | Merge pull request #134 from YamaArashi/master (diff) | |
| parent | sync home (diff) | |
| download | pokeyellow-bfaabd08be0a790dff961276d76af3e1af4e6e24.tar.gz pokeyellow-bfaabd08be0a790dff961276d76af3e1af4e6e24.tar.xz pokeyellow-bfaabd08be0a790dff961276d76af3e1af4e6e24.zip | |
Merge pull request #135 from YamaArashi/master
sync tileset WRAM labels
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 9d72d220..c3a5e235 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -900,16 +900,16 @@ 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 [wTilesetBank], a ld hl, Club_Coll ld a, h - ld [wTileSetCollisionPtr + 1], a + ld [wTilesetCollisionPtr + 1], a ld a, l - ld [wTileSetCollisionPtr], a + ld [wTilesetCollisionPtr], a xor a ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB |