diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 01:06:11 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-12 01:09:22 -0700 |
| commit | c050e9e23983eb76ac5cc3416401715179a9957f (patch) | |
| tree | ed70d7608a30eafa0ad6da28109d2a9cacce1868 | |
| parent | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff) | |
sync tileset WRAM labels
| -rwxr-xr-x | engine/cable_club.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 10 | ||||
| -rwxr-xr-x | wram.asm | 6 |
3 files changed, 10 insertions, 10 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/home/overworld.asm b/home/overworld.asm index 0b2f527f..e323fa49 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -869,9 +869,9 @@ INCLUDE "data/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM LoadTilesetTilePatternData:: - ld a, [wTilesetGFXPtr] + ld a, [wTilesetGfxPtr] ld l, a - ld a, [wTilesetGFXPtr + 1] + ld a, [wTilesetGfxPtr + 1] ld h, a ld de, vTileset ld bc, $600 @@ -1078,7 +1078,7 @@ IsSpriteOrSignInFrontOfPlayer:: .extendRangeOverCounter ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c - ld hl, wTileSetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) + ld hl, wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) ld b, 3 ld d, $20 ; talking range in pixels (long range) .counterTilesLoop @@ -1584,9 +1584,9 @@ ScheduleWestColumnRedraw:: ; Input: c = tile block ID, hl = destination address DrawTileBlock:: push hl - ld a, [wTileSetBlocksPtr] ; pointer to tiles + ld a, [wTilesetBlocksPtr] ; pointer to tiles ld l, a - ld a, [wTileSetBlocksPtr + 1] + ld a, [wTilesetBlocksPtr + 1] ld h, a ld a, c swap a @@ -2981,18 +2981,18 @@ wPlayerDirection:: ; d529 wTilesetBank:: ; d52a ds 1 -wTileSetBlocksPtr:: ; d52b +wTilesetBlocksPtr:: ; d52b ; maps blocks (4x4 tiles) to tiles ds 2 -wTilesetGFXPtr:: ; d52d +wTilesetGfxPtr:: ; d52d ds 2 wTilesetCollisionPtr:: ; d52f ; list of all walkable tiles ds 2 -wTileSetTalkingOverTiles:: ; d531 +wTilesetTalkingOverTiles:: ; d531 ds 3 wGrassTile:: ; d534 |