diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/constants/booster_constants.asm | 60 | ||||
| -rwxr-xr-x | src/engine/bank3.asm | 8 |
2 files changed, 34 insertions, 34 deletions
diff --git a/src/constants/booster_constants.asm b/src/constants/booster_constants.asm index e58f428..ec9bb36 100755 --- a/src/constants/booster_constants.asm +++ b/src/constants/booster_constants.asm @@ -9,33 +9,33 @@ BOOSTER_CARD_TYPE_TRAINER EQU $07 BOOSTER_CARD_TYPE_ENERGY EQU $08
BOOSTER_CARD_TYPE_AMOUNT EQU $09
-BOOSTER_ColoNeutral EQU $00
-BOOSTER_ColoGrass EQU $01
-BOOSTER_ColoFire EQU $02
-BOOSTER_ColoWater EQU $03
-BOOSTER_ColoLightning EQU $04
-BOOSTER_ColoFighting EQU $05
-BOOSTER_ColoTrainer EQU $06
-BOOSTER_EvoNeutral EQU $07
-BOOSTER_EvoGrass EQU $08
-BOOSTER_EvoNeutralFireEnergy EQU $09
-BOOSTER_EvoWater EQU $0a
-BOOSTER_EvoFighting EQU $0b
-BOOSTER_EvoPsychic EQU $0c
-BOOSTER_EvoTrainer EQU $0d
-BOOSTER_MysteryNeutral EQU $0e
-BOOSTER_MysteryGrassColorless EQU $0f
-BOOSTER_MysteryWaterColorless EQU $10
-BOOSTER_LightningColorless EQU $11
-BOOSTER_MysteryFightingColorless EQU $12
-BOOSTER_MysteryTrainerColorless EQU $13
-BOOSTER_LabTrainerLessFighting EQU $14
-BOOSTER_LabGrass EQU $15
-BOOSTER_LabWater EQU $16
-BOOSTER_LabPsychic EQU $17
-BOOSTER_LabTrainer EQU $18
-BOOSTER_EnergyLightningFire EQU $19
-BOOSTER_EnergyWaterFighting EQU $1a
-BOOSTER_EnergyGrassPsychic EQU $1b
-BOOSTER_RandomEnergies EQU $1c
-NO_BOOSTER EQU $ff
+BOOSTER_COLOSSEUM_NEUTRAL EQU $00
+BOOSTER_COLOSSEUM_GRASS EQU $01
+BOOSTER_COLOSSEUM_FIRE EQU $02
+BOOSTER_COLOSSEUM_WATER EQU $03
+BOOSTER_COLOSSEUM_LIGHTNING EQU $04
+BOOSTER_COLOSSEUM_FIGHTING EQU $05
+BOOSTER_COLOSSEUM_TRAINER EQU $06
+BOOSTER_EVOLUTION_NEUTRAL EQU $07
+BOOSTER_EVOLUTION_GRASS EQU $08
+BOOSTER_EVOLUTION_FIRE EQU $09
+BOOSTER_EVOLUTION_WATER EQU $0a
+BOOSTER_EVOLUTION_FIGHTING EQU $0b
+BOOSTER_EVOLUTION_PSYCHIC EQU $0c
+BOOSTER_EVOLUTION_TRAINER EQU $0d
+BOOSTER_MYSTERY_NEUTRAL EQU $0e
+BOOSTER_MYSTERY_GRASS_COLORLESS EQU $0f
+BOOSTER_MYSTERY_WATER_COLORLESS EQU $10
+BOOSTER_MYSTERY_LIGHTNING_COLORLESS EQU $11
+BOOSTER_MYSTERY_FIGHTING_COLORLESS EQU $12
+BOOSTER_MYSTERY_TRAINER_COLORLESS EQU $13
+BOOSTER_LABORATORY_FIGHTING EQU $14
+BOOSTER_LABORATORY_GRASS EQU $15
+BOOSTER_LABORATORY_WATER EQU $16
+BOOSTER_LABORATORY_PSYCHIC EQU $17
+BOOSTER_LABORATORY_TRAINER EQU $18
+BOOSTER_ENERGY_LIGHTNING_FIRE EQU $19
+BOOSTER_ENERGY_WATER_FIGHTING EQU $1a
+BOOSTER_ENERGY_GRASS_PSYCHIC EQU $1b
+BOOSTER_ENERGY_RANDOM EQU $1c
+NO_BOOSTER EQU $ff
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index 6fb124e..d1b27f8 100755 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -3029,8 +3029,8 @@ OWSequence_BeatSara: ; e18c (3:618c) run_script OWScript_PrintTextString tx Text0430 run_script OWScript_GiveBoosterPacks - db BOOSTER_ColoWater - db BOOSTER_ColoWater + db BOOSTER_COLOSSEUM_WATER + db BOOSTER_COLOSSEUM_WATER db NO_BOOSTER run_script OWScript_PrintTextString tx Text0431 @@ -3067,8 +3067,8 @@ OWSequence_BeatAmanda: ; e1b3 (03:61b3) run_script OWScript_PrintTextString tx Text0437 run_script OWScript_GiveBoosterPacks - db BOOSTER_LightningColorless - db BOOSTER_LightningColorless + db BOOSTER_MYSTERY_LIGHTNING_COLORLESS + db BOOSTER_MYSTERY_LIGHTNING_COLORLESS db NO_BOOSTER run_script OWScript_PrintTextString tx Text0438 |