summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rwxr-xr-xsrc/engine/bank1.asm30
-rwxr-xr-xsrc/engine/bank2.asm8
-rwxr-xr-xsrc/engine/bank3.asm4
-rwxr-xr-xsrc/engine/bank4.asm12
-rwxr-xr-xsrc/engine/bank6.asm10
-rwxr-xr-xsrc/engine/home.asm38
6 files changed, 51 insertions, 51 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index ca7c836..6ca20d2 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -22,7 +22,7 @@ Func_4000: ; 4000 (1:4000)
.asm_4035
call Func_405a
call Func_04a2
- text_hl ResetBackUpRam
+ text_hl ResetBackUpRamText
call Func_2af0
jr c, .asm_404d
call EnableExtRAM
@@ -128,7 +128,7 @@ StartDuel: ; 409f (1:409f)
call Func_04a2
ld a, $3
call Func_2167
- text_hl Decision
+ text_hl DecisionText
call DrawWideTextBox_WaitForInput
call Func_04a2
ldh a, [hWhoseTurn]
@@ -147,7 +147,7 @@ StartDuel: ; 409f (1:409f)
jr z, .activeDuelistLostBattle
ld a, $5f
ld c, $1a
- text_hl DuelWasDraw
+ text_hl DuelWasDrawText
jr .asm_4196
.activeDuelistWonBattle
@@ -159,7 +159,7 @@ StartDuel: ; 409f (1:409f)
ld [$d0c3], a
ld a, $5d
ld c, $18
- text_hl WonDuel
+ text_hl WonDuelText
jr .asm_4196
.activeDuelistLostBattle
@@ -172,7 +172,7 @@ StartDuel: ; 409f (1:409f)
ld [$d0c3], a
ld a, $5e
ld c, $19
- text_hl LostDuel
+ text_hl LostDuelText
.asm_4196
call Func_3b6a
@@ -203,7 +203,7 @@ StartDuel: ; 409f (1:409f)
call Func_3b31
ld a, [wDuelTheme]
call PlaySong
- text_hl StartSuddenDeathMatch
+ text_hl StartSuddenDeathMatchText
call DrawWideTextBox_WaitForInput
ld a, $1
ld [$cc08], a
@@ -282,7 +282,7 @@ Func_426d:
xor a
ld [wVBlankCtr], a
ld [$cbf9], a
- text_hl DuelistIsThinking
+ text_hl DuelistIsThinkingText
call Func_2a36
call Func_2bbf
ld a, $ff
@@ -413,7 +413,7 @@ PlayerRetreat: ; 43ab (1:43ab)
jr c, Func_441f
call $4611
jr c, Func_441c
- text_hl SelectMonOnBenchToSwitchWithActive
+ text_hl SelectMonOnBenchToSwitchWithActiveText
call DrawWideTextBox_WaitForInput
call $600c
jr c, Func_441c
@@ -427,7 +427,7 @@ PlayerRetreat: ; 43ab (1:43ab)
call $4f9d
Func_43e8: ; 43e8
- text_hl UnableToRetreat
+ text_hl UnableToRetreatText
call DrawWideTextBox_WaitForInput
jp Func_4295
@@ -437,7 +437,7 @@ Func_43f1: ; 43f1 (1:43f1)
call $4611
jr c, Func_441c
call $6558
- text_hl SelectMonOnBenchToSwitchWithActive
+ text_hl SelectMonOnBenchToSwitchWithActiveText
call DrawWideTextBox_WaitForInput
call $600c
ld [wBenchSelectedPokemon], a
@@ -462,7 +462,7 @@ OpenHandMenu: ; 4425 (1:4425)
call GetTurnDuelistVariable
or a
jr nz, Func_4436
- text_hl NoCardsInHand
+ text_hl NoCardsInHandText
call DrawWideTextBox_WaitForInput
jp Func_4295
@@ -494,7 +494,7 @@ OpenBattleAttackMenu: ; 46fc (1:46fc)
call LoadPokemonAttacksToDuelPointerTable
or a
jr nz, .openAttackMenu
- text_hl NoSelectableAttack
+ text_hl NoSelectableAttackText
call DrawWideTextBox_WaitForInput
jp Func_4295
@@ -523,7 +523,7 @@ OpenBattleAttackMenu: ; 46fc (1:46fc)
ld [wSelectedDuelSubMenuItem], a
call $488f
jr nc, .asm_4759
- text_hl NotEnoughEnergyCards
+ text_hl NotEnoughEnergyCardsText
call DrawWideTextBox_WaitForInput
jr .tryOpenAttackMenu
@@ -748,11 +748,11 @@ CheckIfActiveCardParalyzedOrAsleep: ; 4918 (1:4918)
ret
.paralyzed
- text_hl UnableDueToParalysis
+ text_hl UnableDueToParalysisText
jr .returnWithStatusCondition
.asleep
- text_hl UnableDueToSleep
+ text_hl UnableDueToSleepText
.returnWithStatusCondition:
scf
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index c2b587b..5de68e6 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -81,7 +81,7 @@ Func_8db0: ; 8db0 (2:4db0)
Func_8dbc: ; 8dbc (2:4dbc)
ld hl, Unknown_8de2
call InitializeCursorParameters
- text_hl PleaseSelectDeck
+ text_hl PleaseSelectDeckText
call DrawWideTextBox_PrintText
.asm_8dc8
call DoFrame
@@ -348,13 +348,13 @@ Func_8f9d: ; 8f9d (2:4f9d)
xor a
ld [$ce3f], a
ld [$ce40], a
- text_hl ChosenAsDuelingDeck
+ text_hl ChosenAsDuelingDeckText
call DrawWideTextBox_WaitForInput
ld a, [$ceb1]
jp Func_8dbc
Func_8fe8: ; 8fe8 (2:4fe8)
- text_hl ThereIsNoDeckHere
+ text_hl ThereIsNoDeckHereText
call DrawWideTextBox_WaitForInput
ld a, [$ceb1]
ret
@@ -703,7 +703,7 @@ Func_926e: ; 926e (2:526e)
ret
.asm_929c
call Func_22ae
- text_hl NewDeck
+ text_hl NewDeckText
call Func_2c29
scf
ret
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index d884ce2..9513946 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -1034,7 +1034,7 @@ PC_c7ea: ; c7ea (3:47ea)
call Func_c241
call $4915
call DoFrameIfLCDEnabled
- text_hl TurnedPCOn
+ text_hl TurnedPCOnText
call Func_2c73
call $484e
.asm_c801
@@ -1061,7 +1061,7 @@ PC_c7ea: ; c7ea (3:47ea)
.asm_c82f
call Func_c135
call DoFrameIfLCDEnabled
- text_hl TurnedPCOff
+ text_hl TurnedPCOffText
call $4891
call Func_c111
xor a
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index ebeeb96..1af78f4 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -49,7 +49,7 @@ Medal_1029e: ; 1029e (4:429e)
ld a, [$d116]
cp $e0
jr nz, .asm_102e2
- text_hl WonTheMedal
+ text_hl WonTheMedalText
call Func_2c73
call Func_3c96
call Func_37a0
@@ -101,16 +101,16 @@ BoosterPack_1031b: ; 1031b (4:431b)
pop bc
ld a, c
farcallx $7, $61c4
- text_hl ReceivedBoosterPack
+ text_hl ReceivedBoosterPackText
ld a, [$d117]
cp $1
jr nz, .asm_10373
- text_hl AndAnotherBoosterPack
+ text_hl AndAnotherBoosterPackText
.asm_10373
call Func_2c73
call Func_3c96
call Func_37a0
- text_hl CheckedCardsInBoosterPack
+ text_hl CheckedCardsInBoosterPackText
call Func_2c73
call DisableLCD
call Func_1288c
@@ -1115,7 +1115,7 @@ Func_1344d: ; 1344d (4:744d)
call Func_379b
ld a, MUSIC_MEDAL
call PlaySong
- text_hl DefeatedFiveOpponents
+ text_hl DefeatedFiveOpponentsText
call Func_2c73
call Func_3c96
call Func_37a0
@@ -1137,7 +1137,7 @@ Func_13485: ; 13485 (4:7485)
call Func_379b
ld a, MUSIC_MEDAL
call PlaySong
- text_hl ConsecutiveWinRecordIncreased
+ text_hl ConsecutiveWinRecordIncreasedText
call Func_2c73
call Func_3c96
call Func_37a0
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index 39011da..54dea48 100755
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -124,23 +124,23 @@ Func_1a61f: ; 1a61f (6:661f)
ld a, $76
call $663b
ld a, $c1
- text_hl ReceivedLegendaryCard
+ text_hl ReceivedLegendaryCardText
jr .asm_1a660
.asm_1a640
- text_hl ReceivedCard
+ text_hl ReceivedCardText
cp $1e
jr z, .asm_1a660
cp $43
jr z, .asm_1a660
- text_hl ReceivedPromotionalFlyingPikachu
+ text_hl ReceivedPromotionalFlyingPikachuText
cp $64
jr z, .asm_1a660
- text_hl ReceivedPromotionalSurfingPikachu
+ text_hl ReceivedPromotionalSurfingPikachuText
cp $65
jr z, .asm_1a660
cp $66
jr z, .asm_1a660
- text_hl ReceivedPromotionalCard
+ text_hl ReceivedPromotionalCardText
.asm_1a660
push hl
ld e, a
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 3fd56ed..5a10d44 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2099,7 +2099,7 @@ Func_0f35: ; 0f35 (0:0f35)
ld l, a
ld h, $0
call Func_2ec4
- text_hl TransmissionError
+ text_hl TransmissionErrorText
call DrawWideTextBox_WaitForInput
ld a, $ff
ld [wd0c3], a
@@ -2676,7 +2676,7 @@ Func_1828: ; 1828 (0:1828)
bank1call $4f9d
ld a, $1
ld [wcce6], a
- text_hl DamageToSelfDueToConfusion
+ text_hl DamageToSelfDueToConfusionText
call DrawWideTextBox_PrintText
ld a, $75
ld [wccb8], a
@@ -3024,7 +3024,7 @@ Func_1ad3: ; 1ad3 (0:1ad3)
ld h, [hl]
ld l, a
call Func_2ebb
- text_hl WasKnockedOut
+ text_hl WasKnockedOutText
call DrawWideTextBox_PrintText
ld a, $28
.asm_1aeb
@@ -3053,7 +3053,7 @@ Func_1b8d: ; 1b8d (0:1b8d)
ld [hli], a
ld a, [wccab]
ld [hli], a
- text_hl PokemonsAttack ; text when using an attack
+ text_hl PokemonsAttackText ; text when using an attack
call DrawWideTextBox_PrintText
ret
@@ -3090,7 +3090,7 @@ Func_1bca: ; 1bca (0:1bca)
inc de
ld a, [hli]
ld [de], a
- text_hl WasUnsuccessful
+ text_hl WasUnsuccessfulText
call DrawWideTextBox_PrintText
scf
ret
@@ -4647,7 +4647,7 @@ Func_2af0: ; 2af0 (0:2af0)
Func_2b66: ; 2b66 (0:2b66)
call AdjustCoordinatesForWindow
- text_hl YesOrNo
+ text_hl YesOrNoText
call Func_2c1b
ret
; 0x2b70
@@ -5886,13 +5886,13 @@ CheckIfCantAttackDueToAttackEffect:: ; 33c1 (0:33c1)
call GetTurnDuelistVariable
or a
ret z
- text_hl UnableToAttackDueToTailWag
+ text_hl UnableToAttackDueToTailWagText
cp $05
jr z, .returnWithCantAttack
- text_hl UnableToAttackDueToLeer
+ text_hl UnableToAttackDueToLeerText
cp $06
jr z, .returnWithCantAttack
- text_hl UnableToAttackDueToBoneAttack
+ text_hl UnableToAttackDueToBoneAttackText
cp $0b
jr z, .returnWithCantAttack
or a
@@ -5919,7 +5919,7 @@ Func_33e1: ; 33e1 (0:33e1)
ld a, [wccc6]
cp [hl]
jr nz, .asm_33ee
- text_hl UnableToUseAttackDueToAmnesia
+ text_hl UnableToUseAttackDueToAmnesiaText
scf
ret
@@ -5930,7 +5930,7 @@ Func_3400: ; 3400 (0:3400)
ld [wcc0a], a
ccf
ret nc
- text_hl AttackUnsuccessful
+ text_hl AttackUnsuccessfulText
call DrawWideTextBox_WaitForInput
scf
ret
@@ -5964,15 +5964,15 @@ Func_3432: ; 3432 (0:3432)
ld a, $e7
call GetTurnDuelistVariable
ld e, $3
- text_hl NoDamageOrEffectDueToFly
+ text_hl NoDamageOrEffectDueToFlyText
cp $d
jr z, .asm_346a
ld e, $2
- text_hl NoDamageOrEffectDueToBarrier
+ text_hl NoDamageOrEffectDueToBarrierText
cp $14
jr z, .asm_346a
ld e, $1
- text_hl NoDamageOrEffectDueToAgility
+ text_hl NoDamageOrEffectDueToAgilityText
cp $c
jr z, .asm_346a
call Func_34ef
@@ -6000,7 +6000,7 @@ Func_3432: ; 3432 (0:3432)
or a
ret z
ld e, $5
- text_hl NoDamageOrEffectDueToNShield
+ text_hl NoDamageOrEffectDueToNShieldText
jr .asm_346a
Func_348a: ; 348a (0:348a)
@@ -6024,7 +6024,7 @@ Func_348a: ; 348a (0:348a)
ret nc
ld a, $4
ld [wccc7], a
- text_hl NoDamageOrEffectDueToTransparency
+ text_hl NoDamageOrEffectDueToTransparencyText
scf
ret
; 0x34b7
@@ -6049,13 +6049,13 @@ Func_34f0: ; 34f0 (0:34f0)
ld a, DUELVARS_ARENA_CARD_STATUS
call GetTurnDuelistVariable
and $f
- text_hl CannotUseDueToStatus
+ text_hl CannotUseDueToStatusText
scf
jr nz, .asm_3508
.asm_3500
ld a, $27
call Func_3509
- text_hl UnableDueToToxicGas
+ text_hl UnableDueToToxicGasText
.asm_3508
ret
@@ -6198,7 +6198,7 @@ Func_36a2: ; 36a2 (0:36a2)
push af
push hl
call Func_1a96
- text_hl ReceivesDamageDueToStrikesBack
+ text_hl ReceivesDamageDueToStrikesBackText
call DrawWideTextBox_PrintText
pop hl
pop af
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-15 10:07:48 +0000