mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 06:38:40 +13:00
Daycare Revamp (except Bulbasaur)
In the name of making Pikachu/Eevee mode more accurate to Yellow, the starter trio are being made obtainable. However, I am also improving it in some respects to make it more accurate. In the anime, the Hidden Village is between Cerulean and Vermillion, so Yellow's implementation is inaccurate. It also pushes the Jynx trader out of the house, which is undesirable. Thus, Melanie has been placed in the Day Care to give more reason to go there, as well as make the Day Care look more like the one from FireRed and LeafGreen. In the name of this, a PC has been added as well, allowing for easier utility around the Day Care itself. Bulbasaur is currently allergic to hiding for some reason but we'll figure that out later.
This commit is contained in:
parent
83483f035b
commit
c716be39da
18 changed files with 246 additions and 27 deletions
|
|
@ -3,6 +3,12 @@ Daycare_Script:
|
|||
|
||||
Daycare_TextPointers:
|
||||
dw DayCareMText1
|
||||
dw DaycareMelanie
|
||||
dw DaycareBulbasaur
|
||||
dw DaycareOddish
|
||||
dw DaycareSandshrew
|
||||
dw DaycareRibbito
|
||||
dw DaycareBook
|
||||
|
||||
DayCareMText1:
|
||||
text_asm
|
||||
|
|
@ -267,3 +273,142 @@ DayCareHeresYourMonText:
|
|||
DayCareNotEnoughMoneyText:
|
||||
text_far _DayCareNotEnoughMoneyText
|
||||
text_end
|
||||
|
||||
; This is porting the Yellow Melanie event to Red.
|
||||
; Because we don't have Pikachu for happiness, the condition is made to be
|
||||
; the Cascade Badge instead.
|
||||
; We could hide her entirely with regards to the starter system, it would just
|
||||
; look super cringe
|
||||
DaycareMelanie:
|
||||
text_asm
|
||||
CheckEvent EVENT_GOT_BULBASAUR
|
||||
jr nz, .gotBulbasaur
|
||||
|
||||
ld hl, MelanieText1 ; Firstly, important text.
|
||||
call PrintText
|
||||
ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip.
|
||||
and a ; yep, here too.
|
||||
call z, WaitForTextScrollButtonPress ; and here.
|
||||
call EnableAutoTextBoxDrawing ; and here. it's very hasty.
|
||||
|
||||
ld a, [wObtainedBadges] ; load the badge count
|
||||
bit BIT_CASCADEBADGE, a
|
||||
jr z, .superDone ; no? d'oh! darn those brock skippers!
|
||||
|
||||
; If they picked any of the main 3 they can't get this.
|
||||
ld a, [wPlayerStarter]
|
||||
cp STARTER1
|
||||
jr z, .notTheOne
|
||||
cp STARTER2
|
||||
jr z, .notTheOne
|
||||
cp STARTER3
|
||||
jr z, .notTheOne
|
||||
|
||||
ld hl, MelanieText2 ; yes? let's continue, then.
|
||||
call PrintText
|
||||
|
||||
call YesNoChoice ; let's get things going.
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jr nz, .refused ; imagine refusing a bulbasaur tbh
|
||||
|
||||
lb bc, BULBASAUR, 5 ; load the bulbasaur
|
||||
call GivePokemon ; attempt to give the bulbasaur
|
||||
jr nc, .fullParty ; if it's fucked just go here
|
||||
ld a, HS_DAYCARE_BULBASAUR ; hide the bulbasaur
|
||||
ld [wMissableObjectIndex], a ; badababa
|
||||
predef HideObject ; pow
|
||||
SetEvent EVENT_GOT_BULBASAUR
|
||||
|
||||
ld hl, MelanieText3
|
||||
call PrintText
|
||||
ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip.
|
||||
and a ; yep, here too.
|
||||
call z, WaitForTextScrollButtonPress ; and here.
|
||||
call EnableAutoTextBoxDrawing ; and here.
|
||||
jr .superDone ; anyway tons of textscriptends is cringe so let's do things better this time
|
||||
.gotBulbasaur ; If they have Bulbasaur, just go here.
|
||||
ld hl, MelanieText4
|
||||
jr .done
|
||||
.refused ; If they refused, they're not the one.
|
||||
ld hl, MelanieText5
|
||||
jr .done
|
||||
.fullParty ; if they have a full party they can get knotted
|
||||
ld hl, MelanieText6
|
||||
jr .done
|
||||
.notTheOne ; If they started with the original trio, they're not the one.
|
||||
ld hl, MelanieText7
|
||||
; fallthrough
|
||||
.done
|
||||
call PrintText
|
||||
; fallthrough
|
||||
.superDone
|
||||
jp TextScriptEnd
|
||||
|
||||
DaycareBulbasaur:
|
||||
text_far _BulbasaurText
|
||||
text_asm
|
||||
ld a, BULBASAUR
|
||||
call PlayCry
|
||||
jp TextScriptEnd
|
||||
|
||||
DaycareOddish:
|
||||
text_far _OddishText
|
||||
text_asm
|
||||
ld a, ODDISH
|
||||
call PlayCry
|
||||
jp TextScriptEnd
|
||||
|
||||
DaycareSandshrew:
|
||||
text_far _SandshrewText
|
||||
text_asm
|
||||
ld a, SANDSHREW
|
||||
call PlayCry
|
||||
jp TextScriptEnd
|
||||
|
||||
DaycareRibbito:
|
||||
text_far _RibbitoText
|
||||
text_asm
|
||||
ld a, RIBBITO
|
||||
call PlayCry
|
||||
jp TextScriptEnd
|
||||
|
||||
_RibbitoText:
|
||||
text "RIBBITO: Ribbi"
|
||||
line "ribbi!"
|
||||
done
|
||||
|
||||
MelanieText1:
|
||||
text_far _MelanieText1
|
||||
text_end
|
||||
|
||||
MelanieText2:
|
||||
text_far _MelanieText2
|
||||
text_end
|
||||
|
||||
MelanieText3:
|
||||
text_far _MelanieText3
|
||||
text_end
|
||||
|
||||
MelanieText4:
|
||||
text_far _MelanieText4
|
||||
text_end
|
||||
|
||||
MelanieText5:
|
||||
text_far _MelanieText5
|
||||
text_end
|
||||
|
||||
MelanieText6:
|
||||
text_far _MelanieText6
|
||||
text_end
|
||||
|
||||
MelanieText7:
|
||||
text_far _MelanieText7
|
||||
text_end
|
||||
|
||||
DaycareBook:
|
||||
text "It's a drawing of"
|
||||
line "a TRAINER with a"
|
||||
cont "PIKACHU and an"
|
||||
cont "EEVEE!"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -54,14 +54,14 @@ LavenderHouse1Text_1d8f9:
|
|||
text_end
|
||||
|
||||
LavenderHouse1Text3:
|
||||
text_far _LavenderHouse1Text3
|
||||
text_far _SandshrewText
|
||||
text_asm
|
||||
ld a, SANDSHREW
|
||||
call PlayCry
|
||||
jp TextScriptEnd
|
||||
|
||||
LavenderHouse1Text4:
|
||||
text_far _LavenderHouse1Text4
|
||||
text_far _BulbasaurText
|
||||
text_asm
|
||||
ld a, BULBASAUR
|
||||
call PlayCry
|
||||
|
|
@ -113,7 +113,7 @@ LavenderHouse1Text6:
|
|||
text_end
|
||||
|
||||
LavenderHouse1Text7:
|
||||
text_far _LavenderHouse1Text7
|
||||
text_far _OddishText
|
||||
text_asm
|
||||
ld a, ODDISH
|
||||
call PlayCry
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue