aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Museum1F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/Museum1F.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/Museum1F.asm (renamed from scripts/museum1f.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/museum1f.asm b/scripts/Museum1F.asm
index 30e6f594..fdae9293 100755
--- a/scripts/museum1f.asm
+++ b/scripts/Museum1F.asm
@@ -1,14 +1,14 @@
-Museum1FScript:
+Museum1F_Script:
ld a, $1
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
- ld hl, Museum1FScriptPointers
+ ld hl, Museum1F_ScriptPointers
ld a, [wMuseum1FCurScript]
- call JumpTable
+ call CallFunctionInTable
ret
-Museum1FScriptPointers:
+Museum1F_ScriptPointers:
dw Museum1FScript0
dw Museum1FScript1
@@ -32,7 +32,7 @@ Museum1FScript0:
Museum1FScript1:
ret
-Museum1FTextPointers:
+Museum1F_TextPointers:
dw Museum1FText1
dw Museum1FText2
dw Museum1FText3