pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08: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
commit d054116458
6 changed files with 12 additions and 12 deletions
Show Stats 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_PARTY_MON_WITH_ITEM_FAST ; 06
const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07 const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08 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_GAMEFREAK_LOGO ; 0a
const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c 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_1 ; 1e
const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 ; 1f
const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR ; 20 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_GAMEFREAK_LOGO ; 22
const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23 const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23
const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24 const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24

2
constants/sprite_constants.asm
View File

@ -1,5 +1,5 @@
; sprite ids ; sprite ids
; OverworldSprites indexes (see gfx/sprite_data.asm) ; OverworldSprites indexes (see data/sprites.asm)
const_def const_def
const SPRITE_NONE ; 00 const SPRITE_NONE ; 00
const SPRITE_CHRIS ; 01 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_def
const SPRITEDATA_ADDR ; 0 const SPRITEDATA_ADDR ; 0
const SPRITEDATA_ADDR_HI ; 1 const SPRITEDATA_ADDR_HI ; 1

6
data/sprite_anims/framesets.asm
View File

@ -9,7 +9,7 @@ SpriteAnimFrameData: ; 8d6e6
dw .Frameset_PartyMonWithItemFast dw .Frameset_PartyMonWithItemFast
dw .Frameset_GSTitleTrail dw .Frameset_GSTitleTrail
dw .Frameset_TextEntryCursor dw .Frameset_TextEntryCursor
dw .Frameset_Unused09 dw .Frameset_TextEntryCursorBig
dw .Frameset_GameFreakLogo dw .Frameset_GameFreakLogo
dw .Frameset_GSIntroStar dw .Frameset_GSIntroStar
dw .Frameset_GSIntroSparkle dw .Frameset_GSIntroSparkle
@ -133,8 +133,8 @@ SpriteAnimFrameData: ; 8d6e6
dorepeat 1 dorepeat 1
dorestart dorestart
.Frameset_Unused09: .Frameset_TextEntryCursorBig:
frame SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09, 1 frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG, 1
dorepeat 1 dorepeat 1
dorestart dorestart

4
data/sprite_anims/oam.asm
View File

@ -34,7 +34,7 @@ SpriteAnimOAMData: ; 8d94d
dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1 dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
dbw $00, .OAMData_ForUnusedFrameset09 ; SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09 dbw $00, .OAMData_TextEntryCursorBig ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG
dbw $00, .OAMData_GSIntroGameFreakLogo ; SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO dbw $00, .OAMData_GSIntroGameFreakLogo ; SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO
dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
@ -458,7 +458,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP
dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_ForUnusedFrameset09: .OAMData_TextEntryCursorBig:
db 10 db 10
dsprite -1, 7, 0, 0, $00, 0 dsprite -1, 7, 0, 0, $00, 0
dsprite -1, 7, 1, 0, $01, 0 dsprite -1, 7, 1, 0, $01, 0

6
engine/namingscreen.asm
View File

@ -568,14 +568,14 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
.ok .ok
cp d cp d
ld de, .LetterEntries ld de, .LetterEntries
ld a, $0 ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 0
jr nz, .ok2 jr nz, .ok2
ld de, .CaseDelEnd ld de, .CaseDelEnd
ld a, $1 ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 1
.ok2 .ok2
ld hl, SPRITEANIMSTRUCT_0E ld hl, SPRITEANIMSTRUCT_0E
add hl, bc add hl, bc
add [hl] add [hl] ; default SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc add hl, bc
ld [hl], a ld [hl], a