diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-05-14 06:30:05 +0100 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-05-15 12:36:14 -0400 |
| commit | 81bdfa1c93e6c2442d2dea4eb9a4262ea9a4d146 (patch) | |
| tree | 1e7ca47fce6e204c9045d1b5dc94fe9734aaf133 /data | |
| parent | 6425294d0d20782e8280c20fdac78397faed81b2 (diff) | |
dissassembled some incbins related to battle texts
get rid of // comment use
added textparc tool for incbin processing
revise charmap functions and dissassemble another incbin
revise charmap.txt again
cleaned up charmap.txt and corrected incorrect info about control characters
remove textparc, will push to a seperate fork somewhere later
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 60 |
1 files changed, 39 insertions, 21 deletions
diff --git a/data/data2.s b/data/data2.s index 379106496..2714c74af 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1218,10 +1218,10 @@ gUnknown_0820C334: @ 820C334 .global gUnknown_0820C335 gUnknown_0820C335: @ 820C335 .incbin "baserom.gba", 0x0020c335, 0x7 - - .global gUnknown_0820C33C -gUnknown_0820C33C: @ 820C33C - .incbin "baserom.gba", 0x0020c33c, 0x1 + + .global gUnknownText_0820C33C +gUnknownText_0820C33C: + .string "$" .global gUnknown_0820C33D gUnknown_0820C33D: @ 820C33D @@ -9894,25 +9894,43 @@ gUnknown_0842C622: @ 842C622 gUnknown_0842C62F: @ 842C62F .incbin "baserom.gba", 0x0042c62f, 0x11 - .global gUnknown_0842C640 -gUnknown_0842C640: @ 842C640 - .incbin "baserom.gba", 0x0042c640, 0x176 - - .global gUnknown_0842C7B6 -gUnknown_0842C7B6: @ 842C7B6 - .incbin "baserom.gba", 0x0042c7b6, 0x14 + .global gUnknownText_0842C640 +gUnknownText_0842C640: @ 842C640 + .string "Take good care of {STR_VAR_3}!$" + .string "CANCEL$" + .string "Choose a POKéMON.$" + .string "SUMMARY$" + .string "TRADE$" + .string "Cancel trade?$" + .string "Press the B Button to exit.$" + .string "SUMMARY$" + .string "TRADE$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}Link standby...\nPlease wait.$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}The trade has\nbeen canceled.$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}That’s your only\nPOKéMON for battle.$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}Your friend can’t\ntrade that one.$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}Waiting for your\nfriend to finish...$" + .string "{COLOR}{DARK_GREY}{HIGHLIGHT}{WHITE2}{SHADOW}{LIGHT_GREY}Your friend wants\nto trade POKéMON.$" + .string "$" - .global gUnknown_0842C7CA -gUnknown_0842C7CA: @ 842C7CA - .incbin "baserom.gba", 0x0042c7ca, 0x1 + .global gUnknownText_0842C7B6 @ trade functions? could be in-game as well +gUnknownText_0842C7B6: + .string "Is this trade okay?$" - .global gUnknown_0842C7CB -gUnknown_0842C7CB: @ 842C7CB - .incbin "baserom.gba", 0x0042c7cb, 0xb + .global gUnknownText_0842C7CA +gUnknownText_0842C7CA: + .string "$" - .global gUnknown_0842C7D6 -gUnknown_0842C7D6: @ 842C7D6 - .incbin "baserom.gba", 0x0042c7d6, 0x5 + .global gUnknownText_0842C7CB @ this is probably related to battle +gUnknownText_0842C7CB: + .string "\n$" + .string "/$" + .string "Lv$" + .string "---$" + + .global gUnknownText_0842C7D6 +gUnknownText_0842C7D6: + .string "????$" @ 842C7DB .include "data/text/easy_chat/group_name_strings.s" @@ -10415,4 +10433,4 @@ gUnknown_0842F8E5: @ 842F8E5 .global gUnknown_0842F93A gUnknown_0842F93A: @ 842F93A - .incbin "baserom.gba", 0x0042f93a, 0x2a + .incbin "baserom.gba", 0x0042f93a, 0x2a
\ No newline at end of file |