From b6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 17:15:05 -0700 Subject: documented flags and misc. fixes --- scripts/halloffameroom.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3 From 30063216cdf85dc069c9e0162195cede7d24d4a4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Aug 2015 23:35:58 -0700 Subject: use the new battle type constants --- scripts/viridiancity.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3