thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 14:18:34 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Salesman 'Obtained item!' text

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

36
scripts/CinnabarPokecenter.asm
View file

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

23
scripts/FuchsiaCity.asm
View file

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