summaryrefslogtreecommitdiff
path: root/scripts/viridiangym.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
committerYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
commit0c916aea3353ed1bf2750be403b0da9ea0b922d4 (patch)
tree4e50d805a37f06fabac6086a7ad6ed1d4f4526c4 /scripts/viridiangym.asm
parent91793015e53dbed09576f825d39e71bc59bf90a5 (diff)
Commented more sprite and map code
Diffstat (limited to 'scripts/viridiangym.asm')
-rwxr-xr-xscripts/viridiangym.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 4c9e6821..6b0673d1 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -286,16 +286,16 @@ ViridianGymText1: ; 74a69 (1d:4a69)
jr .asm_6dff7 ; 0x74a7b
.asm_9fc95 ; 0x74a7d
ld a, $1
- ld [wcc3c], a
+ ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9
call PrintText
- call GBFadeIn1
+ call GBFadeOutToBlack
ld a, $32
ld [wcc4d], a
predef HideObject
call UpdateSprites
call Delay3
- call GBFadeOut1
+ call GBFadeInFromBlack
jr .asm_6dff7 ; 0x74a9e
.asm_6de66 ; 0x74aa0
ld hl, ViridianGymText_74ace
@@ -307,7 +307,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
ld de, ViridianGymText_74ad3
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [wcf13], a
+ ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $8