From 30b37da3870217da1eaecca82bb77ca4343ada49 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Tue, 22 Dec 2015 22:19:33 -0500
Subject: More stats screen shenanigans

---
 predef/cgb.asm |  6 +++---
 predef/sgb.asm | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'predef')

diff --git a/predef/cgb.asm b/predef/cgb.asm
index c235816c0..ab96ba8d3 100644
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -12,8 +12,8 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	jr nz, .not_ram
 	ld a, [SGBPredef]
 .not_ram
-	cp SCGB_FC
-	jp z, Function96f3
+	cp SCGB_PARTY_MENU_HP_PALS
+	jp z, CGB_ApplyPartyMenuHPPals
 	call Function9673
 	ld l, a
 	ld h, 0
@@ -277,7 +277,7 @@ Palette8f52: ; 8f52
 	RGB 00, 00, 00
 ; 8f6a
 
-Unknown_8f6a: ; 8f6a
+StatsScreenPals: ; 8f6a
 	RGB 31, 19, 31
 
 	RGB 21, 31, 14
diff --git a/predef/sgb.asm b/predef/sgb.asm
index aad463052..2de9c9359 100644
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -8,8 +8,8 @@ Predef_LoadSGBLayout: ; 864c
 	jr nz, .not_ram
 	ld a, [SGBPredef]
 .not_ram
-	cp SCGB_FC
-	jp z, Function8ade
+	cp SCGB_PARTY_MENU_HP_PALS
+	jp z, SGB_ApplyPartyMenuHPPals
 	ld l, a
 	ld h, 0
 	add hl, hl
@@ -390,7 +390,7 @@ endr
 	pop bc
 	ld a, c
 	and a
-	jr z, .asm_88ef
+	jr z, .partymon
 	ld hl, wSGBPals + 3
 	ld [hl], $e7
 	inc hl
@@ -399,11 +399,11 @@ endr
 	ld [hl], $62
 	inc hl
 	ld [hl], $c
-	jr .asm_8913
+	jr .done
 
-.asm_88ef
+.partymon
 	ld hl, PartyMon1DVs
-	ld bc, $30
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld c, l
@@ -419,7 +419,7 @@ endr
 	ld a, [hl]
 	ld [wSGBPals + 6], a
 
-.asm_8913
+.done
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-- 
cgit v1.2.3