diff options
| -rw-r--r-- | asm/rom3.s | 14 | ||||
| -rw-r--r-- | charmap.txt | 49 | ||||
| -rw-r--r-- | data/data2.s | 72 |
3 files changed, 98 insertions, 37 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index ecba1f0b9..603644633 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -126815,7 +126815,7 @@ sub_8049088: @ 8049088 pop {r0} bx r0 .align 2, 0 -_080490B0: .4byte gUnknown_0842C7B6 +_080490B0: .4byte gUnknownText_0842C7B6 _080490B4: .4byte 0x03004824 _080490B8: .4byte 0x06010000 thumb_func_end sub_8049088 @@ -129040,7 +129040,7 @@ _0804A230: .4byte 0x02020004 _0804A234: .4byte gUnknown_0820C29C _0804A238: .4byte gUnknown_0820C334 _0804A23C: .4byte gUnknown_0820C335 -_0804A240: .4byte gUnknown_0842C7CA +_0804A240: .4byte gUnknownText_0842C7CA _0804A244: ldr r0, _0804A2A4 ldr r0, [r0, 0x14] @@ -129247,9 +129247,9 @@ _0804A3D4: bls _0804A3B8 b _0804A404 .align 2, 0 -_0804A3E8: .4byte gUnknown_0820C33C +_0804A3E8: .4byte gUnknownText_0820C33C _0804A3EC: .4byte gMoveNames -_0804A3F0: .4byte gUnknown_0842C7CB +_0804A3F0: .4byte gUnknownText_0842C7CB _0804A3F4: ldr r1, _0804A414 adds r0, r6, 0 @@ -129266,8 +129266,8 @@ _0804A404: pop {r0} bx r0 .align 2, 0 -_0804A414: .4byte gUnknown_0820C33C -_0804A418: .4byte gUnknown_0842C7D6 +_0804A414: .4byte gUnknownText_0820C33C +_0804A418: .4byte gUnknownText_0842C7D6 thumb_func_end sub_804A33C thumb_func_start sub_804A41C @@ -135015,7 +135015,7 @@ _0804D43E: .align 2, 0 _0804D480: .4byte 0x00000173 _0804D484: .4byte 0x020234cc -_0804D488: .4byte gUnknown_0842C640 +_0804D488: .4byte gUnknownText_0842C640 _0804D48C: ldr r2, [r6] adds r1, r2, 0 diff --git a/charmap.txt b/charmap.txt index 0bd2b7c9d..cd7f3c7e1 100644 --- a/charmap.txt +++ b/charmap.txt @@ -255,9 +255,6 @@ PK = 53 PKMN = 53 54 POKEBLOCK = 55 56 57 58 59 -@ indicates the end of a town/city name (before " TOWN" or " CITY") -NAME_END = FC 00 - @ string placeholders @ unknown (FD 00) PLAYER = FD 01 @@ -275,6 +272,52 @@ GOOD_TEAM_LEADER = FD 0B @ "ARCHIE" / "MAXIE" CUR_VERSION_MASCOT = FD 0C @ "GROUDON" / "KYOGRE" OPP_VERSION_MASCOT = FD 0D @ "KYOGRE" / "GROUDON" +@ indicates the end of a town/city name (before " TOWN" or " CITY") +NAME_END = FC 00 + +@ more text functions + +COLOR = FC 01 @ use a color listed below right after +HIGHLIGHT = FC 02 @ same as fc 01 +SHADOW = FC 03 @ same as fc 01 +COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes +@ FD 05 unknown +SIZE = FC 06 @ note that anything other than "SMALL" is invalid +@ FC 07 unknown +PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them +PAUSE_UNTIL_PRESS = FC 09 +@ 0A and 0B are unknown +ESCAPE = FC 0C +SHIFT_TEXT = FC 0D +@ 0E and 0F are unknown +PLAY_MUSIC = FC 10 +@ 10-14 are unknown +ENLARGE = FC 15 +SET_TO_DEFAULT_SIZE = FC 16 +PAUSE_MUSIC = FC 17 +RESUME_MUSIC = FC 18 + +@ colors + +TRANSPARENT = 00 +DARK_GREY = 01 +RED = 02 +GREEN = 03 +BLUE = 04 +YELLOW = 05 +CYAN = 06 +MAGENTA = 07 +LIGHT_GREY = 08 +BLACK = 09 +BLACK2 = 0A @ duplicate of black? +SILVER = 0B +WHITE = 0C +SKY_BLUE = 0D +LIGHT_BLUE = 0E +WHITE2 = 0F @ duplicate of white? + +@ for wait and shift, use \x00 to print the byte so constants dont need to be defined + '\l' = FA @ scroll up window text '\p' = FB @ new paragraph '\n' = FE @ new line diff --git a/data/data2.s b/data/data2.s index 379106496..c04e5e98c 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1218,18 +1218,18 @@ gUnknown_0820C334: @ 820C334 .global gUnknown_0820C335 gUnknown_0820C335: @ 820C335 .incbin "baserom.gba", 0x0020c335, 0x7 + + .global gUnknownText_0820C33C +gUnknownText_0820C33C: + .string "$" - .global gUnknown_0820C33C -gUnknown_0820C33C: @ 820C33C - .incbin "baserom.gba", 0x0020c33c, 0x1 - - .global gUnknown_0820C33D -gUnknown_0820C33D: @ 820C33D - .incbin "baserom.gba", 0x0020c33d, 0x2 + .global gUnknownText_0820C33D +gUnknownText_0820C33D: @ 820C33D + .string "♂$" - .global gUnknown_0820C33F -gUnknown_0820C33F: @ 820C33F - .incbin "baserom.gba", 0x0020c33f, 0x2 + .global gUnknownText_0820C33F +gUnknownText_0820C33F: @ 820C33F + .string "♀$" .global gUnknown_0820C341 gUnknown_0820C341: @ 820C341 @@ -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 |