diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-15 00:21:41 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-15 00:21:41 -0500 |
| commit | 07b8fe2983b0815ac3183ffa9ecd5d55b7f201a5 (patch) | |
| tree | f7f3c350fe6f173a6bdfddbe83bc9c4ddfa98892 | |
| parent | f2dde1f4caf82622fe43cf6763ab8e0e9a40afa8 (diff) | |
G/S does use this OAM data: https://i.imgur.com/KdIhKKk.png
| -rw-r--r-- | constants/sprite_anim_constants.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 5692c6efc..f1cf6a6c4 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -189,7 +189,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c - const SPRITE_ANIM_OAMSET_UNUSED_0D ; 0d + const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE ; 0d const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 ; 0e const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 ; 0f const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 ; 10 diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index cd03eec29..31bb3fe15 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -14,7 +14,7 @@ SpriteAnimOAMData: ; 8d94d dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE - dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_UNUSED_0D + dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_NOTE dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 |