pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate enum: use const instead, with case-by-case parallel const implementations

Browse Source
This commit is contained in:
Rangi 2020-07-08 15:30:23 -04:00
parent 9e4a00af45
commit 6ca82e5c86
24 changed files with 543 additions and 560 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/engine.asm
View File

@ -1364,7 +1364,7 @@ ParseMusicCommand:
jp hl jp hl
MusicCommands: MusicCommands:
; entries correspond to macros/scripts/audio.asm enumeration ; entries correspond to audio constants (see macros/scripts/audio.asm)
dw Music_Octave8 ; octave 8 dw Music_Octave8 ; octave 8
dw Music_Octave7 ; octave 7 dw Music_Octave7 ; octave 7
dw Music_Octave6 ; octave 6 dw Music_Octave6 ; octave 6

87
constants/battle_constants.asm
View File

@ -162,59 +162,60 @@ SLP EQU %111 ; 0-7 turns
ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
; wPlayerSubStatus1 or wEnemySubStatus1 bit flags ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
enum_start 7, -1 const_def
enum SUBSTATUS_IN_LOVE const SUBSTATUS_NIGHTMARE
enum SUBSTATUS_ROLLOUT const SUBSTATUS_CURSE
enum SUBSTATUS_ENDURE const SUBSTATUS_PROTECT
enum SUBSTATUS_PERISH const SUBSTATUS_IDENTIFIED
enum SUBSTATUS_IDENTIFIED const SUBSTATUS_PERISH
enum SUBSTATUS_PROTECT const SUBSTATUS_ENDURE
enum SUBSTATUS_CURSE const SUBSTATUS_ROLLOUT
enum SUBSTATUS_NIGHTMARE const SUBSTATUS_IN_LOVE
; wPlayerSubStatus2 or wEnemySubStatus2 bit flags ; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
SUBSTATUS_CURLED EQU 0 const_def
const SUBSTATUS_CURLED
; wPlayerSubStatus3 or wEnemySubStatus3 bit flags ; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
enum_start 7, -1 const_def
enum SUBSTATUS_CONFUSED const SUBSTATUS_BIDE
enum SUBSTATUS_FLYING const SUBSTATUS_RAMPAGE
enum SUBSTATUS_UNDERGROUND const SUBSTATUS_IN_LOOP
enum SUBSTATUS_CHARGED const SUBSTATUS_FLINCHED
enum SUBSTATUS_FLINCHED const SUBSTATUS_CHARGED
enum SUBSTATUS_IN_LOOP const SUBSTATUS_UNDERGROUND
enum SUBSTATUS_RAMPAGE const SUBSTATUS_FLYING
enum SUBSTATUS_BIDE const SUBSTATUS_CONFUSED
; wPlayerSubStatus4 or wEnemySubStatus4 bit flags ; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
enum_start 7, -1 const_def
enum SUBSTATUS_LEECH_SEED const SUBSTATUS_X_ACCURACY
enum SUBSTATUS_RAGE const SUBSTATUS_MIST
enum SUBSTATUS_RECHARGE const SUBSTATUS_FOCUS_ENERGY
enum SUBSTATUS_SUBSTITUTE const SUBSTATUS_UNKNOWN_1
enum SUBSTATUS_UNKNOWN_1 const SUBSTATUS_SUBSTITUTE
enum SUBSTATUS_FOCUS_ENERGY const SUBSTATUS_RECHARGE
enum SUBSTATUS_MIST const SUBSTATUS_RAGE
enum SUBSTATUS_X_ACCURACY const SUBSTATUS_LEECH_SEED
; wPlayerSubStatus5 or wEnemySubStatus5 bit flags ; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
enum_start 7, -1 const_def
enum SUBSTATUS_CANT_RUN const SUBSTATUS_TOXIC
enum SUBSTATUS_DESTINY_BOND const SUBSTATUS_UNKNOWN_2
enum SUBSTATUS_LOCK_ON const SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_ENCORED const SUBSTATUS_TRANSFORMED
enum SUBSTATUS_TRANSFORMED const SUBSTATUS_ENCORED
enum SUBSTATUS_UNKNOWN_2 const SUBSTATUS_LOCK_ON
enum SUBSTATUS_UNKNOWN_3 const SUBSTATUS_DESTINY_BOND
enum SUBSTATUS_TOXIC const SUBSTATUS_CANT_RUN
; wPlayerScreens or wEnemyScreens bit flags ; wPlayerScreens or wEnemyScreens bit flags
enum_start 4, -1 const_def
enum SCREENS_REFLECT const SCREENS_SPIKES
enum SCREENS_LIGHT_SCREEN const SCREENS_UNUSED
enum SCREENS_SAFEGUARD const SCREENS_SAFEGUARD
enum SCREENS_UNUSED const SCREENS_LIGHT_SCREEN
enum SCREENS_SPIKES const SCREENS_REFLECT
; values in wBattleWeather ; values in wBattleWeather
const_def const_def

10
constants/deco_constants.asm
View File

@ -54,16 +54,18 @@ const_value = 1
const SET_UP_ORNAMENT const SET_UP_ORNAMENT
const PUT_AWAY_ORNAMENT const PUT_AWAY_ORNAMENT
__deco_value__ = 0
deco: MACRO deco: MACRO
const DECO_\1 const DECO_\1
enum DECOFLAG_\1 DECOFLAG_\1 EQU __deco_value__
__deco_value__ = __deco_value__ + 1
ENDM ENDM
; decorations: ; decorations:
; - DecorationAttributes (see data/decorations/attributes.asm) ; - DecorationAttributes (see data/decorations/attributes.asm)
; - DecorationIDs (see data/decorations/decorations.asm) ; - DecorationIDs (see data/decorations/decorations.asm)
const_def 1 const_def 1
enum_start
; FindOwnedBeds.beds values (see engine/overworld/decorations.asm) ; FindOwnedBeds.beds values (see engine/overworld/decorations.asm)
const BEDS const BEDS
deco FEATHERY_BED deco FEATHERY_BED
@ -121,7 +123,7 @@ ENDM
deco GEODUDE_DOLL deco GEODUDE_DOLL
deco MACHOP_DOLL deco MACHOP_DOLL
deco TENTACOOL_DOLL deco TENTACOOL_DOLL
NUM_NON_TROPHY_DECOS EQU __enum__ NUM_NON_TROPHY_DECOS EQU __deco_value__
deco GOLD_TROPHY_DOLL deco GOLD_TROPHY_DOLL
deco SILVER_TROPHY_DOLL deco SILVER_TROPHY_DOLL
NUM_DECOS EQU __enum__ NUM_DECOS EQU __deco_value__

30
constants/item_constants.asm
View File

@ -197,6 +197,8 @@
const MIRAGE_MAIL ; bd const MIRAGE_MAIL ; bd
const ITEM_BE ; be const ITEM_BE ; be
__tmhm_value__ = 1
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
@ -205,17 +207,17 @@ add_tm: MACRO
; The first usage also defines TM01 as the first TM item id. ; The first usage also defines TM01 as the first TM item id.
if !DEF(TM01) if !DEF(TM01)
TM01 EQU const_value TM01 EQU const_value
enum_start 1
endc endc
if __enum__ < 10 if __tmhm_value__ < 10
MOVE_FOR_TM EQUS "TM0{d:__enum__}_MOVE" MOVE_FOR_TM EQUS "TM0{d:__tmhm_value__}_MOVE"
else else
MOVE_FOR_TM EQUS "TM{d:__enum__}_MOVE" MOVE_FOR_TM EQUS "TM{d:__tmhm_value__}_MOVE"
endc endc
MOVE_FOR_TM = \1 MOVE_FOR_TM = \1
PURGE MOVE_FOR_TM PURGE MOVE_FOR_TM
const TM_\1 const TM_\1
enum \1_TMNUM \1_TMNUM EQU __tmhm_value__
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
; see data/moves/tmhm_moves.asm for moves ; see data/moves/tmhm_moves.asm for moves
@ -271,7 +273,7 @@ ENDM
add_tm FIRE_PUNCH ; f0 add_tm FIRE_PUNCH ; f0
add_tm FURY_CUTTER ; f1 add_tm FURY_CUTTER ; f1
add_tm NIGHTMARE ; f2 add_tm NIGHTMARE ; f2
NUM_TMS EQU __enum__ - 1 NUM_TMS EQU __tmhm_value__ - 1
add_hm: MACRO add_hm: MACRO
; Defines three constants: ; Defines three constants:
@ -282,7 +284,7 @@ add_hm: MACRO
if !DEF(HM01) if !DEF(HM01)
HM01 EQU const_value HM01 EQU const_value
endc endc
HM_VALUE EQU __enum__ - NUM_TMS HM_VALUE EQU __tmhm_value__ - NUM_TMS
if HM_VALUE < 10 if HM_VALUE < 10
MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE" MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE"
else else
@ -292,7 +294,8 @@ MOVE_FOR_HM = \1
PURGE MOVE_FOR_HM PURGE MOVE_FOR_HM
PURGE HM_VALUE PURGE HM_VALUE
const HM_\1 const HM_\1
enum \1_TMNUM \1_TMNUM EQU __tmhm_value__
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
add_hm CUT ; f3 add_hm CUT ; f3
@ -302,13 +305,13 @@ ENDM
add_hm FLASH ; f7 add_hm FLASH ; f7
add_hm WHIRLPOOL ; f8 add_hm WHIRLPOOL ; f8
add_hm WATERFALL ; f9 add_hm WATERFALL ; f9
NUM_HMS EQU __enum__ - NUM_TMS - 1 NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1
add_mt: MACRO add_mt: MACRO
; Defines two constants: ; Defines two constants:
; - \1_TMNUM: the learnable TM/HM flag, starting at 58 ; - \1_TMNUM: the learnable TM/HM flag, starting at 58
; - MT##_MOVE: alias for the move id, equal to the value of \1 ; - MT##_MOVE: alias for the move id, equal to the value of \1
MT_VALUE EQU __enum__ - NUM_TMS - NUM_HMS MT_VALUE EQU __tmhm_value__ - NUM_TMS - NUM_HMS
if MT_VALUE < 10 if MT_VALUE < 10
MOVE_FOR_MT EQUS "MT0{d:MT_VALUE}_MOVE" MOVE_FOR_MT EQUS "MT0{d:MT_VALUE}_MOVE"
else else
@ -317,15 +320,16 @@ endc
MOVE_FOR_MT = \1 MOVE_FOR_MT = \1
PURGE MOVE_FOR_MT PURGE MOVE_FOR_MT
PURGE MT_VALUE PURGE MT_VALUE
enum \1_TMNUM \1_TMNUM EQU __tmhm_value__
__tmhm_value__ = __tmhm_value__ + 1
ENDM ENDM
add_mt FLAMETHROWER add_mt FLAMETHROWER
add_mt THUNDERBOLT add_mt THUNDERBOLT
add_mt ICE_BEAM add_mt ICE_BEAM
NUM_TUTORS = __enum__ - NUM_TMS - NUM_HMS - 1 NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1
NUM_TM_HM_TUTOR EQU __enum__ - 1 NUM_TM_HM_TUTOR EQU __tmhm_value__ - 1
const ITEM_FA ; fa const ITEM_FA ; fa

5
constants/map_constants.asm
View File

@ -1,6 +1,6 @@
newgroup: MACRO newgroup: MACRO
const_value = const_value + 1 const_value = const_value + 1
enum_start 1 __map_value__ = 1
ENDM ENDM
map_const: MACRO map_const: MACRO
@ -8,7 +8,8 @@ map_const: MACRO
;\2: width: in blocks ;\2: width: in blocks
;\3: height: in blocks ;\3: height: in blocks
GROUP_\1 EQU const_value GROUP_\1 EQU const_value
enum MAP_\1 MAP_\1 EQU __map_value__
__map_value__ = __map_value__ + 1
\1_WIDTH EQU \2 \1_WIDTH EQU \2
\1_HEIGHT EQU \3 \1_HEIGHT EQU \3
ENDM ENDM

12
constants/trainer_constants.asm
View File

@ -1,5 +1,8 @@
__trainer_class__ = 0
trainerclass: MACRO trainerclass: MACRO
enum \1 \1 EQU __trainer_class__
__trainer_class__ = __trainer_class__ + 1
const_value = 1 const_value = 1
ENDM ENDM
@ -15,8 +18,7 @@ ENDM
; - BTTrainerClassSprites (see data/trainers/sprites.asm) ; - BTTrainerClassSprites (see data/trainers/sprites.asm)
; - BTTrainerClassGenders (see data/trainers/genders.asm) ; - BTTrainerClassGenders (see data/trainers/genders.asm)
; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm) ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
enum_start CHRIS EQU __trainer_class__
CHRIS EQU __enum__
trainerclass TRAINER_NONE ; 0 trainerclass TRAINER_NONE ; 0
const PHONECONTACT_MOM const PHONECONTACT_MOM
const PHONECONTACT_BIKESHOP const PHONECONTACT_BIKESHOP
@ -24,7 +26,7 @@ CHRIS EQU __enum__
const PHONECONTACT_ELM const PHONECONTACT_ELM
const PHONECONTACT_BUENA const PHONECONTACT_BUENA
KRIS EQU __enum__ KRIS EQU __trainer_class__
trainerclass FALKNER ; 1 trainerclass FALKNER ; 1
const FALKNER1 const FALKNER1
@ -700,4 +702,4 @@ KRIS EQU __enum__
trainerclass MYSTICALMAN ; 43 trainerclass MYSTICALMAN ; 43
const EUSINE const EUSINE
NUM_TRAINER_CLASSES EQU __enum__ NUM_TRAINER_CLASSES EQU __trainer_class__

2
data/moves/tmhm_moves.asm
View File

@ -2,7 +2,7 @@
; define constants for the item IDs and for the corresponding move values. ; define constants for the item IDs and for the corresponding move values.
TMHMMoves: TMHMMoves:
; entries correspond to *_TMNUM enums (see constants/item_constants.asm) ; entries correspond to *_TMNUM constants (see constants/item_constants.asm)
; TMs ; TMs
n = 1 n = 1

2
engine/battle_anims/anim_commands.asm
View File

@ -326,7 +326,7 @@ RunBattleAnimCommand:
jp hl jp hl
BattleAnimCommands:: BattleAnimCommands::
; entries correspond to macros/scripts/battle_anims.asm enumeration ; entries correspond to anim_* constants (see macros/scripts/battle_anims.asm)
dw BattleAnimCmd_Obj dw BattleAnimCmd_Obj
dw BattleAnimCmd_1GFX dw BattleAnimCmd_1GFX
dw BattleAnimCmd_2GFX dw BattleAnimCmd_2GFX

2
engine/movie/trade_animation.asm
View File

@ -231,7 +231,7 @@ DoTradeAnimation:
jumptable .JumpTable, wJumptableIndex jumptable .JumpTable, wJumptableIndex
.JumpTable: .JumpTable:
; entries correspond to macros/scripts/trade_anims.asm enumeration ; entries correspond to tradeanim_* constants (see macros/scripts/trade_anims.asm)
dw TradeAnim_AdvanceScriptPointer ; 00 dw TradeAnim_AdvanceScriptPointer ; 00
dw TradeAnim_ShowGivemonData ; 01 dw TradeAnim_ShowGivemonData ; 01
dw TradeAnim_ShowGetmonData ; 02 dw TradeAnim_ShowGetmonData ; 02

2
engine/overworld/movement.asm
View File

@ -1,5 +1,5 @@
MovementPointers: MovementPointers:
; entries correspond to macros/scripts/movement.asm enumeration ; entries correspond to movement_* constants (see macros/scripts/movement.asm)
dw Movement_turn_head_down ; 00 dw Movement_turn_head_down ; 00
dw Movement_turn_head_up ; 01 dw Movement_turn_head_up ; 01
dw Movement_turn_head_left ; 02 dw Movement_turn_head_left ; 02

2
engine/overworld/scripting.asm
View File

@ -62,7 +62,7 @@ RunScriptCommand:
ret ret
ScriptCommandTable: ScriptCommandTable:
; entries correspond to macros/scripts/events.asm enumeration ; entries correspond to *_command constants (see macros/scripts/events.asm)
dw Script_scall ; 00 dw Script_scall ; 00
dw Script_farscall ; 01 dw Script_farscall ; 01
dw Script_memcall ; 02 dw Script_memcall ; 02

2
lib/mobile/main.asm
View File

@ -1,6 +1,6 @@
; A library included as part of the Mobile Adapter GB SDK. ; A library included as part of the Mobile Adapter GB SDK.
INCLUDE "macros/enum.asm" INCLUDE "macros/const.asm"
INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/hardware_constants.asm"
INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/mobile_constants.asm"

2
macros.asm
View File

@ -1,4 +1,4 @@
INCLUDE "macros/enum.asm" INCLUDE "macros/const.asm"
INCLUDE "macros/predef.asm" INCLUDE "macros/predef.asm"
INCLUDE "macros/rst.asm" INCLUDE "macros/rst.asm"
INCLUDE "macros/data.asm" INCLUDE "macros/data.asm"

24
macros/const.asm Normal file
View File

@ -0,0 +1,24 @@
; Enumerate constants
const_def: MACRO
if _NARG >= 1
const_value = \1
else
const_value = 0
endc
if _NARG >= 2
const_inc = \2
else
const_inc = 1
endc
ENDM
const: MACRO
\1 EQU const_value
const_value = const_value + const_inc
ENDM
shift_const: MACRO
\1 EQU (1 << const_value)
const_value = const_value + const_inc
ENDM

43
macros/enum.asm
View File

@ -1,43 +0,0 @@
; Enumerate variables
enum_start: MACRO
if _NARG >= 1
__enum__ = \1
else
__enum__ = 0
endc
if _NARG >= 2
__enumdir__ = \2
else
__enumdir__ = 1
endc
ENDM
enum: MACRO
\1 EQU __enum__
__enum__ = __enum__ + __enumdir__
ENDM
enum_set: MACRO
__enum__ = \1
ENDM
; Enumerate constants
const_def: MACRO
if _NARG >= 1
const_value = \1
else
const_value = 0
endc
ENDM
const: MACRO
\1 EQU const_value
const_value = const_value + 1
ENDM
shift_const: MACRO
\1 EQU (1 << const_value)
const_value = const_value + 1
ENDM

88
macros/scripts/audio.asm
View File

@ -41,17 +41,17 @@ noise_note: MACRO
ENDM ENDM
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d0, 8 const_def $d0, 8
FIRST_MUSIC_CMD EQU __enum__ FIRST_MUSIC_CMD EQU const_value
enum octave_cmd ; $d0 const octave_cmd ; $d0
octave: MACRO octave: MACRO
db octave_cmd | 8 - (\1) ; octave db octave_cmd | 8 - (\1) ; octave
ENDM ENDM
__enumdir__ = 1 const_inc = 1
enum note_type_cmd ; $d8 const note_type_cmd ; $d8
note_type: MACRO note_type: MACRO
db note_type_cmd db note_type_cmd
db \1 ; note length db \1 ; note length
@ -69,25 +69,25 @@ drum_speed: MACRO
note_type \1 ; note length note_type \1 ; note length
ENDM ENDM
enum transpose_cmd ; $d9 const transpose_cmd ; $d9
transpose: MACRO transpose: MACRO
db transpose_cmd db transpose_cmd
dn \1, \2 ; num octaves, num pitches dn \1, \2 ; num octaves, num pitches
ENDM ENDM
enum tempo_cmd ; $da const tempo_cmd ; $da
tempo: MACRO tempo: MACRO
db tempo_cmd db tempo_cmd
bigdw \1 ; tempo bigdw \1 ; tempo
ENDM ENDM
enum duty_cycle_cmd ; $db const duty_cycle_cmd ; $db
duty_cycle: MACRO duty_cycle: MACRO
db duty_cycle_cmd db duty_cycle_cmd
db \1 ; duty cycle db \1 ; duty cycle
ENDM ENDM
enum volume_envelope_cmd ; $dc const volume_envelope_cmd ; $dc
volume_envelope: MACRO volume_envelope: MACRO
db volume_envelope_cmd db volume_envelope_cmd
IF \2 < 0 IF \2 < 0
@ -97,7 +97,7 @@ volume_envelope: MACRO
ENDC ENDC
ENDM ENDM
enum pitch_sweep_cmd ; $dd const pitch_sweep_cmd ; $dd
pitch_sweep: MACRO pitch_sweep: MACRO
db pitch_sweep_cmd db pitch_sweep_cmd
IF \2 < 0 IF \2 < 0
@ -107,25 +107,25 @@ pitch_sweep: MACRO
ENDC ENDC
ENDM ENDM
enum duty_cycle_pattern_cmd ; $de const duty_cycle_pattern_cmd ; $de
duty_cycle_pattern: MACRO duty_cycle_pattern: MACRO
db duty_cycle_pattern_cmd db duty_cycle_pattern_cmd
db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern
ENDM ENDM
enum toggle_sfx_cmd ; $df const toggle_sfx_cmd ; $df
toggle_sfx: MACRO toggle_sfx: MACRO
db toggle_sfx_cmd db toggle_sfx_cmd
ENDM ENDM
enum pitch_slide_cmd ; $e0 const pitch_slide_cmd ; $e0
pitch_slide: MACRO pitch_slide: MACRO
db pitch_slide_cmd db pitch_slide_cmd
db \1 - 1 ; duration db \1 - 1 ; duration
dn 8 - \2, \3 % 12 ; octave, pitch dn 8 - \2, \3 % 12 ; octave, pitch
ENDM ENDM
enum vibrato_cmd ; $e1 const vibrato_cmd ; $e1
vibrato: MACRO vibrato: MACRO
db vibrato_cmd db vibrato_cmd
db \1 ; delay db \1 ; delay
@ -136,13 +136,13 @@ vibrato: MACRO
ENDC ENDC
ENDM ENDM
enum unknownmusic0xe2_cmd ; $e2 const unknownmusic0xe2_cmd ; $e2
unknownmusic0xe2: MACRO unknownmusic0xe2: MACRO
db unknownmusic0xe2_cmd db unknownmusic0xe2_cmd
db \1 ; unknown db \1 ; unknown
ENDM ENDM
enum toggle_noise_cmd ; $e3 const toggle_noise_cmd ; $e3
toggle_noise: MACRO toggle_noise: MACRO
db toggle_noise_cmd db toggle_noise_cmd
IF _NARG > 0 IF _NARG > 0
@ -150,13 +150,13 @@ toggle_noise: MACRO
ENDC ENDC
ENDM ENDM
enum force_stereo_panning_cmd ; $e4 const force_stereo_panning_cmd ; $e4
force_stereo_panning: MACRO force_stereo_panning: MACRO
db force_stereo_panning_cmd db force_stereo_panning_cmd
dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable
ENDM ENDM
enum volume_cmd ; $e5 const volume_cmd ; $e5
volume: MACRO volume: MACRO
db volume_cmd db volume_cmd
IF _NARG > 1 IF _NARG > 1
@ -166,65 +166,65 @@ volume: MACRO
ENDC ENDC
ENDM ENDM
enum pitch_offset_cmd ; $e6 const pitch_offset_cmd ; $e6
pitch_offset: MACRO pitch_offset: MACRO
db pitch_offset_cmd db pitch_offset_cmd
bigdw \1 ; pitch offset bigdw \1 ; pitch offset
ENDM ENDM
enum unknownmusic0xe7_cmd ; $e7 const unknownmusic0xe7_cmd ; $e7
unknownmusic0xe7: MACRO unknownmusic0xe7: MACRO
db unknownmusic0xe7_cmd db unknownmusic0xe7_cmd
db \1 ; unknown db \1 ; unknown
ENDM ENDM
enum unknownmusic0xe8_cmd ; $e8 const unknownmusic0xe8_cmd ; $e8
unknownmusic0xe8: MACRO unknownmusic0xe8: MACRO
db unknownmusic0xe8_cmd db unknownmusic0xe8_cmd
db \1 ; unknown db \1 ; unknown
ENDM ENDM
enum tempo_relative_cmd ; $e9 const tempo_relative_cmd ; $e9
tempo_relative: MACRO tempo_relative: MACRO
db tempo_relative_cmd db tempo_relative_cmd
bigdw \1 ; tempo adjustment bigdw \1 ; tempo adjustment
ENDM ENDM
enum restart_channel_cmd ; $ea const restart_channel_cmd ; $ea
restart_channel: MACRO restart_channel: MACRO
db restart_channel_cmd db restart_channel_cmd
dw \1 ; address dw \1 ; address
ENDM ENDM
enum new_song_cmd ; $eb const new_song_cmd ; $eb
new_song: MACRO new_song: MACRO
db new_song_cmd db new_song_cmd
bigdw \1 ; id bigdw \1 ; id
ENDM ENDM
enum sfx_priority_on_cmd ; $ec const sfx_priority_on_cmd ; $ec
sfx_priority_on: MACRO sfx_priority_on: MACRO
db sfx_priority_on_cmd db sfx_priority_on_cmd
ENDM ENDM
enum sfx_priority_off_cmd ; $ed const sfx_priority_off_cmd ; $ed
sfx_priority_off: MACRO sfx_priority_off: MACRO
db sfx_priority_off_cmd db sfx_priority_off_cmd
ENDM ENDM
enum unknownmusic0xee_cmd ; $ee const unknownmusic0xee_cmd ; $ee
unknownmusic0xee: MACRO unknownmusic0xee: MACRO
db unknownmusic0xee_cmd db unknownmusic0xee_cmd
dw \1 ; address dw \1 ; address
ENDM ENDM
enum stereo_panning_cmd ; $ef const stereo_panning_cmd ; $ef
stereo_panning: MACRO stereo_panning: MACRO
db stereo_panning_cmd db stereo_panning_cmd
dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable
ENDM ENDM
enum sfx_toggle_noise_cmd ; $f0 const sfx_toggle_noise_cmd ; $f0
sfx_toggle_noise: MACRO sfx_toggle_noise: MACRO
db sfx_toggle_noise_cmd db sfx_toggle_noise_cmd
IF _NARG > 0 IF _NARG > 0
@ -232,84 +232,84 @@ sfx_toggle_noise: MACRO
ENDC ENDC
ENDM ENDM
enum music0xf1_cmd ; $f1 const music0xf1_cmd ; $f1
music0xf1: MACRO music0xf1: MACRO
db music0xf1_cmd db music0xf1_cmd
ENDM ENDM
enum music0xf2_cmd ; $f2 const music0xf2_cmd ; $f2
music0xf2: MACRO music0xf2: MACRO
db music0xf2_cmd db music0xf2_cmd
ENDM ENDM
enum music0xf3_cmd ; $f3 const music0xf3_cmd ; $f3
music0xf3: MACRO music0xf3: MACRO
db music0xf3_cmd db music0xf3_cmd
ENDM ENDM
enum music0xf4_cmd ; $f4 const music0xf4_cmd ; $f4
music0xf4: MACRO music0xf4: MACRO
db music0xf4_cmd db music0xf4_cmd
ENDM ENDM
enum music0xf5_cmd ; $f5 const music0xf5_cmd ; $f5
music0xf5: MACRO music0xf5: MACRO
db music0xf5_cmd db music0xf5_cmd
ENDM ENDM
enum music0xf6_cmd ; $f6 const music0xf6_cmd ; $f6
music0xf6: MACRO music0xf6: MACRO
db music0xf6_cmd db music0xf6_cmd
ENDM ENDM
enum music0xf7_cmd ; $f7 const music0xf7_cmd ; $f7
music0xf7: MACRO music0xf7: MACRO
db music0xf7_cmd db music0xf7_cmd
ENDM ENDM
enum music0xf8_cmd ; $f8 const music0xf8_cmd ; $f8
music0xf8: MACRO music0xf8: MACRO
db music0xf8_cmd db music0xf8_cmd
ENDM ENDM
enum unknownmusic0xf9_cmd ; $f9 const unknownmusic0xf9_cmd ; $f9
unknownmusic0xf9: MACRO unknownmusic0xf9: MACRO
db unknownmusic0xf9_cmd db unknownmusic0xf9_cmd
ENDM ENDM
enum set_condition_cmd ; $fa const set_condition_cmd ; $fa
set_condition: MACRO set_condition: MACRO
db set_condition_cmd db set_condition_cmd
db \1 ; condition db \1 ; condition
ENDM ENDM
enum sound_jump_if_cmd ; $fb const sound_jump_if_cmd ; $fb
sound_jump_if: MACRO sound_jump_if: MACRO
db sound_jump_if_cmd db sound_jump_if_cmd
db \1 ; condition db \1 ; condition
dw \2 ; address dw \2 ; address
ENDM ENDM
enum sound_jump_cmd ; $fc const sound_jump_cmd ; $fc
sound_jump: MACRO sound_jump: MACRO
db sound_jump_cmd db sound_jump_cmd
dw \1 ; address dw \1 ; address
ENDM ENDM
enum sound_loop_cmd ; $fd const sound_loop_cmd ; $fd
sound_loop: MACRO sound_loop: MACRO
db sound_loop_cmd db sound_loop_cmd
db \1 ; count db \1 ; count
dw \2 ; address dw \2 ; address
ENDM ENDM
enum sound_call_cmd ; $fe const sound_call_cmd ; $fe
sound_call: MACRO sound_call: MACRO
db sound_call_cmd db sound_call_cmd
dw \1 ; address dw \1 ; address
ENDM ENDM
enum sound_ret_cmd ; $ff const sound_ret_cmd ; $ff
sound_ret: MACRO sound_ret: MACRO
db sound_ret_cmd db sound_ret_cmd
ENDM ENDM

98
macros/scripts/battle_anims.asm
View File

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

6
macros/scripts/battle_commands.asm
View File

@ -1,10 +1,10 @@
command: MACRO command: MACRO
enum \1_command const \1_command
\1 EQUS "db \1_command" \1 EQUS "db \1_command"
ENDM ENDM
; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm) ; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm)
enum_start 1 const_def 1
command checkturn ; 01 command checkturn ; 01
command checkobedience ; 02 command checkobedience ; 02
command usedmovetext ; 03 command usedmovetext ; 03
@ -181,6 +181,6 @@ ENDM
command startloop ; ae command startloop ; ae
command curl ; af command curl ; af
enum_start $fe const_def $fe
command endturn ; fe command endturn ; fe
command endmove ; ff command endmove ; ff

342
macros/scripts/events.asm
View File

File diff suppressed because it is too large Load Diff

16
macros/scripts/gfx_anims.asm
View File

@ -12,41 +12,41 @@ endc
db x db x
ENDM ENDM
enum_start $fc const_def $fc
enum delanim_command ; $fc const delanim_command ; $fc
delanim: MACRO delanim: MACRO
; Removes the object from the screen, as opposed to `endanim` which just stops all motion ; Removes the object from the screen, as opposed to `endanim` which just stops all motion
db delanim_command db delanim_command
ENDM ENDM
enum dowait_command ; $fd const dowait_command ; $fd
dowait: MACRO dowait: MACRO
db dowait_command db dowait_command
db \1 ; frames db \1 ; frames
ENDM ENDM
enum dorestart_command ; $fe const dorestart_command ; $fe
dorestart: MACRO dorestart: MACRO
db dorestart_command db dorestart_command
ENDM ENDM
enum endanim_command ; $ff const endanim_command ; $ff
endanim: MACRO endanim: MACRO
db endanim_command db endanim_command
ENDM ENDM
; Used for pic animations ; Used for pic animations
__enum__ = $fd const_value = $fd
enum dorepeat_command ; $fd const dorepeat_command ; $fd
dorepeat: MACRO dorepeat: MACRO
db dorepeat_command db dorepeat_command
db \1 ; command offset to jump to db \1 ; command offset to jump to
ENDM ENDM
enum setrepeat_command ; $fe const setrepeat_command ; $fe
setrepeat: MACRO setrepeat: MACRO
db setrepeat_command db setrepeat_command
db \1 ; amount of times to repeat db \1 ; amount of times to repeat

86
macros/scripts/movement.asm
View File

@ -1,114 +1,114 @@
; MovementPointers indexes (see engine/overworld/movement.asm) ; MovementPointers indexes (see engine/overworld/movement.asm)
enum_start 0, 4 const_def 0, 4
; Directional movements ; Directional movements
enum movement_turn_head ; $00 const movement_turn_head ; $00
turn_head: MACRO turn_head: MACRO
db movement_turn_head | \1 db movement_turn_head | \1
ENDM ENDM
enum movement_turn_step ; $04 const movement_turn_step ; $04
turn_step: MACRO turn_step: MACRO
db movement_turn_step | \1 db movement_turn_step | \1
ENDM ENDM
enum movement_slow_step ; $08 const movement_slow_step ; $08
slow_step: MACRO slow_step: MACRO
db movement_slow_step | \1 db movement_slow_step | \1
ENDM ENDM
enum movement_step ; $0c const movement_step ; $0c
step: MACRO step: MACRO
db movement_step | \1 db movement_step | \1
ENDM ENDM
enum movement_big_step ; $10 const movement_big_step ; $10
big_step: MACRO big_step: MACRO
db movement_big_step | \1 db movement_big_step | \1
ENDM ENDM
enum movement_slow_slide_step ; $14 const movement_slow_slide_step ; $14
slow_slide_step: MACRO slow_slide_step: MACRO
db movement_slow_slide_step | \1 db movement_slow_slide_step | \1
ENDM ENDM
enum movement_slide_step ; $18 const movement_slide_step ; $18
slide_step: MACRO slide_step: MACRO
db movement_slide_step | \1 db movement_slide_step | \1
ENDM ENDM
enum movement_fast_slide_step ; $1c const movement_fast_slide_step ; $1c
fast_slide_step: MACRO fast_slide_step: MACRO
db movement_fast_slide_step | \1 db movement_fast_slide_step | \1
ENDM ENDM
enum movement_turn_away ; $20 const movement_turn_away ; $20
turn_away: MACRO turn_away: MACRO
db movement_turn_away | \1 db movement_turn_away | \1
ENDM ENDM
enum movement_turn_in ; $24 const movement_turn_in ; $24
turn_in: MACRO turn_in: MACRO
db movement_turn_in | \1 db movement_turn_in | \1
ENDM ENDM
enum movement_turn_waterfall ; $28 const movement_turn_waterfall ; $28
turn_waterfall: MACRO turn_waterfall: MACRO
db movement_turn_waterfall | \1 db movement_turn_waterfall | \1
ENDM ENDM
enum movement_slow_jump_step ; $2c const movement_slow_jump_step ; $2c
slow_jump_step: MACRO slow_jump_step: MACRO
db movement_slow_jump_step | \1 db movement_slow_jump_step | \1
ENDM ENDM
enum movement_jump_step ; $30 const movement_jump_step ; $30
jump_step: MACRO jump_step: MACRO
db movement_jump_step | \1 db movement_jump_step | \1
ENDM ENDM
enum movement_fast_jump_step ; $34 const movement_fast_jump_step ; $34
fast_jump_step: MACRO fast_jump_step: MACRO
db movement_fast_jump_step | \1 db movement_fast_jump_step | \1
ENDM ENDM
__enumdir__ = 1 const_inc = 1
; Control ; Control
enum movement_remove_sliding ; $38 const movement_remove_sliding ; $38
remove_sliding: MACRO remove_sliding: MACRO
db movement_remove_sliding db movement_remove_sliding
ENDM ENDM
enum movement_set_sliding ; $39 const movement_set_sliding ; $39
set_sliding: MACRO set_sliding: MACRO
db movement_set_sliding db movement_set_sliding
ENDM ENDM
enum movement_remove_fixed_facing ; $3a const movement_remove_fixed_facing ; $3a
remove_fixed_facing: MACRO remove_fixed_facing: MACRO
db movement_remove_fixed_facing db movement_remove_fixed_facing
ENDM ENDM
enum movement_fix_facing ; $3b const movement_fix_facing ; $3b
fix_facing: MACRO fix_facing: MACRO
db movement_fix_facing db movement_fix_facing
ENDM ENDM
enum movement_show_object ; $3c const movement_show_object ; $3c
show_object: MACRO show_object: MACRO
db movement_show_object db movement_show_object
ENDM ENDM
enum movement_hide_object ; $3d const movement_hide_object ; $3d
hide_object: MACRO hide_object: MACRO
db movement_hide_object db movement_hide_object
ENDM ENDM
; Sleep ; Sleep
enum movement_step_sleep ; $3e const movement_step_sleep ; $3e
step_sleep: MACRO step_sleep: MACRO
if \1 <= 8 if \1 <= 8
db movement_step_sleep + \1 - 1 db movement_step_sleep + \1 - 1
@ -117,104 +117,104 @@ else
endc endc
ENDM ENDM
__enum__ = __enum__ + 8 const_value = const_value + 8
enum movement_step_end ; $47 const movement_step_end ; $47
step_end: MACRO step_end: MACRO
db movement_step_end db movement_step_end
ENDM ENDM
enum movement_step_48 ; $48 const movement_step_48 ; $48
step_48: MACRO step_48: MACRO
db movement_step_48 db movement_step_48
db \1 ; ??? db \1 ; ???
ENDM ENDM
enum movement_remove_object ; $49 const movement_remove_object ; $49
remove_object: MACRO remove_object: MACRO
db movement_remove_object db movement_remove_object
ENDM ENDM
enum movement_step_loop ; $4a const movement_step_loop ; $4a
step_loop: MACRO step_loop: MACRO
db movement_step_loop db movement_step_loop
ENDM ENDM
enum movement_step_4b ; $4b const movement_step_4b ; $4b
step_4b: MACRO step_4b: MACRO
db movement_step_4b db movement_step_4b
ENDM ENDM
enum movement_teleport_from ; $4c const movement_teleport_from ; $4c
teleport_from: MACRO teleport_from: MACRO
db movement_teleport_from db movement_teleport_from
ENDM ENDM
enum movement_teleport_to ; $4d const movement_teleport_to ; $4d
teleport_to: MACRO teleport_to: MACRO
db movement_teleport_to db movement_teleport_to
ENDM ENDM
enum movement_skyfall ; $4e const movement_skyfall ; $4e
skyfall: MACRO skyfall: MACRO
db movement_skyfall db movement_skyfall
ENDM ENDM
enum movement_step_dig ; $4f const movement_step_dig ; $4f
step_dig: MACRO step_dig: MACRO
db movement_step_dig db movement_step_dig
db \1 ; length db \1 ; length
ENDM ENDM
enum movement_step_bump ; $50 const movement_step_bump ; $50
step_bump: MACRO step_bump: MACRO
db movement_step_bump db movement_step_bump
ENDM ENDM
enum movement_fish_got_bite ; $51 const movement_fish_got_bite ; $51
fish_got_bite: MACRO fish_got_bite: MACRO
db movement_fish_got_bite db movement_fish_got_bite
ENDM ENDM
enum movement_fish_cast_rod ; $52 const movement_fish_cast_rod ; $52
fish_cast_rod: MACRO fish_cast_rod: MACRO
db movement_fish_cast_rod db movement_fish_cast_rod
ENDM ENDM
enum movement_hide_emote ; $53 const movement_hide_emote ; $53
hide_emote: MACRO hide_emote: MACRO
db movement_hide_emote db movement_hide_emote
ENDM ENDM
enum movement_show_emote ; $54 const movement_show_emote ; $54
show_emote: MACRO show_emote: MACRO
db movement_show_emote db movement_show_emote
ENDM ENDM
enum movement_step_shake ; $55 const movement_step_shake ; $55
step_shake: MACRO step_shake: MACRO
db movement_step_shake db movement_step_shake
db \1 ; displacement db \1 ; displacement
ENDM ENDM
enum movement_tree_shake ; $56 const movement_tree_shake ; $56
tree_shake: MACRO tree_shake: MACRO
db movement_tree_shake db movement_tree_shake
ENDM ENDM
enum movement_rock_smash ; $57 const movement_rock_smash ; $57
rock_smash: MACRO rock_smash: MACRO
db movement_rock_smash db movement_rock_smash
db \1 ; length db \1 ; length
ENDM ENDM
enum movement_return_dig ; $58 const movement_return_dig ; $58
return_dig: MACRO return_dig: MACRO
db movement_return_dig db movement_return_dig
db \1 ; length db \1 ; length
ENDM ENDM
enum movement_skyfall_top ; $59 const movement_skyfall_top ; $59
skyfall_top: MACRO skyfall_top: MACRO
db movement_skyfall_top db movement_skyfall_top
ENDM ENDM

52
macros/scripts/text.asm
View File

@ -8,138 +8,138 @@ done EQUS "db \"<DONE>\"" ; End a text box.
prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event). prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event).
; TextCommands indexes (see home/text.asm) ; TextCommands indexes (see home/text.asm)
enum_start const_def
enum TX_START ; $00 const TX_START ; $00
text_start: MACRO text_start: MACRO
db TX_START db TX_START
ENDM ENDM
enum TX_RAM ; $01 const TX_RAM ; $01
text_ram: MACRO text_ram: MACRO
db TX_RAM db TX_RAM
dw \1 dw \1
ENDM ENDM
enum TX_BCD ; $02 const TX_BCD ; $02
text_bcd: MACRO text_bcd: MACRO
db TX_BCD db TX_BCD
dw \1 dw \1
db \2 db \2
ENDM ENDM
enum TX_MOVE ; $03 const TX_MOVE ; $03
text_move: MACRO text_move: MACRO
db TX_MOVE db TX_MOVE
dw \1 dw \1
ENDM ENDM
enum TX_BOX ; $04 const TX_BOX ; $04
text_box: MACRO text_box: MACRO
db TX_BOX db TX_BOX
dw \1 dw \1
db \2, \3 db \2, \3
ENDM ENDM
enum TX_LOW ; $05 const TX_LOW ; $05
text_low: MACRO text_low: MACRO
db TX_LOW db TX_LOW
ENDM ENDM
enum TX_PROMPT_BUTTON ; $06 const TX_PROMPT_BUTTON ; $06
text_promptbutton: MACRO text_promptbutton: MACRO
db TX_PROMPT_BUTTON db TX_PROMPT_BUTTON
ENDM ENDM
enum TX_SCROLL ; $07 const TX_SCROLL ; $07
text_scroll: MACRO text_scroll: MACRO
db TX_SCROLL db TX_SCROLL
ENDM ENDM
enum TX_START_ASM ; $08 const TX_START_ASM ; $08
text_asm: MACRO text_asm: MACRO
db TX_START_ASM db TX_START_ASM
ENDM ENDM
enum TX_NUM ; $09 const TX_NUM ; $09
text_decimal: MACRO text_decimal: MACRO
db TX_NUM db TX_NUM
dw \1 ; address dw \1 ; address
dn \2, \3 ; bytes, digits dn \2, \3 ; bytes, digits
ENDM ENDM
enum TX_PAUSE ; $0a const TX_PAUSE ; $0a
text_pause: MACRO text_pause: MACRO
db TX_PAUSE db TX_PAUSE
ENDM ENDM
enum TX_SOUND_DEX_FANFARE_50_79 ; $0b const TX_SOUND_DEX_FANFARE_50_79 ; $0b
sound_dex_fanfare_50_79: MACRO sound_dex_fanfare_50_79: MACRO
db TX_SOUND_DEX_FANFARE_50_79 db TX_SOUND_DEX_FANFARE_50_79
ENDM ENDM
enum TX_DOTS ; $0c const TX_DOTS ; $0c
text_dots: MACRO text_dots: MACRO
db TX_DOTS db TX_DOTS
db \1 db \1
ENDM ENDM
enum TX_WAIT_BUTTON ; $0d const TX_WAIT_BUTTON ; $0d
text_waitbutton: MACRO text_waitbutton: MACRO
db TX_WAIT_BUTTON db TX_WAIT_BUTTON
ENDM ENDM
enum TX_SOUND_DEX_FANFARE_20_49 ; $0e const TX_SOUND_DEX_FANFARE_20_49 ; $0e
sound_dex_fanfare_20_49: MACRO sound_dex_fanfare_20_49: MACRO
db TX_SOUND_DEX_FANFARE_20_49 db TX_SOUND_DEX_FANFARE_20_49
ENDM ENDM
enum TX_SOUND_ITEM ; $0f const TX_SOUND_ITEM ; $0f
sound_item: MACRO sound_item: MACRO
db TX_SOUND_ITEM db TX_SOUND_ITEM
ENDM ENDM
enum TX_SOUND_CAUGHT_MON ; $10 const TX_SOUND_CAUGHT_MON ; $10
sound_caught_mon: MACRO sound_caught_mon: MACRO
db TX_SOUND_CAUGHT_MON db TX_SOUND_CAUGHT_MON
ENDM ENDM
enum TX_SOUND_DEX_FANFARE_80_109 ; $11 const TX_SOUND_DEX_FANFARE_80_109 ; $11
sound_dex_fanfare_80_109: MACRO sound_dex_fanfare_80_109: MACRO
db TX_SOUND_DEX_FANFARE_80_109 db TX_SOUND_DEX_FANFARE_80_109
ENDM ENDM
enum TX_SOUND_FANFARE ; $12 const TX_SOUND_FANFARE ; $12
sound_fanfare: MACRO sound_fanfare: MACRO
db TX_SOUND_FANFARE db TX_SOUND_FANFARE
ENDM ENDM
enum TX_SOUND_SLOT_MACHINE_START ; $13 const TX_SOUND_SLOT_MACHINE_START ; $13
sound_slot_machine_start: MACRO sound_slot_machine_start: MACRO
db TX_SOUND_SLOT_MACHINE_START db TX_SOUND_SLOT_MACHINE_START
ENDM ENDM
enum TX_STRINGBUFFER ; $14 const TX_STRINGBUFFER ; $14
text_buffer: MACRO text_buffer: MACRO
db TX_STRINGBUFFER db TX_STRINGBUFFER
db \1 db \1
ENDM ENDM
enum TX_DAY ; $15 const TX_DAY ; $15
text_today: MACRO text_today: MACRO
db TX_DAY db TX_DAY
ENDM ENDM
enum TX_FAR ; $16 const TX_FAR ; $16
text_far: MACRO text_far: MACRO
db TX_FAR db TX_FAR
dw \1 dw \1
db BANK(\1) db BANK(\1)
ENDM ENDM
enum_set $50 const_def $50
enum TX_END ; $50 const TX_END ; $50
text_end: MACRO text_end: MACRO
db TX_END db TX_END
ENDM ENDM

112
macros/scripts/trade_anims.asm
View File

@ -1,254 +1,254 @@
; DoTradeAnimation.JumpTable indexes (see engine/movies/trade_animation.asm) ; DoTradeAnimation.JumpTable indexes (see engine/movies/trade_animation.asm)
enum_start const_def
enum tradeanim_next_command ; $00 const tradeanim_next_command ; $00
tradeanim_next: MACRO tradeanim_next: MACRO
db tradeanim_next_command db tradeanim_next_command
ENDM ENDM
enum tradeanim_show_givemon_data_command ; $01 const tradeanim_show_givemon_data_command ; $01
tradeanim_show_givemon_data: MACRO tradeanim_show_givemon_data: MACRO
db tradeanim_show_givemon_data_command db tradeanim_show_givemon_data_command
ENDM ENDM
enum tradeanim_show_getmon_data_command ; $02 const tradeanim_show_getmon_data_command ; $02
tradeanim_show_getmon_data: MACRO tradeanim_show_getmon_data: MACRO
db tradeanim_show_getmon_data_command db tradeanim_show_getmon_data_command
ENDM ENDM
enum tradeanim_enter_link_tube_command ; $03 const tradeanim_enter_link_tube_command ; $03
tradeanim_enter_link_tube: MACRO tradeanim_enter_link_tube: MACRO
db tradeanim_enter_link_tube_command db tradeanim_enter_link_tube_command
ENDM ENDM
enum_start $05 const_def $05
enum tradeanim_exit_link_tube_command ; $05 const tradeanim_exit_link_tube_command ; $05
tradeanim_exit_link_tube: MACRO tradeanim_exit_link_tube: MACRO
db tradeanim_exit_link_tube_command db tradeanim_exit_link_tube_command
ENDM ENDM
enum tradeanim_tube_to_ot_command ; $06 const tradeanim_tube_to_ot_command ; $06
tradeanim_tube_to_ot: MACRO tradeanim_tube_to_ot: MACRO
db tradeanim_tube_to_ot_command db tradeanim_tube_to_ot_command
ENDM ENDM
enum_start $0e const_def $0e
enum tradeanim_tube_to_player_command ; $0e const tradeanim_tube_to_player_command ; $0e
tradeanim_tube_to_player: MACRO tradeanim_tube_to_player: MACRO
db tradeanim_tube_to_player_command db tradeanim_tube_to_player_command
ENDM ENDM
enum_start $16 const_def $16
enum tradeanim_sent_to_ot_text_command ; $16 const tradeanim_sent_to_ot_text_command ; $16
tradeanim_sent_to_ot_text: MACRO tradeanim_sent_to_ot_text: MACRO
db tradeanim_sent_to_ot_text_command db tradeanim_sent_to_ot_text_command
ENDM ENDM
enum tradeanim_ot_bids_farewell_command ; $17 const tradeanim_ot_bids_farewell_command ; $17
tradeanim_ot_bids_farewell: MACRO tradeanim_ot_bids_farewell: MACRO
db tradeanim_ot_bids_farewell_command db tradeanim_ot_bids_farewell_command
ENDM ENDM
enum tradeanim_take_care_of_text_command ; $18 const tradeanim_take_care_of_text_command ; $18
tradeanim_take_care_of_text: MACRO tradeanim_take_care_of_text: MACRO
db tradeanim_take_care_of_text_command db tradeanim_take_care_of_text_command
ENDM ENDM
enum tradeanim_ot_sends_text_1_command ; $19 const tradeanim_ot_sends_text_1_command ; $19
tradeanim_ot_sends_text_1: MACRO tradeanim_ot_sends_text_1: MACRO
db tradeanim_ot_sends_text_1_command db tradeanim_ot_sends_text_1_command
ENDM ENDM
enum tradeanim_ot_sends_text_2_command ; $1a const tradeanim_ot_sends_text_2_command ; $1a
tradeanim_ot_sends_text_2: MACRO tradeanim_ot_sends_text_2: MACRO
db tradeanim_ot_sends_text_2_command db tradeanim_ot_sends_text_2_command
ENDM ENDM
enum tradeanim_setup_givemon_scroll_command ; $1b const tradeanim_setup_givemon_scroll_command ; $1b
tradeanim_setup_givemon_scroll: MACRO tradeanim_setup_givemon_scroll: MACRO
db tradeanim_setup_givemon_scroll_command db tradeanim_setup_givemon_scroll_command
ENDM ENDM
enum tradeanim_do_givemon_scroll_command ; $1c const tradeanim_do_givemon_scroll_command ; $1c
tradeanim_do_givemon_scroll: MACRO tradeanim_do_givemon_scroll: MACRO
db tradeanim_do_givemon_scroll_command db tradeanim_do_givemon_scroll_command
ENDM ENDM
enum tradeanim_frontpic_scroll_command ; $1d const tradeanim_frontpic_scroll_command ; $1d
tradeanim_frontpic_scroll: MACRO tradeanim_frontpic_scroll: MACRO
db tradeanim_frontpic_scroll_command db tradeanim_frontpic_scroll_command
ENDM ENDM
enum tradeanim_textbox_scroll_command ; $1e const tradeanim_textbox_scroll_command ; $1e
tradeanim_textbox_scroll: MACRO tradeanim_textbox_scroll: MACRO
db tradeanim_textbox_scroll_command db tradeanim_textbox_scroll_command
ENDM ENDM
enum tradeanim_scroll_out_right_command ; $1f const tradeanim_scroll_out_right_command ; $1f
tradeanim_scroll_out_right: MACRO tradeanim_scroll_out_right: MACRO
db tradeanim_scroll_out_right_command db tradeanim_scroll_out_right_command
ENDM ENDM
enum_start $21 const_def $21
enum tradeanim_wait_80_command ; $21 const tradeanim_wait_80_command ; $21
tradeanim_wait_80: MACRO tradeanim_wait_80: MACRO
db tradeanim_wait_80_command db tradeanim_wait_80_command
ENDM ENDM
enum tradeanim_wait_40_command ; $22 const tradeanim_wait_40_command ; $22
tradeanim_wait_40: MACRO tradeanim_wait_40: MACRO
db tradeanim_wait_40_command db tradeanim_wait_40_command
ENDM ENDM
enum tradeanim_rocking_ball_command ; $23 const tradeanim_rocking_ball_command ; $23
tradeanim_rocking_ball: MACRO tradeanim_rocking_ball: MACRO
db tradeanim_rocking_ball_command db tradeanim_rocking_ball_command
ENDM ENDM
enum tradeanim_drop_ball_command ; $24 const tradeanim_drop_ball_command ; $24
tradeanim_drop_ball: MACRO tradeanim_drop_ball: MACRO
db tradeanim_drop_ball_command db tradeanim_drop_ball_command
ENDM ENDM
enum tradeanim_wait_anim_command ; $25 const tradeanim_wait_anim_command ; $25
tradeanim_wait_anim: MACRO tradeanim_wait_anim: MACRO
db tradeanim_wait_anim_command db tradeanim_wait_anim_command
ENDM ENDM
enum_start $27 const_def $27
enum tradeanim_poof_command ; $27 const tradeanim_poof_command ; $27
tradeanim_poof: MACRO tradeanim_poof: MACRO
db tradeanim_poof_command db tradeanim_poof_command
ENDM ENDM
enum tradeanim_bulge_through_tube_command ; $28 const tradeanim_bulge_through_tube_command ; $28
tradeanim_bulge_through_tube: MACRO tradeanim_bulge_through_tube: MACRO
db tradeanim_bulge_through_tube_command db tradeanim_bulge_through_tube_command
ENDM ENDM
enum tradeanim_give_trademon_sfx_command ; $29 const tradeanim_give_trademon_sfx_command ; $29
tradeanim_give_trademon_sfx: MACRO tradeanim_give_trademon_sfx: MACRO
db tradeanim_give_trademon_sfx_command db tradeanim_give_trademon_sfx_command
ENDM ENDM
enum tradeanim_get_trademon_sfx_command ; $2a const tradeanim_get_trademon_sfx_command ; $2a
tradeanim_get_trademon_sfx: MACRO tradeanim_get_trademon_sfx: MACRO
db tradeanim_get_trademon_sfx_command db tradeanim_get_trademon_sfx_command
ENDM ENDM
enum tradeanim_end_command ; $2b const tradeanim_end_command ; $2b
tradeanim_end: MACRO tradeanim_end: MACRO
db tradeanim_end_command db tradeanim_end_command
ENDM ENDM
enum tradeanim_animate_frontpic_command ; $2c const tradeanim_animate_frontpic_command ; $2c
tradeanim_animate_frontpic: MACRO tradeanim_animate_frontpic: MACRO
db tradeanim_animate_frontpic_command db tradeanim_animate_frontpic_command
ENDM ENDM
enum tradeanim_wait_96_command ; $2d const tradeanim_wait_96_command ; $2d
tradeanim_wait_96: MACRO tradeanim_wait_96: MACRO
db tradeanim_wait_96_command db tradeanim_wait_96_command
ENDM ENDM
enum tradeanim_wait_80_if_ot_egg_command ; $2e const tradeanim_wait_80_if_ot_egg_command ; $2e
tradeanim_wait_80_if_ot_egg: MACRO tradeanim_wait_80_if_ot_egg: MACRO
db tradeanim_wait_80_if_ot_egg_command db tradeanim_wait_80_if_ot_egg_command
ENDM ENDM
enum tradeanim_wait_180_if_ot_egg_command ; $2f const tradeanim_wait_180_if_ot_egg_command ; $2f
tradeanim_wait_180_if_ot_egg: MACRO tradeanim_wait_180_if_ot_egg: MACRO
db tradeanim_wait_180_if_ot_egg_command db tradeanim_wait_180_if_ot_egg_command
ENDM ENDM
; Mobile ; Mobile
enum_start $01 const_def $01
enum mobiletradeanim_showgivemon_command ; $01 const mobiletradeanim_showgivemon_command ; $01
mobiletradeanim_showgivemon: MACRO mobiletradeanim_showgivemon: MACRO
db mobiletradeanim_showgivemon_command db mobiletradeanim_showgivemon_command
ENDM ENDM
enum mobiletradeanim_02_command ; $02 const mobiletradeanim_02_command ; $02
mobiletradeanim_02: MACRO mobiletradeanim_02: MACRO
db mobiletradeanim_02_command db mobiletradeanim_02_command
ENDM ENDM
enum mobiletradeanim_sendmon_command ; $03 const mobiletradeanim_sendmon_command ; $03
mobiletradeanim_sendmon: MACRO mobiletradeanim_sendmon: MACRO
db mobiletradeanim_sendmon_command db mobiletradeanim_sendmon_command
ENDM ENDM
enum_start $05 const_def $05
enum mobiletradeanim_05_command ; $05 const mobiletradeanim_05_command ; $05
mobiletradeanim_05: MACRO mobiletradeanim_05: MACRO
db mobiletradeanim_05_command db mobiletradeanim_05_command
ENDM ENDM
enum mobiletradeanim_06_command ; $06 const mobiletradeanim_06_command ; $06
mobiletradeanim_06: MACRO mobiletradeanim_06: MACRO
db mobiletradeanim_06_command db mobiletradeanim_06_command
ENDM ENDM
enum mobiletradeanim_07_command ; $07 const mobiletradeanim_07_command ; $07
mobiletradeanim_07: MACRO mobiletradeanim_07: MACRO
db mobiletradeanim_07_command db mobiletradeanim_07_command
ENDM ENDM
enum mobiletradeanim_receivemon_command ; $08 const mobiletradeanim_receivemon_command ; $08
mobiletradeanim_receivemon: MACRO mobiletradeanim_receivemon: MACRO
db mobiletradeanim_receivemon_command db mobiletradeanim_receivemon_command
ENDM ENDM
enum_start $0b const_def $0b
enum mobiletradeanim_showgetmon_command ; $0b const mobiletradeanim_showgetmon_command ; $0b
mobiletradeanim_showgetmon: MACRO mobiletradeanim_showgetmon: MACRO
db mobiletradeanim_showgetmon_command db mobiletradeanim_showgetmon_command
ENDM ENDM
enum mobiletradeanim_end_command ; $0c const mobiletradeanim_end_command ; $0c
mobiletradeanim_end: MACRO mobiletradeanim_end: MACRO
db mobiletradeanim_end_command db mobiletradeanim_end_command
ENDM ENDM
enum mobiletradeanim_showgtsgivemon_command ; $0d const mobiletradeanim_showgtsgivemon_command ; $0d
mobiletradeanim_showgtsgivemon: MACRO mobiletradeanim_showgtsgivemon: MACRO
db mobiletradeanim_showgtsgivemon_command db mobiletradeanim_showgtsgivemon_command
ENDM ENDM
enum mobiletradeanim_showgtsgetmon_command ; $0e const mobiletradeanim_showgtsgetmon_command ; $0e
mobiletradeanim_showgtsgetmon: MACRO mobiletradeanim_showgtsgetmon: MACRO
db mobiletradeanim_showgtsgetmon_command db mobiletradeanim_showgtsgetmon_command
ENDM ENDM
enum mobiletradeanim_0f_command ; $0f const mobiletradeanim_0f_command ; $0f
mobiletradeanim_0f: MACRO mobiletradeanim_0f: MACRO
db mobiletradeanim_0f_command db mobiletradeanim_0f_command
ENDM ENDM
enum mobiletradeanim_10_command ; $10 const mobiletradeanim_10_command ; $10
mobiletradeanim_10: MACRO mobiletradeanim_10: MACRO
db mobiletradeanim_10_command db mobiletradeanim_10_command
ENDM ENDM
enum mobiletradeanim_11_command ; $11 const mobiletradeanim_11_command ; $11
mobiletradeanim_11: MACRO mobiletradeanim_11: MACRO
db mobiletradeanim_11_command db mobiletradeanim_11_command
ENDM ENDM
enum mobiletradeanim_12_command ; $12 const mobiletradeanim_12_command ; $12
mobiletradeanim_12: MACRO mobiletradeanim_12: MACRO
db mobiletradeanim_12_command db mobiletradeanim_12_command
ENDM ENDM
enum mobiletradeanim_showoddegg_command ; $13 const mobiletradeanim_showoddegg_command ; $13
mobiletradeanim_showoddegg: MACRO mobiletradeanim_showoddegg: MACRO
db mobiletradeanim_showoddegg_command db mobiletradeanim_showoddegg_command
ENDM ENDM

76
wram.asm
View File

@ -445,58 +445,52 @@ wAttackMissed::
wPlayerSubStatus1:: wPlayerSubStatus1::
; bit ; bit
; 7 in love
; 6 rollout
; 5 endure
; 4 perish song
; 3 identified
; 2 protect
; 1 curse
; 0 nightmare ; 0 nightmare
; 1 curse
; 2 protect
; 3 identified
; 4 perish song
; 5 endure
; 6 rollout
; 7 in love
db db
wPlayerSubStatus2:: wPlayerSubStatus2::
; bit ; bit
; 7
; 6
; 5
; 4
; 3
; 2
; 1
; 0 curled ; 0 curled
; 1-7 unused
db db
wPlayerSubStatus3:: wPlayerSubStatus3::
; bit ; bit
; 7 confused
; 6 flying
; 5 underground
; 4 charged
; 3 flinched
; 2 in loop
; 1 rampage
; 0 bide ; 0 bide
; 1 rampage
; 2 in loop
; 3 flinched
; 4 charged
; 5 underground
; 6 flying
; 7 confused
db db
wPlayerSubStatus4:: wPlayerSubStatus4::
; bit ; bit
; 7 leech seed
; 6 rage
; 5 recharge
; 4 substitute
; 3
; 2 focus energy
; 1 mist
; 0 x accuracy ; 0 x accuracy
; 1 mist
; 2 focus energy
; 3
; 4 substitute
; 5 recharge
; 6 rage
; 7 leech seed
db db
wPlayerSubStatus5:: wPlayerSubStatus5::
; bit ; bit
; 7 can't run
; 6 destiny bond
; 5 lock-on
; 4 encored
; 3 transformed
; 2
; 1
; 0 toxic ; 0 toxic
; 1
; 2
; 3 transformed
; 4 encored
; 5 lock-on
; 6 destiny bond
; 7 can't run
db db
wEnemySubStatus1:: wEnemySubStatus1::
@ -635,14 +629,12 @@ wBattleLowHealthAlarm:: db
wPlayerMinimized:: db wPlayerMinimized:: db
wPlayerScreens:: wPlayerScreens::
; bit ; bit
; 7
; 6
; 5
; 4 reflect
; 3 light screen
; 2 safeguard
; 1
; 0 spikes ; 0 spikes
; 1
; 2 safeguard
; 3 light screen
; 4 reflect
; 5-7 unused
db db
wEnemyScreens:: wEnemyScreens::