diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/battle/start_battle.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/battle/start_battle.asm')
| -rw-r--r-- | engine/battle/start_battle.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 98a32c0dd..84cd1e858 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -17,7 +17,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f ld [hMapAnims], a call DelayFrame ld b, 6 - ld hl, PartyMon1HP + ld hl, wPartyMon1HP ld de, PARTYMON_STRUCT_LENGTH - 1 .loop @@ -32,7 +32,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f ld de, MON_LEVEL - MON_HP add hl, de ld a, [hl] - ld [BattleMonLevel], a + ld [wBattleMonLevel], a predef DoBattleTransition farcall _LoadBattleFontsHPBar ld a, 1 @@ -52,13 +52,13 @@ PlayBattleMusic: ; 2ee6c push bc xor a - ld [MusicFade], a + ld [wMusicFade], a ld de, MUSIC_NONE call PlayMusic call DelayFrame call MaxVolume - ld a, [BattleType] + ld a, [wBattleType] cp BATTLETYPE_SUICUNE ld de, MUSIC_SUICUNE_BATTLE jp z, .done @@ -66,7 +66,7 @@ PlayBattleMusic: ; 2ee6c jp z, .done ; Are we fighting a trainer? - ld a, [OtherTrainerClass] + ld a, [wOtherTrainerClass] and a jr nz, .trainermusic @@ -76,7 +76,7 @@ PlayBattleMusic: ; 2ee6c jr nz, .kantowild ld de, MUSIC_JOHTO_WILD_BATTLE - ld a, [TimeOfDay] + ld a, [wTimeOfDay] cp NITE_F jr nz, .done ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT @@ -111,13 +111,13 @@ PlayBattleMusic: ; 2ee6c jr c, .done ld de, MUSIC_RIVAL_BATTLE - ld a, [OtherTrainerClass] + ld a, [wOtherTrainerClass] cp RIVAL1 jr z, .done cp RIVAL2 jr nz, .othertrainer - ld a, [OtherTrainerID] + ld a, [wOtherTrainerID] cp RIVAL2_2_CHIKORITA ; Rival in Indigo Plateau jr c, .done ld de, MUSIC_CHAMPION_BATTLE @@ -160,25 +160,25 @@ ClearBattleRAM: ; 2ef18 ld [hl], a ld [wMenuScrollPosition], a - ld [CriticalHit], a - ld [BattleMonSpecies], a + ld [wCriticalHit], a + ld [wBattleMonSpecies], a ld [wBattleParticipantsNotFainted], a - ld [CurBattleMon], a + ld [wCurBattleMon], a ld [wForcedSwitch], a - ld [TimeOfDayPal], a - ld [PlayerTurnsTaken], a - ld [EnemyTurnsTaken], a - ld [EvolvableFlags], a + ld [wTimeOfDayPal], a + ld [wPlayerTurnsTaken], a + ld [wEnemyTurnsTaken], a + ld [wEvolvableFlags], a - ld hl, PlayerHPPal + ld hl, wPlayerHPPal ld [hli], a ld [hl], a - ld hl, BattleMonDVs + ld hl, wBattleMonDVs ld [hli], a ld [hl], a - ld hl, EnemyMonDVs + ld hl, wEnemyMonDVs ld [hli], a ld [hl], a |