summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 08:20:56 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 08:20:56 -0400
commit1f4f4b99a83406f3078ad639d2c81da32468d463 (patch)
tree17b53841b98b959868bc2e536f672b5d05f3e480 /main.asm
parenta10ddc9c3f94b02ddab6d03fe0121a0e4413b877 (diff)
Update Celadon scripts
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm9
1 files changed, 3 insertions, 6 deletions
diff --git a/main.asm b/main.asm
index c53ba358..4503d4d7 100755
--- a/main.asm
+++ b/main.asm
@@ -261,7 +261,6 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836
; INCLUDE "data/mapObjects/fuchsiacity.asm"
; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
- ; dr $18dee,$1902a ; map scripts
INCLUDE "scripts/pallettown.asm"
INCLUDE "scripts/viridiancity.asm"
@@ -270,11 +269,9 @@ INCLUDE "scripts/ceruleancity.asm"
dr $19841,$19a43 ; vermilion scripts
; INCLUDE "scripts/vermilioncity.asm"
-; INCLUDE "scripts/celadoncity.asm"
-CeladonCityScript:
- dr $19a43,$19a5f
-CeladonCityTextPointers:
- dr $19a5f,$1a4ea
+INCLUDE "scripts/celadoncity.asm"
+
+ dr $19b2b,$1a4ea
; INCLUDE "scripts/fuchsiacity.asm"
INCLUDE "engine/overworld/npc_movement.asm"