From 6fc7ae92c00ce75c1e8af3860fa6ffe3f18e887f Mon Sep 17 00:00:00 2001
From: aaaaaa123456789 <aaaaaa123456789@acidch.at>
Date: Thu, 18 Jul 2019 07:38:14 -0300
Subject: [PATCH] QoL #2: unlink PokemonPicPointers and UnownPicPointers

---
 engine/gfx/load_pics.asm | 8 +++-----
 layout.link              | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 8b282ae69..c0e84597f 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -107,15 +107,14 @@ GetFrontpicPointer:
 	cp UNOWN
 	jr z, .unown
 	ld a, [wCurPartySpecies]
+	ld hl, PokemonPicPointers
 	ld d, BANK(PokemonPicPointers)
 	jr .ok
 .unown
 	ld a, [wUnownLetter]
+	ld hl, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 .ok
-	; These are assumed to be at the same address in their respective banks.
-	assert PokemonPicPointers == UnownPicPointers
-	ld hl, PokemonPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
@@ -206,13 +205,12 @@ GetMonBackpic:
 	ldh [rSVBK], a
 	push de
 
-	; These are assumed to be at the same address in their respective banks.
-	assert PokemonPicPointers == UnownPicPointers
 	ld hl, PokemonPicPointers
 	ld a, b
 	ld d, BANK(PokemonPicPointers)
 	cp UNOWN
 	jr nz, .ok
+	ld hl, UnownPicPointers
 	ld a, c
 	ld d, BANK(UnownPicPointers)
 .ok
diff --git a/layout.link b/layout.link
index 833ca307f..e55ffe461 100644
--- a/layout.link
+++ b/layout.link
@@ -192,11 +192,9 @@ ROMX $46
 ROMX $47
 	"Battle Tower"
 ROMX $48
-	org $4000
 	"Pic Pointers"
 	"Pics 1"
 ROMX $49
-	org $4000
 	"Unown Pic Pointers"
 	"Pics 2"
 ROMX $4a