summaryrefslogtreecommitdiff
path: root/scripts/silphco11.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2014-09-14 11:29:18 -0700
committerYamaArashi <shadow962@live.com>2014-09-14 11:29:18 -0700
commit2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (patch)
tree0efc4cb1b79494d119524b120d27c8c5b74a6a05 /scripts/silphco11.asm
parent0c916aea3353ed1bf2750be403b0da9ea0b922d4 (diff)
Commented/labelled misc functions
Diffstat (limited to 'scripts/silphco11.asm')
-rwxr-xr-xscripts/silphco11.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 32a455ec..43ae72f6 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -22,14 +22,14 @@ SilphCo11Script_62110: ; 62110 (18:6110)
ld a, $20
ld [wd09f], a
ld bc, $603
- predef_jump Func_ee9e
+ predef_jump ReplaceTileBlock
DataTable_62134: ; 62134 (18:6134)
db $06,$03,$FF
SilphCo11Script_62137: ; 62137 (18:6137)
push hl
- ld hl, wd73f
+ ld hl, wCardKeyDoorY
ld a, [hli]
ld b, a
ld a, [hl]
@@ -53,7 +53,7 @@ SilphCo11Script_62137: ; 62137 (18:6137)
ld a, [hli]
cp c
jr nz, .asm_62143
- ld hl, wd73f
+ ld hl, wCardKeyDoorY
xor a
ld [hli], a
ld [hl], a
@@ -116,7 +116,7 @@ SilphCo11Script_621c8: ; 621c8 (18:61c8)
SilphCo11ScriptPointers: ; 621cf (18:61cf)
dw SilphCo11Script0
- dw Func_324c
+ dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw SilphCo11Script3
dw SilphCo11Script4
@@ -221,7 +221,7 @@ SilphCo11Script4: ; 62293 (18:6293)
set 7, [hl]
ld hl, SilphCo10Text_62330 ; $6330
ld de, SilphCo10Text_62330 ; $6330
- call PreBattleSaveRegisters
+ call SaveEndBattleTextPointers
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
ld [wSpriteIndex], a
call EngageMapTrainer