From 5626f2b855c5ff6ca86f34f287da0191bd1fe7ab Mon Sep 17 00:00:00 2001 From: earthoul Date: Mon, 12 Jan 2026 02:40:06 +0900 Subject: [PATCH] Fix tabs --- src/constants/challenge_cup_constants.asm | 10 +- src/constants/game_center_constants.asm | 16 +-- src/data/challenge_cup_opponents.asm | 142 +++++++++++----------- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/constants/challenge_cup_constants.asm b/src/constants/challenge_cup_constants.asm index ed678e2..38001e8 100644 --- a/src/constants/challenge_cup_constants.asm +++ b/src/constants/challenge_cup_constants.asm @@ -58,11 +58,11 @@ DEF NUM_GR_CHALLENGE_CUP_OPPONENT_POOL EQU 27 ; cup prize cards DEF NUM_GRANDMASTERCUP_PRIZE_POOL EQU 37 - const_def - const GRANDMASTERCUP_PRIZE_0 ; 0 - const GRANDMASTERCUP_PRIZE_1 ; 1 - const GRANDMASTERCUP_PRIZE_2 ; 2 - const GRANDMASTERCUP_PRIZE_3 ; 3 + const_def + const GRANDMASTERCUP_PRIZE_0 ; 0 + const GRANDMASTERCUP_PRIZE_1 ; 1 + const GRANDMASTERCUP_PRIZE_2 ; 2 + const GRANDMASTERCUP_PRIZE_3 ; 3 DEF NUM_TCG_CHALLENGE_CUP_PRIZE_POOL EQU 17 DEF NUM_GR_CHALLENGE_CUP_PRIZE_POOL EQU 17 diff --git a/src/constants/game_center_constants.asm b/src/constants/game_center_constants.asm index fadce2f..2bf1212 100644 --- a/src/constants/game_center_constants.asm +++ b/src/constants/game_center_constants.asm @@ -33,11 +33,11 @@ DEF BLACK_BOX_OUTPUT_BYTES EQU 2 * MAX_NUM_BLACK_BOX_OUTPUT ; card dungeon ; for VAR_CARD_DUNGEON_PROGRESS - const_def 1 - const CARDDUNGEON_BEAT_PAWN ; 1 - const CARDDUNGEON_BEAT_KNIGHT ; 2 - const CARDDUNGEON_BEAT_BISHOP ; 3 - const CARDDUNGEON_BEAT_ROOK ; 4 - const CARDDUNGEON_BEAT_QUEEN ; 5 - const CARDDUNGEON_LOST ; 6 - const CARDDUNGEON_QUIT_OR_WITHDREW ; 7 + const_def 1 + const CARDDUNGEON_BEAT_PAWN ; 1 + const CARDDUNGEON_BEAT_KNIGHT ; 2 + const CARDDUNGEON_BEAT_BISHOP ; 3 + const CARDDUNGEON_BEAT_ROOK ; 4 + const CARDDUNGEON_BEAT_QUEEN ; 5 + const CARDDUNGEON_LOST ; 6 + const CARDDUNGEON_QUIT_OR_WITHDREW ; 7 diff --git a/src/data/challenge_cup_opponents.asm b/src/data/challenge_cup_opponents.asm index d633f1e..e617485 100644 --- a/src/data/challenge_cup_opponents.asm +++ b/src/data/challenge_cup_opponents.asm @@ -1,76 +1,76 @@ ; deck id and bitmask cup1, 2, 3 for SetChallengeCupOpponents TCGChallengeCupOpponents: - db ROLLING_STONE_DECK_ID, %111, %011, %011 - db GREAT_EARTHQUAKE_DECK_ID, %111, %011, %011 - db AWESOME_FOSSIL_DECK_ID, %111, %011, %011 - db NEW_MACHOKE_DECK_ID, %111, %011, %011 - db SKILLED_WARRIOR_DECK_ID, %111, %011, %011 - db I_LOVE_TO_FIGHT_DECK_ID, %000, %011, %011 - db REMAINING_GREEN_DECK_ID, %111, %000, %000 - db POISON_CURSE_DECK_ID, %000, %011, %011 - db GLITTERING_SCALES_DECK_ID, %111, %011, %011 - db STEADY_INCREASE_DECK_ID, %111, %011, %011 - db NATURAL_SCIENCE_DECK_ID, %111, %011, %011 - db POISONOUS_SWAMP_DECK_ID, %111, %011, %011 - db GATHERING_NIDORAN_DECK_ID, %111, %011, %011 - db CONSERVING_WATER_DECK_ID, %111, %011, %000 - db ENERGY_REMOVAL_DECK_ID, %000, %000, %011 - db SPLASHING_ABOUT_DECK_ID, %111, %011, %011 - db BEACH_DECK_ID, %000, %011, %011 - db FLAME_FESTIVAL_DECK_ID, %000, %011, %011 - db ELECTRIC_CURRENT_SHOCK_DECK_ID, %111, %011, %011 - db IMMORTAL_FLAME_DECK_ID, %111, %011, %011 - db I_LOVE_PIKACHU_DECK_ID, %111, %011, %011 - db OVERFLOW_DECK_ID, %111, %011, %000 - db TRIPLE_ZAPDOS_DECK_ID, %000, %000, %011 - db TEN_THOUSAND_VOLTS_DECK_ID, %111, %011, %011 - db PHANTOM_DECK_ID, %000, %011, %011 - db PUPPET_MASTER_DECK_ID, %000, %000, %011 - db PSYCHOKINESIS_DECK_ID, %111, %011, %011 - db EVEN3_YEARS_ON_A_ROCK_DECK_ID, %000, %100, %100 - db MAX_ENERGY_DECK_ID, %000, %100, %100 - db DARK_SCIENCE_DECK_ID, %000, %100, %100 - db RAIN_DANCE_CONFUSION_DECK_ID, %000, %100, %100 - db GO_ARCANINE_DECK_ID, %000, %100, %100 - db ELECTRIC_SELFDESTRUCT_DECK_ID, %000, %100, %100 - db HAND_OVER_GR_DECK_ID, %000, %100, %000 - db PSYCHIC_ELITE_DECK_ID, %000, %000, %100 - db RAGING_BILLOW_OF_FISTS_DECK_ID, %000, %000, %100 - db GREAT_ROCKET1_DECK_ID, %000, %000, %100 - db GREAT_ROCKET2_DECK_ID, %000, %000, %100 - db GREAT_ROCKET3_DECK_ID, %000, %000, %100 - db GREAT_ROCKET4_DECK_ID, %000, %000, %100 - db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 - db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 - db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 - db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 + db ROLLING_STONE_DECK_ID, %111, %011, %011 + db GREAT_EARTHQUAKE_DECK_ID, %111, %011, %011 + db AWESOME_FOSSIL_DECK_ID, %111, %011, %011 + db NEW_MACHOKE_DECK_ID, %111, %011, %011 + db SKILLED_WARRIOR_DECK_ID, %111, %011, %011 + db I_LOVE_TO_FIGHT_DECK_ID, %000, %011, %011 + db REMAINING_GREEN_DECK_ID, %111, %000, %000 + db POISON_CURSE_DECK_ID, %000, %011, %011 + db GLITTERING_SCALES_DECK_ID, %111, %011, %011 + db STEADY_INCREASE_DECK_ID, %111, %011, %011 + db NATURAL_SCIENCE_DECK_ID, %111, %011, %011 + db POISONOUS_SWAMP_DECK_ID, %111, %011, %011 + db GATHERING_NIDORAN_DECK_ID, %111, %011, %011 + db CONSERVING_WATER_DECK_ID, %111, %011, %000 + db ENERGY_REMOVAL_DECK_ID, %000, %000, %011 + db SPLASHING_ABOUT_DECK_ID, %111, %011, %011 + db BEACH_DECK_ID, %000, %011, %011 + db FLAME_FESTIVAL_DECK_ID, %000, %011, %011 + db ELECTRIC_CURRENT_SHOCK_DECK_ID, %111, %011, %011 + db IMMORTAL_FLAME_DECK_ID, %111, %011, %011 + db I_LOVE_PIKACHU_DECK_ID, %111, %011, %011 + db OVERFLOW_DECK_ID, %111, %011, %000 + db TRIPLE_ZAPDOS_DECK_ID, %000, %000, %011 + db TEN_THOUSAND_VOLTS_DECK_ID, %111, %011, %011 + db PHANTOM_DECK_ID, %000, %011, %011 + db PUPPET_MASTER_DECK_ID, %000, %000, %011 + db PSYCHOKINESIS_DECK_ID, %111, %011, %011 + db EVEN3_YEARS_ON_A_ROCK_DECK_ID, %000, %100, %100 + db MAX_ENERGY_DECK_ID, %000, %100, %100 + db DARK_SCIENCE_DECK_ID, %000, %100, %100 + db RAIN_DANCE_CONFUSION_DECK_ID, %000, %100, %100 + db GO_ARCANINE_DECK_ID, %000, %100, %100 + db ELECTRIC_SELFDESTRUCT_DECK_ID, %000, %100, %100 + db HAND_OVER_GR_DECK_ID, %000, %100, %000 + db PSYCHIC_ELITE_DECK_ID, %000, %000, %100 + db RAGING_BILLOW_OF_FISTS_DECK_ID, %000, %000, %100 + db GREAT_ROCKET1_DECK_ID, %000, %000, %100 + db GREAT_ROCKET2_DECK_ID, %000, %000, %100 + db GREAT_ROCKET3_DECK_ID, %000, %000, %100 + db GREAT_ROCKET4_DECK_ID, %000, %000, %100 + db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 + db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 + db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 + db RONALDS_PSYCHIC_DECK_ID, %000, %000, %100 GRChallengeCupOpponents: - db BUG_COLLECTING_DECK_ID, %111, %111, %011 - db DEMONIC_FOREST_DECK_ID, %111, %111, %011 - db STICKY_POISON_GAS_DECK_ID, %111, %111, %011 - db DANGEROUS_BENCH_DECK_ID, %111, %111, %011 - db CHAIN_LIGHTNING_BY_PIKACHU_DECK_ID, %111, %111, %011 - db THIS_IS_THE_POWER_OF_ELECTRICITY_DECK_ID, %111, %111, %011 - db COMPLETE_COMBUSTION_DECK_ID, %111, %111, %011 - db FIREBALL_DECK_ID, %111, %111, %011 - db EEVEE_SHOWDOWN_DECK_ID, %111, %111, %011 - db WHIRLPOOL_SHOWER_DECK_ID, %111, %111, %011 - db PARALYZED_PARALYZED_DECK_ID, %111, %111, %011 - db BENCH_CALL_DECK_ID, %111, %111, %011 - db ROCK_BLAST_DECK_ID, %000, %111, %011 - db FULL_STRENGTH_DECK_ID, %000, %111, %011 - db DIRECT_HIT_DECK_ID, %000, %111, %011 - db SUPERDESTRUCTIVE_POWER_DECK_ID, %000, %111, %011 - db BAD_DREAM_DECK_ID, %000, %111, %011 - db POKEMON_POWER_DECK_ID, %000, %111, %011 - db MAD_PETALS_DECK_ID, %000, %000, %100 - db QUICK_ATTACK_DECK_ID, %000, %000, %100 - db GAZE_UPON_THE_POWER_OF_FIRE_DECK_ID, %000, %000, %100 - db WATER_STREAM_DECK_ID, %000, %000, %100 - db RUNNING_WILD_DECK_ID, %000, %000, %100 - db SPIRITED_AWAY_DECK_ID, %000, %000, %100 - db SNORLAX_GUARD_DECK_ID, %000, %000, %100 - db EYE_OF_THE_STORM_DECK_ID, %000, %000, %100 - db SUDDEN_GROWTH_DECK_ID, %000, %000, %100 + db BUG_COLLECTING_DECK_ID, %111, %111, %011 + db DEMONIC_FOREST_DECK_ID, %111, %111, %011 + db STICKY_POISON_GAS_DECK_ID, %111, %111, %011 + db DANGEROUS_BENCH_DECK_ID, %111, %111, %011 + db CHAIN_LIGHTNING_BY_PIKACHU_DECK_ID, %111, %111, %011 + db THIS_IS_THE_POWER_OF_ELECTRICITY_DECK_ID, %111, %111, %011 + db COMPLETE_COMBUSTION_DECK_ID, %111, %111, %011 + db FIREBALL_DECK_ID, %111, %111, %011 + db EEVEE_SHOWDOWN_DECK_ID, %111, %111, %011 + db WHIRLPOOL_SHOWER_DECK_ID, %111, %111, %011 + db PARALYZED_PARALYZED_DECK_ID, %111, %111, %011 + db BENCH_CALL_DECK_ID, %111, %111, %011 + db ROCK_BLAST_DECK_ID, %000, %111, %011 + db FULL_STRENGTH_DECK_ID, %000, %111, %011 + db DIRECT_HIT_DECK_ID, %000, %111, %011 + db SUPERDESTRUCTIVE_POWER_DECK_ID, %000, %111, %011 + db BAD_DREAM_DECK_ID, %000, %111, %011 + db POKEMON_POWER_DECK_ID, %000, %111, %011 + db MAD_PETALS_DECK_ID, %000, %000, %100 + db QUICK_ATTACK_DECK_ID, %000, %000, %100 + db GAZE_UPON_THE_POWER_OF_FIRE_DECK_ID, %000, %000, %100 + db WATER_STREAM_DECK_ID, %000, %000, %100 + db RUNNING_WILD_DECK_ID, %000, %000, %100 + db SPIRITED_AWAY_DECK_ID, %000, %000, %100 + db SNORLAX_GUARD_DECK_ID, %000, %000, %100 + db EYE_OF_THE_STORM_DECK_ID, %000, %000, %100 + db SUDDEN_GROWTH_DECK_ID, %000, %000, %100