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/pokedex_flags.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/pokedex_flags.asm')
| -rw-r--r-- | home/pokedex_flags.asm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm index e9ca2163e..809341509 100644 --- a/home/pokedex_flags.asm +++ b/home/pokedex_flags.asm @@ -1,4 +1,4 @@ -SetSeenAndCaughtMon:: ; 3380 +SetSeenAndCaughtMon:: push af ld c, a ld hl, wPokedexCaught @@ -6,33 +6,28 @@ SetSeenAndCaughtMon:: ; 3380 call PokedexFlagAction pop af ; fallthrough -; 338b -SetSeenMon:: ; 338b +SetSeenMon:: ld c, a ld hl, wPokedexSeen ld b, SET_FLAG jr PokedexFlagAction -; 3393 -CheckCaughtMon:: ; 3393 +CheckCaughtMon:: ld c, a ld hl, wPokedexCaught ld b, CHECK_FLAG jr PokedexFlagAction -; 339b -CheckSeenMon:: ; 339b +CheckSeenMon:: ld c, a ld hl, wPokedexSeen ld b, CHECK_FLAG ; fallthrough -; 33a1 -PokedexFlagAction:: ; 33a1 +PokedexFlagAction:: ld d, 0 predef SmallFarFlagAction ld a, c and a ret -; 33ab |