diff options
| -rwxr-xr-x | src/engine/bank1.asm | 52 | ||||
| -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 | 40 | ||||
| -rwxr-xr-x | src/text/text1.asm | 86 | ||||
| -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 | 156 |
11 files changed, 219 insertions, 219 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 50a7b0e..ca7c836 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 Text00a2 ; reset back up ram? + text_hl ResetBackUpRam 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 Text0076 ; decision... + text_hl Decision 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 Text0077 ; duel was a draw + text_hl DuelWasDraw jr .asm_4196 .activeDuelistWonBattle @@ -159,7 +159,7 @@ StartDuel: ; 409f (1:409f) ld [$d0c3], a ld a, $5d ld c, $18 - text_hl Text0078 ; won duel + text_hl WonDuel jr .asm_4196 .activeDuelistLostBattle @@ -172,7 +172,7 @@ StartDuel: ; 409f (1:409f) ld [$d0c3], a ld a, $5e ld c, $19 - text_hl Text0079 ; lost duel + text_hl LostDuel .asm_4196 call Func_3b6a @@ -203,7 +203,7 @@ StartDuel: ; 409f (1:409f) call Func_3b31 ld a, [wDuelTheme] call PlaySong - text_hl Text007a ; sudden-death match + text_hl StartSuddenDeathMatch 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 Text0088 ; is thinking + text_hl DuelistIsThinking 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 Text010e ; select pokemon on bench to switch + text_hl SelectMonOnBenchToSwitchWithActive call DrawWideTextBox_WaitForInput call $600c jr c, Func_441c @@ -427,7 +427,7 @@ PlayerRetreat: ; 43ab (1:43ab) call $4f9d Func_43e8: ; 43e8 - text_hl Text003d ; unable to retreat + text_hl UnableToRetreat 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 Text010e ; select pokemon on bench to switch + text_hl SelectMonOnBenchToSwitchWithActive 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 Text00a4 ; no cards in hand + text_hl NoCardsInHand call DrawWideTextBox_WaitForInput jp Func_4295 @@ -494,7 +494,7 @@ OpenBattleAttackMenu: ; 46fc (1:46fc) call LoadPokemonAttacksToDuelPointerTable or a jr nz, .openAttackMenu - text_hl Text003c ; no selectable attack + text_hl NoSelectableAttack 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 Text00c0 ; not enough energy cards + text_hl NotEnoughEnergyCards call DrawWideTextBox_WaitForInput jr .tryOpenAttackMenu @@ -747,12 +747,12 @@ CheckIfActiveCardParalyzedOrAsleep: ; 4918 (1:4918) or a ret -.paralyzed: - text_hl Text0025 ; paralyzed +.paralyzed + text_hl UnableDueToParalysis jr .returnWithStatusCondition -.asleep: - text_hl Text0024 ; asleep +.asleep + text_hl UnableDueToSleep .returnWithStatusCondition: scf @@ -833,16 +833,16 @@ ConvertTrainerCardToPokemon: ret .dataToOverwrite - db 10 ; hp - ds $07 ; wCardBuffer1Move1Name - (wCardBuffer1HP + 1) - tx Text0030 ; move1 name - tx Text0041 ; move1 description - ds $03 ; wCardBuffer1Move1Category - (wCardBuffer1Move1Description + 2) - db POKEMON_POWER ; move1 category + db 10 ; hp + ds $07 ; wCardBuffer1Move1Name - (wCardBuffer1HP + 1) + tx DiscardName ; move1 name + tx DiscardDescription ; move1 description + ds $03 ; wCardBuffer1Move1Category - (wCardBuffer1Move1Description + 2) + db POKEMON_POWER ; move1 category dw TrainerCardAsPokemonEffectCommands ; move1 effect commands - ds $18 ; wCardBuffer1RetreatCost - (wCardBuffer1Move1EffectCommands + 2) - db UNABLE_RETREAT ; retreat cost - ds $0d ; PKMN_CARD_DATA_LENGTH - (wCardBuffer1RetreatCost + 1 - wCardBuffer1) + ds $18 ; wCardBuffer1RetreatCost - (wCardBuffer1Move1EffectCommands + 2) + db UNABLE_RETREAT ; retreat cost + ds $0d ; PKMN_CARD_DATA_LENGTH - (wCardBuffer1RetreatCost + 1 - wCardBuffer1) INCBIN "baserom.gbc",$6df1,$7107 - $6df1 diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm index 7901f9e..c2b587b 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 Text0224 + text_hl PleaseSelectDeck 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 Text022a + text_hl ChosenAsDuelingDeck call DrawWideTextBox_WaitForInput ld a, [$ceb1] jp Func_8dbc Func_8fe8: ; 8fe8 (2:4fe8) - text_hl Text022f + text_hl ThereIsNoDeckHere call DrawWideTextBox_WaitForInput ld a, [$ceb1] ret @@ -703,7 +703,7 @@ Func_926e: ; 926e (2:526e) ret .asm_929c call Func_22ae - text_hl Text0223 + text_hl NewDeck call Func_2c29 scf ret diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index f4fb571..d884ce2 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 Text0352 ; turned PC on + text_hl TurnedPCOn 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 Text0353 ; turned PC off + text_hl TurnedPCOff call $4891 call Func_c111 xor a diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm index dd51647..ebeeb96 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 Text038b + text_hl WonTheMedal 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 Text0387 + text_hl ReceivedBoosterPack ld a, [$d117] cp $1 jr nz, .asm_10373 - text_hl Text0388 + text_hl AndAnotherBoosterPack .asm_10373 call Func_2c73 call Func_3c96 call Func_37a0 - text_hl Text0389 + text_hl CheckedCardsInBoosterPack 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 Text07e6 + text_hl DefeatedFiveOpponents 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 Text07e8 + text_hl ConsecutiveWinRecordIncreased call Func_2c73 call Func_3c96 call Func_37a0 diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm index 8fb9996..39011da 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 Text0191 + text_hl ReceivedLegendaryCard jr .asm_1a660 .asm_1a640 - text_hl Text018f + text_hl ReceivedCard cp $1e jr z, .asm_1a660 cp $43 jr z, .asm_1a660 - text_hl Text0192 + text_hl ReceivedPromotionalFlyingPikachu cp $64 jr z, .asm_1a660 - text_hl Text0193 + text_hl ReceivedPromotionalSurfingPikachu cp $65 jr z, .asm_1a660 cp $66 jr z, .asm_1a660 - text_hl Text0190 + text_hl ReceivedPromotionalCard .asm_1a660 push hl ld e, a diff --git a/src/engine/home.asm b/src/engine/home.asm index dd1ff77..3fd56ed 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 Text0055 ; transmission error + text_hl TransmissionError 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 Text004f ; 20 self-confusion damage + text_hl DamageToSelfDueToConfusion 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 Text0081 ; was knocked out + text_hl WasKnockedOut 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 Text0035 ; text when using an attack (?) + text_hl PokemonsAttack ; 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 Text014a ; was unsuccessful + text_hl WasUnsuccessful call DrawWideTextBox_PrintText scf ret @@ -3145,7 +3145,7 @@ PrintOpponentName: ; 1c8e (0:1c8e) jr z, .printPlayer2 jr printNameLoop .printPlayer2 - text_hl Text0092 ; player 2 + text_hl Player2 jp PrintTextBoxBorderLabel ; 0x1caa @@ -4647,7 +4647,7 @@ Func_2af0: ; 2af0 (0:2af0) Func_2b66: ; 2b66 (0:2b66) call AdjustCoordinatesForWindow - text_hl Text002f ; yes no + text_hl YesOrNo call Func_2c1b ret ; 0x2b70 @@ -5886,13 +5886,13 @@ CheckIfCantAttackDueToAttackEffect:: ; 33c1 (0:33c1) call GetTurnDuelistVariable or a ret z - text_hl Text0100 ; tail wag + text_hl UnableToAttackDueToTailWag cp $05 jr z, .returnWithCantAttack - text_hl Text0101 ; leer + text_hl UnableToAttackDueToLeer cp $06 jr z, .returnWithCantAttack - text_hl Text0102 ; bone attack + text_hl UnableToAttackDueToBoneAttack 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 Text0103 ; amnesia + text_hl UnableToUseAttackDueToAmnesia scf ret @@ -5930,7 +5930,7 @@ Func_3400: ; 3400 (0:3400) ld [wcc0a], a ccf ret nc - text_hl Text00fd ; attack unsuccessful + text_hl AttackUnsuccessful call DrawWideTextBox_WaitForInput scf ret @@ -5964,15 +5964,15 @@ Func_3432: ; 3432 (0:3432) ld a, $e7 call GetTurnDuelistVariable ld e, $3 - text_hl Text0107 ; fly + text_hl NoDamageOrEffectDueToFly cp $d jr z, .asm_346a ld e, $2 - text_hl Text0108 ; barrier + text_hl NoDamageOrEffectDueToBarrier cp $14 jr z, .asm_346a ld e, $1 - text_hl Text0109 ; agility + text_hl NoDamageOrEffectDueToAgility 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 Text010b ; n shield + text_hl NoDamageOrEffectDueToNShield 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 Text010c ; transparency + text_hl NoDamageOrEffectDueToTransparency scf ret ; 0x34b7 @@ -6049,13 +6049,13 @@ Func_34f0: ; 34f0 (0:34f0) ld a, DUELVARS_ARENA_CARD_STATUS call GetTurnDuelistVariable and $f - text_hl Text00cb ; sleep, paralysis or confusion + text_hl CannotUseDueToStatus scf jr nz, .asm_3508 .asm_3500 ld a, $27 call Func_3509 - text_hl Text00d4 ; toxic gas + text_hl UnableDueToToxicGas .asm_3508 ret @@ -6198,7 +6198,7 @@ Func_36a2: ; 36a2 (0:36a2) push af push hl call Func_1a96 - text_hl Text0105 ; strikes back + text_hl ReceivesDamageDueToStrikesBack call DrawWideTextBox_PrintText pop hl pop af diff --git a/src/text/text1.asm b/src/text/text1.asm index 3d10001..19fe206 100755 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1,49 +1,49 @@ -Text0001: ; 3630a (d:630a) +DuelMenuText_Hand: ; 3630a (d:630a) db TX_START,"Hand",TX_END -Text0002: ; 36310 (d:6310) +DuelMenuText_Check: ; 36310 (d:6310) db TX_START,"Check",TX_END -Text0003: ; 36317 (d:6317) +DuelMenuText_Attack: ; 36317 (d:6317) db TX_START,"Attack",TX_END -Text0004: ; 3631f (d:631f) +DuelMenuText_PKMNPower: ; 3631f (d:631f) db TX_START,"PKMN Power",TX_END -Text0005: ; 3632b (d:632b) +DuelMenuText_Done: ; 3632b (d:632b) db TX_START,"Done",TX_END -Text0006: ; 36331 (d:6331) +DuelMenuText_Type: ; 36331 (d:6331) db TX_START,"Type",TX_END -Text0007: ; 36337 (d:6337) +CardInfoPageText_Retreat: ; 36337 (d:6337) db TX_START,"Retreat",TX_END -Text0008: ; 36340 (d:6340) +CardInfoPageText_Weakness: ; 36340 (d:6340) db TX_START,"Weakness",TX_END -Text0009: ; 3634a (d:634a) +CardInfoPageText_Resistance: ; 3634a (d:634a) db TX_START,"Resistance",TX_END -Text000a: ; 36356 (d:6356) +CardInfoPageText_PKMNPWR: ; 36356 (d:6356) db TX_START,"PKMN PWR",TX_END Text000b: ; 36360 (d:6360) db $56,$19,$33,$3d,$16,$78,$4c,TX_END -Text000c: ; 36368 (d:6368) +CardInfoPageText_Length: ; 36368 (d:6368) db TX_START,"Length",TX_END -Text000d: ; 36370 (d:6370) +CardInfoPageText_Weight: ; 36370 (d:6370) db TX_START,"Weight",TX_END -Text000e: ; 36378 (d:6378) +CardInfoPageText_Pokemon: ; 36378 (d:6378) db TX_START," Pok`mon",TX_END Text000f: ; 36382 (d:6382) db $03,$4c,TX_END -Text0010: ; 36385 (d:6385) +CardInfoPageText_lbs: ; 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 -Text0023: ; 3646e (d:646e) +NoPokemonOnTheBench: ; 3646e (d:646e) db TX_START,"No Pok`mon on the Bench.",TX_END -Text0024: ; 36488 (d:6488) +UnableDueToSleep: ; 36488 (d:6488) db TX_START,"Unable to due to Sleep.",TX_END -Text0025: ; 364a1 (d:64a1) +UnableDueToParalysis: ; 364a1 (d:64a1) db TX_START,"Unable to due to Paralysis.",TX_END -Text0026: ; 364be (d:64be) +Received10DamageDueToPoison: ; 364be (d:64be) db TX_START,TX_RAM2," received\n" db "10 damage due to Poison.",TX_END -Text0027: ; 364e3 (d:64e3) +Received20DamageDueToPoison: ; 364e3 (d:64e3) db TX_START,TX_RAM2," received\n" db "20 damage due to Double Poison.",TX_END -Text0028: ; 3650f (d:650f) +IsStillAsleep: ; 3650f (d:650f) db TX_START,TX_RAM2," is\n" db "still Asleep.",TX_END -Text0029: ; 36523 (d:6523) +IsCuredOfSleep: ; 36523 (d:6523) db TX_START,TX_RAM2," is\n" db "cured of Sleep.",TX_END -Text002a: ; 36539 (d:6539) +IsCuredOfParalysis: ; 36539 (d:6539) db TX_START,TX_RAM2," is\n" db "cured of Paralysis.",TX_END @@ -141,10 +141,10 @@ Text002d: ; 36576 (d:6576) Text002e: ; 36588 (d:6588) db TX_START,"Is this OK?",TX_END -Text002f: ; 36595 (d:6595) +YesOrNo: ; 36595 (d:6595) db TX_START,"Yes No",TX_END -Text0030: ; 365a1 (d:65a1) +DiscardName: ; 365a1 (d:65a1) db TX_START,"Discard",TX_END Text0031: ; 365aa (d:65aa) @@ -159,7 +159,7 @@ Text0033: ; 365be (d:65be) Text0034: ; 365c7 (d:65c7) db TX_START,"Received damage",TX_END -Text0035: ; 365d8 (d:65d8) +PokemonsAttack: ; 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 -Text003c: ; 366af (d:66af) +NoSelectableAttack: ; 366af (d:66af) db TX_START,"No selectable Attack",TX_END -Text003d: ; 366c5 (d:66c5) +UnableToRetreat: ; 366c5 (d:66c5) db TX_START,"Unable to Retreat.",TX_END Text003e: ; 366d9 (d:66d9) @@ -204,7 +204,7 @@ Text0040: ; 3671f (d:671f) db TX_START,"You do not need to select the\n" db "Pok`mon Power to use it.",TX_END -Text0041: ; 36757 (d:6757) +DiscardDescription: ; 36757 (d:6757) db TX_START,"You may discard this card during\n" db "your turn.\n" db "It will be counted as a Knock Out\n" @@ -256,7 +256,7 @@ Text004d: ; 3685a (d:685a) Text004e: ; 36861 (d:6861) db TX_START,"Knock Out",TX_END -Text004f: ; 3686c (d:686c) +DamageToSelfDueToConfusion: ; 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 -Text0055: ; 36947 (d:6947) +TransmissionError: ; 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 -Text0076: ; 36da4 (d:6da4) +Decision: ; 36da4 (d:6da4) db TX_START,"Decision...",TX_END -Text0077: ; 36db1 (d:6db1) +DuelWasDraw: ; 36db1 (d:6db1) db TX_START,"The Duel with ",TX_RAM1,"\n" db "was a Draw!",TX_END -Text0078: ; 36dce (d:6dce) +WonDuel: ; 36dce (d:6dce) db TX_START,"You won the Duel with ",TX_RAM1,"!",TX_END -Text0079: ; 36de8 (d:6de8) +LostDuel: ; 36de8 (d:6de8) db TX_START,"You lost the Duel\n" db "with ",TX_RAM1,"...",TX_END -Text007a: ; 36e05 (d:6e05) +StartSuddenDeathMatch: ; 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 -Text0081: ; 36eaa (d:6eaa) +WasKnockedOut: ; 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 -Text0088: ; 36f4a (d:6f4a) +DuelistIsThinking: ; 36f4a (d:6f4a) db TX_START,TX_RAM1," is thinking.",TX_END Text0089: ; 36f5a (d:6f5a) @@ -498,7 +498,7 @@ Text0090: ; 36fbc (d:6fbc) Text0091: ; 36fca (d:6fca) db TX_START,"Player 1",TX_END -Text0092: ; 36fd4 (d:6fd4) +Player2: ; 36fd4 (d:6fd4) db TX_START,"Player 2",TX_END Text0093: ; 36fde (d:6fde) @@ -584,7 +584,7 @@ Text00a0: ; 37284 (d:7284) Text00a1: ; 37294 (d:7294) db TX_START,"End without Prizes?",TX_END -Text00a2: ; 372a9 (d:72a9) +ResetBackUpRam: ; 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 -Text00a4: ; 37348 (d:7348) +NoCardsInHand: ; 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 -Text00c0: ; 37781 (d:7781) +NotEnoughEnergyCards: ; 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 -Text00cb: ; 378bc (d:78bc) +CannotUseDueToStatus: ; 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 -Text00d4: ; 37a0a (d:7a0a) +UnableDueToToxicGas: ; 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 b0d3800..a073788 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 -Text00fd: ; 38197 (e:4197) +AttackUnsuccessful: ; 38197 (e:4197) db TX_START,"Attack unsuccessful.",TX_END -Text00fe: ; 381ad (e:41ad) +UnableToRetreatDueToAcid: ; 381ad (e:41ad) db TX_START,"Unable to Retreat due to\n" db "the effects of Acid.",TX_END -Text00ff: ; 381dc (e:41dc) +UnableToUseTrainerDueToHeadache: ; 381dc (e:41dc) db TX_START,"Unable to use a Trainer card\n" db "due to the effects of Headache.",TX_END -Text0100: ; 3821a (e:421a) +UnableToAttackDueToTailWag: ; 3821a (e:421a) db TX_START,"Unable to Attack due to\n" db "the effects of Tail wag.",TX_END -Text0101: ; 3824c (e:424c) +UnableToAttackDueToLeer: ; 3824c (e:424c) db TX_START,"Unable to Attack due to\n" db "the effects of Leer.",TX_END -Text0102: ; 3827a (e:427a) +UnableToAttackDueToBoneAttack: ; 3827a (e:427a) db TX_START,"Unable to Attack due to\n" db "the effects of Bone attack.",TX_END -Text0103: ; 382af (e:42af) +UnableToUseAttackDueToAmnesia: ; 382af (e:42af) db TX_START,"Unable to use this Attack\n" db "due to the effects of Amnesia.",TX_END -Text0104: ; 382e9 (e:42e9) +KnockedOutDueToDestinyBond: ; 382e9 (e:42e9) db TX_START,TX_RAM2," was Knocked Out\n" db "due to the effects of Destiny Bond.",TX_END -Text0105: ; 38320 (e:4320) +ReceivesDamageDueToStrikesBack: ; 38320 (e:4320) db TX_START,TX_RAM2," receives ",TX_RAM3," damage\n" db "due to the effects of Strikes Back.",TX_END -Text0106: ; 38359 (e:4359) +UnableToEvolveDueToPrehistoricPower: ; 38359 (e:4359) db TX_START,"Unable to evolve due to the\n" db "effects of Prehistoric Power.",TX_END -Text0107: ; 38394 (e:4394) +NoDamageOrEffectDueToFly: ; 38394 (e:4394) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Fly.",TX_END -Text0108: ; 383d3 (e:43d3) +NoDamageOrEffectDueToBarrier: ; 383d3 (e:43d3) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Barrier.",TX_END -Text0109: ; 38416 (e:4416) +NoDamageOrEffectDueToAgility: ; 38416 (e:4416) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of Agility.",TX_END -Text010a: ; 38459 (e:4459) +UnableToUseAttackDueToNShield: ; 38459 (e:4459) db TX_START,"Unable to use this Attack due to\n" db "the effects of N Shield.",TX_END -Text010b: ; 38494 (e:4494) +NoDamageOrEffectDueToNShield: ; 38494 (e:4494) db TX_START,"No damage or effect on next Attack\n" db "due to the effects of N Shield.",TX_END -Text010c: ; 384d8 (e:44d8) +NoDamageOrEffectDueToTransparency: ; 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 -Text010e: ; 38533 (e:4533) +SelectMonOnBenchToSwitchWithActive: ; 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 -Text014a: ; 393e6 (e:53e6) +WasUnsuccessful: ; 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 -Text018f: ; 39e20 (e:5e20) +ReceivedCard: ; 39e20 (e:5e20) db TX_START,TX_RAM1," received\n" db "a ",TX_RAM2,"!",TX_END -Text0190: ; 39e31 (e:5e31) +ReceivedPromotionalCard: ; 39e31 (e:5e31) db TX_START,TX_RAM1," received a Promotional\n" db "card ",TX_RAM2,"!",TX_END -Text0191: ; 39e53 (e:5e53) +ReceivedLegendaryCard: ; 39e53 (e:5e53) db TX_START,TX_RAM1," received the Legendary\n" db "card ",TX_RAM2,"!",TX_END -Text0192: ; 39e75 (e:5e75) +ReceivedPromotionalFlyingPikachu: ; 39e75 (e:5e75) db TX_START,TX_RAM1," received a Promotinal\n" db "card Flyin' Pikachu!",TX_END -Text0193: ; 39ea3 (e:5ea3) +ReceivedPromotionalSurfingPikachu: ; 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 -Text0223: ; 3ba03 (e:7a03) +NewDeck: ; 3ba03 (e:7a03) db TX_START,"New deck",TX_END -Text0224: ; 3ba0d (e:7a0d) +PleaseSelectDeck: ; 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 -Text022a: ; 3ba55 (e:7a55) +ChosenAsDuelingDeck: ; 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 -Text022f: ; 3ba84 (e:7a84) +ThereIsNoDeckHere: ; 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 de8239c..76c4d4c 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 -Text0352: ; 3ea69 (f:6a69) +TurnedPCOn: ; 3ea69 (f:6a69) db TX_START,TX_RAM1,"\n" db "turned the PC on!",TX_END -Text0353: ; 3ea7e (f:6a7e) +TurnedPCOff: ; 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 -Text0387: ; 3f308 (f:7308) +ReceivedBoosterPack: ; 3f308 (f:7308) db TX_START,TX_RAM1," received a Booster\n" db "Pack: ",TX_RAM2,".",TX_END -Text0388: ; 3f327 (f:7327) +AndAnotherBoosterPack: ; 3f327 (f:7327) db TX_START,"...And another Booster Pack:\n" db TX_RAM2,".",TX_END -Text0389: ; 3f348 (f:7348) +CheckedCardsInBoosterPack: ; 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 -Text038b: ; 3f39b (f:739b) +WonTheMedal: ; 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 29a1324..2249e38 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 -Text07e6: ; 5728e (15:728e) +DefeatedFiveOpponents: ; 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 -Text07e8: ; 572ee (15:72ee) +ConsecutiveWinRecordIncreased: ; 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 501eff4..cd5c688 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 Text0001 - text Text0002 - text Text0003 - text Text0004 - text Text0005 - text Text0006 - text Text0007 - text Text0008 - text Text0009 - text Text000a + 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 Text000b - text Text000c - text Text000d - text Text000e + text CardInfoPageText_Length + text CardInfoPageText_Weight + text CardInfoPageText_Pokemon text Text000f - text Text0010 + text CardInfoPageText_lbs text Text0011 text Text0012 text Text0013 @@ -37,37 +37,37 @@ TextOffsets:: ; 34000 (d:4000) text Text0020 text Text0021 text Text0022 - text Text0023 - text Text0024 - text Text0025 - text Text0026 - text Text0027 - text Text0028 - text Text0029 - text Text002a + text NoPokemonOnTheBench + text UnableDueToSleep + text UnableDueToParalysis + text Received10DamageDueToPoison + text Received20DamageDueToPoison + text IsStillAsleep + text IsCuredOfSleep + text IsCuredOfParalysis text Text002b text Text002c text Text002d text Text002e - text Text002f - text Text0030 + text YesOrNo + text DiscardName text Text0031 text Text0032 text Text0033 text Text0034 - text Text0035 + text PokemonsAttack text Text0036 text Text0037 text Text0038 text Text0039 text Text003a text Text003b - text Text003c - text Text003d + text NoSelectableAttack + text UnableToRetreat text Text003e text Text003f text Text0040 - text Text0041 + text DiscardDescription text Text0042 text Text0043 text Text0044 @@ -81,13 +81,13 @@ TextOffsets:: ; 34000 (d:4000) text Text004c text Text004d text Text004e - text Text004f + text DamageToSelfDueToConfusion text Text0050 text Text0051 text Text0052 text Text0053 text Text0054 - text Text0055 + text TransmissionError text Text0056 text Text0057 text Text0058 @@ -120,25 +120,25 @@ TextOffsets:: ; 34000 (d:4000) text Text0073 text Text0074 text Text0075 - text Text0076 - text Text0077 - text Text0078 - text Text0079 - text Text007a + text Decision + text DuelWasDraw + text WonDuel + text LostDuel + text StartSuddenDeathMatch text Text007b text Text007c text Text007d text Text007e text Text007f text Text0080 - text Text0081 + text WasKnockedOut text Text0082 text Text0083 text Text0084 text Text0085 text Text0086 text Text0087 - text Text0088 + text DuelistIsThinking text Text0089 text Text008a text Text008b @@ -148,7 +148,7 @@ TextOffsets:: ; 34000 (d:4000) text Text008f text Text0090 text Text0091 - text Text0092 + text Player2 text Text0093 text Text0094 text Text0095 @@ -164,9 +164,9 @@ TextOffsets:: ; 34000 (d:4000) text Text009f text Text00a0 text Text00a1 - text Text00a2 + text ResetBackUpRam text Text00a3 - text Text00a4 + text NoCardsInHand text Text00a5 text Text00a6 text Text00a7 @@ -194,7 +194,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00bd text Text00be text Text00bf - text Text00c0 + text NotEnoughEnergyCards text Text00c1 text Text00c2 text Text00c3 @@ -205,7 +205,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00c8 text Text00c9 text Text00ca - text Text00cb + text CannotUseDueToStatus text Text00cc text Text00cd text Text00ce @@ -214,7 +214,7 @@ TextOffsets:: ; 34000 (d:4000) text Text00d1 text Text00d2 text Text00d3 - text Text00d4 + text UnableDueToToxicGas text Text00d5 text Text00d6 text Text00d7 @@ -255,24 +255,24 @@ TextOffsets:: ; 34000 (d:4000) text Text00fa text Text00fb text Text00fc - text Text00fd - text Text00fe - text Text00ff - text Text0100 - text Text0101 - text Text0102 - text Text0103 - text Text0104 - text Text0105 - text Text0106 - text Text0107 - text Text0108 - text Text0109 - text Text010a - text Text010b - text Text010c + 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 Text010d - text Text010e + text SelectMonOnBenchToSwitchWithActive text Text010f text Text0110 text Text0111 @@ -332,7 +332,7 @@ TextOffsets:: ; 34000 (d:4000) text Text0147 text Text0148 text Text0149 - text Text014a + text WasUnsuccessful text Text014b text Text014c text Text014d @@ -401,11 +401,11 @@ TextOffsets:: ; 34000 (d:4000) text Text018c text Text018d text Text018e - text Text018f - text Text0190 - text Text0191 - text Text0192 - text Text0193 + text ReceivedCard + text ReceivedPromotionalCard + text ReceivedLegendaryCard + text ReceivedPromotionalFlyingPikachu + text ReceivedPromotionalSurfingPikachu text Text0194 text Text0195 text Text0196 @@ -549,19 +549,19 @@ TextOffsets:: ; 34000 (d:4000) text Text0220 text Text0221 text Text0222 - text Text0223 - text Text0224 + text NewDeck + text PleaseSelectDeck text Text0225 text Text0226 text Text0227 text Text0228 text Text0229 - text Text022a + text ChosenAsDuelingDeck text Text022b text Text022c text Text022d text Text022e - text Text022f + text ThereIsNoDeckHere text Text0230 text Text0231 text Text0232 @@ -852,8 +852,8 @@ TextOffsets:: ; 34000 (d:4000) text Text034f text Text0350 text Text0351 - text Text0352 - text Text0353 + text TurnedPCOn + text TurnedPCOff text Text0354 text Text0355 text Text0356 @@ -905,11 +905,11 @@ TextOffsets:: ; 34000 (d:4000) text Text0384 text Text0385 text Text0386 - text Text0387 - text Text0388 - text Text0389 + text ReceivedBoosterPack + text AndAnotherBoosterPack + text CheckedCardsInBoosterPack text Text038a - text Text038b + text WonTheMedal text Text038c text Text038d text Text038e @@ -2024,9 +2024,9 @@ TextOffsets:: ; 34000 (d:4000) text Text07e3 text Text07e4 text Text07e5 - text Text07e6 + text DefeatedFiveOpponents text Text07e7 - text Text07e8 + text ConsecutiveWinRecordIncreased text Text07e9 text Text07ea text Text07eb |