diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-18 20:51:43 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-18 20:51:43 -0400 |
| commit | 0429b9c3aea055dbc20c519f4d4b37b8a5e96bb1 (patch) | |
| tree | eee7374c530ccce5b2b0358c608b711f78aeea9d | |
| parent | 1cb753d3edc9cbbcd2de2ce7d02c9c8e3402e20c (diff) | |
| parent | 30871487fea3fa41bc25a806d0c4f7648649114b (diff) | |
Merge branch 'master' of https://github.com/TwitchPlaysPokemon/pokeruby
| -rw-r--r-- | data/text/battle_strings.s | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index e8baa88ab..e9195e261 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1860,8 +1860,7 @@ gUnknown_0840164C:: @ 840164C .2byte BATTLE_TEXT_SubTookDamage .2byte BATTLE_TEXT_CoinScatter .2byte BATTLE_TEXT_SandTombTrapped - - .incbin "baserom.gba", 0x401658, 0x4 + .2byte 0xFFFF .align 2 gUnknown_0840165C:: @ 840165C |