Vermilion Officer Jenny, other things

- Adds Officer Jenny from Yellow to Vermilion City. Due to spriteset restrictions, Roingus Girl has been removed; the self-insert felt a little weird anyway.
- Fuchsia City's map has been redone a little bit to more closely resemble the LGPE version, being far more walkable and aesthetically appealing.
- A Firefighter has been added to Cerulean Gym!
This commit is contained in:
Llinos Evans 2023-06-30 21:51:05 +01:00
parent 97a99c3744
commit 3866a69a25
18 changed files with 201 additions and 34 deletions

View file

@ -266,7 +266,7 @@ VermilionCity_TextPointers:
dw VermilionCityText4
dw VermilionCityText5
dw VermilionCityText6
dw RoingusText
dw OfficerJennySquirtle
dw VermilionBeauty
dw VermilionCityText7
dw VermilionCityText8
@ -437,8 +437,69 @@ VermilionCityText13:
text_far _VermilionCityText13
text_end
RoingusText:
text_far _RoingusText
OfficerJennySquirtle:
text_asm
CheckEvent EVENT_GOT_SQUIRTLE
jr nz, .howDoing
ld a, [wObtainedBadges]
bit 3, a ; THUNDERBADGE
jr z, .noBadge
ld hl, OfficerJennyHasBadge
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refuse
ld a, SQUIRTLE
ld [wd11e], a
ld [wcf91], a
call GetMonName
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
lb bc, SQUIRTLE, 15
call GivePokemon
ld a, [wAddedToParty]
and a
call z, WaitForTextScrollButtonPress
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, OfficerJennyGive
call PrintText
SetEvent EVENT_GOT_SQUIRTLE
jp TextScriptEnd
.howDoing
ld hl, OfficerJennyHowDoing
jr .done
.noBadge
ld hl, OfficerJennyNoBadge
jr .done
.refuse
ld hl, OfficerJennyRefuse
; fallthrough
.done
call PrintText
jp TextScriptEnd
OfficerJennyNoBadge:
text_far _OfficerJennyText1
text_end
OfficerJennyHasBadge:
text_far _OfficerJennyText2
text_end
OfficerJennyGive:
text_far _OfficerJennyText3
text_waitbutton
text_end
OfficerJennyRefuse:
text_far _OfficerJennyText4
text_end
OfficerJennyHowDoing:
text_far _OfficerJennyText5
text_end
VermillionCityPassSelectionText: