aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/silphco2.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/silphco2.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/SilphCo2F.asm (renamed from scripts/silphco2.asm)12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm
index e77c45dd..5fd542cb 100755
--- a/scripts/silphco2.asm
+++ b/scripts/SilphCo2F.asm
@@ -1,11 +1,11 @@
-SilphCo2Script:
+SilphCo2F_Script:
call SilphCo2Script_59d07
call EnableAutoTextBoxDrawing
ld hl, SilphCo2TrainerHeader0
- ld de, SilphCo2ScriptPointers
- ld a, [wSilphCo2CurScript]
+ ld de, SilphCo2F_ScriptPointers
+ ld a, [wSilphCo2FCurScript]
call ExecuteCurMapScriptInTable
- ld [wSilphCo2CurScript], a
+ ld [wSilphCo2FCurScript], a
ret
SilphCo2Script_59d07:
@@ -86,12 +86,12 @@ SilphCo2Script_59d6f:
SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1
ret
-SilphCo2ScriptPointers:
+SilphCo2F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-SilphCo2TextPointers:
+SilphCo2F_TextPointers:
dw SilphCo2Text1
dw SilphCo2Text2
dw SilphCo2Text3