aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/silphco3.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts/silphco3.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xscripts/SilphCo3F.asm (renamed from scripts/silphco3.asm)12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm
index 0d12b768..42b5d611 100755
--- a/scripts/silphco3.asm
+++ b/scripts/SilphCo3F.asm
@@ -1,11 +1,11 @@
-SilphCo3Script:
+SilphCo3F_Script:
call SilphCo3Script_59f71
call EnableAutoTextBoxDrawing
ld hl, SilphCo3TrainerHeader0
- ld de, SilphCo3ScriptPointers
- ld a, [wSilphCo3CurScript]
+ ld de, SilphCo3F_ScriptPointers
+ ld a, [wSilphCo3FCurScript]
call ExecuteCurMapScriptInTable
- ld [wSilphCo3CurScript], a
+ ld [wSilphCo3FCurScript], a
ret
SilphCo3Script_59f71:
@@ -50,12 +50,12 @@ SilphCo3Script_59fad:
SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
ret
-SilphCo3ScriptPointers:
+SilphCo3F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-SilphCo3TextPointers:
+SilphCo3F_TextPointers:
dw SilphCo3Text1
dw SilphCo3Text2
dw SilphCo3Text3