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

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source
This commit is contained in:
Diegoisawesome
2018-01-07 18:47:05 -06:00
parent a11c65ff1a 75c359e300
commit 75f9c16504
1232 changed files with 50110 additions and 7001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_8170478.s
+25 -24
View File
@@ -10,33 +10,33 @@ gUnknown_085E5088:: @ 85E5088
.align 2
gUnknown_085E5094:: @ 85E5094
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ec
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ed
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ee
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ef
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f0
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f1
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f2
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f3
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f4
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f5
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f6
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f7
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ec
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ed
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ee
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ef
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f0
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f1
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f2
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f3
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f4
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f5
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f6
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f7
.align 2
gUnknown_085E50F4:: @ 85E50F4
obj_pal gUnknown_08C1A564, 0xd6ec
obj_pal gUnknown_08C1A564, 0xd6ed
obj_pal gUnknown_08C1A564, 0xd6ee
obj_pal gUnknown_08C1A564, 0xd6ef
obj_pal gUnknown_08C1A564, 0xd6f0
obj_pal gUnknown_08C1A564, 0xd6f1
obj_pal gUnknown_08C1A564, 0xd6f2
obj_pal gUnknown_08C1A564, 0xd6f3
obj_pal gUnknown_08C1A564, 0xd6f4
obj_pal gUnknown_08C1A564, 0xd6f5
obj_pal gUnknown_08C1A564, 0xd6f6
obj_pal gUnknown_08C1A564, 0xd6f7
obj_pal gBattleAnimSpritePalette_136, 0xd6ec
obj_pal gBattleAnimSpritePalette_136, 0xd6ed
obj_pal gBattleAnimSpritePalette_136, 0xd6ee
obj_pal gBattleAnimSpritePalette_136, 0xd6ef
obj_pal gBattleAnimSpritePalette_136, 0xd6f0
obj_pal gBattleAnimSpritePalette_136, 0xd6f1
obj_pal gBattleAnimSpritePalette_136, 0xd6f2
obj_pal gBattleAnimSpritePalette_136, 0xd6f3
obj_pal gBattleAnimSpritePalette_136, 0xd6f4
obj_pal gBattleAnimSpritePalette_136, 0xd6f5
obj_pal gBattleAnimSpritePalette_136, 0xd6f6
obj_pal gBattleAnimSpritePalette_136, 0xd6f7
.align 2
gUnknown_085E5154:: @ 85E5154
@@ -140,6 +140,7 @@ gUnknown_085E5310:: @ 85E5310
.2byte 0x0100, 0x0503, 0x0506, 0x0004
.align 2
gUnknown_085E5338:: @ 85E5338
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2