diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 16:19:04 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 16:19:04 -0500 |
| commit | ae78ee6cc8c8f47f0d7ada56848dd7a04129bf61 (patch) | |
| tree | a7ecf1dc6ee7a2ea9de6bd608e5268728d6e51ec | |
| parent | d5c8cb7496b14324db7ef682ba300425ed00e764 (diff) | |
One more G/S intro OAM identified
| -rw-r--r-- | constants/sprite_anim_constants.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 12237417c..31eac1348 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -208,7 +208,7 @@ const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR ; 20 const SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09 ; 21 - const SPRITE_ANIM_OAMSET_UNUSED_22 ; 22 + const SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO ; 22 const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23 const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24 const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2 ; 25 diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 48d424902..70f6b6456 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -35,7 +35,7 @@ SpriteAnimOAMData: ; 8d94d 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_Unused22 ; SPRITE_ANIM_OAMSET_UNUSED_22 + 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 dbw $12, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2 @@ -471,7 +471,7 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, 3, 0, $01, 0 | Y_FLIP dsprite 0, 0, 4, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_Unused22: +.OAMData_GSIntroGameFreakLogo: db 15 dsprite -3, 4, -2, 4, $00, 1 | OBP_NUM dsprite -3, 4, -1, 4, $01, 1 | OBP_NUM |