summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-01-22 19:07:39 -0500
committeryenatch <yenatch@gmail.com>2014-01-22 19:07:39 -0500
commitbf743815fabea7ff0d5f6775a39befe94d919299 (patch)
tree5a719b00e5494691c07bda99b9097b1b33a28819
parent9da43a2311ff61ef89a187be4f8b897abf660bed (diff)
Silph Co 1f text was actually somewhere else
-rw-r--r--main.asm9
-rw-r--r--text/maps/silph_co_1f.asm6
2 files changed, 7 insertions, 8 deletions
diff --git a/main.asm b/main.asm
index 77706a9d..89cec4cd 100644
--- a/main.asm
+++ b/main.asm
@@ -115792,7 +115792,6 @@ INCLUDE "text/maps/rocket_hideout_b2f.asm"
INCLUDE "text/maps/rocket_hideout_b3f.asm"
INCLUDE "text/maps/rocket_hideout_b4f.asm"
INCLUDE "text/maps/rocket_hideout_elevator.asm"
-INCLUDE "text/maps/silph_co_1f.asm"
INCLUDE "text/maps/silph_co_2f.asm"
INCLUDE "text/maps/silph_co_3f.asm"
INCLUDE "text/maps/silph_co_4f.asm"
@@ -125958,13 +125957,7 @@ _SaffronMartText3: ; a242a (28:642a)
cont "fainted #MON!"
done
-_SilphCo1Text1: ; a245a (28:645a)
- text "Welcome!"
-
- para "The PRESIDENT is"
- line "in the boardroom"
- cont "on 11F!"
- done
+INCLUDE "text/maps/silph_co_1f.asm"
_SaffronPokecenterText1: ; a248e (28:648e)
text "#MON growth"
diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm
index 139597f9..ebb1cb90 100644
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/silph_co_1f.asm
@@ -1,2 +1,8 @@
+_SilphCo1Text1: ; a245a (28:645a)
+ text "Welcome!"
+ para "The PRESIDENT is"
+ line "in the boardroom"
+ cont "on 11F!"
+ done