ref: f6a5d7b2f2bce987ae7d5e291e80e830516c2965
parent: f958ba0e6d0e8dde9e77e0233bb9932fe506dee2
author: yenatch <[email protected]>
date: Wed Sep 18 17:54:31 EDT 2013
split pokedex flag handling into home/pokedex_flags.asm
--- /dev/null
+++ b/home/pokedex_flags.asm
@@ -1,0 +1,40 @@
+SetSeenAndCaughtMon: ; 3380
+ push af
+ ld c, a
+ ld hl, PokedexCaught
+ ld b, SET_FLAG
+ call PokedexFlagAction
+ pop af
+ ; fallthrough
+; 338b
+
+SetSeenMon: ; 338b
+ ld c, a
+ ld hl, PokedexSeen
+ ld b, SET_FLAG
+ jr PokedexFlagAction
+; 3393
+
+CheckCaughtMon: ; 3393
+ ld c, a
+ ld hl, PokedexCaught
+ ld b, CHECK_FLAG
+ jr PokedexFlagAction
+; 339b
+
+CheckSeenMon: ; 339b
+ ld c, a
+ ld hl, PokedexSeen
+ ld b, CHECK_FLAG
+ ; fallthrough
+; 33a1
+
+PokedexFlagAction: ; 33a1
+ ld d, 0
+ ld a, PREDEF_FLAG
+ call Predef
+ ld a, c
+ and a
+ ret
+; 33ab
+
--- a/main.asm
+++ b/main.asm
@@ -1281,45 +1281,7 @@
; 3380
-SetSeenAndCaughtMon: ; 3380
- push af
- ld c, a
- ld hl, PokedexCaught
- ld b, SET_FLAG
- call PokedexFlagAction
- pop af
- ; fallthrough
-; 338b
-
-SetSeenMon: ; 338b
- ld c, a
- ld hl, PokedexSeen
- ld b, SET_FLAG
- jr PokedexFlagAction
-; 3393
-
-CheckCaughtMon: ; 3393
- ld c, a
- ld hl, PokedexCaught
- ld b, CHECK_FLAG
- jr PokedexFlagAction
-; 339b
-
-CheckSeenMon: ; 339b
- ld c, a
- ld hl, PokedexSeen
- ld b, CHECK_FLAG
- ; fallthrough
-; 33a1
-
-PokedexFlagAction: ; 33a1
- ld d, 0
- ld a, PREDEF_FLAG
- call Predef
- ld a, c
- and a
- ret
-; 33ab
+INCLUDE "home/pokedex_flags.asm"
NamesPointerTable: ; 33ab