From d51dcc263e487d4846cbe989c53c45bc0478b483 Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sun, 2 Apr 2017 13:27:47 -0700
Subject: Remove duplicate OaksLabText labels

For unknown reasons, the text pointer list for Oak's Lab is
duplicated. This is currently implemented by treating the
two text pointer lists as one large list. This leads to
duplicate labels and some confusing logic.

Refactor the code to treat the two text pointer lists
separately. This lets us remove several labels. It also
makes the code which sets the text pointer list
self-documenting.
---
 scripts/oakslab.asm | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index b91abd43..e73d7cf8 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -712,7 +712,7 @@ OaksLabScript_1d02b:
 	ret
 
 OaksLabScript_1d076:
-	ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
+	ld hl, OaksLabTextPointers2
 	ld a, l
 	ld [wMapTextPtr], a
 	ld a, h
@@ -747,19 +747,20 @@ OaksLabTextPointers:
 	dw OaksLabText25
 	dw OaksLabText26
 	dw OaksLabText27
-	dw OaksLabText28
-	dw OaksLabText29
-	dw OaksLabText30
-	dw OaksLabText31
-	dw OaksLabText32
-	dw OaksLabText33
-	dw OaksLabText34
-	dw OaksLabText35
-	dw OaksLabText36
-	dw OaksLabText37
-	dw OaksLabText38
-
-OaksLabText28:
+
+OaksLabTextPointers2:
+	dw OaksLabText1
+	dw OaksLabText2
+	dw OaksLabText3
+	dw OaksLabText4
+	dw OaksLabText5
+	dw OaksLabText6
+	dw OaksLabText7
+	dw OaksLabText8
+	dw OaksLabText9
+	dw OaksLabText10
+	dw OaksLabText11
+
 OaksLabText1:
 	TX_ASM
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
@@ -791,7 +792,6 @@ OaksLabText41:
 	TX_FAR _OaksLabText41
 	db "@"
 
-OaksLabText29:
 OaksLabText2:
 	TX_ASM
 	ld a, STARTER2
@@ -802,7 +802,6 @@ OaksLabText2:
 	ld b, $2
 	jr OaksLabScript_1d133
 
-OaksLabText30:
 OaksLabText3:
 	TX_ASM
 	ld a, STARTER3
@@ -813,7 +812,6 @@ OaksLabText3:
 	ld b, $3
 	jr OaksLabScript_1d133
 
-OaksLabText31:
 OaksLabText4:
 	TX_ASM
 	ld a, STARTER1
@@ -1070,8 +1068,6 @@ OaksLabText_1d31d:
 	TX_FAR _OaksLabText_1d31d
 	db "@"
 
-OaksLabText34:
-OaksLabText33:
 OaksLabText7:
 OaksLabText6:
 	TX_ASM
@@ -1083,12 +1079,10 @@ OaksLabText_1d32c:
 	TX_FAR _OaksLabText_1d32c
 	db "@"
 
-OaksLabText35:
 OaksLabText8:
 	TX_FAR _OaksLabText8
 	db "@"
 
-OaksLabText36:
 OaksLabText9:
 	TX_ASM
 	ld hl, OaksLabText_1d340
@@ -1227,8 +1221,6 @@ OaksLabText27:
 	TX_FAR _OaksLabText27
 	db "@"
 
-OaksLabText38:
-OaksLabText37:
 OaksLabText11:
 OaksLabText10:
 	TX_ASM
-- 
cgit v1.2.3