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

Clean up some macro definitions

Browse Source
This commit is contained in:
Rangi 2021-03-21 20:09:34 -04:00
parent 90ce126139
commit 5037adc55f
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
constants/item_constants.asm
View File

@ -200,6 +200,11 @@ NUM_ITEMS EQU const_value - 1
__tmhm_value__ = 1 __tmhm_value__ = 1
add_tmnum: MACRO
\1_TMNUM EQU __tmhm_value__
__tmhm_value__ = __tmhm_value__ + 1
ENDM
add_tm: MACRO add_tm: MACRO
; Defines three constants: ; Defines three constants:
; - TM_\1: the item id, starting at $bf ; - TM_\1: the item id, starting at $bf
@ -217,8 +222,7 @@ endc
MOVE_FOR_TM = \1 MOVE_FOR_TM = \1
PURGE MOVE_FOR_TM PURGE MOVE_FOR_TM
const TM_\1 const TM_\1
\1_TMNUM EQU __tmhm_value__ add_tmnum \1
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
; see data/moves/tmhm_moves.asm for moves ; see data/moves/tmhm_moves.asm for moves
@ -295,8 +299,7 @@ MOVE_FOR_HM = \1
PURGE MOVE_FOR_HM PURGE MOVE_FOR_HM
PURGE HM_VALUE PURGE HM_VALUE
const HM_\1 const HM_\1
\1_TMNUM EQU __tmhm_value__ add_tmnum \1
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
add_hm CUT ; f3 add_hm CUT ; f3
@ -321,8 +324,7 @@ endc
MOVE_FOR_MT = \1 MOVE_FOR_MT = \1
PURGE MOVE_FOR_MT PURGE MOVE_FOR_MT
PURGE MT_VALUE PURGE MT_VALUE
\1_TMNUM EQU __tmhm_value__ add_tmnum \1
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
add_mt FLAMETHROWER add_mt FLAMETHROWER
@ -330,7 +332,7 @@ ENDM
add_mt ICE_BEAM add_mt ICE_BEAM
NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1 NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1
NUM_TM_HM_TUTOR EQU __tmhm_value__ - 1 NUM_TM_HM_TUTOR EQU NUM_TMS + NUM_HMS + NUM_TUTORS
const ITEM_FA ; fa const ITEM_FA ; fa

4
macros/scripts/audio.asm
View File

@ -50,8 +50,8 @@ FIRST_MUSIC_CMD EQU const_value
const octave_cmd ; $d0 const octave_cmd ; $d0
octave: MACRO octave: MACRO
assert 0 < (\1) && (\1) < 8, "octave must be 1-8" assert 1 <= (\1) && (\1) <= 8, "octave must be 1-8"
db octave_cmd | 8 - (\1) ; octave db octave_cmd + 8 - (\1) ; octave
ENDM ENDM
const_skip 7 ; all octave values const_skip 7 ; all octave values

10
macros/scripts/battle_anims.asm
View File

@ -1,12 +1,12 @@
anim_wait: MACRO
assert (\1) < $d0, "anim_wait argument must be less than $d0"
db \1
ENDM
; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) ; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm)
const_def $d0 const_def $d0
FIRST_BATTLE_ANIM_CMD EQU const_value FIRST_BATTLE_ANIM_CMD EQU const_value
anim_wait: MACRO
assert (\1) < FIRST_BATTLE_ANIM_CMD, "anim_wait argument must be less than {FIRST_BATTLE_ANIM_CMD}"
db \1
ENDM
const anim_obj_command ; $d0 const anim_obj_command ; $d0
anim_obj: MACRO anim_obj: MACRO
db anim_obj_command db anim_obj_command