Disassemble load_pics.asm and move_mon_wo_mail.asm in bank $14.

158 files changed, 621 insertions, 59 deletions

diff --git a/.gitignore b/.gitignore
index d4fa49a8..60269f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,6 @@ pokesilver.txt
 .DS_STORE
 
 # compiled graphics
+*.png
 *.2bpp
-*.lz
 *.1bpp
diff --git a/Makefile b/Makefile
index 1e15b7af..8c24c34d 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ silver: pokesilver.gbc
 
 clean:
 	rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
-	find gfx/pics gfx/trainers -name "*.png" -delete
+	find gfx/pics gfx/trainers \( -name "*.png" -o -name "*.2bpp" \) -delete
 	$(MAKE) clean -C tools/
 
 compare: $(roms)
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index badbf7ba..8de1ffcc 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -2350,7 +2350,7 @@ BattleAnim_Transform:
 	anim_call BattleAnim_TargetObj_2Row
 	anim_sound 0, 0, SFX_PSYBEAM
 	anim_bgeffect ANIM_BG_WAVE_DEFORM_USER, $0, $1, $0
-    anim_wait 48
+	anim_wait 48
 	anim_transform
 	anim_incbgeffect ANIM_BG_WAVE_DEFORM_USER
 	anim_wait 48
@@ -2592,7 +2592,7 @@ BattleAnim_Minimize:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_TargetObj_2Row
 	anim_bgeffect ANIM_BG_WAVE_DEFORM_USER, $0, $1, $0
-    anim_wait 48
+	anim_wait 48
 	anim_minimizeopp
 	anim_incbgeffect ANIM_BG_WAVE_DEFORM_USER
 	anim_wait 48
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index 8e4dac0f..8f7fd669 100755
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -74,6 +74,6 @@ PredefPointers::
 	add_predef CheckTypeMatchup ; $40
 	add_predef ConvertMon_1to2
 	add_predef NewPokedexEntry
-	add_predef FrontpicPredef
+	add_predef UnusedFrontpicPredef
 	add_predef UpdateTimePredef
 	dbw -1, InexplicablyEmptyFunction ; ???
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index 408bc508..770b8cfb 100755
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -19,9 +19,9 @@ add_special: MACRO
 ; Some ROM0 specials have a nonzero bank.
 \1Special::
 IF _NARG == 1
-        dba \1
+	dba \1
 ELSE
-        dbw \2, \1
+	dbw \2, \1
 ENDC
 ENDM
 
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
new file mode 100644
index 00000000..18f76ec0
--- /dev/null
+++ b/engine/gfx/load_pics.asm
@@ -0,0 +1,432 @@
+GetUnownLetter:
+; Return Unown letter in wUnownLetter based on DVs at hl
+
+; Take the middle 2 bits of each DV and place them in order:
+;	atk  def  spd  spc
+;	.ww..xx.  .yy..zz.
+
+	; atk
+	ld a, [hl]
+	and %01100000
+	sla a
+	ld b, a
+	; def
+	ld a, [hli]
+	and %00000110
+	swap a
+	srl a
+	or b
+	ld b, a
+
+	; spd
+	ld a, [hl]
+	and %01100000
+	swap a
+	sla a
+	or b
+	ld b, a
+	; spc
+	ld a, [hl]
+	and %00000110
+	srl a
+	or b
+
+; Divide by 10 to get 0-25
+	ldh [hDividend + 3], a
+	xor a
+	ldh [hDividend], a
+	ldh [hDividend + 1], a
+	ldh [hDividend + 2], a
+	ld a, $ff / NUM_UNOWN + 1
+	ldh [hDivisor], a
+	ld b, 4
+	call Divide
+
+; Increment to get 1-26
+	ldh a, [hQuotient + 2]
+	inc a
+	ld [wUnownLetter], a
+	ret
+
+GetMonFrontpic:
+	call _GetFrontpic
+	jp Load2bppToSRAM
+
+UnusedFrontpicPredef:
+	call _GetFrontpic
+	push hl
+	farcall StubbedGetFrontpic
+	pop hl
+	jp Load2bppToSRAM
+
+_GetFrontpic:
+	ld a, [wCurPartySpecies]
+	ld [wCurSpecies], a
+	and a
+	ret z
+	cp NUM_POKEMON + 1
+	ret z
+	cp EGG + 1
+	ret nc
+
+.is_a_pokemon:
+	push de
+	call GetBaseData
+	ld a, [wBasePicSize]
+	and $f
+	ld b, a
+	push bc
+	ld a, BANK(sDecompressBuffer)
+	call OpenSRAM
+	ld hl, PokemonPicPointers
+	ld a, [wCurPartySpecies]
+	ld d, BANK(PokemonPicPointers)
+	cp UNOWN
+	jr z, .unown
+
+	cp EGG
+	jr nz, .not_egg
+
+	ld hl, EggPic
+	ld a, BANK(EggPic)
+	jr .ok
+
+.unown:
+	ld a, [wUnownLetter]
+	ld d, BANK(UnownPicPointers)
+
+.not_egg:
+	dec a
+	ld bc, 6
+	call AddNTimes
+	ld a, d
+	call GetFarByte
+	call FixPicBank
+	push af
+	inc hl
+	ld a, d
+	call GetFarHalfword
+	pop af
+
+.ok:
+	ld de, sDecompressBuffer
+	call FarDecompress
+	pop bc
+	ld hl, sDecompressScratch
+	ld de, sDecompressBuffer
+	call PadFrontpic
+	pop hl
+	ret
+
+Load2bppToSRAM:
+	ld de, sDecompressScratch
+	ld c, 7 * 7
+	ldh a, [hROMBank]
+	ld b, a
+	call Get2bpp
+	jp CloseSRAM
+
+GetMonBackpic:
+	ld a, [wCurPartySpecies]
+	and a
+	ret z
+	cp NUM_POKEMON + 1
+	ret z
+	cp EGG + 1
+	ret nc
+
+.is_a_pokemon:
+	push de
+	ld a, BANK(sDecompressBuffer)
+	call OpenSRAM
+	ld hl, PokemonPicPointers
+	ld a, [wCurPartySpecies]
+	ld d, BANK(PokemonPicPointers)
+	cp UNOWN
+	jr nz, .ok
+	ld a, [wUnownLetter]
+	ld d, BANK(UnownPicPointers)
+
+.ok:
+	dec a
+	ld bc, 6
+	call AddNTimes
+	ld bc, 3
+	add hl, bc
+	ld a, d
+	call GetFarByte
+	call FixPicBank
+	push af
+	inc hl
+	ld a, d
+	call GetFarByte
+	push af
+	inc hl
+	ld a, d
+	call GetFarByte
+	ld h, a
+	pop af
+	ld l, a
+	ld de, sDecompressBuffer
+	pop af
+	call FarDecompress
+	ld hl, sDecompressBuffer
+	ld c, 6 * 6
+	call FixBackpicAlignment
+	pop hl
+	ld de, sDecompressBuffer
+	ldh a, [hROMBank]
+	ld b, a
+	call Get2bpp
+	call CloseSRAM
+	ret
+
+FixPicBank:
+; Precondition:  a = defined bank for pic
+; Postcondition: a = repaired bank for pic
+;
+; Pic bank values that will get repaired (and what they'll be repaired to):
+;     $13 -> $1f
+;     $14 -> $20
+;     $1f -> $2e
+;
+; Otherwise, the repaired bank will match the defined bank.
+	push hl
+	push bc
+	ld b, a
+	ld hl, .FixPicBankTable
+
+.loop:
+	ld a, [hli]
+	cp -1
+	jr z, .done
+
+	inc hl
+	cp b
+	jr nz, .loop
+
+	dec hl
+	ld b, [hl]
+
+.done:
+	ld a, b
+	pop bc
+	pop hl
+	ret
+
+.FixPicBankTable:
+	db $13, $1f
+	db $14, $20
+	db $1f, $2e
+	db -1
+
+Function150ff:
+	ld a, c
+	push de
+	ld hl, PokemonPicPointers ; UnownPicPointers
+	dec a
+	ld bc, 6
+	call AddNTimes
+	ld a, BANK(PokemonPicPointers)
+	call GetFarByte
+	call FixPicBank
+	push af
+	inc hl
+	ld a, BANK(PokemonPicPointers)
+	call GetFarHalfword
+	pop af
+	pop de
+	call FarDecompress
+	ret
+
+GetTrainerPic:
+	ld a, [wTrainerClass]
+	and a
+	ret z
+	cp NUM_TRAINER_CLASSES
+	ret nc
+	ld a, 0
+	call WaitBGMap
+	xor a
+	ldh [hBGMapMode], a
+	ld a, BANK(sDecompressBuffer)
+	call OpenSRAM
+	push de
+	ld hl, TrainerPicPointers
+	ld a, [wTrainerClass]
+	dec a
+	ld bc, 3
+	call AddNTimes
+	ld a, BANK(TrainerPicPointers)
+	call GetFarByte
+	call FixPicBank
+	push af
+	inc hl
+	ld a, BANK(TrainerPicPointers)
+	call GetFarByte
+	push af
+	inc hl
+	ld a, BANK(TrainerPicPointers)
+	call GetFarByte
+	ld h, a
+	pop af
+	ld l, a
+	ld de, sDecompressBuffer
+	pop af
+	call FarDecompress
+	pop hl
+	ld de, sDecompressBuffer
+	ld c, 7 * 7
+	ldh a, [hROMBank]
+	ld b, a
+	call Get2bpp
+	call CloseSRAM
+	call WaitBGMap
+	ld a, 1
+	ldh [hBGMapMode], a
+	ret
+
+DecompressGet2bpp:
+	push de
+	push bc
+	ld a, BANK(sDecompressBuffer)
+	call OpenSRAM
+	ld a, b
+	ld de, sDecompressBuffer
+	call FarDecompress
+	pop bc
+	ld de, sDecompressBuffer
+	pop hl
+	ldh a, [hROMBank]
+	ld b, a
+	call Get2bpp
+	call CloseSRAM
+	ret
+
+FixBackpicAlignment:
+	push de
+	push bc
+	ld a, [wBoxAlignment]
+	and a
+	jr z, .keep_dims
+	ld a, c
+	cp 7 * 7
+	ld de, 7 * 7 tiles
+	jr z, .got_dims
+	cp 6 * 6
+	ld de, 6 * 6 tiles
+	jr z, .got_dims
+	ld de, 5 * 5 tiles
+
+.got_dims
+	ld a, [hl]
+	ld b, 0
+	ld c, 8
+.loop
+	rra
+	rl b
+	dec c
+	jr nz, .loop
+	ld a, b
+	ld [hli], a
+	dec de
+	ld a, e
+	or d
+	jr nz, .got_dims
+
+.keep_dims
+	pop bc
+	pop de
+	ret
+
+PadFrontpic:
+; pads frontpic to fill 7x7 box
+	ld a, b
+	cp 6
+	jr z, .six
+	cp 5
+	jr z, .five
+
+.seven_loop
+	ld c, 7 << 4
+	call LoadOrientedFrontpic
+	dec b
+	jr nz, .seven_loop
+	ret
+
+.six
+	ld c, 7 << 4
+	xor a
+	call .Fill
+.six_loop
+	ld c, (7 - 6) << 4
+	xor a
+	call .Fill
+	ld c, 6 << 4
+	call LoadOrientedFrontpic
+	dec b
+	jr nz, .six_loop
+	ret
+
+.five
+	ld c, 7 << 4
+	xor a
+	call .Fill
+.five_loop
+	ld c, (7 - 5) << 4
+	xor a
+	call .Fill
+	ld c, 5 << 4
+	call LoadOrientedFrontpic
+	dec b
+	jr nz, .five_loop
+	ld c, 7 << 4
+	xor a
+	call .Fill
+	ret
+
+.Fill:
+rept 4
+	srl c
+endr
+.loop:
+rept 16
+	ld [hli], a
+endr
+	dec c
+	jr nz, .loop
+	ret
+
+LoadOrientedFrontpic:
+	ld a, [wBoxAlignment]
+	and a
+	jr nz, .x_flip
+rept 4
+	srl c
+endr
+.left_loop:
+rept 16
+	ld a, [de]
+	inc de
+	ld [hli], a
+endr
+	dec c
+	jr nz, .left_loop
+	ret
+
+.x_flip:
+	push bc
+.right_loop:
+	ld a, [de]
+	inc de
+	ld b, a
+	xor a
+rept 8
+	rr b
+	rla
+endr
+	ld [hli], a
+	dec c
+	jr nz, .right_loop
+	pop bc
+	ret
diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm
index 7e6906ee..b40a8a51 100755
--- a/engine/overworld/variables.asm
+++ b/engine/overworld/variables.asm
@@ -55,7 +55,7 @@ GetVarAction_::
 	dwb wXCoord, RETVAR_STRBUF2
 	dwb wYCoord, RETVAR_STRBUF2
 	dwb wSpecialPhoneCallID, RETVAR_STRBUF2
-    dwb     0, 0
+	dwb NULL, RETVAR_STRBUF2
 
 .CountCaughtMons: ; 41cf
 ; Caught mons.
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 7198910d..5fce891f 100755
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -406,7 +406,7 @@ AddTempmonToParty: ; da9c (3:5a9c)
 	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .asm_db43
-	ld a, [wd11e]
+	ld a, [wUnownLetter]
 	ld [wFirstUnownSeen], a
 .asm_db43
 	and a
@@ -604,7 +604,7 @@ SendGetMonIntoFromBox: ; db45 (3:5b45)
 	ld a, [sBoxCount]
 	dec a
 	ld b, a
-	call Functiondcbc
+	call RestorePPOfDepositedPokemon
 Functiondcb2: ; dcb2 (3:5cb2)
 	call CloseSRAM
 	and a
@@ -615,7 +615,7 @@ Functiondcb7: ; dcb7 (3:5cb7)
 	scf
 	ret
 
-Functiondcbc: ; dcbc (3:5cbc)
+RestorePPOfDepositedPokemon:
 	ld a, b
 	ld hl, sBoxMon1Species
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -947,7 +947,7 @@ SendMonIntoBox: ; de74 (3:5e74)
 	ld bc, $4
 	call CopyBytes
 	ld b, $0
-	call Functiondcbc
+	call RestorePPOfDepositedPokemon
 	call CloseSRAM
 	scf
 	ret
diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
new file mode 100644
index 00000000..79f70d05
--- /dev/null
+++ b/engine/pokemon/move_mon_wo_mail.asm
@@ -0,0 +1,133 @@
+InsertPokemonIntoBox:
+	ld a, BANK(sBoxCount)
+	call OpenSRAM
+	ld hl, sBoxCount
+	call InsertSpeciesIntoBoxOrParty
+	ld a, [sBoxCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, sBoxMonNicknames
+	ld bc, MON_NAME_LENGTH
+	ld de, wBufferMonNick
+	call InsertDataIntoBoxOrParty
+	ld a, [sBoxCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, sBoxMonOT
+	ld bc, NAME_LENGTH
+	ld de, wBufferMonOT
+	call InsertDataIntoBoxOrParty
+	ld a, [sBoxCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, sBoxMons
+	ld bc, BOXMON_STRUCT_LENGTH
+	ld de, wBufferMon
+	call InsertDataIntoBoxOrParty
+	ld hl, wBufferMonMoves
+	ld de, wTempMonMoves
+	ld bc, NUM_MOVES
+	call CopyBytes
+	ld hl, wBufferMonPP
+	ld de, wTempMonPP
+	ld bc, NUM_MOVES
+	call CopyBytes
+	ld a, [wCurPartyMon]
+	ld b, a
+	farcall RestorePPOfDepositedPokemon
+	jp CloseSRAM
+
+InsertPokemonIntoParty:
+	ld hl, wPartyCount
+	call InsertSpeciesIntoBoxOrParty
+	ld a, [wPartyCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, wPartyMonNicknames
+	ld bc, MON_NAME_LENGTH
+	ld de, wBufferMonNick
+	call InsertDataIntoBoxOrParty
+	ld a, [wPartyCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, wPartyMonOT
+	ld bc, NAME_LENGTH
+	ld de, wBufferMonOT
+	call InsertDataIntoBoxOrParty
+	ld a, [wPartyCount]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	ld hl, wPartyMons
+	ld bc, PARTYMON_STRUCT_LENGTH
+	ld de, wBufferMon
+	call InsertDataIntoBoxOrParty
+	ret
+
+InsertSpeciesIntoBoxOrParty:
+	inc [hl]
+	inc hl
+	ld a, [wCurPartyMon]
+	ld c, a
+	ld b, 0
+	add hl, bc
+	ld a, [wCurPartySpecies]
+	ld c, a
+.loop
+	ld a, [hl]
+	ld [hl], c
+	inc hl
+	inc c
+	ld c, a
+	jr nz, .loop
+	ret
+
+InsertDataIntoBoxOrParty:
+	push de
+	push hl
+	push bc
+	ld a, [wNextBoxOrPartyIndex]
+	dec a
+	call AddNTimes
+	push hl
+	add hl, bc
+	ld d, h
+	ld e, l
+	pop hl
+.loop
+	push bc
+	ld a, [wNextBoxOrPartyIndex]
+	ld b, a
+	ld a, [wCurPartyMon]
+	cp b
+	pop bc
+	jr z, .insert
+	push hl
+	push de
+	push bc
+	call CopyBytes
+	pop bc
+	pop de
+	pop hl
+	push hl
+	ld a, l
+	sub c
+	ld l, a
+	ld a, h
+	sbc b
+	ld h, a
+	pop de
+	ld a, [wNextBoxOrPartyIndex]
+	dec a
+	ld [wNextBoxOrPartyIndex], a
+	jr .loop
+
+.insert
+	pop bc
+	pop hl
+	ld a, [wCurPartyMon]
+	call AddNTimes
+	ld d, h
+	ld e, l
+	pop hl
+	call CopyBytes
+	ret
diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm
index 0c45cf57..3d7a5b1b 100644
--- a/engine/tilesets/map_palettes.asm
+++ b/engine/tilesets/map_palettes.asm
@@ -17,7 +17,7 @@ _SwapTextboxPalettes::
 	ld h, a
 	ld a, [hl]
 	and $f
-    bit 3, a
+	bit 3, a
 	jr z, .next
 	jr .asm_8038
 
@@ -31,8 +31,8 @@ _SwapTextboxPalettes::
 	ld a, [hl]
 	swap a
 	and $f
-    bit 3, a
-    jr z, .next
+	bit 3, a
+	jr z, .next
 
 .asm_8038
 	ld a, [wMapGroup]
@@ -73,7 +73,7 @@ _ScrollBGMapPalettes::
 	ld h, a
 	ld a, [hl]
 	and $f
-    bit 3, a
+	bit 3, a
 	jr z, .next
 	jr .asm_8083
 
diff --git a/gfx/intro/copyright.2bpp b/gfx/intro/copyright.2bpp
new file mode 100644
index 00000000..07de9357
--- /dev/null
+++ b/gfx/intro/copyright.2bpp
diff --git a/gfx/intro/copyright.png b/gfx/intro/copyright.png
deleted file mode 100644
index 0ad7c2ef..00000000
--- a/gfx/intro/copyright.png
+++ /dev/null
diff --git a/gfx/intro/gamefreak_logo.1bpp b/gfx/intro/gamefreak_logo.1bpp
new file mode 100644
index 00000000..697590aa
--- /dev/null
+++ b/gfx/intro/gamefreak_logo.1bpp
diff --git a/gfx/intro/gamefreak_logo.png b/gfx/intro/gamefreak_logo.png
deleted file mode 100644
index 7038efb5..00000000
--- a/gfx/intro/gamefreak_logo.png
+++ /dev/null
diff --git a/gfx/intro/gamefreak_presents.1bpp b/gfx/intro/gamefreak_presents.1bpp
new file mode 100644
index 00000000..400e6f3c
--- /dev/null
+++ b/gfx/intro/gamefreak_presents.1bpp
diff --git a/gfx/intro/gamefreak_presents.png b/gfx/intro/gamefreak_presents.png
deleted file mode 100644
index d5ff5c43..00000000
--- a/gfx/intro/gamefreak_presents.png
+++ /dev/null
diff --git a/gfx/intro/logo_sparkle.2bpp b/gfx/intro/logo_sparkle.2bpp
new file mode 100644
index 00000000..41b31988
--- /dev/null
+++ b/gfx/intro/logo_sparkle.2bpp
diff --git a/gfx/intro/logo_sparkle.png b/gfx/intro/logo_sparkle.png
deleted file mode 100644
index feaa9c1f..00000000
--- a/gfx/intro/logo_sparkle.png
+++ /dev/null
diff --git a/gfx/intro/logo_star.2bpp b/gfx/intro/logo_star.2bpp
new file mode 100644
index 00000000..4e7e61a8
--- /dev/null
+++ b/gfx/intro/logo_star.2bpp
diff --git a/gfx/intro/logo_star.png b/gfx/intro/logo_star.png
deleted file mode 100644
index 8fc2f734..00000000
--- a/gfx/intro/logo_star.png
+++ /dev/null
diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp
new file mode 100644
index 00000000..22be5508
--- /dev/null
+++ b/gfx/misc/pack.2bpp
diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png
deleted file mode 100644
index 738a9dd9..00000000
--- a/gfx/misc/pack.png
+++ /dev/null
diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp
new file mode 100644
index 00000000..484bc94c
--- /dev/null
+++ b/gfx/misc/pack_menu.2bpp
diff --git a/gfx/misc/pack_menu.png b/gfx/misc/pack_menu.png
deleted file mode 100644
index 52e2bcdd..00000000
--- a/gfx/misc/pack_menu.png
+++ /dev/null
diff --git a/gfx/namingscreen/border.2bpp b/gfx/namingscreen/border.2bpp
new file mode 100644
index 00000000..5046cc61
--- /dev/null
+++ b/gfx/namingscreen/border.2bpp
diff --git a/gfx/namingscreen/border.png b/gfx/namingscreen/border.png
deleted file mode 100644
index 36935ab8..00000000
--- a/gfx/namingscreen/border.png
+++ /dev/null
diff --git a/gfx/namingscreen/cursor.2bpp b/gfx/namingscreen/cursor.2bpp
new file mode 100644
index 00000000..852606f9
--- /dev/null
+++ b/gfx/namingscreen/cursor.2bpp
diff --git a/gfx/namingscreen/cursor.png b/gfx/namingscreen/cursor.png
deleted file mode 100644
index a0429a3a..00000000
--- a/gfx/namingscreen/cursor.png
+++ /dev/null
diff --git a/gfx/namingscreen/ed.1bpp b/gfx/namingscreen/ed.1bpp
new file mode 100644
index 00000000..7bbee183
--- /dev/null
+++ b/gfx/namingscreen/ed.1bpp
@@ -0,0 +1 @@
+ðÀðÎý


\ No newline at end of file
diff --git a/gfx/namingscreen/ed.png b/gfx/namingscreen/ed.png
deleted file mode 100644
index c8e132b9..00000000
--- a/gfx/namingscreen/ed.png
+++ /dev/null
diff --git a/gfx/namingscreen/mail_icon.2bpp b/gfx/namingscreen/mail_icon.2bpp
new file mode 100644
index 00000000..18892689
--- /dev/null
+++ b/gfx/namingscreen/mail_icon.2bpp
diff --git a/gfx/namingscreen/mail_icon.png b/gfx/namingscreen/mail_icon.png
deleted file mode 100644
index 7ad25edb..00000000
--- a/gfx/namingscreen/mail_icon.png
+++ /dev/null
diff --git a/gfx/namingscreen/middleline.1bpp b/gfx/namingscreen/middleline.1bpp
new file mode 100644
index 00000000..9713c883
--- /dev/null
+++ b/gfx/namingscreen/middleline.1bpp
diff --git a/gfx/namingscreen/middleline.png b/gfx/namingscreen/middleline.png
deleted file mode 100644
index a34e82bf..00000000
--- a/gfx/namingscreen/middleline.png
+++ /dev/null
diff --git a/gfx/namingscreen/underline.1bpp b/gfx/namingscreen/underline.1bpp
new file mode 100644
index 00000000..3da14ecb
--- /dev/null
+++ b/gfx/namingscreen/underline.1bpp
diff --git a/gfx/namingscreen/underline.png b/gfx/namingscreen/underline.png
deleted file mode 100644
index e92cd4d6..00000000
--- a/gfx/namingscreen/underline.png
+++ /dev/null
diff --git a/gfx/overworld/heal_machine.2bpp b/gfx/overworld/heal_machine.2bpp
new file mode 100644
index 00000000..1314e8c4
--- /dev/null
+++ b/gfx/overworld/heal_machine.2bpp
diff --git a/gfx/overworld/heal_machine.png b/gfx/overworld/heal_machine.png
deleted file mode 100755
index dbf51348..00000000
--- a/gfx/overworld/heal_machine.png
+++ /dev/null
diff --git a/gfx/pics/abra/front.2bpp b/gfx/pics/abra/front.2bpp
deleted file mode 100644
index 0d958845..00000000
--- a/gfx/pics/abra/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/alakazam/front.2bpp b/gfx/pics/alakazam/front.2bpp
deleted file mode 100644
index 978b1f03..00000000
--- a/gfx/pics/alakazam/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/arbok/front.2bpp b/gfx/pics/arbok/front.2bpp
deleted file mode 100644
index c30f52dc..00000000
--- a/gfx/pics/arbok/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/arcanine/front.2bpp b/gfx/pics/arcanine/front.2bpp
deleted file mode 100644
index b016dcba..00000000
--- a/gfx/pics/arcanine/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/beedrill/front.2bpp b/gfx/pics/beedrill/front.2bpp
deleted file mode 100644
index 755de5a2..00000000
--- a/gfx/pics/beedrill/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/bellsprout/front.2bpp b/gfx/pics/bellsprout/front.2bpp
deleted file mode 100644
index cb3440d1..00000000
--- a/gfx/pics/bellsprout/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/blastoise/front.2bpp b/gfx/pics/blastoise/front.2bpp
deleted file mode 100644
index 837dba1b..00000000
--- a/gfx/pics/blastoise/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/bulbasaur/front.2bpp b/gfx/pics/bulbasaur/front.2bpp
deleted file mode 100644
index b9f2585a..00000000
--- a/gfx/pics/bulbasaur/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/butterfree/front.2bpp b/gfx/pics/butterfree/front.2bpp
deleted file mode 100644
index 18066dd1..00000000
--- a/gfx/pics/butterfree/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/caterpie/front.2bpp b/gfx/pics/caterpie/front.2bpp
deleted file mode 100644
index 21f0c8ba..00000000
--- a/gfx/pics/caterpie/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/charizard/front.2bpp b/gfx/pics/charizard/front.2bpp
deleted file mode 100644
index 1157f7e9..00000000
--- a/gfx/pics/charizard/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/charmander/front.2bpp b/gfx/pics/charmander/front.2bpp
deleted file mode 100644
index b822a173..00000000
--- a/gfx/pics/charmander/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/charmeleon/front.2bpp b/gfx/pics/charmeleon/front.2bpp
deleted file mode 100644
index 364481b6..00000000
--- a/gfx/pics/charmeleon/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/clefable/front.2bpp b/gfx/pics/clefable/front.2bpp
deleted file mode 100644
index e52d8fd2..00000000
--- a/gfx/pics/clefable/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/clefairy/front.2bpp b/gfx/pics/clefairy/front.2bpp
deleted file mode 100644
index b3960ee7..00000000
--- a/gfx/pics/clefairy/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/cloyster/front.2bpp b/gfx/pics/cloyster/front.2bpp
deleted file mode 100644
index 6b0d4f15..00000000
--- a/gfx/pics/cloyster/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/cubone/front.2bpp b/gfx/pics/cubone/front.2bpp
deleted file mode 100644
index 24318e15..00000000
--- a/gfx/pics/cubone/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/dewgong/front.2bpp b/gfx/pics/dewgong/front.2bpp
deleted file mode 100644
index efba9498..00000000
--- a/gfx/pics/dewgong/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/diglett/front.2bpp b/gfx/pics/diglett/front.2bpp
deleted file mode 100644
index 65bcb90d..00000000
--- a/gfx/pics/diglett/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/dodrio/front.2bpp b/gfx/pics/dodrio/front.2bpp
deleted file mode 100644
index bdc124b2..00000000
--- a/gfx/pics/dodrio/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/doduo/front.2bpp b/gfx/pics/doduo/front.2bpp
deleted file mode 100644
index 3285add3..00000000
--- a/gfx/pics/doduo/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/drowzee/front.2bpp b/gfx/pics/drowzee/front.2bpp
deleted file mode 100644
index 3ef9bd91..00000000
--- a/gfx/pics/drowzee/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/dugtrio/front.2bpp b/gfx/pics/dugtrio/front.2bpp
deleted file mode 100644
index b840e13d..00000000
--- a/gfx/pics/dugtrio/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/ekans/front.2bpp b/gfx/pics/ekans/front.2bpp
deleted file mode 100644
index f70d888b..00000000
--- a/gfx/pics/ekans/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/electrode/front.2bpp b/gfx/pics/electrode/front.2bpp
deleted file mode 100644
index ec6da7fe..00000000
--- a/gfx/pics/electrode/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/exeggcute/front.2bpp b/gfx/pics/exeggcute/front.2bpp
deleted file mode 100644
index 811710dd..00000000
--- a/gfx/pics/exeggcute/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/exeggutor/front.2bpp b/gfx/pics/exeggutor/front.2bpp
deleted file mode 100644
index 60a8d935..00000000
--- a/gfx/pics/exeggutor/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/farfetch_d/front.2bpp b/gfx/pics/farfetch_d/front.2bpp
deleted file mode 100644
index f71b92ec..00000000
--- a/gfx/pics/farfetch_d/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/fearow/front.2bpp b/gfx/pics/fearow/front.2bpp
deleted file mode 100644
index 848bc5da..00000000
--- a/gfx/pics/fearow/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/gastly/front.2bpp b/gfx/pics/gastly/front.2bpp
deleted file mode 100644
index 2813a6db..00000000
--- a/gfx/pics/gastly/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/gengar/front.2bpp b/gfx/pics/gengar/front.2bpp
deleted file mode 100644
index 14a69e2c..00000000
--- a/gfx/pics/gengar/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/geodude/front.2bpp b/gfx/pics/geodude/front.2bpp
deleted file mode 100644
index d237188c..00000000
--- a/gfx/pics/geodude/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/gloom/front.2bpp b/gfx/pics/gloom/front.2bpp
deleted file mode 100644
index e42c667d..00000000
--- a/gfx/pics/gloom/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/golbat/front.2bpp b/gfx/pics/golbat/front.2bpp
deleted file mode 100644
index 8c86d5d4..00000000
--- a/gfx/pics/golbat/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/golduck/front.2bpp b/gfx/pics/golduck/front.2bpp
deleted file mode 100644
index d588509e..00000000
--- a/gfx/pics/golduck/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/golem/front.2bpp b/gfx/pics/golem/front.2bpp
deleted file mode 100644
index 2e4fdb7d..00000000
--- a/gfx/pics/golem/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/graveler/front.2bpp b/gfx/pics/graveler/front.2bpp
deleted file mode 100644
index b4071986..00000000
--- a/gfx/pics/graveler/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/grimer/front.2bpp b/gfx/pics/grimer/front.2bpp
deleted file mode 100644
index 6020eea1..00000000
--- a/gfx/pics/grimer/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/growlithe/front.2bpp b/gfx/pics/growlithe/front.2bpp
deleted file mode 100644
index b952ad05..00000000
--- a/gfx/pics/growlithe/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/haunter/front.2bpp b/gfx/pics/haunter/front.2bpp
deleted file mode 100644
index 533d9ec1..00000000
--- a/gfx/pics/haunter/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/hitmonchan/front.2bpp b/gfx/pics/hitmonchan/front.2bpp
deleted file mode 100644
index 575c9b6f..00000000
--- a/gfx/pics/hitmonchan/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/hitmonlee/front.2bpp b/gfx/pics/hitmonlee/front.2bpp
deleted file mode 100644
index 6878abbc..00000000
--- a/gfx/pics/hitmonlee/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/hypno/front.2bpp b/gfx/pics/hypno/front.2bpp
deleted file mode 100644
index 2c56933e..00000000
--- a/gfx/pics/hypno/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/ivysaur/front.2bpp b/gfx/pics/ivysaur/front.2bpp
deleted file mode 100644
index a0f78dc4..00000000
--- a/gfx/pics/ivysaur/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/jigglypuff/front.2bpp b/gfx/pics/jigglypuff/front.2bpp
deleted file mode 100644
index 6011501e..00000000
--- a/gfx/pics/jigglypuff/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/kadabra/front.2bpp b/gfx/pics/kadabra/front.2bpp
deleted file mode 100644
index b3d7e44b..00000000
--- a/gfx/pics/kadabra/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/kakuna/front.2bpp b/gfx/pics/kakuna/front.2bpp
deleted file mode 100644
index 2eb1f87c..00000000
--- a/gfx/pics/kakuna/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/kingler/front.2bpp b/gfx/pics/kingler/front.2bpp
deleted file mode 100644
index 8504034c..00000000
--- a/gfx/pics/kingler/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/koffing/front.2bpp b/gfx/pics/koffing/front.2bpp
deleted file mode 100644
index b097c9aa..00000000
--- a/gfx/pics/koffing/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/krabby/front.2bpp b/gfx/pics/krabby/front.2bpp
deleted file mode 100644
index 316f042d..00000000
--- a/gfx/pics/krabby/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/lickitung/front.2bpp b/gfx/pics/lickitung/front.2bpp
deleted file mode 100644
index b4ced51f..00000000
--- a/gfx/pics/lickitung/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/machamp/front.2bpp b/gfx/pics/machamp/front.2bpp
deleted file mode 100644
index 1149ed3a..00000000
--- a/gfx/pics/machamp/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/machoke/front.2bpp b/gfx/pics/machoke/front.2bpp
deleted file mode 100644
index 7a63d131..00000000
--- a/gfx/pics/machoke/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/machop/front.2bpp b/gfx/pics/machop/front.2bpp
deleted file mode 100644
index 1d872699..00000000
--- a/gfx/pics/machop/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/magnemite/front.2bpp b/gfx/pics/magnemite/front.2bpp
deleted file mode 100644
index 2b8434ba..00000000
--- a/gfx/pics/magnemite/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/magneton/front.2bpp b/gfx/pics/magneton/front.2bpp
deleted file mode 100644
index dbe09500..00000000
--- a/gfx/pics/magneton/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/mankey/front.2bpp b/gfx/pics/mankey/front.2bpp
deleted file mode 100644
index d8c36ab6..00000000
--- a/gfx/pics/mankey/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/marowak/front.2bpp b/gfx/pics/marowak/front.2bpp
deleted file mode 100644
index d9a29cf7..00000000
--- a/gfx/pics/marowak/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/meowth/front.2bpp b/gfx/pics/meowth/front.2bpp
deleted file mode 100644
index 39ac3179..00000000
--- a/gfx/pics/meowth/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/metapod/front.2bpp b/gfx/pics/metapod/front.2bpp
deleted file mode 100644
index 08d00f5a..00000000
--- a/gfx/pics/metapod/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/muk/front.2bpp b/gfx/pics/muk/front.2bpp
deleted file mode 100644
index fd4d1f97..00000000
--- a/gfx/pics/muk/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidoking/front.2bpp b/gfx/pics/nidoking/front.2bpp
deleted file mode 100644
index 3353bfe7..00000000
--- a/gfx/pics/nidoking/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidoqueen/front.2bpp b/gfx/pics/nidoqueen/front.2bpp
deleted file mode 100644
index 84114068..00000000
--- a/gfx/pics/nidoqueen/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidoran_f/front.2bpp b/gfx/pics/nidoran_f/front.2bpp
deleted file mode 100644
index f262426c..00000000
--- a/gfx/pics/nidoran_f/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidoran_m/front.2bpp b/gfx/pics/nidoran_m/front.2bpp
deleted file mode 100644
index b87b5b37..00000000
--- a/gfx/pics/nidoran_m/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidorina/front.2bpp b/gfx/pics/nidorina/front.2bpp
deleted file mode 100644
index e12e1258..00000000
--- a/gfx/pics/nidorina/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/nidorino/front.2bpp b/gfx/pics/nidorino/front.2bpp
deleted file mode 100644
index bc724ec5..00000000
--- a/gfx/pics/nidorino/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/ninetales/front.2bpp b/gfx/pics/ninetales/front.2bpp
deleted file mode 100644
index 5ab8aaa6..00000000
--- a/gfx/pics/ninetales/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/oddish/front.2bpp b/gfx/pics/oddish/front.2bpp
deleted file mode 100644
index f185d9cc..00000000
--- a/gfx/pics/oddish/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/onix/front.2bpp b/gfx/pics/onix/front.2bpp
deleted file mode 100644
index 17f2ed99..00000000
--- a/gfx/pics/onix/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/paras/front.2bpp b/gfx/pics/paras/front.2bpp
deleted file mode 100644
index 055a297d..00000000
--- a/gfx/pics/paras/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/parasect/front.2bpp b/gfx/pics/parasect/front.2bpp
deleted file mode 100644
index fcaf5593..00000000
--- a/gfx/pics/parasect/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/persian/front.2bpp b/gfx/pics/persian/front.2bpp
deleted file mode 100644
index 196736a1..00000000
--- a/gfx/pics/persian/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/pidgeot/front.2bpp b/gfx/pics/pidgeot/front.2bpp
deleted file mode 100644
index ccd96ba5..00000000
--- a/gfx/pics/pidgeot/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/pidgeotto/front.2bpp b/gfx/pics/pidgeotto/front.2bpp
deleted file mode 100644
index a01e3f35..00000000
--- a/gfx/pics/pidgeotto/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/pidgey/front.2bpp b/gfx/pics/pidgey/front.2bpp
deleted file mode 100644
index a99ca661..00000000
--- a/gfx/pics/pidgey/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/pikachu/front.2bpp b/gfx/pics/pikachu/front.2bpp
deleted file mode 100644
index 8a1a7f1d..00000000
--- a/gfx/pics/pikachu/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/poliwag/front.2bpp b/gfx/pics/poliwag/front.2bpp
deleted file mode 100644
index cd54221a..00000000
--- a/gfx/pics/poliwag/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/poliwhirl/front.2bpp b/gfx/pics/poliwhirl/front.2bpp
deleted file mode 100644
index c4e6f267..00000000
--- a/gfx/pics/poliwhirl/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/poliwrath/front.2bpp b/gfx/pics/poliwrath/front.2bpp
deleted file mode 100644
index c28daa8d..00000000
--- a/gfx/pics/poliwrath/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/ponyta/front.2bpp b/gfx/pics/ponyta/front.2bpp
deleted file mode 100644
index 6194a4be..00000000
--- a/gfx/pics/ponyta/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/primeape/front.2bpp b/gfx/pics/primeape/front.2bpp
deleted file mode 100644
index 2f7965f7..00000000
--- a/gfx/pics/primeape/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/psyduck/front.2bpp b/gfx/pics/psyduck/front.2bpp
deleted file mode 100644
index e7bf5ec3..00000000
--- a/gfx/pics/psyduck/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/raichu/front.2bpp b/gfx/pics/raichu/front.2bpp
deleted file mode 100644
index 689e8bee..00000000
--- a/gfx/pics/raichu/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/rapidash/front.2bpp b/gfx/pics/rapidash/front.2bpp
deleted file mode 100644
index a8c1ff99..00000000
--- a/gfx/pics/rapidash/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/raticate/front.2bpp b/gfx/pics/raticate/front.2bpp
deleted file mode 100644
index aa81ca8d..00000000
--- a/gfx/pics/raticate/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/rattata/front.2bpp b/gfx/pics/rattata/front.2bpp
deleted file mode 100644
index 63d93f76..00000000
--- a/gfx/pics/rattata/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/rhyhorn/front.2bpp b/gfx/pics/rhyhorn/front.2bpp
deleted file mode 100644
index b27fef88..00000000
--- a/gfx/pics/rhyhorn/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/sandshrew/front.2bpp b/gfx/pics/sandshrew/front.2bpp
deleted file mode 100644
index 23b4277e..00000000
--- a/gfx/pics/sandshrew/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/sandslash/front.2bpp b/gfx/pics/sandslash/front.2bpp
deleted file mode 100644
index 3ec11f22..00000000
--- a/gfx/pics/sandslash/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/seel/front.2bpp b/gfx/pics/seel/front.2bpp
deleted file mode 100644
index dda07652..00000000
--- a/gfx/pics/seel/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/shellder/front.2bpp b/gfx/pics/shellder/front.2bpp
deleted file mode 100644
index c01e40a3..00000000
--- a/gfx/pics/shellder/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/slowbro/front.2bpp b/gfx/pics/slowbro/front.2bpp
deleted file mode 100644
index 48f0ed34..00000000
--- a/gfx/pics/slowbro/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/slowpoke/front.2bpp b/gfx/pics/slowpoke/front.2bpp
deleted file mode 100644
index 57a84cd4..00000000
--- a/gfx/pics/slowpoke/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/spearow/front.2bpp b/gfx/pics/spearow/front.2bpp
deleted file mode 100644
index f9690b6c..00000000
--- a/gfx/pics/spearow/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/squirtle/front.2bpp b/gfx/pics/squirtle/front.2bpp
deleted file mode 100644
index 8fd89631..00000000
--- a/gfx/pics/squirtle/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/tentacool/front.2bpp b/gfx/pics/tentacool/front.2bpp
deleted file mode 100644
index c0e0d7b6..00000000
--- a/gfx/pics/tentacool/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/tentacruel/front.2bpp b/gfx/pics/tentacruel/front.2bpp
deleted file mode 100644
index 019f5e90..00000000
--- a/gfx/pics/tentacruel/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/venomoth/front.2bpp b/gfx/pics/venomoth/front.2bpp
deleted file mode 100644
index 9fbba22f..00000000
--- a/gfx/pics/venomoth/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/venonat/front.2bpp b/gfx/pics/venonat/front.2bpp
deleted file mode 100644
index f7e6a9d2..00000000
--- a/gfx/pics/venonat/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/venusaur/front.2bpp b/gfx/pics/venusaur/front.2bpp
deleted file mode 100644
index 40c64e6f..00000000
--- a/gfx/pics/venusaur/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/victreebel/front.2bpp b/gfx/pics/victreebel/front.2bpp
deleted file mode 100644
index a7a7c815..00000000
--- a/gfx/pics/victreebel/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/vileplume/front.2bpp b/gfx/pics/vileplume/front.2bpp
deleted file mode 100644
index f3ed639f..00000000
--- a/gfx/pics/vileplume/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/voltorb/front.2bpp b/gfx/pics/voltorb/front.2bpp
deleted file mode 100644
index d776ea88..00000000
--- a/gfx/pics/voltorb/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/vulpix/front.2bpp b/gfx/pics/vulpix/front.2bpp
deleted file mode 100644
index abde2e5b..00000000
--- a/gfx/pics/vulpix/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/wartortle/front.2bpp b/gfx/pics/wartortle/front.2bpp
deleted file mode 100644
index 47832f91..00000000
--- a/gfx/pics/wartortle/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/weedle/front.2bpp b/gfx/pics/weedle/front.2bpp
deleted file mode 100644
index 5da162ff..00000000
--- a/gfx/pics/weedle/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/weepinbell/front.2bpp b/gfx/pics/weepinbell/front.2bpp
deleted file mode 100644
index b20c4c5e..00000000
--- a/gfx/pics/weepinbell/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/weezing/front.2bpp b/gfx/pics/weezing/front.2bpp
deleted file mode 100644
index 782a2374..00000000
--- a/gfx/pics/weezing/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/wigglytuff/front.2bpp b/gfx/pics/wigglytuff/front.2bpp
deleted file mode 100644
index 2a4378bf..00000000
--- a/gfx/pics/wigglytuff/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/zubat/front.2bpp b/gfx/pics/zubat/front.2bpp
deleted file mode 100644
index 8d9fac78..00000000
--- a/gfx/pics/zubat/front.2bpp
+++ /dev/null
diff --git a/gfx/sgb_border/gold.2bpp b/gfx/sgb_border/gold.2bpp
new file mode 100644
index 00000000..aad569e8
--- /dev/null
+++ b/gfx/sgb_border/gold.2bpp
diff --git a/gfx/sgb_border/gold.png b/gfx/sgb_border/gold.png
deleted file mode 100644
index 5f3e7ee7..00000000
--- a/gfx/sgb_border/gold.png
+++ /dev/null
diff --git a/gfx/sgb_border/silver.2bpp b/gfx/sgb_border/silver.2bpp
new file mode 100644
index 00000000..aad569e8
--- /dev/null
+++ b/gfx/sgb_border/silver.2bpp
diff --git a/gfx/sgb_border/silver.png b/gfx/sgb_border/silver.png
deleted file mode 100644
index 5f3e7ee7..00000000
--- a/gfx/sgb_border/silver.png
+++ /dev/null
diff --git a/home/gfx.asm b/home/gfx.asm
index 7c5deb51..409b0778 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -42,18 +42,18 @@ LoadFontsExtra::
 
 DecompressRequest2bpp::
 	push de
-	ld a, BANK(sScratch)
+	ld a, BANK(sDecompressScratch)
 	call OpenSRAM
 	push bc
 
-	ld de, sScratch
+	ld de, sDecompressScratch
 	ld a, b
 	call FarDecompress
 
 	pop bc
 	pop hl
 
-	ld de, sScratch
+	ld de, sDecompressScratch
 	call Request2bpp
 	call CloseSRAM
 	ret
@@ -267,7 +267,7 @@ Function_ea6::
 Function_eac::
 	push de
 	push hl
-	
+
 ; bank
 	ld a, b
 
diff --git a/home/pokemon.asm b/home/pokemon.asm
index 0c51fba8..9bc54b2d 100755
--- a/home/pokemon.asm
+++ b/home/pokemon.asm
@@ -60,7 +60,7 @@ DrawBattleHPBar::
 
 PrepMonFrontpic::
 	ld a, $1
-	ld [wcf3b], a
+	ld [wBoxAlignment], a
 
 _PrepMonFrontpic::
 	ld a, [wCurPartySpecies]
@@ -80,12 +80,12 @@ _PrepMonFrontpic::
 	lb bc, 7, 7
 	predef PlaceGraphic
 	xor a
-	ld [wcf3b], a
+	ld [wBoxAlignment], a
 	ret
 
 .not_pokemon
 	xor a
-	ld [wcf3b], a
+	ld [wBoxAlignment], a
 	inc a
 	ld [wCurPartySpecies], a
 	ret
@@ -236,7 +236,7 @@ GetBaseData::
 	jr .end
 
 .egg
-	ld de, UnknownEggPic
+	ld de, EggPic
 
 ; Sprite dimensions
 	ld b, $55 ; 5x5
diff --git a/main.asm b/main.asm
index c1c731fd..f5846516 100644
--- a/main.asm
+++ b/main.asm
@@ -409,6 +409,7 @@ IsAnyPokemonHoldingMail:
 	dr $4488c, $48000
 
 SECTION "bank12", ROMX, BANK[$12]
+PokemonPicPointers:
 	dr $48000, $4c000
 
 SECTION "bank13", ROMX, BANK[$13]
@@ -514,30 +515,14 @@ CalcExpAtLevel:
 _SwitchPartyMons:
 	dr $5161b, $51749
 
-GetUnownLetter::
-	dr $51749, $51780
-
-GetMonFrontpic::
-	dr $51780, $51786
-
-FrontpicPredef::
-	dr $51786, $51803
-
-GetMonBackpic::
-	dr $51803, $518a0
-
-GetTrainerPic::
-	dr $518a0, $518fa
-
-DecompressGet2bpp::
-	dr $518fa, $51b0b
-
+INCLUDE "engine/gfx/load_pics.asm"
+INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 
 Unknown53a6b:
 	dr $53a6b, $53a83
 
-UnknownEggPic:: ; 53a83
+EggPic::
 	dr $53a83, $54000
 
 SECTION "bank15", ROMX, BANK[$15]
@@ -571,9 +556,11 @@ SECTION "bank1e", ROMX, BANK[$1e]
 	dr $78000, $7c000
 
 SECTION "bank1f", ROMX, BANK[$1f]
+UnownPicPointers:
 	dr $7c000, $80000
 
 SECTION "bank20", ROMX, BANK[$20]
+TrainerPicPointers:
 	dr $80000, $84000
 
 SECTION "bank21", ROMX, BANK[$21]
@@ -984,7 +971,11 @@ SECTION "bank6f", ROMX, BANK[$6f]
 SECTION "bank70", ROMX, BANK[$70]
 	dr $1c0000, $1c0a66
 UpdateTimePredef::
-	dr $1c0a66, $1c0de9
+	dr $1c0a66, $1c0a7a
+StubbedGetFrontpic::
+	ret
+Function1c0a7b::
+	dr $1c0a7b, $1c0de9
 _DudeAutoInput_A::
 	dr $1c0de9, $1c0dee
 
diff --git a/sram.asm b/sram.asm
index e0c6c9ff..83d2b35f 100755
--- a/sram.asm
+++ b/sram.asm
@@ -1,5 +1,5 @@
 SECTION "Scratch", SRAM, BANK[0]
-sScratch:: ds $188 ; a000
+sDecompressScratch:: ds $188 ; a000
 
 SECTION "Decompress Buffer", SRAM, BANK[0]
 sDecompressBuffer:: ds 7 * 7 * $10 ; a188
diff --git a/wram.asm b/wram.asm
index 6a2ad8e6..f7d67061 100644
--- a/wram.asm
+++ b/wram.asm
@@ -120,7 +120,7 @@ SECTION "WRAM", WRAM0
 wLZAddress:: dw ; c1c2
 wLZBank::    db ; c1c4
 
-wBoxAlignment:: db ; c1c5
+wc1c5:: db ; c1c5
 
 wInputType::        db ; c1c6
 wAutoInputAddress:: dw ; c1c7
@@ -2109,7 +2109,7 @@ wCurPocket::
 	db ; ce65
 
 wPackUsedItem::
-wce66:: 
+wce66::
 	db ; ce66
 
 wRequested2bpp:: ds 1 ; ce67
@@ -2273,6 +2273,13 @@ UNION ; ceed
 wTempMail:: mailmsg wTempMail
 
 NEXTU ; ceed
+; mon buffer
+wBufferMonNick:: ds MON_NAME_LENGTH ; ceed
+wBufferMonOT:: ds NAME_LENGTH ; cef8
+wBufferMon:: party_struct wBufferMon ; cf03
+	ds 8
+
+NEXTU ; ceed
 ; bug-catching contest
 wBugContestResults::
 	bugcontestwinner wBugContestFirstPlace
@@ -2421,12 +2428,12 @@ wJumpStdScriptBuffer:: ds 3
 ENDU
 
 wcf3a:: ds 1
-wcf3b:: ds 1
+wBoxAlignment:: db
 wcf3c:: ds 1
 wcf3d:: ds 1
 wcf3e:: ds 1
 wcf3f:: ds 1
-ENDU 
+ENDU
 
 wcf40:: ds 1 ; cf40
 wcf41:: ds 1 ; cf41
@@ -2501,7 +2508,7 @@ wcfd2:: ds 1 ; cfd2
 wSwitchMon::
 wSwitchItem::
 wMoveSwapBuffer::
-wcfd3:: 
+wcfd3::
 	db ; cfd3
 
 wMenuScrollPosition:: ds 1 ; cfd4
@@ -2781,7 +2788,7 @@ wd11a:: ds 1 ; d11a
 wd11b:: ds 1 ; d11b
 wd11c:: ds 1 ; d11c
 wTrainerClass:: ds 1 ; d11d
-wd11e:: ds 1 ; d11e
+wUnownLetter:: ds 1 ; d11e
 wd11f:: ds 1 ; d11f
 
 wBaseDexNo:: ; d120
@@ -2803,10 +2810,8 @@ wd12d:: ds 1 ; d12d
 wd12e:: ds 1 ; d12e
 wBaseEggSteps:: db ; d12f
 wd130:: ds 1 ; d130
-wBasePicSize::
-wd131:: ds 1 ; d131
-wBaseUnusedFrontpic::
-wd132:: ds 1 ; d132
+wBasePicSize:: db ; d131
+wBaseUnusedFrontpic:: db ; d132
 wd133:: ds 1 ; d133
 wd134:: ds 1 ; d134
 wd135:: ds 1 ; d135
@@ -2937,7 +2942,7 @@ wOptions:: ; d199
 ; bit 6: battle style shift/set
 ; bit 7: battle scene off/on
 	ds 1
-	
+
 wSaveFileExists:: ds 1 ; d19a
 wTextboxFrame:: ; d19b
 ; bits 0-2: textbox frame 0-7
@@ -3137,7 +3142,7 @@ wPokegearFlags:: ; d67c
 
 wRadioTuningKnob:: ds 1 ; d67d
 wLastDexMode:: ds 1 ; d67e
-	
+
 	ds 1
 
 wWhichRegisteredItem:: ds 1 ; d680
@@ -3655,7 +3660,7 @@ wMapData::
 wVisitedSpawns:: ds 4 ; flag_array NUM_SPAWNS ; d9ee
 
 	warp_struct wDig ; d9f2
-	
+
 wBackupWarpNumber:: db ; d9f5
 wBackupMapGroup:: db ; d9f6
 wBackupMapNumber:: db ; d9f7
@@ -3771,7 +3776,7 @@ wBreedMotherOrNonDitto:: ; dc79
 ; nz: no
 	ds 1
 
-wBreedMon2::	
+wBreedMon2::
 wBreedMon2Nick::  ds MON_NAME_LENGTH ; dc7a
 wBreedMon2OT::    ds NAME_LENGTH ; dc85
 wBreedMon2Stats:: box_struct wBreedMon2 ; dc90