diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 01:06:27 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-12 01:07:52 -0700 |
| commit | bcb251261dae3cd9ba423fc139c7db4433a1a802 (patch) | |
| tree | 237b56ae82a276689aa48adb658fbe1774f6ea73 /engine | |
| parent | 2b2c6fefd311101c87845c8c498746dc74bd725f (diff) | |
sync tileset WRAM labels
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/cable_club.asm | 10 | ||||
| -rwxr-xr-x | engine/items/items.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 4 |
3 files changed, 8 insertions, 8 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 diff --git a/engine/items/items.asm b/engine/items/items.asm index a6717494..24489690 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -695,7 +695,7 @@ ItemUseSurfboard: ld hl,TilePairCollisionsWater call CheckForTilePairCollisions jr c,.cannotStopSurfing - ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles + ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a ; hl now points to passable tiles diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 9302b6e3..6d05859e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -589,9 +589,9 @@ CanWalkOntoTile: and a ret .notScripted - ld a, [wTileSetCollisionPtr] + ld a, [wTilesetCollisionPtr] ld l, a - ld a, [wTileSetCollisionPtr+1] + ld a, [wTilesetCollisionPtr+1] ld h, a .tilePassableLoop ld a, [hli] |