pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

PokedexSeen and PokedexCaught were swapped

Browse Source
This commit is contained in:
yenatch 2013-09-09 02:34:07 -04:00
parent 106b0e139f
commit 771ebcbf23
2 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
main.asm
View File

@ -1383,39 +1383,38 @@ GetWeekday: ; 3376
SetSeenAndCaughtMon: ; 3380 SetSeenAndCaughtMon: ; 3380
push af push af
ld c, a ld c, a
ld hl, PokedexSeen ld hl, PokedexCaught
ld b, 1 ld b, SET_FLAG
call GetWramFlag call PokedexFlagAction
pop af pop af
; fallthrough ; fallthrough
; 338b ; 338b
SetCaughtMon: ; 338b SetSeenMon: ; 338b
ld c, a
ld hl, PokedexCaught
ld b, 1
jr GetWramFlag
; 3393
CheckSeenMon: ; 3393
ld c, a ld c, a
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, 2 ld b, SET_FLAG
jr GetWramFlag jr PokedexFlagAction
; 339b ; 3393
CheckCaughtMon: ; 339b CheckCaughtMon: ; 3393
ld c, a ld c, a
ld hl, PokedexCaught ld hl, PokedexCaught
ld b, 2 ld b, CHECK_FLAG
jr PokedexFlagAction
; 339b
CheckSeenMon: ; 339b
ld c, a
ld hl, PokedexSeen
ld b, CHECK_FLAG
; fallthrough ; fallthrough
; 33a1 ; 33a1
GetWramFlag: ; 33a1 PokedexFlagAction: ; 33a1
ld d, 0 ld d, 0
ld a, PREDEF_FLAG ld a, PREDEF_FLAG
call Predef call Predef
ld a, c ld a, c
and a and a
ret ret
@ -8612,7 +8611,7 @@ Function5f6b: ; 5f6b
bit 0, a bit 0, a
ret z ret z
push hl push hl
ld hl, PokedexSeen ld hl, PokedexCaught
ld b, $20 ld b, $20
call CountSetBits call CountSetBits
pop hl pop hl
@ -13517,7 +13516,7 @@ Functionc225: ; c225
Functionc230: ; c230 Functionc230: ; c230
ld a, [ScriptVar] ld a, [ScriptVar]
dec a dec a
call CheckSeenMon call CheckCaughtMon
ret nz ret nz
ld a, [ScriptVar] ld a, [ScriptVar]
dec a dec a
@ -13533,7 +13532,7 @@ Functionc230: ; c230
Functionc252: ; c252 Functionc252: ; c252
ld a, [ScriptVar] ld a, [ScriptVar]
dec a dec a
call SetCaughtMon call SetSeenMon
ret ret
; c25a ; c25a
@ -17018,7 +17017,7 @@ Functiond88c: ; d88c
ld [$d265], a ld [$d265], a
dec a dec a
push de push de
call CheckSeenMon call CheckCaughtMon
ld a, [$d265] ld a, [$d265]
dec a dec a
call SetSeenAndCaughtMon call SetSeenAndCaughtMon
@ -17924,10 +17923,10 @@ Functiondf8c: ; df8c
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
dec a dec a
push af push af
call CheckSeenMon call CheckCaughtMon
pop af pop af
push bc push bc
call CheckCaughtMon call CheckSeenMon
push bc push bc
call Functiond88c call Functiond88c
pop bc pop bc
@ -17938,7 +17937,7 @@ Functiondf8c: ; df8c
dec a dec a
ld c, a ld c, a
ld d, $0 ld d, $0
ld hl, PokedexSeen ld hl, PokedexCaught
ld b, $0 ld b, $0
ld a, $3 ld a, $3
call Predef call Predef
@ -17952,7 +17951,7 @@ Functiondf8c: ; df8c
dec a dec a
ld c, a ld c, a
ld d, $0 ld d, $0
ld hl, PokedexCaught ld hl, PokedexSeen
ld b, $0 ld b, $0
ld a, $3 ld a, $3
call Predef call Predef
@ -31577,13 +31576,13 @@ Function26601: ; 0x26601
Rate: ; 0x26616 Rate: ; 0x26616
; calculate Seen/Owned ; calculate Seen/Owned
ld hl, PokedexCaught
ld b, EndPokedexCaught - PokedexCaught
call CountSetBits
ld [DefaultFlypoint], a
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, EndPokedexSeen - PokedexSeen ld b, EndPokedexSeen - PokedexSeen
call CountSetBits call CountSetBits
ld [DefaultFlypoint], a
ld hl, PokedexCaught
ld b, EndPokedexCaught - PokedexCaught
call CountSetBits
ld [$d003], a ld [$d003], a
; print appropriate rating ; print appropriate rating
@ -35982,7 +35981,7 @@ Function2a4ab: ; 2a4ab
push bc push bc
dec c dec c
ld a, c ld a, c
call CheckCaughtMon call CheckSeenMon
pop bc pop bc
jr nz, .asm_2a514 jr nz, .asm_2a514
ld de, StringBuffer1 ld de, StringBuffer1
@ -36474,7 +36473,7 @@ Function2c0c5: ; 2c0c5
ret nz ret nz
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
dec a dec a
call CheckSeenMon call CheckCaughtMon
ret z ret z
ld hl, $c4b5 ld hl, $c4b5
ld [hl], $5d ld [hl], $5d
@ -44694,7 +44693,7 @@ LoadEnemyMon: ; 3e8eb
dec a dec a
ld c, a ld c, a
ld b, 1 ; set ld b, 1 ; set
ld hl, PokedexCaught ld hl, PokedexSeen
ld a, PREDEF_FLAG ld a, PREDEF_FLAG
call Predef call Predef
@ -47986,7 +47985,7 @@ Function40bd0: ; 40bd0
push hl push hl
ld a, [$d265] ld a, [$d265]
dec a dec a
call CheckCaughtMon call CheckSeenMon
pop hl pop hl
pop de pop de
ret ret
@ -49198,7 +49197,7 @@ Function4424d: ; 4424d
call PrintNum call PrintNum
ld a, [$d265] ld a, [$d265]
dec a dec a
call CheckSeenMon call CheckCaughtMon
pop hl pop hl
pop bc pop bc
ret z ret z
@ -83255,7 +83254,7 @@ Function11d493: ; 11d493
ld hl, rSVBK ld hl, rSVBK
ld e, $1 ld e, $1
ld [hl], e ld [hl], e
call CheckCaughtMon call CheckSeenMon
ld hl, rSVBK ld hl, rSVBK
ld e, $5 ld e, $5
ld [hl], e ld [hl], e

8
wram.asm
View File

@ -2026,12 +2026,12 @@ PartyMon6Nickname: ; de78
PartyMonNicknamesEnd PartyMonNicknamesEnd
SECTION "Pokedex",WRAMX[$de99],BANK[1] SECTION "Pokedex",WRAMX[$de99],BANK[1]
PokedexSeen: ; de99 PokedexCaught: ; de99
ds 32
EndPokedexSeen:
PokedexCaught: ; deb9
ds 32 ds 32
EndPokedexCaught: EndPokedexCaught:
PokedexSeen: ; deb9
ds 32
EndPokedexSeen:
UnownDex: ; ded9 UnownDex: ; ded9
ds 26 ds 26
UnlockedUnowns: ; def3 UnlockedUnowns: ; def3