summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/halloffameroom.asm4
-rwxr-xr-xscripts/viridiancity.asm2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm
index 1da6d3f5..de3cd779 100755
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -47,11 +47,11 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
ld [wLastBlackoutMap], a
callba SaveSAVtoSRAM
ld b, 5
-.asm_5a4ff
+.delayLoop
ld c, 600 / 5
call DelayFrames
dec b
- jr nz, .asm_5a4ff
+ jr nz, .delayLoop
call WaitForTextScrollButtonPress
jp Init
diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm
index 79ad444f..ae0b6212 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -71,7 +71,7 @@ ViridianCityScript1: ; 19062 (6:5062)
ld [wListScrollOffset], a
; set up battle for Old Man
- ld a, $1
+ ld a, BATTLE_TYPE_OLD_MAN
ld [W_BATTLETYPE], a
ld a, 5
ld [W_CURENEMYLVL], a