diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-07-27 19:52:45 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-07-27 19:52:45 +0200 |
| commit | 5621850eb451524b3f7c2ac2d036fd27a918ec30 (patch) | |
| tree | 41dd8333737012d14a35fe9fcd5527d87b114a0b /src/text | |
| parent | 25ccfe9112f1666cdeace67898c2a99362e4c855 (diff) | |
Bank 1 disasm
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 4 | ||||
| -rw-r--r-- | src/text/text2.asm | 2 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index f773960..d4124c2 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -171,7 +171,7 @@ IsCuredOfParalysisText: ; 36539 (d:6539) line "cured of Paralysis." done -Text002b: ; 36553 (d:6553) +BetweenTurnsText: ; 36553 (d:6553) text "Between Turns." done @@ -406,7 +406,7 @@ FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74) line "without Attacking." done -Text005e: ; 36a9a (d:6a9a) +DuelistsTurnText: ; 36a9a (d:6a9a) text "<RAMNAME>'s Turn." done diff --git a/src/text/text2.asm b/src/text/text2.asm index 5afb3c6..845e9c5 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -18,7 +18,7 @@ ConfusionCheckRetreatText: ; 380ac (e:40ac) line "If Tails, unable to Retreat." done -Text00f9: ; 380db (e:40db) +PokemonsSleepCheckText: ; 380db (e:40db) text "<RAMTEXT>'s Sleep check." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index e2e1725..5f817b6 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -44,7 +44,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer IsStillAsleepText ; 0x0028 textpointer IsCuredOfSleepText ; 0x0029 textpointer IsCuredOfParalysisText ; 0x002a - textpointer Text002b ; 0x002b + textpointer BetweenTurnsText ; 0x002b textpointer Text002c ; 0x002c textpointer Text002d ; 0x002d textpointer Text002e ; 0x002e @@ -79,9 +79,9 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text004b ; 0x004b textpointer Text004c ; 0x004c textpointer Text004d ; 0x004d - textpointer KnockOutText ; 0x004e + textpointer KnockOutText ; 0x004e textpointer DamageToSelfDueToConfusionText ; 0x004f - textpointer ChooseEnergyCardToDiscardText ; 0x0050 + textpointer ChooseEnergyCardToDiscardText ; 0x0050 textpointer Text0051 ; 0x0051 textpointer Text0052 ; 0x0052 textpointer YouPlayFirstText ; 0x0053 @@ -95,7 +95,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer RetreatWasUnsuccessfulText ; 0x005b textpointer WillUseThePokemonPowerText ; 0x005c textpointer FinishedTurnWithoutAttackingText ; 0x005d - textpointer Text005e ; 0x005e + textpointer DuelistsTurnText ; 0x005e textpointer Text005f ; 0x005f textpointer Text0060 ; 0x0060 textpointer PlacedOnTheBenchText ; 0x0061 @@ -192,7 +192,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00bc ; 0x00bc textpointer Text00bd ; 0x00bd textpointer Text00be ; 0x00be - textpointer EnergyCardsRequiredToRetreatText ; 0x00bf + textpointer EnergyCardsRequiredToRetreatText ; 0x00bf textpointer NotEnoughEnergyCardsText ; 0x00c0 textpointer Text00c1 ; 0x00c1 textpointer Text00c2 ; 0x00c2 @@ -250,7 +250,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer TransparencyCheckText ; 0x00f6 textpointer ConfusionCheckDamageText ; 0x00f7 textpointer ConfusionCheckRetreatText ; 0x00f8 - textpointer Text00f9 ; 0x00f9 + textpointer PokemonsSleepCheckText ; 0x00f9 textpointer Text00fa ; 0x00fa textpointer Text00fb ; 0x00fb textpointer Text00fc ; 0x00fc |