diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/move_anim.asm | 18 | ||||
| -rw-r--r-- | macros/movement.asm | 354 | ||||
| -rw-r--r-- | macros/sound.asm | 25 | ||||
| -rwxr-xr-x | macros/trade_anim.asm | 12 | ||||
| -rwxr-xr-x | macros/wram.asm | 137 |
5 files changed, 229 insertions, 317 deletions
diff --git a/macros/move_anim.asm b/macros/move_anim.asm index 05faf253d..c795f561e 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -183,9 +183,9 @@ anim_0xed: macro db anim_0xed_command endm - enum anim_jumpand_command ; ee -anim_jumpand: macro - db anim_jumpand_command + enum anim_if_param_and_command ; ee +anim_if_param_and: macro + db anim_if_param_and_command db \1 ; value dw \2 ; address endm @@ -243,9 +243,9 @@ anim_0xf7: macro db anim_0xf7_command endm - enum anim_jumpif_command ; f8 -anim_jumpif: macro - db anim_jumpif_command + enum anim_if_param_equal_command ; f8 +anim_if_param_equal: macro + db anim_if_param_equal_command db \1 ; value dw \2 ; address endm @@ -261,9 +261,9 @@ anim_incvar: macro db anim_incvar_command endm - enum anim_jumpvar_command ; fb -anim_jumpvar: macro - db anim_jumpvar_command + enum anim_if_var_equal_command ; fb +anim_if_var_equal: macro + db anim_if_var_equal_command db \1 ; value dw \2 ; address endm diff --git a/macros/movement.asm b/macros/movement.asm index b5aebdc89..53b8bf107 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -1,286 +1,106 @@ - enum_start - enum movement_turn_head_down -turn_head_down: macro - db movement_turn_head_down ; $00 - endm - - enum movement_turn_head_up -turn_head_up: macro - db movement_turn_head_up ; $01 - endm - - enum movement_turn_head_left -turn_head_left: macro - db movement_turn_head_left ; $02 - endm - - enum movement_turn_head_right -turn_head_right: macro - db movement_turn_head_right ; $03 - endm - - enum movement_turn_step_down -turn_step_down: macro - db movement_turn_step_down ; $04 - endm - - enum movement_turn_step_up -turn_step_up: macro - db movement_turn_step_up ; $05 - endm - - enum movement_turn_step_left -turn_step_left: macro - db movement_turn_step_left ; $06 - endm - - enum movement_turn_step_right -turn_step_right: macro - db movement_turn_step_right ; $07 - endm - - enum movement_slow_step_down -slow_step_down: macro - db movement_slow_step_down ; $08 - endm - - enum movement_slow_step_up -slow_step_up: macro - db movement_slow_step_up ; $09 - endm - - enum movement_slow_step_left -slow_step_left: macro - db movement_slow_step_left ; $0a - endm - - enum movement_slow_step_right -slow_step_right: macro - db movement_slow_step_right ; $0b - endm - - enum movement_step_down -step_down: macro - db movement_step_down ; $0c - endm - - enum movement_step_up -step_up: macro - db movement_step_up ; $0d - endm - - enum movement_step_left -step_left: macro - db movement_step_left ; $0e - endm - - enum movement_step_right -step_right: macro - db movement_step_right ; $0f - endm - - enum movement_big_step_down -big_step_down: macro - db movement_big_step_down ; $10 - endm - - enum movement_big_step_up -big_step_up: macro - db movement_big_step_up ; $11 - endm - - enum movement_big_step_left -big_step_left: macro - db movement_big_step_left ; $12 - endm - - enum movement_big_step_right -big_step_right: macro - db movement_big_step_right ; $13 - endm - - enum movement_slow_slide_step_down -slow_slide_step_down: macro - db movement_slow_slide_step_down ; $14 - endm - - enum movement_slow_slide_step_up -slow_slide_step_up: macro - db movement_slow_slide_step_up ; $15 - endm - - enum movement_slow_slide_step_left -slow_slide_step_left: macro - db movement_slow_slide_step_left ; $16 - endm +; Directional movements - enum movement_slow_slide_step_right -slow_slide_step_right: macro - db movement_slow_slide_step_right ; $17 + enum movement_turn_head +turn_head: macro + db movement_turn_head | \1 ; $00 endm - enum movement_slide_step_down -slide_step_down: macro - db movement_slide_step_down ; $18 - endm +__enum__ = __enum__ + 3 - enum movement_slide_step_up -slide_step_up: macro - db movement_slide_step_up ; $19 + enum movement_turn_step +turn_step: macro + db movement_turn_step | \1 ; $04 endm - enum movement_slide_step_left -slide_step_left: macro - db movement_slide_step_left ; $1a - endm +__enum__ = __enum__ + 3 - enum movement_slide_step_right -slide_step_right: macro - db movement_slide_step_right ; $1b + enum movement_slow_step +slow_step: macro + db movement_slow_step | \1; $08 endm - enum movement_fast_slide_step_down -fast_slide_step_down: macro - db movement_fast_slide_step_down ; $1c - endm +__enum__ = __enum__ + 3 - enum movement_fast_slide_step_up -fast_slide_step_up: macro - db movement_fast_slide_step_up ; $1d + enum movement_step +step: macro + db movement_step | \1 ; $0c endm - enum movement_fast_slide_step_left -fast_slide_step_left: macro - db movement_fast_slide_step_left ; $1e - endm +__enum__ = __enum__ + 3 - enum movement_fast_slide_step_right -fast_slide_step_right: macro - db movement_fast_slide_step_right ; $1f + enum movement_big_step +big_step: macro + db movement_big_step | \1 ; $10 endm - enum movement_turn_away_down -turn_away_down: macro - db movement_turn_away_down ; $20 - endm +__enum__ = __enum__ + 3 - enum movement_turn_away_up -turn_away_up: macro - db movement_turn_away_up ; $21 + enum movement_slow_slide_step +slow_slide_step: macro + db movement_slow_slide_step | \1 ; $14 endm - enum movement_turn_away_left -turn_away_left: macro - db movement_turn_away_left ; $22 - endm +__enum__ = __enum__ + 3 - enum movement_turn_away_right -turn_away_right: macro - db movement_turn_away_right ; $23 + enum movement_slide_step +slide_step: macro + db movement_slide_step | \1 ; $18 endm - enum movement_turn_in_down -turn_in_down: macro - db movement_turn_in_down ; $24 - endm +__enum__ = __enum__ + 3 - enum movement_turn_in_up -turn_in_up: macro - db movement_turn_in_up ; $25 + enum movement_fast_slide_step +fast_slide_step: macro + db movement_fast_slide_step | \1 ; $1c endm - enum movement_turn_in_left -turn_in_left: macro - db movement_turn_in_left ; $26 - endm +__enum__ = __enum__ + 3 - enum movement_turn_in_right -turn_in_right: macro - db movement_turn_in_right ; $27 + enum movement_turn_away +turn_away: macro + db movement_turn_away | \1 ; $20 endm - enum movement_turn_waterfall_down -turn_waterfall_down: macro - db movement_turn_waterfall_down ; $28 - endm +__enum__ = __enum__ + 3 - enum movement_turn_waterfall_up -turn_waterfall_up: macro - db movement_turn_waterfall_up ; $29 + enum movement_turn_in +turn_in: macro + db movement_turn_in | \1 ; $24 endm - enum movement_turn_waterfall_left -turn_waterfall_left: macro - db movement_turn_waterfall_left ; $2a - endm +__enum__ = __enum__ + 3 - enum movement_turn_waterfall_right -turn_waterfall_right: macro - db movement_turn_waterfall_right ; $2b + enum movement_turn_waterfall +turn_waterfall: macro + db movement_turn_waterfall | \1 ; $28 endm - enum movement_slow_jump_step_down -slow_jump_step_down: macro - db movement_slow_jump_step_down ; $2c - endm +__enum__ = __enum__ + 3 - enum movement_slow_jump_step_up -slow_jump_step_up: macro - db movement_slow_jump_step_up ; $2d + enum movement_slow_jump_step +slow_jump_step: macro + db movement_slow_jump_step | \1 ; $2c endm - enum movement_slow_jump_step_left -slow_jump_step_left: macro - db movement_slow_jump_step_left ; $2e - endm - - enum movement_slow_jump_step_right -slow_jump_step_right: macro - db movement_slow_jump_step_right ; $2f - endm +__enum__ = __enum__ + 3 - enum movement_jump_step_down -jump_step_down: macro - db movement_jump_step_down ; $30 + enum movement_jump_step +jump_step: macro + db movement_jump_step | \1 ; $30 endm - enum movement_jump_step_up -jump_step_up: macro - db movement_jump_step_up ; $31 - endm - - enum movement_jump_step_left -jump_step_left: macro - db movement_jump_step_left ; $32 - endm +__enum__ = __enum__ + 3 - enum movement_jump_step_right -jump_step_right: macro - db movement_jump_step_right ; $33 + enum movement_fast_jump_step +fast_jump_step: macro + db movement_fast_jump_step | \1 ; $34 endm - enum movement_fast_jump_step_down -fast_jump_step_down: macro - db movement_fast_jump_step_down ; $34 - endm - - enum movement_fast_jump_step_up -fast_jump_step_up: macro - db movement_fast_jump_step_up ; $35 - endm - - enum movement_fast_jump_step_left -fast_jump_step_left: macro - db movement_fast_jump_step_left ; $36 - endm - - enum movement_fast_jump_step_right -fast_jump_step_right: macro - db movement_fast_jump_step_right ; $37 - endm +__enum__ = __enum__ + 3 +; Control enum movement_remove_sliding remove_sliding: macro db movement_remove_sliding ; $38 @@ -311,51 +131,18 @@ hide_person: macro db movement_hide_person ; $3d endm - enum movement_step_sleep_1 -step_sleep_1: macro - db movement_step_sleep_1 ; $3e - endm - - enum movement_step_sleep_2 -step_sleep_2: macro - db movement_step_sleep_2 ; $3f - endm - - enum movement_step_sleep_3 -step_sleep_3: macro - db movement_step_sleep_3 ; $40 - endm - - enum movement_step_sleep_4 -step_sleep_4: macro - db movement_step_sleep_4 ; $41 - endm - - enum movement_step_sleep_5 -step_sleep_5: macro - db movement_step_sleep_5 ; $42 - endm - - enum movement_step_sleep_6 -step_sleep_6: macro - db movement_step_sleep_6 ; $43 - endm - - enum movement_step_sleep_7 -step_sleep_7: macro - db movement_step_sleep_7 ; $44 - endm - - enum movement_step_sleep_8 -step_sleep_8: macro - db movement_step_sleep_8 ; $45 - endm +; Sleep enum movement_step_sleep step_sleep: macro - db movement_step_sleep ; $46 - db \1 ; duration - endm +if \1 <= 8 + db movement_step_sleep + \1 - 1 +else + db movement_step_sleep + 8, \1 +endc +endm + +__enum__ = __enum__ + 8 enum movement_step_end step_end: macro @@ -363,8 +150,11 @@ step_end: macro endm ; Whatever Movement_48 is, it takes a one-byte parameter - -__enum__ = $49 + enum movement_step_48 +step_48: macro + db movement_step_48 + db \1 + endm enum movement_remove_person remove_person: macro diff --git a/macros/sound.asm b/macros/sound.asm index 64fe309cb..ad6a50749 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -37,10 +37,10 @@ notetype: macro endc endm - enum forceoctave_cmd -forceoctave: macro - db forceoctave_cmd - db \1 ; octave + enum pitchoffset_cmd +pitchoffset: macro + db pitchoffset_cmd + dn \1, \2 - 1 ; octave, key endm enum tempo_cmd @@ -67,10 +67,10 @@ soundinput: macro db \1 ; input endm - enum unknownmusic0xde_cmd -unknownmusic0xde: macro - db unknownmusic0xde_cmd - db \1 ; unknown + enum sound_duty_cmd +sound_duty: macro + db sound_duty_cmd + db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence endm enum togglesfx_cmd @@ -78,11 +78,10 @@ togglesfx: macro db togglesfx_cmd endm - enum unknownmusic0xe0_cmd -unknownmusic0xe0: macro - db unknownmusic0xe0_cmd - db \1 ; unknown - ; db \2 ; unknown + enum slidepitchto_cmd +slidepitchto: macro + db slidepitchto_cmd + db \1 - 1 ; duration dn \2, \3 ; octave, pitch endm diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm index 04d3b7d0e..c590cb620 100755 --- a/macros/trade_anim.asm +++ b/macros/trade_anim.asm @@ -75,14 +75,14 @@ tradeanim_do_givemon_scroll: macro db tradeanim_do_givemon_scroll_command ; 1c endm - enum tradeanim_1d_command -tradeanim_1d: macro - db tradeanim_1d_command ; 1d + enum tradeanim_frontpic_scroll_command +tradeanim_frontpic_scroll: macro + db tradeanim_frontpic_scroll_command ; 1d endm - enum tradeanim_1e_command -tradeanim_1e: macro - db tradeanim_1e_command ; 1e + enum tradeanim_textbox_scroll_command +tradeanim_textbox_scroll: macro + db tradeanim_textbox_scroll_command ; 1e endm enum tradeanim_scroll_out_right_command diff --git a/macros/wram.asm b/macros/wram.asm index 1b296bb04..ce53dc5c7 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -134,22 +134,21 @@ channel_struct: MACRO \1FrequencyHi:: db \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1StartingOctave:: db ; raises existing octaves (to repeat phrases) +\1PitchOffset:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note \1Field0x16:: ds 1 ; c117 ds 1 ; c118 \1LoopCount:: db \1Tempo:: dw \1Tracks:: db ; hi:left lo:right -\1Field0x1c:: ds 1 ; c11d +\1SFXDutyLoop:: ds 1 ; c11d \1VibratoDelayCount:: db ; initialized by \1VibratoDelay \1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoExtent:: db \1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt -\1Field0x21:: ds 1 ; c122 -\1Field0x22:: ds 1 ; c123 -\1Field0x23:: ds 1 ; c124 -\1Field0x24:: ds 1 ; c125 +\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel +\1PitchWheelAmount:: db ; c124 +\1PitchWheelAmountFraction:: db ; c125 \1Field0x25:: ds 1 ; c126 ds 1 ; c127 \1CryPitch:: dw @@ -199,6 +198,21 @@ hof_mon: MACRO \1End:: endm +roam_struct: MACRO +\1Species:: db +\1Level:: db +\1MapGroup:: db +\1MapNumber:: db +\1HP:: ds 1 +\1DVs:: ds 2 +ENDM + +bugcontestwinner: macro +\1PersonID:: ds 1 +\1Mon:: ds 1 +\1Score:: ds 2 +endm + hall_of_fame: MACRO \1:: \1WinCount:: ds 1 @@ -248,4 +262,113 @@ slot_reel: MACRO \1Slot0d:: ds 1 \1Slot0e:: ds 1 \1Slot0f:: ds 1 -endm
\ No newline at end of file +endm + +object_struct: MACRO +\1Struct:: +\1Sprite:: ds 1 +\1MapObjectIndex:: ds 1 +\1SpriteTile:: ds 1 +\1MovementType:: ds 1 +\1Flags:: ds 2 +\1Palette:: ds 1 +\1Walking:: ds 1 +\1Direction:: ds 1 +\1StepType:: ds 1 +\1StepDuration:: ds 1 +\1Action:: ds 1 +\1ObjectStepFrame:: ds 1 +\1Facing:: ds 1 +\1StandingTile:: ds 1 ; collision +\1LastTile:: ds 1 ; collision +\1StandingMapX:: ds 1 +\1StandingMapY:: ds 1 +\1LastMapX:: ds 1 +\1LastMapY:: ds 1 +\1ObjectInitX:: ds 1 +\1ObjectInitY:: ds 1 +\1Radius:: ds 1 +\1SpriteX:: ds 1 +\1SpriteY:: ds 1 +\1SpriteXOffset:: ds 1 +\1SpriteYOffset:: ds 1 +\1MovementByteIndex:: ds 1 +\1Object28:: ds 1 +\1Object29:: ds 1 +\1Object30:: ds 1 +\1Object31:: ds 1 +\1Range:: ds 1 + ds 7 +\1StructEnd:: +ENDM + +map_object: MACRO +\1Object:: +\1ObjectStructID:: ds 1 +\1ObjectSprite:: ds 1 +\1ObjectYCoord:: ds 1 +\1ObjectXCoord:: ds 1 +\1ObjectMovement:: ds 1 +\1ObjectRadius:: ds 1 +\1ObjectHour:: ds 1 +\1ObjectTimeOfDay:: ds 1 +\1ObjectColor:: ds 1 +\1ObjectRange:: ds 1 +\1ObjectScript:: ds 2 +\1ObjectEventFlag:: ds 2 + ds 2 +endm + +sprite_anim_struct: MACRO +\1Index:: ds 1 ; 0 +\1FramesetID:: ds 1 ; 1 +\1AnimSeqID:: ds 1 ; 2 +\1TileID:: ds 1 ; 3 +\1XCoord:: ds 1 ; 4 +\1YCoord:: ds 1 ; 5 +\1XOffset:: ds 1 ; 6 +\1YOffset:: ds 1 ; 7 +\1Duration:: ds 1 ; 8 +\1DurationOffset:: ds 1 ; 9 +\1FrameIndex:: ds 1 ; a +\1Sprite0b:: ds 1 +\1Sprite0c:: ds 1 +\1Sprite0d:: ds 1 +\1Sprite0e:: ds 1 +\1Sprite0f:: ds 1 +ENDM + +battle_anim_struct: MACRO +; Placeholder until we can figure out what it all means +\1_Index:: ds 1 +\1_Anim01:: ds 1 +\1_Anim02:: ds 1 +\1_FramesetIndex:: ds 1 +\1_FunctionIndex:: ds 1 +\1_Anim05:: ds 1 +\1_TileID:: ds 1 +\1_XCoord:: ds 1 +\1_YCoord:: ds 1 +\1_XOffset:: ds 1 +\1_YOffset:: ds 1 +\1_Anim0b:: ds 1 +\1_Anim0c:: ds 1 +\1_Anim0d:: ds 1 +\1_AnonJumptableIndex:: ds 1 +\1_Anim0f:: ds 1 +\1_Anim10:: ds 1 +\1_Anim11:: ds 1 +\1_Anim12:: ds 1 +\1_Anim13:: ds 1 +\1_Anim14:: ds 1 +\1_Anim15:: ds 1 +\1_Anim16:: ds 1 +\1_Anim17:: ds 1 +endm + +battle_bg_effect: MACRO +\1_Function:: ds 1 +\1_01:: ds 1 +\1_02:: ds 1 +\1_03:: ds 1 +endm |