LGPE Beauty Event

This is basically done, but has a few glitches to iron out that I don't have time to do today. So, I'm sending this in as-is with the intent to finish (or someone else can idc) it later.

I initially thought to restrict this to after Vermilion Gym but Persian is really bad and Arcanine doesn't compare to the L30 Dugtrio, so I think it's ok. Just barely balances itself out.

Bugs:
- GiveMonName doesn't work properly for the Vermilion Beauty after receiving the Pokemon, jank ensues.
- Text scrolls immediately when receiving the Pokemon from the Vermilion Beauty.
This commit is contained in:
Llinos Evans 2023-06-07 11:17:47 +01:00
parent cd8f73b99f
commit 35851ef6a9
12 changed files with 243 additions and 25 deletions

View file

@ -2379,6 +2379,7 @@ UseBagItem:
ret
.returnAfterCapturingMon
call VermilionBeautyCheck ; before you go, would you like to talk about our lord and saviour LGPE?
call GBPalNormal
xor a
ld [wCapturedMonSpecies], a
@ -7225,3 +7226,22 @@ StupidBattleTentFix:
text "Oops! Better"
line "luck next time!"
prompt
; Vermilion Beauty functionality.
; If we have a Meowth or Growlithe on our hands, increment the counter.
VermilionBeautyCheck:
ld a, [wBeautyChoice] ; Firstly, was this even started?
jr z, .skipCounting ; Yeah? Alright, skip.
ld a, [wBeautyCounter] ; Now to cap this at 5.
cp 5 ; First, we check if we're at 5...
jr z, .skipCounting ; and if so, we skip doing this at all.
ld a, [wCapturedMonSpecies] ; Now to check the species.
ld hl, wBeautyChoice
cp [hl] ; Is it our guy?
jr nz, .skipCounting ; Fuck right off then.
ld a, [wBeautyCounter] ; Ok, now grab the counter...
inc a ; Increment it...
ld [wBeautyCounter], a ; and get the FUCK out of my office!!!
.skipCounting
ret

View file

@ -48,6 +48,14 @@ IF DEF(_DEBUG)
ld a, 39
ld [wCandyJarCount], a
; Test Vermilion Beauty
; Set a to 4 to test increments.
; Set BeautyChoice to GROWLITHE to test the other choice.
ld a, 5
ld [wBeautyCounter], a
ld a, MEOWTH
ld [wBeautyChoice], a
; Get all badges except Earth Badge.
ld a, ~(1 << BIT_EARTHBADGE)
ld [wObtainedBadges], a
@ -165,15 +173,14 @@ DebugSetPokedexEntries:
ret
DebugItemsList:
db POKE_BALL, 99
db MASTER_BALL, 99
db MYSTERY_BOX, 1
db CANDY_JAR, 1
db BICYCLE, 1
db FULL_RESTORE, 99
db MAX_REPEL, 99
db RARE_CANDY, 99
db MASTER_BALL, 99
db ULTRA_BALL, 99
db POKE_BALL, 99 ; test ball miss text with this
db SECRET_KEY, 1
db CARD_KEY, 1
db S_S_TICKET, 1