Merge pull request #34 from xCrystal/master

Some Home disasm ; Misc style fixes, constants and labeling ; Split macros ; Create linkerscript and arrange Sections ; Bump extras

11 files changed, 605 insertions, 575 deletions

diff --git a/src/constants/booster_constants.asm b/src/constants/booster_constants.asm
index e58f428..f5efb9b 100755
--- a/src/constants/booster_constants.asm
+++ b/src/constants/booster_constants.asm
@@ -1,41 +1,45 @@
-BOOSTER_CARD_TYPE_GRASS     EQU $00

-BOOSTER_CARD_TYPE_FIRE      EQU $01

-BOOSTER_CARD_TYPE_LIGHTNING EQU $03

-BOOSTER_CARD_TYPE_WATER     EQU $02

-BOOSTER_CARD_TYPE_FIGHTING  EQU $04

-BOOSTER_CARD_TYPE_PSYCHIC   EQU $05

-BOOSTER_CARD_TYPE_COLORLESS EQU $06

-BOOSTER_CARD_TYPE_TRAINER   EQU $07

-BOOSTER_CARD_TYPE_ENERGY    EQU $08

-BOOSTER_CARD_TYPE_AMOUNT    EQU $09

-

-BOOSTER_ColoNeutral              EQU $00

-BOOSTER_ColoGrass                EQU $01

-BOOSTER_ColoFire                 EQU $02

-BOOSTER_ColoWater                EQU $03

-BOOSTER_ColoLightning            EQU $04

-BOOSTER_ColoFighting             EQU $05

-BOOSTER_ColoTrainer              EQU $06

-BOOSTER_EvoNeutral               EQU $07

-BOOSTER_EvoGrass                 EQU $08

-BOOSTER_EvoNeutralFireEnergy     EQU $09

-BOOSTER_EvoWater                 EQU $0a

-BOOSTER_EvoFighting              EQU $0b

-BOOSTER_EvoPsychic               EQU $0c

-BOOSTER_EvoTrainer               EQU $0d

-BOOSTER_MysteryNeutral           EQU $0e

-BOOSTER_MysteryGrassColorless    EQU $0f

-BOOSTER_MysteryWaterColorless    EQU $10

-BOOSTER_LightningColorless       EQU $11

-BOOSTER_MysteryFightingColorless EQU $12

-BOOSTER_MysteryTrainerColorless  EQU $13

-BOOSTER_LabTrainerLessFighting   EQU $14

-BOOSTER_LabGrass                 EQU $15

-BOOSTER_LabWater                 EQU $16

-BOOSTER_LabPsychic               EQU $17

-BOOSTER_LabTrainer               EQU $18

-BOOSTER_EnergyLightningFire      EQU $19

-BOOSTER_EnergyWaterFighting      EQU $1a

-BOOSTER_EnergyGrassPsychic       EQU $1b

-BOOSTER_RandomEnergies           EQU $1c

-NO_BOOSTER                       EQU $ff

+NUM_CARDS_IN_BOOSTER EQU 10
+
+	const_def
+	const BOOSTER_CARD_TYPE_GRASS     ; $00
+	const BOOSTER_CARD_TYPE_FIRE      ; $01
+	const BOOSTER_CARD_TYPE_WATER     ; $02
+	const BOOSTER_CARD_TYPE_LIGHTNING ; $03
+	const BOOSTER_CARD_TYPE_FIGHTING  ; $04
+	const BOOSTER_CARD_TYPE_PSYCHIC   ; $05
+	const BOOSTER_CARD_TYPE_COLORLESS ; $06
+	const BOOSTER_CARD_TYPE_TRAINER   ; $07
+	const BOOSTER_CARD_TYPE_ENERGY    ; $08
+NUM_BOOSTER_CARD_TYPES EQU const_value
+
+	const_def
+	const BOOSTER_COLOSSEUM_NEUTRAL           ; $00
+	const BOOSTER_COLOSSEUM_GRASS             ; $01
+	const BOOSTER_COLOSSEUM_FIRE              ; $02
+	const BOOSTER_COLOSSEUM_WATER             ; $03
+	const BOOSTER_COLOSSEUM_LIGHTNING         ; $04
+	const BOOSTER_COLOSSEUM_FIGHTING          ; $05
+	const BOOSTER_COLOSSEUM_TRAINER           ; $06
+	const BOOSTER_EVOLUTION_NEUTRAL           ; $07
+	const BOOSTER_EVOLUTION_GRASS             ; $08
+	const BOOSTER_EVOLUTION_FIRE              ; $09
+	const BOOSTER_EVOLUTION_WATER             ; $0a
+	const BOOSTER_EVOLUTION_FIGHTING          ; $0b
+	const BOOSTER_EVOLUTION_PSYCHIC           ; $0c
+	const BOOSTER_EVOLUTION_TRAINER           ; $0d
+	const BOOSTER_MYSTERY_NEUTRAL             ; $0e
+	const BOOSTER_MYSTERY_GRASS_COLORLESS     ; $0f
+	const BOOSTER_MYSTERY_WATER_COLORLESS     ; $10
+	const BOOSTER_MYSTERY_LIGHTNING_COLORLESS ; $11
+	const BOOSTER_MYSTERY_FIGHTING_COLORLESS  ; $12
+	const BOOSTER_MYSTERY_TRAINER_COLORLESS   ; $13
+	const BOOSTER_LABORATORY_NEUTRAL          ; $14
+	const BOOSTER_LABORATORY_GRASS            ; $15
+	const BOOSTER_LABORATORY_WATER            ; $16
+	const BOOSTER_LABORATORY_PSYCHIC          ; $17
+	const BOOSTER_LABORATORY_TRAINER          ; $18
+	const BOOSTER_ENERGY_LIGHTNING_FIRE       ; $19
+	const BOOSTER_ENERGY_WATER_FIGHTING       ; $1a
+	const BOOSTER_ENERGY_GRASS_PSYCHIC        ; $1b
+	const BOOSTER_ENERGY_RANDOM               ; $1c
+NO_BOOSTER EQU $ff
diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm
index dd96647..30560c2 100755
--- a/src/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
@@ -1,230 +1,230 @@
-GRASS_ENERGY            EQU $01
-FIRE_ENERGY             EQU $02
-WATER_ENERGY            EQU $03
-LIGHTNING_ENERGY        EQU $04
-FIGHTING_ENERGY         EQU $05
-PSYCHIC_ENERGY          EQU $06
-DOUBLE_COLORLESS_ENERGY EQU $07
-BULBASAUR               EQU $08
-IVYSAUR                 EQU $09
-VENUSAUR1               EQU $0A
-VENUSAUR2               EQU $0B
-CATERPIE                EQU $0C
-METAPOD                 EQU $0D
-BUTTERFREE              EQU $0E
-WEEDLE                  EQU $0F
-KAKUNA                  EQU $10
-BEEDRILL                EQU $11
-EKANS                   EQU $12
-ARBOK                   EQU $13
-NIDORANF                EQU $14
-NIDORINA                EQU $15
-NIDOQUEEN               EQU $16
-NIDORANM                EQU $17
-NIDORINO                EQU $18
-NIDOKING                EQU $19
-ZUBAT                   EQU $1A
-GOLBAT                  EQU $1B
-ODDISH                  EQU $1C
-GLOOM                   EQU $1D
-VILEPLUME               EQU $1E
-PARAS                   EQU $1F
-PARASECT                EQU $20
-VENONAT                 EQU $21
-VENOMOTH                EQU $22
-BELLSPROUT              EQU $23
-WEEPINBELL              EQU $24
-VICTREEBEL              EQU $25
-GRIMER                  EQU $26
-MUK                     EQU $27
-EXEGGCUTE               EQU $28
-EXEGGUTOR               EQU $29
-KOFFING                 EQU $2A
-WEEZING                 EQU $2B
-TANGELA1                EQU $2C
-TANGELA2                EQU $2D
-SCYTHER                 EQU $2E
-PINSIR                  EQU $2F
-CHARMANDER              EQU $30
-CHARMELEON              EQU $31
-CHARIZARD               EQU $32
-VULPIX                  EQU $33
-NINETAILS1              EQU $34
-NINETAILS2              EQU $35
-GROWLITHE               EQU $36
-ARCANINE1               EQU $37
-ARCANINE2               EQU $38
-PONYTA                  EQU $39
-RAPIDASH                EQU $3A
-MAGMAR1                 EQU $3B
-MAGMAR2                 EQU $3C
-FLAREON1                EQU $3D
-FLAREON2                EQU $3E
-MOLTRES1                EQU $3F
-MOLTRES2                EQU $40
-SQUIRTLE                EQU $41
-WARTORTLE               EQU $42
-BLASTOISE               EQU $43
-PSYDUCK                 EQU $44
-GOLDUCK                 EQU $45
-POLIWAG                 EQU $46
-POLIWHIRL               EQU $47
-POLIWRATH               EQU $48
-TENTACOOL               EQU $49
-TENTACRUEL              EQU $4A
-SEEL                    EQU $4B
-DEWGONG                 EQU $4C
-SHELLDER                EQU $4D
-CLOYSTER                EQU $4E
-KRABBY                  EQU $4F
-KINGLER                 EQU $50
-HORSEA                  EQU $51
-SEADRA                  EQU $52
-GOLDEEN                 EQU $53
-SEAKING                 EQU $54
-STARYU                  EQU $55
-STARMIE                 EQU $56
-MAGIKARP                EQU $57
-GYARADOS                EQU $58
-LAPRAS                  EQU $59
-VAPOREON1               EQU $5A
-VAPOREON2               EQU $5B
-OMANYTE                 EQU $5C
-OMASTAR                 EQU $5D
-ARTICUNO1               EQU $5E
-ARTICUNO2               EQU $5F
-PIKACHU1                EQU $60
-PIKACHU2                EQU $61
-PIKACHU3                EQU $62
-PIKACHU4                EQU $63
-FLYING_PIKACHU          EQU $64
-SURFING_PIKACHU1        EQU $65
-SURFING_PIKACHU2        EQU $66
-RAICHU1                 EQU $67
-RAICHU2                 EQU $68
-MAGNEMITE1              EQU $69
-MAGNEMITE2              EQU $6A
-MAGNETON1               EQU $6B
-MAGNETON2               EQU $6C
-VOLTORB                 EQU $6D
-ELECTRODE1              EQU $6E
-ELECTRODE2              EQU $6F
-ELECTABUZZ1             EQU $70
-ELECTABUZZ2             EQU $71
-JOLTEON1                EQU $72
-JOLTEON2                EQU $73
-ZAPDOS1                 EQU $74
-ZAPDOS2                 EQU $75
-ZAPDOS3                 EQU $76
-SANDSHREW               EQU $77
-SANDSLASH               EQU $78
-DIGLETT                 EQU $79
-DUGTRIO                 EQU $7A
-MANKEY                  EQU $7B
-PRIMEAPE                EQU $7C
-MACHOP                  EQU $7D
-MACHOKE                 EQU $7E
-MACHAMP                 EQU $7F
-GEODUDE                 EQU $80
-GRAVELER                EQU $81
-GOLEM                   EQU $82
-ONIX                    EQU $83
-CUBONE                  EQU $84
-MAROWAK1                EQU $85
-MAROWAK2                EQU $86
-HITMONLEE               EQU $87
-HITMONCHAN              EQU $88
-RHYHORN                 EQU $89
-RHYDON                  EQU $8A
-KABUTO                  EQU $8B
-KABUTOPS                EQU $8C
-AERODACTYL              EQU $8D
-ABRA                    EQU $8E
-KADABRA                 EQU $8F
-ALAKAZAM                EQU $90
-SLOWPOKE1               EQU $91
-SLOWPOKE2               EQU $92
-SLOWBRO                 EQU $93
-GASTLY1                 EQU $94
-GASTLY2                 EQU $95
-HAUNTER1                EQU $96
-HAUNTER2                EQU $97
-GENGAR                  EQU $98
-DROWZEE                 EQU $99
-HYPNO                   EQU $9A
-MR_MIME                 EQU $9B
-JYNX                    EQU $9C
-MEWTWO1                 EQU $9D
-MEWTWO2                 EQU $9E
-MEWTWO3                 EQU $9F
-MEW1                    EQU $A0
-MEW2                    EQU $A1
-MEW3                    EQU $A2
-PIDGEY                  EQU $A3
-PIDGEOTTO               EQU $A4
-PIDGEOT1                EQU $A5
-PIDGEOT2                EQU $A6
-RATTATA                 EQU $A7
-RATICATE                EQU $A8
-SPEAROW                 EQU $A9
-FEAROW                  EQU $AA
-CLEFAIRY                EQU $AB
-CLEFABLE                EQU $AC
-JIGGLYPUFF1             EQU $AD
-JIGGLYPUFF2             EQU $AE
-JIGGLYPUFF3             EQU $AF
-WIGGLYTUFF              EQU $B0
-MEOWTH1                 EQU $B1
-MEOWTH2                 EQU $B2
-PERSIAN                 EQU $B3
-FARFETCHD               EQU $B4
-DODUO                   EQU $B5
-DODRIO                  EQU $B6
-LICKITUNG               EQU $B7
-CHANSEY                 EQU $B8
-KANGASKHAN              EQU $B9
-TAUROS                  EQU $BA
-DITTO                   EQU $BB
-EEVEE                   EQU $BC
-PORYGON                 EQU $BD
-SNORLAX                 EQU $BE
-DRATINI                 EQU $BF
-DRAGONAIR               EQU $C0
-DRAGONITE1              EQU $C1
-DRAGONITE2              EQU $C2
-PROFESSOR_OAK           EQU $C3
-IMPOSTER_PROFESSOR_OAK  EQU $C4
-BILL                    EQU $C5
-MR_FUJI                 EQU $C6
-LASS                    EQU $C7
-IMAKUNI_CARD            EQU $C8
-POKEMON_TRADER          EQU $C9
-POKEMON_BREEDER         EQU $CA
-CLEFAIRY_DOLL           EQU $CB
-MYSTERIOUS_FOSSIL       EQU $CC
-ENERGY_RETRIEVAL        EQU $CD
-SUPER_ENERGY_RETRIEVAL  EQU $CE
-ENERGY_SEARCH           EQU $CF
-ENERGY_REMOVAL          EQU $D0
-SUPER_ENERGY_REMOVAL    EQU $D1
-SWITCH                  EQU $D2
-POKEMON_CENTER          EQU $D3
-POKE_BALL               EQU $D4
-SCOOP_UP                EQU $D5
-COMPUTER_SEARCH         EQU $D6
-POKEDEX                 EQU $D7
-PLUSPOWER               EQU $D8
-DEFENDER                EQU $D9
-ITEM_FINDER             EQU $DA
-GUST_OF_WIND            EQU $DB
-DEVOLUTION_SPRAY        EQU $DC
-POTION                  EQU $DD
-SUPER_POTION            EQU $DE
-FULL_HEAL               EQU $DF
-REVIVE                  EQU $E0
-MAINTENANCE             EQU $E1
-POKEMON_FLUTE           EQU $E2
-GAMBLER                 EQU $E3
-RECYCLE                 EQU $E4
-
-NUM_CARDS               EQU RECYCLE
+	const_def 1
+	const GRASS_ENERGY            ; $01
+	const FIRE_ENERGY             ; $02
+	const WATER_ENERGY            ; $03
+	const LIGHTNING_ENERGY        ; $04
+	const FIGHTING_ENERGY         ; $05
+	const PSYCHIC_ENERGY          ; $06
+	const DOUBLE_COLORLESS_ENERGY ; $07
+	const BULBASAUR               ; $08
+	const IVYSAUR                 ; $09
+	const VENUSAUR1               ; $0A
+	const VENUSAUR2               ; $0B
+	const CATERPIE                ; $0C
+	const METAPOD                 ; $0D
+	const BUTTERFREE              ; $0E
+	const WEEDLE                  ; $0F
+	const KAKUNA                  ; $10
+	const BEEDRILL                ; $11
+	const EKANS                   ; $12
+	const ARBOK                   ; $13
+	const NIDORANF                ; $14
+	const NIDORINA                ; $15
+	const NIDOQUEEN               ; $16
+	const NIDORANM                ; $17
+	const NIDORINO                ; $18
+	const NIDOKING                ; $19
+	const ZUBAT                   ; $1A
+	const GOLBAT                  ; $1B
+	const ODDISH                  ; $1C
+	const GLOOM                   ; $1D
+	const VILEPLUME               ; $1E
+	const PARAS                   ; $1F
+	const PARASECT                ; $20
+	const VENONAT                 ; $21
+	const VENOMOTH                ; $22
+	const BELLSPROUT              ; $23
+	const WEEPINBELL              ; $24
+	const VICTREEBEL              ; $25
+	const GRIMER                  ; $26
+	const MUK                     ; $27
+	const EXEGGCUTE               ; $28
+	const EXEGGUTOR               ; $29
+	const KOFFING                 ; $2A
+	const WEEZING                 ; $2B
+	const TANGELA1                ; $2C
+	const TANGELA2                ; $2D
+	const SCYTHER                 ; $2E
+	const PINSIR                  ; $2F
+	const CHARMANDER              ; $30
+	const CHARMELEON              ; $31
+	const CHARIZARD               ; $32
+	const VULPIX                  ; $33
+	const NINETAILS1              ; $34
+	const NINETAILS2              ; $35
+	const GROWLITHE               ; $36
+	const ARCANINE1               ; $37
+	const ARCANINE2               ; $38
+	const PONYTA                  ; $39
+	const RAPIDASH                ; $3A
+	const MAGMAR1                 ; $3B
+	const MAGMAR2                 ; $3C
+	const FLAREON1                ; $3D
+	const FLAREON2                ; $3E
+	const MOLTRES1                ; $3F
+	const MOLTRES2                ; $40
+	const SQUIRTLE                ; $41
+	const WARTORTLE               ; $42
+	const BLASTOISE               ; $43
+	const PSYDUCK                 ; $44
+	const GOLDUCK                 ; $45
+	const POLIWAG                 ; $46
+	const POLIWHIRL               ; $47
+	const POLIWRATH               ; $48
+	const TENTACOOL               ; $49
+	const TENTACRUEL              ; $4A
+	const SEEL                    ; $4B
+	const DEWGONG                 ; $4C
+	const SHELLDER                ; $4D
+	const CLOYSTER                ; $4E
+	const KRABBY                  ; $4F
+	const KINGLER                 ; $50
+	const HORSEA                  ; $51
+	const SEADRA                  ; $52
+	const GOLDEEN                 ; $53
+	const SEAKING                 ; $54
+	const STARYU                  ; $55
+	const STARMIE                 ; $56
+	const MAGIKARP                ; $57
+	const GYARADOS                ; $58
+	const LAPRAS                  ; $59
+	const VAPOREON1               ; $5A
+	const VAPOREON2               ; $5B
+	const OMANYTE                 ; $5C
+	const OMASTAR                 ; $5D
+	const ARTICUNO1               ; $5E
+	const ARTICUNO2               ; $5F
+	const PIKACHU1                ; $60
+	const PIKACHU2                ; $61
+	const PIKACHU3                ; $62
+	const PIKACHU4                ; $63
+	const FLYING_PIKACHU          ; $64
+	const SURFING_PIKACHU1        ; $65
+	const SURFING_PIKACHU2        ; $66
+	const RAICHU1                 ; $67
+	const RAICHU2                 ; $68
+	const MAGNEMITE1              ; $69
+	const MAGNEMITE2              ; $6A
+	const MAGNETON1               ; $6B
+	const MAGNETON2               ; $6C
+	const VOLTORB                 ; $6D
+	const ELECTRODE1              ; $6E
+	const ELECTRODE2              ; $6F
+	const ELECTABUZZ1             ; $70
+	const ELECTABUZZ2             ; $71
+	const JOLTEON1                ; $72
+	const JOLTEON2                ; $73
+	const ZAPDOS1                 ; $74
+	const ZAPDOS2                 ; $75
+	const ZAPDOS3                 ; $76
+	const SANDSHREW               ; $77
+	const SANDSLASH               ; $78
+	const DIGLETT                 ; $79
+	const DUGTRIO                 ; $7A
+	const MANKEY                  ; $7B
+	const PRIMEAPE                ; $7C
+	const MACHOP                  ; $7D
+	const MACHOKE                 ; $7E
+	const MACHAMP                 ; $7F
+	const GEODUDE                 ; $80
+	const GRAVELER                ; $81
+	const GOLEM                   ; $82
+	const ONIX                    ; $83
+	const CUBONE                  ; $84
+	const MAROWAK1                ; $85
+	const MAROWAK2                ; $86
+	const HITMONLEE               ; $87
+	const HITMONCHAN              ; $88
+	const RHYHORN                 ; $89
+	const RHYDON                  ; $8A
+	const KABUTO                  ; $8B
+	const KABUTOPS                ; $8C
+	const AERODACTYL              ; $8D
+	const ABRA                    ; $8E
+	const KADABRA                 ; $8F
+	const ALAKAZAM                ; $90
+	const SLOWPOKE1               ; $91
+	const SLOWPOKE2               ; $92
+	const SLOWBRO                 ; $93
+	const GASTLY1                 ; $94
+	const GASTLY2                 ; $95
+	const HAUNTER1                ; $96
+	const HAUNTER2                ; $97
+	const GENGAR                  ; $98
+	const DROWZEE                 ; $99
+	const HYPNO                   ; $9A
+	const MR_MIME                 ; $9B
+	const JYNX                    ; $9C
+	const MEWTWO1                 ; $9D
+	const MEWTWO2                 ; $9E
+	const MEWTWO3                 ; $9F
+	const MEW1                    ; $A0
+	const MEW2                    ; $A1
+	const MEW3                    ; $A2
+	const PIDGEY                  ; $A3
+	const PIDGEOTTO               ; $A4
+	const PIDGEOT1                ; $A5
+	const PIDGEOT2                ; $A6
+	const RATTATA                 ; $A7
+	const RATICATE                ; $A8
+	const SPEAROW                 ; $A9
+	const FEAROW                  ; $AA
+	const CLEFAIRY                ; $AB
+	const CLEFABLE                ; $AC
+	const JIGGLYPUFF1             ; $AD
+	const JIGGLYPUFF2             ; $AE
+	const JIGGLYPUFF3             ; $AF
+	const WIGGLYTUFF              ; $B0
+	const MEOWTH1                 ; $B1
+	const MEOWTH2                 ; $B2
+	const PERSIAN                 ; $B3
+	const FARFETCHD               ; $B4
+	const DODUO                   ; $B5
+	const DODRIO                  ; $B6
+	const LICKITUNG               ; $B7
+	const CHANSEY                 ; $B8
+	const KANGASKHAN              ; $B9
+	const TAUROS                  ; $BA
+	const DITTO                   ; $BB
+	const EEVEE                   ; $BC
+	const PORYGON                 ; $BD
+	const SNORLAX                 ; $BE
+	const DRATINI                 ; $BF
+	const DRAGONAIR               ; $C0
+	const DRAGONITE1              ; $C1
+	const DRAGONITE2              ; $C2
+	const PROFESSOR_OAK           ; $C3
+	const IMPOSTER_PROFESSOR_OAK  ; $C4
+	const BILL                    ; $C5
+	const MR_FUJI                 ; $C6
+	const LASS                    ; $C7
+	const IMAKUNI_CARD            ; $C8
+	const POKEMON_TRADER          ; $C9
+	const POKEMON_BREEDER         ; $CA
+	const CLEFAIRY_DOLL           ; $CB
+	const MYSTERIOUS_FOSSIL       ; $CC
+	const ENERGY_RETRIEVAL        ; $CD
+	const SUPER_ENERGY_RETRIEVAL  ; $CE
+	const ENERGY_SEARCH           ; $CF
+	const ENERGY_REMOVAL          ; $D0
+	const SUPER_ENERGY_REMOVAL    ; $D1
+	const SWITCH                  ; $D2
+	const POKEMON_CENTER          ; $D3
+	const POKE_BALL               ; $D4
+	const SCOOP_UP                ; $D5
+	const COMPUTER_SEARCH         ; $D6
+	const POKEDEX                 ; $D7
+	const PLUSPOWER               ; $D8
+	const DEFENDER                ; $D9
+	const ITEM_FINDER             ; $DA
+	const GUST_OF_WIND            ; $DB
+	const DEVOLUTION_SPRAY        ; $DC
+	const POTION                  ; $DD
+	const SUPER_POTION            ; $DE
+	const FULL_HEAL               ; $DF
+	const REVIVE                  ; $E0
+	const MAINTENANCE             ; $E1
+	const POKEMON_FLUTE           ; $E2
+	const GAMBLER                 ; $E3
+	const RECYCLE                 ; $E4
+NUM_CARDS EQU const_value + -1
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 637eb90..a98a0c7 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -1,33 +1,45 @@
+NONE EQU $0
+
 PKMN_CARD_DATA_LENGTH   EQU $41
 TRN_CARD_DATA_LENGTH    EQU $0e
 ENERGY_CARD_DATA_LENGTH EQU $0e
 
-DECK_NAME_SIZE   EQU  24
-DECK_SIZE        EQU  60
-BENCH_SIZE       EQU   5
+;;; generic type constants
+; double up as Pokemon card types
+	const_def
+	const FIRE        ; $0
+	const GRASS       ; $1
+	const LIGHTNING   ; $2
+	const WATER       ; $3
+	const FIGHTING    ; $4
+	const PSYCHIC     ; $5
+	const COLORLESS   ; $6
+	const UNUSED_TYPE ; $7
+NUM_TYPES EQU const_value
 
 ;;; card types
-FIRE      EQU $0
-GRASS     EQU $1
-LIGHTNING EQU $2
-WATER     EQU $3
-FIGHTING  EQU $4
-PSYCHIC   EQU $5
-COLORLESS EQU $6
-
-FIRE_ENERGY_CARD             EQU $8
-GRASS_ENERGY_CARD            EQU $9
-LIGHTNING_ENERGY_CARD        EQU $A
-WATER_ENERGY_CARD            EQU $B
-FIGHTING_ENERGY_CARD         EQU $C
-PSYCHIC_ENERGY_CARD          EQU $D
-DOUBLE_COLORLESS_ENERGY_CARD EQU $E
-
-TRAINER_CARD EQU $10
-
-NUM_TYPES EQU FIRE_ENERGY_CARD - FIRE
-
-ENERGY_CARD_F EQU 3
+TYPE_PKMN_FIRE               EQUS "FIRE"
+TYPE_PKMN_GRASS              EQUS "GRASS"
+TYPE_PKMN_LIGHTNING          EQUS "LIGHTNING"
+TYPE_PKMN_WATER              EQUS "WATER"
+TYPE_PKMN_FIGHTING           EQUS "FIGHTING"
+TYPE_PKMN_PSYCHIC            EQUS "PSYCHIC"
+TYPE_PKMN_COLORLESS          EQUS "COLORLESS"
+TYPE_PKMN_UNUSED             EQUS "UNUSED_TYPE"
+	const_def TYPE_PKMN_UNUSED + 1 - TYPE_PKMN_FIRE
+	const TYPE_ENERGY_FIRE              ; $8
+	const TYPE_ENERGY_GRASS             ; $9
+	const TYPE_ENERGY_LIGHTNING         ; $A
+	const TYPE_ENERGY_WATER             ; $B
+	const TYPE_ENERGY_FIGHTING          ; $C
+	const TYPE_ENERGY_PSYCHIC           ; $D
+	const TYPE_ENERGY_DOUBLE_COLORLESS  ; $E
+	const TYPE_ENERGY_UNUSED            ; $F
+	const TYPE_TRAINER                  ; $10
+	const TYPE_TRAINER_UNUSED           ; $11
+NUM_CARD_TYPES EQU const_value + -1
+
+TYPE_ENERGY_F EQU 3
 
 ;;; rarity
 CIRCLE    EQU $0
@@ -35,7 +47,7 @@ DIAMOND   EQU $1
 STAR      EQU $2
 PROMOSTAR EQU $FF
 
-;;; set
+;;; set 1
 COLOSSEUM   EQU $00
 EVOLUTION   EQU $10
 MYSTERY     EQU $20
@@ -43,7 +55,7 @@ LABORATORY  EQU $30
 PROMOTIONAL EQU $40
 ENERGY      EQU $50
 
-NONE   EQU $0
+;;; set 2
 JUNGLE EQU $1
 FOSSIL EQU $2
 GB     EQU $7
diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm
index 9f2198b..d6e5b1a 100755
--- a/src/constants/deck_constants.asm
+++ b/src/constants/deck_constants.asm
@@ -1,57 +1,57 @@
-UNNAMED_DECK_DECK           EQU $00
-UNNAMED_DECK_DECK2          EQU $01
-SAMS_PRACTICE_DECK          EQU $02
-PRACTICE_PLAYER_DECK        EQU $03
-SAMS_NORMAL_DECK            EQU $04
-CHARMANDER_AND_FRIENDS_DECK EQU $05
-CHARMANDER_EXTRA_DECK       EQU $06
-SQUIRTLE_AND_FRIENDS_DECK   EQU $07
-SQUIRTLE_EXTRA_DECK         EQU $08
-BULBASAUR_AND_FRIENDS_DECK  EQU $09
-BULBASAUR_EXTRA_DECK        EQU $0A
-LIGHTNING_AND_FIRE_DECK     EQU $0B
-WATER_AND_FIGHTING_DECK     EQU $0C
-GRASS_AND_PSYCHIC_DECK      EQU $0D
-LEGENDARY_MOLTRES_DECK      EQU $0E
-LEGENDARY_ZAPDOS_DECK       EQU $0F
-LEGENDARY_ARTICUNO_DECK     EQU $10
-LEGENDARY_DRAGONITE_DECK    EQU $11
-FIRST_STRIKE_DECK           EQU $12
-ROCK_CRUSHER_DECK           EQU $13
-GO_GO_RAIN_DANCE_DECK       EQU $14
-ZAPPING_SELFDESTRUCT_DECK   EQU $15
-FLOWER_POWER_DECK           EQU $16
-STRANGE_PSYSHOCK_DECK       EQU $17
-WONDERS_OF_SCIENCE_DECK     EQU $18
-FIRE_CHARGE_DECK            EQU $19
-IM_RONALD_DECK              EQU $1A
-POWERFUL_RONALD_DECK        EQU $1B
-INVINCIBLE_RONALD_DECK      EQU $1C
-LEGENDARY_RONALD_DECK       EQU $1D
-MUSCLES_FOR_BRAINS_DECK     EQU $1E
-HEATED_BATTLE_DECK          EQU $1F
-LOVE_TO_BATTLE_DECK         EQU $20
-EXCAVATION_DECK             EQU $21
-BLISTERING_POKEMON_DECK     EQU $22
-HARD_POKEMON_DECK           EQU $23
-WATERFRONT_POKEMON_DECK     EQU $24
-LONELY_FRIENDS_DECK         EQU $25
-SOUND_OF_THE_WAVES_DECK     EQU $26
-PIKACHU_DECK                EQU $27
-BOOM_BOOM_SELFDESTRUCT_DECK EQU $28
-POWER_GENERATOR_DECK        EQU $29
-ETCETERA_DECK               EQU $2A
-FLOWER_GARDEN_DECK          EQU $2B
-KALEIDOSCOPE_DECK           EQU $2C
-GHOST_DECK                  EQU $2D
-NAP_TIME_DECK               EQU $2E
-STRANGE_POWER_DECK          EQU $2F
-FLYIN_POKEMON_DECK          EQU $30
-LOVELY_NIDORAN_DECK         EQU $31
-POISON_DECK                 EQU $32
-ANGER_DECK                  EQU $33
-FLAMETHROWER_DECK           EQU $34
-RESHUFFLE_DECK              EQU $35
-IMAKUNI_DECK                EQU $36
-
-NUMBER_OF_DECKS             EQU $36
+	const_def
+	const UNNAMED_DECK                ; $00
+	const UNNAMED_DECK_2              ; $01
+	const SAMS_PRACTICE_DECK          ; $02
+	const PRACTICE_PLAYER_DECK        ; $03
+	const SAMS_NORMAL_DECK            ; $04
+	const CHARMANDER_AND_FRIENDS_DECK ; $05
+	const CHARMANDER_EXTRA_DECK       ; $06
+	const SQUIRTLE_AND_FRIENDS_DECK   ; $07
+	const SQUIRTLE_EXTRA_DECK         ; $08
+	const BULBASAUR_AND_FRIENDS_DECK  ; $09
+	const BULBASAUR_EXTRA_DECK        ; $0A
+	const LIGHTNING_AND_FIRE_DECK     ; $0B
+	const WATER_AND_FIGHTING_DECK     ; $0C
+	const GRASS_AND_PSYCHIC_DECK      ; $0D
+	const LEGENDARY_MOLTRES_DECK      ; $0E
+	const LEGENDARY_ZAPDOS_DECK       ; $0F
+	const LEGENDARY_ARTICUNO_DECK     ; $10
+	const LEGENDARY_DRAGONITE_DECK    ; $11
+	const FIRST_STRIKE_DECK           ; $12
+	const ROCK_CRUSHER_DECK           ; $13
+	const GO_GO_RAIN_DANCE_DECK       ; $14
+	const ZAPPING_SELFDESTRUCT_DECK   ; $15
+	const FLOWER_POWER_DECK           ; $16
+	const STRANGE_PSYSHOCK_DECK       ; $17
+	const WONDERS_OF_SCIENCE_DECK     ; $18
+	const FIRE_CHARGE_DECK            ; $19
+	const IM_RONALD_DECK              ; $1A
+	const POWERFUL_RONALD_DECK        ; $1B
+	const INVINCIBLE_RONALD_DECK      ; $1C
+	const LEGENDARY_RONALD_DECK       ; $1D
+	const MUSCLES_FOR_BRAINS_DECK     ; $1E
+	const HEATED_BATTLE_DECK          ; $1F
+	const LOVE_TO_BATTLE_DECK         ; $20
+	const EXCAVATION_DECK             ; $21
+	const BLISTERING_POKEMON_DECK     ; $22
+	const HARD_POKEMON_DECK           ; $23
+	const WATERFRONT_POKEMON_DECK     ; $24
+	const LONELY_FRIENDS_DECK         ; $25
+	const SOUND_OF_THE_WAVES_DECK     ; $26
+	const PIKACHU_DECK                ; $27
+	const BOOM_BOOM_SELFDESTRUCT_DECK ; $28
+	const POWER_GENERATOR_DECK        ; $29
+	const ETCETERA_DECK               ; $2A
+	const FLOWER_GARDEN_DECK          ; $2B
+	const KALEIDOSCOPE_DECK           ; $2C
+	const GHOST_DECK                  ; $2D
+	const NAP_TIME_DECK               ; $2E
+	const STRANGE_POWER_DECK          ; $2F
+	const FLYIN_POKEMON_DECK          ; $30
+	const LOVELY_NIDORAN_DECK         ; $31
+	const POISON_DECK                 ; $32
+	const ANGER_DECK                  ; $33
+	const FLAMETHROWER_DECK           ; $34
+	const RESHUFFLE_DECK              ; $35
+	const IMAKUNI_DECK                ; $36
+DECKS_END EQU const_value + -1
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 104799d..ee964b3 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -1,3 +1,7 @@
+DECK_NAME_SIZE   EQU  24
+DECK_SIZE        EQU  60
+BENCH_SIZE       EQU   5
+
 PLAYER_TURN   EQUS "wPlayerDuelVariables >> $8"
 OPPONENT_TURN EQUS "wOpponentDuelVariables >> $8"
 
@@ -41,6 +45,7 @@ CARD_LOCATION_BENCH_2      EQU $12
 CARD_LOCATION_BENCH_3      EQU $13
 CARD_LOCATION_BENCH_4      EQU $14
 CARD_LOCATION_BENCH_5      EQU $15
+CARD_LOCATION_JUST_DRAWN   EQU $40
 
 ;;; duelist types
 DUELIST_TYPE_PLAYER   EQU $00
diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm
index c2e2388..4b74a29 100755
--- a/src/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
@@ -1,34 +1,35 @@
-OVERWORLD_MAP           EQU $00
-MASON_LABORATORY        EQU $01
-DECK_MACHINE_ROOM       EQU $02
-ISHIHARAS_HOUSE         EQU $03
-FIGHTING_CLUB_ENTRANCE  EQU $04
-FIGHTING_CLUB_LOBBY     EQU $05
-FIGHTING_CLUB           EQU $06
-ROCK_CLUB_ENTRANCE      EQU $07
-ROCK_CLUB_LOBBY         EQU $08
-ROCK_CLUB               EQU $09
-WATER_CLUB_ENTRANCE     EQU $0A
-WATER_CLUB_LOBBY        EQU $0B
-WATER_CLUB              EQU $0C
-LIGHTNING_CLUB_ENTRANCE EQU $0D
-LIGHTNING_CLUB_LOBBY    EQU $0E
-LIGHTNING_CLUB          EQU $0F
-GRASS_CLUB_ENTRANCE     EQU $10
-GRASS_CLUB_LOBBY        EQU $11
-GRASS_CLUB              EQU $12
-PSYCHIC_CLUB_ENTRANCE   EQU $13
-PSYCHIC_CLUB_LOBBY      EQU $14
-PSYCHIC_CLUB            EQU $15
-SCIENCE_CLUB_ENTRANCE   EQU $16
-SCIENCE_CLUB_LOBBY      EQU $17
-SCIENCE_CLUB            EQU $18
-FIRE_CLUB_ENTRANCE      EQU $19
-FIRE_CLUB_LOBBY         EQU $1A
-FIRE_CLUB               EQU $1B
-CHALLENGE_HALL_ENTRANCE EQU $1C
-CHALLENGE_HALL_LOBBY    EQU $1D
-CHALLENGE_HALL          EQU $1E
-POKEMON_DOME_ENTRANCE   EQU $1F
-POKEMON_DOME            EQU $20
-HALL_OF_HONOR           EQU $21
+	const_def
+	const OVERWORLD_MAP           ; $00
+	const MASON_LABORATORY        ; $01
+	const DECK_MACHINE_ROOM       ; $02
+	const ISHIHARAS_HOUSE         ; $03
+	const FIGHTING_CLUB_ENTRANCE  ; $04
+	const FIGHTING_CLUB_LOBBY     ; $05
+	const FIGHTING_CLUB           ; $06
+	const ROCK_CLUB_ENTRANCE      ; $07
+	const ROCK_CLUB_LOBBY         ; $08
+	const ROCK_CLUB               ; $09
+	const WATER_CLUB_ENTRANCE     ; $0A
+	const WATER_CLUB_LOBBY        ; $0B
+	const WATER_CLUB              ; $0C
+	const LIGHTNING_CLUB_ENTRANCE ; $0D
+	const LIGHTNING_CLUB_LOBBY    ; $0E
+	const LIGHTNING_CLUB          ; $0F
+	const GRASS_CLUB_ENTRANCE     ; $10
+	const GRASS_CLUB_LOBBY        ; $11
+	const GRASS_CLUB              ; $12
+	const PSYCHIC_CLUB_ENTRANCE   ; $13
+	const PSYCHIC_CLUB_LOBBY      ; $14
+	const PSYCHIC_CLUB            ; $15
+	const SCIENCE_CLUB_ENTRANCE   ; $16
+	const SCIENCE_CLUB_LOBBY      ; $17
+	const SCIENCE_CLUB            ; $18
+	const FIRE_CLUB_ENTRANCE      ; $19
+	const FIRE_CLUB_LOBBY         ; $1A
+	const FIRE_CLUB               ; $1B
+	const CHALLENGE_HALL_ENTRANCE ; $1C
+	const CHALLENGE_HALL_LOBBY    ; $1D
+	const CHALLENGE_HALL          ; $1E
+	const POKEMON_DOME_ENTRANCE   ; $1F
+	const POKEMON_DOME            ; $20
+	const HALL_OF_HONOR           ; $21
diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm
index 11693b4..422fda4 100644
--- a/src/constants/misc_constants.asm
+++ b/src/constants/misc_constants.asm
@@ -1,3 +1,11 @@
+; screen size
+SCREEN_WIDTH  EQU 20 ; tiles
+SCREEN_HEIGHT EQU 18 ; tiles
+
+; background map size
+BG_MAP_WIDTH  EQU 32 ; tiles
+BG_MAP_HEIGHT EQU 32 ; tiles
+
 ; console types (for wConsole)
 CONSOLE_DMG EQU $00
 CONSOLE_SGB EQU $01
diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm
index a4c2526..ebcd75f 100755
--- a/src/constants/music_constants.asm
+++ b/src/constants/music_constants.asm
@@ -1,31 +1,32 @@
-MUSIC_STOP          EQU $00
-MUSIC_TITLESCREEN   EQU $01
-MUSIC_DUELTHEME1    EQU $02
-MUSIC_DUELTHEME2    EQU $03
-MUSIC_DUELTHEME3    EQU $04
-MUSIC_PAUSEMENU     EQU $05
-MUSIC_PCMAINMENU    EQU $06
-MUSIC_DECKMACHINE   EQU $07
-MUSIC_CARDPOP       EQU $08
-MUSIC_OVERWORLD     EQU $09
-MUSIC_POKEMONDOME   EQU $0A
-MUSIC_CHALLENGEHALL EQU $0B
-MUSIC_CLUB1         EQU $0C
-MUSIC_CLUB2         EQU $0D
-MUSIC_CLUB3         EQU $0E
-MUSIC_RONALD        EQU $0F
-MUSIC_IMAKUNI       EQU $10
-MUSIC_HALLOFHONOR   EQU $11
-MUSIC_CREDITS       EQU $12
-;MUSIC_UNUSED13     EQU $13
-;MUSIC_UNUSED14     EQU $14
-MUSIC_MATCHSTART1   EQU $15
-MUSIC_MATCHSTART2   EQU $16
-MUSIC_MATCHSTART3   EQU $17
-MUSIC_MATCHVICTORY  EQU $18
-MUSIC_MATCHLOSS     EQU $19
-MUSIC_DARKDIDDLY    EQU $1A
-;MUSIC_UNUSED1B     EQU $1B
-MUSIC_BOOSTERPACK   EQU $1C
-MUSIC_MEDAL         EQU $1D
-;MUSIC_UNUSED1E     EQU $1E
+	const_def
+	const MUSIC_STOP          ; $00
+	const MUSIC_TITLESCREEN   ; $01
+	const MUSIC_DUELTHEME1    ; $02
+	const MUSIC_DUELTHEME2    ; $03
+	const MUSIC_DUELTHEME3    ; $04
+	const MUSIC_PAUSEMENU     ; $05
+	const MUSIC_PCMAINMENU    ; $06
+	const MUSIC_DECKMACHINE   ; $07
+	const MUSIC_CARDPOP       ; $08
+	const MUSIC_OVERWORLD     ; $09
+	const MUSIC_POKEMONDOME   ; $0A
+	const MUSIC_CHALLENGEHALL ; $0B
+	const MUSIC_CLUB1         ; $0C
+	const MUSIC_CLUB2         ; $0D
+	const MUSIC_CLUB3         ; $0E
+	const MUSIC_RONALD        ; $0F
+	const MUSIC_IMAKUNI       ; $10
+	const MUSIC_HALLOFHONOR   ; $11
+	const MUSIC_CREDITS       ; $12
+	const MUSIC_UNUSED_13     ; $13
+	const MUSIC_UNUSED_14     ; $14
+	const MUSIC_MATCHSTART1   ; $15
+	const MUSIC_MATCHSTART2   ; $16
+	const MUSIC_MATCHSTART3   ; $17
+	const MUSIC_MATCHVICTORY  ; $18
+	const MUSIC_MATCHLOSS     ; $19
+	const MUSIC_DARKDIDDLY    ; $1A
+	const MUSIC_UNUSED_1B     ; $1B
+	const MUSIC_BOOSTERPACK   ; $1C
+	const MUSIC_MEDAL         ; $1D
+	const MUSIC_UNUSED_1E     ; $1E
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index 58b137a..f4972dc 100755
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -1,44 +1,45 @@
-PLAYER_PIC    EQU $01
-RONALD_PIC    EQU $02
-SAM_PIC       EQU $03
-IMAKUNI_PIC   EQU $04
-NIKKI_PIC     EQU $05
-RICK_PIC      EQU $06
-KEN_PIC       EQU $07
-AMY_PIC       EQU $08
-ISAAC_PIC     EQU $09
-MITCH_PIC     EQU $0A
-GENE_PIC      EQU $0B
-MURRAY_PIC    EQU $0C
-COURTNEY_PIC  EQU $0D
-STEVE_PIC     EQU $0E
-JACK_PIC      EQU $0F
-ROD_PIC       EQU $10
-JOSEPH_PIC    EQU $11
-DAVID_PIC     EQU $12
-ERIK_PIC      EQU $13
-JOHN_PIC      EQU $14
-ADAM_PIC      EQU $15
-JONATHAN_PIC  EQU $16
-JOSHUA_PIC    EQU $17
-NICHOLAS_PIC  EQU $18
-BRANDON_PIC   EQU $19
-MATTHEW_PIC   EQU $1A
-RYAN_PIC      EQU $1B
-ANDREW_PIC    EQU $1C
-CHRIS_PIC     EQU $1D
-MICHAEL_PIC   EQU $1E
-DANIEL_PIC    EQU $1F
-ROBERT_PIC    EQU $20
-BRITTANY_PIC  EQU $21
-KRISTIN_PIC   EQU $22
-HEATHER_PIC   EQU $23
-SARA_PIC      EQU $24
-AMANDA_PIC    EQU $25
-JENNIFER_PIC  EQU $26
-JESSICA_PIC   EQU $27
-STEPHANIE_PIC EQU $28
-AARON_PIC     EQU $29
+	const_def 1
+	const PLAYER_PIC    ; $01
+	const RONALD_PIC    ; $02
+	const SAM_PIC       ; $03
+	const IMAKUNI_PIC   ; $04
+	const NIKKI_PIC     ; $05
+	const RICK_PIC      ; $06
+	const KEN_PIC       ; $07
+	const AMY_PIC       ; $08
+	const ISAAC_PIC     ; $09
+	const MITCH_PIC     ; $0A
+	const GENE_PIC      ; $0B
+	const MURRAY_PIC    ; $0C
+	const COURTNEY_PIC  ; $0D
+	const STEVE_PIC     ; $0E
+	const JACK_PIC      ; $0F
+	const ROD_PIC       ; $10
+	const JOSEPH_PIC    ; $11
+	const DAVID_PIC     ; $12
+	const ERIK_PIC      ; $13
+	const JOHN_PIC      ; $14
+	const ADAM_PIC      ; $15
+	const JONATHAN_PIC  ; $16
+	const JOSHUA_PIC    ; $17
+	const NICHOLAS_PIC  ; $18
+	const BRANDON_PIC   ; $19
+	const MATTHEW_PIC   ; $1A
+	const RYAN_PIC      ; $1B
+	const ANDREW_PIC    ; $1C
+	const CHRIS_PIC     ; $1D
+	const MICHAEL_PIC   ; $1E
+	const DANIEL_PIC    ; $1F
+	const ROBERT_PIC    ; $20
+	const BRITTANY_PIC  ; $21
+	const KRISTIN_PIC   ; $22
+	const HEATHER_PIC   ; $23
+	const SARA_PIC      ; $24
+	const AMANDA_PIC    ; $25
+	const JENNIFER_PIC  ; $26
+	const JESSICA_PIC   ; $27
+	const STEPHANIE_PIC ; $28
+	const AARON_PIC     ; $29
 
-SARA          EQU $1f
-AMANDA        EQU $20
+SARA   EQU $1F
+AMANDA EQU $20
diff --git a/src/constants/overworld_script_constants.asm b/src/constants/overworld_script_constants.asm
index fed849d..167537c 100755
--- a/src/constants/overworld_script_constants.asm
+++ b/src/constants/overworld_script_constants.asm
@@ -1,111 +1,109 @@
-start_script EQUS "rst $20"
-
-OWScript_EndScriptLoop1_index         EQU $00
-OWScript_CloseTextBox_index           EQU $01
-OWScript_PrintTextString_index        EQU $02
-Func_ccdc_index                       EQU $03
-OWScript_AskQuestionJump_index        EQU $04
-OWScript_StartBattle_index            EQU $05
-Func_cd83_index                       EQU $06
-Func_cda8_index                       EQU $07
-OWScript_PrintTextCloseBox_index      EQU $08
-Func_cdcb_index                       EQU $09
-Func_ce26_index                       EQU $0a
-Func_ce84_index                       EQU $0b
-OWScript_GiveBoosterPacks_index       EQU $0c
-Func_cf0c_index                       EQU $0d
-Func_cf12_index                       EQU $0e
-Func_cf3f_index                       EQU $0f
-Func_cf4c_index                       EQU $10
-Func_cf53_index                       EQU $11
-Func_cf7b_index                       EQU $12
-Func_cf2d_index                       EQU $13
-Func_cf96_index                       EQU $14
-Func_cfc6_index                       EQU $15
-Func_cfd4_index                       EQU $16
-Func_d00b_index                       EQU $17
-Func_d025_index                       EQU $18
-Func_d032_index                       EQU $19
-Func_d03f_index                       EQU $1a
-OWScript_ScriptJump_index             EQU $1b
-Func_d04f_index                       EQU $1c
-Func_d055_index                       EQU $1d
-OWScript_MovePlayer_index             EQU $1e
-Func_cee2_index                       EQU $1f
-Func_d080_index                       EQU $20
-Func_d088_index                       EQU $21
-Func_d095_index                       EQU $22
-Func_d0be_index                       EQU $23
-Func_d0ce_index                       EQU $24
-Func_d0d9_index                       EQU $25
-Func_d0f2_index                       EQU $26
-Func_ce4a_index                       EQU $27
-Func_ceba_index                       EQU $28
-Func_d103_index                       EQU $29
-Func_d125_index                       EQU $2a
-Func_d135_index                       EQU $2b
-Func_d16b_index                       EQU $2c
-Func_cd4f_index                       EQU $2d
-Func_cd94_index                       EQU $2e
-Func_ce52_index                       EQU $2f
-Func_cdd8_index                       EQU $30
-Func_cdf5_index                       EQU $31
-Func_d195_index                       EQU $32
-Func_d1ad_index                       EQU $33
-Func_d1b3_index                       EQU $34
-OWScript_EndScriptCloseText_index     EQU $35
-Func_d244_index                       EQU $36
-Func_d24c_index                       EQU $37
-DeckMachine_d336_index                EQU $38
-Func_d271_index                       EQU $39
-Func_d36d_index                       EQU $3a
-Func_ce6f_index                       EQU $3b
-Func_d209_index                       EQU $3c
-Func_d38f_index                       EQU $3d
-Func_d396_index                       EQU $3e
-Func_cd76_index                       EQU $3f
-Func_d39d_index                       EQU $40
-Func_d3b9_index                       EQU $41
-Func_d3c9_index                       EQU $42
-Func_d3d1_index                       EQU $43
-Func_d3d4_index                       EQU $44
-Func_d3e0_index                       EQU $45
-Func_d3fe_index                       EQU $46
-Func_d408_index                       EQU $47
-Func_d40f_index                       EQU $48
-Func_d416_index                       EQU $49
-Func_d423_index                       EQU $4a
-Func_d429_index                       EQU $4b
-Func_d41d_index                       EQU $4c
-Func_d42f_index                       EQU $4d
-Func_d435_index                       EQU $4e
-Func_cce4_index                       EQU $4f
-Func_d2f6_index                       EQU $50
-Func_d317_index                       EQU $51
-Func_d43d_index                       EQU $52
-OWScript_EndScriptLoop2_index         EQU $53
-OWScript_EndScriptLoop3_index         EQU $54
-OWScript_EndScriptLoop4_index         EQU $55
-OWScript_EndScriptLoop5_index         EQU $56
-OWScript_EndScriptLoop6_index         EQU $57
-OWScript_CustomModifyEventFlags_index EQU $58
-Func_d460_index                       EQU $59
-OWScript_JumpIfFlagSet_index          EQU $5a
-Func_d484_index                       EQU $5b
-Func_d49e_index                       EQU $5c
-Func_d4a6_index                       EQU $5d
-Func_d4ae_index                       EQU $5e
-OWScript_SetEventFlags_index          EQU $5f
-Func_d4c3_index                       EQU $60
-Func_d4ca_index                       EQU $61
-OWScript_JumpIfFlagNotSet_index       EQU $62
-Func_d452_index                       EQU $63
-OWScript_EndScriptLoop7_index         EQU $64
-OWScript_EndScriptLoop8_index         EQU $65
-OWScript_EndScriptLoop9_index         EQU $66
-OWScript_EndScriptLoop10_index        EQU $67
+	const_def
+	const OWScript_EndScriptLoop1_index         ; $00
+	const OWScript_CloseTextBox_index           ; $01
+	const OWScript_PrintTextString_index        ; $02
+	const Func_ccdc_index                       ; $03
+	const OWScript_AskQuestionJump_index        ; $04
+	const OWScript_StartBattle_index            ; $05
+	const Func_cd83_index                       ; $06
+	const Func_cda8_index                       ; $07
+	const OWScript_PrintTextCloseBox_index      ; $08
+	const Func_cdcb_index                       ; $09
+	const Func_ce26_index                       ; $0a
+	const Func_ce84_index                       ; $0b
+	const OWScript_GiveBoosterPacks_index       ; $0c
+	const Func_cf0c_index                       ; $0d
+	const Func_cf12_index                       ; $0e
+	const Func_cf3f_index                       ; $0f
+	const Func_cf4c_index                       ; $10
+	const Func_cf53_index                       ; $11
+	const Func_cf7b_index                       ; $12
+	const Func_cf2d_index                       ; $13
+	const Func_cf96_index                       ; $14
+	const Func_cfc6_index                       ; $15
+	const Func_cfd4_index                       ; $16
+	const Func_d00b_index                       ; $17
+	const Func_d025_index                       ; $18
+	const Func_d032_index                       ; $19
+	const Func_d03f_index                       ; $1a
+	const OWScript_ScriptJump_index             ; $1b
+	const Func_d04f_index                       ; $1c
+	const Func_d055_index                       ; $1d
+	const OWScript_MovePlayer_index             ; $1e
+	const Func_cee2_index                       ; $1f
+	const Func_d080_index                       ; $20
+	const Func_d088_index                       ; $21
+	const Func_d095_index                       ; $22
+	const Func_d0be_index                       ; $23
+	const Func_d0ce_index                       ; $24
+	const Func_d0d9_index                       ; $25
+	const Func_d0f2_index                       ; $26
+	const Func_ce4a_index                       ; $27
+	const Func_ceba_index                       ; $28
+	const Func_d103_index                       ; $29
+	const Func_d125_index                       ; $2a
+	const Func_d135_index                       ; $2b
+	const Func_d16b_index                       ; $2c
+	const Func_cd4f_index                       ; $2d
+	const Func_cd94_index                       ; $2e
+	const Func_ce52_index                       ; $2f
+	const Func_cdd8_index                       ; $30
+	const Func_cdf5_index                       ; $31
+	const Func_d195_index                       ; $32
+	const Func_d1ad_index                       ; $33
+	const Func_d1b3_index                       ; $34
+	const OWScript_EndScriptCloseText_index     ; $35
+	const Func_d244_index                       ; $36
+	const Func_d24c_index                       ; $37
+	const DeckMachine_d336_index                ; $38
+	const Func_d271_index                       ; $39
+	const Func_d36d_index                       ; $3a
+	const Func_ce6f_index                       ; $3b
+	const Func_d209_index                       ; $3c
+	const Func_d38f_index                       ; $3d
+	const Func_d396_index                       ; $3e
+	const Func_cd76_index                       ; $3f
+	const Func_d39d_index                       ; $40
+	const Func_d3b9_index                       ; $41
+	const Func_d3c9_index                       ; $42
+	const Func_d3d1_index                       ; $43
+	const Func_d3d4_index                       ; $44
+	const Func_d3e0_index                       ; $45
+	const Func_d3fe_index                       ; $46
+	const Func_d408_index                       ; $47
+	const Func_d40f_index                       ; $48
+	const Func_d416_index                       ; $49
+	const Func_d423_index                       ; $4a
+	const Func_d429_index                       ; $4b
+	const Func_d41d_index                       ; $4c
+	const Func_d42f_index                       ; $4d
+	const Func_d435_index                       ; $4e
+	const Func_cce4_index                       ; $4f
+	const Func_d2f6_index                       ; $50
+	const Func_d317_index                       ; $51
+	const Func_d43d_index                       ; $52
+	const OWScript_EndScriptLoop2_index         ; $53
+	const OWScript_EndScriptLoop3_index         ; $54
+	const OWScript_EndScriptLoop4_index         ; $55
+	const OWScript_EndScriptLoop5_index         ; $56
+	const OWScript_EndScriptLoop6_index         ; $57
+	const OWScript_CustomModifyEventFlags_index ; $58
+	const Func_d460_index                       ; $59
+	const OWScript_JumpIfFlagSet_index          ; $5a
+	const Func_d484_index                       ; $5b
+	const Func_d49e_index                       ; $5c
+	const Func_d4a6_index                       ; $5d
+	const Func_d4ae_index                       ; $5e
+	const OWScript_SetEventFlags_index          ; $5f
+	const Func_d4c3_index                       ; $60
+	const Func_d4ca_index                       ; $61
+	const OWScript_JumpIfFlagNotSet_index       ; $62
+	const Func_d452_index                       ; $63
+	const OWScript_EndScriptLoop7_index         ; $64
+	const OWScript_EndScriptLoop8_index         ; $65
+	const OWScript_EndScriptLoop9_index         ; $66
+	const OWScript_EndScriptLoop10_index        ; $67
 
 ; Script Flags
 FLAG_BEAT_SARA      EQU $15
 FLAG_BEAT_AMANDA    EQU $16
-
diff --git a/src/constants/sgb_constants.asm b/src/constants/sgb_constants.asm
index beb69b6..e956881 100644
--- a/src/constants/sgb_constants.asm
+++ b/src/constants/sgb_constants.asm
@@ -8,12 +8,12 @@ ATTR_DIV EQU $06 ; "Divide" Area Designation Mode
 ATTR_CHR EQU $07 ; "1CHR" Area Designation Mode
 SOUND    EQU $08 ; Sound On/Off
 SOU_TRN  EQU $09 ; Transfer Sound PRG/DATA
-PAL_SET  EQU $0A ; Set SGB Palette Indirect
-PAL_TRN  EQU $0B ; Set System Color Palette Data
-ATRC_EN  EQU $0C ; Enable/disable Attraction Mode
-TEST_EN  EQU $0D ; Speed Function
-ICON_EN  EQU $0E ; SGB Function
-DATA_SND EQU $0F ; SUPER NES WRAM Transfer 1
+PAL_SET  EQU $0a ; Set SGB Palette Indirect
+PAL_TRN  EQU $0b ; Set System Color Palette Data
+ATRC_EN  EQU $0c ; Enable/disable Attraction Mode
+TEST_EN  EQU $0d ; Speed Function
+ICON_EN  EQU $0e ; SGB Function
+DATA_SND EQU $0f ; SUPER NES WRAM Transfer 1
 DATA_TRN EQU $10 ; SUPER NES WRAM Transfer 2
 MLT_REQ  EQU $11 ; Controller 2 Request
 JUMP     EQU $12 ; Set SNES Program Counter