diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-30 20:40:32 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-30 20:40:32 -0500 |
| commit | 1ee9fb408c47c3a15a38b1bb407d86ed1a5d2fcc (patch) | |
| tree | 937d54d5f4c7ee08099669e2742704800dab11d2 /scripts | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
| parent | 4cfcc2f589d07e0b038a0ca4b31123152b93dbe1 (diff) | |
Merge pull request #116 from YamaArashi/master
Misc changes
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/halloffameroom.asm | 4 | ||||
| -rwxr-xr-x | scripts/viridiancity.asm | 2 |
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 |