diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 6e4753c..51f1e94 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -342,49 +342,48 @@ DEF PRIZES_6 EQU $06 const DECK_REQUIREMENT_COLORLESS_ISHII ; $0f const DECK_REQUIREMENT_COLORLESS_SAMEJIMA ; $10 -;duelist intro text constants, stored in wDuelistIntroText +; duelist intro text constants, stored in wDuelistIntroText const_def 1 - const DUELIST_INTRO_LIGHTNING_CLUB_MEMBER ; $01 - const DUELIST_INTRO_PSYCHIC_CLUB_MEMBER ; $02 - const DUELIST_INTRO_ROCK_CLUB_MEMBER ; $03 - const DUELIST_INTRO_FIGHTING_CLUB_MEMBER ; $04 - const DUELIST_INTRO_GRASS_CLUB_MEMBER ; $05 - const DUELIST_INTRO_SCIENCE_CLUB_MEMBER ; $06 - const DUELIST_INTRO_WATER_CLUB_MEMBER ; $07 - const DUELIST_INTRO_FIRE_CLUB_MEMBER ; $08 - const DUELIST_INTRO_LIGHTNING_CLUB_MASTER ; $09 - const DUELIST_INTRO_PSYCHIC_CLUB_MASTER ; $0a - const DUELIST_INTRO_ROCK_CLUB_MASTER ; $0b - const DUELIST_INTRO_FIGHTING_CLUB_MASTER ; $0c - const DUELIST_INTRO_GRASS_CLUB_MASTER ; $0d - const DUELIST_INTRO_SCIENCE_CLUB_MASTER ; $0e - const DUELIST_INTRO_WATER_CLUB_MASTER ; $0f - const DUELIST_INTRO_FIRE_CLUB_MASTER ; $10 - const DUELIST_INTRO_GRAND_MASTER ; $11 - const DUELIST_INTRO_TECH ; $12 - const DUELIST_INTRO_STRANGE_LIFE_FORM ; $13 - const DUELIST_INTRO_COLLECTOR ; $14 - const DUELIST_INTRO_RIVAL ; $15 - const DUELIST_INTRO_ENIGMATIC_MASK ; $16 - const DUELIST_INTRO_GR_GRASS_FORT_MEMBER ; $17 - const DUELIST_INTRO_GR_LIGHTNING_FORT_MEMBER ; $18 - const DUELIST_INTRO_GR_FIRE_FORT_MEMBER ; $19 - const DUELIST_INTRO_GR_WATER_FORT_MEMBER ; $1a - const DUELIST_INTRO_GR_FIGHTING_FORT_MEMBER ; $1b - const DUELIST_INTRO_GR_PSYCHIC_STRONGHOLD_MEMBER ; $1c - const DUELIST_INTRO_GR_GRASS_FORT_LEADER ; $1d - const DUELIST_INTRO_GR_LIGHTNING_FORT_LEADER ; $1e - const DUELIST_INTRO_GR_FIRE_FORT_LEADER ; $1f - const DUELIST_INTRO_GR_WATER_FORT_LEADER ; $20 - const DUELIST_INTRO_GR_FIGHTING_FORT_LEADER ; $21 - const DUELIST_INTRO_GR_PSYCHIC_FORT_LEADER ; $22 - const DUELIST_INTRO_GR_COLORLESS_ALTAR_GUARDIAN ; $23 - const DUELIST_INTRO_GR_BIG_BOSS ; $24 - const DUELIST_INTRO_GR_KING ; $25 - const DUELIST_INTRO_TAP ; $26 - const DUELIST_INTRO_DUNGEON_MASTER ; $27 - const DUELIST_INTRO_GHOST_MASTER ; $28 - + const DUELIST_INTRO_LIGHTNING_CLUB_MEMBER ; $01 + const DUELIST_INTRO_PSYCHIC_CLUB_MEMBER ; $02 + const DUELIST_INTRO_ROCK_CLUB_MEMBER ; $03 + const DUELIST_INTRO_FIGHTING_CLUB_MEMBER ; $04 + const DUELIST_INTRO_GRASS_CLUB_MEMBER ; $05 + const DUELIST_INTRO_SCIENCE_CLUB_MEMBER ; $06 + const DUELIST_INTRO_WATER_CLUB_MEMBER ; $07 + const DUELIST_INTRO_FIRE_CLUB_MEMBER ; $08 + const DUELIST_INTRO_LIGHTNING_CLUB_MASTER ; $09 + const DUELIST_INTRO_PSYCHIC_CLUB_MASTER ; $0a + const DUELIST_INTRO_ROCK_CLUB_MASTER ; $0b + const DUELIST_INTRO_FIGHTING_CLUB_MASTER ; $0c + const DUELIST_INTRO_GRASS_CLUB_MASTER ; $0d + const DUELIST_INTRO_SCIENCE_CLUB_MASTER ; $0e + const DUELIST_INTRO_WATER_CLUB_MASTER ; $0f + const DUELIST_INTRO_FIRE_CLUB_MASTER ; $10 + const DUELIST_INTRO_GRAND_MASTER ; $11 + const DUELIST_INTRO_TECH ; $12 + const DUELIST_INTRO_STRANGE_LIFE_FORM ; $13 + const DUELIST_INTRO_COLLECTOR ; $14 + const DUELIST_INTRO_RIVAL ; $15 + const DUELIST_INTRO_ENIGMATIC_MASK ; $16 + const DUELIST_INTRO_GR_GRASS_FORT_MEMBER ; $17 + const DUELIST_INTRO_GR_LIGHTNING_FORT_MEMBER ; $18 + const DUELIST_INTRO_GR_FIRE_FORT_MEMBER ; $19 + const DUELIST_INTRO_GR_WATER_FORT_MEMBER ; $1a + const DUELIST_INTRO_GR_FIGHTING_FORT_MEMBER ; $1b + const DUELIST_INTRO_GR_PSYCHIC_STRONGHOLD_MEMBER ; $1c + const DUELIST_INTRO_GR_GRASS_FORT_LEADER ; $1d + const DUELIST_INTRO_GR_LIGHTNING_FORT_LEADER ; $1e + const DUELIST_INTRO_GR_FIRE_FORT_LEADER ; $1f + const DUELIST_INTRO_GR_WATER_FORT_LEADER ; $20 + const DUELIST_INTRO_GR_FIGHTING_FORT_LEADER ; $21 + const DUELIST_INTRO_GR_PSYCHIC_FORT_LEADER ; $22 + const DUELIST_INTRO_GR_COLORLESS_ALTAR_GUARDIAN ; $23 + const DUELIST_INTRO_GR_BIG_BOSS ; $24 + const DUELIST_INTRO_GR_KING ; $25 + const DUELIST_INTRO_TAP ; $26 + const DUELIST_INTRO_DUNGEON_MASTER ; $27 + const DUELIST_INTRO_GHOST_MASTER ; $28 ; constants to use as input to SetCardSearchFuncParams const_def diff --git a/src/constants/tileset_constants.asm b/src/constants/tileset_constants.asm index a47232e..ce15a18 100644 --- a/src/constants/tileset_constants.asm +++ b/src/constants/tileset_constants.asm @@ -335,9 +335,9 @@ const TILESET_GLOW ; $14d const TILESET_DAMAGE ; $14e const TILESET_THUNDER ; $14f - const TILESET_LIGHTING ; $150 + const TILESET_LIGHTNING ; $150 const TILESET_SPARK ; $151 - const TILESET_BIG_LIGHTING ; $152 + const TILESET_BIG_LIGHTNING ; $152 const TILESET_EMBER ; $153 const TILESET_FIRE_SPIN ; $154 const TILESET_FIRE_BIRD ; $155 diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index 996a410..64627a4 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -6437,11 +6437,11 @@ Animations: ; DUEL_ANIM_THUNDER_SHOCK animation TILESET_THUNDER, SPRITE_ANIM_07, FRAMESET_015, PALETTE_0DF, NONE, SFX_18, $00 ; DUEL_ANIM_LIGHTNING - animation TILESET_LIGHTING, SPRITE_ANIM_08, FRAMESET_016, PALETTE_0E0, NONE, SFX_19, $00 + animation TILESET_LIGHTNING, SPRITE_ANIM_08, FRAMESET_016, PALETTE_0E0, NONE, SFX_19, $00 ; DUEL_ANIM_BORDER_SPARK animation TILESET_SPARK, SPRITE_ANIM_09, FRAMESET_017, PALETTE_0E1, NONE, SFX_1A, $00 ; DUEL_ANIM_BIG_LIGHTNING - animation TILESET_BIG_LIGHTING, SPRITE_ANIM_0A, FRAMESET_018, PALETTE_0E2, SPRITE_ANIM_FLAG_CENTERED, SFX_1B, $00 + animation TILESET_BIG_LIGHTNING, SPRITE_ANIM_0A, FRAMESET_018, PALETTE_0E2, SPRITE_ANIM_FLAG_CENTERED, SFX_1B, $00 ; DUEL_ANIM_SMALL_FLAME animation TILESET_EMBER, SPRITE_ANIM_0B, FRAMESET_019, PALETTE_0E3, NONE, SFX_1C, $00 ; DUEL_ANIM_BIG_FLAME diff --git a/src/engine/bank0d.asm b/src/engine/bank0d.asm index 5628fb1..92d744b 100644 --- a/src/engine/bank0d.asm +++ b/src/engine/bank0d.asm @@ -1793,7 +1793,7 @@ Func_34da3: script_jump_if_b0z .ows_34ddf script_command_71 get_game_center_chips - compare_loaded_var_word $0000 + compare_loaded_var_word 0 script_jump_if_b0nz .ows_34dd9 game_center take_chips 1 @@ -2016,7 +2016,7 @@ Func_34f7b: ask_question GameCenterCardDungeonStartPromptText, TRUE script_jump_if_b0z .ows_34fd7 get_game_center_chips - compare_loaded_var_word $000a + compare_loaded_var_word 10 script_jump_if_b1z .ows_34fb3 quit_script xor a diff --git a/src/wram.asm b/src/wram.asm index e8ce411..e69bf81 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -827,11 +827,11 @@ wcd0c:: ; cd0c wcd0d:: ; cd0d ds $1 -; index of deck requirements for this duel +; DECK_REQUIREMENT_* constant for the current duel wDeckRequirement:: ; cd0e ds $1 -;index of duelist intro texts for this duel +; DUELIST_INTRO_* constant for the current duel wDuelistIntroText:: ; cd0f ds $1