diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 15:54:23 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 15:54:23 -0500 |
| commit | 64b27d86c0d8975838d8b6174871c56f73738c1b (patch) | |
| tree | 5ec79ce5395e77375528e21dcb4e0c40e3342bdb | |
| parent | 6a3045d759d7172c2687bf41f3ef4aa9065ee273 (diff) | |
More G/S intro OAM documentation
| -rw-r--r-- | constants/sprite_anim_constants.asm | 8 | ||||
| -rwxr-xr-x | data/sprite_anims/framesets.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 034baa76f..7c11bc51a 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -198,16 +198,16 @@ 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_UNUSED_18 ; 18 - const SPRITE_ANIM_OAMSET_UNUSED_19 ; 19 - const SPRITE_ANIM_OAMSET_UNUSED_1A ; 1a + 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 const SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA ; 1b const SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL ; 1c const SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE ; 1d const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1 ; 1e const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR ; 20 - const SPRITE_ANIM_OAMSET_FOR_UNUSED_09 ; 21 + const SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09 ; 21 const SPRITE_ANIM_OAMSET_UNUSED_22 ; 22 const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23 const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24 diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 71a4ad13a..f2a1bce3b 100755 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -134,7 +134,7 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_Unused09: - frame SPRITE_ANIM_OAMSET_FOR_UNUSED_09, 1 + frame SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09, 1 dorepeat 1 dorestart diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 20c943bfd..8b5dc6b29 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -25,16 +25,16 @@ SpriteAnimOAMData: ; 8d94d 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 $00, .OAMData_IntroUnownF2_1 ; SPRITE_ANIM_OAMSET_UNUSED_18 - dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_UNUSED_19 - dbw $09, .OAMData_Unused1A ; SPRITE_ANIM_OAMSET_UNUSED_1A + 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 dbw $10, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA dbw $29, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL dbw $42, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE 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_ForUnused09 ; SPRITE_ANIM_OAMSET_FOR_UNUSED_09 + dbw $00, .OAMData_ForUnusedFrameset09 ; SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09 dbw $00, .OAMData_Unused22 ; SPRITE_ANIM_OAMSET_UNUSED_22 dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 @@ -208,7 +208,7 @@ SpriteAnimOAMData: ; 8d94d dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_Unused1A: +.OAMData_GSIntroBigFireball: db 36 dsprite -3, 0, -3, 0, $00, 0 dsprite -3, 0, -2, 0, $01, 0 @@ -460,7 +460,7 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_ForUnused09: +.OAMData_ForUnusedFrameset09: db 10 dsprite -1, 7, 0, 0, $00, 0 dsprite -1, 7, 1, 0, $01, 0 |