summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-04-05 22:05:09 -0500
committerGitHub <noreply@github.com>2021-04-05 22:05:09 -0500
commitd316d1e359c7672277a9cf644acd4e40170f5968 (patch)
tree82bc44e67d6219e53fac89caff5db22c5a394b1e /data
parent22fec43f1812cb863ad699b357bd593222ae140c (diff)
Preproc all the data (#35)
* actually put C files in preproc and use it for formatted type names. Cleaned up makefile like pokeemerald * finish adding all colors and text macros to charmap * preproc all the data and use text macros * move all of wonder_mail_1 to src * unify wonder_mail and wonder_mail_mid * small code cleanup * name two more exclusive pokemon funcs * decomp a few more wonder mail funcs * clean up MemoryFill call * doc more of wonder mail in main menu
Diffstat (limited to 'data')
-rw-r--r--data/data_80B9BB8.s2
-rw-r--r--data/data_80DED44.s23
-rw-r--r--data/personality_test.s29
-rw-r--r--data/text/wonder_mail_1.inc113
4 files changed, 0 insertions, 167 deletions
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index c203289..0801563 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -2973,5 +2973,3 @@ gUnknown_80DDB24: @ 80DDB24
gUnknown_80DDB60: @ 80DDB60
.incbin "baserom.gba", 0xDDB60, 0x48
- .include "data/text/wonder_mail_1.inc"
-
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index 21f1673..ce3aad8 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -1,10 +1,5 @@
.section .rodata
- .global gUnknown_80DED44
-gUnknown_80DED44: @ 80DED44
- @ replacing .incbin "baserom.gba", 0x000ded44, 0x4
- .4byte 0x01
-
.global gUnknown_80DED48
gUnknown_80DED48: @ 80DED48
@ replacing .incbin "baserom.gba", 0x000ded48, 0x18
@@ -1211,21 +1206,3 @@ gUnknown_80E1FDC: @ 80E1FDC
.align 2,0
.string "pksdir0\0"
.align 2,0
-
- .global gUnknown_80E1FF0
-gUnknown_80E1FF0: @ 80E1FF0
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
-
- .global gUnknown_80E2008
-gUnknown_80E2008: @ 80E2008
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x06, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x02, 0x00
- .byte 0x1a, 0x00, 0x04, 0x00
- .byte 0x06, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
diff --git a/data/personality_test.s b/data/personality_test.s
index 541dec4..b6cd987 100644
--- a/data/personality_test.s
+++ b/data/personality_test.s
@@ -1837,32 +1837,3 @@ gStarters: @ 80F278E (2D Array / [Male][Female])
.byte 0x34, 0x00 @ Meowth (Quirky M)
.byte 0x15, 0x01 @ Treecko (Quirky F)
.byte 0x00, 0x00 @ End of table
-
- .global gStarterReveal
-gStarterReveal: @ 80F27C4
- .string "\n"
- .string "#+The Pokémon $m0!\0"
- .4byte gStarterReveal
-
- .global gPartnerPrompt
-gPartnerPrompt: @ 80F27DC
- .string "#+This is the final step.#W\n"
- .string "#+Who would you like to have as a partner?#P" @ #P -> scroll down
- .string "#+Choose the Pokémon you want\n"
- .string "#+as your partner from this group.\0"
- .align 2,0
- .4byte gPartnerPrompt
-
- .global gPartnerNickPrompt
-gPartnerNickPrompt: @ 80F286C
- .string "#+What is your partner~27s nickname?\0"
- .align 2,0
- .4byte gPartnerNickPrompt
-
- .global gEndIntroText
-gEndIntroText: @ 80F2898
- .string "#+OK! We~27re all set!#P"
- .string "#+Let~27s get you into the\n"
- .string "#+world of Pokémon!#P"
- .string "#+Go for it!\0"
- .align 2,0
diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc
deleted file mode 100644
index 9b50564..0000000
--- a/data/text/wonder_mail_1.inc
+++ /dev/null
@@ -1,113 +0,0 @@
-gUnknown_80DDBA8:: @ 80DDBA8
- .string " What you need to do is\n"
- .string "tell your friend--the one you rescued--\n"
- .string "this here password.\0"
- .align 2, 0
-
-gUnknown_80DDBFC:: @ 80DDBFC
- .string " All righty!\n"
- .string "Here~27s your #CGA-OK Mail password#R.\0"
- .align 2, 0
-
-gUnknown_80DDC30:: @ 80DDC30
- .string " Okeydoke! That~27s all done.\n"
- .string "Come around whenever you need.\0"
- .align 2, 0
-
-gUnknown_80DDC70:: @ 80DDC70
- .string " Okeydoke! I sent off your\n"
- .string "#CGA-OK Mail#R.#P"
- .string " Let me save your adventure.\0"
- .align 2, 0
-
-gUnknown_80DDCBC:: @ 80DDCBC
- .string "#+Please choose the Pokémon you want to\n"
- .string "#+send as a helper to your friend.\n"
- .string "#+(Its hold item will not be sent.)\0"
- .align 2, 0
-
-gUnknown_80DDD2C:: @ 80DDD2C
- .string " ...Uh~2c no?\n"
- .string "There appear to be no Pokémon in your\n"
- .string "Friend Areas. What do you want to do?\0"
- .align 2, 0
-
-gUnknown_80DDD88:: @ 80DDD88
- .string " You~27re sure you want to\n"
- .string "send this here Pokémon?\0"
- .align 2, 0
-
-gUnknown_80DDDBC:: @ 80DDDBC
- .string " You~27re sure about this?\0"
- .align 2, 0
-
-gUnknown_80DDDD8:: @ 80DDDD8
- .string " All righty. I need you to\n"
- .string "pick the #CGA-OK Mail#R you want to send.\0"
- .align 2, 0
-
-gUnknown_80DDE20:: @ 80DDE20
- .string " ...Uh~2c no?\n"
- .string "I don~27t see any #CGA-OK Mail#R here.\0"
- .align 2, 0
-
-gUnknown_80DDE58:: @ 80DDE58
- .string " Did you know? If you use\n"
- .string "a #CGGame Link cable#R~2c you can send\n"
- .string "a #CGhelper Pokémon#R to your friend.\0"
- .align 2, 0
-
-gUnknown_80DDEC0:: @ 80DDEC0
- .string " Don~27t you worry. Sending\n"
- .string "a Pokémon doesn~27t mean it will go away.\n"
- .string "So! Want to send one to your friend?\0"
- .align 2, 0
-
-gUnknown_80DDF2C:: @ 80DDF2C
- .string " ...Uh~2c no?\n"
- .string "There~27s no space at all to receive\n"
- .string "any more mail.#P"
- .string " Delete some old mail~2c\n"
- .string "and then come to me to receive\n"
- .string "your mail~2c OK?\0"
- .align 2, 0
-
-gUnknown_80DDFB8:: @ 80DDFB8
- .string " All righty! Connect up\n"
- .string "the #CGGame Link cable#R~2c if you~27d please.\n"
- .string "Your friend ready~2c too?\0"
- .align 2, 0
-
-gUnknown_80DE01C:: @ 80DE01C
- .string "#+Communicating...\n"
- .string "#+Please wait with the power on.\n"
- .string "#+To cancel~2c press {B_BUTTON}.\0"
- .align 2, 0
-
-gUnknown_80DE06C:: @ 80DE06C
- .string " Okeydoke!\n"
- .string "I received your friend~27s #CGSOS Mail#R.#P"
- .string " Let me save your adventure.\0"
- .align 2, 0
-
-gUnknown_80DE0C0:: @ 80DE0C0
- .string " Okeydoke! You~27re good to go.\n"
- .string "Just give me a shout when you~27d like\n"
- .string "to go rescue your friend.\0"
- .align 2, 0
-
-gUnknown_80DE124:: @ 80DE124
- .string " OK~2c I need you to enter\n"
- .string "the #CGSOS Mail password#R that your\n"
- .string "friend gave you.\0"
- .align 2, 0
-
-gUnknown_80DE178:: @ 80DE178
- .string " How do you want to receive\n"
- .string "your friend~27s #CGSOS Mail#R?\0"
- .align 2, 0
-
-gUnknown_80DE1B4:: @ 80DE1B4
- .string " How do you want to send\n"
- .string "your #CGA-OK Mail#R?\0"
- .align 2, 0