Small polishing of the previous commit + Item Sorting

- Fixes a few bugs from the last commit, namely:
     - The guy who gives you the Pocket Lapras having bugged text
     - Being able to use it where you shouldn't (Cycling Road, Seafoam before the boulder puzzle)
     - Pocket Lapras not having an item description

- As well as this, automatic item sorting has been added. Just press Start in the bag menu and all your items will get assorted into a convenient list.

- Changed a few item descriptions since some of them didn't terminate properly

- Freed up some space in the Home bank
This commit is contained in:
Martha Schilling 2024-05-14 21:17:36 +01:00
parent dd7130c489
commit 2c02483f01
15 changed files with 379 additions and 66 deletions

View file

@ -87,34 +87,42 @@ CinnabarIslandText7:
_CinnabarPocketLapras1:
text "Bah, this LAPRAS"
line "just doesn't"
cont "wanna fight! Can"
cont "you believe that?"
line "just doesn't want"
cont "to fight! Can you"
cont "believe that?"
para "All it does is"
line "SURF. My GYARADOS"
cont "can do that!"
para "All it likes to"
line "do is SURF, but"
cont "my GYARADOS can"
cont "already do that!"
para "Here. Take it."
line "I can't stand"
cont "looking at its"
cont "big ol' eyes."
done
para "Here, take it. I"
line "can't stand its"
cont "big ol' eyes"
cont "looking at me."
prompt
_PocketLaprasNoRoomText:
text "You don't have"
line "room either?"
line "room, either?"
para "Well, it's not"
line "going anywhere..."
line "like it's going"
cont "anywhere..."
done
_ReceivedPocketLaprasText:
text "Take care of that"
line "LAPRAS though,"
cont "yeah? They're"
cont "an endangered"
cont "species."
text "<PLAYER> received"
line "@"
text_ram wStringBuffer
text "!@"
text_end
_CinnabarPocketLapras2:
text "Take care of it"
line "though, alright?"
cont "LAPRAS is very"
cont "endangered."
para "You should stay"
line "safe, too." ; haha, llinos, you sly dog
@ -124,6 +132,10 @@ _ReceivedPocketLaprasText:
CinnabarPocketLapras1:
text_far _CinnabarPocketLapras1
text_end
CinnabarPocketLapras2:
text_far _CinnabarPocketLapras2
text_end
PocketLaprasNoRoomText:
text_far _PocketLaprasNoRoomText
@ -139,21 +151,21 @@ CinnabarPocketLapras:
jr nz, .skip
ld hl, CinnabarPocketLapras1
call PrintText
call TheAutoskipStopinator ; it's been a while but i didnt forget how annoying this was
lb bc, SURFBOARD, 1
lb bc, POCKET_LAPRAS, 1
call GiveItem
jr nc, .bag_full
SetEvent EVENT_GOT_POCKET_LAPRAS ; if you get here, it's done. Using this to load all three texts with one PrintText instruction
sound_get_key_item
ld hl, ReceivedPocketLaprasText
call PrintText
ld a, SFX_GET_KEY_ITEM
call PlaySound
SetEvent EVENT_GOT_POCKET_LAPRAS ; if you get here, it's done.
jr .end
.bag_full
ld hl, PocketLaprasNoRoomText
jr .end
.skip
ld hl, ReceivedPocketLaprasText
ld hl, CinnabarPocketLapras2
call PrintText
; fallthrough
.end
call PrintText
call TheAutoskipStopinator
jp TextScriptEnd