diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-24 23:36:40 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-24 23:36:40 -0700 |
| commit | b2eeda7ddcff4cf01fc6e1b8b8fafad15b7ed306 (patch) | |
| tree | 15158ec08a6192e8e666d59e1eb357db1e903597 | |
| parent | 74957cfce6aab30816393ae4976e312e2574279a (diff) | |
in-game trade mail
| -rw-r--r-- | asm/rom_8040EB4.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 3 | ||||
| -rw-r--r-- | data/ingame_trades.s | 26 |
3 files changed, 27 insertions, 4 deletions
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 67ee5c939..5021c71aa 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -25497,7 +25497,7 @@ _0804DAEE: pop {r0} bx r0 .align 2, 0 -_0804DB28: .4byte gUnknown_08215B78 +_0804DB28: .4byte gIngameTradeMail thumb_func_end sub_804DAD4 thumb_func_start sub_804DB2C diff --git a/data/data2.s b/data/data2.s index 627159c27..225900137 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2633,9 +2633,6 @@ gUnknown_08215AC0:: @ 8215AC0 @ 8215AC4 .include "data/ingame_trades.s" -gUnknown_08215B78:: @ 8215B78 - .incbin "baserom.gba", 0x00215b78, 0x28 - gUnknown_08215BA0:: @ 8215BA0 .incbin "baserom.gba", 0x00215ba0, 0x6c diff --git a/data/ingame_trades.s b/data/ingame_trades.s index 8b91aaeff..1eb5a59c4 100644 --- a/data/ingame_trades.s +++ b/data/ingame_trades.s @@ -80,3 +80,29 @@ gIngameTrades:: @ 8215AC4 .byte 10 @ sheen .2byte SPECIES_BELLOSSOM @ player mon species .space 2 + + .align 1 +gIngameTradeMail:: @ 8215B78 + @ 0 + ec_pokemon1 PIKACHU + ec_word THANK_YOU + ec_word EXCL + ec_word MY + ec_pokemon1 SKITTY + ec_word EATS + ec_word A_LOT + ec_word NOW + ec_word EXCL + .2byte 0 + + @ 1 + ec_word I + ec_word WANT + ec_word TO + ec_word SEE + ec_word A + ec_move2 PETAL_DANCE + ec_word IT_S + ec_word SO + ec_word PRETTY + .2byte 0 |