summaryrefslogtreecommitdiff
path: root/scripts/celadoncity.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
commit3330662296eabb6b3b7f0eed1c79003c8873c712 (patch)
treedae9a2f40425a236a3ef6ecce453cf16b4359c26 /scripts/celadoncity.asm
parent5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff)
parentd00b70b33ee909ad163f2cb1c639ce799db118d0 (diff)
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'scripts/celadoncity.asm')
-rwxr-xr-xscripts/celadoncity.asm16
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm
index cfc8f197..233b38bd 100755
--- a/scripts/celadoncity.asm
+++ b/scripts/celadoncity.asm
@@ -1,5 +1,14 @@
-CeladonCityScript: ; 19956 (6:5956)
+CeladonCityScript: ; 19a43 (6:5a43)
call EnableAutoTextBoxDrawing
+ ld hl, CeladonCityScriptPointers
+ ld a, [W_CELADONCITYCURSCRIPT]
+ call JumpTable
+ ret
+
+CeladonCityScriptPointers:
+ dw CeladonCityScript1
+
+CeladonCityScript1:
ResetEvents EVENT_1B8, EVENT_1BF
ResetEvent EVENT_67F
ret
@@ -99,8 +108,9 @@ CeladonCityText9: ; 199fe (6:59fe)
db "@"
CeladonCityText10: ; 19a03 (6:5a03)
- TX_FAR _CeladonCityText10
- db "@"
+ TX_ASM
+ callba Func_f1ac6
+ jp TextScriptEnd
CeladonCityText11: ; 19a08 (6:5a08)
TX_FAR _CeladonCityText11