summaryrefslogtreecommitdiff
path: root/scripts/school.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/school.asm
parent5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff)
parentd00b70b33ee909ad163f2cb1c639ce799db118d0 (diff)
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'scripts/school.asm')
-rwxr-xr-xscripts/school.asm14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/school.asm b/scripts/school.asm
index 57eb58c8..6ee0d36e 100755
--- a/scripts/school.asm
+++ b/scripts/school.asm
@@ -1,14 +1,22 @@
SchoolScript: ; 1d54c (7:554c)
- jp EnableAutoTextBoxDrawing
+ call EnableAutoTextBoxDrawing
+ ret
SchoolTextPointers: ; 1d54f (7:554f)
dw SchoolText1
dw SchoolText2
+ dw SchoolText3
SchoolText1: ; 1d553 (7:5553)
TX_FAR _SchoolText1
db "@"
SchoolText2: ; 1d558 (7:5558)
- TX_FAR _SchoolText2
- db "@"
+ TX_ASM
+ callba Func_f1c0f
+ jp TextScriptEnd
+
+SchoolText3: ; 1d558 (7:5558)
+ TX_ASM
+ callba Func_f1c03
+ jp TextScriptEnd