aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PalletTown.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/PalletTown.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/PalletTown.asm (renamed from scripts/pallettown.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pallettown.asm b/scripts/PalletTown.asm
index e98464ce..fbdee4bc 100755
--- a/scripts/pallettown.asm
+++ b/scripts/PalletTown.asm
@@ -1,14 +1,14 @@
-PalletTownScript:
+PalletTown_Script:
CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
jr z, .next
SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
.next
call EnableAutoTextBoxDrawing
- ld hl, PalletTownScriptPointers
+ ld hl, PalletTown_ScriptPointers
ld a, [wPalletTownCurScript]
- jp JumpTable
+ jp CallFunctionInTable
-PalletTownScriptPointers:
+PalletTown_ScriptPointers:
dw PalletTownScript0
dw PalletTownScript1
dw PalletTownScript2
@@ -220,7 +220,7 @@ PalletTownScript8:
PalletTownScript9:
ret
-PalletTownTextPointers:
+PalletTown_TextPointers:
dw PalletTownText1
dw PalletTownText2
dw PalletTownText3