This should end it! - Entei

- Fixed up the Fishing Rod encounters.
- Finished the Pocket Lapras
- Farfetch'd on Route 13 and 15
- L50 Chansey on Victory Road 3F for Repel trick grinding
- Changed Surge's text to be way, way more accurate to the differences between American and Japanese relations at the time. See file for more details.
- Fixed the build error with the new Galarian Bird track
This commit is contained in:
Llinos Evans 2024-08-25 21:21:55 +01:00
parent f9ff97cd9d
commit 6292c39217
11 changed files with 103 additions and 58 deletions

View file

@ -782,8 +782,17 @@ ItemUseLapras:
ld a, 2
ld [wWalkBikeSurfState], a ; change player state to surfing
call PlayDefaultMusic ; play surfing music
; no jimmy i will NOT make a new item
ld hl, SurfingGotOnLaprasText
ld a, [wSurfMonItemSwitch] ; check if the mon item switch has been set
and a
jr z, .skip
ld hl, SurfingGotOnText
.skip ; now shut the fuck up
jp PrintText
.tryToStopSurfing
xor a
ldh [hSpriteIndexOrTextID], a

View file

@ -165,6 +165,14 @@ StartMenu_Pokemon::
bit 1, [hl]
res 1, [hl]
jp z, .loop
; this makes it so the pokemon shows up instead of pocket lapras
; no visible effect when using surf, it's actually for the item effect later
; it makes it so I don't have to make a craptastic new function that falls through, which would require a new item, which is so unimaginably cringe i would fall off my chair and die
; - pvk
ld a, 1
ld [wSurfMonItemSwitch], a
ld a, POCKET_LAPRAS
ld [wcf91], a
ld [wPseudoItemID], a

View file

@ -33,10 +33,18 @@ TrySurf:
and a
jr nz, .no2
call GetPartyMonName2
; pocket lapras illusion maintenance service
ld a, 1
ld [wSurfMonItemSwitch], a
ld a, POCKET_LAPRAS
ld [wcf91], a
ld [wPseudoItemID], a
call UseItem
; pocket lapras stuff
xor a
ld [wSurfMonItemSwitch], a
.yes2
call CloseFieldMoveTextBox
.yes