mirror of
https://github.com/pret/poketcg2.git
synced 2026-10-05 15:39:28 -04:00
Merge pull request #57 from earthoul/engine-deck
Refactor Deck Machine funcs
This commit is contained in:
dannye
@@ -7,6 +7,9 @@ DEF CARD_NOT_OWNED_F EQU 7
|
||||
DEF CARD_NOT_OWNED EQU 1 << CARD_NOT_OWNED_F
|
||||
DEF CARD_COUNT_MASK EQU $7f
|
||||
|
||||
DEF CARD_COUNT_FROM_BUILT_DECKS EQU CARD_NOT_OWNED ; $80
|
||||
; on the other hand, counting all owned cards uses $0 and $ff inconsistently
|
||||
|
||||
; sDeck* and generic deck constants
|
||||
DEF NUM_DECKS EQU 4
|
||||
DEF DECK_NAME_SIZE EQU 24
|
||||
@@ -17,9 +20,15 @@ DEF DECK_STRUCT_SIZE EQU DECK_NAME_SIZE + DECK_SIZE_BYTES
|
||||
DEF DECK_COMPRESSED_SIZE EQU ((DECK_SIZE + 7) / 8 + 1) * 8
|
||||
DEF DECK_COMPRESSED_STRUCT_SIZE EQU DECK_NAME_SIZE + DECK_COMPRESSED_SIZE
|
||||
DEF DECK_CONFIG_BUFFER_SIZE EQU 80
|
||||
DEF DECK_TEMP_BUFFER_SIZE EQU 128 ; as DECK_COMPRESSED_STRUCT_SIZE + 32, DECK_SIZE_BYTES + 8, etc.
|
||||
DEF DECK_BIG_TEMP_BUFFER_SIZE EQU 256
|
||||
DEF MAX_NUM_SAME_NAME_CARDS EQU 4
|
||||
DEF MAX_NUM_SUB_ENERGY_CARDS EQU 9
|
||||
DEF MAX_UNNAMED_DECK_NUM EQU 999
|
||||
|
||||
DEF MAX_NUM_AUTO_DECK_LIST_DIFFERENT_CARDS EQU 43
|
||||
DEF AUTO_DECK_LIST_BUFFER_SIZE EQU 3 * MAX_NUM_AUTO_DECK_LIST_DIFFERENT_CARDS + 1
|
||||
|
||||
; card data offsets (data/cards.asm and card_data_struct)
|
||||
|
||||
RSRESET
|
||||
|
||||
@@ -123,8 +123,8 @@ DEF GR_ISLAND EQU $1
|
||||
const MAP_GR_CASTLE_ENTRANCE ; $71
|
||||
const MAP_GR_CASTLE ; $72
|
||||
const MAP_GR_CASTLE_BIRURITCHI ; $73
|
||||
|
||||
DEF MAP_NONE EQU -1
|
||||
const_def -1
|
||||
const MAP_NONE ; $ff
|
||||
|
||||
; MAP_GFX_*
|
||||
; referenced in MapHeaders, and others. see also: data/map_gfx.asm
|
||||
|
||||
@@ -64,6 +64,19 @@
|
||||
const MINICOMMENU_MAILBOX ; 1
|
||||
const MINICOMMENU_CARD_ALBUM ; 2
|
||||
|
||||
; deck save machine options
|
||||
const_def
|
||||
const DECKSAVEMACHINEMENU_SAVE ; 0
|
||||
const DECKSAVEMACHINEMENU_DELETE ; 1
|
||||
const DECKSAVEMACHINEMENU_BUILD ; 2
|
||||
const DECKSAVEMACHINEMENU_CANCEL ; 3
|
||||
|
||||
; auto deck machine options
|
||||
const_def
|
||||
const AUTODECKMACHINEMENU_BUILD ; 0
|
||||
const AUTODECKMACHINEMENU_CANCEL ; 1
|
||||
const AUTODECKMACHINEMENU_READ ; 2
|
||||
|
||||
; mailbox options
|
||||
const_def
|
||||
const MAILBOXMENU_READ ; 0
|
||||
@@ -99,6 +112,10 @@
|
||||
const POPUPMENU_CARD_DUNGEON_QUEEN ; $9
|
||||
const POPUPMENU_CARD_DUNGEON_PAWN ; $a
|
||||
|
||||
; for menu items, PlaySFXConfirmOrCancel, etc.
|
||||
DEF MENU_CANCEL EQU -1
|
||||
DEF MENU_CONFIRM EQU 1 ; != -1, but uses 1 most of the time
|
||||
|
||||
; filter types for CardTypeFilters
|
||||
; used to categorise the different cards
|
||||
; i.e. in the deck building screen
|
||||
@@ -113,6 +130,10 @@ DEF FILTER_TRAINER EQUS "TYPE_TRAINER"
|
||||
DEF FILTER_ENERGY EQU $20
|
||||
|
||||
DEF NUM_FILTERS EQU 9
|
||||
DEF NO_FILTERS EQU $ff
|
||||
|
||||
DEF FILTERED_CARD_LIST_SIZE EQU 80
|
||||
DEF FILTERED_CARD_LIST_SIZE_BYTES EQU FILTERED_CARD_LIST_SIZE * 2
|
||||
|
||||
; for FilterCardListInHL
|
||||
DEF FILTER_ONLY_PKMN EQU 0
|
||||
@@ -121,11 +142,43 @@ DEF FILTER_ONLY_ENERGY EQU FILTER_ENERGY >> 4 ; 2, or any number > 1
|
||||
|
||||
DEF NUM_DECK_CONFIRMATION_VISIBLE_CARDS EQU 7
|
||||
DEF NUM_FILTERED_LIST_VISIBLE_CARDS EQU 6
|
||||
DEF NUM_DECK_STATUS_LIST_VISIBLE_CARDS EQU 5
|
||||
|
||||
DEF NUM_DECK_SAVE_MACHINE_SLOTS EQU 50
|
||||
DEF NUM_DECK_MACHINE_VISIBLE_DECKS EQU 5
|
||||
DEF NUM_DECK_MACHINE_VISIBLE_SLOTS EQU 5 ; decks or categories
|
||||
DEF NUM_AUTO_DECK_MACHINE_SLOTS EQU 4
|
||||
|
||||
; auto deck machine 1
|
||||
const_def
|
||||
const AUTO_DECK_BASIC ; 0
|
||||
const AUTO_DECK_GIVEN ; 1
|
||||
const AUTO_DECK_FIGHTING ; 2
|
||||
const AUTO_DECK_GRASS ; 3
|
||||
const AUTO_DECK_WATER ; 4
|
||||
const AUTO_DECK_FIRE ; 5
|
||||
const AUTO_DECK_LIGHTNING ; 6
|
||||
const AUTO_DECK_PSYCHIC ; 7
|
||||
DEF NUM_AUTO_DECK_MACHINE_REGULAR_CATEGORIES EQU const_value ; shared with machine 2
|
||||
const AUTO_DECK_SPECIAL ; 8
|
||||
const AUTO_DECK_LEGENDARY ; 9
|
||||
DEF NUM_AUTO_DECK_MACHINE_CATEGORIES EQU const_value ; shared with machine 2
|
||||
|
||||
; auto deck machine 2
|
||||
const_def
|
||||
const AUTO_DECK_DARK_GRASS ; 0
|
||||
const AUTO_DECK_DARK_LIGHTNING ; 1
|
||||
const AUTO_DECK_DARK_WATER ; 2
|
||||
const AUTO_DECK_DARK_FIRE ; 3
|
||||
const AUTO_DECK_DARK_FIGHTING ; 4
|
||||
const AUTO_DECK_DARK_PSYCHIC ; 5
|
||||
const AUTO_DECK_COLORLESS ; 6
|
||||
const AUTO_DECK_DARK_SPECIAL ; 7
|
||||
const AUTO_DECK_SUPER_RARE ; 8
|
||||
const AUTO_DECK_MYSTERIOUS ; 9
|
||||
|
||||
; auto_deck args
|
||||
DEF AUTO_DECK_ENTRY_SIZE EQU 6
|
||||
|
||||
; deck flags
|
||||
const_def
|
||||
const DECK_1_F ; $0
|
||||
|
||||
@@ -331,8 +331,8 @@ DEF NUM_PICS EQU const_value
|
||||
const NPC_WHITE_CASTLE_COIN ; $e6
|
||||
const NPC_PURPLE_CASTLE_COIN ; $e7
|
||||
const NPC_STRONGHOLD_PLATFORM ; $e8
|
||||
|
||||
DEF NPC_NONE EQU -1
|
||||
const_def -1
|
||||
const NPC_NONE ; $ff
|
||||
|
||||
; grand masters
|
||||
const_def
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
const OW_ANIM_29 ; $29
|
||||
const OW_ANIM_2A ; $2a
|
||||
const OW_ANIM_2B ; $2b
|
||||
DEF const_value = $ff
|
||||
const_def -1
|
||||
const OW_ANIM_NONE ; $ff
|
||||
|
||||
const_def
|
||||
|
||||
@@ -162,7 +162,3 @@
|
||||
const SFX_GHOST_MASTER_DISAPPEAR ; $a0
|
||||
|
||||
DEF NUM_SFX EQU const_value
|
||||
|
||||
; PlaySFXConfirmOrCancel args
|
||||
DEF MENU_CANCEL EQU -1
|
||||
DEF MENU_CONFIRM EQU 1 ; != -1, but uses 1 most of the time
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
; each Auto Deck Machine section has 4 deck entries
|
||||
; each Auto Deck Machine category has 4 deck entries
|
||||
; each entry consists of
|
||||
; its card list (see data/auto_deck_card_lists.asm) and
|
||||
; two text IDs for its name and description (flavor) text
|
||||
@@ -12,263 +12,263 @@ ENDM
|
||||
AutoDeckMachine1Entries:
|
||||
; basic
|
||||
auto_deck MachineStarterDeckList, \
|
||||
MachineStarterDeckText, \
|
||||
MachineStarterDeckName, \
|
||||
MachineStarterDeckDescriptionText
|
||||
auto_deck MachineElectricFireDeckList, \
|
||||
MachineElectricFireDeckText, \
|
||||
MachineElectricFireDeckName, \
|
||||
MachineElectricFireDeckDescriptionText
|
||||
auto_deck MachineBattleWaterDeckList, \
|
||||
MachineBattleWaterDeckText, \
|
||||
MachineBattleWaterDeckName, \
|
||||
MachineBattleWaterDeckDescriptionText
|
||||
auto_deck MachineEsperGreenDeckList, \
|
||||
MachineEsperGreenDeckText, \
|
||||
MachineEsperGreenDeckName, \
|
||||
MachineEsperGreenDeckDescriptionText
|
||||
; gifts
|
||||
auto_deck MachineSweatAntiGR1DeckList, \
|
||||
MachineSweatAntiGR1DeckText, \
|
||||
MachineSweatAntiGR1DeckName, \
|
||||
MachineSweatAntiGR1DeckDescriptionText
|
||||
auto_deck MachineGiveInAntiGR2DeckList, \
|
||||
MachineGiveInAntiGR2DeckText, \
|
||||
MachineGiveInAntiGR2DeckName, \
|
||||
MachineGiveInAntiGR2DeckDescriptionText
|
||||
auto_deck MachineVengefulAntiGR3DeckList, \
|
||||
MachineVengefulAntiGR3DeckText, \
|
||||
MachineVengefulAntiGR3DeckName, \
|
||||
MachineVengefulAntiGR3DeckDescriptionText
|
||||
auto_deck MachineUnforgivingAntiGR4DeckList, \
|
||||
MachineUnforgivingAntiGR4DeckText, \
|
||||
MachineUnforgivingAntiGR4DeckName, \
|
||||
MachineUnforgivingAntiGR4DeckDescriptionText
|
||||
; fighting
|
||||
auto_deck MachineAwesomeFossilsDeckList, \
|
||||
MachineAwesomeFossilsDeckText, \
|
||||
MachineAwesomeFossilsDeckName, \
|
||||
MachineAwesomeFossilsDeckDescriptionText
|
||||
auto_deck MachineNewMachokeDeckList, \
|
||||
MachineNewMachokeDeckText, \
|
||||
MachineNewMachokeDeckName, \
|
||||
MachineNewMachokeDeckDescriptionText
|
||||
auto_deck MachineRockFestivalDeckList, \
|
||||
MachineRockFestivalDeckText, \
|
||||
MachineRockFestivalDeckName, \
|
||||
MachineRockFestivalDeckDescriptionText
|
||||
auto_deck MachineJabHookDeckList, \
|
||||
MachineJabHookDeckText, \
|
||||
MachineJabHookDeckName, \
|
||||
MachineJabHookDeckDescriptionText
|
||||
; grass
|
||||
auto_deck MachineSteadyIncreaseDeckList, \
|
||||
MachineSteadyIncreaseDeckText, \
|
||||
MachineSteadyIncreaseDeckName, \
|
||||
MachineSteadyIncreaseDeckDescriptionText
|
||||
auto_deck MachineGatheringNidoranDeckList, \
|
||||
MachineGatheringNidoranDeckText, \
|
||||
MachineGatheringNidoranDeckName, \
|
||||
MachineGatheringNidoranDeckDescriptionText
|
||||
auto_deck MachineNationalParkDeckList, \
|
||||
MachineNationalParkDeckText, \
|
||||
MachineNationalParkDeckName, \
|
||||
MachineNationalParkDeckDescriptionText
|
||||
auto_deck MachineSelectiveBreedingDeckList, \
|
||||
MachineSelectiveBreedingDeckText, \
|
||||
MachineSelectiveBreedingDeckName, \
|
||||
MachineSelectiveBreedingDeckDescriptionText
|
||||
; water
|
||||
auto_deck MachineSplashingAboutDeckList, \
|
||||
MachineSplashingAboutDeckText, \
|
||||
MachineSplashingAboutDeckName, \
|
||||
MachineSplashingAboutDeckDescriptionText
|
||||
auto_deck MachineBeachDeckList, \
|
||||
MachineBeachDeckText, \
|
||||
MachineBeachDeckName, \
|
||||
MachineBeachDeckDescriptionText
|
||||
auto_deck MachineInsulationDeckList, \
|
||||
MachineInsulationDeckText, \
|
||||
MachineInsulationDeckName, \
|
||||
MachineInsulationDeckDescriptionText
|
||||
auto_deck MachineAntarcticDeckList, \
|
||||
MachineAntarcticDeckText, \
|
||||
MachineAntarcticDeckName, \
|
||||
MachineAntarcticDeckDescriptionText
|
||||
; fire
|
||||
auto_deck MachineFlameFestivalDeckList, \
|
||||
MachineFlameFestivalDeckText, \
|
||||
MachineFlameFestivalDeckName, \
|
||||
MachineFlameFestivalDeckDescriptionText
|
||||
auto_deck MachineElectricCurrentShockDeckList, \
|
||||
MachineElectricCurrentShockDeckText, \
|
||||
MachineElectricCurrentShockDeckName, \
|
||||
MachineElectricCurrentShockDeckDescriptionText
|
||||
auto_deck MachineRiskyBlazeDeckList, \
|
||||
MachineRiskyBlazeDeckText, \
|
||||
MachineRiskyBlazeDeckName, \
|
||||
MachineRiskyBlazeDeckDescriptionText
|
||||
auto_deck MachineRagingCharizardDeckList, \
|
||||
MachineRagingCharizardDeckText, \
|
||||
MachineRagingCharizardDeckName, \
|
||||
MachineRagingCharizardDeckDescriptionText
|
||||
; lightning
|
||||
auto_deck MachineZapdosPowerPlantDeckList, \
|
||||
MachineZapdosPowerPlantDeckText, \
|
||||
MachineZapdosPowerPlantDeckName, \
|
||||
MachineZapdosPowerPlantDeckDescriptionText
|
||||
auto_deck MachineElectricShockDeckList, \
|
||||
MachineElectricShockDeckText, \
|
||||
MachineElectricShockDeckName, \
|
||||
MachineElectricShockDeckDescriptionText
|
||||
auto_deck MachineOverflowDeckList, \
|
||||
MachineOverflowDeckText, \
|
||||
MachineOverflowDeckName, \
|
||||
MachineOverflowDeckDescriptionText
|
||||
auto_deck MachineTripleZapdosDeckList, \
|
||||
MachineTripleZapdosDeckText, \
|
||||
MachineTripleZapdosDeckName, \
|
||||
MachineTripleZapdosDeckDescriptionText
|
||||
; psychic
|
||||
auto_deck MachineSpecialBarrierDeckList, \
|
||||
MachineSpecialBarrierDeckText, \
|
||||
MachineSpecialBarrierDeckName, \
|
||||
MachineSpecialBarrierDeckDescriptionText
|
||||
auto_deck MachineEvolutionProhibitedDeckList, \
|
||||
MachineEvolutionProhibitedDeckText, \
|
||||
MachineEvolutionProhibitedDeckName, \
|
||||
MachineEvolutionProhibitedDeckDescriptionText
|
||||
auto_deck MachineGhostDeckList, \
|
||||
MachineGhostDeckText, \
|
||||
MachineGhostDeckName, \
|
||||
MachineGhostDeckDescriptionText
|
||||
auto_deck MachinePuppetMasterDeckList, \
|
||||
MachinePuppetMasterDeckText, \
|
||||
MachinePuppetMasterDeckName, \
|
||||
MachinePuppetMasterDeckDescriptionText
|
||||
; special
|
||||
auto_deck MachineMewLv15DeckList, \
|
||||
MachineMewLv15DeckText, \
|
||||
MachineMewLv15DeckName, \
|
||||
MachineMewLv15DeckDescriptionText
|
||||
auto_deck MachineVenusaurLv64DeckList, \
|
||||
MachineVenusaurLv64DeckText, \
|
||||
MachineVenusaurLv64DeckName, \
|
||||
MachineVenusaurLv64DeckDescriptionText
|
||||
auto_deck MachineMutualDestructionDeckList, \
|
||||
MachineMutualDestructionDeckText, \
|
||||
MachineMutualDestructionDeckName, \
|
||||
MachineMutualDestructionDeckDescriptionText
|
||||
auto_deck MachineEverybodySurfDeckList, \
|
||||
MachineEverybodySurfDeckText, \
|
||||
MachineEverybodySurfDeckName, \
|
||||
MachineEverybodySurfDeckDescriptionText
|
||||
; legendary
|
||||
auto_deck MachineGrandFireDeckList, \
|
||||
MachineGrandFireDeckText, \
|
||||
MachineGrandFireDeckName, \
|
||||
MachineGrandFireDeckDescriptionText
|
||||
auto_deck MachineLegendaryFossilDeckList, \
|
||||
MachineLegendaryFossilDeckText, \
|
||||
MachineLegendaryFossilDeckName, \
|
||||
MachineLegendaryFossilDeckDescriptionText
|
||||
auto_deck MachineWaterLegendDeckList, \
|
||||
MachineWaterLegendDeckText, \
|
||||
MachineWaterLegendDeckName, \
|
||||
MachineWaterLegendDeckDescriptionText
|
||||
auto_deck MachineGreatDragonDeckList, \
|
||||
MachineGreatDragonDeckText, \
|
||||
MachineGreatDragonDeckName, \
|
||||
MachineGreatDragonDeckDescriptionText
|
||||
|
||||
AutoDeckMachine2Entries:
|
||||
; dark grass
|
||||
auto_deck MachineInsectCollectionDeckList, \
|
||||
MachineInsectCollectionDeckText, \
|
||||
MachineInsectCollectionDeckName, \
|
||||
MachineInsectCollectionDeckDescriptionText
|
||||
auto_deck MachineCaveExplorationDeckList, \
|
||||
MachineCaveExplorationDeckText, \
|
||||
MachineCaveExplorationDeckName, \
|
||||
MachineCaveExplorationDeckDescriptionText
|
||||
auto_deck MachineOminousMeadowDeckList, \
|
||||
MachineOminousMeadowDeckText, \
|
||||
MachineOminousMeadowDeckName, \
|
||||
MachineOminousMeadowDeckDescriptionText
|
||||
auto_deck MachineAtrociousWeezingDeckList, \
|
||||
MachineAtrociousWeezingDeckText, \
|
||||
MachineAtrociousWeezingDeckName, \
|
||||
MachineAtrociousWeezingDeckDescriptionText
|
||||
; dark lightning
|
||||
auto_deck MachineTheBenchIsAlsoASurpriseDeckList, \
|
||||
MachineTheBenchIsAlsoASurpriseDeckText, \
|
||||
MachineTheBenchIsAlsoASurpriseDeckName, \
|
||||
MachineTheBenchIsAlsoASurpriseDeckDescriptionText
|
||||
auto_deck MachineEnergyConservationDeckList, \
|
||||
MachineEnergyConservationDeckText, \
|
||||
MachineEnergyConservationDeckName, \
|
||||
MachineEnergyConservationDeckDescriptionText
|
||||
auto_deck MachineSonicboomDeckList, \
|
||||
MachineSonicboomDeckText, \
|
||||
MachineSonicboomDeckName, \
|
||||
MachineSonicboomDeckDescriptionText
|
||||
auto_deck MachineRageOfTheHeavensDeckList, \
|
||||
MachineRageOfTheHeavensDeckText, \
|
||||
MachineRageOfTheHeavensDeckName, \
|
||||
MachineRageOfTheHeavensDeckDescriptionText
|
||||
; dark water
|
||||
auto_deck MachineDarkWaterDeckList, \
|
||||
MachineDarkWaterDeckText, \
|
||||
MachineDarkWaterDeckName, \
|
||||
MachineDarkWaterDeckDescriptionText
|
||||
auto_deck MachineQuickFreezeDeckList, \
|
||||
MachineQuickFreezeDeckText, \
|
||||
MachineQuickFreezeDeckName, \
|
||||
MachineQuickFreezeDeckDescriptionText
|
||||
auto_deck MachineWhirlpoolShowerDeckList, \
|
||||
MachineWhirlpoolShowerDeckText, \
|
||||
MachineWhirlpoolShowerDeckName, \
|
||||
MachineWhirlpoolShowerDeckDescriptionText
|
||||
auto_deck MachineWaterGangDeckList, \
|
||||
MachineWaterGangDeckText, \
|
||||
MachineWaterGangDeckName, \
|
||||
MachineWaterGangDeckDescriptionText
|
||||
; dark fire
|
||||
auto_deck MachineFireballDeckList, \
|
||||
MachineFireballDeckText, \
|
||||
MachineFireballDeckName, \
|
||||
MachineFireballDeckDescriptionText
|
||||
auto_deck MachineCompleteCombustionDeckList, \
|
||||
MachineCompleteCombustionDeckText, \
|
||||
MachineCompleteCombustionDeckName, \
|
||||
MachineCompleteCombustionDeckDescriptionText
|
||||
auto_deck MachineOminousSpiritFlamesDeckList, \
|
||||
MachineOminousSpiritFlamesDeckText, \
|
||||
MachineOminousSpiritFlamesDeckName, \
|
||||
MachineOminousSpiritFlamesDeckDescriptionText
|
||||
auto_deck MachineEternalFireDeckList, \
|
||||
MachineEternalFireDeckText, \
|
||||
MachineEternalFireDeckName, \
|
||||
MachineEternalFireDeckDescriptionText
|
||||
; dark fighting
|
||||
auto_deck MachineBewareTheTrapDeckList, \
|
||||
MachineBewareTheTrapDeckText, \
|
||||
MachineBewareTheTrapDeckName, \
|
||||
MachineBewareTheTrapDeckDescriptionText
|
||||
auto_deck MachineOgresKickDeckList, \
|
||||
MachineOgresKickDeckText, \
|
||||
MachineOgresKickDeckName, \
|
||||
MachineOgresKickDeckDescriptionText
|
||||
auto_deck MachineRockBlastDeckList, \
|
||||
MachineRockBlastDeckText, \
|
||||
MachineRockBlastDeckName, \
|
||||
MachineRockBlastDeckDescriptionText
|
||||
auto_deck MachineHeavyWorkDeckList, \
|
||||
MachineHeavyWorkDeckText, \
|
||||
MachineHeavyWorkDeckName, \
|
||||
MachineHeavyWorkDeckDescriptionText
|
||||
; dark psychic
|
||||
auto_deck MachineSlowbrosFishingDeckList, \
|
||||
MachineSlowbrosFishingDeckText, \
|
||||
MachineSlowbrosFishingDeckName, \
|
||||
MachineSlowbrosFishingDeckDescriptionText
|
||||
auto_deck MachineDirectHitDeckList, \
|
||||
MachineDirectHitDeckText, \
|
||||
MachineDirectHitDeckName, \
|
||||
MachineDirectHitDeckDescriptionText
|
||||
auto_deck MachineBadDreamDeckList, \
|
||||
MachineBadDreamDeckText, \
|
||||
MachineBadDreamDeckName, \
|
||||
MachineBadDreamDeckDescriptionText
|
||||
auto_deck MachineBenchPanicDeckList, \
|
||||
MachineBenchPanicDeckText, \
|
||||
MachineBenchPanicDeckName, \
|
||||
MachineBenchPanicDeckDescriptionText
|
||||
; colorless
|
||||
auto_deck MachineSnorlaxGuardDeckList, \
|
||||
MachineSnorlaxGuardDeckText, \
|
||||
MachineSnorlaxGuardDeckName, \
|
||||
MachineSnorlaxGuardDeckDescriptionText
|
||||
auto_deck MachineEyeOfTheStormDeckList, \
|
||||
MachineEyeOfTheStormDeckText, \
|
||||
MachineEyeOfTheStormDeckName, \
|
||||
MachineEyeOfTheStormDeckDescriptionText
|
||||
auto_deck MachineSuddenGrowthDeckList, \
|
||||
MachineSuddenGrowthDeckText, \
|
||||
MachineSuddenGrowthDeckName, \
|
||||
MachineSuddenGrowthDeckDescriptionText
|
||||
auto_deck MachineKingDragoniteDeckList, \
|
||||
MachineKingDragoniteDeckText, \
|
||||
MachineKingDragoniteDeckName, \
|
||||
MachineKingDragoniteDeckDescriptionText
|
||||
; dark special
|
||||
auto_deck MachineDarkCharizardDeckList, \
|
||||
MachineDarkCharizardDeckText, \
|
||||
MachineDarkCharizardDeckName, \
|
||||
MachineDarkCharizardDeckDescriptionText
|
||||
auto_deck MachineDarkBlastoiseDeckList, \
|
||||
MachineDarkBlastoiseDeckText, \
|
||||
MachineDarkBlastoiseDeckName, \
|
||||
MachineDarkBlastoiseDeckDescriptionText
|
||||
auto_deck MachineDarkVenusaurDeckList, \
|
||||
MachineDarkVenusaurDeckText, \
|
||||
MachineDarkVenusaurDeckName, \
|
||||
MachineDarkVenusaurDeckDescriptionText
|
||||
auto_deck MachineDarkDragoniteDeckList, \
|
||||
MachineDarkDragoniteDeckText, \
|
||||
MachineDarkDragoniteDeckName, \
|
||||
MachineDarkDragoniteDeckDescriptionText
|
||||
; rare
|
||||
auto_deck MachinePerfectHealthDeckList, \
|
||||
MachinePerfectHealthDeckText, \
|
||||
MachinePerfectHealthDeckName, \
|
||||
MachinePerfectHealthDeckDescriptionText
|
||||
auto_deck MachineSuperSoakerDeckList, \
|
||||
MachineSuperSoakerDeckText, \
|
||||
MachineSuperSoakerDeckName, \
|
||||
MachineSuperSoakerDeckDescriptionText
|
||||
auto_deck MachineHellsDemonDeckList, \
|
||||
MachineHellsDemonDeckText, \
|
||||
MachineHellsDemonDeckName, \
|
||||
MachineHellsDemonDeckDescriptionText
|
||||
auto_deck MachinePremiumThunderDeckList, \
|
||||
MachinePremiumThunderDeckText, \
|
||||
MachinePremiumThunderDeckName, \
|
||||
MachinePremiumThunderDeckDescriptionText
|
||||
; mysterious
|
||||
auto_deck MachineMysteriousMewtwoDeckList, \
|
||||
MachineMysteriousMewtwoDeckText, \
|
||||
MachineMysteriousMewtwoDeckName, \
|
||||
MachineMysteriousMewtwoDeckDescriptionText
|
||||
auto_deck MachineHeavenlyLugiaDeckList, \
|
||||
MachineHeavenlyLugiaDeckText, \
|
||||
MachineHeavenlyLugiaDeckName, \
|
||||
MachineHeavenlyLugiaDeckDescriptionText
|
||||
auto_deck MachineBrutalTrainersDeckList, \
|
||||
MachineBrutalTrainersDeckText, \
|
||||
MachineBrutalTrainersDeckName, \
|
||||
MachineBrutalTrainersDeckDescriptionText
|
||||
auto_deck MachineDreadfulParalysisDeckList, \
|
||||
MachineDreadfulParalysisDeckText, \
|
||||
MachineDreadfulParalysisDeckName, \
|
||||
MachineDreadfulParalysisDeckDescriptionText
|
||||
|
||||
+390
-264
File diff suppressed because it is too large
Load Diff
+87
-64
@@ -2319,23 +2319,29 @@ ENDR
|
||||
pop bc
|
||||
ret
|
||||
|
||||
; jump to .check_pointers[a], set carry if the event is set, clear carry if not
|
||||
CheckTCGIslandMilestoneEvents:
|
||||
; a = machine 1 category index
|
||||
; jump to .category_table[a]
|
||||
; return a = event flag(s), with carry if nz, with no carry otherwise
|
||||
; single event check: category unlock
|
||||
; multiple : per-deck unlock
|
||||
CheckCurAutoDeckMachine1CategoryUnlockEvents:
|
||||
push bc
|
||||
push de
|
||||
push hl
|
||||
sla a
|
||||
ld hl, .check_pointers
|
||||
ld hl, .category_table
|
||||
add_hl_a
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
|
||||
.jump_set_carry:
|
||||
; unlocked from start
|
||||
.BasicDecks
|
||||
jp .set_carry
|
||||
|
||||
.check_four_tcgisland_coins:
|
||||
; received anti-GR decks, checked with coin flags
|
||||
.AntiGRDecks
|
||||
ld a, EVENT_GOT_KABUTO_COIN
|
||||
call GetEventValue
|
||||
push af
|
||||
@@ -2351,58 +2357,64 @@ CheckTCGIslandMilestoneEvents:
|
||||
ld c, 4
|
||||
xor a
|
||||
ld d, a
|
||||
; fallthrough
|
||||
.loop_bitmask_1
|
||||
.loop_bitmask_four_coins
|
||||
sla d
|
||||
pop af
|
||||
jr z, .next_1
|
||||
jr z, .next_coin
|
||||
set 0, d
|
||||
; fallthrough
|
||||
.next_1
|
||||
.next_coin
|
||||
dec c
|
||||
jr nz, .loop_bitmask_1
|
||||
jr nz, .loop_bitmask_four_coins
|
||||
ld a, d
|
||||
or a
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_gr_coin_top_left:
|
||||
; beat GR1
|
||||
.FightingDecks
|
||||
ld a, EVENT_GOT_GR_COIN_PIECE_TOP_LEFT
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_gr_coin_top_right:
|
||||
; beat GR2
|
||||
.GrassDecks
|
||||
ld a, EVENT_GOT_GR_COIN_PIECE_TOP_RIGHT
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_starmie_coin:
|
||||
; beat GR3 in Water Club
|
||||
.WaterDecks
|
||||
ld a, EVENT_GOT_STARMIE_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_gr_coin_bottom_left:
|
||||
; beat GR3 in Fire Club
|
||||
.FireDecks
|
||||
ld a, EVENT_GOT_GR_COIN_PIECE_BOTTOM_LEFT
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_pikachu_coin:
|
||||
; beat controlled Isaac
|
||||
.LightningDecks
|
||||
ld a, EVENT_GOT_PIKACHU_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_gr_coin_bottom_right:
|
||||
; beat GR4
|
||||
.PsychicDecks
|
||||
ld a, EVENT_GOT_GR_COIN_PIECE_BOTTOM_RIGHT
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_final_cup_or_postgame:
|
||||
; won final cup / post-game
|
||||
; each unlocks two decks
|
||||
.SpecialDecks
|
||||
ld a, EVENT_WON_FINAL_CUP
|
||||
call GetEventValue
|
||||
push af
|
||||
@@ -2412,37 +2424,36 @@ CheckTCGIslandMilestoneEvents:
|
||||
ld c, 2
|
||||
xor a
|
||||
ld d, a
|
||||
; fallthrough
|
||||
.loop_bitmask_2
|
||||
.loop_bitmask_events
|
||||
sla d
|
||||
sla d
|
||||
pop af
|
||||
jr z, .next_2
|
||||
jr z, .next_event
|
||||
set 0, d
|
||||
set 1, d
|
||||
; fallthrough
|
||||
.next_2
|
||||
.next_event
|
||||
dec c
|
||||
jr nz, .loop_bitmask_2
|
||||
jr nz, .loop_bitmask_events
|
||||
ld a, d
|
||||
or a
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_event_db:
|
||||
; won grand master cup
|
||||
.LegendaryDecks:
|
||||
ld a, EVENT_WON_GRAND_MASTER_CUP
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.set_carry:
|
||||
.set_carry
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
scf
|
||||
ret
|
||||
|
||||
.clear_carry:
|
||||
.clear_carry
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
@@ -2450,99 +2461,111 @@ CheckTCGIslandMilestoneEvents:
|
||||
ccf
|
||||
ret
|
||||
|
||||
.check_pointers:
|
||||
dw .jump_set_carry
|
||||
dw .check_four_tcgisland_coins
|
||||
dw .check_gr_coin_top_left
|
||||
dw .check_gr_coin_top_right
|
||||
dw .check_starmie_coin
|
||||
dw .check_gr_coin_bottom_left
|
||||
dw .check_pikachu_coin
|
||||
dw .check_gr_coin_bottom_right
|
||||
dw .check_final_cup_or_postgame
|
||||
dw .check_event_db
|
||||
.category_table
|
||||
dw .BasicDecks ; AUTO_DECK_BASIC
|
||||
dw .AntiGRDecks ; AUTO_DECK_GIVEN
|
||||
dw .FightingDecks ; AUTO_DECK_FIGHTING
|
||||
dw .GrassDecks ; AUTO_DECK_GRASS
|
||||
dw .WaterDecks ; AUTO_DECK_WATER
|
||||
dw .FireDecks ; AUTO_DECK_FIRE
|
||||
dw .LightningDecks ; AUTO_DECK_LIGHTNING
|
||||
dw .PsychicDecks ; AUTO_DECK_PSYCHIC
|
||||
dw .SpecialDecks ; AUTO_DECK_SPECIAL
|
||||
dw .LegendaryDecks ; AUTO_DECK_LEGENDARY
|
||||
|
||||
; jump to .check_pointers[a], set carry if the event is set, clear carry if not
|
||||
CheckGRIslandMilestoneEvents:
|
||||
; a = machine 2 category index
|
||||
; jump to .category_table[a]
|
||||
; return a = event flag with carry if nz, with no carry otherwise
|
||||
CheckCurAutoDeckMachine2CategoryUnlockEvents:
|
||||
push bc
|
||||
push de
|
||||
push hl
|
||||
sla a
|
||||
ld hl, .check_pointers
|
||||
ld hl, .category_table
|
||||
add_hl_a
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
|
||||
.check_golbat_coin:
|
||||
; beat Morino
|
||||
.DarkGrassDecks
|
||||
ld a, EVENT_GOT_GOLBAT_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_magnemite_coin:
|
||||
; beat Catherine
|
||||
.DarkLightningDecks
|
||||
ld a, EVENT_GOT_MAGNEMITE_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_psyduck_coin:
|
||||
; beat Kanoko
|
||||
.DarkWaterDecks
|
||||
ld a, EVENT_GOT_PSYDUCK_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_magmar_coin:
|
||||
; beat Hidero
|
||||
.DarkFireDecks
|
||||
ld a, EVENT_GOT_MAGMAR_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_machamp_coin:
|
||||
; beat Kamiya
|
||||
.DarkFightingDecks
|
||||
ld a, EVENT_GOT_MACHAMP_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_mew_coin:
|
||||
; beat Mami
|
||||
.DarkPsychicDecks
|
||||
ld a, EVENT_GOT_MEW_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_snorlax_coin:
|
||||
; beat all three Colorless Altar guardians
|
||||
.ColorlessDecks
|
||||
ld a, EVENT_GOT_SNORLAX_COIN
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_rui_roadblock:
|
||||
; beat Rui
|
||||
.DarkSpecialDecks
|
||||
ld a, EVENT_GR_CASTLE_STAIRS_RUI_ROADBLOCK
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_battled_ishihara:
|
||||
; battled Ishihara
|
||||
.SuperRareDecks
|
||||
ld a, EVENT_BATTLED_ISHIHARA
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.check_postgame:
|
||||
; post-game
|
||||
.MysteriousDecks
|
||||
ld a, EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE
|
||||
call GetEventValue
|
||||
jp nz, .set_carry
|
||||
jp .clear_carry
|
||||
|
||||
.set_carry:
|
||||
.set_carry
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
scf
|
||||
ret
|
||||
|
||||
.clear_carry:
|
||||
.clear_carry
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
@@ -2550,17 +2573,17 @@ CheckGRIslandMilestoneEvents:
|
||||
ccf
|
||||
ret
|
||||
|
||||
.check_pointers:
|
||||
dw .check_golbat_coin
|
||||
dw .check_magnemite_coin
|
||||
dw .check_psyduck_coin
|
||||
dw .check_magmar_coin
|
||||
dw .check_machamp_coin
|
||||
dw .check_mew_coin
|
||||
dw .check_snorlax_coin
|
||||
dw .check_rui_roadblock
|
||||
dw .check_battled_ishihara
|
||||
dw .check_postgame
|
||||
.category_table
|
||||
dw .DarkGrassDecks ; AUTO_DECK_DARK_GRASS
|
||||
dw .DarkLightningDecks ; AUTO_DECK_DARK_LIGHTNING
|
||||
dw .DarkWaterDecks ; AUTO_DECK_DARK_WATER
|
||||
dw .DarkFireDecks ; AUTO_DECK_DARK_FIRE
|
||||
dw .DarkFightingDecks ; AUTO_DECK_DARK_FIGHTING
|
||||
dw .DarkPsychicDecks ; AUTO_DECK_DARK_PSYCHIC
|
||||
dw .ColorlessDecks ; AUTO_DECK_COLORLESS
|
||||
dw .DarkSpecialDecks ; AUTO_DECK_DARK_SPECIAL
|
||||
dw .SuperRareDecks ; AUTO_DECK_SUPER_RARE
|
||||
dw .MysteriousDecks ; AUTO_DECK_MYSTERIOUS
|
||||
|
||||
GetNumberOfDeckDiagnosisStepsUnlocked:
|
||||
push bc
|
||||
|
||||
@@ -5675,7 +5675,7 @@ CallMinicomMenuFunction:
|
||||
|
||||
MinicomDeckSaveMachine:
|
||||
farcall ClearSpriteAnimsAndSetInitialGraphicsConfiguration
|
||||
farcall Func_baec
|
||||
farcall HandleDeckSaveMachineMenu
|
||||
ret
|
||||
|
||||
MinicomCardAlbum:
|
||||
@@ -5689,7 +5689,7 @@ Func_1e849:
|
||||
farcall Func_10252
|
||||
ret
|
||||
|
||||
Func_1e855:
|
||||
AutoDeckMachine:
|
||||
farcall Func_1022a
|
||||
farcall ClearSpriteAnimsAndSetInitialGraphicsConfiguration
|
||||
farcall HandleAutoDeckMenu
|
||||
|
||||
+167
-139
@@ -3316,31 +3316,34 @@ AIDeckSpecificBenchScore:
|
||||
INCLUDE "src/data/auto_deck_list.asm"
|
||||
INCLUDE "src/data/auto_deck_machine.asm"
|
||||
|
||||
Func_2bb32:
|
||||
ReadAutoDeckConfiguration:
|
||||
call EnableSRAM
|
||||
ld a, [wd4b3]
|
||||
ld a, [wSelectedAutoDeckMachineCategory]
|
||||
ld l, a
|
||||
ld h, 24
|
||||
ld h, AUTO_DECK_ENTRY_SIZE * NUM_AUTO_DECK_MACHINE_SLOTS
|
||||
call HtimesL
|
||||
ld a, [wd548]
|
||||
ld a, [wAutoDeckMachineIndex]
|
||||
or a
|
||||
jr nz, .machine_2
|
||||
; machine 1
|
||||
ld bc, AutoDeckMachine1Entries
|
||||
jr .got_addr
|
||||
jr .set_entry_offset
|
||||
.machine_2
|
||||
ld bc, AutoDeckMachine2Entries
|
||||
.got_addr
|
||||
.set_entry_offset
|
||||
add hl, bc
|
||||
ld bc, $0
|
||||
.loop
|
||||
call Func_2bb7f
|
||||
call Func_2bbbb
|
||||
|
||||
; hl = ptr to entries under selected category
|
||||
lb bc, 0, 0
|
||||
.loop_decks
|
||||
call .GetPointerToWRAMAutoDeck
|
||||
call ReadCurAutoDeckConfiguration
|
||||
inc hl
|
||||
inc hl
|
||||
call Func_2bbf9
|
||||
call ReadCurAutoDeckName
|
||||
; set de = wAutoDeckMachineTexts[c], but verbosely
|
||||
push hl
|
||||
ld de, wd4b4
|
||||
ld de, wAutoDeckMachineTexts
|
||||
ld h, c
|
||||
ld l, 2
|
||||
call HtimesL
|
||||
@@ -3348,23 +3351,27 @@ Func_2bb32:
|
||||
ld d, h
|
||||
ld e, l
|
||||
pop hl
|
||||
; load text
|
||||
ld a, [hli]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [hli]
|
||||
ld [de], a
|
||||
call Func_2bb8e
|
||||
; next deck
|
||||
call .CheckPerDeckUnlockEvents
|
||||
inc b
|
||||
ld a, b
|
||||
cp 4
|
||||
jr nz, .loop
|
||||
cp NUM_AUTO_DECK_MACHINE_SLOTS
|
||||
jr nz, .loop_decks
|
||||
|
||||
ld a, c
|
||||
ld [wNumDeckMachineEntries], a
|
||||
call DisableSRAM
|
||||
ret
|
||||
|
||||
Func_2bb7f:
|
||||
; c = deck position
|
||||
; return de = deck
|
||||
.GetPointerToWRAMAutoDeck:
|
||||
push hl
|
||||
ld l, c
|
||||
ld h, DECK_COMPRESSED_STRUCT_SIZE
|
||||
@@ -3376,42 +3383,45 @@ Func_2bb7f:
|
||||
pop hl
|
||||
ret
|
||||
|
||||
Func_2bb8e:
|
||||
ld a, [wd4b3]
|
||||
cp $01
|
||||
jr z, .asm_2bb9b
|
||||
cp $08
|
||||
jr z, .asm_2bb9b
|
||||
; checks for machine 1
|
||||
; harmless bug:
|
||||
; machine 2 still checks them but doesn't get affected
|
||||
.CheckPerDeckUnlockEvents:
|
||||
ld a, [wSelectedAutoDeckMachineCategory]
|
||||
cp AUTO_DECK_GIVEN
|
||||
jr z, .per_deck_check
|
||||
cp AUTO_DECK_SPECIAL
|
||||
jr z, .per_deck_check
|
||||
inc c
|
||||
ret
|
||||
.asm_2bb9b
|
||||
.per_deck_check
|
||||
push de
|
||||
push hl
|
||||
push bc
|
||||
ld a, [wd4b3]
|
||||
farcall CheckTCGIslandMilestoneEvents
|
||||
ld a, [wSelectedAutoDeckMachineCategory]
|
||||
farcall CheckCurAutoDeckMachine1CategoryUnlockEvents
|
||||
inc b
|
||||
ld e, $01
|
||||
.asm_2bba8
|
||||
ld e, 1
|
||||
.loop_bitmask
|
||||
dec b
|
||||
jr z, .asm_2bbaf
|
||||
jr z, .got_bitmask
|
||||
sla e
|
||||
jr .asm_2bba8
|
||||
.asm_2bbaf
|
||||
jr .loop_bitmask
|
||||
.got_bitmask
|
||||
and e
|
||||
or a
|
||||
jr z, .asm_2bbb7
|
||||
jr z, .skip_deck
|
||||
pop bc
|
||||
inc c
|
||||
jr .asm_2bbb8
|
||||
.asm_2bbb7
|
||||
jr .done_per_deck_check
|
||||
.skip_deck
|
||||
pop bc
|
||||
.asm_2bbb8
|
||||
.done_per_deck_check
|
||||
pop hl
|
||||
pop de
|
||||
ret
|
||||
|
||||
Func_2bbbb:
|
||||
ReadCurAutoDeckConfiguration:
|
||||
push hl
|
||||
push bc
|
||||
push de
|
||||
@@ -3419,37 +3429,40 @@ Func_2bbbb:
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
ld hl, wc000
|
||||
ld hl, wDeckToBuild
|
||||
xor a
|
||||
ld b, $82
|
||||
.asm_2bbc8
|
||||
ld b, AUTO_DECK_LIST_BUFFER_SIZE
|
||||
.loop_init
|
||||
ld [hli], a
|
||||
dec b
|
||||
jr nz, .asm_2bbc8
|
||||
ld hl, wc000
|
||||
.asm_2bbcf
|
||||
ld a, [de]
|
||||
jr nz, .loop_init
|
||||
|
||||
; de = Machine*DeckList (card count, card id)
|
||||
ld hl, wDeckToBuild
|
||||
.loop_create_deck
|
||||
ld a, [de] ; card count
|
||||
inc de
|
||||
ld b, a
|
||||
or a
|
||||
jr z, .asm_2bbe2
|
||||
ld a, [de]
|
||||
jr z, .save_deck
|
||||
ld a, [de] ; low(card id)
|
||||
inc de
|
||||
ld c, a
|
||||
ld a, [de]
|
||||
ld a, [de] ; high(card id)
|
||||
inc de
|
||||
.asm_2bbda
|
||||
.loop_card_count
|
||||
ld [hl], c
|
||||
inc hl
|
||||
ld [hli], a
|
||||
dec b
|
||||
jr nz, .asm_2bbda
|
||||
jr .asm_2bbcf
|
||||
.asm_2bbe2
|
||||
jr nz, .loop_card_count
|
||||
jr .loop_create_deck
|
||||
|
||||
.save_deck
|
||||
pop hl
|
||||
ld bc, $18
|
||||
ld bc, DECK_NAME_SIZE
|
||||
add hl, bc
|
||||
ld de, wc000
|
||||
ld de, wDeckToBuild
|
||||
farcall SwitchToWRAM2
|
||||
bank1call SaveDeckCards
|
||||
farcall SwitchToWRAM1
|
||||
@@ -3458,7 +3471,7 @@ Func_2bbbb:
|
||||
pop hl
|
||||
ret
|
||||
|
||||
Func_2bbf9:
|
||||
ReadCurAutoDeckName:
|
||||
push hl
|
||||
push bc
|
||||
push de
|
||||
@@ -3468,26 +3481,29 @@ Func_2bbf9:
|
||||
ld de, wDefaultText
|
||||
call CopyText
|
||||
pop hl
|
||||
|
||||
farcall SwitchToWRAM2
|
||||
ld de, wDefaultText
|
||||
ld b, $0f
|
||||
ld c, $0e
|
||||
.asm_2bc11
|
||||
ld b, TX_KATAKANA
|
||||
ld c, TX_HIRAGANA
|
||||
.loop_copy_name
|
||||
ld a, [de]
|
||||
inc de
|
||||
or a
|
||||
jr z, .asm_2bc45
|
||||
cp $05
|
||||
jr z, .asm_2bc2f
|
||||
cp $04
|
||||
jr z, .asm_2bc3a
|
||||
jr z, .done_copy_name ; TX_END
|
||||
; handle charmap, due to different TX_* usage
|
||||
cp TX_SYMBOL
|
||||
jr z, .symbol
|
||||
cp TX_FULLWIDTH4
|
||||
jr z, .fw4
|
||||
cp c
|
||||
jr z, .asm_2bc26
|
||||
jr z, .kana_switch
|
||||
; kana, no switch
|
||||
ld [hl], b
|
||||
inc hl
|
||||
ld [hli], a
|
||||
jr .asm_2bc11
|
||||
.asm_2bc26
|
||||
jr .loop_copy_name
|
||||
.kana_switch
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
inc de
|
||||
@@ -3495,28 +3511,29 @@ Func_2bbf9:
|
||||
ld a, b
|
||||
ld b, c
|
||||
ld c, a
|
||||
jr .asm_2bc11
|
||||
.asm_2bc2f
|
||||
jr .loop_copy_name
|
||||
.symbol
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
cp b
|
||||
jr nz, .asm_2bc11
|
||||
jr nz, .loop_copy_name
|
||||
inc de
|
||||
jr .asm_2bc11
|
||||
.asm_2bc3a
|
||||
jr .loop_copy_name
|
||||
.fw4
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
ld a, [de]
|
||||
cp b
|
||||
jr nz, .asm_2bc11
|
||||
jr nz, .loop_copy_name
|
||||
inc de
|
||||
jr .asm_2bc11
|
||||
.asm_2bc45
|
||||
jr .loop_copy_name
|
||||
|
||||
.done_copy_name
|
||||
ld [hl], a
|
||||
farcall SwitchToWRAM1
|
||||
pop bc
|
||||
@@ -3571,17 +3588,18 @@ Func_2bc4f:
|
||||
.MenuParameters:
|
||||
menu_params 1, 2, 3, NUM_DECKS, SYM_CURSOR_R, SYM_SPACE, NULL
|
||||
|
||||
; a = *_ISLAND
|
||||
_HandleAutoDeckMenu:
|
||||
ld [wd548], a
|
||||
ld [wAutoDeckMachineIndex], a
|
||||
xor a
|
||||
ld [wScrollMenuScrollOffset], a
|
||||
.asm_2bca6
|
||||
.start
|
||||
ld hl, AutoDeckMachineMenuParams
|
||||
farcall InitializeScrollMenuParameters
|
||||
ld a, NUM_DECK_MACHINE_VISIBLE_DECKS
|
||||
ld a, NUM_DECK_MACHINE_VISIBLE_SLOTS
|
||||
ld [wNumMenuItems], a
|
||||
call .InitMenu
|
||||
ld hl, Func_3bf5e
|
||||
ld hl, UpdateDeckMachineScrollArrowsAndEntries
|
||||
ld d, h
|
||||
ld a, l
|
||||
ld hl, wScrollMenuScrollFunc
|
||||
@@ -3594,27 +3612,27 @@ _HandleAutoDeckMenu:
|
||||
farcall HandleScrollMenu
|
||||
jr nc, .wait_input
|
||||
ld a, [hCurMenuItem]
|
||||
cp $ff
|
||||
ret z ; cancel
|
||||
cp MENU_CANCEL
|
||||
ret z
|
||||
|
||||
ld a, [wScrollMenuScrollOffset]
|
||||
ld [wd54a], a
|
||||
ld [wAutoDeckMachineScrollOffset], a
|
||||
ld b, a
|
||||
ld a, [wTempCardTypeFilter]
|
||||
ld [wd54b], a
|
||||
ld a, [wCurScrollMenuItem]
|
||||
ld [wAutoDeckMachineScrollMenuItem], a
|
||||
add b
|
||||
ld hl, wd49f
|
||||
ld hl, wIndicesAutoDeckMachineUnlockedCategories
|
||||
ld c, a
|
||||
ld b, $00
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
dec a
|
||||
ld [wd4b3], a
|
||||
farcall Func_3bb09
|
||||
ld a, [wd54a]
|
||||
ld [wSelectedAutoDeckMachineCategory], a
|
||||
farcall _HandleAutoDeckSelectionMenu
|
||||
ld a, [wAutoDeckMachineScrollOffset]
|
||||
ld [wScrollMenuScrollOffset], a
|
||||
ld a, [wd54b]
|
||||
jr .asm_2bca6
|
||||
ld a, [wAutoDeckMachineScrollMenuItem]
|
||||
jr .start
|
||||
|
||||
.InitMenu:
|
||||
xor a
|
||||
@@ -3632,7 +3650,7 @@ _HandleAutoDeckMenu:
|
||||
lb bc, 20, 13
|
||||
call DrawRegularTextBox
|
||||
lb de, 1, 0
|
||||
ld a, [wd548]
|
||||
ld a, [wAutoDeckMachineIndex]
|
||||
or a
|
||||
jr nz, .machine_2
|
||||
; machine 1
|
||||
@@ -3642,36 +3660,38 @@ _HandleAutoDeckMenu:
|
||||
ldtx hl, AutoDeckMachine2Text
|
||||
.got_name
|
||||
call Func_2c4b
|
||||
ldtx hl, ChooseDeckTypeText
|
||||
ldtx hl, ChooseDeckCategoryText
|
||||
call DrawWideTextBox_PrintText
|
||||
call Func_2bd48
|
||||
farcall Func_3bf5e
|
||||
farcall UpdateDeckMachineScrollArrowsAndEntries
|
||||
call EnableLCD
|
||||
ret
|
||||
|
||||
Func_2bd48:
|
||||
ld a, $08
|
||||
ld hl, wd49f
|
||||
ld a, NUM_AUTO_DECK_MACHINE_REGULAR_CATEGORIES
|
||||
ld hl, wIndicesAutoDeckMachineUnlockedCategories
|
||||
farcall ClearNBytesFromHL
|
||||
ld a, $08
|
||||
ld hl, wd4b4
|
||||
ld a, 2 * 4
|
||||
ld hl, wAutoDeckMachineTexts
|
||||
farcall ClearNBytesFromHL
|
||||
ld bc, $0
|
||||
.asm_2bd5d
|
||||
|
||||
lb bc, 0, 0
|
||||
.loop_categories
|
||||
ld a, b
|
||||
push bc
|
||||
call Func_2bd7f
|
||||
call .CheckUnlockEvents
|
||||
pop bc
|
||||
jr nc, .asm_2bd6b
|
||||
jr nc, .next_category
|
||||
push bc
|
||||
call Func_2bd92
|
||||
call .LoadIndexAndName
|
||||
pop bc
|
||||
inc c
|
||||
.asm_2bd6b
|
||||
.next_category
|
||||
inc b
|
||||
ld a, b
|
||||
cp $0a
|
||||
jr nz, .asm_2bd5d
|
||||
cp NUM_AUTO_DECK_MACHINE_CATEGORIES
|
||||
jr nz, .loop_categories
|
||||
|
||||
ld a, c
|
||||
ld [wNumDeckMachineEntries], a
|
||||
ld a, [wNumMenuItems]
|
||||
@@ -3681,22 +3701,28 @@ Func_2bd48:
|
||||
ld [wNumMenuItems], a
|
||||
ret
|
||||
|
||||
Func_2bd7f:
|
||||
.CheckUnlockEvents:
|
||||
push af
|
||||
ld a, [wd548]
|
||||
ld a, [wAutoDeckMachineIndex]
|
||||
or a
|
||||
jr nz, .machine_2
|
||||
jr nz, .is_unlocked_machine_2
|
||||
; machine 1
|
||||
pop af
|
||||
farcall CheckTCGIslandMilestoneEvents
|
||||
farcall CheckCurAutoDeckMachine1CategoryUnlockEvents
|
||||
ret
|
||||
.machine_2
|
||||
.is_unlocked_machine_2
|
||||
pop af
|
||||
farcall CheckGRIslandMilestoneEvents
|
||||
farcall CheckCurAutoDeckMachine2CategoryUnlockEvents
|
||||
ret
|
||||
|
||||
Func_2bd92:
|
||||
ld hl, wd49f
|
||||
; b = category index
|
||||
; c = position offset
|
||||
; set:
|
||||
; wIndicesAutoDeckMachineUnlockedCategories[c] = b + 1
|
||||
; wAutoDeckMachineTexts[c] = text id
|
||||
.LoadIndexAndName:
|
||||
; set index
|
||||
ld hl, wIndicesAutoDeckMachineUnlockedCategories
|
||||
push bc
|
||||
ld a, b
|
||||
inc a
|
||||
@@ -3704,15 +3730,16 @@ Func_2bd92:
|
||||
add hl, bc
|
||||
pop bc
|
||||
ld [hl], a
|
||||
ld a, [wd548]
|
||||
|
||||
ld a, [wAutoDeckMachineIndex]
|
||||
or a
|
||||
jr nz, .machine_2
|
||||
jr nz, .load_from_machine_2
|
||||
; machine 1
|
||||
ld hl, .Machine1SectionTitles
|
||||
jr .got_addr
|
||||
.machine_2
|
||||
ld hl, .Machine2SectionTitles
|
||||
.got_addr
|
||||
ld hl, .machine_1_category_titles
|
||||
jr .set_name
|
||||
.load_from_machine_2
|
||||
ld hl, .machine_2_category_titles
|
||||
.set_name
|
||||
push bc
|
||||
ld c, b
|
||||
sla c
|
||||
@@ -3721,7 +3748,7 @@ Func_2bd92:
|
||||
pop bc
|
||||
ld e, l
|
||||
ld d, h
|
||||
ld hl, wd4b4
|
||||
ld hl, wAutoDeckMachineTexts
|
||||
sla c
|
||||
ld b, 0
|
||||
add hl, bc
|
||||
@@ -3732,26 +3759,27 @@ Func_2bd92:
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.Machine1SectionTitles:
|
||||
tx BasicDeckMachineTextPadded
|
||||
tx GivenDeckMachineTextPadded
|
||||
tx FightingDeckMachineText
|
||||
tx GrassDeckMachineText
|
||||
tx WaterDeckMachineText
|
||||
tx FireDeckMachineText
|
||||
tx LightningDeckMachineText
|
||||
tx PsychicDeckMachineText
|
||||
tx SpecialDeckMachineTextPadded
|
||||
tx LegendaryDeckMachineTextPadded
|
||||
; category titles with padding
|
||||
.machine_1_category_titles
|
||||
tx AutoDeckMachine1BasicDecksTextPadded
|
||||
tx AutoDeckMachine1GivenDecksTextPadded
|
||||
tx AutoDeckMachine1FightingDecksText
|
||||
tx AutoDeckMachine1GrassDecksText
|
||||
tx AutoDeckMachine1WaterDecksText
|
||||
tx AutoDeckMachine1FireDecksText
|
||||
tx AutoDeckMachine1LightningDecksText
|
||||
tx AutoDeckMachine1PsychicDecksText
|
||||
tx AutoDeckMachine1SpecialDecksTextPadded
|
||||
tx AutoDeckMachine1LegendaryDecksTextPadded
|
||||
|
||||
.Machine2SectionTitles:
|
||||
tx DarkGrassDeckMachineText
|
||||
tx DarkLightningDeckMachineText
|
||||
tx DarkWaterDeckMachineText
|
||||
tx DarkFireDeckMachineText
|
||||
tx DarkFightingDeckMachineText
|
||||
tx DarkPsychicDeckMachineText
|
||||
tx ColorlessDeckMachineTextPadded
|
||||
tx DarkSpecialDeckMachineText
|
||||
tx RareCardDeckMachineText
|
||||
tx MysteriousCardDeckMachineTextPadded
|
||||
.machine_2_category_titles
|
||||
tx AutoDeckMachine2DarkGrassDecksText
|
||||
tx AutoDeckMachine2DarkLightningDecksText
|
||||
tx AutoDeckMachine2DarkWaterDecksText
|
||||
tx AutoDeckMachine2DarkFireDecksText
|
||||
tx AutoDeckMachine2DarkFightingDecksText
|
||||
tx AutoDeckMachine2DarkPsychicDecksText
|
||||
tx AutoDeckMachine2ColorlessDecksTextPadded
|
||||
tx AutoDeckMachine2DarkSpecialDecksText
|
||||
tx AutoDeckMachine2RareCardDecksText
|
||||
tx AutoDeckMachine2MysteriousCardDecksTextPadded
|
||||
|
||||
+918
-661
File diff suppressed because it is too large
Load Diff
@@ -843,8 +843,8 @@ Script_AutoDeckMachine1:
|
||||
call PauseSong
|
||||
ld a, MUSIC_DECK_MACHINE
|
||||
call PlaySong
|
||||
xor a
|
||||
farcall Func_1e855
|
||||
xor a ; TCG_ISLAND
|
||||
farcall AutoDeckMachine
|
||||
call ResumeSong
|
||||
ret
|
||||
.cancel
|
||||
@@ -867,8 +867,8 @@ Script_AutoDeckMachine2:
|
||||
call PauseSong
|
||||
ld a, MUSIC_DECK_MACHINE
|
||||
call PlaySong
|
||||
ld a, $01
|
||||
farcall Func_1e855
|
||||
ld a, GR_ISLAND
|
||||
farcall AutoDeckMachine
|
||||
call ResumeSong
|
||||
ret
|
||||
.cancel
|
||||
|
||||
+3
-3
@@ -138,14 +138,14 @@ HandleMenuInput::
|
||||
; B button pressed
|
||||
ld a, [wCurMenuItem]
|
||||
ld e, a
|
||||
ld a, $ff
|
||||
ld a, MENU_CANCEL
|
||||
ldh [hCurScrollMenuItem], a
|
||||
call PlayOpenOrExitScreenSFX
|
||||
scf
|
||||
ret
|
||||
|
||||
; plays an "open screen" sound (SFX_CONFIRM) if [hCurScrollMenuItem] != 0xff
|
||||
; plays an "exit screen" sound (SFX_CANCEL) if [hCurScrollMenuItem] == 0xff
|
||||
; if [hCurScrollMenuItem] = MENU_CANCEL (exit), play SFX_CANCEL,
|
||||
; otherwise (open) SFX_CONFIRM
|
||||
PlayOpenOrExitScreenSFX::
|
||||
push af
|
||||
ldh a, [hCurScrollMenuItem]
|
||||
|
||||
+107
-107
@@ -2125,7 +2125,7 @@ SubInEnergyCardsPromptText:
|
||||
textfw "エネルギーカードをだいようしますか?"
|
||||
done
|
||||
|
||||
ChooseDeckTypeText:
|
||||
ChooseDeckCategoryText:
|
||||
textfw "デッキの しゅるいを"
|
||||
linefw "えらんでください"
|
||||
done
|
||||
@@ -2235,59 +2235,59 @@ AutoDeckMachine1Text:
|
||||
textfw "オートデッキマシン1"
|
||||
done
|
||||
|
||||
BasicDeckMachineText:
|
||||
AutoDeckMachine1BasicDecksText:
|
||||
textfw "きほんデッキ"
|
||||
done
|
||||
|
||||
GivenDeckMachineText:
|
||||
AutoDeckMachine1GivenDecksText:
|
||||
textfw "もらったデッキ"
|
||||
done
|
||||
|
||||
FightingDeckMachineText:
|
||||
AutoDeckMachine1FightingDecksText:
|
||||
textfw "闘ポケモンのデッキ"
|
||||
done
|
||||
|
||||
GrassDeckMachineText:
|
||||
AutoDeckMachine1GrassDecksText:
|
||||
textfw "草ポケモンのデッキ"
|
||||
done
|
||||
|
||||
WaterDeckMachineText:
|
||||
AutoDeckMachine1WaterDecksText:
|
||||
textfw "水ポケモンのデッキ"
|
||||
done
|
||||
|
||||
FireDeckMachineText:
|
||||
AutoDeckMachine1FireDecksText:
|
||||
textfw "炎ポケモンのデッキ"
|
||||
done
|
||||
|
||||
LightningDeckMachineText:
|
||||
AutoDeckMachine1LightningDecksText:
|
||||
textfw "雷ポケモンのデッキ"
|
||||
done
|
||||
|
||||
PsychicDeckMachineText:
|
||||
AutoDeckMachine1PsychicDecksText:
|
||||
textfw "超ポケモンのデッキ"
|
||||
done
|
||||
|
||||
SpecialDeckMachineText:
|
||||
AutoDeckMachine1SpecialDecksText:
|
||||
textfw "スペシャルデッキ"
|
||||
done
|
||||
|
||||
LegendaryDeckMachineText:
|
||||
AutoDeckMachine1LegendaryDecksText:
|
||||
textfw "伝説のデッキ"
|
||||
done
|
||||
|
||||
BasicDeckMachineTextPadded:
|
||||
AutoDeckMachine1BasicDecksTextPadded:
|
||||
textfw "きほんデッキ "
|
||||
done
|
||||
|
||||
GivenDeckMachineTextPadded:
|
||||
AutoDeckMachine1GivenDecksTextPadded:
|
||||
textfw "もらったデッキ "
|
||||
done
|
||||
|
||||
SpecialDeckMachineTextPadded:
|
||||
AutoDeckMachine1SpecialDecksTextPadded:
|
||||
textfw "スペシャルデッキ "
|
||||
done
|
||||
|
||||
LegendaryDeckMachineTextPadded:
|
||||
AutoDeckMachine1LegendaryDecksTextPadded:
|
||||
textfw "伝説のデッキ "
|
||||
done
|
||||
|
||||
@@ -2295,211 +2295,211 @@ AutoDeckMachine2Text:
|
||||
textfw "オートデッキマシン2"
|
||||
done
|
||||
|
||||
DarkGrassDeckMachineText:
|
||||
AutoDeckMachine2DarkGrassDecksText:
|
||||
textfw "わるい草ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkLightningDeckMachineText:
|
||||
AutoDeckMachine2DarkLightningDecksText:
|
||||
textfw "わるい雷ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkWaterDeckMachineText:
|
||||
AutoDeckMachine2DarkWaterDecksText:
|
||||
textfw "わるい水ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkFireDeckMachineText:
|
||||
AutoDeckMachine2DarkFireDecksText:
|
||||
textfw "わるい炎ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkFightingDeckMachineText:
|
||||
AutoDeckMachine2DarkFightingDecksText:
|
||||
textfw "わるい闘ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkPsychicDeckMachineText:
|
||||
AutoDeckMachine2DarkPsychicDecksText:
|
||||
textfw "わるい超ポケモンデッキ"
|
||||
done
|
||||
|
||||
ColorlessDeckMachineText:
|
||||
AutoDeckMachine2ColorlessDecksText:
|
||||
textfw "無色ポケモンデッキ"
|
||||
done
|
||||
|
||||
DarkSpecialDeckMachineText:
|
||||
AutoDeckMachine2DarkSpecialDecksText:
|
||||
textfw "わるいスペシャルデッキ"
|
||||
done
|
||||
|
||||
RareCardDeckMachineText:
|
||||
AutoDeckMachine2RareCardDecksText:
|
||||
textfw "めずらしいカードデッキ"
|
||||
done
|
||||
|
||||
MysteriousCardDeckMachineText:
|
||||
AutoDeckMachine2MysteriousCardDecksText:
|
||||
textfw "なぞのカードデッキ"
|
||||
done
|
||||
|
||||
ColorlessDeckMachineTextPadded:
|
||||
AutoDeckMachine2ColorlessDecksTextPadded:
|
||||
textfw "無色ポケモンデッキ "
|
||||
done
|
||||
|
||||
MysteriousCardDeckMachineTextPadded:
|
||||
AutoDeckMachine2MysteriousCardDecksTextPadded:
|
||||
textfw "なぞのカードデッキ "
|
||||
done
|
||||
|
||||
MachineStarterDeckText:
|
||||
MachineStarterDeckName:
|
||||
textfw "さいしょの"
|
||||
done
|
||||
|
||||
MachineElectricFireDeckText:
|
||||
MachineElectricFireDeckName:
|
||||
textfw "エレキファイヤー"
|
||||
done
|
||||
|
||||
MachineBattleWaterDeckText:
|
||||
MachineBattleWaterDeckName:
|
||||
textfw "バトルウォーター"
|
||||
done
|
||||
|
||||
MachineEsperGreenDeckText:
|
||||
MachineEsperGreenDeckName:
|
||||
textfw "エスパーグリーン"
|
||||
done
|
||||
|
||||
MachineSweatAntiGR1DeckText:
|
||||
MachineSweatAntiGR1DeckName:
|
||||
textfw "たおせ!GR1ごう"
|
||||
done
|
||||
|
||||
MachineGiveInAntiGR2DeckText:
|
||||
MachineGiveInAntiGR2DeckName:
|
||||
textfw "まけろ!GR2ごう"
|
||||
done
|
||||
|
||||
MachineVengefulAntiGR3DeckText:
|
||||
MachineVengefulAntiGR3DeckName:
|
||||
textfw "しかえしGR3ごう"
|
||||
done
|
||||
|
||||
MachineUnforgivingAntiGR4DeckText:
|
||||
MachineUnforgivingAntiGR4DeckName:
|
||||
textfw "ゆるさんGR4ごう"
|
||||
done
|
||||
|
||||
MachineAwesomeFossilsDeckText:
|
||||
MachineAwesomeFossilsDeckName:
|
||||
textfw "シブイかせき"
|
||||
done
|
||||
|
||||
MachineNewMachokeDeckText:
|
||||
MachineNewMachokeDeckName:
|
||||
textfw "ニューゴーリキー"
|
||||
done
|
||||
|
||||
MachineRockFestivalDeckText:
|
||||
MachineRockFestivalDeckName:
|
||||
textfw "ロックフェスティバル"
|
||||
done
|
||||
|
||||
MachineJabHookDeckText:
|
||||
MachineJabHookDeckName:
|
||||
textfw "ジャブだフックだ!"
|
||||
done
|
||||
|
||||
MachineSteadyIncreaseDeckText:
|
||||
MachineSteadyIncreaseDeckName:
|
||||
textfw "ドンドンぞうしょく"
|
||||
done
|
||||
|
||||
MachineGatheringNidoranDeckText:
|
||||
MachineGatheringNidoranDeckName:
|
||||
textfw "あつまれニドラン"
|
||||
done
|
||||
|
||||
MachineNationalParkDeckText:
|
||||
MachineNationalParkDeckName:
|
||||
textfw "しんりんこうえん"
|
||||
done
|
||||
|
||||
MachineSelectiveBreedingDeckText:
|
||||
MachineSelectiveBreedingDeckName:
|
||||
textfw "ひんしゅかいりょう"
|
||||
done
|
||||
|
||||
MachineSplashingAboutDeckText:
|
||||
MachineSplashingAboutDeckName:
|
||||
textfw "みずあそび"
|
||||
done
|
||||
|
||||
MachineBeachDeckText:
|
||||
MachineBeachDeckName:
|
||||
textfw "なみうちぎわ"
|
||||
done
|
||||
|
||||
MachineInsulationDeckText:
|
||||
MachineInsulationDeckName:
|
||||
textfw "ぜつえんたい"
|
||||
done
|
||||
|
||||
MachineAntarcticDeckText:
|
||||
MachineAntarcticDeckName:
|
||||
textfw "なんきょく"
|
||||
done
|
||||
|
||||
MachineFlameFestivalDeckText:
|
||||
MachineFlameFestivalDeckName:
|
||||
textfw "ほのおのおまつり"
|
||||
done
|
||||
|
||||
MachineElectricCurrentShockDeckText:
|
||||
MachineElectricCurrentShockDeckName:
|
||||
textfw "でんりゅうひばな"
|
||||
done
|
||||
|
||||
MachineRiskyBlazeDeckText:
|
||||
MachineRiskyBlazeDeckName:
|
||||
textfw "すてみのほのお"
|
||||
done
|
||||
|
||||
MachineRagingCharizardDeckText:
|
||||
MachineRagingCharizardDeckName:
|
||||
textfw "リザードンおおあばれ"
|
||||
done
|
||||
|
||||
MachineZapdosPowerPlantDeckText:
|
||||
MachineZapdosPowerPlantDeckName:
|
||||
textfw "サンダーはつでんしょ"
|
||||
done
|
||||
|
||||
MachineElectricShockDeckText:
|
||||
MachineElectricShockDeckName:
|
||||
textfw "でんきショック"
|
||||
done
|
||||
|
||||
MachineOverflowDeckText:
|
||||
MachineOverflowDeckName:
|
||||
textfw "オーバーフロー"
|
||||
done
|
||||
|
||||
MachineTripleZapdosDeckText:
|
||||
MachineTripleZapdosDeckName:
|
||||
textfw "トリプルサンダー"
|
||||
done
|
||||
|
||||
MachineSpecialBarrierDeckText:
|
||||
MachineSpecialBarrierDeckName:
|
||||
textfw "とくしゅバリヤー"
|
||||
done
|
||||
|
||||
MachineEvolutionProhibitedDeckText:
|
||||
MachineEvolutionProhibitedDeckName:
|
||||
textfw "しんかふのう"
|
||||
done
|
||||
|
||||
MachineGhostDeckText:
|
||||
MachineGhostDeckName:
|
||||
textfw "ゆうれい"
|
||||
done
|
||||
|
||||
MachinePuppetMasterDeckText:
|
||||
MachinePuppetMasterDeckName:
|
||||
textfw "にんぎょうつかい"
|
||||
done
|
||||
|
||||
MachineMewLv15DeckText:
|
||||
MachineMewLv15DeckName:
|
||||
textfw "ミュウ<Lv>15"
|
||||
done
|
||||
|
||||
MachineVenusaurLv64DeckText:
|
||||
MachineVenusaurLv64DeckName:
|
||||
textfw "フシギバナ<Lv>64"
|
||||
done
|
||||
|
||||
MachineMutualDestructionDeckText:
|
||||
MachineMutualDestructionDeckName:
|
||||
textfw "ともだおれ"
|
||||
done
|
||||
|
||||
MachineEverybodySurfDeckText:
|
||||
MachineEverybodySurfDeckName:
|
||||
textfw "みんなでなみのり"
|
||||
done
|
||||
|
||||
MachineGrandFireDeckText:
|
||||
MachineGrandFireDeckName:
|
||||
textfw "グランドファイヤー"
|
||||
done
|
||||
|
||||
MachineLegendaryFossilDeckText:
|
||||
MachineLegendaryFossilDeckName:
|
||||
textfw "でんせつのかせき"
|
||||
done
|
||||
|
||||
MachineWaterLegendDeckText:
|
||||
MachineWaterLegendDeckName:
|
||||
textfw "ウォーターレジェンド"
|
||||
done
|
||||
|
||||
MachineGreatDragonDeckText:
|
||||
MachineGreatDragonDeckName:
|
||||
textfw "レジェンドドラゴン"
|
||||
done
|
||||
|
||||
@@ -2703,164 +2703,164 @@ MachineGreatDragonDeckDescriptionText:
|
||||
linefw "きょうりょくポケモンで トドメだ!"
|
||||
done
|
||||
|
||||
MachineInsectCollectionDeckText:
|
||||
MachineInsectCollectionDeckName:
|
||||
textfw "こんちゅうさいしゅう"
|
||||
done
|
||||
|
||||
MachineCaveExplorationDeckText:
|
||||
MachineCaveExplorationDeckName:
|
||||
textfw "どうくつたんけん"
|
||||
done
|
||||
|
||||
MachineOminousMeadowDeckText:
|
||||
MachineOminousMeadowDeckName:
|
||||
textfw "あやしいはなばたけ"
|
||||
done
|
||||
|
||||
MachineAtrociousWeezingDeckText:
|
||||
MachineAtrociousWeezingDeckName:
|
||||
textfw "きょうあくマタドガス"
|
||||
done
|
||||
|
||||
MachineTheBenchIsAlsoASurpriseDeckText:
|
||||
MachineTheBenchIsAlsoASurpriseDeckName:
|
||||
textfw "ベンチもビックリ"
|
||||
done
|
||||
|
||||
MachineEnergyConservationDeckText:
|
||||
MachineEnergyConservationDeckName:
|
||||
textfw "しょうエネルギー"
|
||||
done
|
||||
|
||||
MachineSonicboomDeckText:
|
||||
MachineSonicboomDeckName:
|
||||
textfw "ソニックブーム"
|
||||
done
|
||||
|
||||
MachineRageOfTheHeavensDeckText:
|
||||
MachineRageOfTheHeavensDeckName:
|
||||
textfw "てんくうのいかり"
|
||||
done
|
||||
|
||||
MachineDarkWaterDeckText:
|
||||
MachineDarkWaterDeckName:
|
||||
textfw "ダークウォーター"
|
||||
done
|
||||
|
||||
MachineQuickFreezeDeckText:
|
||||
MachineQuickFreezeDeckName:
|
||||
textfw "きゅうそくれいとう"
|
||||
done
|
||||
|
||||
MachineWhirlpoolShowerDeckText:
|
||||
MachineWhirlpoolShowerDeckName:
|
||||
textfw "うずしおのシャワー"
|
||||
done
|
||||
|
||||
MachineWaterGangDeckText:
|
||||
MachineWaterGangDeckName:
|
||||
textfw "みずのギャングだん"
|
||||
done
|
||||
|
||||
MachineFireballDeckText:
|
||||
MachineFireballDeckName:
|
||||
textfw "ファイヤーボール"
|
||||
done
|
||||
|
||||
MachineCompleteCombustionDeckText:
|
||||
MachineCompleteCombustionDeckName:
|
||||
textfw "かんぜんねんしょう"
|
||||
done
|
||||
|
||||
MachineOminousSpiritFlamesDeckText:
|
||||
MachineOminousSpiritFlamesDeckName:
|
||||
textfw "あやしいヒトダマ"
|
||||
done
|
||||
|
||||
MachineEternalFireDeckText:
|
||||
MachineEternalFireDeckName:
|
||||
textfw "えいえんのファイヤー"
|
||||
done
|
||||
|
||||
MachineBewareTheTrapDeckText:
|
||||
MachineBewareTheTrapDeckName:
|
||||
textfw "ワナにごちゅうい!"
|
||||
done
|
||||
|
||||
MachineOgresKickDeckText:
|
||||
MachineOgresKickDeckName:
|
||||
textfw "キックのオニ"
|
||||
done
|
||||
|
||||
MachineRockBlastDeckText:
|
||||
MachineRockBlastDeckName:
|
||||
textfw "ロックブラスト!"
|
||||
done
|
||||
|
||||
MachineHeavyWorkDeckText:
|
||||
MachineHeavyWorkDeckName:
|
||||
; the same as Full Strength Deck but renamed for Machine
|
||||
textfw "ちからわざ"
|
||||
done
|
||||
|
||||
MachineSlowbrosFishingDeckText:
|
||||
MachineSlowbrosFishingDeckName:
|
||||
textfw "ヤドランともづり"
|
||||
done
|
||||
|
||||
MachineDirectHitDeckText:
|
||||
MachineDirectHitDeckName:
|
||||
textfw "ちょくげき"
|
||||
done
|
||||
|
||||
MachineBadDreamDeckText:
|
||||
MachineBadDreamDeckName:
|
||||
textfw "バッドドリーム"
|
||||
done
|
||||
|
||||
MachineBenchPanicDeckText:
|
||||
MachineBenchPanicDeckName:
|
||||
textfw "ベンチはパニック!"
|
||||
done
|
||||
|
||||
MachineSnorlaxGuardDeckText:
|
||||
MachineSnorlaxGuardDeckName:
|
||||
textfw "カビゴンとおせんぼ"
|
||||
done
|
||||
|
||||
MachineEyeOfTheStormDeckText:
|
||||
MachineEyeOfTheStormDeckName:
|
||||
textfw "たいふうのめ"
|
||||
done
|
||||
|
||||
MachineSuddenGrowthDeckText:
|
||||
MachineSuddenGrowthDeckName:
|
||||
textfw "きゅうせいちょう"
|
||||
done
|
||||
|
||||
MachineKingDragoniteDeckText:
|
||||
MachineKingDragoniteDeckName:
|
||||
textfw "おうじゃカイリュー"
|
||||
done
|
||||
|
||||
MachineDarkCharizardDeckText:
|
||||
MachineDarkCharizardDeckName:
|
||||
textfw "わるいリザードン!"
|
||||
done
|
||||
|
||||
MachineDarkBlastoiseDeckText:
|
||||
MachineDarkBlastoiseDeckName:
|
||||
textfw "わるいカメックス!"
|
||||
done
|
||||
|
||||
MachineDarkVenusaurDeckText:
|
||||
MachineDarkVenusaurDeckName:
|
||||
textfw "わるいフシギバナ!"
|
||||
done
|
||||
|
||||
MachineDarkDragoniteDeckText:
|
||||
MachineDarkDragoniteDeckName:
|
||||
textfw "わるいカイリュー!"
|
||||
done
|
||||
|
||||
MachinePerfectHealthDeckText:
|
||||
MachinePerfectHealthDeckName:
|
||||
textfw "けんこうゆうりょう"
|
||||
done
|
||||
|
||||
MachineSuperSoakerDeckText:
|
||||
MachineSuperSoakerDeckName:
|
||||
textfw "スーパーみずでっぽう"
|
||||
done
|
||||
|
||||
MachineHellsDemonDeckText:
|
||||
MachineHellsDemonDeckName:
|
||||
textfw "ちていのあくま"
|
||||
done
|
||||
|
||||
MachinePremiumThunderDeckText:
|
||||
MachinePremiumThunderDeckName:
|
||||
textfw "プレミアムサンダー"
|
||||
done
|
||||
|
||||
MachineMysteriousMewtwoDeckText:
|
||||
MachineMysteriousMewtwoDeckName:
|
||||
textfw "なぞのミュウツー"
|
||||
done
|
||||
|
||||
MachineHeavenlyLugiaDeckText:
|
||||
MachineHeavenlyLugiaDeckName:
|
||||
textfw "てんくうのルギア"
|
||||
done
|
||||
|
||||
MachineBrutalTrainersDeckText:
|
||||
MachineBrutalTrainersDeckName:
|
||||
textfw "きょうあくトレーナー"
|
||||
done
|
||||
|
||||
MachineDreadfulParalysisDeckText:
|
||||
MachineDreadfulParalysisDeckName:
|
||||
textfw "きょうふのかなしばり"
|
||||
done
|
||||
|
||||
|
||||
+107
-107
@@ -760,7 +760,7 @@ TextOffsets::
|
||||
textpointer CannotBuildLackingBasicPokemonText ; 0x02f2
|
||||
textpointer BuiltSubbedDeckWithTheseCardsText ; 0x02f3
|
||||
textpointer SubInEnergyCardsPromptText ; 0x02f4
|
||||
textpointer ChooseDeckTypeText ; 0x02f5
|
||||
textpointer ChooseDeckCategoryText ; 0x02f5
|
||||
textpointer PrintThisCardPromptYesNoText ; 0x02f6
|
||||
textpointer ChooseDeckConfigurationToPrintText ; 0x02f7
|
||||
textpointer PrintThisDeckPromptText ; 0x02f8
|
||||
@@ -782,73 +782,73 @@ TextOffsets::
|
||||
textpointer ReceiveRecordsText ; 0x0308
|
||||
textpointer ReceivedDeckConfigurationFromText ; 0x0309
|
||||
textpointer AutoDeckMachine1Text ; 0x030a
|
||||
textpointer BasicDeckMachineText ; 0x030b
|
||||
textpointer GivenDeckMachineText ; 0x030c
|
||||
textpointer FightingDeckMachineText ; 0x030d
|
||||
textpointer GrassDeckMachineText ; 0x030e
|
||||
textpointer WaterDeckMachineText ; 0x030f
|
||||
textpointer FireDeckMachineText ; 0x0310
|
||||
textpointer LightningDeckMachineText ; 0x0311
|
||||
textpointer PsychicDeckMachineText ; 0x0312
|
||||
textpointer SpecialDeckMachineText ; 0x0313
|
||||
textpointer LegendaryDeckMachineText ; 0x0314
|
||||
textpointer BasicDeckMachineTextPadded ; 0x0315
|
||||
textpointer GivenDeckMachineTextPadded ; 0x0316
|
||||
textpointer SpecialDeckMachineTextPadded ; 0x0317
|
||||
textpointer LegendaryDeckMachineTextPadded ; 0x0318
|
||||
textpointer AutoDeckMachine1BasicDecksText ; 0x030b
|
||||
textpointer AutoDeckMachine1GivenDecksText ; 0x030c
|
||||
textpointer AutoDeckMachine1FightingDecksText ; 0x030d
|
||||
textpointer AutoDeckMachine1GrassDecksText ; 0x030e
|
||||
textpointer AutoDeckMachine1WaterDecksText ; 0x030f
|
||||
textpointer AutoDeckMachine1FireDecksText ; 0x0310
|
||||
textpointer AutoDeckMachine1LightningDecksText ; 0x0311
|
||||
textpointer AutoDeckMachine1PsychicDecksText ; 0x0312
|
||||
textpointer AutoDeckMachine1SpecialDecksText ; 0x0313
|
||||
textpointer AutoDeckMachine1LegendaryDecksText ; 0x0314
|
||||
textpointer AutoDeckMachine1BasicDecksTextPadded ; 0x0315
|
||||
textpointer AutoDeckMachine1GivenDecksTextPadded ; 0x0316
|
||||
textpointer AutoDeckMachine1SpecialDecksTextPadded ; 0x0317
|
||||
textpointer AutoDeckMachine1LegendaryDecksTextPadded ; 0x0318
|
||||
textpointer AutoDeckMachine2Text ; 0x0319
|
||||
textpointer DarkGrassDeckMachineText ; 0x031a
|
||||
textpointer DarkLightningDeckMachineText ; 0x031b
|
||||
textpointer DarkWaterDeckMachineText ; 0x031c
|
||||
textpointer DarkFireDeckMachineText ; 0x031d
|
||||
textpointer DarkFightingDeckMachineText ; 0x031e
|
||||
textpointer DarkPsychicDeckMachineText ; 0x031f
|
||||
textpointer ColorlessDeckMachineText ; 0x0320
|
||||
textpointer DarkSpecialDeckMachineText ; 0x0321
|
||||
textpointer RareCardDeckMachineText ; 0x0322
|
||||
textpointer MysteriousCardDeckMachineText ; 0x0323
|
||||
textpointer ColorlessDeckMachineTextPadded ; 0x0324
|
||||
textpointer MysteriousCardDeckMachineTextPadded ; 0x0325
|
||||
textpointer MachineStarterDeckText ; 0x0326
|
||||
textpointer MachineElectricFireDeckText ; 0x0327
|
||||
textpointer MachineBattleWaterDeckText ; 0x0328
|
||||
textpointer MachineEsperGreenDeckText ; 0x0329
|
||||
textpointer MachineSweatAntiGR1DeckText ; 0x032a
|
||||
textpointer MachineGiveInAntiGR2DeckText ; 0x032b
|
||||
textpointer MachineVengefulAntiGR3DeckText ; 0x032c
|
||||
textpointer MachineUnforgivingAntiGR4DeckText ; 0x032d
|
||||
textpointer MachineAwesomeFossilsDeckText ; 0x032e
|
||||
textpointer MachineNewMachokeDeckText ; 0x032f
|
||||
textpointer MachineRockFestivalDeckText ; 0x0330
|
||||
textpointer MachineJabHookDeckText ; 0x0331
|
||||
textpointer MachineSteadyIncreaseDeckText ; 0x0332
|
||||
textpointer MachineGatheringNidoranDeckText ; 0x0333
|
||||
textpointer MachineNationalParkDeckText ; 0x0334
|
||||
textpointer MachineSelectiveBreedingDeckText ; 0x0335
|
||||
textpointer MachineSplashingAboutDeckText ; 0x0336
|
||||
textpointer MachineBeachDeckText ; 0x0337
|
||||
textpointer MachineInsulationDeckText ; 0x0338
|
||||
textpointer MachineAntarcticDeckText ; 0x0339
|
||||
textpointer MachineFlameFestivalDeckText ; 0x033a
|
||||
textpointer MachineElectricCurrentShockDeckText ; 0x033b
|
||||
textpointer MachineRiskyBlazeDeckText ; 0x033c
|
||||
textpointer MachineRagingCharizardDeckText ; 0x033d
|
||||
textpointer MachineZapdosPowerPlantDeckText ; 0x033e
|
||||
textpointer MachineElectricShockDeckText ; 0x033f
|
||||
textpointer MachineOverflowDeckText ; 0x0340
|
||||
textpointer MachineTripleZapdosDeckText ; 0x0341
|
||||
textpointer MachineSpecialBarrierDeckText ; 0x0342
|
||||
textpointer MachineEvolutionProhibitedDeckText ; 0x0343
|
||||
textpointer MachineGhostDeckText ; 0x0344
|
||||
textpointer MachinePuppetMasterDeckText ; 0x0345
|
||||
textpointer MachineMewLv15DeckText ; 0x0346
|
||||
textpointer MachineVenusaurLv64DeckText ; 0x0347
|
||||
textpointer MachineMutualDestructionDeckText ; 0x0348
|
||||
textpointer MachineEverybodySurfDeckText ; 0x0349
|
||||
textpointer MachineGrandFireDeckText ; 0x034a
|
||||
textpointer MachineLegendaryFossilDeckText ; 0x034b
|
||||
textpointer MachineWaterLegendDeckText ; 0x034c
|
||||
textpointer MachineGreatDragonDeckText ; 0x034d
|
||||
textpointer AutoDeckMachine2DarkGrassDecksText ; 0x031a
|
||||
textpointer AutoDeckMachine2DarkLightningDecksText ; 0x031b
|
||||
textpointer AutoDeckMachine2DarkWaterDecksText ; 0x031c
|
||||
textpointer AutoDeckMachine2DarkFireDecksText ; 0x031d
|
||||
textpointer AutoDeckMachine2DarkFightingDecksText ; 0x031e
|
||||
textpointer AutoDeckMachine2DarkPsychicDecksText ; 0x031f
|
||||
textpointer AutoDeckMachine2ColorlessDecksText ; 0x0320
|
||||
textpointer AutoDeckMachine2DarkSpecialDecksText ; 0x0321
|
||||
textpointer AutoDeckMachine2RareCardDecksText ; 0x0322
|
||||
textpointer AutoDeckMachine2MysteriousCardDecksText ; 0x0323
|
||||
textpointer AutoDeckMachine2ColorlessDecksTextPadded ; 0x0324
|
||||
textpointer AutoDeckMachine2MysteriousCardDecksTextPadded ; 0x0325
|
||||
textpointer MachineStarterDeckName ; 0x0326
|
||||
textpointer MachineElectricFireDeckName ; 0x0327
|
||||
textpointer MachineBattleWaterDeckName ; 0x0328
|
||||
textpointer MachineEsperGreenDeckName ; 0x0329
|
||||
textpointer MachineSweatAntiGR1DeckName ; 0x032a
|
||||
textpointer MachineGiveInAntiGR2DeckName ; 0x032b
|
||||
textpointer MachineVengefulAntiGR3DeckName ; 0x032c
|
||||
textpointer MachineUnforgivingAntiGR4DeckName ; 0x032d
|
||||
textpointer MachineAwesomeFossilsDeckName ; 0x032e
|
||||
textpointer MachineNewMachokeDeckName ; 0x032f
|
||||
textpointer MachineRockFestivalDeckName ; 0x0330
|
||||
textpointer MachineJabHookDeckName ; 0x0331
|
||||
textpointer MachineSteadyIncreaseDeckName ; 0x0332
|
||||
textpointer MachineGatheringNidoranDeckName ; 0x0333
|
||||
textpointer MachineNationalParkDeckName ; 0x0334
|
||||
textpointer MachineSelectiveBreedingDeckName ; 0x0335
|
||||
textpointer MachineSplashingAboutDeckName ; 0x0336
|
||||
textpointer MachineBeachDeckName ; 0x0337
|
||||
textpointer MachineInsulationDeckName ; 0x0338
|
||||
textpointer MachineAntarcticDeckName ; 0x0339
|
||||
textpointer MachineFlameFestivalDeckName ; 0x033a
|
||||
textpointer MachineElectricCurrentShockDeckName ; 0x033b
|
||||
textpointer MachineRiskyBlazeDeckName ; 0x033c
|
||||
textpointer MachineRagingCharizardDeckName ; 0x033d
|
||||
textpointer MachineZapdosPowerPlantDeckName ; 0x033e
|
||||
textpointer MachineElectricShockDeckName ; 0x033f
|
||||
textpointer MachineOverflowDeckName ; 0x0340
|
||||
textpointer MachineTripleZapdosDeckName ; 0x0341
|
||||
textpointer MachineSpecialBarrierDeckName ; 0x0342
|
||||
textpointer MachineEvolutionProhibitedDeckName ; 0x0343
|
||||
textpointer MachineGhostDeckName ; 0x0344
|
||||
textpointer MachinePuppetMasterDeckName ; 0x0345
|
||||
textpointer MachineMewLv15DeckName ; 0x0346
|
||||
textpointer MachineVenusaurLv64DeckName ; 0x0347
|
||||
textpointer MachineMutualDestructionDeckName ; 0x0348
|
||||
textpointer MachineEverybodySurfDeckName ; 0x0349
|
||||
textpointer MachineGrandFireDeckName ; 0x034a
|
||||
textpointer MachineLegendaryFossilDeckName ; 0x034b
|
||||
textpointer MachineWaterLegendDeckName ; 0x034c
|
||||
textpointer MachineGreatDragonDeckName ; 0x034d
|
||||
textpointer MachineStarterDeckDescriptionText ; 0x034e
|
||||
textpointer MachineElectricFireDeckDescriptionText ; 0x034f
|
||||
textpointer MachineBattleWaterDeckDescriptionText ; 0x0350
|
||||
@@ -889,46 +889,46 @@ TextOffsets::
|
||||
textpointer MachineLegendaryFossilDeckDescriptionText ; 0x0373
|
||||
textpointer MachineWaterLegendDeckDescriptionText ; 0x0374
|
||||
textpointer MachineGreatDragonDeckDescriptionText ; 0x0375
|
||||
textpointer MachineInsectCollectionDeckText ; 0x0376
|
||||
textpointer MachineCaveExplorationDeckText ; 0x0377
|
||||
textpointer MachineOminousMeadowDeckText ; 0x0378
|
||||
textpointer MachineAtrociousWeezingDeckText ; 0x0379
|
||||
textpointer MachineTheBenchIsAlsoASurpriseDeckText ; 0x037a
|
||||
textpointer MachineEnergyConservationDeckText ; 0x037b
|
||||
textpointer MachineSonicboomDeckText ; 0x037c
|
||||
textpointer MachineRageOfTheHeavensDeckText ; 0x037d
|
||||
textpointer MachineDarkWaterDeckText ; 0x037e
|
||||
textpointer MachineQuickFreezeDeckText ; 0x037f
|
||||
textpointer MachineWhirlpoolShowerDeckText ; 0x0380
|
||||
textpointer MachineWaterGangDeckText ; 0x0381
|
||||
textpointer MachineFireballDeckText ; 0x0382
|
||||
textpointer MachineCompleteCombustionDeckText ; 0x0383
|
||||
textpointer MachineOminousSpiritFlamesDeckText ; 0x0384
|
||||
textpointer MachineEternalFireDeckText ; 0x0385
|
||||
textpointer MachineBewareTheTrapDeckText ; 0x0386
|
||||
textpointer MachineOgresKickDeckText ; 0x0387
|
||||
textpointer MachineRockBlastDeckText ; 0x0388
|
||||
textpointer MachineHeavyWorkDeckText ; 0x0389
|
||||
textpointer MachineSlowbrosFishingDeckText ; 0x038a
|
||||
textpointer MachineDirectHitDeckText ; 0x038b
|
||||
textpointer MachineBadDreamDeckText ; 0x038c
|
||||
textpointer MachineBenchPanicDeckText ; 0x038d
|
||||
textpointer MachineSnorlaxGuardDeckText ; 0x038e
|
||||
textpointer MachineEyeOfTheStormDeckText ; 0x038f
|
||||
textpointer MachineSuddenGrowthDeckText ; 0x0390
|
||||
textpointer MachineKingDragoniteDeckText ; 0x0391
|
||||
textpointer MachineDarkCharizardDeckText ; 0x0392
|
||||
textpointer MachineDarkBlastoiseDeckText ; 0x0393
|
||||
textpointer MachineDarkVenusaurDeckText ; 0x0394
|
||||
textpointer MachineDarkDragoniteDeckText ; 0x0395
|
||||
textpointer MachinePerfectHealthDeckText ; 0x0396
|
||||
textpointer MachineSuperSoakerDeckText ; 0x0397
|
||||
textpointer MachineHellsDemonDeckText ; 0x0398
|
||||
textpointer MachinePremiumThunderDeckText ; 0x0399
|
||||
textpointer MachineMysteriousMewtwoDeckText ; 0x039a
|
||||
textpointer MachineHeavenlyLugiaDeckText ; 0x039b
|
||||
textpointer MachineBrutalTrainersDeckText ; 0x039c
|
||||
textpointer MachineDreadfulParalysisDeckText ; 0x039d
|
||||
textpointer MachineInsectCollectionDeckName ; 0x0376
|
||||
textpointer MachineCaveExplorationDeckName ; 0x0377
|
||||
textpointer MachineOminousMeadowDeckName ; 0x0378
|
||||
textpointer MachineAtrociousWeezingDeckName ; 0x0379
|
||||
textpointer MachineTheBenchIsAlsoASurpriseDeckName ; 0x037a
|
||||
textpointer MachineEnergyConservationDeckName ; 0x037b
|
||||
textpointer MachineSonicboomDeckName ; 0x037c
|
||||
textpointer MachineRageOfTheHeavensDeckName ; 0x037d
|
||||
textpointer MachineDarkWaterDeckName ; 0x037e
|
||||
textpointer MachineQuickFreezeDeckName ; 0x037f
|
||||
textpointer MachineWhirlpoolShowerDeckName ; 0x0380
|
||||
textpointer MachineWaterGangDeckName ; 0x0381
|
||||
textpointer MachineFireballDeckName ; 0x0382
|
||||
textpointer MachineCompleteCombustionDeckName ; 0x0383
|
||||
textpointer MachineOminousSpiritFlamesDeckName ; 0x0384
|
||||
textpointer MachineEternalFireDeckName ; 0x0385
|
||||
textpointer MachineBewareTheTrapDeckName ; 0x0386
|
||||
textpointer MachineOgresKickDeckName ; 0x0387
|
||||
textpointer MachineRockBlastDeckName ; 0x0388
|
||||
textpointer MachineHeavyWorkDeckName ; 0x0389
|
||||
textpointer MachineSlowbrosFishingDeckName ; 0x038a
|
||||
textpointer MachineDirectHitDeckName ; 0x038b
|
||||
textpointer MachineBadDreamDeckName ; 0x038c
|
||||
textpointer MachineBenchPanicDeckName ; 0x038d
|
||||
textpointer MachineSnorlaxGuardDeckName ; 0x038e
|
||||
textpointer MachineEyeOfTheStormDeckName ; 0x038f
|
||||
textpointer MachineSuddenGrowthDeckName ; 0x0390
|
||||
textpointer MachineKingDragoniteDeckName ; 0x0391
|
||||
textpointer MachineDarkCharizardDeckName ; 0x0392
|
||||
textpointer MachineDarkBlastoiseDeckName ; 0x0393
|
||||
textpointer MachineDarkVenusaurDeckName ; 0x0394
|
||||
textpointer MachineDarkDragoniteDeckName ; 0x0395
|
||||
textpointer MachinePerfectHealthDeckName ; 0x0396
|
||||
textpointer MachineSuperSoakerDeckName ; 0x0397
|
||||
textpointer MachineHellsDemonDeckName ; 0x0398
|
||||
textpointer MachinePremiumThunderDeckName ; 0x0399
|
||||
textpointer MachineMysteriousMewtwoDeckName ; 0x039a
|
||||
textpointer MachineHeavenlyLugiaDeckName ; 0x039b
|
||||
textpointer MachineBrutalTrainersDeckName ; 0x039c
|
||||
textpointer MachineDreadfulParalysisDeckName ; 0x039d
|
||||
textpointer MachineInsectCollectionDeckDescriptionText ; 0x039e
|
||||
textpointer MachineCaveExplorationDeckDescriptionText ; 0x039f
|
||||
textpointer MachineOminousMeadowDeckDescriptionText ; 0x03a0
|
||||
|
||||
+71
-41
@@ -44,6 +44,12 @@ NEXTU
|
||||
wCardPopCandidateList:: ; c000
|
||||
ds CARD_COLLECTION_SIZE
|
||||
|
||||
NEXTU
|
||||
|
||||
; buffer to store a target deck
|
||||
wDeckToBuild:: ; c000
|
||||
ds DECK_BIG_TEMP_BUFFER_SIZE
|
||||
|
||||
ENDU
|
||||
|
||||
SECTION "WRAM0 Duels 1", WRAM0
|
||||
@@ -1334,7 +1340,7 @@ wCardPopRecordType:: ; ce45
|
||||
|
||||
ds $6 ; padding to align to $20
|
||||
|
||||
wce4c:: ; ce4c
|
||||
wTempBankWRAM:: ; ce4c
|
||||
ds $1
|
||||
|
||||
wWRAMBank:: ; ce4d
|
||||
@@ -2007,7 +2013,8 @@ wTempFilteredCardListNumCursorPositions:: ; d11c
|
||||
wd11d:: ; d11d
|
||||
ds $1
|
||||
|
||||
wced7:: ; d11e
|
||||
; tcg1: wced7
|
||||
wd11e:: ; d11e
|
||||
ds $1
|
||||
|
||||
wCardListVisibleOffsetBackup:: ; d11f
|
||||
@@ -2017,7 +2024,8 @@ wCardListVisibleOffsetBackup:: ; d11f
|
||||
wNumUniqueCards:: ; d120
|
||||
ds $1
|
||||
|
||||
wd121:: ; d121
|
||||
; flag for Bill's Computer
|
||||
wBillsComputerAllowedInCardList:: ; d121
|
||||
ds $1
|
||||
|
||||
; cards that belong to a Booster Pack
|
||||
@@ -2032,7 +2040,7 @@ wTempCardList:: ; d122
|
||||
|
||||
; holds cards for the current deck
|
||||
wCurDeckCards:: ; d1c4
|
||||
ds $a2
|
||||
ds 2 * (DECK_CONFIG_BUFFER_SIZE + 1)
|
||||
|
||||
; list of all the different cards in a deck configuration
|
||||
wUniqueDeckCardList:: ; d266
|
||||
@@ -2103,7 +2111,7 @@ wCurCardListPtr:: ; d388
|
||||
|
||||
ds $1
|
||||
|
||||
wd38a:: ; d38a
|
||||
wCardConfirmationText:: ; d38a
|
||||
ds $2
|
||||
|
||||
ds $2
|
||||
@@ -2210,10 +2218,11 @@ wTempScrollMenuScrollOffset:: ; d47c
|
||||
wSelectedDeckMachineEntry:: ; d47d
|
||||
ds $1
|
||||
|
||||
wd47e:: ; d47e
|
||||
ds $18
|
||||
wDismantledDeckName:: ; d47e
|
||||
ds DECK_NAME_SIZE
|
||||
|
||||
wd496:: ; d496
|
||||
; which deck slot to be used to build a new deck
|
||||
wDeckSlotForNewDeck:: ; d496
|
||||
ds $1
|
||||
|
||||
wDeckMachineTitleText:: ; d497
|
||||
@@ -2222,10 +2231,10 @@ wDeckMachineTitleText:: ; d497
|
||||
wNumDeckMachineEntries:: ; d499
|
||||
ds $1
|
||||
|
||||
wd49a:: ; d49a
|
||||
wDecksToBeDismantled:: ; d49a
|
||||
ds $1
|
||||
|
||||
wd49b:: ; d49b
|
||||
wNumCardsNeededToBuildSelectedDeckUsedInBuiltDecks:: ; d49b
|
||||
ds $1
|
||||
|
||||
; text ID to print in the text box when
|
||||
@@ -2233,32 +2242,53 @@ wd49b:: ; d49b
|
||||
wDeckMachineText:: ; d49c
|
||||
ds $2
|
||||
|
||||
wd49e:: ; d49e
|
||||
wNumCardsNeededToBuildSelectedDeckMissingInCardCollection:: ; d49e
|
||||
ds $1
|
||||
|
||||
wd49f:: ; d49f
|
||||
UNION
|
||||
|
||||
; cards used in built decks, cards missing
|
||||
wNumCardsNeededToBuildDeckMachineDecks:: ; d49f
|
||||
ds (1 + 1) * NUM_DECK_SAVE_MACHINE_SLOTS
|
||||
|
||||
NEXTU
|
||||
|
||||
; store (index + 1)
|
||||
wIndicesAutoDeckMachineUnlockedCategories:: ; d49f
|
||||
ds NUM_AUTO_DECK_MACHINE_CATEGORIES
|
||||
|
||||
ds $a
|
||||
|
||||
; selected category index of current auto deck machine
|
||||
wSelectedAutoDeckMachineCategory:: ; d4b3
|
||||
ds $1
|
||||
|
||||
ds $13
|
||||
; unlocked category names, description texts of current category, etc.
|
||||
wAutoDeckMachineTexts:: ; d4b4
|
||||
ds 2 * NUM_AUTO_DECK_MACHINE_CATEGORIES
|
||||
|
||||
wd4b3:: ; d4b3
|
||||
wSelectedMachineDeck:: ; d4c8
|
||||
ds DECK_TEMP_BUFFER_SIZE
|
||||
|
||||
ENDU
|
||||
|
||||
UNION
|
||||
|
||||
; *_ISLAND flag to switch machine 1 and 2
|
||||
wAutoDeckMachineIndex:: ; d548
|
||||
ds $1
|
||||
|
||||
wd4b4:: ; d4b4
|
||||
ds $8
|
||||
|
||||
ds $c
|
||||
|
||||
wd4c8:: ; d4c8
|
||||
ds $80
|
||||
NEXTU
|
||||
|
||||
wd548:: ; d548
|
||||
ds $2
|
||||
|
||||
wd54a:: ; d54a
|
||||
ENDU
|
||||
|
||||
wAutoDeckMachineScrollOffset:: ; d54a
|
||||
ds $1
|
||||
|
||||
wd54b:: ; d54b
|
||||
wAutoDeckMachineScrollMenuItem:: ; d54b
|
||||
ds $1
|
||||
|
||||
wNextGameEvent:: ; d54c
|
||||
@@ -3597,32 +3627,32 @@ SECTION "WRAM2", WRAMX
|
||||
wScratchCardCollection:: ; d000
|
||||
ds CARD_COLLECTION_SIZE
|
||||
|
||||
w2d200:: ; d200
|
||||
ds $80
|
||||
wBackup1DeckToBuild:: ; d200
|
||||
ds DECK_TEMP_BUFFER_SIZE
|
||||
|
||||
w2d280:: ; d280
|
||||
ds $6
|
||||
; $ff-terminated array of basic energy amount available to sub in,
|
||||
; first in card constant order (not in type-flag order),
|
||||
; then sorted in descending order when processed
|
||||
; also a subbed deck flag after the sort
|
||||
wNumRemainingBasicEnergyCardsForSubbedDeck:: ; d280
|
||||
ds NUM_COLORED_TYPES + 1
|
||||
|
||||
w2d286:: ; d286
|
||||
ds $1
|
||||
; $ff-terminated index array [0, 5]
|
||||
; mapped when wNumRemainingBasicEnergyCardsForSubbedDeck is sorted
|
||||
wIndicesRemainingBasicEnergyCardsForSubbedDeck:: ; d287
|
||||
ds NUM_COLORED_TYPES + 1
|
||||
|
||||
w2d287:: ; d287
|
||||
ds $6
|
||||
wBigBackupDeckToBuild:: ; d28e
|
||||
ds DECK_BIG_TEMP_BUFFER_SIZE
|
||||
|
||||
w2d28d:: ; d28d
|
||||
ds $1
|
||||
|
||||
w2d28e:: ; d28e
|
||||
ds $100
|
||||
|
||||
w2d38e:: ; d38e
|
||||
ds $80
|
||||
wBackup2DeckToBuild:: ; d38e
|
||||
ds DECK_TEMP_BUFFER_SIZE
|
||||
|
||||
wAutoDecks:: ; d40e
|
||||
ds DECK_COMPRESSED_STRUCT_SIZE * NUM_AUTO_DECK_MACHINE_SLOTS
|
||||
|
||||
w2d58e:: ; d58e
|
||||
ds $80
|
||||
wBackup3DeckToBuild:: ; d58e
|
||||
ds DECK_TEMP_BUFFER_SIZE
|
||||
|
||||
SECTION "WRAM3", WRAMX
|
||||
|
||||
|
||||
Reference in New Issue
Block a user