Rename some script commands

like print_text_string -> print_npc_text etc, and change instances of 'battle' to 'duel'
JappaWakka · Jan 16, 2021 · 518e7d3 · 518e7d3
1 parent 09ac45c
commit 518e7d3
Show file tree

Hide file tree

Showing 10 changed files with 625 additions and 571 deletions.
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm
@@ -2,7 +2,7 @@
 	const EVENT_FLAG_00                         ; $00
 	const EVENT_FLAG_01                         ; $01
 	const EVENT_TEMP_TALKED_TO_IMAKUNI          ; $02
-	const EVENT_TEMP_BATTLED_IMAKUNI            ; $03
+	const EVENT_TEMP_DUELED_IMAKUNI             ; $03
 	const EVENT_FLAG_04                         ; $04
 	const EVENT_FLAG_05                         ; $05
 	const EVENT_FLAG_06                         ; $06

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
@@ -1,4 +1,4 @@
-; NPC Map data. Note: pre-load functions also run after battles
+; NPC Map data. Note: pre-load functions also run after duels
 ; Format:
 ; NPC, X position, Y Position, Direction,
 ; pre-load function. (Resets c flag if NPC should not be loaded)

diff --git 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]