diff options
Diffstat (limited to 'scripts/CeladonMartRoof.asm')
| -rwxr-xr-x | scripts/CeladonMartRoof.asm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index 0f71aa51..1d39670d 100755 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -1,5 +1,6 @@ CeladonMartRoof_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret CeladonMartRoofScript_GetDrinksInBag: ; construct a list of all drinks in the player's bag @@ -71,7 +72,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 res 6, [hl] call HandleMenuInput - bit 1, a ; pressed b + bit BIT_B_BUTTON, a ; pressed b ret nz ld hl, wFilteredBagItems ld a, [wCurrentMenuItem] @@ -125,13 +126,16 @@ CeladonMartRoofScript_GiveDrinkToGirl: ret .bagFull ld hl, CeladonMartRoofText_48526 - jp PrintText + call PrintText + ret .alreadyGaveDrink ld hl, CeladonMartRoofText_4852c - jp PrintText + call PrintText + ret RemoveItemByIDBank12: - farjp RemoveItemByID + farcall RemoveItemByID + ret CeladonMartRoofText_484ee: text_far _CeladonMartRoofText_484ee |