dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge with master and fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-09-23 20:36:00 +02:00
parent 601fc9e85b a57915fa5b
commit 7bb0fcf182
200 changed files with 23492 additions and 30189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
data/battle_scripts_1.s
View File

@@ -322,10 +322,43 @@ BattleScript_CurseTurnDmg:: @ 82DB350
.incbin "baserom.gba", 0x2db350, 0x11
BattleScript_TargetPRLZHeal:: @ 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
BattleScript_ItemSteal:: @ 82DB422
.incbin "baserom.gba", 0x2db422, 0xe