diff options
Diffstat (limited to 'scripts/celadonmartroof.asm')
| -rwxr-xr-x | scripts/celadonmartroof.asm | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 1f3bcb64..22a83780 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -1,5 +1,6 @@ CeladonMartRoofScript: - 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: - jpba RemoveItemByID + callba RemoveItemByID + ret CeladonMartRoofText_484ee: TX_FAR _CeladonMartRoofText_484ee @@ -139,48 +143,48 @@ CeladonMartRoofText_484ee: CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 - TX_SFX_ITEM + db $0b TX_FAR _CeladonMartRoofText_484fe - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a - TX_SFX_ITEM + db $0b TX_FAR _CeladonMartRoofText_4850f - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 - TX_WAIT_BUTTON + db $0d db "@" ReceivedTM49Text: TX_FAR _ReceivedTM49Text - TX_SFX_ITEM + db $0b TX_FAR _CeladonMartRoofText_48520 - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c - TX_WAIT_BUTTON + db $0d db "@" CeladonMartRoofScript_PrintDrinksInBag: |