diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
| commit | 38065a744de1065cc021a4cafe22476f8425448d (patch) | |
| tree | a37a103d7c22f3cc5f62689e5062877961493caa /engine/in_game_trades.asm | |
| parent | Merge pull request #116 from YamaArashi/master (diff) | |
| download | pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.gz pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.xz pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.zip | |
No more W_
Diffstat (limited to 'engine/in_game_trades.asm')
| -rwxr-xr-x | engine/in_game_trades.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 4229afd8..176d6af7 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -108,7 +108,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a,[hl] - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a ld hl,wCompletedInGameTradeFlags ld a,[wWhichTrade] ld c,a @@ -118,13 +118,13 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) call PrintText ld a,[wWhichPokemon] push af - ld a,[W_CURENEMYLVL] + ld a,[wCurEnemyLVL] push af call LoadHpBarAndStatusTilePatterns call InGameTrade_PrepareTradeData predef InternalClockTradeAnim pop af - ld [W_CURENEMYLVL],a + ld [wCurEnemyLVL],a pop af ld [wWhichPokemon],a ld a,[wInGameTradeReceiveMonSpecies] |