diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:14 -0700 |
| commit | 2b2c6fefd311101c87845c8c498746dc74bd725f (patch) | |
| tree | 3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/cable_club.asm | |
| parent | Remove the last address comments (diff) | |
| parent | more syncing with pokeyellow (diff) | |
| download | pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.gz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.xz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.zip | |
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index bd9ed683..9d72d220 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 @@ -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 |