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:
@@ -129,8 +129,8 @@ DEF NUM_PREDEF_PALS EQU const_value
|
||||
const_def
|
||||
const RGBFADE_TO_BLACK_6BGP
|
||||
const RGBFADE_TO_LIGHTER_6BGP
|
||||
const RGBFADE_TO_WHITE_6BGP_7OBP
|
||||
const RGBFADE_TO_WHITE_6BGP_6OBP
|
||||
const RGBFADE_TO_WHITE_8BGP_8OBP
|
||||
const RGBFADE_TO_BLACK_6BGP_1OBP2
|
||||
const RGBFADE_TO_LIGHTER_6BGP_1OBP2
|
||||
const RGBFADE_TO_BLACK_6BGP_1OBP1
|
||||
const RGBFADE_TO_LIGHTER_6BGP_1OBP1
|
||||
DEF NUM_RGB_FADE_EFFECTS EQU const_value
|
||||
|
@@ -80,18 +80,14 @@ DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10
|
||||
const SPRITE_ANIM_OBJ_INTRO_UNOWN_F ; 2a
|
||||
const SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY ; 2b
|
||||
const SPRITE_ANIM_OBJ_CELEBI ; 2c
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_DOWN ; 2d
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN ; 2e
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_UP ; 2f
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_UP ; 30
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_LEFT ; 31
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT ; 32
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT ; 33
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT ; 34
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_BREAK_DIE ; 35
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_APPEAR_DIE_NUMBER ; 36
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_MOVE_DIE_NUMBER ; 37
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL ; 38
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_DOWN ; 2d
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_UP ; 2e
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_LEFT ; 2f
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_WALK_RIGHT ; 30
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_BREAK_DIE ; 31
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_APPEAR_DIE_NUMBER ; 32
|
||||
const SPRITE_ANIM_OBJ_BOARD_MENU_MOVE_DIE_NUMBER ; 33
|
||||
const SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL ; 34
|
||||
DEF NUM_SPRITE_ANIM_OBJS EQU const_value
|
||||
|
||||
; DoSpriteAnimFrame.Jumptable indexes (see engine/sprite_anims/functions.asm)
|
||||
@@ -206,18 +202,14 @@ DEF NUM_SPRITE_ANIM_FUNCS EQU const_value
|
||||
const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
|
||||
const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
|
||||
const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_DOWN ; 42
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_DOWN ; 43
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_UP ; 44
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_UP ; 45
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_LEFT ; 46
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_LEFT ; 47
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_MALE_WALK_RIGHT ; 48
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_FEMALE_WALK_RIGHT ; 49
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_BREAK_DIE ; 50
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_APPEAR_DIE_NUMBER ; 51
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_MOVE_DIE_NUMBER ; 52
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL ; 53
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_DOWN ; 42
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_UP ; 43
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_LEFT ; 44
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_WALK_RIGHT ; 45
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_BREAK_DIE ; 46
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_APPEAR_DIE_NUMBER ; 47
|
||||
const SPRITE_ANIM_FRAMESET_BOARD_MENU_MOVE_DIE_NUMBER ; 48
|
||||
const SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL ; 49
|
||||
DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
|
||||
|
||||
; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
|
||||
@@ -362,29 +354,21 @@ DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
|
||||
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9 ; 89
|
||||
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10 ; 8a
|
||||
const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11 ; 8b
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_1 ; 8c
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_DOWN_2 ; 8d
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_1 ; 8e
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_DOWN_2 ; 8f
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_1 ; 90
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_UP_2 ; 91
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_1 ; 92
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_UP_2 ; 93
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_1 ; 94
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_LEFT_2 ; 95
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_1 ; 96
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_LEFT_2 ; 97
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_1 ; 98
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_MALE_RIGHT_2 ; 99
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_1 ; 9a
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_2 ; 9b
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_1 ; 9c
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_2 ; 9d
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_3 ; 9e
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_4 ; 9f
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_DIE_NUMBER ; a0
|
||||
const SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1 ; a1
|
||||
const SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2 ; a2
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_1 ; 8c
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_DOWN_2 ; 8d
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_1 ; 8e
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_UP_2 ; 8f
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_1 ; 90
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_LEFT_2 ; 91
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_1 ; 92
|
||||
const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_RIGHT_2 ; 93
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_1 ; 94
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_2 ; 95
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_3 ; 96
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_4 ; 97
|
||||
const SPRITE_ANIM_OAMSET_BOARD_MENU_DIE_NUMBER ; 98
|
||||
const SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1 ; 99
|
||||
const SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2 ; 9a
|
||||
DEF NUM_SPRITE_ANIM_OAMSETS EQU const_value
|
||||
|
||||
assert NUM_SPRITE_ANIM_OAMSETS <= FIRST_OAM_CMD, \
|
||||
|
@@ -35,3 +35,12 @@ DEF NUM_SPRITEDATA_FIELDS EQU _RS
|
||||
const PAL_NPC_TREE ; d
|
||||
const PAL_NPC_ROCK ; e
|
||||
const PAL_NPC_MISC ; f
|
||||
|
||||
; level selection menu sprite palettes
|
||||
const_def
|
||||
const PAL_LSM_PLAYER ; 0
|
||||
const PAL_LSM_TOD ; 1
|
||||
const PAL_LSM_TROPHY_1 ; 2
|
||||
const PAL_LSM_TROPHY_2 ; 3
|
||||
const PAL_LSM_TROPHY_3 ; 4
|
||||
const PAL_LSM_TROPHY_4 ; 5
|
||||
|
Reference in New Issue
Block a user