diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
| commit | d0541164589a5fd2f628bf8629f878430b31c5f7 (patch) | |
| tree | 03599c969ac901a7878b4d4ddbb3d1e01dcd019d /constants | |
| parent | 59c95abf836e139931a41d20cf95af2472763fab (diff) | |
| parent | 5b7773b7d3ddf1addd99588cc5c41cd81ecdc402 (diff) | |
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/sprite_anim_constants.asm | 4 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sprite_data_constants.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 6d6b1a474..5692c6efc 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -116,7 +116,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06 const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07 const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08 - const SPRITE_ANIM_FRAMESET_UNUSED_09 ; 09 + const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG ; 09 const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c @@ -209,7 +209,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs 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_FRAMESET_09 ; 21 + const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG ; 21 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 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 32d386ba7..767d7a3c6 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; OverworldSprites indexes (see gfx/sprite_data.asm) +; OverworldSprites indexes (see data/sprites.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 32cc343e0..db53c3ca1 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -1,4 +1,4 @@ -; overworld_sprite struct members (see gfx/sprite_data.asm) +; overworld_sprite struct members (see data/sprites.asm) const_def const SPRITEDATA_ADDR ; 0 const SPRITEDATA_ADDR_HI ; 1 |