diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/cable_club.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/cable_club.asm')
| -rwxr-xr-x | engine/cable_club.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 2cfb1734..3cbc0867 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -2,7 +2,7 @@ ; In the Colosseum, it starts a battle. In the Trade Centre, it displays the trade selection screen. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy. CableClub_DoBattleOrTrade: ; 5317 (1:5317) - ld c, $50 + ld c, 80 call DelayFrames call ClearScreen call UpdateSprites @@ -359,7 +359,7 @@ TradeCenter_SelectMon: .displayEnemyMonStats ld a, $1 ld [wd11b], a - callab Func_39bd5 + callab InitList ld hl, wEnemyMons call TradeCenter_DisplayStats jp .getNewInput @@ -418,7 +418,7 @@ TradeCenter_SelectMon: ; unreachable code ld a, $4 ld [wd11b], a - callab Func_39bd5 + callab InitList call TradeCenter_DisplayStats jp .getNewInput .playerMonMenu_ANotPressed @@ -513,7 +513,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a ld a, $4 ld [wd11b], a - callab Func_39bd5 + callab InitList call TradeCenter_DisplayStats call LoadScreenTilesFromBuffer1 jp .playerMonMenu |