diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/flag.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/flag.asm')
| -rw-r--r-- | home/flag.asm | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/home/flag.asm b/home/flag.asm index 00c7d4b7e..411f04184 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -1,19 +1,17 @@ -ResetMapBufferEventFlags:: ; 2e50 +ResetMapBufferEventFlags:: xor a ld hl, wEventFlags ld [hli], a ret -; 2e56 -ResetBikeFlags:: ; 2e56 +ResetBikeFlags:: xor a ld hl, wBikeFlags ld [hli], a ld [hl], a ret -; 2e5d -ResetFlashIfOutOfCave:: ; 2e5d +ResetFlashIfOutOfCave:: ld a, [wEnvironment] cp ROUTE jr z, .outdoors @@ -25,15 +23,13 @@ ResetFlashIfOutOfCave:: ; 2e5d ld hl, wStatusFlags res STATUSFLAGS_FLASH_F, [hl] ret -; 2e6f - -EventFlagAction:: ; 0x2e6f +EventFlagAction:: ld hl, wEventFlags call FlagAction ret -FlagAction:: ; 0x2e76 +FlagAction:: ; Perform action b on bit de in flag array hl. ; inputs: @@ -99,14 +95,11 @@ FlagAction:: ; 0x2e76 and [hl] ld [hl], a ret -; 0x2ead - -CheckReceivedDex:: ; 2ead +CheckReceivedDex:: ld de, ENGINE_POKEDEX ld b, CHECK_FLAG farcall EngineFlagAction ld a, c and a ret -; 2ebb |