diff options
author | Daniel Harding <33dannye@gmail.com> | 2021-02-15 13:25:02 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-15 13:25:02 -0600 |
commit | 456a6d2378b967d59e4c07edf17313f334341892 (patch) | |
tree | ba0877ba507c5116b10e2628e4eb3ab2a3fbccac /src/text | |
parent | c708b288d4f978b7e269c934233a7db747d91a53 (diff) | |
parent | 9a74ae3bc62fe1aa1c6ef33cdac4df324fd44e57 (diff) |
Merge pull request #97 from dannye/master
Script command clean up and Overworld map menu logic
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 7699e08..a05ca19 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -1604,19 +1604,19 @@ Text03a6: ; 3f631 (f:7631) Text03a7: ; 3f643 (f:7643) done -Text03a8: ; 3f644 (f:7644) +ColosseumBoosterText: ; 3f644 (f:7644) text "COLOSSEUM" done -Text03a9: ; 3f64f (f:764f) +EvolutionBoosterText: ; 3f64f (f:764f) text "EVOLUTION" done -Text03aa: ; 3f65a (f:765a) +MysteryBoosterText: ; 3f65a (f:765a) text "MYSTERY" done -Text03ab: ; 3f663 (f:7663) +LaboratoryBoosterText: ; 3f663 (f:7663) text "LABORATORY" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index ff757fe..3f1d87d 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -937,10 +937,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text03a5 ; 0x03a5 textpointer Text03a6 ; 0x03a6 textpointer Text03a7 ; 0x03a7 - textpointer Text03a8 ; 0x03a8 - textpointer Text03a9 ; 0x03a9 - textpointer Text03aa ; 0x03aa - textpointer Text03ab ; 0x03ab + textpointer ColosseumBoosterText ; 0x03a8 + textpointer EvolutionBoosterText ; 0x03a9 + textpointer MysteryBoosterText ; 0x03aa + textpointer LaboratoryBoosterText ; 0x03ab textpointer DrMasonNPCName ; 0x03ac textpointer RonaldNPCName ; 0x03ad textpointer IshiharaNPCName ; 0x03ae |