diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-08 11:43:54 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-08 11:43:54 -0500 |
commit | 50709682c7b1db4a1fcdfcf8080910bde2f969a1 (patch) | |
tree | a5547cbe82548abe318b280f504c695c88832b48 /data | |
parent | 21b5f78d6a38032aa49870a4c02cacfed2249ab8 (diff) |
through sub_8113FBC
Diffstat (limited to 'data')
-rw-r--r-- | data/data.s | 2 | ||||
-rw-r--r-- | data/data_83FECCC.s | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/data/data.s b/data/data.s index 5c81abcac..1c4806436 100644 --- a/data/data.s +++ b/data/data.s @@ -128,7 +128,7 @@ gSpeciesNames:: @ 8245EE0 gUnknown_8246BE5:: @ 8246BE5 .incbin "baserom.gba", 0x246BE5, 0x4AF -gUnknown_8247094:: @ 8247094 +gMoveNames:: @ 8247094 .incbin "baserom.gba", 0x247094, 0xF97 gUnknown_824802B:: @ 824802B diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 724138136..da553d83e 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1662,58 +1662,58 @@ gUnknown_841A155:: @ 841A155 .string "Previously on your quest…$" gUnknown_841A16F:: @ 841A16F - .incbin "baserom.gba", 0x41A16F, 0x24 + .string "{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.$" gUnknown_841A193:: @ 841A193 - .incbin "baserom.gba", 0x41A193, 0x3A + .string "Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.$" gUnknown_841A1CD:: @ 841A1CD - .incbin "baserom.gba", 0x41A1CD, 0x1A + .string "Took the item {STR_VAR_2} from\n{STR_VAR_1}.$" gUnknown_841A1E7:: @ 841A1E7 - .incbin "baserom.gba", 0x41A1E7, 0x29 + .string "Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.$" gUnknown_841A210:: @ 841A210 - .incbin "baserom.gba", 0x41A210, 0x10 + .string "{PLAYER} used the\n{STR_VAR_1}.$" gUnknown_841A220:: @ 841A220 - .incbin "baserom.gba", 0x41A220, 0x35 + .string "Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.$" gUnknown_841A255:: @ 841A255 - .incbin "baserom.gba", 0x41A255, 0x22 + .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.$" gUnknown_841A277:: @ 841A277 - .incbin "baserom.gba", 0x41A277, 0x39 + .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.$" gUnknown_841A2B0:: @ 841A2B0 - .incbin "baserom.gba", 0x41A2B0, 0x31 + .string "POKéMON were fully restored\nat a POKéMON CENTER.$" gUnknown_841A2E1:: @ 841A2E1 - .incbin "baserom.gba", 0x41A2E1, 0x31 + .string "{UNKNOWN_F7 0x00} had a marvelous battle\nwith the CHAMPION, {UNKNOWN_F7 0x01}.$" gUnknown_841A312:: @ 841A312 - .incbin "baserom.gba", 0x41A312, 0x37 + .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\nwhile {UNKNOWN_F7 0x02} countered with\n{UNKNOWN_F7 0x03}.$" gUnknown_841A349:: @ 841A349 - .incbin "baserom.gba", 0x41A349, 0x48 + .string "And, as a result of battling with every\nbit of power, {UNKNOWN_F7 0x00} won\nthe match.$" gUnknown_841A391:: @ 841A391 - .incbin "baserom.gba", 0x41A391, 0x49 + .string "Removed the item {STR_VAR_1} from\nthe BAG’s ITEMS POCKET and stored it\non the PC.$" gUnknown_841A3DA:: @ 841A3DA - .incbin "baserom.gba", 0x41A3DA, 0x25 + .string "{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.$" gUnknown_841A3FF:: @ 841A3FF - .incbin "baserom.gba", 0x41A3FF, 0x23 + .string "Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}’s {STR_VAR_2}.$" gUnknown_841A422:: @ 841A422 - .incbin "baserom.gba", 0x41A422, 0x55 + .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {UNKNOWN_F7 0x01}.$" gUnknown_841A477:: @ 841A477 - .incbin "baserom.gba", 0x41A477, 0x4F + .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {UNKNOWN_F7 0x01}.$" gUnknown_841A4C6:: @ 841A4C6 - .incbin "baserom.gba", 0x41A4C6, 0x3C + .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\nMULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" gUnknown_841A502:: .string "win$" |