diff options
author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 12:57:02 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 12:57:02 -0400 |
commit | 3b4ea37c363b70ea1683059329879466dec4a094 (patch) | |
tree | 430b2260d025fc28880ce3f76882d97dcd50507d /engine | |
parent | 268e2cae0b98779cfb0c590ab9612151c752e868 (diff) |
Replace enum with const, and update many constants to be more like pokegold
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/items/inventory.asm | 2 | ||||
-rw-r--r-- | engine/menu/main_menu.asm | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 78417e2..3ecf4e2 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -712,7 +712,7 @@ ItemAttr_ReturnCarry: GetItemPrice: push hl push bc - ld a, ITEMATTR_PRICE + ld a, ITEMATTR_PRICE_LO call GetItemAttr ld e, a ld a, ITEMATTR_PRICE_HI diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 356a237..7034904 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,5 +1,18 @@ INCLUDE "constants.asm" + const_def + const M_NEW_GAME + const M_CONTINUE + const M_PLAY_GAME + const M_SET_TIME + + const_def + const CONTINUE + const NEW_GAME + const OPTION + const PLAY_POKEMON + const SET_TIME + SECTION "engine/menu/main_menu.asm@Initialize new game WRAM", ROMX ; TODO: Move this to another file when surrounding ; functions have been disassembled. |