diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-29 21:29:10 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-29 21:29:10 -0400 |
| commit | e7a66b294169572a70c65b7223ae16810e9a49a3 (patch) | |
| tree | 3a70ce34b5a66f14a069a3ade9befc57109c1ec8 /data | |
| parent | e9592bee5d1aa74a39e8879d52c0e5f105bef9c1 (diff) | |
port sub_8050F3C
Diffstat (limited to 'data')
| -rw-r--r-- | data/strings.s | 8 | ||||
| -rw-r--r-- | data/trade.s | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/strings.s b/data/strings.s index bd5c308a5..5ebdc7afa 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4407,17 +4407,17 @@ gUnknown_841E1C5:: .string "Your friend wants\n" .string "to trade POKéMON.$" -gUnknown_841E1E9:: @ 841E1E9 +gText_XWillBeSentToY:: @ 841E1E9 .string "{STR_VAR_2} will be\n" .string "sent to {STR_VAR_1}.$" -gUnknown_841E200:: @ 841E200 +gText_ByeByeVar1:: @ 841E200 .string "Bye-bye, {STR_VAR_2}!$" -gUnknown_841E20D:: @ 841E20D +gText_XSentOverY:: @ 841E20D .string "{STR_VAR_1} sent over {STR_VAR_3}.$" -gUnknown_841E21E:: @ 841E21E +gText_TakeGoodCareOfX:: @ 841E21E .string "Take good care of {STR_VAR_3}!$" gText_From:: @ 841E234 diff --git a/data/trade.s b/data/trade.s index 0102b1faf..e9ff8b289 100644 --- a/data/trade.s +++ b/data/trade.s @@ -750,7 +750,7 @@ gSpriteAnimTable_826CE74:: gUnknown_826CE7C:: @ 826CE7C obj_tiles gUnknown_8264C1C, 0x0300, 5552 -gUnknown_826CE84:: @ 826CE84 +sGlowBallSpriteTemplate:: @ 826CE84 spr_template 5552, 5551, gOamData_826CE5C, gSpriteAnimTable_826CE74, NULL, gDummySpriteAffineAnimTable, SpriteCB_TradeGlowCore gOamData_826CE9C:: |