ref: 53cb0137e7b61093eb7bea852d3b7432a7383d8f
parent: 0d062b49a6585378d424185b3590e52493964a61
parent: d51dcc263e487d4846cbe989c53c45bc0478b483
author: YamaArashi <YamaArashi@users.noreply.github.com>
date: Mon Apr 3 15:58:24 EDT 2017
Merge pull request #152 from strager/strager-fix-oaks-lab Remove duplicate OaksLabText labels
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -712,7 +712,7 @@
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 @@
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 @@
TX_FAR _OaksLabText41
db "@"
-OaksLabText29:
OaksLabText2:
TX_ASM
ld a, STARTER2
@@ -802,7 +802,6 @@
ld b, $2
jr OaksLabScript_1d133
-OaksLabText30:
OaksLabText3:
TX_ASM
ld a, STARTER3
@@ -813,7 +812,6 @@
ld b, $3
jr OaksLabScript_1d133
-OaksLabText31:
OaksLabText4:
TX_ASM
ld a, STARTER1
@@ -1070,8 +1068,6 @@
TX_FAR _OaksLabText_1d31d
db "@"
-OaksLabText34:
-OaksLabText33:
OaksLabText7:
OaksLabText6:
TX_ASM
@@ -1083,12 +1079,10 @@
TX_FAR _OaksLabText_1d32c
db "@"
-OaksLabText35:
OaksLabText8:
TX_FAR _OaksLabText8
db "@"
-OaksLabText36:
OaksLabText9:
TX_ASM
ld hl, OaksLabText_1d340
@@ -1227,8 +1221,6 @@
TX_FAR _OaksLabText27
db "@"
-OaksLabText38:
-OaksLabText37:
OaksLabText11:
OaksLabText10:
TX_ASM