QoL #2: unlink PokemonPicPointers and UnownPicPointers

vulcandth · Oct 2, 2022 · 8e88b25 · 8e88b25
1 parent bef5113
commit 8e88b25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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