diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
| commit | 8d5250fdaad7b50abd05cdee2e0cedfef99cdcbc (patch) | |
| tree | 05d6a27744a82014df531be24531d81b4d5f82ed /data/battle_scripts_1.s | |
| parent | 6f481cceb1b56c5d63ba045f7ca7f1ac7151332b (diff) | |
| parent | e7f91c65d9983ba9944bd7d09f8fe0cf245669d2 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'data/battle_scripts_1.s')
| -rw-r--r-- | data/battle_scripts_1.s | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ca599631c..156a8e1c4 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -322,10 +322,43 @@ BattleScript_CurseTurnDmg:: @ 82DB350 .incbin "baserom.gba", 0x2db350, 0x11 gUnknown_082DB361:: @ 82DB361 - .incbin "baserom.gba", 0x2db361, 0x17 + .incbin "baserom.gba", 0x2db361, 0x9 + +gUnknown_082DB36A:: @ 82DB36A + .incbin "baserom.gba", 0x2db36A, 0xE BattleScript_YawnMakesAsleep:: @ 82DB378 - .incbin "baserom.gba", 0x2db378, 0xaa + .incbin "baserom.gba", 0x2db378, 0xE + +gUnknown_082DB386:: @ 82DB386 + .incbin "baserom.gba", 0x2db386, 0xF + +gUnknown_082DB395:: @ 82DB395 + .incbin "baserom.gba", 0x2db395, 0xF + +gUnknown_082DB3A4:: @ 82DB3A4 + .incbin "baserom.gba", 0x2db3A4, 0xF + +gUnknown_082DB3B3:: @ 82DB3B3 + .incbin "baserom.gba", 0x2db3B3, 0xF + +gUnknown_082DB3C2:: @ 82DB3C2 + .incbin "baserom.gba", 0x2db3C2, 0x7 + +gUnknown_082DB3C9:: @ 82DB3C9 + .incbin "baserom.gba", 0x2db3C9, 0xD + +gUnknown_082DB3D6:: @ 82DB3D6 + .incbin "baserom.gba", 0x2db3D6, 0x7 + +gUnknown_082DB3DD:: @ 82DB3DD + .incbin "baserom.gba", 0x2db3DD, 0x9 + +gUnknown_082DB3E6:: @ 82DB3E6 + .incbin "baserom.gba", 0x2db3E6, 0xE + +gUnknown_082DB3F4:: @ 82DB3F4 + .incbin "baserom.gba", 0x2db3F4, 0x2e gUnknown_082DB422:: @ 82DB422 .incbin "baserom.gba", 0x2db422, 0xe |