diff options
| author | dannye <33dannye@gmail.com> | 2021-01-16 10:46:08 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-01-16 10:46:08 -0600 |
| commit | 518e7d399cd69b3775226f0ed5b7921e92f05c64 (patch) | |
| tree | 0e31470be75ba9565ea3465130bfcfa041056359 /src/engine/bank01.asm | |
| parent | 09ac45cb24b6182ba4e6bc2dc3c71e205a652d37 (diff) | |
Rename some script commands
like print_text_string -> print_npc_text etc, and change instances of 'battle' to 'duel'
Diffstat (limited to 'src/engine/bank01.asm')
| -rw-r--r-- | src/engine/bank01.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 9cdb098..4936cbc 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -188,29 +188,29 @@ MainDuelLoop: ; 40ee (1:40ee) ; load the correct music and animation depending on result ld a, [wDuelFinished] cp TURN_PLAYER_WON - jr z, .active_duelist_won_battle + jr z, .active_duelist_won_duel cp TURN_PLAYER_LOST - jr z, .active_duelist_lost_battle + jr z, .active_duelist_lost_duel ld a, DUEL_ANIM_DUEL_DRAW ld c, MUSIC_MATCH_DRAW ldtx hl, DuelWasADrawText jr .handle_duel_finished -.active_duelist_won_battle +.active_duelist_won_duel ldh a, [hWhoseTurn] cp PLAYER_TURN - jr nz, .opponent_won_battle -.player_won_battle + jr nz, .opponent_won_duel +.player_won_duel xor a ; DUEL_WIN ld [wDuelResult], a ld a, DUEL_ANIM_DUEL_WIN ld c, MUSIC_MATCH_VICTORY ldtx hl, WonDuelText jr .handle_duel_finished -.active_duelist_lost_battle +.active_duelist_lost_duel ldh a, [hWhoseTurn] cp PLAYER_TURN - jr nz, .player_won_battle -.opponent_won_battle + jr nz, .player_won_duel +.opponent_won_duel ld a, DUEL_LOSS ld [wDuelResult], a ld a, DUEL_ANIM_DUEL_LOSS @@ -232,7 +232,7 @@ MainDuelLoop: ; 40ee (1:40ee) jr nz, .wait_song ld a, [wDuelFinished] cp TURN_PLAYER_TIED - jr z, .tied_battle + jr z, .tied_duel call Func_39fc call WaitForWideTextBoxInput call Func_3b31 @@ -241,7 +241,7 @@ MainDuelLoop: ; 40ee (1:40ee) ldh [hWhoseTurn], a ret -.tied_battle +.tied_duel call WaitForWideTextBoxInput call Func_3b31 ld a, [wDuelTheme] |