diff options
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/battle_script.inc | 6 | ||||
| -rw-r--r-- | asm/macros/map.inc | 80 | ||||
| -rw-r--r-- | asm/macros/movement.inc | 234 |
3 files changed, 158 insertions, 162 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 083107c08..c03d78df7 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -511,7 +511,7 @@ .byte \bank .endm - .macro atk5F + .macro swapattackerwithtarget .byte 0x5f .endm @@ -525,7 +525,7 @@ .byte \bank .endm - .macro atk62 bank + .macro hidepartystatussummary bank .byte 0x62 .byte \bank .endm @@ -1163,7 +1163,7 @@ .4byte \param0 .endm - .macro snatchsetbanks + .macro snatchsetbattlers .byte 0xed .endm diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 5367ad712..23806b4cc 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,38 +1,8 @@ - .macro new_map_group - inc cur_map_group - .set cur_map_num, 0 + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm - .macro map_group map_name - .set GROUP_\map_name, cur_map_group - .set MAP_\map_name, cur_map_num - inc cur_map_num - .endm - - .macro map map_name - .byte GROUP_\map_name - .byte MAP_\map_name - .endm - - .macro warp_map map_name - .byte MAP_\map_name - .byte GROUP_\map_name - .endm - - .macro heal_location map_name, x, y - .byte GROUP_\map_name - .byte MAP_\map_name - .2byte \x - .2byte \y - .space 2 - .endm - - .equiv GROUP_NONE, 0x7f - .equiv MAP_NONE, 0x7f - - .equiv GROUP_UNDEFINED, 0xff - .equiv MAP_UNDEFINED, 0xff - .macro map_script type, address .byte \type .4byte \address @@ -44,37 +14,47 @@ .4byte \address .endm - .macro object_event index, gfx, replacement, filler1, x, y, elevation, movement_type, radius, filler2, trainer_type, sight_radius_tree_etc, script, event_flag, filler3, filler4 - .byte \index, \gfx, \replacement, \filler1 + .macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag + .byte \index, \gfx, \replacement, 0 .2byte \x .2byte \y - .byte \elevation, \movement_type, \radius, \filler2 + .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 .2byte \trainer_type, \sight_radius_tree_etc .4byte \script .2byte \event_flag - .byte \filler3, \filler4 + .2byte 0 inc _num_npcs .endm - .macro warp_def x, y, byte, warp, map + .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp - warp_map \map + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .macro coord_weather_event x, y, elevation, weather + .2byte \x, \y + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps + .endm + + .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 .2byte \x, \y - .byte \byte, \kind - .2byte \word + .byte \elevation, \kind + .2byte 0 .if \kind < 5 .4byte \arg6 .else @@ -84,6 +64,14 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag + bg_event \x, \y, \height, 7, \item, \flag, 0 + .endm + + .macro bg_secret_base_event x, y, height, secret_base_id + bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs @@ -107,7 +95,7 @@ .equiv connection_dive, 5 .equiv connection_emerge, 6 - .macro connection direction, offset, map, filler + .macro connection direction, offset, map .4byte connection_\direction .4byte \offset map \map diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 5a810c497..99b5c8f84 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,4 +1,4 @@ - .macro create_movement name + .macro create_movement_action name enum _\name .macro \name .byte _\name @@ -6,118 +6,126 @@ .endm enum_start - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 - create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b - create_movement step_5c - create_movement step_5d - create_movement step_5e - create_movement step_5f - create_movement step_60 - create_movement step_61 - create_movement step_62 - create_movement step_63 + create_movement_action face_down + create_movement_action face_up + create_movement_action face_left + create_movement_action face_right + create_movement_action walk_slow_down + create_movement_action walk_slow_up + create_movement_action walk_slow_left + create_movement_action walk_slow_right + create_movement_action walk_down + create_movement_action walk_up + create_movement_action walk_left + create_movement_action walk_right + create_movement_action jump_2_down + create_movement_action jump_2_up + create_movement_action jump_2_left + create_movement_action jump_2_right + create_movement_action delay_1 + create_movement_action delay_2 + create_movement_action delay_4 + create_movement_action delay_8 + create_movement_action delay_16 + create_movement_action walk_fast_down + create_movement_action walk_fast_up + create_movement_action walk_fast_left + create_movement_action walk_fast_right + create_movement_action walk_in_place_slow_down + create_movement_action walk_in_place_slow_up + create_movement_action walk_in_place_slow_left + create_movement_action walk_in_place_slow_right + create_movement_action walk_in_place_down + create_movement_action walk_in_place_up + create_movement_action walk_in_place_left + create_movement_action walk_in_place_right + create_movement_action walk_in_place_fast_down + create_movement_action walk_in_place_fast_up + create_movement_action walk_in_place_fast_left + create_movement_action walk_in_place_fast_right + create_movement_action walk_in_place_fastest_down + create_movement_action walk_in_place_fastest_up + create_movement_action walk_in_place_fastest_left + create_movement_action walk_in_place_fastest_right + create_movement_action ride_water_current_down + create_movement_action ride_water_current_up + create_movement_action ride_water_current_left + create_movement_action ride_water_current_right + create_movement_action walk_fastest_down + create_movement_action walk_fastest_up + create_movement_action walk_fastest_left + create_movement_action walk_fastest_right + create_movement_action slide_down + create_movement_action slide_up + create_movement_action slide_left + create_movement_action slide_right + create_movement_action player_run_down + create_movement_action player_run_up + create_movement_action player_run_left + create_movement_action player_run_right + create_movement_action start_anim_in_direction + create_movement_action jump_special_down + create_movement_action jump_special_up + create_movement_action jump_special_left + create_movement_action jump_special_right + create_movement_action face_player + create_movement_action face_away_player + create_movement_action lock_facing_direction + create_movement_action unlock_facing_direction + create_movement_action jump_down + create_movement_action jump_up + create_movement_action jump_left + create_movement_action jump_right + create_movement_action jump_in_place_down + create_movement_action jump_in_place_up + create_movement_action jump_in_place_left + create_movement_action jump_in_place_right + create_movement_action jump_in_place_down_up + create_movement_action jump_in_place_up_down + create_movement_action jump_in_place_left_right + create_movement_action jump_in_place_right_left + create_movement_action face_original_direction + create_movement_action nurse_joy_bow + create_movement_action enable_jump_landing_ground_effect + create_movement_action disable_jump_landing_ground_effect + create_movement_action disable_anim + create_movement_action restore_anim + create_movement_action set_invisible + create_movement_action set_visible + create_movement_action emote_exclamation_mark + create_movement_action emote_question_mark + create_movement_action emote_heart + create_movement_action reveal_trainer + create_movement_action rock_smash_break + create_movement_action cut_tree + create_movement_action set_fixed_priority + create_movement_action clear_fixed_priority + create_movement_action init_affine_anim + create_movement_action clear_affine_anim + create_movement_action unknown_movement_1 + create_movement_action unknown_movement_2 + create_movement_action walk_down_start_affine + create_movement_action walk_down_affine - enum_start 0x91 - create_movement step_91 - create_movement step_92 - create_movement step_93 - create_movement step_94 - create_movement step_95 - create_movement step_96 - create_movement step_97 - create_movement step_98 - create_movement step_99 - create_movement step_9A + enum_start 0x8C + create_movement_action walk_diag_northwest + create_movement_action walk_diag_northeast + create_movement_action walk_diag_southwest + create_movement_action walk_diag_southeast + create_movement_action walk_slow_diag_northwest + create_movement_action walk_slow_diag_northeast + create_movement_action walk_slow_diag_southwest + create_movement_action walk_slow_diag_southeast + create_movement_action store_lock_anim + create_movement_action free_unlock_anim + create_movement_action walk_left_affine + create_movement_action walk_right_affine + create_movement_action levitate + create_movement_action stop_levitate + create_movement_action destroy_extra_task + create_movement_action figure_8 + create_movement_action fly_up + create_movement_action fly_down enum_start 0xfe - create_movement step_end + create_movement_action step_end |