sync tileset WRAM labels

This commit is contained in:
YamaArashi 2016-06-12 01:06:27 -07:00
parent 2b2c6fefd3
commit bcb251261d
6 changed files with 24 additions and 24 deletions

View file

@ -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

View file

@ -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

View file

@ -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]