diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-07 13:19:41 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-07 13:19:41 -0400 |
| commit | edf42a54d5b95780725e50605672fec29a9936f1 (patch) | |
| tree | c3c9fd0799a1f91a0804a315ec0ffdffaf5b2c13 /engine/events.asm | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
More labels, including fns responsible for partymon generation
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/events.asm b/engine/events.asm index 3fedf691d..cf8b4e647 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -121,7 +121,7 @@ StartMap: ; 96724 xor a ld [ScriptRunning], a ld hl, MapStatus - ld bc, $3e + ld bc, $3e ; 62 call ByteFill callba Function113e5 call ClearJoypad @@ -137,13 +137,13 @@ EnterMap: ; 9673e callba RunMapSetupScript call ClearAllScriptFlags3 - ld a, [$ff9f] + ld a, [hMapEntryMethod] cp $f7 jr nz, .dontset call SetAll_ScriptFlags3 .dontset - ld a, [$ff9f] + ld a, [hMapEntryMethod] cp $f3 jr nz, .dontresetpoison xor a @@ -151,7 +151,7 @@ EnterMap: ; 9673e .dontresetpoison xor a - ld [$ff9f], a + ld [hMapEntryMethod], a ld a, 2 ; HandleMap ld [MapStatus], a ret |