pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add STANDARDMART_* jumptable index constants

Browse Source
This commit is contained in:
Rangi 2018-06-23 22:35:46 -04:00
parent e36a505906
commit f6ef095284
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engine/items/mart.asm
View File

@ -28,7 +28,7 @@ OpenMartDialog:: ; 15a45
MartDialog: ; 15a61 MartDialog: ; 15a61
ld a, 0 ld a, 0
ld [wEngineBuffer1], a ld [wEngineBuffer1], a
xor a xor a ; STANDARDMART_HOWMAYIHELPYOU
ld [wEngineBuffer5], a ld [wEngineBuffer5], a
call StandardMart call StandardMart
ret ret
@ -138,17 +138,27 @@ GetMart: ; 15b31
ret ret
; 15b47 ; 15b47
; StandardMart.MartFunctions indexes
const_def
const STANDARDMART_HOWMAYIHELPYOU ; 0
const STANDARDMART_TOPMENU ; 1
const STANDARDMART_BUY ; 2
const STANDARDMART_SELL ; 3
const STANDARDMART_QUIT ; 4
const STANDARDMART_ANYTHINGELSE ; 5
StandardMart: ; 15b47 StandardMart: ; 15b47
.loop .loop
ld a, [wEngineBuffer5] ld a, [wEngineBuffer5]
ld hl, .MartFunctions ld hl, .MartFunctions
rst JumpTable rst JumpTable
ld [wEngineBuffer5], a ld [wEngineBuffer5], a
cp $ff cp -1
jr nz, .loop jr nz, .loop
ret ret
.MartFunctions: .MartFunctions:
; entries correspond to STANDARDMART_* constants
dw .HowMayIHelpYou dw .HowMayIHelpYou
dw .TopMenu dw .TopMenu
dw .Buy dw .Buy
@ -161,7 +171,7 @@ StandardMart: ; 15b47
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_Mart_HowMayIHelpYou ld hl, Text_Mart_HowMayIHelpYou
call PrintText call PrintText
ld a, $1 ; top menu ld a, STANDARDMART_TOPMENU
ret ret
; 15b6e ; 15b6e
@ -176,13 +186,13 @@ StandardMart: ; 15b47
cp $2 cp $2
jr z, .sell jr z, .sell
.quit .quit
ld a, $4 ; Come again! ld a, STANDARDMART_QUIT
ret ret
.buy .buy
ld a, $2 ; buy ld a, STANDARDMART_BUY
ret ret
.sell .sell
ld a, $3 ; sell ld a, STANDARDMART_SELL
ret ret
; 15b8d ; 15b8d
@ -191,14 +201,14 @@ StandardMart: ; 15b47
call FarReadMart call FarReadMart
call BuyMenu call BuyMenu
and a and a
ld a, $5 ; Anything else? ld a, STANDARDMART_ANYTHINGELSE
ret ret
; 15b9a ; 15b9a
.Sell: ; 15b9a .Sell: ; 15b9a
call ExitMenu call ExitMenu
call SellMenu call SellMenu
ld a, $5 ; Anything else? ld a, STANDARDMART_ANYTHINGELSE
ret ret
; 15ba3 ; 15ba3
@ -206,7 +216,7 @@ StandardMart: ; 15b47
call ExitMenu call ExitMenu
ld hl, Text_Mart_ComeAgain ld hl, Text_Mart_ComeAgain
call MartTextBox call MartTextBox
ld a, $ff ; exit ld a, -1
ret ret
; 15baf ; 15baf
@ -214,7 +224,7 @@ StandardMart: ; 15b47
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_Mart_AnythingElse ld hl, Text_Mart_AnythingElse
call PrintText call PrintText
ld a, $1 ; top menu ld a, STANDARDMART_TOPMENU
ret ret
; 15bbb ; 15bbb
@ -470,7 +480,7 @@ BuyMenuLoop: ; 15cef
jr c, .cancel jr c, .cancel
ld de, wMoney ld de, wMoney
ld bc, hMoneyTemp ld bc, hMoneyTemp
ld a, $3 ; useless load ld a, 3 ; useless load
call CompareMoney call CompareMoney
jr c, .insufficient_funds jr c, .insufficient_funds
ld hl, wNumItems ld hl, wNumItems
@ -478,7 +488,7 @@ BuyMenuLoop: ; 15cef
jr nc, .insufficient_bag_space jr nc, .insufficient_bag_space
ld a, [wMartItemID] ld a, [wMartItemID]
ld e, a ld e, a
ld d, $0 ld d, 0
ld b, SET_FLAG ld b, SET_FLAG
ld hl, wBargainShopFlags ld hl, wBargainShopFlags
call FlagAction call FlagAction
@ -537,7 +547,7 @@ BargainShopAskPurchaseQuantity:
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld a, [wMartItemID] ld a, [wMartItemID]
ld e, a ld e, a
ld d, $0 ld d, 0
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld hl, wBargainShopFlags ld hl, wBargainShopFlags
call FlagAction call FlagAction
@ -546,7 +556,7 @@ BargainShopAskPurchaseQuantity:
jr nz, .SoldOut jr nz, .SoldOut
ld a, [wMartItemID] ld a, [wMartItemID]
ld e, a ld e, a
ld d, $0 ld d, 0
ld hl, wMartPointer ld hl, wMartPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]