Sepia City Gym & badge infrastructure

Nihon badges now count and Sepia City has its Gym Leader. All fully functional.

I've also distributed the transfer-exclusive Kanto Pokemon items to their relevant owners, plus the Polkadot Bow.
This commit is contained in:
Llinos Evans 2024-07-25 15:29:35 +01:00
parent 7a5cbd31dc
commit cd08f11fa4
31 changed files with 462 additions and 38 deletions

View file

@ -204,6 +204,7 @@ _ResetWRAM:
ld [wJohtoBadges], a
ld [wKantoBadges], a
ld [wNihonBadges], a
ld [wCoins], a
ld [wCoins + 1], a
@ -611,7 +612,7 @@ Continue_UnknownGameTime:
Continue_DisplayBadgeCount:
push hl
ld hl, wJohtoBadges
ld b, 2
ld b, 3
call CountSetBits
pop hl
ld de, wNumSetBits

View file

@ -1073,7 +1073,7 @@ PeoplePlaces4: ; People
bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .ok
ld hl, PnP_HiddenPeople_BeatE4
ld a, [wKantoBadges]
ld a, [wKantoBadges] ; TODO: See if a Nihon equivalent is warranted.
cp %11111111 ; all badges
jr nz, .ok
ld hl, PnP_HiddenPeople_BeatKanto