From 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 2 Jan 2017 04:27:51 -0500
Subject: label and document berry.c, decompress.c, item_use.c and label
 gBattleTypeFlags (#146)

* make ROM match again

* clean up item_use.c labels and clarify functions.

* label and clarify some functions in decompress.c

* label and clarify berry.c

* rename 20239F8 to gBattleTypeFlags

* formatting
---
 asm/mystery_event_script.s | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'asm/mystery_event_script.s')

diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index f3ba5c831..f0e842626 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -369,7 +369,7 @@ sub_8126438: @ 8126438
 	mov r7, r8
 	push {r7}
 	adds r7, r0, 0
-	bl sub_80B4940
+	bl IsEnigmaBerryValid
 	mov r8, r0
 	adds r0, r7, 0
 	bl ScriptReadWord
@@ -385,7 +385,7 @@ sub_8126438: @ 8126438
 	movs r2, 0x7
 	bl StringCopyN
 	adds r0, r4, 0
-	bl sub_80B48A8
+	bl SetEnigmaBerry
 	ldr r4, _0812648C @ =gStringVar2
 	adds r0, r4, 0
 	adds r1, r5, 0
@@ -422,7 +422,7 @@ _081264B8:
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r7, 0x6C]
-	bl sub_80B4940
+	bl IsEnigmaBerryValid
 	cmp r0, 0x1
 	bne _081264E0
 	ldr r0, _081264DC @ =0x0000402d
-- 
cgit v1.2.3