Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Identify more G/S intro OAM data

This commit is contained in:
Remy Oukaour 2018-01-02 17:05:40 -05:00
parent e6778f931d
commit 41de67edbd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/sprite_anim_constants.asm
View File

@ -195,9 +195,9 @@
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2 ; 12
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3 ; 13
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4 ; 14
const SPRITE_ANIM_OAMSET_UNUSED_15 ; 15
const SPRITE_ANIM_OAMSET_UNUSED_16 ; 16
const SPRITE_ANIM_OAMSET_UNUSED_17 ; 17
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1 ; 15
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2 ; 16
const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3 ; 17
const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL ; 18
const SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL ; 19
const SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL ; 1a

8
data/sprite_anims/oam.asm
View File

@ -22,9 +22,9 @@ SpriteAnimOAMData: ; 8d94d
dbw $44, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2
dbw $48, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3
dbw $4c, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4
dbw $80, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_15
dbw $85, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_16
dbw $8a, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_17
dbw $80, .OAMData_GSIntroPikachuTail ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1
dbw $85, .OAMData_GSIntroPikachuTail ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2
dbw $8a, .OAMData_GSIntroPikachuTail ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3
dbw $00, .OAMData_IntroUnownF2_1 ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL
dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL
dbw $09, .OAMData_GSIntroBigFireball ; SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL
@ -432,7 +432,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -1, 0, -1, 4, $00, 0
dsprite 0, 0, -1, 4, $10, 0
.OAMData_Unused15_17:
.OAMData_GSIntroPikachuTail:
db 5
dsprite -2, 0, 3, 0, $00, 0
dsprite -2, 0, 4, 0, $01, 0