summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/data/booster_packs.asm4
-rw-r--r--src/data/map_headers.asm66
-rw-r--r--src/data/move_animations.asm2
-rw-r--r--src/engine/booster_packs.asm12
-rw-r--r--src/engine/home.asm14
-rw-r--r--src/gfx.asm8
-rw-r--r--src/macros/scripts.asm206
-rw-r--r--src/macros/text.asm6
-rw-r--r--src/wram.asm2
9 files changed, 160 insertions, 160 deletions
diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
index 7d1090c..8524ca6 100644
--- a/src/data/booster_packs.asm
+++ b/src/data/booster_packs.asm
@@ -37,7 +37,7 @@ BoosterPack_ColosseumNeutral:: ; 1e4e4 (7:64e4)
BoosterPack_ColosseumGrass:: ; 1e4f0 (7:64f0)
booster_set COLOSSEUM ; booster pack set
- dw GRASS_ENERGY ; energy or energy generation function
+ dw GRASS_ENERGY ; energy or energy generation function
; Card Type Chances
db 48 ; Grass Type Chance
@@ -52,7 +52,7 @@ BoosterPack_ColosseumGrass:: ; 1e4f0 (7:64f0)
BoosterPack_ColosseumFire:: ; 1e4fc (7:64fc)
booster_set COLOSSEUM ; booster pack set
- dw FIRE_ENERGY ; energy or energy generation function
+ dw FIRE_ENERGY ; energy or energy generation function
; Card Type Chances
db 16 ; Grass Type Chance
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
index 7f57a06..06a2e20 100644
--- a/src/data/map_headers.asm
+++ b/src/data/map_headers.asm
@@ -1,37 +1,37 @@
; TODO: figure out the rest of the data for each map
; related to the table at 20:4e5d
MapHeaders: ; 1c374 (7:4374)
- db $00,$01,$00,$01,$01,MUSIC_OVERWORLD ; OVERWORLD_MAP
- db $02,$03,$00,$02,$02,MUSIC_OVERWORLD ; MASON_LABORATORY
- db $06,$07,$00,$02,$02,MUSIC_OVERWORLD ; DECK_MACHINE_ROOM
- db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD ; ISHIHARAS_HOUSE
- db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY
- db $20,$21,$00,$04,$0D,MUSIC_CLUB_3 ; FIGHTING_CLUB
- db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY
- db $22,$23,$00,$04,$0E,MUSIC_CLUB_2 ; ROCK_CLUB
- db $10,$11,$00,$03,$06,MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; WATER_CLUB_LOBBY
- db $24,$25,$00,$02,$0F,MUSIC_CLUB_2 ; WATER_CLUB
- db $12,$13,$00,$03,$07,MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY
- db $26,$27,$00,$05,$10,MUSIC_CLUB_1 ; LIGHTNING_CLUB
- db $14,$15,$00,$03,$08,MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY
- db $28,$29,$00,$06,$11,MUSIC_CLUB_1 ; GRASS_CLUB
- db $16,$17,$00,$03,$09,MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY
- db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2 ; PSYCHIC_CLUB
- db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY
- db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3 ; SCIENCE_CLUB
- db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY
- db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3 ; FIRE_CLUB
- db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE
- db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY
- db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL
- db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE
- db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME ; POKEMON_DOME
+ db $00,$01,$00,$01,$01,MUSIC_OVERWORLD ; OVERWORLD_MAP
+ db $02,$03,$00,$02,$02,MUSIC_OVERWORLD ; MASON_LABORATORY
+ db $06,$07,$00,$02,$02,MUSIC_OVERWORLD ; DECK_MACHINE_ROOM
+ db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD ; ISHIHARAS_HOUSE
+ db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY
+ db $20,$21,$00,$04,$0D,MUSIC_CLUB_3 ; FIGHTING_CLUB
+ db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY
+ db $22,$23,$00,$04,$0E,MUSIC_CLUB_2 ; ROCK_CLUB
+ db $10,$11,$00,$03,$06,MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; WATER_CLUB_LOBBY
+ db $24,$25,$00,$02,$0F,MUSIC_CLUB_2 ; WATER_CLUB
+ db $12,$13,$00,$03,$07,MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY
+ db $26,$27,$00,$05,$10,MUSIC_CLUB_1 ; LIGHTNING_CLUB
+ db $14,$15,$00,$03,$08,MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY
+ db $28,$29,$00,$06,$11,MUSIC_CLUB_1 ; GRASS_CLUB
+ db $16,$17,$00,$03,$09,MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY
+ db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2 ; PSYCHIC_CLUB
+ db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY
+ db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3 ; SCIENCE_CLUB
+ db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY
+ db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3 ; FIRE_CLUB
+ db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE
+ db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY
+ db $30,$31,$00,$09,$15,MUSIC_OVERWORLD ; CHALLENGE_HALL
+ db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE
+ db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME ; POKEMON_DOME
db $3A,$3B,$00,$0A,$18,MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/data/move_animations.asm b/src/data/move_animations.asm
index f774afa..9ead157 100644
--- a/src/data/move_animations.asm
+++ b/src/data/move_animations.asm
@@ -167,7 +167,7 @@ PointerTable_MoveAnimation:
dw MoveAnimation_5673
dw MoveAnimation_5673
-MoveAnimation_52c6: ; (6:52c6)
+MoveAnimation_52c6: ; (6:52c6)
anim_player ANIM_SPELL_MOVE
anim_opponent ANIM_GET_HIT
anim_normal ANIM_SHAKE1
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index a799d71..238a8b2 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -164,7 +164,7 @@ GetBoosterCardType: ; 1e2a0 (7:62a0)
pop hl
ret
-CardTypeTable: ; 1e2b1 (7:62b1)
+CardTypeTable: ; 1e2b1 (7:62b1)
db BOOSTER_CARD_TYPE_FIRE ; TYPE_PKMN_FIRE
db BOOSTER_CARD_TYPE_GRASS ; TYPE_PKMN_GRASS
db BOOSTER_CARD_TYPE_LIGHTNING ; TYPE_PKMN_LIGHTNING
@@ -344,7 +344,7 @@ GenerateRandomEnergy: ; 1e387 (7:6387)
jr AddBoosterEnergyToDrawnEnergies
; generates a booster with 10 random energies
-GenerateRandomEnergyBooster: ; 1e390 (7:6390)
+GenerateRandomEnergyBooster: ; 1e390 (7:6390)
ld a, NUM_CARDS_IN_BOOSTER
.generate_energy_loop
push af
@@ -355,22 +355,22 @@ GenerateRandomEnergyBooster: ; 1e390 (7:6390)
jr ZeroBoosterRarityData
; generates a booster with 5 Lightning energies and 5 Fire energies
-GenerateEnergyBoosterLightningFire: ; 1e39c (7:639c)
+GenerateEnergyBoosterLightningFire: ; 1e39c (7:639c)
ld hl, EnergyBoosterLightningFireData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 Water energies and 5 Fighting energies
-GenerateEnergyBoosterWaterFighting: ; 1e3a1 (7:63a1)
+GenerateEnergyBoosterWaterFighting: ; 1e3a1 (7:63a1)
ld hl, EnergyBoosterWaterFightingData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 Grass energies and 5 Psychic energies
-GenerateEnergyBoosterGrassPsychic: ; 1e3a6 (7:63a6)
+GenerateEnergyBoosterGrassPsychic: ; 1e3a6 (7:63a6)
ld hl, EnergyBoosterGrassPsychicData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 energies of 2 different types each
-GenerateTwoTypesEnergyBooster: ; 1e3ab (7:63ab)
+GenerateTwoTypesEnergyBooster: ; 1e3ab (7:63ab)
ld b, $02
.add_two_energies_to_booster_loop
ld c, NUM_CARDS_IN_BOOSTER / 2
diff --git a/src/engine/home.asm b/src/engine/home.asm
index cd9c9c9..0094924 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -653,7 +653,7 @@ EmptyScreen: ; 04a2 (0:04a2)
AttrBlkPacket_EmptyScreen: ; 04bf (0:04bf)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 0 << 2, 0, 0, 19, 17 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -1928,7 +1928,7 @@ Pal23Packet_0b00: ; 0b00 (0:0b00)
AttrBlkPacket_0b10: ; 0b10 (0:0b10)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 1 << 0 + 2 << 2, 5, 5, 10, 10 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -5830,7 +5830,7 @@ ColorizeTextBoxSGB: ; 1f1b (0:1f1b)
AttrBlkPacket_TextBox: ; 1f4f (0:1f4f)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 1 << 2, 0, 0, 0, 0 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -6182,7 +6182,7 @@ LoadSymbolsFont: ; 2119 (0:2119)
; if $4000 ≤ hl ≤ $7fff
; copy b tiles from Gfx2:hl to de
CopyFontsOrDuelGraphicsTiles: ; 2121 (0:2121)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld c, TILE_SIZE
call CopyGfxData
@@ -6240,7 +6240,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167)
; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.1bpp
LoadFullWidthFontTiles: ; 2189 (0:2189)
ld hl, FullWidthFonts + $3cc tiles_1bpp - $4000
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
push hl
ld e, l
@@ -6999,7 +6999,7 @@ ConvertTileNumberToTileDataAddress: ; 2518 (0:2518)
; create, at wTextTileBuffer, a full-width font tile given its
; within the full-width font graphics (FullWidthFonts) in hl
CreateFullWidthFontTile: ; 252e (0:252e)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld de, wTextTileBuffer
push de
@@ -8977,7 +8977,7 @@ LoadCardGfx: ; 2fa0 (0:2fa0)
; identical to CopyFontsOrDuelGraphicsTiles
CopyFontsOrDuelGraphicsTiles2: ; 2fcb (0:2fcb)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld c, TILE_SIZE
call CopyGfxData
diff --git a/src/gfx.asm b/src/gfx.asm
index e3b97cf..2cf2d77 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -910,16 +910,16 @@ FightingGfx: ; a8e12 (2a:4e12)
INCROM $a8e54, $ac000
SECTION "Gfx 13", ROMX
- INCROM $ac000, $b0000
+ INCROM $ac000, $b0000
SECTION "Gfx 14", ROMX
- INCROM $b0000, $b4000
+ INCROM $b0000, $b4000
SECTION "Gfx 15", ROMX
- INCROM $b4000, $b8000
+ INCROM $b4000, $b8000
SECTION "Gfx 16", ROMX
- INCROM $b8000, $bc000
+ INCROM $b8000, $bc000
SECTION "Card Gfx 1", ROMX
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index ed7b30d..3a2552e 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -14,107 +14,107 @@ ENDM
;ENDM
const_def
- const ScriptCommand_EndScriptLoop1_index ; $00
- const ScriptCommand_CloseAdvancedTextBox_index ; $01
- const ScriptCommand_PrintTextString_index ; $02
- const Func_ccdc_index ; $03
- const ScriptCommand_AskQuestionJump_index ; $04
- const ScriptCommand_StartBattle_index ; $05
- const ScriptCommand_PrintVariableText_index ; $06
- const Func_cda8_index ; $07
- const ScriptCommand_PrintTextQuitFully_index ; $08
- const Func_cdcb_index ; $09
- const ScriptCommand_MoveActiveNPCByDirection_index ; $0a
- const ScriptCommand_CloseTextBox_index ; $0b
- const ScriptCommand_GiveBoosterPacks_index ; $0c
- const ScriptCommand_CheckIfCardInCollectionOrDecks_index ; $0d
- const ScriptCommand_CheckIfCardInCollection_index ; $0e
- const ScriptCommand_GiveCard_index ; $0f
- const ScriptCommand_TakeCard_index ; $10
- const Func_cf53_index ; $11
- const Func_cf7b_index ; $12
- const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13
- const ScriptCommand_JumpBasedOnFightingClubPupilStatus_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 ScriptCommand_Jump_index ; $1b
- const ScriptCommand_TryGiveMedalPCPacks_index ; $1c
- const ScriptCommand_SetPlayerDirection_index ; $1d
- const ScriptCommand_MovePlayer_index ; $1e
- const ScriptCommand_ShowCardReceivedScreen_index ; $1f
- const ScriptCommand_SetDialogName_index ; $20
- const ScriptCommand_SetNextNPCandScript_index ; $21
- const Func_d095_index ; $22
- const Func_d0be_index ; $23
- const ScriptCommand_DoFrames_index ; $24
- const Func_d0d9_index ; $25
- const ScriptCommand_JumpIfPlayerCoordMatches_index ; $26
+ const ScriptCommand_EndScriptLoop1_index ; $00
+ const ScriptCommand_CloseAdvancedTextBox_index ; $01
+ const ScriptCommand_PrintTextString_index ; $02
+ const Func_ccdc_index ; $03
+ const ScriptCommand_AskQuestionJump_index ; $04
+ const ScriptCommand_StartBattle_index ; $05
+ const ScriptCommand_PrintVariableText_index ; $06
+ const Func_cda8_index ; $07
+ const ScriptCommand_PrintTextQuitFully_index ; $08
+ const Func_cdcb_index ; $09
+ const ScriptCommand_MoveActiveNPCByDirection_index ; $0a
+ const ScriptCommand_CloseTextBox_index ; $0b
+ const ScriptCommand_GiveBoosterPacks_index ; $0c
+ const ScriptCommand_CheckIfCardInCollectionOrDecks_index ; $0d
+ const ScriptCommand_CheckIfCardInCollection_index ; $0e
+ const ScriptCommand_GiveCard_index ; $0f
+ const ScriptCommand_TakeCard_index ; $10
+ const Func_cf53_index ; $11
+ const Func_cf7b_index ; $12
+ const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13
+ const ScriptCommand_JumpBasedOnFightingClubPupilStatus_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 ScriptCommand_Jump_index ; $1b
+ const ScriptCommand_TryGiveMedalPCPacks_index ; $1c
+ const ScriptCommand_SetPlayerDirection_index ; $1d
+ const ScriptCommand_MovePlayer_index ; $1e
+ const ScriptCommand_ShowCardReceivedScreen_index ; $1f
+ const ScriptCommand_SetDialogName_index ; $20
+ const ScriptCommand_SetNextNPCandScript_index ; $21
+ const Func_d095_index ; $22
+ const Func_d0be_index ; $23
+ const ScriptCommand_DoFrames_index ; $24
+ const Func_d0d9_index ; $25
+ const ScriptCommand_JumpIfPlayerCoordMatches_index ; $26
const ScriptCommand_MoveActiveNPC_index ; $27
- const ScriptCommand_GiveOneOfEachTrainerBooster_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 ScriptCommand_MoveWramNPC_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 ScriptCommand_QuitScriptFully_index ; $35
- const Func_d244_index ; $36
- const Func_d24c_index ; $37
- const ScriptCommand_OpenDeckMachine_index ; $38
- const Func_d271_index ; $39
- const ScriptCommand_EnterMap_index ; $3a
- const ScriptCommand_MoveArbitraryNPC_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 ScriptCommand_TryGivePCPack_index ; $42
- const ScriptCommand_nop_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 ScriptCommand_PlaySFX_index ; $49
- const ScriptCommand_PauseSong_index ; $4a
- const ScriptCommand_ResumeSong_index ; $4b
- const Func_d41d_index ; $4c
- const ScriptCommand_WaitForSongToFinish_index ; $4d
- const Func_d435_index ; $4e
- const ScriptCommand_AskQuestionJumpDefaultYes_index ; $4f
- const Func_d2f6_index ; $50
- const Func_d317_index ; $51
- const Func_d43d_index ; $52
- const ScriptCommand_EndScriptLoop2_index ; $53
- const ScriptCommand_EndScriptLoop3_index ; $54
- const ScriptCommand_EndScriptLoop4_index ; $55
- const ScriptCommand_EndScriptLoop5_index ; $56
- const ScriptCommand_EndScriptLoop6_index ; $57
- const ScriptCommand_SetFlagValue_index ; $58
- const ScriptCommand_JumpIfFlagZero1_index ; $59
- const ScriptCommand_JumpIfFlagNonzero1_index ; $5a
- const ScriptCommand_JumpIfFlagEqual_index ; $5b
- const ScriptCommand_JumpIfFlagNotEqual_index ; $5c
- const ScriptCommand_JumpIfFlagNotLessThan_index ; $5d
- const ScriptCommand_JumpIfFlagLessThan_index ; $5e
- const ScriptCommand_MaxOutFlagValue_index ; $5f
- const ScriptCommand_ZeroOutFlagValue_index ; $60
- const ScriptCommand_JumpIfFlagNonzero2_index ; $61
- const ScriptCommand_JumpIfFlagZero2_index ; $62
- const ScriptCommand_IncrementFlagValue_index ; $63
- const ScriptCommand_EndScriptLoop7_index ; $64
- const ScriptCommand_EndScriptLoop8_index ; $65
- const ScriptCommand_EndScriptLoop9_index ; $66
- const ScriptCommand_EndScriptLoop10_index ; $67
+ const ScriptCommand_GiveOneOfEachTrainerBooster_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 ScriptCommand_MoveWramNPC_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 ScriptCommand_QuitScriptFully_index ; $35
+ const Func_d244_index ; $36
+ const Func_d24c_index ; $37
+ const ScriptCommand_OpenDeckMachine_index ; $38
+ const Func_d271_index ; $39
+ const ScriptCommand_EnterMap_index ; $3a
+ const ScriptCommand_MoveArbitraryNPC_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 ScriptCommand_TryGivePCPack_index ; $42
+ const ScriptCommand_nop_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 ScriptCommand_PlaySFX_index ; $49
+ const ScriptCommand_PauseSong_index ; $4a
+ const ScriptCommand_ResumeSong_index ; $4b
+ const Func_d41d_index ; $4c
+ const ScriptCommand_WaitForSongToFinish_index ; $4d
+ const Func_d435_index ; $4e
+ const ScriptCommand_AskQuestionJumpDefaultYes_index ; $4f
+ const Func_d2f6_index ; $50
+ const Func_d317_index ; $51
+ const Func_d43d_index ; $52
+ const ScriptCommand_EndScriptLoop2_index ; $53
+ const ScriptCommand_EndScriptLoop3_index ; $54
+ const ScriptCommand_EndScriptLoop4_index ; $55
+ const ScriptCommand_EndScriptLoop5_index ; $56
+ const ScriptCommand_EndScriptLoop6_index ; $57
+ const ScriptCommand_SetFlagValue_index ; $58
+ const ScriptCommand_JumpIfFlagZero1_index ; $59
+ const ScriptCommand_JumpIfFlagNonzero1_index ; $5a
+ const ScriptCommand_JumpIfFlagEqual_index ; $5b
+ const ScriptCommand_JumpIfFlagNotEqual_index ; $5c
+ const ScriptCommand_JumpIfFlagNotLessThan_index ; $5d
+ const ScriptCommand_JumpIfFlagLessThan_index ; $5e
+ const ScriptCommand_MaxOutFlagValue_index ; $5f
+ const ScriptCommand_ZeroOutFlagValue_index ; $60
+ const ScriptCommand_JumpIfFlagNonzero2_index ; $61
+ const ScriptCommand_JumpIfFlagZero2_index ; $62
+ const ScriptCommand_IncrementFlagValue_index ; $63
+ const ScriptCommand_EndScriptLoop7_index ; $64
+ const ScriptCommand_EndScriptLoop8_index ; $65
+ const ScriptCommand_EndScriptLoop9_index ; $66
+ const ScriptCommand_EndScriptLoop10_index ; $67
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 2b29afe..bd33833 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -1,6 +1,6 @@
-text EQUS "db TX_HALFWIDTH, "
-line EQUS "db TX_LINE, "
-done EQUS "db TX_END"
+text EQUS "db TX_HALFWIDTH, "
+line EQUS "db TX_LINE, "
+done EQUS "db TX_END"
half2full EQUS "db TX_HALF2FULL"
diff --git a/src/wram.asm b/src/wram.asm
index ae6d10a..895074c 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1552,7 +1552,7 @@ wCoinTossScreenTextID:: ; ce4e
ds $2
; set to PLAYER_TURN in the "Your Play Area" screen
-; set to OPPONENT_TURN in the "Opp Play Area" screen
+; set to OPPONENT_TURN in the "Opp Play Area" screen
; alternates when drawing the "In Play Area" screen
wCheckMenuPlayAreaWhichDuelist:: ; ce50
ds $1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 16:35:44 +0000