diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2019-07-25 15:33:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 15:33:49 +0200 |
| commit | 46f1b78bf98cf1de7a1f85e2848126da39e53d32 (patch) | |
| tree | 5895876e715fb66d83593a3d8282c404b871115d /src/text | |
| parent | b7ee18f262b1d88582fdc55879f1abaad17cc5ce (diff) | |
| parent | d2917adab14ca8ff842ddc6430acb20e11636361 (diff) | |
Merge pull request #52 from jidoc01/master
Disassemble bank 6
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text3.asm | 8 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/text/text3.asm b/src/text/text3.asm index 04d0b05..60b3c25 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -619,11 +619,11 @@ Text02f5: ; 3d2e6 (f:52e6) line "very rare Pokémon cards!" done -Text02f6: ; 3d31c (f:531c) +PokemonCardGlossaryText: ; 3d31c (f:531c) text "Pokémon Card Glossary" done -Text02f7: ; 3d333 (f:5333) +GlossaryMenuPage1Text: ; 3d333 (f:5333) text "Deck Active Pokémon" line "Discard Pile Bench Pokémon" line "Hand Prizes " @@ -631,7 +631,7 @@ Text02f7: ; 3d333 (f:5333) line "Bench To next page " done -Text02f8: ; 3d3e0 (f:53e0) +GlossaryMenuPage2Text: ; 3d3e0 (f:53e0) text "Energy Card Pokémon Power " line "Trainer Card Weakness " line "Basic Pokémon Resistance" @@ -639,7 +639,7 @@ Text02f8: ; 3d3e0 (f:53e0) line "Attack To previous page" done -Text02f9: ; 3d48f (f:548f) +ChooseWordAndPressAButtonText: ; 3d48f (f:548f) text "Choose a word and press the" line "A button." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index cf89644..56f1f41 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -759,10 +759,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text02f3 ; 0x02f3 textpointer Text02f4 ; 0x02f4 textpointer Text02f5 ; 0x02f5 - textpointer Text02f6 ; 0x02f6 - textpointer Text02f7 ; 0x02f7 - textpointer Text02f8 ; 0x02f8 - textpointer Text02f9 ; 0x02f9 + textpointer PokemonCardGlossaryText ; 0x02f6 + textpointer GlossaryMenuPage1Text ; 0x02f7 + textpointer GlossaryMenuPage2Text ; 0x02f8 + textpointer ChooseWordAndPressAButtonText ; 0x02f9 textpointer Text02fa ; 0x02fa textpointer Text02fb ; 0x02fb textpointer Text02fc ; 0x02fc |