Eliminate enum: use const instead, with case-by-case parallel const implementations
This commit is contained in:
Rangi
@@ -6,9 +6,9 @@ endc
|
||||
ENDM
|
||||
|
||||
; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm)
|
||||
enum_start $d0
|
||||
const_def $d0
|
||||
|
||||
enum anim_obj_command ; $d0
|
||||
const anim_obj_command ; $d0
|
||||
anim_obj: MACRO
|
||||
db anim_obj_command
|
||||
if _NARG <= 4
|
||||
@@ -25,20 +25,20 @@ else
|
||||
endc
|
||||
ENDM
|
||||
|
||||
enum anim_1gfx_command ; $d1
|
||||
const anim_1gfx_command ; $d1
|
||||
anim_1gfx: MACRO
|
||||
db anim_1gfx_command
|
||||
db \1 ; gfx1
|
||||
ENDM
|
||||
|
||||
enum anim_2gfx_command ; $d2
|
||||
const anim_2gfx_command ; $d2
|
||||
anim_2gfx: MACRO
|
||||
db anim_2gfx_command
|
||||
db \1 ; gfx1
|
||||
db \2 ; gfx2
|
||||
ENDM
|
||||
|
||||
enum anim_3gfx_command ; $d3
|
||||
const anim_3gfx_command ; $d3
|
||||
anim_3gfx: MACRO
|
||||
db anim_3gfx_command
|
||||
db \1 ; gfx1
|
||||
@@ -46,7 +46,7 @@ anim_3gfx: MACRO
|
||||
db \3 ; gfx3
|
||||
ENDM
|
||||
|
||||
enum anim_4gfx_command ; $d4
|
||||
const anim_4gfx_command ; $d4
|
||||
anim_4gfx: MACRO
|
||||
db anim_4gfx_command
|
||||
db \1 ; gfx1
|
||||
@@ -55,7 +55,7 @@ anim_4gfx: MACRO
|
||||
db \4 ; gfx4
|
||||
ENDM
|
||||
|
||||
enum anim_5gfx_command ; $d5
|
||||
const anim_5gfx_command ; $d5
|
||||
anim_5gfx: MACRO
|
||||
db anim_5gfx_command
|
||||
db \1 ; gfx1
|
||||
@@ -65,147 +65,147 @@ anim_5gfx: MACRO
|
||||
db \5 ; gfx5
|
||||
ENDM
|
||||
|
||||
enum anim_incobj_command ; $d6
|
||||
const anim_incobj_command ; $d6
|
||||
anim_incobj: MACRO
|
||||
db anim_incobj_command
|
||||
db \1 ; object_id
|
||||
ENDM
|
||||
|
||||
enum anim_setobj_command ; $d7
|
||||
const anim_setobj_command ; $d7
|
||||
anim_setobj: MACRO
|
||||
db anim_setobj_command
|
||||
db \1 ; object_id
|
||||
db \2 ; value
|
||||
ENDM
|
||||
|
||||
enum anim_incbgeffect_command ; $d8
|
||||
const anim_incbgeffect_command ; $d8
|
||||
anim_incbgeffect: MACRO
|
||||
db anim_incbgeffect_command
|
||||
db \1 ; effect
|
||||
ENDM
|
||||
|
||||
enum anim_battlergfx_2row_command ; $d9
|
||||
const anim_battlergfx_2row_command ; $d9
|
||||
anim_battlergfx_2row: MACRO
|
||||
db anim_battlergfx_2row_command
|
||||
ENDM
|
||||
|
||||
enum anim_battlergfx_1row_command ; $da
|
||||
const anim_battlergfx_1row_command ; $da
|
||||
anim_battlergfx_1row: MACRO
|
||||
db anim_battlergfx_1row_command
|
||||
ENDM
|
||||
|
||||
enum anim_checkpokeball_command ; $db
|
||||
const anim_checkpokeball_command ; $db
|
||||
anim_checkpokeball: MACRO
|
||||
db anim_checkpokeball_command
|
||||
ENDM
|
||||
|
||||
enum anim_transform_command ; $dc
|
||||
const anim_transform_command ; $dc
|
||||
anim_transform: MACRO
|
||||
db anim_transform_command
|
||||
ENDM
|
||||
|
||||
enum anim_raisesub_command ; $dd
|
||||
const anim_raisesub_command ; $dd
|
||||
anim_raisesub: MACRO
|
||||
db anim_raisesub_command
|
||||
ENDM
|
||||
|
||||
enum anim_dropsub_command ; $de
|
||||
const anim_dropsub_command ; $de
|
||||
anim_dropsub: MACRO
|
||||
db anim_dropsub_command
|
||||
ENDM
|
||||
|
||||
enum anim_resetobp0_command ; $df
|
||||
const anim_resetobp0_command ; $df
|
||||
anim_resetobp0: MACRO
|
||||
db anim_resetobp0_command
|
||||
ENDM
|
||||
|
||||
enum anim_sound_command ; $e0
|
||||
const anim_sound_command ; $e0
|
||||
anim_sound: MACRO
|
||||
db anim_sound_command
|
||||
db (\1 << 2) | \2 ; duration, tracks
|
||||
db \3 ; sound_id
|
||||
ENDM
|
||||
|
||||
enum anim_cry_command ; $e1
|
||||
const anim_cry_command ; $e1
|
||||
anim_cry: MACRO
|
||||
db anim_cry_command
|
||||
db \1 ; pitch
|
||||
ENDM
|
||||
|
||||
enum anim_minimizeopp_command ; $e2
|
||||
const anim_minimizeopp_command ; $e2
|
||||
anim_minimizeopp: MACRO
|
||||
db anim_minimizeopp_command
|
||||
ENDM
|
||||
|
||||
enum anim_oamon_command ; $e3
|
||||
const anim_oamon_command ; $e3
|
||||
anim_oamon: MACRO
|
||||
db anim_oamon_command
|
||||
ENDM
|
||||
|
||||
enum anim_oamoff_command ; $e4
|
||||
const anim_oamoff_command ; $e4
|
||||
anim_oamoff: MACRO
|
||||
db anim_oamoff_command
|
||||
ENDM
|
||||
|
||||
enum anim_clearobjs_command ; $e5
|
||||
const anim_clearobjs_command ; $e5
|
||||
anim_clearobjs: MACRO
|
||||
db anim_clearobjs_command
|
||||
ENDM
|
||||
|
||||
enum anim_beatup_command ; $e6
|
||||
const anim_beatup_command ; $e6
|
||||
anim_beatup: MACRO
|
||||
db anim_beatup_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xe7_command ; $e7
|
||||
const anim_0xe7_command ; $e7
|
||||
anim_0xe7: MACRO
|
||||
db anim_0xe7_command
|
||||
ENDM
|
||||
|
||||
enum anim_updateactorpic_command ; $e8
|
||||
const anim_updateactorpic_command ; $e8
|
||||
anim_updateactorpic: MACRO
|
||||
db anim_updateactorpic_command
|
||||
ENDM
|
||||
|
||||
enum anim_minimize_command ; $e9
|
||||
const anim_minimize_command ; $e9
|
||||
anim_minimize: MACRO
|
||||
db anim_minimize_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xea_command ; $ea
|
||||
const anim_0xea_command ; $ea
|
||||
anim_0xea: MACRO
|
||||
db anim_0xea_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xeb_command ; $eb
|
||||
const anim_0xeb_command ; $eb
|
||||
anim_0xeb: MACRO
|
||||
db anim_0xeb_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xec_command ; $ec
|
||||
const anim_0xec_command ; $ec
|
||||
anim_0xec: MACRO
|
||||
db anim_0xec_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xed_command ; $ed
|
||||
const anim_0xed_command ; $ed
|
||||
anim_0xed: MACRO
|
||||
db anim_0xed_command
|
||||
ENDM
|
||||
|
||||
enum anim_if_param_and_command ; $ee
|
||||
const anim_if_param_and_command ; $ee
|
||||
anim_if_param_and: MACRO
|
||||
db anim_if_param_and_command
|
||||
db \1 ; value
|
||||
dw \2 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_jumpuntil_command ; $ef
|
||||
const anim_jumpuntil_command ; $ef
|
||||
anim_jumpuntil: MACRO
|
||||
db anim_jumpuntil_command
|
||||
dw \1 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_bgeffect_command ; $f0
|
||||
const anim_bgeffect_command ; $f0
|
||||
anim_bgeffect: MACRO
|
||||
db anim_bgeffect_command
|
||||
db \1 ; effect
|
||||
@@ -214,89 +214,89 @@ anim_bgeffect: MACRO
|
||||
db \4 ; unknown
|
||||
ENDM
|
||||
|
||||
enum anim_bgp_command ; $f1
|
||||
const anim_bgp_command ; $f1
|
||||
anim_bgp: MACRO
|
||||
db anim_bgp_command
|
||||
db \1 ; colors
|
||||
ENDM
|
||||
|
||||
enum anim_obp0_command ; $f2
|
||||
const anim_obp0_command ; $f2
|
||||
anim_obp0: MACRO
|
||||
db anim_obp0_command
|
||||
db \1 ; colors
|
||||
ENDM
|
||||
|
||||
enum anim_obp1_command ; $f3
|
||||
const anim_obp1_command ; $f3
|
||||
anim_obp1: MACRO
|
||||
db anim_obp1_command
|
||||
db \1 ; colors
|
||||
ENDM
|
||||
|
||||
enum anim_keepsprites_command ; $f4
|
||||
const anim_keepsprites_command ; $f4
|
||||
anim_keepsprites: MACRO
|
||||
db anim_keepsprites_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xf5_command ; $f5
|
||||
const anim_0xf5_command ; $f5
|
||||
anim_0xf5: MACRO
|
||||
db anim_0xf5_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xf6_command ; $f6
|
||||
const anim_0xf6_command ; $f6
|
||||
anim_0xf6: MACRO
|
||||
db anim_0xf6_command
|
||||
ENDM
|
||||
|
||||
enum anim_0xf7_command ; $f7
|
||||
const anim_0xf7_command ; $f7
|
||||
anim_0xf7: MACRO
|
||||
db anim_0xf7_command
|
||||
ENDM
|
||||
|
||||
enum anim_if_param_equal_command ; $f8
|
||||
const anim_if_param_equal_command ; $f8
|
||||
anim_if_param_equal: MACRO
|
||||
db anim_if_param_equal_command
|
||||
db \1 ; value
|
||||
dw \2 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_setvar_command ; $f9
|
||||
const anim_setvar_command ; $f9
|
||||
anim_setvar: MACRO
|
||||
db anim_setvar_command
|
||||
db \1 ; value
|
||||
ENDM
|
||||
|
||||
enum anim_incvar_command ; $fa
|
||||
const anim_incvar_command ; $fa
|
||||
anim_incvar: MACRO
|
||||
db anim_incvar_command
|
||||
ENDM
|
||||
|
||||
enum anim_if_var_equal_command ; $fb
|
||||
const anim_if_var_equal_command ; $fb
|
||||
anim_if_var_equal: MACRO
|
||||
db anim_if_var_equal_command
|
||||
db \1 ; value
|
||||
dw \2 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_jump_command ; $fc
|
||||
const anim_jump_command ; $fc
|
||||
anim_jump: MACRO
|
||||
db anim_jump_command
|
||||
dw \1 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_loop_command ; $fd
|
||||
const anim_loop_command ; $fd
|
||||
anim_loop: MACRO
|
||||
db anim_loop_command
|
||||
db \1 ; count
|
||||
dw \2 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_call_command ; $fe
|
||||
const anim_call_command ; $fe
|
||||
anim_call: MACRO
|
||||
db anim_call_command
|
||||
dw \1 ; address
|
||||
ENDM
|
||||
|
||||
enum anim_ret_command ; $ff
|
||||
const anim_ret_command ; $ff
|
||||
anim_ret: MACRO
|
||||
db anim_ret_command
|
||||
ENDM
|
||||
|
||||
Reference in New Issue
Block a user