diff options
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 2458abd4..ab18f32b 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -27,10 +27,10 @@ CableClub_DoBattleOrTradeAgain: ld hl, wSerialPlayerDataBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 6 -.writePlayeDataBlockPreambleLoop +.writePlayerDataBlockPreambleLoop ld [hli], a dec b - jr nz, .writePlayeDataBlockPreambleLoop + jr nz, .writePlayerDataBlockPreambleLoop ld hl, wSerialRandomNumberListBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 7 @@ -271,7 +271,7 @@ CableClub_DoBattleOrTradeAgain: cp LINK_STATE_START_BATTLE ld a, LINK_STATE_TRADING ld [wLinkState], a - jr nz, .asm_5506 + jr nz, .trading ld a, LINK_STATE_BATTLING ld [wLinkState], a ld a, OPP_SONY1 @@ -283,7 +283,7 @@ CableClub_DoBattleOrTradeAgain: predef InitOpponent predef HealParty jp ReturnToCableClubRoom -.asm_5506 +.trading ld c, BANK(Music_GameCorner) ld a, MUSIC_GAME_CORNER call PlayMusic @@ -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 @@ -964,8 +964,8 @@ CableClub_TextBoxBorder: ; c = width CableClub_DrawHorizontalLine: ld d, c -.asm_5ae1 +.loop ld [hli], a dec d - jr nz, .asm_5ae1 + jr nz, .loop ret |