summaryrefslogtreecommitdiff
path: root/data/text
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-03-23 12:11:10 -0500
committerGitHub <noreply@github.com>2021-03-23 12:11:10 -0500
commit2fd4f339b42c010191c199772b09ac34c580de94 (patch)
treee562899f35861ece70c292602fe6aac2f50906bf /data/text
parent7b142311a7294c4c7a943870fa5f24f0fbea604a (diff)
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C * combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu * decomp some more wonder mail funcs and label some more data * lots of data splitting and move some to src * split out more dungeon data * continue splitting out more dungeon data * doc rescue team rank/pts funcs/data and exclusive pokemon ewram * doc more sound things and decomp a func * decomp LoadTeamRankBadge and label some data members * split out rescue team and text util stuff * forgot a constant * match a few funcs and clean up a few * cleaned up sub_80A28B4
Diffstat (limited to 'data/text')
-rw-r--r--data/text/type_names.inc110
-rw-r--r--data/text/wonder_mail_1.inc202
2 files changed, 1 insertions, 311 deletions
diff --git a/data/text/type_names.inc b/data/text/type_names.inc
deleted file mode 100644
index 57913c6..0000000
--- a/data/text/type_names.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-gUnformattedTypeStrings:: @ 810AD4C
-@ (Table of pointers to each string)
-.4byte gNoneText
-.4byte gNormalText
-.4byte gFireText
-.4byte gWaterText
-.4byte gGrassText
-.4byte gElectricText
-.4byte gIceText
-.4byte gFightingText
-.4byte gPoisonText
-.4byte gGroundText
-.4byte gFlyingText
-.4byte gPsychicText
-.4byte gBugText
-.4byte gRockText
-.4byte gGhostText
-.4byte gDragonText
-.4byte gDarkText
-.4byte gSteelText
-
-.global gSteelText
-gSteelText:
-.string "Steel\0"
-.align 2,0
-
-.global gDarkText
-gDarkText:
-.string "Dark\0"
-.align 2,0
-
-.global gDragonText
-gDragonText:
-.string "Dragon\0"
-.align 2,0
-
-.global gGhostText
-gGhostText:
-.string "Ghost\0"
-.align 2,0
-
-.global gRockText
-gRockText:
-.string "Rock\0"
-.align 2,0
-
-.global gBugText
-gBugText:
-.string "Bug\0"
-.align 2,0
-
-.global gPsychicText
-gPsychicText:
-.string "Psychic\0"
-.align 2,0
-
-.global gFlyingText
-gFlyingText:
-.string "Flying\0"
-.align 2,0
-
-.global gGroundText
-gGroundText:
-.string "Ground\0"
-.align 2,0
-
-.global gPoisonText
-gPoisonText:
-.string "Poison\0"
-.align 2,0
-
-.global gFightingText
-gFightingText:
-.string "Fighting\0"
-.align 2,0
-
-.global gIceText
-gIceText:
-.string "Ice\0"
-.align 2,0
-
-.global gElectricText
-gElectricText:
-.string "Electric\0"
-.align 2,0
-
-.global gGrassText
-gGrassText:
-.string "Grass\0"
-.align 2,0
-
-.global gWaterText
-gWaterText:
-.string "Water\0"
-.align 2,0
-
-.global gFireText
-gFireText:
-.string "Fire\0"
-.align 2,0
-
-.global gNormalText
-gNormalText:
-.string "Normal\0"
-.align 2,0
-
-.global gNoneText
-gNoneText:
-.string "None\0"
-.align 2,0
diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc
index fdb94ef..9b50564 100644
--- a/data/text/wonder_mail_1.inc
+++ b/data/text/wonder_mail_1.inc
@@ -34,7 +34,7 @@ gUnknown_80DDD2C:: @ 80DDD2C
gUnknown_80DDD88:: @ 80DDD88
.string " You~27re sure you want to\n"
- .string "send this here Pokémon?\0" @ must stay .string due to encoding issues
+ .string "send this here Pokémon?\0"
.align 2, 0
gUnknown_80DDDBC:: @ 80DDDBC
@@ -111,203 +111,3 @@ gUnknown_80DE1B4:: @ 80DE1B4
.string " How do you want to send\n"
.string "your #CGA-OK Mail#R?\0"
.align 2, 0
-
-gUnknown_80DE1E4:: @ 80DE1E4
- .string " ...Uh~2c no?\n"
- .string "You don~27t have an #CGSOS Mail#R.#P"
- .string " You~27ll need to arrange\n"
- .string "to receive your friend~27s #CGSOS Mail#R first.\n"
- .string "That~27s what you need to do.\0"
- .align 2, 0
-
-gUnknown_80DE280:: @ 80DE280
- .string " Okeydoke!\n"
- .string "Let me show you to the rescue site.\0"
- .align 2, 0
-
-gUnknown_80DE2B0:: @ 80DE2B0
- .string " ...Uh~2c no?\n"
- .string "Doesn~27t look like you can go to the dungeon\n"
- .string "named in this #CGSOS Mail#R.#P"
- .string " Come see me about doing\n"
- .string "this rescue when you can actually go\n"
- .string "to that dungeon~2c all right?\0"
- .align 2, 0
-
-gUnknown_80DE368:: @ 80DE368
- .string " ...Uh~2c no?\n"
- .string "You~27ve blown this rescue mission too\n"
- .string "often. Your friend~27s team is beyond help.#P"
- .string " I~27m sorry to say this~2c\n"
- .string "but you~27ll have to tell your friend that\n"
- .string "your rescue attempts failed.\0"
- .align 2, 0
-
-gUnknown_80DE430:: @ 80DE430
- .string " Okeydoke.\n"
- .string "I~27ll need you to choose the #CGSOS Mail#R\n"
- .string "for you to go on a rescue mission.\0"
- .align 2, 0
-
-gUnknown_80DE48C:: @ 80DE48C
- .string " What kind of mail do you\n"
- .string "want to delete?\0"
- .align 2, 0
-
-gUnknown_80DE4B8:: @ 80DE4B8
- .string " All righty. Choose\n"
- .string "the #CGSOS Mail#R you don~27t need.\0"
- .align 2, 0
-
-gUnknown_80DE4F0:: @ 80DE4F0
- .string " ...Uh~2c no?\n"
- .string "You don~27t have any #CGSOS Mail#R.\0"
- .align 2, 0
-
-gUnknown_80DE524:: @ 80DE524
- .string " If you want a reward~2c #C2don~27t\n"
- .string "delete an A-OK Mail#R before getting a\n"
- .string "#CGThank-You Mail#R back for it.#P"
- .string " #C2Be careful#R if you~27re going\n"
- .string "to delete any #CGA-OK Mail#R.#P"
- .string " Okeydoke.\n"
- .string "Choose an #CGA-OK Mail#R\n"
- .string "you don~27t need anymore.\0"
- .align 2, 0
-
-gUnknown_80DE614:: @ 80DE614
- .string " ...Uh~2c no?\n"
- .string "You don~27t have any #CGA-OK Mail#R.\0"
- .align 2, 0
-
-gUnknown_80DE648:: @ 80DE648
- .string " Uh~2c OK.\n"
- .string "So~2c you want me to delete every piece\n"
- .string "of mail that you have.\0"
- .align 2, 0
-
-gUnknown_80DE694:: @ 80DE694
- .string " ...Uh~2c no?\n"
- .string "You don~27t have a single piece of\n"
- .string "mail on you!\0"
- .align 2, 0
-
-gUnknown_80DE6D4:: @ 80DE6D4
- .string " So~2c delete all your #CGSOS Mail#R~2c\n"
- .string "#CGA-OK Mail#R~2c and your #CGThank-You Mail#R?\n"
- .string "You~27re absolutely~2c positively sure?\0"
- .align 2, 0
-
-gUnknown_80DE754:: @ 80DE754
- .string " If I delete any mail~2c it~27s\n"
- .string "gone forever and ever. Bye-bye.\n"
- .string "You~27re really~2c really sure now?\0"
- .align 2, 0
-
-gUnknown_80DE7B8:: @ 80DE7B8
- .string " OK~2c then.\n"
- .string "Let me save your adventure now.\0"
- .align 2, 0
-
-gUnknown_80DE7E8:: @ 80DE7E8
- .string " Okeydoke. That~27s all done.\0"
- .align 2, 0
-
-gUnknown_80DE808:: @ 80DE808
- .string " Do you want to delete\n"
- .string "any other mail?\0"
- .align 2, 0
-
-gUnknown_80DE830:: @ 80DE830
- .string " Okeydoke.\n"
- .string "I~27ll delete #CGevery piece of mail#R.\0"
- .align 2, 0
-
-gUnknown_80DE864:: @ 80DE864
- .string " Okeydoke.\n"
- .string "Every bit of mail has been deleted.#P"
- .string " Let me save your adventure.\0"
- .align 2, 0
-
-gUnknown_80DE8B4:: @ 80DE8B4
- .string " Well~2c hello~2c there!\n"
- .string "This is the #CGFriend Rescue#R counter.\n"
- .string "What can I help you with today?\0"
- .align 2, 0
-
-gUnknown_80DE918:: @ 80DE918
- .string " Help you with anything\n"
- .string "else today?\0"
- .align 2, 0
-
-gUnknown_80DE93C:: @ 80DE93C
- .string " Come again anytime!\0"
- .align 2, 0
-
-gWonderMailErrorText:: @ 80DE954
- .string " ...Uh~2c no?\n"
- .string "Something~27s not working right here...\0"
- .align 2, 0
-
-gWonderMailNumGBAsText:: @ 80DE98C
- .string " ...Uh~2c no?\n"
- .string "The number of GBA systems isn~27t right.\n"
- .string "You~27d better try this again from the top.\0"
- .align 2, 0
-
-gWonderMailWrongModeText:: @ 80DE9F0
- .string " ...Uh~2c no? You~27re not in the\n"
- .string "same mode as your friend.\n"
- .string "You~27d better try this again from the top.\0"
- .align 2, 0
-
-gWonderMailStorageFullText:: @ 80DEA58
- .string " ...Uh~2c no?\n"
- .string "Your storage space is stuffed full.\n"
- .string "You~27d better make room and try again.\0"
- .align 2, 0
-
-gWonderMailDuplicateText:: @ 80DEAB4
- .string " ...Uh~2c no? It looks like\n"
- .string "you received this mail before.\n"
- .string "You can~27t get the same mail twice. \0"
- .align 2, 0
-
-gWonderMailNotEligibleReceiveText:: @ 80DEB18
- .string " ...Uh~2c no?\n"
- .string "You~27re not eligible to receive this mail.\0"
- .align 2, 0
-
-gWonderMailNoRoomText:: @ 80DEB54
- .string " ...Uh~2c no?\n"
- .string "There~27s no room for you to \n"
- .string "receive any more mail.#P"
- .string " You~27d better delete some\n"
- .string "mail and make room before you come see\n"
- .string "me again about receiving new mail.\0"
- .align 2, 0
-
-gWonderMailFriendErrorText:: @ 80DEC00
- .string " ...Uh~2c no? Looks like your\n"
- .string "friend didn~27t do what needed doing.\n"
- .string "You~27d better do this again from the top.\0"
- .align 2, 0
-
-gWonderMailPasswordIncorrectText:: @ 80DEC70
- .string " ...Uh~2c no?\n"
- .string "This here password looks wrong.\n"
- .string "Do you want to try that again?\0"
- .align 2, 0
-
-gWonderMailSOSPasswordIncorrectText:: @ 80DECC0
- .string " ...Uh~2c no? This password~27s\n"
- .string "not for any #CGSOS Mail#R.\0"
- .align 2, 0
-
-gWonderMailAOKMailReceivedText:: @ 80DECFC
- .string ": I received the #CGSOS Mail#R.\n"
- .string "Your adventure will be saved.\0"
- .align 2, 0
-
- .string "pksdir0\0"
- .align 2, 0