diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
| commit | 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch) | |
| tree | cfc859d11d462e8b4bab1968360a9a85cd83154d /engine/battle/1c.asm | |
| parent | Use MAX_LEVEL instead of 100/$64 (diff) | |
| download | pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.gz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.xz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.zip | |
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/battle/1c.asm')
| -rwxr-xr-x | engine/battle/1c.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm index d936c7e5..242b8d66 100755 --- a/engine/battle/1c.asm +++ b/engine/battle/1c.asm @@ -170,16 +170,16 @@ GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) ret GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) - ld hl, W_PARTYMON1_HP + ld hl, wPartyMon1HP .faintedLoop ld a, [hli] or [hl] jr nz, .notFainted - ld de, W_PARTYMON2DATA - (W_PARTYMON1DATA + 1) + ld de, wPartyMon2 - (wPartyMon1 + 1) add hl, de jr .faintedLoop .notFainted - ld de, W_PARTYMON1_LEVEL - (W_PARTYMON1_HP + 1) + ld de, wPartyMon1Level - (wPartyMon1HP + 1) add hl, de ld a, [hl] add $3 |