Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

4
data/sprite_anims/oam.asm
View File

@@ -34,7 +34,7 @@ SpriteAnimOAMData: ; 8d94d
dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
dbw $00, .OAMData_ForUnusedFrameset09 ; SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09
dbw $00, .OAMData_TextEntryCursorBig ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG
dbw $00, .OAMData_GSIntroGameFreakLogo ; SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO
dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
@@ -458,7 +458,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP
dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_ForUnusedFrameset09:
.OAMData_TextEntryCursorBig:
db 10
dsprite -1, 7, 0, 0, $00, 0
dsprite -1, 7, 1, 0, $01, 0