Saffron Guards are now British

They desire the caffeine...

Mt. Moon Square no longer breaks game balance.
This commit is contained in:
Llinos Evans 2023-06-18 09:12:42 +01:00
parent 15be9046a7
commit c356ee81f5
14 changed files with 98 additions and 8 deletions

View file

@ -19,6 +19,55 @@ CeladonMansion1Text1:
jp CeladonMansion1_PlayCryScript
CeladonMansion1Text2:
text_asm
CheckEvent EVENT_GOT_TEA
jr nz, .usual
ld hl, CeladonMansionHasTea
call PrintText
lb bc, TEA, 1
call GiveItem
jr nc, .bag_full
ld hl, ReceivedTeaText
call PrintText
ld a, SFX_GET_ITEM_1
call PlaySound
SetEvent EVENT_GOT_TEA
jr .done
.bag_full
ld hl, CeladonMansionTeaNoRoom
jr .efficientPrint
.got_item
ld hl, CeladonMansionTeaExplanation
jr .efficientPrint
.usual
ld hl, OldCeladonMansion1Text2
; fallthrough
.efficientPrint
call PrintText
.done
jp TextScriptEnd
CeladonMansionHasTea:
text_far _CeladonMansionHasTea
text_end
CeladonMansionNoTea:
text_far _CeladonMansion1Text2
text_end
CeladonMansionTeaNoRoom:
text_far _CeladonMansionTeaNoRoom
text_end
CeladonMansionTeaExplanation:
text_far _CeladonMansionTeaExplanation
text_end
ReceivedTeaText:
text_far _ReceivedTeaText
text_end
OldCeladonMansion1Text2:
text_far _CeladonMansion1Text2
text_end

View file

@ -34,6 +34,8 @@ SafariZoneRestHouse3Meltan:
jr nc, .bag_full
ld hl, ReceivedBoxText
call PrintText
ld a, SFX_GET_ITEM_1
call PlaySound
SetEvent EVENT_GOT_MELTAN
jr .done
.bag_full