pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch' of https://github.com/mid-kid/pokecrystal

Browse Source 
# Conflicts:
#	constants/sprite_anim_constants.asm
#	data/sprite_anims/framesets.asm
#	data/sprite_anims/oam.asm
This commit is contained in:
Remy Oukaour
2018-01-12 17:23:50 -05:00
parent 59c95abf83 5b7773b7d3
commit d054116458
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/sprite_anims/framesets.asm
View File

@@ -9,7 +9,7 @@ SpriteAnimFrameData: ; 8d6e6
dw .Frameset_PartyMonWithItemFast
dw .Frameset_GSTitleTrail
dw .Frameset_TextEntryCursor
dw .Frameset_Unused09
dw .Frameset_TextEntryCursorBig
dw .Frameset_GameFreakLogo
dw .Frameset_GSIntroStar
dw .Frameset_GSIntroSparkle
@@ -133,8 +133,8 @@ SpriteAnimFrameData: ; 8d6e6
dorepeat 1
dorestart
.Frameset_Unused09:
frame SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09, 1
.Frameset_TextEntryCursorBig:
frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
dorepeat 1
dorestart