diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 12:56:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 12:56:45 +0200 |
| commit | 28da80e19af3270b827e98c2e7c69c0199d14d05 (patch) | |
| tree | 6afb2df5bfa686bbb8f1d5e1c912361633f96733 /data | |
| parent | b4875d82d50b0649c2289b9e470ca0a9ae23782d (diff) | |
battle 4 up to SetMoveEffect
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_message.s | 2 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/battle_message.s b/data/battle_message.s index 93a921b5e..df6380640 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -596,7 +596,7 @@ gUnknown_085CC23E:: @ 85CC23E gUnknown_085CC270:: @ 85CC270 .incbin "baserom.gba", 0x5cc270, 0x5c4 -gUnknown_085CC834:: @ 85CC834 +gMissStringIds:: @ 85CC834 .incbin "baserom.gba", 0x5cc834, 0x14e gUnknown_085CC982:: @ 85CC982 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index aab0de4e3..23ef731d1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -246,10 +246,10 @@ BattleScript_MagicCoatBounce:: @ 82DB194 BattleScript_SnatchedMove:: @ 82DB1AC .incbin "baserom.gba", 0x2db1ac, 0x1b -gUnknown_082DB1C7:: @ 82DB1C7 +BattleScript_EnduredMsg:: @ 82DB1C7 .incbin "baserom.gba", 0x2db1c7, 0x7 -gUnknown_082DB1CE:: @ 82DB1CE +BattleScript_OneHitKOMsg:: @ 82DB1CE .incbin "baserom.gba", 0x2db1ce, 0x7 gUnknown_082DB1D5:: @ 82DB1D5 @@ -450,7 +450,7 @@ gUnknown_082DB6D9:: @ 82DB6D9 gUnknown_082DB6F0:: @ 82DB6F0 .incbin "baserom.gba", 0x2db6f0, 0xb -gUnknown_082DB6FB:: @ 82DB6FB +BattleScript_SubstituteFade:: @ 82DB6FB .incbin "baserom.gba", 0x2db6fb, 0xb BattleScript_BerryCurePrlzEnd2:: @ 82DB706 @@ -516,7 +516,7 @@ BattleScript_ItemHealHP_Ret:: @ 82DB7F7 gUnknown_082DB812:: @ 82DB812 .incbin "baserom.gba", 0x2db812, 0x4 -gUnknown_082DB816:: @ 82DB816 +BattleScript_HangedOnMsg:: @ 82DB816 .incbin "baserom.gba", 0x2db816, 0xe BattleScript_BerryConfuseHealEnd2:: @ 82DB824 |