diff options
author | xCrystal <rgr.crystal@gmail.com> | 2016-03-03 23:59:18 +0100 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2016-03-03 23:59:18 +0100 |
commit | e17e1e25d46a2af43c3118cc795f0ee9ca1ada2c (patch) | |
tree | 3dbae280c4b97ffe37837f17d41d27a0f756766a /src | |
parent | 6456cbd31cb403106d4246c487b95f04b51ba200 (diff) |
append "Text" to text labels
Diffstat (limited to 'src')
-rwxr-xr-x | src/engine/bank1.asm | 30 | ||||
-rwxr-xr-x | src/engine/bank2.asm | 8 | ||||
-rwxr-xr-x | src/engine/bank3.asm | 4 | ||||
-rwxr-xr-x | src/engine/bank4.asm | 12 | ||||
-rwxr-xr-x | src/engine/bank6.asm | 10 | ||||
-rwxr-xr-x | src/engine/home.asm | 38 | ||||
-rwxr-xr-x | src/text/text1.asm | 80 | ||||
-rw-r--r-- | src/text/text2.asm | 54 | ||||
-rw-r--r-- | src/text/text3.asm | 12 | ||||
-rw-r--r-- | src/text/text9.asm | 4 | ||||
-rwxr-xr-x | src/text/text_offsets.asm | 150 |
11 files changed, 201 insertions, 201 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 diff --git a/src/text/text1.asm b/src/text/text1.asm index 19fe206..93e19b7 100755 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1,49 +1,49 @@ -DuelMenuText_Hand: ; 3630a (d:630a) +HandText: ; 3630a (d:630a) db TX_START,"Hand",TX_END -DuelMenuText_Check: ; 36310 (d:6310) +CheckText: ; 36310 (d:6310) db TX_START,"Check",TX_END -DuelMenuText_Attack: ; 36317 (d:6317) +AttackText: ; 36317 (d:6317) db TX_START,"Attack",TX_END -DuelMenuText_PKMNPower: ; 3631f (d:631f) +PKMNPowerText: ; 3631f (d:631f) db TX_START,"PKMN Power",TX_END -DuelMenuText_Done: ; 3632b (d:632b) +DoneText: ; 3632b (d:632b) db TX_START,"Done",TX_END -DuelMenuText_Type: ; 36331 (d:6331) +TypeText: ; 36331 (d:6331) db TX_START,"Type",TX_END -CardInfoPageText_Retreat: ; 36337 (d:6337) +RetreatText: ; 36337 (d:6337) db TX_START,"Retreat",TX_END -CardInfoPageText_Weakness: ; 36340 (d:6340) +WeaknessText: ; 36340 (d:6340) db TX_START,"Weakness",TX_END -CardInfoPageText_Resistance: ; 3634a (d:634a) +ResistanceText: ; 3634a (d:634a) db TX_START,"Resistance",TX_END -CardInfoPageText_PKMNPWR: ; 36356 (d:6356) +PKMNPWRText: ; 36356 (d:6356) db TX_START,"PKMN PWR",TX_END Text000b: ; 36360 (d:6360) db $56,$19,$33,$3d,$16,$78,$4c,TX_END -CardInfoPageText_Length: ; 36368 (d:6368) +LengthText: ; 36368 (d:6368) db TX_START,"Length",TX_END -CardInfoPageText_Weight: ; 36370 (d:6370) +WeightText: ; 36370 (d:6370) db TX_START,"Weight",TX_END -CardInfoPageText_Pokemon: ; 36378 (d:6378) +PokemonText: ; 36378 (d:6378) db TX_START," Pok`mon",TX_END Text000f: ; 36382 (d:6382) db $03,$4c,TX_END -CardInfoPageText_lbs: ; 36385 (d:6385) +lbsText: ; 36385 (d:6385) db TX_START,"lbs.",TX_END Text0011: ; 3638b (d:638b) @@ -100,32 +100,32 @@ Text0021: ; 36460 (d:6460) Text0022: ; 36466 (d:6466) db TX_START,"Attack",TX_END -NoPokemonOnTheBench: ; 3646e (d:646e) +NoPokemonOnTheBenchText: ; 3646e (d:646e) db TX_START,"No Pok`mon on the Bench.",TX_END -UnableDueToSleep: ; 36488 (d:6488) +UnableDueToSleepText: ; 36488 (d:6488) db TX_START,"Unable to due to Sleep.",TX_END -UnableDueToParalysis: ; 364a1 (d:64a1) +UnableDueToParalysisText: ; 364a1 (d:64a1) db TX_START,"Unable to due to Paralysis.",TX_END -Received10DamageDueToPoison: ; 364be (d:64be) +Received10DamageDueToPoisonText: ; 364be (d:64be) db TX_START,TX_RAM2," received\n" db "10 damage due to Poison.",TX_END -Received20DamageDueToPoison: ; 364e3 (d:64e3) +Received20DamageDueToPoisonText: ; 364e3 (d:64e3) db TX_START,TX_RAM2," received\n" db "20 damage due to Double Poison.",TX_END -IsStillAsleep: ; 3650f (d:650f) +IsStillAsleepText: ; 3650f (d:650f) db TX_START,TX_RAM2," is\n" db "still Asleep.",TX_END -IsCuredOfSleep: ; 36523 (d:6523) +IsCuredOfSleepText: ; 36523 (d:6523) db TX_START,TX_RAM2," is\n" db "cured of Sleep.",TX_END -IsCuredOfParalysis: ; 36539 (d:6539) +IsCuredOfParalysisText: ; 36539 (d:6539) db TX_START,TX_RAM2," is\n" db "cured of Paralysis.",TX_END @@ -141,7 +141,7 @@ Text002d: ; 36576 (d:6576) Text002e: ; 36588 (d:6588) db TX_START,"Is this OK?",TX_END -YesOrNo: ; 36595 (d:6595) +YesOrNoText: ; 36595 (d:6595) db TX_START,"Yes No",TX_END DiscardName: ; 365a1 (d:65a1) @@ -159,7 +159,7 @@ Text0033: ; 365be (d:65be) Text0034: ; 365c7 (d:65c7) db TX_START,"Received damage",TX_END -PokemonsAttack: ; 365d8 (d:65d8) +PokemonsAttackText: ; 365d8 (d:65d8) db TX_START,TX_RAM2,"'s\n" db TX_START,TX_RAM2,"!",TX_END @@ -187,10 +187,10 @@ Text003b: ; 36694 (d:6694) db TX_START,TX_RAM2," did not\n" db "receive damage!",TX_END -NoSelectableAttack: ; 366af (d:66af) +NoSelectableAttackText: ; 366af (d:66af) db TX_START,"No selectable Attack",TX_END -UnableToRetreat: ; 366c5 (d:66c5) +UnableToRetreatText: ; 366c5 (d:66c5) db TX_START,"Unable to Retreat.",TX_END Text003e: ; 366d9 (d:66d9) @@ -256,7 +256,7 @@ Text004d: ; 3685a (d:685a) Text004e: ; 36861 (d:6861) db TX_START,"Knock Out",TX_END -DamageToSelfDueToConfusion: ; 3686c (d:686c) +DamageToSelfDueToConfusionText: ; 3686c (d:686c) db TX_START,"20 damage to Self due to Confusion.",TX_END Text0050: ; 36891 (d:6891) @@ -277,7 +277,7 @@ Text0053: ; 36924 (d:6924) Text0054: ; 36935 (d:6935) db TX_START,"You play second.",TX_END -TransmissionError: ; 36947 (d:6947) +TransmissionErrorText: ; 36947 (d:6947) db TX_START,"Transmission Error.\n" db "Start again from the beginning.",TX_END @@ -401,21 +401,21 @@ Text0075: ; 36d72 (d:6d72) db TX_START,"A coin will be tossed\n" db "to decide who plays first.",TX_END -Decision: ; 36da4 (d:6da4) +DecisionText: ; 36da4 (d:6da4) db TX_START,"Decision...",TX_END -DuelWasDraw: ; 36db1 (d:6db1) +DuelWasDrawText: ; 36db1 (d:6db1) db TX_START,"The Duel with ",TX_RAM1,"\n" db "was a Draw!",TX_END -WonDuel: ; 36dce (d:6dce) +WonDuelText: ; 36dce (d:6dce) db TX_START,"You won the Duel with ",TX_RAM1,"!",TX_END -LostDuel: ; 36de8 (d:6de8) +LostDuelText: ; 36de8 (d:6de8) db TX_START,"You lost the Duel\n" db "with ",TX_RAM1,"...",TX_END -StartSuddenDeathMatch: ; 36e05 (d:6e05) +StartSuddenDeathMatchText: ; 36e05 (d:6e05) db TX_START,"Start a Sudden-Death\n" db "Match for 1 Prize!",TX_END @@ -441,7 +441,7 @@ Text0080: ; 36e82 (d:6e82) db TX_START,"There are no Pok`mon\n" db "in ",TX_RAM1,"'s Play Area!",TX_END -WasKnockedOut: ; 36eaa (d:6eaa) +WasKnockedOutText: ; 36eaa (d:6eaa) db TX_START,TX_RAM2," was\n" db "Knocked Out!",TX_END @@ -468,7 +468,7 @@ Text0086: ; 36f31 (d:6f31) Text0087: ; 36f43 (d:6f43) db $03,$31,$0c,$03,$42,$0c,TX_END -DuelistIsThinking: ; 36f4a (d:6f4a) +DuelistIsThinkingText: ; 36f4a (d:6f4a) db TX_START,TX_RAM1," is thinking.",TX_END Text0089: ; 36f5a (d:6f5a) @@ -584,7 +584,7 @@ Text00a0: ; 37284 (d:7284) Text00a1: ; 37294 (d:7294) db TX_START,"End without Prizes?",TX_END -ResetBackUpRam: ; 372a9 (d:72a9) +ResetBackUpRamText: ; 372a9 (d:72a9) db TX_START,"Reset Back Up RAM?",TX_END Text00a3: ; 372bd (d:72bd) @@ -595,7 +595,7 @@ Text00a3: ; 372bd (d:72bd) db "Please restart the game after\n" db "the Data is reset.",TX_END -NoCardsInHand: ; 37348 (d:7348) +NoCardsInHandText: ; 37348 (d:7348) db TX_START,"No cards in hand.",TX_END Text00a5: ; 3735b (d:735b) @@ -696,7 +696,7 @@ Text00bf: ; 37758 (d:7758) db TX_START,TX_RAM3," Energy cards\n" db "are required to Retreat.",TX_END -NotEnoughEnergyCards: ; 37781 (d:7781) +NotEnoughEnergyCardsText: ; 37781 (d:7781) db TX_START,"Not enough Energy cards.",TX_END Text00c1: ; 3779b (d:779b) @@ -732,7 +732,7 @@ Text00c9: ; 37897 (d:7897) Text00ca: ; 378a7 (d:78a7) db TX_START,"Only once per turn.",TX_END -CannotUseDueToStatus: ; 378bc (d:78bc) +CannotUseDueToStatusText: ; 378bc (d:78bc) db TX_START,"Cannot use due to Sleep, Paralysis,\n" db "or Confusion.",TX_END @@ -763,7 +763,7 @@ Text00d2: ; 379ce (d:79ce) Text00d3: ; 379f2 (d:79f2) db TX_START,"Opponent is not Asleep",TX_END -UnableDueToToxicGas: ; 37a0a (d:7a0a) +UnableDueToToxicGasText: ; 37a0a (d:7a0a) db TX_START,"Unable to use due to the\n" db "effects of Toxic Gas.",TX_END diff --git a/src/text/text2.asm b/src/text/text2.asm index a073788..4c8d86f 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -29,66 +29,66 @@ Text00fc: ; 3816a (e:416a) db TX_START,"If Heads, opponent cannot Attack\n" db "next turn!",TX_END -AttackUnsuccessful: ; 38197 (e:4197) +AttackUnsuccessfulText: ; 38197 (e:4197) db TX_START,"Attack unsuccessful.",TX_END -UnableToRetreatDueToAcid: ; 381ad (e:41ad) +UnableToRetreatDueToAcidText: ; 381ad (e:41ad) db TX_START,"Unable to Retreat due to\n" db "the effects of Acid.",TX_END -UnableToUseTrainerDueToHeadache: ; 381dc (e:41dc) +UnableToUseTrainerDueToHeadacheText: ; 381dc (e:41dc) db TX_START,"Unable to use a Trainer card\n" db "due to the effects of Headache.",TX_END -UnableToAttackDueToTailWag: ; 3821a (e:421a) +UnableToAttackDueToTailWagText: ; 3821a (e:421a) db TX_START,"Unable to Attack due to\n" db "the effects of Tail wag.",TX_END -UnableToAttackDueToLeer: ; 3824c (e:424c) +UnableToAttackDueToLeerText: ; 3824c (e:424c) db TX_START,"Unable to Attack due to\n" db "the effects of Leer.",TX_END -UnableToAttackDueToBoneAttack: ; 3827a (e:427a) +UnableToAttackDueToBoneAttackText: ; 3827a (e:427a) db TX_START,"Unable to Attack due to\n" db "the effects of Bone attack.",TX_END -UnableToUseAttackDueToAmnesia: ; 382af (e:42af) +UnableToUseAttackDueToAmnesiaText: ; 382af (e:42af) db TX_START,"Unable to use this Attack\n" db "due to the effects of Amnesia.",TX_END -KnockedOutDueToDestinyBond: ; 382e9 (e:42e9) +KnockedOutDueToDestinyBondText: ; 382e9 (e:42e9) db TX_START,TX_RAM2," was Knocked Out\n" db "due to the effects of Destiny Bond.",TX_END -ReceivesDamageDueToStrikesBack: ; 38320 (e:4320) +ReceivesDamageDueToStrikesBackText: ; 38320 (e:4320) db TX_START,TX_RAM2," receives ",TX_RAM3," damage\n" db "due to the effects of Strikes Back.",TX_END -UnableToEvolveDueToPrehistoricPower: ; 38359 (e:4359) +UnableToEvolveDueToPrehistoricPowerText: ; 38359 (e:4359) db TX_START,"Unable to evolve due to the\n" db "effects of Prehistoric Power.",TX_END -NoDamageOrEffectDueToFly: ; 38394 (e:4394) +NoDamageOrEffectDueToFlyText: ; 38394 (e:4394) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Fly.",TX_END -NoDamageOrEffectDueToBarrier: ; 383d3 (e:43d3) +NoDamageOrEffectDueToBarrierText: ; 383d3 (e:43d3) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Barrier.",TX_END -NoDamageOrEffectDueToAgility: ; 38416 (e:4416) +NoDamageOrEffectDueToAgilityText: ; 38416 (e:4416) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Agility.",TX_END -UnableToUseAttackDueToNShield: ; 38459 (e:4459) +UnableToUseAttackDueToNShieldText: ; 38459 (e:4459) db TX_START,"Unable to use this Attack due to\n" db "the effects of N Shield.",TX_END -NoDamageOrEffectDueToNShield: ; 38494 (e:4494) +NoDamageOrEffectDueToNShieldText: ; 38494 (e:4494) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of N Shield.",TX_END -NoDamageOrEffectDueToTransparency: ; 384d8 (e:44d8) +NoDamageOrEffectDueToTransparencyText: ; 384d8 (e:44d8) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Transparency",TX_END @@ -96,7 +96,7 @@ Text010d: ; 3851f (e:451f) db TX_START,TX_RAM2,"\n" db "metamorphs to ",TX_RAM2,".",TX_END -SelectMonOnBenchToSwitchWithActive: ; 38533 (e:4533) +SelectMonOnBenchToSwitchWithActiveText: ; 38533 (e:4533) db TX_START,"Select a Pok`mon on the Bench\n" db "to switch with the Active Pok`mon.",TX_END @@ -362,7 +362,7 @@ Text0149: ; 393bb (e:53bb) db TX_START,"A Basic Pok`mon was placed\n" db "on each Bench.",TX_END -WasUnsuccessful: ; 393e6 (e:53e6) +WasUnsuccessfulText: ; 393e6 (e:53e6) db TX_START,TX_RAM2,"'s\n" db TX_RAM2," was unsuccessful.",TX_END @@ -629,23 +629,23 @@ Text018e: ; 39e02 (e:5e02) db TX_START,"Received ",TX_RAM2,"\n" db "through Card Pop!",TX_END -ReceivedCard: ; 39e20 (e:5e20) +ReceivedCardText: ; 39e20 (e:5e20) db TX_START,TX_RAM1," received\n" db "a ",TX_RAM2,"!",TX_END -ReceivedPromotionalCard: ; 39e31 (e:5e31) +ReceivedPromotionalCardText: ; 39e31 (e:5e31) db TX_START,TX_RAM1," received a Promotional\n" db "card ",TX_RAM2,"!",TX_END -ReceivedLegendaryCard: ; 39e53 (e:5e53) +ReceivedLegendaryCardText: ; 39e53 (e:5e53) db TX_START,TX_RAM1," received the Legendary\n" db "card ",TX_RAM2,"!",TX_END -ReceivedPromotionalFlyingPikachu: ; 39e75 (e:5e75) +ReceivedPromotionalFlyingPikachuText: ; 39e75 (e:5e75) db TX_START,TX_RAM1," received a Promotinal\n" db "card Flyin' Pikachu!",TX_END -ReceivedPromotionalSurfingPikachu: ; 39ea3 (e:5ea3) +ReceivedPromotionalSurfingPikachuText: ; 39ea3 (e:5ea3) db TX_START,TX_RAM1," received a Promotional\n" db "card Surfin' Pikachu!",TX_END @@ -1232,10 +1232,10 @@ Text0222: ; 3b97b (e:797b) db $64,$70,$65,$70,$66,$70,$67,$70,$68,$70,$69,$70,$70,$70,$70,$70,$70,"\n" db $70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,$70,TX_END -NewDeck: ; 3ba03 (e:7a03) +NewDeckText: ; 3ba03 (e:7a03) db TX_START,"New deck",TX_END -PleaseSelectDeck: ; 3ba0d (e:7a0d) +PleaseSelectDeckText: ; 3ba0d (e:7a0d) db TX_START,"Please select deck.",TX_END Text0225: ; 3ba22 (e:7a22) @@ -1253,7 +1253,7 @@ Text0228: ; 3ba49 (e:7a49) Text0229: ; 3ba51 (e:7a51) db TX_START,"as",TX_END -ChosenAsDuelingDeck: ; 3ba55 (e:7a55) +ChosenAsDuelingDeckText: ; 3ba55 (e:7a55) db TX_START,TX_RAM2," was\n" db "chosen as the dueling deck!",TX_END @@ -1269,7 +1269,7 @@ Text022d: ; 3ba7e (e:7a7e) Text022e: ; 3ba81 (e:7a81) db $64,$77,TX_END -ThereIsNoDeckHere: ; 3ba84 (e:7a84) +ThereIsNoDeckHereText: ; 3ba84 (e:7a84) db TX_START,"There is no Deck here!",TX_END Text0230: ; 3ba9c (e:7a9c) diff --git a/src/text/text3.asm b/src/text/text3.asm index 76c4d4c..f780c92 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -922,11 +922,11 @@ Text0351: ; 3ea3a (f:6a3a) db "Print\n" db "Shut Down",TX_END -TurnedPCOn: ; 3ea69 (f:6a69) +TurnedPCOnText: ; 3ea69 (f:6a69) db TX_START,TX_RAM1,"\n" db "turned the PC on!",TX_END -TurnedPCOff: ; 3ea7e (f:6a7e) +TurnedPCOffText: ; 3ea7e (f:6a7e) db TX_START,TX_RAM1,"\n" db "turned the PC off!",TX_END @@ -1163,15 +1163,15 @@ Text0385: ; 3f2c6 (f:72c6) Text0386: ; 3f2f1 (f:72f1) db TX_START," Use ",TX_RAM3,"'s Deck",TX_END -ReceivedBoosterPack: ; 3f308 (f:7308) +ReceivedBoosterPackText: ; 3f308 (f:7308) db TX_START,TX_RAM1," received a Booster\n" db "Pack: ",TX_RAM2,".",TX_END -AndAnotherBoosterPack: ; 3f327 (f:7327) +AndAnotherBoosterPackText: ; 3f327 (f:7327) db TX_START,"...And another Booster Pack:\n" db TX_RAM2,".",TX_END -CheckedCardsInBoosterPack: ; 3f348 (f:7348) +CheckedCardsInBoosterPackText: ; 3f348 (f:7348) db TX_START,TX_RAM1," checked the cards\n" db "in the Booster Pack!!",TX_END @@ -1179,7 +1179,7 @@ Text038a: ; 3f373 (f:7373) db TX_START,"Substitute screen for\n" db "receiving cards.",TX_END -WonTheMedal: ; 3f39b (f:739b) +WonTheMedalText: ; 3f39b (f:739b) db TX_START,TX_RAM1,"\n" db "Won the ",TX_RAM2," Medal!",TX_END diff --git a/src/text/text9.asm b/src/text/text9.asm index 2249e38..f4cf489 100644 --- a/src/text/text9.asm +++ b/src/text/text9.asm @@ -889,7 +889,7 @@ Text07e5: ; 5725f (15:725f) db TX_START,"Congratulations!\n" db "You won against ",TX_RAM3," opponents!",TX_END -DefeatedFiveOpponents: ; 5728e (15:728e) +DefeatedFiveOpponentsText: ; 5728e (15:728e) db TX_START,"Congratulations!\n" db "You defeated 5 opponents!",TX_END @@ -897,7 +897,7 @@ Text07e7: ; 572ba (15:72ba) db TX_START,TX_RAM1," successfully defeated \n" db "5 opponents ",TX_START,TX_RAM3," time(s)!!!",TX_END -ConsecutiveWinRecordIncreased: ; 572ee (15:72ee) +ConsecutiveWinRecordIncreasedText: ; 572ee (15:72ee) db TX_START,TX_RAM1,"'s consecutive win\n" db "record increased to ",TX_RAM3,"!",TX_END diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index cd5c688..fce099e 100755 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -3,22 +3,22 @@ const_value = 1 TextOffsets:: ; 34000 (d:4000) db $00,$00,$00 - text DuelMenuText_Hand - text DuelMenuText_Check - text DuelMenuText_Attack - text DuelMenuText_PKMNPower - text DuelMenuText_Done - text DuelMenuText_Type - text CardInfoPageText_Retreat - text CardInfoPageText_Weakness - text CardInfoPageText_Resistance - text CardInfoPageText_PKMNPWR + text HandText + text CheckText + text AttackText + text PKMNPowerText + text DoneText + text TypeText + text RetreatText + text WeaknessText + text ResistanceText + text PKMNPWRText text Text000b - text CardInfoPageText_Length - text CardInfoPageText_Weight - text CardInfoPageText_Pokemon + text LengthText + text WeightText + text PokemonText text Text000f - text CardInfoPageText_lbs + text lbsText text Text0011 text Text0012 text Text0013 @@ -37,33 +37,33 @@ TextOffsets:: ; 34000 (d:4000) text Text0020 text Text0021 text Text0022 - text NoPokemonOnTheBench - text UnableDueToSleep - text UnableDueToParalysis - text Received10DamageDueToPoison - text Received20DamageDueToPoison - text IsStillAsleep - text IsCuredOfSleep - text IsCuredOfParalysis + text NoPokemonOnTheBenchText + text UnableDueToSleepText + text UnableDueToParalysisText + text Received10DamageDueToPoisonText + text Received20DamageDueToPoisonText + text IsStillAsleepText + text IsCuredOfSleepText + text IsCuredOfParalysisText text Text002b text Text002c text Text002d text Text002e - text YesOrNo + text YesOrNoText text DiscardName text Text0031 text Text0032 text Text0033 text Text0034 - text PokemonsAttack + text PokemonsAttackText text Text0036 text Text0037 text Text0038 text Text0039 text Text003a text Text003b - text NoSelectableAttack - text UnableToRetreat + text NoSelectableAttackText + text UnableToRetreatText text Text003e text Text003f text Text0040 @@ -81,13 +81,13 @@ TextOffsets:: ; 34000 (d:4000) text Text004c text Text004d text Text004e - text DamageToSelfDueToConfusion + text DamageToSelfDueToConfusionText text Text0050 text Text0051 text Text0052 text Text0053 text Text0054 - text TransmissionError + text TransmissionErrorText text Text0056 text Text0057 text Text0058 @@ -120,25 +120,25 @@ TextOffsets:: ; 34000 (d:4000) text Text0073 text Text0074 text Text0075 - text Decision - text DuelWasDraw - text WonDuel - text LostDuel - text StartSuddenDeathMatch + text DecisionText + text DuelWasDrawText + text WonDuelText + text LostDuelText + text StartSuddenDeathMatchText text Text007b text Text007c text Text007d text Text007e text Text007f text Text0080 - text WasKnockedOut + text WasKnockedOutText text Text0082 text Text0083 text Text0084 text Text0085 text Text0086 text Text0087 - text DuelistIsThinking + text DuelistIsThinkingText text Text0089 text Text008a text Text008b @@ -164,9 +164,9 @@ TextOffsets:: ; 34000 (d:4000) text Text009f text Text00a0 text Text00a1 - text ResetBackUpRam + text ResetBackUpRamText text Text00a3 - text NoCardsInHand + text NoCardsInHandText text Text00a5 text Text00a6 text Text00a7 @@ -194,7 +194,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00bd text Text00be text Text00bf - text NotEnoughEnergyCards + text NotEnoughEnergyCardsText text Text00c1 text Text00c2 text Text00c3 @@ -205,7 +205,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00c8 text Text00c9 text Text00ca - text CannotUseDueToStatus + text CannotUseDueToStatusText text Text00cc text Text00cd text Text00ce @@ -214,7 +214,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00d1 text Text00d2 text Text00d3 - text UnableDueToToxicGas + text UnableDueToToxicGasText text Text00d5 text Text00d6 text Text00d7 @@ -255,24 +255,24 @@ TextOffsets:: ; 34000 (d:4000) text Text00fa text Text00fb text Text00fc - text AttackUnsuccessful - text UnableToRetreatDueToAcid - text UnableToUseTrainerDueToHeadache - text UnableToAttackDueToTailWag - text UnableToAttackDueToLeer - text UnableToAttackDueToBoneAttack - text UnableToUseAttackDueToAmnesia - text KnockedOutDueToDestinyBond - text ReceivesDamageDueToStrikesBack - text UnableToEvolveDueToPrehistoricPower - text NoDamageOrEffectDueToFly - text NoDamageOrEffectDueToBarrier - text NoDamageOrEffectDueToAgility - text UnableToUseAttackDueToNShield - text NoDamageOrEffectDueToNShield - text NoDamageOrEffectDueToTransparency + text AttackUnsuccessfulText + text UnableToRetreatDueToAcidText + text UnableToUseTrainerDueToHeadacheText + text UnableToAttackDueToTailWagText + text UnableToAttackDueToLeerText + text UnableToAttackDueToBoneAttackText + text UnableToUseAttackDueToAmnesiaText + text KnockedOutDueToDestinyBondText + text ReceivesDamageDueToStrikesBackText + text UnableToEvolveDueToPrehistoricPowerText + text NoDamageOrEffectDueToFlyText + text NoDamageOrEffectDueToBarrierText + text NoDamageOrEffectDueToAgilityText + text UnableToUseAttackDueToNShieldText + text NoDamageOrEffectDueToNShieldText + text NoDamageOrEffectDueToTransparencyText text Text010d - text SelectMonOnBenchToSwitchWithActive + text SelectMonOnBenchToSwitchWithActiveText text Text010f text Text0110 text Text0111 @@ -332,7 +332,7 @@ TextOffsets:: ; 34000 (d:4000) text Text0147 text Text0148 text Text0149 - text WasUnsuccessful + text WasUnsuccessfulText text Text014b text Text014c text Text014d @@ -401,11 +401,11 @@ TextOffsets:: ; 34000 (d:4000) text Text018c text Text018d text Text018e - text ReceivedCard - text ReceivedPromotionalCard - text ReceivedLegendaryCard - text ReceivedPromotionalFlyingPikachu - text ReceivedPromotionalSurfingPikachu + text ReceivedCardText + text ReceivedPromotionalCardText + text ReceivedLegendaryCardText + text ReceivedPromotionalFlyingPikachuText + text ReceivedPromotionalSurfingPikachuText text Text0194 text Text0195 text Text0196 @@ -549,19 +549,19 @@ TextOffsets:: ; 34000 (d:4000) text Text0220 text Text0221 text Text0222 - text NewDeck - text PleaseSelectDeck + text NewDeckText + text PleaseSelectDeckText text Text0225 text Text0226 text Text0227 text Text0228 text Text0229 - text ChosenAsDuelingDeck + text ChosenAsDuelingDeckText text Text022b text Text022c text Text022d text Text022e - text ThereIsNoDeckHere + text ThereIsNoDeckHereText text Text0230 text Text0231 text Text0232 @@ -852,8 +852,8 @@ TextOffsets:: ; 34000 (d:4000) text Text034f text Text0350 text Text0351 - text TurnedPCOn - text TurnedPCOff + text TurnedPCOnText + text TurnedPCOffText text Text0354 text Text0355 text Text0356 @@ -905,11 +905,11 @@ TextOffsets:: ; 34000 (d:4000) text Text0384 text Text0385 text Text0386 - text ReceivedBoosterPack - text AndAnotherBoosterPack - text CheckedCardsInBoosterPack + text ReceivedBoosterPackText + text AndAnotherBoosterPackText + text CheckedCardsInBoosterPackText text Text038a - text WonTheMedal + text WonTheMedalText text Text038c text Text038d text Text038e @@ -2024,9 +2024,9 @@ TextOffsets:: ; 34000 (d:4000) text Text07e3 text Text07e4 text Text07e5 - text DefeatedFiveOpponents + text DefeatedFiveOpponentsText text Text07e7 - text ConsecutiveWinRecordIncreased + text ConsecutiveWinRecordIncreasedText text Text07e9 text Text07ea text Text07eb |