diff options
Diffstat (limited to 'scripts/viridianmart.asm')
| -rwxr-xr-x | scripts/viridianmart.asm | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 542040a6..e20ed48e 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -3,7 +3,8 @@ ViridianMartScript: call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers ld a, [wViridianMarketCurScript] - jp CallFunctionInTable + call JumpTable + ret ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL @@ -11,7 +12,7 @@ ViridianMartScript_1d47d: ld hl, ViridianMartTextPointers jr .asm_1d48c .asm_1d489 - ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 + ld hl, ViridianMartTextPointers + $a ; starts at ViridianCashierText .asm_1d48c ld a, l ld [wMapTextPtr], a @@ -57,8 +58,19 @@ ViridianMartScript1: SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 ld [wViridianMarketCurScript], a - ; fallthrough + ret + ViridianMartScript2: + CheckEventHL EVENT_02D + ret z + CheckAndSetEventReuseHL EVENT_02C + ret nz + ld a, HS_OLD_MAN + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_OLD_MAN_1 + ld [wMissableObjectIndex], a + predef ShowObject ret ViridianMartTextPointers: @@ -81,7 +93,7 @@ ViridianMartText4: ViridianMartText5: TX_FAR ViridianMartParcelQuestText - db $11 + TX_SFX_KEY_ITEM db "@" ViridianMartText2: |