diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/cable_club.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| parent | more syncing with pokered (diff) | |
| download | pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip | |
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index a6552939..d7b5bdc8 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -253,7 +253,7 @@ CableClub_DoBattleOrTradeAgain: ld hl, wEnemyMons + (SERIAL_PREAMBLE_BYTE - 1) dec c jr nz, .unpatchEnemyMonsLoop - ld a, wEnemyMonOT & $ff + ld a, wEnemyMonOT % $100 ld [wUnusedCF8D], a ld a, wEnemyMonOT / $100 ld [wUnusedCF8D + 1], a @@ -268,7 +268,7 @@ CableClub_DoBattleOrTradeAgain: cp LINK_STATE_START_BATTLE ld a, LINK_STATE_TRADING ld [wLinkState], a - jr nz, .asm_55a0 + jr nz, .trading ld a, LINK_STATE_BATTLING ld [wLinkState], a ld a, OPP_SONY1 @@ -288,7 +288,7 @@ CableClub_DoBattleOrTradeAgain: ld [wLetterPrintingDelayFlags], a predef HealParty jp ReturnToCableClubRoom -.asm_55a0 +.trading ld c, BANK(Music_GameCorner) ld a, MUSIC_GAME_CORNER call PlayMusic @@ -446,7 +446,6 @@ TradeCenter_SelectMon: ld a, [wEnemyPartyCount] dec a cp b - ; continue jr nc, .notPastLastEnemyMon ; when switching to the enemy mon menu, if the menu selection would be past the last enemy mon, select the last enemy mon ld [wCurrentMenuItem], a @@ -851,7 +850,6 @@ TradeCenter_Trade: .usingExternalClock predef ExternalClockTradeAnim .tradeCompleted -; continue callab TryEvolvingMon call ClearScreen call LoadTrainerInfoTextBoxTiles @@ -973,10 +971,10 @@ CableClub_TextBoxBorder: ; c = width CableClub_DrawHorizontalLine: ld d, c -.drawHorizontalLineLoop +.loop ld [hli], a dec d - jr nz, .drawHorizontalLineLoop + jr nz, .loop ret LoadTrainerInfoTextBoxTiles: |