pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch' of https://github.com/mid-kid/pokecrystal

Browse Source 
# Conflicts:
#	constants/sprite_anim_constants.asm
#	data/sprite_anims/framesets.asm
#	data/sprite_anims/oam.asm
This commit is contained in:
Remy Oukaour
2018-01-12 17:23:50 -05:00
parent 59c95abf83 5b7773b7d3
commit d054116458
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/sprite_anim_constants.asm
View File

@@ -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

2
constants/sprite_constants.asm
View File

@@ -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

2
constants/sprite_data_constants.asm
View File

@@ -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