diff options
| -rw-r--r-- | asm/rom3.s | 14 | ||||
| -rw-r--r-- | data/data2.s | 38 |
2 files changed, 26 insertions, 26 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 603644633..ecba1f0b9 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 gUnknownText_0842C7B6 +_080490B0: .4byte gUnknown_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 gUnknownText_0842C7CA +_0804A240: .4byte gUnknown_0842C7CA _0804A244: ldr r0, _0804A2A4 ldr r0, [r0, 0x14] @@ -129247,9 +129247,9 @@ _0804A3D4: bls _0804A3B8 b _0804A404 .align 2, 0 -_0804A3E8: .4byte gUnknownText_0820C33C +_0804A3E8: .4byte gUnknown_0820C33C _0804A3EC: .4byte gMoveNames -_0804A3F0: .4byte gUnknownText_0842C7CB +_0804A3F0: .4byte gUnknown_0842C7CB _0804A3F4: ldr r1, _0804A414 adds r0, r6, 0 @@ -129266,8 +129266,8 @@ _0804A404: pop {r0} bx r0 .align 2, 0 -_0804A414: .4byte gUnknownText_0820C33C -_0804A418: .4byte gUnknownText_0842C7D6 +_0804A414: .4byte gUnknown_0820C33C +_0804A418: .4byte gUnknown_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 gUnknownText_0842C640 +_0804D488: .4byte gUnknown_0842C640 _0804D48C: ldr r2, [r6] adds r1, r2, 0 diff --git a/data/data2.s b/data/data2.s index c04e5e98c..0a5d336b6 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1218,17 +1218,17 @@ gUnknown_0820C334: @ 820C334 .global gUnknown_0820C335 gUnknown_0820C335: @ 820C335 .incbin "baserom.gba", 0x0020c335, 0x7 - - .global gUnknownText_0820C33C -gUnknownText_0820C33C: + + .global gUnknown_0820C33C +gUnknown_0820C33C: .string "$" - .global gUnknownText_0820C33D -gUnknownText_0820C33D: @ 820C33D + .global gUnknown_0820C33D +gUnknown_0820C33D: @ 820C33D .string "♂$" - .global gUnknownText_0820C33F -gUnknownText_0820C33F: @ 820C33F + .global gUnknown_0820C33F +gUnknown_0820C33F: @ 820C33F .string "♀$" .global gUnknown_0820C341 @@ -9894,8 +9894,8 @@ gUnknown_0842C622: @ 842C622 gUnknown_0842C62F: @ 842C62F .incbin "baserom.gba", 0x0042c62f, 0x11 - .global gUnknownText_0842C640 -gUnknownText_0842C640: @ 842C640 + .global gUnknown_0842C640 +gUnknown_0842C640: @ 842C640 .string "Take good care of {STR_VAR_3}!$" .string "CANCEL$" .string "Choose a POKéMON.$" @@ -9913,23 +9913,23 @@ gUnknownText_0842C640: @ 842C640 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend wants\nto trade POKéMON.$" .string "$" - .global gUnknownText_0842C7B6 @ trade functions? could be in-game as well -gUnknownText_0842C7B6: + .global gUnknown_0842C7B6 @ trade functions? could be in-game as well +gUnknown_0842C7B6: .string "Is this trade okay?$" - .global gUnknownText_0842C7CA -gUnknownText_0842C7CA: + .global gUnknown_0842C7CA +gUnknown_0842C7CA: .string "$" - .global gUnknownText_0842C7CB @ this is probably related to battle -gUnknownText_0842C7CB: + .global gUnknown_0842C7CB @ this is probably related to battle +gUnknown_0842C7CB: .string "\n$" .string "/$" .string "Lv$" .string "---$" - - .global gUnknownText_0842C7D6 -gUnknownText_0842C7D6: + + .global gUnknown_0842C7D6 +gUnknown_0842C7D6: .string "????$" @ 842C7DB @@ -10433,4 +10433,4 @@ gUnknown_0842F8E5: @ 842F8E5 .global gUnknown_0842F93A gUnknown_0842F93A: @ 842F93A - .incbin "baserom.gba", 0x0042f93a, 0x2a
\ No newline at end of file + .incbin "baserom.gba", 0x0042f93a, 0x2a |