From 40eae001a168502782338340db9f47216ae850f4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Tue, 3 Nov 2015 09:45:25 -0500
Subject: [PATCH] Status strings

---
 battle/core.asm   |  4 ++--
 engine/predef.asm |  4 ++--
 main.asm          | 30 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/battle/core.asm b/battle/core.asm
index f42fe3c55..d136b33e2 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -4945,7 +4945,7 @@ PrintPlayerHUD: ; 3dfbf
 	push af
 	push hl
 	ld de, BattleMonStatus
-	predef Function50d2e
+	predef PlaceNonFaintStatus
 	pop hl
 	pop bc
 	ret nz
@@ -5024,7 +5024,7 @@ DrawEnemyHUD: ; 3e043
 	push af
 	push hl
 	ld de, EnemyMonStatus
-	predef Function50d2e
+	predef PlaceNonFaintStatus
 	pop hl
 	pop bc
 	jr nz, .asm_3e0be
diff --git a/engine/predef.asm b/engine/predef.asm
index 9fa26875a..8f6a17779 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -63,7 +63,7 @@ PredefPointers:: ; 856b
 	add_predef Function28f24
 	add_predef CopyPkmnToTempMon
 	add_predef ListMoves ; $20
-	add_predef Function50d2e
+	add_predef PlaceNonFaintStatus
 	add_predef Function50cdb
 	add_predef Function50c50
 	add_predef GetGender
@@ -99,7 +99,7 @@ PredefPointers:: ; 856b
 	add_predef ConvertMon_1to2
 	add_predef Functionfb877
 	add_predef Functiond0000
-	add_predef Function50d0a
+	add_predef PlaceStatusString
 	add_predef Functiond00a3
 	add_predef Functiond008e
 	add_predef Functiond0669 ; $48
diff --git a/main.asm b/main.asm
index ef38086e4..52279f048 100644
--- a/main.asm
+++ b/main.asm
@@ -44486,7 +44486,7 @@ Function4e013: ; 4e013 (13:6013)
 	hlcoord 6, 13
 	push hl
 	ld de, TempMonStatus
-	predef Function50d0a
+	predef PlaceStatusString
 	pop hl
 	jr nz, .asm_4e066
 	jr .asm_4e060
@@ -46219,7 +46219,7 @@ Function501b2: ; 501b2
 	ld e, l
 	ld d, h
 	pop hl
-	call Function50d0a
+	call PlaceStatusString
 
 .asm_501d5
 	pop hl
@@ -47916,7 +47916,7 @@ Function50cdb: ; 50cdb
 ; 50d0a
 
 
-Function50d0a: ; 50d0a
+PlaceStatusString: ; 50d0a
 	push de
 rept 2
 	inc de
@@ -47927,10 +47927,10 @@ endr
 	ld a, [de]
 	or b
 	pop de
-	jr nz, Function50d2e
+	jr nz, PlaceNonFaintStatus
 	push de
 	ld de, FntString
-	call Function50d25
+	call CopyStatusString
 	pop de
 	ld a, $1
 	and a
@@ -47941,7 +47941,7 @@ FntString: ; 50d22
 	db "FNT@"
 ; 50d25
 
-Function50d25: ; 50d25
+CopyStatusString: ; 50d25
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -47953,31 +47953,31 @@ Function50d25: ; 50d25
 	ret
 ; 50d2e
 
-Function50d2e: ; 50d2e
+PlaceNonFaintStatus: ; 50d2e
 	push de
 	ld a, [de]
 	ld de, PsnString
 	bit PSN, a
-	jr nz, .asm_50d53
+	jr nz, .place
 	ld de, BrnString
 	bit BRN, a
-	jr nz, .asm_50d53
+	jr nz, .place
 	ld de, FrzString
 	bit FRZ, a
-	jr nz, .asm_50d53
+	jr nz, .place
 	ld de, ParString
 	bit PAR, a
-	jr nz, .asm_50d53
+	jr nz, .place
 	ld de, SlpString
 	and SLP
-	jr z, .asm_50d59
+	jr z, .no_status
 
-.asm_50d53
-	call Function50d25
+.place
+	call CopyStatusString
 	ld a, $1
 	and a
 
-.asm_50d59
+.no_status
 	pop de
 	ret
 ; 50d5b