You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Level selection menu: don't make unique palette numbers and sprite anims for male and female; instead, load either red or blue into pal0 (#12)
This commit is contained in:
xCrystal
@@ -67,14 +67,10 @@ SpriteAnimFrameData:
|
||||
dw .Frameset_IntroUnownF
|
||||
dw .Frameset_CelebiLeft
|
||||
dw .Frameset_CelebiRight
|
||||
dw .Frameset_LevelSelectionMenuMaleWalkDown
|
||||
dw .Frameset_LevelSelectionMenuFemaleWalkDown
|
||||
dw .Frameset_LevelSelectionMenuMaleWalkUp
|
||||
dw .Frameset_LevelSelectionMenuFemaleWalkUp
|
||||
dw .Frameset_LevelSelectionMenuMaleWalkLeft
|
||||
dw .Frameset_LevelSelectionMenuFemaleWalkLeft
|
||||
dw .Frameset_LevelSelectionMenuMaleWalkRight
|
||||
dw .Frameset_LevelSelectionMenuFemaleWalkRight
|
||||
dw .Frameset_LevelSelectionMenuWalkDown
|
||||
dw .Frameset_LevelSelectionMenuWalkUp
|
||||
dw .Frameset_LevelSelectionMenuWalkLeft
|
||||
dw .Frameset_LevelSelectionMenuWalkRight
|
||||
dw .Frameset_BoardMenuBreakDie
|
||||
dw .Frameset_BoardMenuAppearDieNumber
|
||||
dw .Frameset_BoardMenuMoveDieNumber
|
||||
@@ -510,60 +506,32 @@ SpriteAnimFrameData:
|
||||
oamframe SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP
|
||||
oamend
|
||||
|
||||
.Frameset_LevelSelectionMenuMaleWalkDown:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_2, 6, OAM_X_FLIP
|
||||
.Frameset_LevelSelectionMenuWalkDown:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_2, 6, OAM_X_FLIP
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuFemaleWalkDown:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_2, 6, OAM_X_FLIP
|
||||
.Frameset_LevelSelectionMenuWalkUp:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_2, 6, OAM_X_FLIP
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuMaleWalkUp:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_2, 6, OAM_X_FLIP
|
||||
.Frameset_LevelSelectionMenuWalkLeft:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_2, 6
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuFemaleWalkUp:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_2, 6, OAM_X_FLIP
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuMaleWalkLeft:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_2, 6
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuFemaleWalkLeft:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_2, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_1, 6
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_2, 6
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuMaleWalkRight:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_2, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_2, 6, OAM_X_FLIP
|
||||
oamrestart
|
||||
|
||||
.Frameset_LevelSelectionMenuFemaleWalkRight:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_2, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_2, 6, OAM_X_FLIP
|
||||
.Frameset_LevelSelectionMenuWalkRight:
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_2, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_1, 6, OAM_X_FLIP
|
||||
oamframe SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_2, 6, OAM_X_FLIP
|
||||
oamrestart
|
||||
|
||||
.Frameset_BoardMenuBreakDie:
|
||||
|
||||
@@ -147,22 +147,14 @@ SpriteAnimOAMData:
|
||||
spriteanimoam $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
|
||||
spriteanimoam $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
|
||||
spriteanimoam $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
|
||||
spriteanimoam $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_1
|
||||
spriteanimoam $0c, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_2
|
||||
spriteanimoam $00, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_1
|
||||
spriteanimoam $0c, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_2
|
||||
spriteanimoam $04, .OAMData_RedWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_1
|
||||
spriteanimoam $10, .OAMData_RedWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_2
|
||||
spriteanimoam $04, .OAMData_BlueWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_1
|
||||
spriteanimoam $10, .OAMData_BlueWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_2
|
||||
spriteanimoam $08, .OAMData_RedWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_1
|
||||
spriteanimoam $14, .OAMData_RedWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_2
|
||||
spriteanimoam $08, .OAMData_BlueWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_1
|
||||
spriteanimoam $14, .OAMData_BlueWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_2
|
||||
spriteanimoam $08, .OAMData_RedWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_1
|
||||
spriteanimoam $14, .OAMData_RedWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_2
|
||||
spriteanimoam $08, .OAMData_BlueWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_1
|
||||
spriteanimoam $14, .OAMData_BlueWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_2
|
||||
spriteanimoam $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_1
|
||||
spriteanimoam $0c, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_2
|
||||
spriteanimoam $04, .OAMData_RedWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_1
|
||||
spriteanimoam $10, .OAMData_RedWalkUp ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_2
|
||||
spriteanimoam $08, .OAMData_RedWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_1
|
||||
spriteanimoam $14, .OAMData_RedWalkLeft ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_2
|
||||
spriteanimoam $08, .OAMData_RedWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_1
|
||||
spriteanimoam $14, .OAMData_RedWalkRight ; SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_2
|
||||
spriteanimoam $00, .OAMData_BreakDie1 ; SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_1
|
||||
spriteanimoam $00, .OAMData_BreakDie2 ; SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_2
|
||||
spriteanimoam $00, .OAMData_BreakDie3 ; SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_3
|
||||
@@ -788,27 +780,6 @@ SpriteAnimOAMData:
|
||||
dbsprite -1, 0, 0, 0, $02, PAL_OW_BLUE
|
||||
dbsprite 0, 0, 0, 0, $03, PAL_OW_BLUE
|
||||
|
||||
.OAMData_BlueWalkUp:
|
||||
db 4
|
||||
dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE
|
||||
dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE
|
||||
dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE
|
||||
dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE
|
||||
|
||||
.OAMData_BlueWalkLeft:
|
||||
db 4
|
||||
dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE
|
||||
dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE
|
||||
dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE
|
||||
dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE
|
||||
|
||||
.OAMData_BlueWalkRight:
|
||||
db 4
|
||||
dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE
|
||||
dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE
|
||||
dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE
|
||||
dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE
|
||||
|
||||
.OAMData_MagnetTrainBlue:
|
||||
db 4
|
||||
dbsprite -1, -1, 0, 0, $00, PAL_OW_BLUE | PRIORITY
|
||||
|
||||
@@ -92,22 +92,14 @@ SpriteAnimObjects:
|
||||
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_FUNC_INTRO_SUICUNE_AWAY, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_CELEBI
|
||||
db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_DOWN
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_DOWN, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_UP
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_UP, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_UP
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_UP, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_LEFT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_LEFT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_DOWN
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_DOWN, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_UP
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_UP, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_LEFT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_LEFT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_RIGHT
|
||||
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_FUNC_LEVEL_SELECTION_MENU_WALK_RIGHT, SPRITE_ANIM_DICT_DEFAULT
|
||||
; SPRITE_ANIM_OBJ_BOARD_MENU_BREAK_DIE
|
||||
db SPRITE_ANIM_FRAMESET_BOARD_MENU_BREAK_DIE, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_BOARD_MENU
|
||||
; SPRITE_ANIM_OBJ_BOARD_MENU_APPEAR_DIE_NUMBER
|
||||
|
||||
Reference in New Issue
Block a user