summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/booster_packs.asm720
-rw-r--r--[-rwxr-xr-x]src/data/cards.asm54
-rw-r--r--[-rwxr-xr-x]src/data/decks.asm0
-rw-r--r--src/data/effect_commands.asm16
-rw-r--r--[-rwxr-xr-x]src/data/map_scripts.asm0
-rw-r--r--[-rwxr-xr-x]src/data/map_songs.asm20
-rw-r--r--[-rwxr-xr-x]src/data/overworld_indexes.asm0
7 files changed, 409 insertions, 401 deletions
diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
index 8f8d8c2..03b64ee 100644
--- a/src/data/booster_packs.asm
+++ b/src/data/booster_packs.asm
@@ -1,448 +1,456 @@
-BoosterSetRarityAmountTable: ; 1e4d4 (7::64d4)
+BoosterSetRarityAmountsTable: ; 1e4d4 (7::64d4)
; energies, commons, uncommons, rares
; commons + uncommons + rares needs to be equal to 10 minus the number of energy cards
; defined in the pack's data below; otherwise, the number of cards in the pack won't be 10.
- db $01, $05, $03, $01 ; COLOSSEUM >> 4
- db $01, $05, $03, $01 ; EVOLUTION >> 4
- db $00, $06, $03, $01 ; MYSTERY >> 4
- db $00, $06, $03, $01 ; LABORATORY >> 4
+ db 1, 5, 3, 1 ; COLOSSEUM
+ db 1, 5, 3, 1 ; EVOLUTION
+ db 0, 6, 3, 1 ; MYSTERY
+ db 0, 6, 3, 1 ; LABORATORY
+
+booster_set: MACRO
+ db \1 >> 4
+ENDM
; For the energy or energy generation function, there are three options:
; - Ponter to a function that generates energies (some generate one, some generate a full pack)
; - A single energy of a specific type
; - $0000 if no card in the pack is an energy
-PackColosseumNeutral:: ; 1e4e4 (7:64e4)
- db COLOSSEUM >> 4 ; booster pack set
- dw GenerateEndingEnergy ; energy or energy generation function
+; As for Card Type Chances, note that whenever one card of the 10 is drawn, the chances of
+; the type of that card are reduced by the original average of all 8 types (capping the result at 1).
+; This average always outputs 17 (except for the energy-only packs).
+
+BoosterPack_ColosseumNeutral:: ; 1e4e4 (7:64e4)
+ booster_set COLOSSEUM ; booster pack set
+ dw GenerateRandomEnergy ; energy or energy generation function
; Card Type Chances
- db $14 ; Grass Type Chance
- db $14 ; Fire Type Chance
- db $14 ; Water Type Chance
- db $14 ; Lightning Type Chance
- db $14 ; Fighting Type Chance
- db $14 ; Psychic Type Chance
- db $14 ; Colorless Type Chance
- db $14 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumGrass:: ; 1e4f0 (7:64f0)
- db COLOSSEUM >> 4 ; booster pack set
+ db 20 ; Grass Type Chance
+ db 20 ; Fire Type Chance
+ db 20 ; Water Type Chance
+ db 20 ; Lightning Type Chance
+ db 20 ; Fighting Type Chance
+ db 20 ; Psychic Type Chance
+ db 20 ; Colorless Type Chance
+ db 20 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumGrass:: ; 1e4f0 (7:64f0)
+ booster_set COLOSSEUM ; booster pack set
dw GRASS_ENERGY ; energy or energy generation function
; Card Type Chances
- db $30 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumFire:: ; 1e4fc (7:64fc)
- db COLOSSEUM >> 4 ; booster pack set
+ db 48 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumFire:: ; 1e4fc (7:64fc)
+ booster_set COLOSSEUM ; booster pack set
dw FIRE_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $30 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumWater:: ; 1e508 (7:6508)
- db COLOSSEUM >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 48 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumWater:: ; 1e508 (7:6508)
+ booster_set COLOSSEUM ; booster pack set
dw WATER_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $30 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumLightning:: ; 1e514 (7:6514)
- db COLOSSEUM >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 48 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumLightning:: ; 1e514 (7:6514)
+ booster_set COLOSSEUM ; booster pack set
dw LIGHTNING_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $30 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumFighting:: ; 1e520 (7:6520)
- db COLOSSEUM >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 48 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumFighting:: ; 1e520 (7:6520)
+ booster_set COLOSSEUM ; booster pack set
dw FIGHTING_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $30 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackColosseumTrainer:: ; 1e52c (7:652c)
- db COLOSSEUM >> 4 ; booster pack set
- dw GenerateEndingEnergy ; energy or energy generation function
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 48 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_ColosseumTrainer:: ; 1e52c (7:652c)
+ booster_set COLOSSEUM ; booster pack set
+ dw GenerateRandomEnergy ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $30 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionNeutral:: ; 1e538 (7:6538)
- db EVOLUTION >> 4 ; booster pack set
- dw GenerateEndingEnergy ; energy or energy generation function
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 48 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionNeutral:: ; 1e538 (7:6538)
+ booster_set EVOLUTION ; booster pack set
+ dw GenerateRandomEnergy ; energy or energy generation function
; Card Type Chances
- db $14 ; Grass Type Chance
- db $14 ; Fire Type Chance
- db $14 ; Water Type Chance
- db $14 ; Lightning Type Chance
- db $14 ; Fighting Type Chance
- db $14 ; Psychic Type Chance
- db $14 ; Colorless Type Chance
- db $14 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionGrass:: ; 1e544 (7:6544)
- db EVOLUTION >> 4 ; booster pack set
+ db 20 ; Grass Type Chance
+ db 20 ; Fire Type Chance
+ db 20 ; Water Type Chance
+ db 20 ; Lightning Type Chance
+ db 20 ; Fighting Type Chance
+ db 20 ; Psychic Type Chance
+ db 20 ; Colorless Type Chance
+ db 20 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionGrass:: ; 1e544 (7:6544)
+ booster_set EVOLUTION ; booster pack set
dw GRASS_ENERGY ; energy or energy generation function
; Card Type Chances
- db $30 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionNeutralFireEnergy:: ; 1e550 (7:6550)
- db EVOLUTION >> 4 ; booster pack set
+ db 48 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionNeutralFireEnergy:: ; 1e550 (7:6550)
+ booster_set EVOLUTION ; booster pack set
dw FIRE_ENERGY ; energy or energy generation function
; Card Type Chances
- db $14 ; Grass Type Chance
- db $14 ; Fire Type Chance
- db $14 ; Water Type Chance
- db $14 ; Lightning Type Chance
- db $14 ; Fighting Type Chance
- db $14 ; Psychic Type Chance
- db $14 ; Colorless Type Chance
- db $14 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionWater:: ; 1e55c (7:655c)
- db EVOLUTION >> 4 ; booster pack set
+ db 20 ; Grass Type Chance
+ db 20 ; Fire Type Chance
+ db 20 ; Water Type Chance
+ db 20 ; Lightning Type Chance
+ db 20 ; Fighting Type Chance
+ db 20 ; Psychic Type Chance
+ db 20 ; Colorless Type Chance
+ db 20 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionWater:: ; 1e55c (7:655c)
+ booster_set EVOLUTION ; booster pack set
dw WATER_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $30 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionFighting:: ; 1e568 (7:6568)
- db EVOLUTION >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 48 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionFighting:: ; 1e568 (7:6568)
+ booster_set EVOLUTION ; booster pack set
dw FIGHTING_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $30 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionPsychic:: ; 1e574 (7:6574)
- db EVOLUTION >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 48 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionPsychic:: ; 1e574 (7:6574)
+ booster_set EVOLUTION ; booster pack set
dw PSYCHIC_ENERGY ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $30 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEvolutionTrainer:: ; 1e580 (7:6580)
- db EVOLUTION >> 4 ; booster pack set
- dw GenerateEndingEnergy ; energy or energy generation function
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 48 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EvolutionTrainer:: ; 1e580 (7:6580)
+ booster_set EVOLUTION ; booster pack set
+ dw GenerateRandomEnergy ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $30 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackMysteryNeutral:: ; 1e58c (7:658c)
- db MYSTERY >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 48 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_MysteryNeutral:: ; 1e58c (7:658c)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $11 ; Grass Type Chance
- db $11 ; Fire Type Chance
- db $11 ; Water Type Chance
- db $11 ; Lightning Type Chance
- db $11 ; Fighting Type Chance
- db $11 ; Psychic Type Chance
- db $11 ; Colorless Type Chance
- db $11 ; Trainer Card Chance
- db $11 ; Energy Card Chance
-
-PackMysteryGrassColorless:: ; 1e598 (7:6598)
- db MYSTERY >> 4 ; booster pack set
+ db 17 ; Grass Type Chance
+ db 17 ; Fire Type Chance
+ db 17 ; Water Type Chance
+ db 17 ; Lightning Type Chance
+ db 17 ; Fighting Type Chance
+ db 17 ; Psychic Type Chance
+ db 17 ; Colorless Type Chance
+ db 17 ; Trainer Card Chance
+ db 17 ; Energy Card Chance
+
+BoosterPack_MysteryGrassColorless:: ; 1e598 (7:6598)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $30 ; Grass Type Chance
- db $0C ; Fire Type Chance
- db $0C ; Water Type Chance
- db $0C ; Lightning Type Chance
- db $0C ; Fighting Type Chance
- db $0C ; Psychic Type Chance
- db $16 ; Colorless Type Chance
- db $0C ; Trainer Card Chance
- db $0C ; Energy Card Chance
-
-PackMysteryWaterColorless:: ; 1e5a4 (7:65a4)
- db MYSTERY >> 4 ; booster pack set
+ db 48 ; Grass Type Chance
+ db 12 ; Fire Type Chance
+ db 12 ; Water Type Chance
+ db 12 ; Lightning Type Chance
+ db 12 ; Fighting Type Chance
+ db 12 ; Psychic Type Chance
+ db 22 ; Colorless Type Chance
+ db 12 ; Trainer Card Chance
+ db 12 ; Energy Card Chance
+
+BoosterPack_MysteryWaterColorless:: ; 1e5a4 (7:65a4)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $0C ; Grass Type Chance
- db $0C ; Fire Type Chance
- db $30 ; Water Type Chance
- db $0C ; Lightning Type Chance
- db $0C ; Fighting Type Chance
- db $0C ; Psychic Type Chance
- db $16 ; Colorless Type Chance
- db $0C ; Trainer Card Chance
- db $0C ; Energy Card Chance
-
-PackMysteryLightningColorless:: ; 1e5b0 (7:65b0)
- db MYSTERY >> 4 ; booster pack set
+ db 12 ; Grass Type Chance
+ db 12 ; Fire Type Chance
+ db 48 ; Water Type Chance
+ db 12 ; Lightning Type Chance
+ db 12 ; Fighting Type Chance
+ db 12 ; Psychic Type Chance
+ db 22 ; Colorless Type Chance
+ db 12 ; Trainer Card Chance
+ db 12 ; Energy Card Chance
+
+BoosterPack_MysteryLightningColorless:: ; 1e5b0 (7:65b0)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $0C ; Grass Type Chance
- db $0C ; Fire Type Chance
- db $0C ; Water Type Chance
- db $30 ; Lightning Type Chance
- db $0C ; Fighting Type Chance
- db $0C ; Psychic Type Chance
- db $16 ; Colorless Type Chance
- db $0C ; Trainer Card Chance
- db $0C ; Energy Card Chance
-
-PackMysteryFightingColorless:: ; 1e5bc (7:65bc)
- db MYSTERY >> 4 ; booster pack set
+ db 12 ; Grass Type Chance
+ db 12 ; Fire Type Chance
+ db 12 ; Water Type Chance
+ db 48 ; Lightning Type Chance
+ db 12 ; Fighting Type Chance
+ db 12 ; Psychic Type Chance
+ db 22 ; Colorless Type Chance
+ db 12 ; Trainer Card Chance
+ db 12 ; Energy Card Chance
+
+BoosterPack_MysteryFightingColorless:: ; 1e5bc (7:65bc)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $0C ; Grass Type Chance
- db $0C ; Fire Type Chance
- db $0C ; Water Type Chance
- db $0C ; Lightning Type Chance
- db $30 ; Fighting Type Chance
- db $0C ; Psychic Type Chance
- db $16 ; Colorless Type Chance
- db $0C ; Trainer Card Chance
- db $0C ; Energy Card Chance
-
-PackMysteryTrainerColorless:: ; 1e5c8 (7:65c8)
- db MYSTERY >> 4 ; booster pack set
+ db 12 ; Grass Type Chance
+ db 12 ; Fire Type Chance
+ db 12 ; Water Type Chance
+ db 12 ; Lightning Type Chance
+ db 48 ; Fighting Type Chance
+ db 12 ; Psychic Type Chance
+ db 22 ; Colorless Type Chance
+ db 12 ; Trainer Card Chance
+ db 12 ; Energy Card Chance
+
+BoosterPack_MysteryTrainerColorless:: ; 1e5c8 (7:65c8)
+ booster_set MYSTERY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $0C ; Grass Type Chance
- db $0C ; Fire Type Chance
- db $0C ; Water Type Chance
- db $0C ; Lightning Type Chance
- db $0C ; Fighting Type Chance
- db $0C ; Psychic Type Chance
- db $16 ; Colorless Type Chance
- db $30 ; Trainer Card Chance
- db $0C ; Energy Card Chance
-
-PackLaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
- db LABORATORY >> 4 ; booster pack set
+ db 12 ; Grass Type Chance
+ db 12 ; Fire Type Chance
+ db 12 ; Water Type Chance
+ db 12 ; Lightning Type Chance
+ db 12 ; Fighting Type Chance
+ db 12 ; Psychic Type Chance
+ db 22 ; Colorless Type Chance
+ db 48 ; Trainer Card Chance
+ db 12 ; Energy Card Chance
+
+BoosterPack_LaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
+ booster_set LABORATORY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $14 ; Grass Type Chance
- db $14 ; Fire Type Chance
- db $14 ; Water Type Chance
- db $14 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $14 ; Psychic Type Chance
- db $14 ; Colorless Type Chance
- db $18 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackLaboratoryGrass:: ; 1e5e0 (7:65e0)
- db LABORATORY >> 4 ; booster pack set
+ db 20 ; Grass Type Chance
+ db 20 ; Fire Type Chance
+ db 20 ; Water Type Chance
+ db 20 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 20 ; Psychic Type Chance
+ db 20 ; Colorless Type Chance
+ db 24 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_LaboratoryGrass:: ; 1e5e0 (7:65e0)
+ booster_set LABORATORY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $30 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackLaboratoryWater:: ; 1e5ec (7:65ec)
- db LABORATORY >> 4 ; booster pack set
+ db 48 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_LaboratoryWater:: ; 1e5ec (7:65ec)
+ booster_set LABORATORY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $30 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackLaboratoryPsychic:: ; 1e5f8 (7:65f8)
- db LABORATORY >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 48 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_LaboratoryPsychic:: ; 1e5f8 (7:65f8)
+ booster_set LABORATORY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $30 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $10 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackLaboratoryTrainer:: ; 1e604 (7:6604)
- db LABORATORY >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 48 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 16 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_LaboratoryTrainer:: ; 1e604 (7:6604)
+ booster_set LABORATORY ; booster pack set
dw $0000 ; energy or energy generation function
; Card Type Chances
- db $10 ; Grass Type Chance
- db $10 ; Fire Type Chance
- db $10 ; Water Type Chance
- db $10 ; Lightning Type Chance
- db $10 ; Fighting Type Chance
- db $10 ; Psychic Type Chance
- db $10 ; Colorless Type Chance
- db $30 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEnergyLightningFire:: ; 1e610 (7:6610)
- db COLOSSEUM >> 4 ; booster pack set
+ db 16 ; Grass Type Chance
+ db 16 ; Fire Type Chance
+ db 16 ; Water Type Chance
+ db 16 ; Lightning Type Chance
+ db 16 ; Fighting Type Chance
+ db 16 ; Psychic Type Chance
+ db 16 ; Colorless Type Chance
+ db 48 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EnergyLightningFire:: ; 1e610 (7:6610)
+ booster_set COLOSSEUM ; booster pack set
dw GenerateEnergyBoosterLightningFire ; energy or energy generation function
; Card Type Chances
- db $00 ; Grass Type Chance
- db $00 ; Fire Type Chance
- db $00 ; Water Type Chance
- db $00 ; Lightning Type Chance
- db $00 ; Fighting Type Chance
- db $00 ; Psychic Type Chance
- db $00 ; Colorless Type Chance
- db $00 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEnergyWaterFighting:: ; 1e61c (7:661c)
- db COLOSSEUM >> 4 ; booster pack set
+ db 0 ; Grass Type Chance
+ db 0 ; Fire Type Chance
+ db 0 ; Water Type Chance
+ db 0 ; Lightning Type Chance
+ db 0 ; Fighting Type Chance
+ db 0 ; Psychic Type Chance
+ db 0 ; Colorless Type Chance
+ db 0 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EnergyWaterFighting:: ; 1e61c (7:661c)
+ booster_set COLOSSEUM ; booster pack set
dw GenerateEnergyBoosterWaterFighting ; energy or energy generation function
; Card Type Chances
- db $00 ; Grass Type Chance
- db $00 ; Fire Type Chance
- db $00 ; Water Type Chance
- db $00 ; Lightning Type Chance
- db $00 ; Fighting Type Chance
- db $00 ; Psychic Type Chance
- db $00 ; Colorless Type Chance
- db $00 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackEnergyGrassPsychic:: ; 1e628 (7:6628)
- db COLOSSEUM >> 4 ; booster pack set
+ db 0 ; Grass Type Chance
+ db 0 ; Fire Type Chance
+ db 0 ; Water Type Chance
+ db 0 ; Lightning Type Chance
+ db 0 ; Fighting Type Chance
+ db 0 ; Psychic Type Chance
+ db 0 ; Colorless Type Chance
+ db 0 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_EnergyGrassPsychic:: ; 1e628 (7:6628)
+ booster_set COLOSSEUM ; booster pack set
dw GenerateEnergyBoosterGrassPsychic ; energy or energy generation function
; Card Type Chances
- db $00 ; Grass Type Chance
- db $00 ; Fire Type Chance
- db $00 ; Water Type Chance
- db $00 ; Lightning Type Chance
- db $00 ; Fighting Type Chance
- db $00 ; Psychic Type Chance
- db $00 ; Colorless Type Chance
- db $00 ; Trainer Card Chance
- db $00 ; Energy Card Chance
-
-PackRandomEnergies:: ; 1e634 (7:6634)
- db COLOSSEUM >> 4 ; booster pack set
+ db 0 ; Grass Type Chance
+ db 0 ; Fire Type Chance
+ db 0 ; Water Type Chance
+ db 0 ; Lightning Type Chance
+ db 0 ; Fighting Type Chance
+ db 0 ; Psychic Type Chance
+ db 0 ; Colorless Type Chance
+ db 0 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
+
+BoosterPack_RandomEnergies:: ; 1e634 (7:6634)
+ booster_set COLOSSEUM ; booster pack set
dw GenerateRandomEnergyBooster ; energy or energy generation function
; Card Type Chances
- db $00 ; Grass Type Chance
- db $00 ; Fire Type Chance
- db $00 ; Water Type Chance
- db $00 ; Lightning Type Chance
- db $00 ; Fighting Type Chance
- db $00 ; Psychic Type Chance
- db $00 ; Colorless Type Chance
- db $00 ; Trainer Card Chance
- db $00 ; Energy Card Chance
+ db 0 ; Grass Type Chance
+ db 0 ; Fire Type Chance
+ db 0 ; Water Type Chance
+ db 0 ; Lightning Type Chance
+ db 0 ; Fighting Type Chance
+ db 0 ; Psychic Type Chance
+ db 0 ; Colorless Type Chance
+ db 0 ; Trainer Card Chance
+ db 0 ; Energy Card Chance
diff --git a/src/data/cards.asm b/src/data/cards.asm
index b246f59..480607e 100755..100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -221,7 +221,7 @@ CardPointers: ; 30c5c (c:4c5c)
dw PlusPowerCard
dw DefenderCard
dw ItemFinderCard
- dw GustofWindCard
+ dw GustOfWindCard
dw DevolutionSprayCard
dw PotionCard
dw SuperPotionCard
@@ -872,12 +872,12 @@ NidoranFCard: ; 31134 (c:5134)
; move 2
energy GRASS, 2 ; energies
- tx CallforFamilyName ; name
- tx NidoranFsCallforFamilyDescription ; description
+ tx CallForFamilyName ; name
+ tx NidoranFsCallForFamilyDescription ; description
dw NONE ; description (cont)
db 0 ; damage
db RESIDUAL ; category
- dw NidoranFCallforFamilyEffectCommands ; effect commands
+ dw NidoranFCallForFamilyEffectCommands ; effect commands
db NONE ; flags 1
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
@@ -1637,12 +1637,12 @@ BellsproutCard: ; 31503 (c:5503)
; move 2
energy GRASS, 1 ; energies
- tx CallforFamilyName ; name
- tx BellsproutsCallforFamilyDescription ; description
+ tx CallForFamilyName ; name
+ tx BellsproutsCallForFamilyDescription ; description
dw NONE ; description (cont)
db 0 ; damage
db RESIDUAL ; category
- dw BellsproutCallforFamilyEffectCommands ; effect commands
+ dw BellsproutCallForFamilyEffectCommands ; effect commands
db NONE ; flags 1
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
@@ -2657,12 +2657,12 @@ Arcanine1Card: ; 31a17 (c:5a17)
; move 2
energy FIRE, 2 ; energies
- tx FlamesofRageName ; name
- tx FlamesofRageDescription ; description
+ tx FlamesOfRageName ; name
+ tx FlamesOfRageDescription ; description
dw NONE ; description (cont)
db 40 ; damage
db DAMAGE_PLUS ; category
- dw ArcanineFlamesofRageEffectCommands ; effect commands
+ dw ArcanineFlamesOfRageEffectCommands ; effect commands
db NONE ; flags 1
db DISCARD_ENERGY ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
@@ -3779,12 +3779,12 @@ ShellderCard: ; 31fad (c:5fad)
; move 2
energy WATER, 1 ; energies
- tx HideinShellName ; name
- tx HideinShellDescription ; description
+ tx HideInShellName ; name
+ tx HideInShellDescription ; description
dw NONE ; description (cont)
db 0 ; damage
db RESIDUAL ; category
- dw ShellderHideinShellEffectCommands ; effect commands
+ dw ShellderHideInShellEffectCommands ; effect commands
db NONE ; flags 1
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
@@ -3867,12 +3867,12 @@ KrabbyCard: ; 3202f (c:602f)
; move 1
energy WATER, 1 ; energies
- tx CallforFamilyName ; name
- tx KrabbysCallforFamilyDescription ; description
+ tx CallForFamilyName ; name
+ tx KrabbysCallForFamilyDescription ; description
dw NONE ; description (cont)
db 0 ; damage
db RESIDUAL ; category
- dw KrabbyCallforFamilyEffectCommands ; effect commands
+ dw KrabbyCallForFamilyEffectCommands ; effect commands
db NONE ; flags 1
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
@@ -5856,12 +5856,12 @@ Zapdos3Card: ; 32a16 (c:6a16)
; move 1
energy 0 ; energies
- tx PealofThunderName ; name
- tx PealofThunderDescription ; description
+ tx PealOfThunderName ; name
+ tx PealOfThunderDescription ; description
dw NONE ; description (cont)
db 0 ; damage
db POKEMON_POWER ; category
- dw ZapdosPealofThunderEffectCommands ; effect commands
+ dw ZapdosPealOfThunderEffectCommands ; effect commands
db DAMAGE_TO_OPPONENT_BENCH ; flags 1
db NONE ; flags 2
db NONE ; flags 3
@@ -8828,12 +8828,12 @@ WigglytuffCard: ; 338d0 (c:78d0)
; move 2
energy COLORLESS, 3 ; energies
- tx DotheWaveName ; name
- tx DotheWaveDescription ; description
+ tx DoTheWaveName ; name
+ tx DoTheWaveDescription ; description
dw NONE ; description (cont)
db 10 ; damage
db DAMAGE_PLUS ; category
- dw WigglytuffDotheWaveEffectCommands ; effect commands
+ dw WigglytuffDoTheWaveEffectCommands ; effect commands
db NONE ; flags 1
db NONE ; flags 2
db NONE ; flags 3
@@ -10111,15 +10111,15 @@ ItemFinderCard: ; 33f47 (c:7f47)
tx ItemFinderDescription ; description
dw NONE ; description (cont)
-GustofWindCard: ; 33f55 (c:7f55)
+GustOfWindCard: ; 33f55 (c:7f55)
db TYPE_TRAINER ; type
- gfx GustofWindCardGfx ; gfx
- tx GustofWindName ; name
+ gfx GustOfWindCardGfx ; gfx
+ tx GustOfWindName ; name
db CIRCLE ; rarity
db EVOLUTION | NONE ; sets
db GUST_OF_WIND
- dw GustofWindEffectCommands ; effect commands
- tx GustofWindDescription ; description
+ dw GustOfWindEffectCommands ; effect commands
+ tx GustOfWindDescription ; description
dw NONE ; description (cont)
DevolutionSprayCard: ; 33f63 (c:7f63)
diff --git a/src/data/decks.asm b/src/data/decks.asm
index 129b6d9..129b6d9 100755..100644
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 3dfdf9c..1df3d0d 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -182,7 +182,7 @@ NidoranFFurySweepesEffectCommands:
dbw $09, $49be
db $00
-NidoranFCallforFamilyEffectCommands:
+NidoranFCallForFamilyEffectCommands:
dbw $01, $49db
dbw $04, $4a6e
dbw $05, $49eb
@@ -264,7 +264,7 @@ MukSludgeEffectCommands:
dbw $09, $4c38
db $00
-BellsproutCallforFamilyEffectCommands:
+BellsproutCallForFamilyEffectCommands:
dbw $01, $4c40
dbw $04, $4cc2
dbw $05, $4c50
@@ -369,7 +369,7 @@ KinglerFlailEffectCommands:
dbw $09, $4f4e
db $00
-KrabbyCallforFamilyEffectCommands:
+KrabbyCallForFamilyEffectCommands:
dbw $01, $4f5d
dbw $04, $4fdf
dbw $05, $4f6d
@@ -413,7 +413,7 @@ ShellderSupersonicEffectCommands:
dbw $03, $509d
db $00
-ShellderHideinShellEffectCommands:
+ShellderHideInShellEffectCommands:
dbw $03, $50a4
db $00
@@ -555,7 +555,7 @@ ArcanineQuickAttackEffectCommands:
dbw $09, $5385
db $00
-ArcanineFlamesofRageEffectCommands:
+ArcanineFlamesOfRageEffectCommands:
dbw $01, $53a0
dbw $02, $53ae
dbw $03, $53ef
@@ -1114,7 +1114,7 @@ Magneton2SelfdestructEffectCommands:
dbw $04, $675f
db $00
-ZapdosPealofThunderEffectCommands:
+ZapdosPealOfThunderEffectCommands:
dbw $01, $677e
dbw $07, $6780
db $00
@@ -1289,7 +1289,7 @@ WigglytuffLullabyEffectCommands:
dbw $03, SleepEffect
db $00
-WigglytuffDotheWaveEffectCommands:
+WigglytuffDoTheWaveEffectCommands:
dbw $03, $6d87
dbw $09, $6d87
db $00
@@ -1599,7 +1599,7 @@ SuperEnergyRetrievalEffectCommands:
dbw $05, $7dba
db $00
-GustofWindEffectCommands:
+GustOfWindEffectCommands:
dbw $01, $7e6e
dbw $02, $7e79
dbw $03, $7e90
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ae4e355..ae4e355 100755..100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
diff --git a/src/data/map_songs.asm b/src/data/map_songs.asm
index afb54a8..4012452 100755..100644
--- a/src/data/map_songs.asm
+++ b/src/data/map_songs.asm
@@ -7,31 +7,31 @@ MapSongs: ; 1c374 (7:4374)
db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD ; ISHIHARAS_HOUSE
db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY
- db $20,$21,$00,$04,$0D,MUSIC_CLUB3 ; FIGHTING_CLUB
+ db $20,$21,$00,$04,$0D,MUSIC_CLUB_3 ; FIGHTING_CLUB
db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY
- db $22,$23,$00,$04,$0E,MUSIC_CLUB2 ; ROCK_CLUB
+ db $22,$23,$00,$04,$0E,MUSIC_CLUB_2 ; ROCK_CLUB
db $10,$11,$00,$03,$06,MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; WATER_CLUB_LOBBY
- db $24,$25,$00,$02,$0F,MUSIC_CLUB2 ; WATER_CLUB
+ db $24,$25,$00,$02,$0F,MUSIC_CLUB_2 ; WATER_CLUB
db $12,$13,$00,$03,$07,MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY
- db $26,$27,$00,$05,$10,MUSIC_CLUB1 ; LIGHTNING_CLUB
+ db $26,$27,$00,$05,$10,MUSIC_CLUB_1 ; LIGHTNING_CLUB
db $14,$15,$00,$03,$08,MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY
- db $28,$29,$00,$06,$11,MUSIC_CLUB1 ; GRASS_CLUB
+ db $28,$29,$00,$06,$11,MUSIC_CLUB_1 ; GRASS_CLUB
db $16,$17,$00,$03,$09,MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY
- db $2A,$2B,$00,$07,$12,MUSIC_CLUB2 ; PSYCHIC_CLUB
+ db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2 ; PSYCHIC_CLUB
db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY
- db $2C,$2D,$00,$06,$13,MUSIC_CLUB3 ; SCIENCE_CLUB
+ db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3 ; SCIENCE_CLUB
db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY
- db $2E,$2F,$00,$08,$14,MUSIC_CLUB3 ; FIRE_CLUB
+ db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3 ; FIRE_CLUB
db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE
db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY
db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL
db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE
- db $36,$37,$00,$0A,$17,MUSIC_POKEMONDOME ; POKEMON_DOME
- db $3A,$3B,$00,$0A,$18,MUSIC_HALLOFHONOR ; HALL_OF_HONOR
+ db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME ; POKEMON_DOME
+ db $3A,$3B,$00,$0A,$18,MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/data/overworld_indexes.asm b/src/data/overworld_indexes.asm
index 7df99de..7df99de 100755..100644
--- a/src/data/overworld_indexes.asm
+++ b/src/data/overworld_indexes.asm
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 20:33:41 +0000