pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Move some more constants out of misc_constants.asm

Browse Source
This commit is contained in:
Rangi 2018-01-25 17:30:13 -05:00
parent 0380c2a493
commit dcc0ca9b83
4 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
constants/map_data_constants.asm
View File

@ -183,3 +183,14 @@ INVISIBLE EQU 0
FIXED_FACING EQU 2 FIXED_FACING EQU 2
SLIDING EQU 3 SLIDING EQU 3
EMOTE_OBJECT EQU 7 EMOTE_OBJECT EQU 7
; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm)
const_def
const STEP_SLOW ; 0
const STEP_WALK ; 1
const STEP_BIKE ; 2
const STEP_LEDGE ; 3
const STEP_ICE ; 4
const STEP_TURN ; 5
const STEP_BACK_LEDGE ; 6
const STEP_WALK_IN_PLACE ; 7

4
constants/menu_constants.asm
View File

@ -65,3 +65,7 @@ MONMENU_FIELD_MOVE EQU 0
MONMENU_MENUOPTION EQU 1 MONMENU_MENUOPTION EQU 1
NUM_MONMENU_ITEMS EQU 8 NUM_MONMENU_ITEMS EQU 8
; start/select menu return values
HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111

42
constants/misc_constants.asm
View File

@ -18,10 +18,6 @@ GS_VERSION EQU 0
SAVE_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_1 EQU 99
SAVE_CHECK_VALUE_2 EQU 127 SAVE_CHECK_VALUE_2 EQU 127
; hMenuReturn
HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111
; time of day boundaries ; time of day boundaries
MORN_HOUR EQU 4 ; 4 AM MORN_HOUR EQU 4 ; 4 AM
DAY_HOUR EQU 10 ; 10 AM DAY_HOUR EQU 10 ; 10 AM
@ -35,46 +31,12 @@ MOM_MONEY EQU 2300
MAX_MONEY EQU 999999 MAX_MONEY EQU 999999
MAX_COINS EQU 9999 MAX_COINS EQU 9999
; link record
MAX_LINK_RECORD EQU 9999 MAX_LINK_RECORD EQU 9999
; day-care
MAX_DAY_CARE_EXP EQU $500000 MAX_DAY_CARE_EXP EQU $500000
; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm)
const_def
const STEP_SLOW ; 0
const STEP_WALK ; 1
const STEP_BIKE ; 2
const STEP_LEDGE ; 3
const STEP_ICE ; 4
const STEP_TURN ; 5
const STEP_BACK_LEDGE ; 6
const STEP_WALK_IN_PLACE ; 7
; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1
const HAPPINESS_GAINLEVEL ; 01
const HAPPINESS_USEDITEM ; 02
const HAPPINESS_USEDXITEM ; 03
const HAPPINESS_GYMBATTLE ; 04
const HAPPINESS_LEARNMOVE ; 05
const HAPPINESS_FAINTED ; 06
const HAPPINESS_POISONFAINT ; 07
const HAPPINESS_BEATENBYSTRONGFOE ; 08
const HAPPINESS_YOUNGCUT1 ; 09
const HAPPINESS_YOUNGCUT2 ; 0a
const HAPPINESS_YOUNGCUT3 ; 0b
const HAPPINESS_OLDERCUT1 ; 0c
const HAPPINESS_OLDERCUT2 ; 0d
const HAPPINESS_OLDERCUT3 ; 0e
const HAPPINESS_BITTERPOWDER ; 0f
const HAPPINESS_ENERGYROOT ; 10
const HAPPINESS_REVIVALHERB ; 11
const HAPPINESS_GROOMING ; 12
const HAPPINESS_GAINLEVELATHOME ; 13
; bug-catching contest ; bug-catching contest
BUG_CONTEST_MINUTES EQU 20 BUG_CONTEST_MINUTES EQU 20
BUG_CONTEST_SECONDS EQU 0 BUG_CONTEST_SECONDS EQU 0

22
constants/pokemon_data_constants.asm
View File

@ -182,6 +182,28 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_RARE ; 2 const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1
const HAPPINESS_GAINLEVEL ; 01
const HAPPINESS_USEDITEM ; 02
const HAPPINESS_USEDXITEM ; 03
const HAPPINESS_GYMBATTLE ; 04
const HAPPINESS_LEARNMOVE ; 05
const HAPPINESS_FAINTED ; 06
const HAPPINESS_POISONFAINT ; 07
const HAPPINESS_BEATENBYSTRONGFOE ; 08
const HAPPINESS_YOUNGCUT1 ; 09
const HAPPINESS_YOUNGCUT2 ; 0a
const HAPPINESS_YOUNGCUT3 ; 0b
const HAPPINESS_OLDERCUT1 ; 0c
const HAPPINESS_OLDERCUT2 ; 0d
const HAPPINESS_OLDERCUT3 ; 0e
const HAPPINESS_BITTERPOWDER ; 0f
const HAPPINESS_ENERGYROOT ; 10
const HAPPINESS_REVIVALHERB ; 11
const HAPPINESS_GROOMING ; 12
const HAPPINESS_GAINLEVELATHOME ; 13
; significant happiness values ; significant happiness values
BASE_HAPPINESS EQU 70 BASE_HAPPINESS EQU 70
FRIEND_BALL_HAPPINESS EQU 200 FRIEND_BALL_HAPPINESS EQU 200