70 files changed, 137 insertions, 87 deletions

diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm
index 18bf014..50bb03c 100644
--- a/src/constants/misc_constants.asm
+++ b/src/constants/misc_constants.asm
@@ -6,8 +6,11 @@ SCREEN_HEIGHT EQU 18 ; tiles
 BG_MAP_WIDTH  EQU 32 ; tiles
 BG_MAP_HEIGHT EQU 32 ; tiles
 
-; palettes
-CGB_PAL_SIZE EQU 8
+; cgb palette size
+CGB_PAL_SIZE EQU 8 ; bytes
+
+; tile size
+TILE_SIZE EQU 16 ; bytes
 
 ; console types (for wConsole)
 CONSOLE_DMG EQU $00
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 2d9e6f9..985418b 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -1,4 +1,5 @@
-Func_4000: ; 4000 (1:4000)
+; continuation of Bank0 Start
+Start_Cont: ; 4000 (1:4000)
 	di
 	ld sp, $e000
 	call ResetSerial
@@ -18,7 +19,7 @@ Func_4000: ; 4000 (1:4000)
 	cp A_BUTTON | B_BUTTON
 	jr z, .ask_erase_backup_ram
 	farcall Func_126d1
-	jr Func_4000
+	jr Start_Cont
 .ask_erase_backup_ram
 	call Func_405a
 	call Func_04a2
@@ -40,10 +41,43 @@ Func_4050: ; 4050 (1:4050)
 	ret
 
 Func_405a: ; 405a (1:405a)
-	INCROM $405a, $406f
+	xor a
+	ld [wTileMapFill], a
+	call DisableLCD
+	call Func_2119
+	call Func_5aeb
+	ld de, $387f
+	call Func_2275
+	ret
+; 0x406e
+
+CommentedOut_406e: ; 406e (1:406e)
+	ret
+; 0x406f
 
 Func_406f: ; 406f (1:406f)
-	INCROM $406f, $409f
+	call $420b
+	call $66e9
+	ldtx hl, BackUpIsBrokenText
+	jr c, .asm_4097
+	ld hl, sp+$00
+	ld a, l
+	ld [wcbe5], a
+	ld a, h
+	ld [wcbe6], a
+	call ClearJoypad
+	ld a, [wDuelTheme]
+	call PlaySong
+	xor a
+	ld [wDuelFinished], a
+	call Func_426d
+	jp StartDuel.asm_40fb
+.asm_4097
+	call DrawWideTextBox_WaitForInput
+	call ResetSerial
+	scf
+	ret
+; 0x409f
 
 ; this function begins the duel after the opponent's
 ; graphics, name and deck have been introduced
@@ -92,6 +126,8 @@ StartDuel: ; 409f (1:409f)
 	call HandleSwordsDanceOrFocusEnergySubstatus
 	call $54c8
 	call HandleTurn
+
+.asm_40fb
 	call Func_0f58
 	ld a, [wDuelFinished]
 	or a
@@ -232,7 +268,18 @@ StartDuel: ; 409f (1:409f)
 	ret
 ; 0x420b
 
-	INCROM $420b, $4225
+Func_420b: ; 420b (1:420b)
+	xor a
+	ld [wTileMapFill], a
+	call $5990
+	call Func_04a2
+	call Func_2119
+	call Func_5aeb
+	ld de, $389f
+	call Func_2275
+	call EnableLCD
+	ret
+; 0x4225
 
 HandleTurn: ; 4225 (1:4225)
 	ld a, DUELVARS_DUELIST_TYPE
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index dd8638b..68fb245 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -83,9 +83,9 @@ Func_c0ce: ; c0ce (3:40ce)
 	ld a, [wd0bf]
 	res 7, a
 	rlca
-	add PointerTable_c0e0 & $ff
+	add LOW(PointerTable_c0e0)
 	ld l, a
-	ld a, PointerTable_c0e0 >> $8
+	ld a, HIGH(PointerTable_c0e0)
 	adc $0
 	ld h, a
 	ld a, [hli]
diff --git a/src/engine/home.asm b/src/engine/home.asm
index ebffefa..78e32ae 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -61,10 +61,10 @@ Start: ; 0150 (0:0150)
 	call ResetSerial
 	call CopyDMAFunction
 	call SetupExtRAM
-	ld a, BANK(Func_4000)
+	ld a, BANK(Start_Cont)
 	call BankswitchHome
 	ld sp, $e000
-	jp Func_4000
+	jp Start_Cont
 
 VBlankHandler: ; 019b (0:019b)
 	push af
@@ -627,10 +627,10 @@ Func_04a2: ; 04a2 (0:04a2)
 	ld a, [wConsole]
 	cp CONSOLE_SGB
 	ret nz
-	call EnableLCD                ;
-	ld hl, AttrBlkPacket_04bf      ; send SGB data
-	call SendSGB                  ;
-	call DisableLCD               ;
+	call EnableLCD
+	ld hl, AttrBlkPacket_04bf
+	call SendSGB
+	call DisableLCD
 	ret
 
 AttrBlkPacket_04bf: ; 04bf (0:04bf)
@@ -2069,7 +2069,7 @@ SerialHandleRecv: ; 0d77 (0:0d77)
 	dec e
 	jr z, .last_was_ca
 	cp $ac
-	ret z                ; return if read_data == $ac
+	ret z ; return if read_data == $ac
 	cp $ca
 	jr z, .read_ca
 	or a
@@ -2081,7 +2081,7 @@ SerialHandleRecv: ; 0d77 (0:0d77)
 	set 6, [hl]
 	ret
 .read_ca
-	inc [hl]             ; inc [wSerialLastReadCA]
+	inc [hl] ; inc [wSerialLastReadCA]
 	ret
 .last_was_ca
 	; if last byte read was $ca, flip all bits of data received
@@ -4350,13 +4350,13 @@ Func_210f: ; 210f (0:210f)
 	jr asm_2121
 
 Func_2119: ; 2119 (0:2119)
-	ld hl, DuelGraphics - Fonts
+	ld hl, DuelGraphics - $4000
 	ld de, vTiles2 ; destination
 	ld b, $38 ; number of tiles
 asm_2121
-	ld a, BANK(Fonts)
+	ld a, BANK(DuelGraphics)
 	call BankpushHome
-	ld c, $10
+	ld c, TILE_SIZE
 	call CopyGfxData
 	call BankpopHome
 	ret
@@ -4707,7 +4707,7 @@ Func_235e: ; 235e (0:235e)
 	ld b, $c9
 	ld a, l
 	ld [bc], a           ; prev[i0] ← i
-	ldh [$ffa9], a        ; [$ffa9] ← i  (update linked-list head)
+	ldh [$ffa9], a       ; [$ffa9] ← i  (update linked-list head)
 	ld h, $c9
 	ld b, [hl]
 	ld [hl], $0          ; prev[i] ← 0
@@ -6173,7 +6173,7 @@ LoadCardGfx: ; 2fa0 (0:2fa0)
 Func_2fcb: ; 2fcb (0:2fcb)
 	ld a, $1d
 	call BankpushHome
-	ld c, $10
+	ld c, TILE_SIZE
 	call CopyGfxData
 	call BankpopHome
 	ret
diff --git a/src/gfx.asm b/src/gfx.asm
index dc7f9b9..71c6934 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -85,7 +85,7 @@ GrassClubTilesetGfx: ; 8b91e (22:791e)
 
 OWSpritePlayer: ; 8be90 (22:7e90)
 	dw $14
-	INCBIN "gfx/ow/player.2bpp"
+	INCBIN "gfx/overworld_sprites/player.2bpp"
 
 Unnamed3Gfx: ; 8bfd2 (22:7fd2)
 	dw $1
@@ -160,39 +160,39 @@ PoisonGfx: ; 8ffa4 (23:7fa4)
 SECTION "Gfx 6", ROMX
 CardPop1Gfx: ; 90000 (24:4000)
 	dw $bd
-	INCBIN "gfx/cardpop1.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop1.t3.2bpp"
 
 CardPop2Gfx: ; 90bd2 (24:4bd2)
 	dw $6d
-	INCBIN "gfx/cardpop2.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop2.t3.2bpp"
 
 CardPop3Gfx: ; 912a4 (24:52a4)
 	dw $5d
-	INCBIN "gfx/cardpop3.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop3.t3.2bpp"
 
 Colosseum1Gfx: ; 91876 (24:5876)
 	dw $60
-	INCBIN "gfx/boosterpacks/colosseum1.2bpp"
+	INCBIN "gfx/booster_packs/colosseum1.2bpp"
 
 Colosseum2Gfx: ; 91e78 (24:5e78)
 	dw $56
-	INCBIN "gfx/boosterpacks/colosseum2.t10.2bpp"
+	INCBIN "gfx/booster_packs/colosseum2.t10.2bpp"
 
 Evolution1Gfx: ; 923da (24:63da)
 	dw $60
-	INCBIN "gfx/boosterpacks/evolution1.2bpp"
+	INCBIN "gfx/booster_packs/evolution1.2bpp"
 
 Evolution2Gfx: ; 929dc (24:69dc)
 	dw $56
-	INCBIN "gfx/boosterpacks/evolution2.t10.2bpp"
+	INCBIN "gfx/booster_packs/evolution2.t10.2bpp"
 
 Mystery1Gfx: ; 92f3e (24:6f3e)
 	dw $60
-	INCBIN "gfx/boosterpacks/mystery1.2bpp"
+	INCBIN "gfx/booster_packs/mystery1.2bpp"
 
 Mystery2Gfx: ; 93540 (24:7540)
 	dw $56
-	INCBIN "gfx/boosterpacks/mystery2.t10.2bpp"
+	INCBIN "gfx/booster_packs/mystery2.t10.2bpp"
 
 RonaldGfx: ; 93aa2 (24:7aa2)
 	dw $24
@@ -204,7 +204,7 @@ CopyrightGfx: ; 93ce4 (24:7ce4)
 
 HelpDeskLadyGfx: ; 93f26 (24:7f26)
 	dw $8
-	INCBIN "gfx/ow/help_desk_lady.2bpp"
+	INCBIN "gfx/overworld_sprites/help_desk_lady.2bpp"
 
 Unnamed4Gfx: ; 93fa8 (24:7fa8)
 	dw $3
@@ -221,35 +221,35 @@ endr
 SECTION "Gfx 7", ROMX
 Laboratory1Gfx: ; 94000 (25:4000)
 	dw $60
-	INCBIN "gfx/boosterpacks/laboratory1.2bpp"
+	INCBIN "gfx/booster_packs/laboratory1.2bpp"
 
 Laboratory2Gfx: ; 94602 (25:4602)
 	dw $56
-	INCBIN "gfx/boosterpacks/laboratory2.t10.2bpp"
+	INCBIN "gfx/booster_packs/laboratory2.t10.2bpp"
 
 CharizardIntro1Gfx: ; 94b64 (25:4b64)
 	dw $60
-	INCBIN "gfx/boosterpacks/charizardintro1.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/charizardintro1.2bpp"
 
 CharizardIntro2Gfx: ; 95166 (25:5166)
 	dw $60
-	INCBIN "gfx/boosterpacks/charizardintro2.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/charizardintro2.2bpp"
 
 ScytherIntro1Gfx: ; 95768 (25:5768)
 	dw $60
-	INCBIN "gfx/boosterpacks/scytherintro1.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/scytherintro1.2bpp"
 
 ScytherIntro2Gfx: ; 95d6a (25:5d6a)
 	dw $60
-	INCBIN "gfx/boosterpacks/scytherintro2.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/scytherintro2.2bpp"
 
 AerodactylIntro1Gfx: ; 9636c (25:636c)
 	dw $60
-	INCBIN "gfx/boosterpacks/aerodactylintro1.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro1.2bpp"
 
 AerodactylIntro2Gfx: ; 9696e (25:696e)
 	dw $60
-	INCBIN "gfx/boosterpacks/aerodactylintro2.2bpp"
+	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro2.2bpp"
 
 Titlescreen1Gfx: ; 96f70 (25:6f70)
 	dw $61
@@ -265,7 +265,7 @@ CompaniesGfx: ; 97b94 (25:7b94)
 
 RonaldOWGfx: ; 97ea6 (25:7ea6)
 	dw $14
-	INCBIN "gfx/ow/ronald.2bpp"
+	INCBIN "gfx/overworld_sprites/ronald.2bpp"
 
 	INCROM $97fe8, $98000
 
@@ -288,11 +288,11 @@ Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 
 DoctorMasonOWGfx: ; 9bdf8 (26:7df8)
 	dw $14
-	INCBIN "gfx/ow/doctormason.2bpp"
+	INCBIN "gfx/overworld_sprites/doctormason.2bpp"
 
 OverworldMapOAMGfx: ; 9bf3a (26:7f3a)
 	dw $8
-	INCBIN "gfx/ow_map_oam.2bpp"
+	INCBIN "gfx/overworld_map_oam.2bpp"
 
 Unnamed6Gfx: ; 9bfbc (26:7fbc)
 	dw $3
@@ -474,123 +474,123 @@ AaronGfx: ; a1694 (28:5694)
 
 OWSprite0: ; a18d6 (28:58d6)
 	dw $14
-	INCBIN "gfx/ow/sprite0.2bpp"
+	INCBIN "gfx/overworld_sprites/0.2bpp"
 
 OWSprite1: ; a1a18 (28:5a18)
 	dw $14
-	INCBIN "gfx/ow/sprite1.2bpp"
+	INCBIN "gfx/overworld_sprites/1.2bpp"
 
 OWSprite2: ; a1b5a (28:5b5a)
 	dw $14
-	INCBIN "gfx/ow/sprite2.2bpp"
+	INCBIN "gfx/overworld_sprites/2.2bpp"
 
 OWSprite3: ; a1c9c (28:5c9c)
 	dw $14
-	INCBIN "gfx/ow/sprite3.2bpp"
+	INCBIN "gfx/overworld_sprites/3.2bpp"
 
 OWSprite4: ; a1dde (28:5dde)
 	dw $14
-	INCBIN "gfx/ow/sprite4.2bpp"
+	INCBIN "gfx/overworld_sprites/4.2bpp"
 
 OWSprite5: ; a1f20 (28:5f20)
 	dw $1b
-	INCBIN "gfx/ow/sprite5.2bpp"
+	INCBIN "gfx/overworld_sprites/5.2bpp"
 
 OWSprite6: ; a20d2 (28:60d2)
 	dw $14
-	INCBIN "gfx/ow/sprite6.2bpp"
+	INCBIN "gfx/overworld_sprites/6.2bpp"
 
 OWSprite7: ; a2214 (28:6214)
 	dw $14
-	INCBIN "gfx/ow/sprite7.2bpp"
+	INCBIN "gfx/overworld_sprites/7.2bpp"
 
 OWSprite8: ; a2356 (28:6356)
 	dw $14
-	INCBIN "gfx/ow/sprite8.2bpp"
+	INCBIN "gfx/overworld_sprites/8.2bpp"
 
 OWSprite9: ; a2498 (28:6498)
 	dw $14
-	INCBIN "gfx/ow/sprite9.2bpp"
+	INCBIN "gfx/overworld_sprites/9.2bpp"
 
 OWSprite10: ; a25da (28:65da)
 	dw $14
-	INCBIN "gfx/ow/sprite10.2bpp"
+	INCBIN "gfx/overworld_sprites/10.2bpp"
 
 OWSprite11: ; a271c (28:671c)
 	dw $14
-	INCBIN "gfx/ow/sprite11.2bpp"
+	INCBIN "gfx/overworld_sprites/11.2bpp"
 
 OWSprite12: ; a285e (28:685e)
 	dw $14
-	INCBIN "gfx/ow/sprite12.2bpp"
+	INCBIN "gfx/overworld_sprites/12.2bpp"
 
 OWSprite13: ; a29a0 (28:69a0)
 	dw $14
-	INCBIN "gfx/ow/sprite13.2bpp"
+	INCBIN "gfx/overworld_sprites/13.2bpp"
 
 OWSprite14: ; a2ae2 (28:6ae2)
 	dw $14
-	INCBIN "gfx/ow/sprite14.2bpp"
+	INCBIN "gfx/overworld_sprites/14.2bpp"
 
 OWSprite15: ; a2c24 (28:6c24)
 	dw $14
-	INCBIN "gfx/ow/sprite15.2bpp"
+	INCBIN "gfx/overworld_sprites/15.2bpp"
 
 OWSprite16: ; a2d66 (28:6d66)
 	dw $14
-	INCBIN "gfx/ow/sprite16.2bpp"
+	INCBIN "gfx/overworld_sprites/16.2bpp"
 
 OWSprite17: ; a2ea8 (28:6ea8)
 	dw $14
-	INCBIN "gfx/ow/sprite17.2bpp"
+	INCBIN "gfx/overworld_sprites/17.2bpp"
 
 OWSprite18: ; a2fea (28:6fea)
 	dw $14
-	INCBIN "gfx/ow/sprite18.2bpp"
+	INCBIN "gfx/overworld_sprites/18.2bpp"
 
 OWSprite19: ; a312c (28:712c)
 	dw $14
-	INCBIN "gfx/ow/sprite19.2bpp"
+	INCBIN "gfx/overworld_sprites/19.2bpp"
 
 OWSprite20: ; a326e (28:726e)
 	dw $14
-	INCBIN "gfx/ow/sprite20.2bpp"
+	INCBIN "gfx/overworld_sprites/20.2bpp"
 
 OWSprite21: ; a33b0 (28:73b0)
 	dw $14
-	INCBIN "gfx/ow/sprite21.2bpp"
+	INCBIN "gfx/overworld_sprites/21.2bpp"
 
 OWSprite22: ; a34f2 (28:74f2)
 	dw $14
-	INCBIN "gfx/ow/sprite22.2bpp"
+	INCBIN "gfx/overworld_sprites/22.2bpp"
 
 OWSprite23: ; a3634 (28:7634)
 	dw $14
-	INCBIN "gfx/ow/sprite23.2bpp"
+	INCBIN "gfx/overworld_sprites/23.2bpp"
 
 OWSprite24: ; a3776 (28:7776)
 	dw $14
-	INCBIN "gfx/ow/sprite24.2bpp"
+	INCBIN "gfx/overworld_sprites/24.2bpp"
 
 OWSprite25: ; a38b8 (28:78b8)
 	dw $14
-	INCBIN "gfx/ow/sprite25.2bpp"
+	INCBIN "gfx/overworld_sprites/25.2bpp"
 
 OWSprite26: ; a39fa (28:79fa)
 	dw $14
-	INCBIN "gfx/ow/sprite26.2bpp"
+	INCBIN "gfx/overworld_sprites/26.2bpp"
 
 OWSprite27: ; a3b3c (28:7b3c)
 	dw $14
-	INCBIN "gfx/ow/sprite27.2bpp"
+	INCBIN "gfx/overworld_sprites/27.2bpp"
 
 OWSprite28: ; a3c7e (28:7c7e)
 	dw $14
-	INCBIN "gfx/ow/sprite28.2bpp"
+	INCBIN "gfx/overworld_sprites/28.2bpp"
 
 OWSprite29: ; a3dc0 (28:7dc0)
 	dw $14
-	INCBIN "gfx/ow/sprite29.2bpp"
+	INCBIN "gfx/overworld_sprites/29.2bpp"
 
 Unnamed10Gfx: ; a3f02 (28:7f02)
 	dw $b
@@ -605,15 +605,15 @@ Unnamed11Gfx: ; a3fb4 (28:7fb4)
 SECTION "Gfx 11", ROMX
 OWSprite30: ; a4000 (29:4000)
 	dw $14
-	INCBIN "gfx/ow/sprite30.2bpp"
+	INCBIN "gfx/overworld_sprites/30.2bpp"
 
 OWSprite31: ; a4142 (29:4142)
 	dw $14
-	INCBIN "gfx/ow/sprite31.2bpp"
+	INCBIN "gfx/overworld_sprites/31.2bpp"
 
 OWSprite32: ; a4284 (29:4284)
 	dw $14
-	INCBIN "gfx/ow/sprite32.2bpp"
+	INCBIN "gfx/overworld_sprites/32.2bpp"
 
 Duel0Gfx: ; a43c6 (29:43c6)
 	dw $16
@@ -840,7 +840,7 @@ Duel54Gfx: ; a87e0 (2a:47e0)
 
 BoosterPackOAMGfx: ; a8942 (2a:4942)
 	dw $20
-	INCBIN "gfx/boosterpacks/boosterpack_oam.2bpp"
+	INCBIN "gfx/booster_packs/oam.2bpp"
 
 PressStartGfx: ; a8b44 (2a:4b44)
 	dw $14
@@ -848,31 +848,31 @@ PressStartGfx: ; a8b44 (2a:4b44)
 
 GrassGfx: ; a8c86 (2a:4c86)
 	dw $04
-	INCBIN "gfx/titlescreen/grass.2bpp"
+	INCBIN "gfx/titlescreen/energies/grass.2bpp"
 
 FireGfx: ; a8cc8 (2a:4cc8)
 	dw $04
-	INCBIN "gfx/titlescreen/fire.2bpp"
+	INCBIN "gfx/titlescreen/energies/fire.2bpp"
 
 WaterGfx: ; a8d0a (2a:4d0a)
 	dw $04
-	INCBIN "gfx/titlescreen/water.2bpp"
+	INCBIN "gfx/titlescreen/energies/water.2bpp"
 
 ColorlessGfx: ; a8d4c (2a:4d4c)
 	dw $04
-	INCBIN "gfx/titlescreen/colorless.2bpp"
+	INCBIN "gfx/titlescreen/energies/colorless.2bpp"
 
 LightningGfx: ; a8d8e (2a:4d8e)
 	dw $04
-	INCBIN "gfx/titlescreen/lightning.2bpp"
+	INCBIN "gfx/titlescreen/energies/lightning.2bpp"
 
 PsychicGfx: ; a8dd0 (2a:4dd0)
 	dw $04
-	INCBIN "gfx/titlescreen/psychic.2bpp"
+	INCBIN "gfx/titlescreen/energies/psychic.2bpp"
 
 FightingGfx: ; a8e12 (2a:4e12)
 	dw $04
-	INCBIN "gfx/titlescreen/fighting.2bpp"
+	INCBIN "gfx/titlescreen/energies/fighting.2bpp"
 
 	INCROM $a8e54, $ac000
 
diff --git a/src/gfx/boosterpacks/colosseum1.png b/src/gfx/booster_packs/colosseum1.png
index 9ce2500..9ce2500 100755..100644
--- a/src/gfx/boosterpacks/colosseum1.png
+++ b/src/gfx/booster_packs/colosseum1.png
diff --git a/src/gfx/boosterpacks/colosseum2.t10.png b/src/gfx/booster_packs/colosseum2.t10.png
index 1da1a52..1da1a52 100755..100644
--- a/src/gfx/boosterpacks/colosseum2.t10.png
+++ b/src/gfx/booster_packs/colosseum2.t10.png
diff --git a/src/gfx/boosterpacks/evolution1.png b/src/gfx/booster_packs/evolution1.png
index 15caac5..15caac5 100755..100644
--- a/src/gfx/boosterpacks/evolution1.png
+++ b/src/gfx/booster_packs/evolution1.png
diff --git a/src/gfx/boosterpacks/evolution2.t10.png b/src/gfx/booster_packs/evolution2.t10.png
index 09affa5..09affa5 100755..100644
--- a/src/gfx/boosterpacks/evolution2.t10.png
+++ b/src/gfx/booster_packs/evolution2.t10.png
diff --git a/src/gfx/boosterpacks/laboratory1.png b/src/gfx/booster_packs/laboratory1.png
index 5444be5..5444be5 100755..100644
--- a/src/gfx/boosterpacks/laboratory1.png
+++ b/src/gfx/booster_packs/laboratory1.png
diff --git a/src/gfx/boosterpacks/laboratory2.t10.png b/src/gfx/booster_packs/laboratory2.t10.png
index 4feb880..4feb880 100755..100644
--- a/src/gfx/boosterpacks/laboratory2.t10.png
+++ b/src/gfx/booster_packs/laboratory2.t10.png
diff --git a/src/gfx/boosterpacks/mystery1.png b/src/gfx/booster_packs/mystery1.png
index 06a5749..06a5749 100755..100644
--- a/src/gfx/boosterpacks/mystery1.png
+++ b/src/gfx/booster_packs/mystery1.png
diff --git a/src/gfx/boosterpacks/mystery2.t10.png b/src/gfx/booster_packs/mystery2.t10.png
index fc04dbf..fc04dbf 100755..100644
--- a/src/gfx/boosterpacks/mystery2.t10.png
+++ b/src/gfx/booster_packs/mystery2.t10.png
diff --git a/src/gfx/boosterpacks/boosterpack_oam.png b/src/gfx/booster_packs/oam.png
index dcb3850..dcb3850 100755..100644
--- a/src/gfx/boosterpacks/boosterpack_oam.png
+++ b/src/gfx/booster_packs/oam.png
diff --git a/src/gfx/cardpop1.t3.png b/src/gfx/cardpop/cardpop1.t3.png
index c607d8d..c607d8d 100755..100644
--- a/src/gfx/cardpop1.t3.png
+++ b/src/gfx/cardpop/cardpop1.t3.png
diff --git a/src/gfx/cardpop2.t3.png b/src/gfx/cardpop/cardpop2.t3.png
index 75e5149..75e5149 100755..100644
--- a/src/gfx/cardpop2.t3.png
+++ b/src/gfx/cardpop/cardpop2.t3.png
diff --git a/src/gfx/cardpop3.t3.png b/src/gfx/cardpop/cardpop3.t3.png
index 48bd233..48bd233 100755..100644
--- a/src/gfx/cardpop3.t3.png
+++ b/src/gfx/cardpop/cardpop3.t3.png
diff --git a/src/gfx/ow_map_oam.png b/src/gfx/overworld_map_oam.png
index 323fc59..323fc59 100755..100644
--- a/src/gfx/ow_map_oam.png
+++ b/src/gfx/overworld_map_oam.png
diff --git a/src/gfx/ow/sprite0.png b/src/gfx/overworld_sprites/0.png
index 0eceeb6..0eceeb6 100755..100644
--- a/src/gfx/ow/sprite0.png
+++ b/src/gfx/overworld_sprites/0.png
diff --git a/src/gfx/ow/sprite1.png b/src/gfx/overworld_sprites/1.png
index b3fa35f..b3fa35f 100755..100644
--- a/src/gfx/ow/sprite1.png
+++ b/src/gfx/overworld_sprites/1.png
diff --git a/src/gfx/ow/sprite10.png b/src/gfx/overworld_sprites/10.png
index e63ba2b..e63ba2b 100755..100644
--- a/src/gfx/ow/sprite10.png
+++ b/src/gfx/overworld_sprites/10.png
diff --git a/src/gfx/ow/sprite11.png b/src/gfx/overworld_sprites/11.png
index 4a231fe..4a231fe 100755..100644
--- a/src/gfx/ow/sprite11.png
+++ b/src/gfx/overworld_sprites/11.png
diff --git a/src/gfx/ow/sprite12.png b/src/gfx/overworld_sprites/12.png
index b24cd69..b24cd69 100755..100644
--- a/src/gfx/ow/sprite12.png
+++ b/src/gfx/overworld_sprites/12.png
diff --git a/src/gfx/ow/sprite13.png b/src/gfx/overworld_sprites/13.png
index d55c62c..d55c62c 100755..100644
--- a/src/gfx/ow/sprite13.png
+++ b/src/gfx/overworld_sprites/13.png
diff --git a/src/gfx/ow/sprite14.png b/src/gfx/overworld_sprites/14.png
index 0026093..0026093 100755..100644
--- a/src/gfx/ow/sprite14.png
+++ b/src/gfx/overworld_sprites/14.png
diff --git a/src/gfx/ow/sprite15.png b/src/gfx/overworld_sprites/15.png
index 67a227d..67a227d 100755..100644
--- a/src/gfx/ow/sprite15.png
+++ b/src/gfx/overworld_sprites/15.png
diff --git a/src/gfx/ow/sprite16.png b/src/gfx/overworld_sprites/16.png
index 0baa4eb..0baa4eb 100755..100644
--- a/src/gfx/ow/sprite16.png
+++ b/src/gfx/overworld_sprites/16.png
diff --git a/src/gfx/ow/sprite17.png b/src/gfx/overworld_sprites/17.png
index 2f696e6..2f696e6 100755..100644
--- a/src/gfx/ow/sprite17.png
+++ b/src/gfx/overworld_sprites/17.png
diff --git a/src/gfx/ow/sprite18.png b/src/gfx/overworld_sprites/18.png
index 97281b6..97281b6 100755..100644
--- a/src/gfx/ow/sprite18.png
+++ b/src/gfx/overworld_sprites/18.png
diff --git a/src/gfx/ow/sprite19.png b/src/gfx/overworld_sprites/19.png
index 437a376..437a376 100755..100644
--- a/src/gfx/ow/sprite19.png
+++ b/src/gfx/overworld_sprites/19.png
diff --git a/src/gfx/ow/sprite2.png b/src/gfx/overworld_sprites/2.png
index 0bda3be..0bda3be 100755..100644
--- a/src/gfx/ow/sprite2.png
+++ b/src/gfx/overworld_sprites/2.png
diff --git a/src/gfx/ow/sprite20.png b/src/gfx/overworld_sprites/20.png
index 3da8ad9..3da8ad9 100755..100644
--- a/src/gfx/ow/sprite20.png
+++ b/src/gfx/overworld_sprites/20.png
diff --git a/src/gfx/ow/sprite21.png b/src/gfx/overworld_sprites/21.png
index 7d07d78..7d07d78 100755..100644
--- a/src/gfx/ow/sprite21.png
+++ b/src/gfx/overworld_sprites/21.png
diff --git a/src/gfx/ow/sprite22.png b/src/gfx/overworld_sprites/22.png
index 2d47555..2d47555 100755..100644
--- a/src/gfx/ow/sprite22.png
+++ b/src/gfx/overworld_sprites/22.png
diff --git a/src/gfx/ow/sprite23.png b/src/gfx/overworld_sprites/23.png
index 8432c39..8432c39 100755..100644
--- a/src/gfx/ow/sprite23.png
+++ b/src/gfx/overworld_sprites/23.png
diff --git a/src/gfx/ow/sprite24.png b/src/gfx/overworld_sprites/24.png
index 0d7b908..0d7b908 100755..100644
--- a/src/gfx/ow/sprite24.png
+++ b/src/gfx/overworld_sprites/24.png
diff --git a/src/gfx/ow/sprite25.png b/src/gfx/overworld_sprites/25.png
index 1e161da..1e161da 100755..100644
--- a/src/gfx/ow/sprite25.png
+++ b/src/gfx/overworld_sprites/25.png
diff --git a/src/gfx/ow/sprite26.png b/src/gfx/overworld_sprites/26.png
index 6a5f4cd..6a5f4cd 100755..100644
--- a/src/gfx/ow/sprite26.png
+++ b/src/gfx/overworld_sprites/26.png
diff --git a/src/gfx/ow/sprite27.png b/src/gfx/overworld_sprites/27.png
index 7b738e4..7b738e4 100755..100644
--- a/src/gfx/ow/sprite27.png
+++ b/src/gfx/overworld_sprites/27.png
diff --git a/src/gfx/ow/sprite28.png b/src/gfx/overworld_sprites/28.png
index 0ba9e64..0ba9e64 100755..100644
--- a/src/gfx/ow/sprite28.png
+++ b/src/gfx/overworld_sprites/28.png
diff --git a/src/gfx/ow/sprite29.png b/src/gfx/overworld_sprites/29.png
index 5926395..5926395 100755..100644
--- a/src/gfx/ow/sprite29.png
+++ b/src/gfx/overworld_sprites/29.png
diff --git a/src/gfx/ow/sprite3.png b/src/gfx/overworld_sprites/3.png
index 2fac558..2fac558 100755..100644
--- a/src/gfx/ow/sprite3.png
+++ b/src/gfx/overworld_sprites/3.png
diff --git a/src/gfx/ow/sprite30.png b/src/gfx/overworld_sprites/30.png
index ef25140..ef25140 100755..100644
--- a/src/gfx/ow/sprite30.png
+++ b/src/gfx/overworld_sprites/30.png
diff --git a/src/gfx/ow/sprite31.png b/src/gfx/overworld_sprites/31.png
index 1494e05..1494e05 100755..100644
--- a/src/gfx/ow/sprite31.png
+++ b/src/gfx/overworld_sprites/31.png
diff --git a/src/gfx/ow/sprite32.png b/src/gfx/overworld_sprites/32.png
index 7d3fac1..7d3fac1 100755..100644
--- a/src/gfx/ow/sprite32.png
+++ b/src/gfx/overworld_sprites/32.png
diff --git a/src/gfx/ow/sprite4.png b/src/gfx/overworld_sprites/4.png
index a12569b..a12569b 100755..100644
--- a/src/gfx/ow/sprite4.png
+++ b/src/gfx/overworld_sprites/4.png
diff --git a/src/gfx/ow/sprite5.png b/src/gfx/overworld_sprites/5.png
index d46c9bb..d46c9bb 100755..100644
--- a/src/gfx/ow/sprite5.png
+++ b/src/gfx/overworld_sprites/5.png
diff --git a/src/gfx/ow/sprite6.png b/src/gfx/overworld_sprites/6.png
index 2423fd1..2423fd1 100755..100644
--- a/src/gfx/ow/sprite6.png
+++ b/src/gfx/overworld_sprites/6.png
diff --git a/src/gfx/ow/sprite7.png b/src/gfx/overworld_sprites/7.png
index c7f1d29..c7f1d29 100755..100644
--- a/src/gfx/ow/sprite7.png
+++ b/src/gfx/overworld_sprites/7.png
diff --git a/src/gfx/ow/sprite8.png b/src/gfx/overworld_sprites/8.png
index 2527ae9..2527ae9 100755..100644
--- a/src/gfx/ow/sprite8.png
+++ b/src/gfx/overworld_sprites/8.png
diff --git a/src/gfx/ow/sprite9.png b/src/gfx/overworld_sprites/9.png
index 69c5451..69c5451 100755..100644
--- a/src/gfx/ow/sprite9.png
+++ b/src/gfx/overworld_sprites/9.png
diff --git a/src/gfx/ow/doctormason.png b/src/gfx/overworld_sprites/doctormason.png
index 8b0f384..8b0f384 100755..100644
--- a/src/gfx/ow/doctormason.png
+++ b/src/gfx/overworld_sprites/doctormason.png
diff --git a/src/gfx/ow/help_desk_lady.png b/src/gfx/overworld_sprites/help_desk_lady.png
index 92bb5ef..92bb5ef 100755..100644
--- a/src/gfx/ow/help_desk_lady.png
+++ b/src/gfx/overworld_sprites/help_desk_lady.png
diff --git a/src/gfx/ow/player.png b/src/gfx/overworld_sprites/player.png
index 2f891ef..2f891ef 100755..100644
--- a/src/gfx/ow/player.png
+++ b/src/gfx/overworld_sprites/player.png
diff --git a/src/gfx/ow/ronald.png b/src/gfx/overworld_sprites/ronald.png
index 4cd2be0..4cd2be0 100755..100644
--- a/src/gfx/ow/ronald.png
+++ b/src/gfx/overworld_sprites/ronald.png
diff --git a/src/gfx/boosterpacks/aerodactylintro1.png b/src/gfx/titlescreen/booster_packs/aerodactylintro1.png
index e18b96b..e18b96b 100755..100644
--- a/src/gfx/boosterpacks/aerodactylintro1.png
+++ b/src/gfx/titlescreen/booster_packs/aerodactylintro1.png
diff --git a/src/gfx/boosterpacks/aerodactylintro2.png b/src/gfx/titlescreen/booster_packs/aerodactylintro2.png
index ba347b5..ba347b5 100755..100644
--- a/src/gfx/boosterpacks/aerodactylintro2.png
+++ b/src/gfx/titlescreen/booster_packs/aerodactylintro2.png
diff --git a/src/gfx/boosterpacks/charizardintro1.png b/src/gfx/titlescreen/booster_packs/charizardintro1.png
index 50e757f..50e757f 100755..100644
--- a/src/gfx/boosterpacks/charizardintro1.png
+++ b/src/gfx/titlescreen/booster_packs/charizardintro1.png
diff --git a/src/gfx/boosterpacks/charizardintro2.png b/src/gfx/titlescreen/booster_packs/charizardintro2.png
index c7ec7b4..c7ec7b4 100755..100644
--- a/src/gfx/boosterpacks/charizardintro2.png
+++ b/src/gfx/titlescreen/booster_packs/charizardintro2.png
diff --git a/src/gfx/boosterpacks/scytherintro1.png b/src/gfx/titlescreen/booster_packs/scytherintro1.png
index 3e6bd36..3e6bd36 100755..100644
--- a/src/gfx/boosterpacks/scytherintro1.png
+++ b/src/gfx/titlescreen/booster_packs/scytherintro1.png
diff --git a/src/gfx/boosterpacks/scytherintro2.png b/src/gfx/titlescreen/booster_packs/scytherintro2.png
index c6fd814..c6fd814 100755..100644
--- a/src/gfx/boosterpacks/scytherintro2.png
+++ b/src/gfx/titlescreen/booster_packs/scytherintro2.png
diff --git a/src/gfx/titlescreen/colorless.png b/src/gfx/titlescreen/energies/colorless.png
index fe55d79..fe55d79 100755..100644
--- a/src/gfx/titlescreen/colorless.png
+++ b/src/gfx/titlescreen/energies/colorless.png
diff --git a/src/gfx/titlescreen/fighting.png b/src/gfx/titlescreen/energies/fighting.png
index 849d5d6..849d5d6 100755..100644
--- a/src/gfx/titlescreen/fighting.png
+++ b/src/gfx/titlescreen/energies/fighting.png
diff --git a/src/gfx/titlescreen/fire.png b/src/gfx/titlescreen/energies/fire.png
index 518fcfc..518fcfc 100755..100644
--- a/src/gfx/titlescreen/fire.png
+++ b/src/gfx/titlescreen/energies/fire.png
diff --git a/src/gfx/titlescreen/grass.png b/src/gfx/titlescreen/energies/grass.png
index b864fc4..b864fc4 100755..100644
--- a/src/gfx/titlescreen/grass.png
+++ b/src/gfx/titlescreen/energies/grass.png
diff --git a/src/gfx/titlescreen/lightning.png b/src/gfx/titlescreen/energies/lightning.png
index 9dcddef..9dcddef 100755..100644
--- a/src/gfx/titlescreen/lightning.png
+++ b/src/gfx/titlescreen/energies/lightning.png
diff --git a/src/gfx/titlescreen/psychic.png b/src/gfx/titlescreen/energies/psychic.png
index 60bbe0b..60bbe0b 100755..100644
--- a/src/gfx/titlescreen/psychic.png
+++ b/src/gfx/titlescreen/energies/psychic.png
diff --git a/src/gfx/titlescreen/water.png b/src/gfx/titlescreen/energies/water.png
index 124f54c..124f54c 100755..100644
--- a/src/gfx/titlescreen/water.png
+++ b/src/gfx/titlescreen/energies/water.png
diff --git a/src/text/text1.asm b/src/text/text1.asm
index eb11f83..3c82b18 100755
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -992,7 +992,7 @@ Text00d5: ; 37a3a (d:7a3a)
 	text "A Transmission Error occured."
 	done
 
-Text00d6: ; 37a59 (d:7a59)
+BackUpIsBrokenText: ; 37a59 (d:7a59)
 	text "Back Up is broken."
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 7b60d4f..acb7f4c 100755
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -215,7 +215,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text00d3
 	textpointer UnableDueToToxicGasText
 	textpointer Text00d5
-	textpointer Text00d6
+	textpointer BackUpIsBrokenText
 	textpointer Text00d7
 	textpointer Text00d8
 	textpointer Text00d9