Salesman 'Obtained item!' text

Yeah for some reason the salesman didn't actually tell you that you got the item. Meanie.
This commit is contained in:
Martha Schilling 2023-12-30 20:10:11 +00:00
parent dacb23f87b
commit d20207f012
4 changed files with 58 additions and 18 deletions

View file

@ -40,7 +40,7 @@ PoryZSalesmanText:
jp nz, .choseNo jp nz, .choseNo
ldh [hMoney], a ldh [hMoney], a
ldh [hMoney + 2], a ldh [hMoney + 2], a
ld a, $21 ld a, $30
ldh [hMoney + 1], a ldh [hMoney + 1], a
call HasEnoughMoney call HasEnoughMoney
jr nc, .enoughMoney jr nc, .enoughMoney
@ -49,11 +49,13 @@ PoryZSalesmanText:
.enoughMoney .enoughMoney
lb bc, DUBIOUS_DISC, 1 lb bc, DUBIOUS_DISC, 1
call GiveItem call GiveItem
jr nc, .done jr nc, .BagFull
ld hl, ReceivedDubiousDiscText
call PrintText
xor a xor a
ld [wPriceTemp], a ld [wPriceTemp], a
ld [wPriceTemp + 2], a ld [wPriceTemp + 2], a
ld a, $21 ld a, $30
ld [wPriceTemp + 1], a ld [wPriceTemp + 1], a
ld hl, wPriceTemp + 2 ld hl, wPriceTemp + 2
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
@ -65,10 +67,17 @@ PoryZSalesmanText:
SetEvent EVENT_BOUGHT_DUBIOUS_DISC SetEvent EVENT_BOUGHT_DUBIOUS_DISC
jr .done jr .done
.choseNo .choseNo
ld hl, .RefuseText ld hl, RefuseText2
jr .printText call PrintText
jr .done
.alreadyBoughtPoryZ .alreadyBoughtPoryZ
ld hl, .Text2 ld hl, .Text2
call PrintText
jr .done
.BagFull
ld hl, PoryZBagFull
call PrintText
jr .done
.printText .printText
call PrintText call PrintText
.done .done
@ -78,16 +87,21 @@ PoryZSalesmanText:
text_far _PoryZSalesmanText1 text_far _PoryZSalesmanText1
text_end text_end
.RefuseText .Text2
text_far _PoryZSalesmanNoText text_far _PoryZSalesmanText2
text_end text_end
.NoMoneyText .NoMoneyText
text_far _PoryZSalesmanNoMoneyText text_far _PoryZSalesmanNoMoneyText
text_end text_end
.Text2 RefuseText2:
text_far _PoryZSalesmanText2 text_far _PoryZSalesmanNoText
text_end
ReceivedDubiousDiscText:
text_far _ReceivedDubiousDiscText
sound_get_item_1
text_end text_end
PoryZBagFull: PoryZBagFull:

View file

@ -190,7 +190,9 @@ SafariBallSalesman:
.enoughMoney .enoughMoney
lb bc, SAFARI_BALL, 3 lb bc, SAFARI_BALL, 3
call GiveItem call GiveItem
jr nc, .done jr nc, .BagFull
ld hl, ReceivedSafariBallsText
call PrintText
xor a xor a
ld [wPriceTemp], a ld [wPriceTemp], a
ld [wPriceTemp + 2], a ld [wPriceTemp + 2], a
@ -205,7 +207,13 @@ SafariBallSalesman:
call DisplayTextBoxID call DisplayTextBoxID
jr .done jr .done
.choseNo .choseNo
ld hl, .RefuseText ld hl, RefuseText
call PrintText
jr .done
.BagFull
ld hl, SafariBallBagFull
call PrintText
jr .done
.printText .printText
call PrintText call PrintText
.done .done
@ -215,12 +223,17 @@ SafariBallSalesman:
text_far _SafariBallSalesmanText1 text_far _SafariBallSalesmanText1
text_end text_end
.RefuseText .NoMoneyText
text_far _SafariBallSalesmanNoMoneyText
text_end
RefuseText:
text_far _SafariBallSalesmanNoText text_far _SafariBallSalesmanNoText
text_end text_end
.NoMoneyText ReceivedSafariBallsText:
text_far _SafariBallSalesmanNoMoneyText text_far _ReceivedSafariBallsText
sound_get_item_1
text_end text_end
SafariBallBagFull: SafariBallBagFull:

View file

@ -33,7 +33,7 @@ _PoryZSalesmanText1::
para "Tell you what." para "Tell you what."
line "You can get a" line "You can get a"
cont "copy for ¥2100." cont "copy for ¥3000."
cont "What do you say?" cont "What do you say?"
done done
@ -44,6 +44,11 @@ _PoryZSalesmanNoText::
cont "chance!" cont "chance!"
done done
_ReceivedDubiousDiscText::
text "<PLAYER> received"
line "DUBIOUS DISC!@"
text_end
_PoryZSalesmanNoMoneyText:: _PoryZSalesmanNoMoneyText::
text "You'll need more" text "You'll need more"
line "money than that!" line "money than that!"
@ -60,3 +65,5 @@ _PoryZBagFull::
line "full! Can't sell" line "full! Can't sell"
cont "you anything like" cont "you anything like"
cont "that!" cont "that!"
done

View file

@ -145,6 +145,11 @@ _SafariBallSalesmanNoText::
cont "me?" cont "me?"
done done
_ReceivedSafariBallsText::
text "<PLAYER> received"
line "3 SAFARI BALLS!@"
text_end
_SafariBallSalesmanNoMoneyText:: _SafariBallSalesmanNoMoneyText::
text "Not enough money?" text "Not enough money?"
line "Sorry, kid! Paint" line "Sorry, kid! Paint"
@ -160,6 +165,7 @@ _SafariBallBagFull::
line "give you these" line "give you these"
cont "when your bag's" cont "when your bag's"
cont "that full!" cont "that full!"
done
_ReceivedTM50Text:: _ReceivedTM50Text::
text "<PLAYER> received" text "<PLAYER> received"