diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/charmap.asm | 1 | ||||
| -rw-r--r-- | macros/event.asm | 20 | ||||
| -rw-r--r-- | macros/movement.asm | 27 | ||||
| -rw-r--r-- | macros/text.asm | 16 | ||||
| -rwxr-xr-x | macros/trade_anim.asm | 166 |
5 files changed, 205 insertions, 25 deletions
diff --git a/macros/charmap.asm b/macros/charmap.asm index 73446d8e7..9eee57a0e 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -35,6 +35,7 @@ ; Actual characters charmap "▲", $61 charmap "_", $62 + charmap "<COLON>", $6d ; necessary because ":" is already used charmap "′", $6e charmap "<LV>", $6e charmap "″", $6f diff --git a/macros/event.asm b/macros/event.asm index c51f798c5..18483abc3 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -293,9 +293,9 @@ checktime: macro db \1 ; time endm -checkmorn EQUS "checktime 1" -checkday EQUS "checktime 2" -checknite EQUS "checktime 4" +checkmorn EQUS "checktime 1 << MORN" +checkday EQUS "checktime 1 << DAY" +checknite EQUS "checktime 1 << NITE" enum checkpoke_command checkpoke: macro @@ -496,9 +496,9 @@ loadmovesprites: macro db loadmovesprites_command endm - enum loadbytec1ce_command -loadbytec1ce: macro - db loadbytec1ce_command + enum loadbytec2cf_command +loadbytec2cf: macro + db loadbytec2cf_command db \1 ; byte endm @@ -544,12 +544,14 @@ jumptextfaceplayer: macro dw \1 ; text_pointer endm +; IF _CRYSTAL enum farjumptext_command farjumptext: macro db farjumptext_command db BANK(\1) dw \1 endm +; ENDC enum jumptext_command jumptext: macro @@ -1068,7 +1070,7 @@ wait: macro db \1 ; duration endm - enum unknown0xa9_command -unknown0xa9: macro - db unknown0xa9_command + enum check_save_command +check_save: macro + db check_save_command endm diff --git a/macros/movement.asm b/macros/movement.asm index 2b5720832..c354b0d5c 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -292,10 +292,9 @@ fix_facing: macro db movement_fix_facing ; $3b endm - enum movement_return_dig -return_dig: macro - db movement_return_dig - db \1 + enum movement_show_person +show_person: macro + db movement_show_person ; $3c endm enum movement_hide_person @@ -354,6 +353,8 @@ step_end: macro db movement_step_end ; $47 endm +; Whatever Movement_48 is, it takes a one-byte parameter + __enum__ = $49 enum movement_remove_person @@ -383,12 +384,16 @@ skyfall: macro db movement_skyfall ; $4e endm - enum movement_step_wait5 -step_wait5: macro - db movement_step_wait5 ; $4f + enum movement_step_dig +step_dig: macro + db movement_step_dig ; $4f + db \1 endm -__enum__ = $51 + enum movement_step_bump +step_bump: macro + db movement_step_bump ; $50 + endm enum movement_fish_got_bite fish_got_bite: macro @@ -422,3 +427,9 @@ rock_smash: macro db movement_rock_smash ; $57 db \1 endm + + enum movement_return_dig +return_dig: macro + db movement_return_dig ; $58 + db \1 + endm diff --git a/macros/text.asm b/macros/text.asm index 6af4d109b..37ce72d98 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -73,7 +73,7 @@ interpret_data: macro endm enum TX_SOUND_0B -sound0: macro +sound_dex_fanfare_50_79: macro db TX_SOUND_0B endm @@ -89,33 +89,33 @@ link_wait_button: macro endm enum TX_SOUND_0E -sound1: macro +sound_dex_fanfare_20_49: macro db TX_SOUND_0E endm enum TX_SOUND_0F -sound0x0F: macro +sound_item: macro db TX_SOUND_0F endm enum TX_SOUND_10 -sound0x02: macro +sound_caught_mon: macro db TX_SOUND_10 endm enum TX_SOUND_11 -sound0x0A: macro +sound_dex_fanfare_80_109: macro db TX_SOUND_11 endm enum TX_SOUND_12 -sound0x12: macro +sound_fanfare: macro db TX_SOUND_12 endm enum TX_SOUND_13 -sound0x2C: macro - db $13 +sound_slot_machine_start: macro + db TX_SOUND_13 endm enum TX_STRINGBUFFER diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm new file mode 100755 index 000000000..3b2aeaf09 --- /dev/null +++ b/macros/trade_anim.asm @@ -0,0 +1,166 @@ + enum_start + enum tradeanim_next_command +tradeanim_next: macro + db tradeanim_next_command +endm + + enum tradeanim_show_givemon_data_command +tradeanim_show_givemon_data: macro + db tradeanim_show_givemon_data_command +endm + + enum tradeanim_show_getmon_data_command +tradeanim_show_getmon_data: macro + db tradeanim_show_getmon_data_command +endm + + enum tradeanim_enter_link_tube_command +tradeanim_enter_link_tube: macro + db tradeanim_enter_link_tube_command +endm + +__enum__ set $5 + + enum tradeanim_exit_link_tube_command +tradeanim_exit_link_tube: macro + db tradeanim_exit_link_tube_command +endm + + enum tradeanim_tube_to_ot_command +tradeanim_tube_to_ot: macro + db tradeanim_tube_to_ot_command +endm + +__enum__ set $e + + enum tradeanim_tube_to_player_command +tradeanim_tube_to_player: macro + db tradeanim_tube_to_player_command +endm + +__enum__ set $16 + + enum tradeanim_sent_to_ot_text_command +tradeanim_sent_to_ot_text: macro + db tradeanim_sent_to_ot_text_command +endm + + enum tradeanim_ot_bids_farewell_command +tradeanim_ot_bids_farewell: macro + db tradeanim_ot_bids_farewell_command +endm + + enum tradeanim_take_care_of_text_command +tradeanim_take_care_of_text: macro + db tradeanim_take_care_of_text_command +endm + + enum tradeanim_ot_sends_text_1_command +tradeanim_ot_sends_text_1: macro + db tradeanim_ot_sends_text_1_command +endm + + enum tradeanim_ot_sends_text_2_command +tradeanim_ot_sends_text_2: macro + db tradeanim_ot_sends_text_2_command +endm + + enum tradeanim_setup_givemon_scroll_command +tradeanim_setup_givemon_scroll: macro + db tradeanim_setup_givemon_scroll_command +endm + + enum tradeanim_do_givemon_scroll_command +tradeanim_do_givemon_scroll: macro + db tradeanim_do_givemon_scroll_command +endm + + enum tradeanim_1d_command +tradeanim_1d: macro + db tradeanim_1d_command +endm + + enum tradeanim_1e_command +tradeanim_1e: macro + db tradeanim_1e_command +endm + + enum tradeanim_scroll_out_right_command +tradeanim_scroll_out_right: macro + db tradeanim_scroll_out_right_command +endm + +__enum__ set $21 + + enum tradeanim_wait_80_command +tradeanim_wait_80: macro + db tradeanim_wait_80_command +endm + + enum tradeanim_wait_40_command +tradeanim_wait_40: macro + db tradeanim_wait_40_command +endm + + enum tradeanim_rocking_ball_command +tradeanim_rocking_ball: macro + db tradeanim_rocking_ball_command +endm + + enum tradeanim_drop_ball_command +tradeanim_drop_ball: macro + db tradeanim_drop_ball_command +endm + + enum tradeanim_wait_anim_command +tradeanim_wait_anim: macro + db tradeanim_wait_anim_command +endm + +__enum__ set $27 + + enum tradeanim_poof_command +tradeanim_poof: macro + db tradeanim_poof_command +endm + + enum tradeanim_bulge_through_tube_command +tradeanim_bulge_through_tube: macro + db tradeanim_bulge_through_tube_command +endm + + enum tradeanim_give_trademon_sfx_command +tradeanim_give_trademon_sfx: macro + db tradeanim_give_trademon_sfx_command +endm + + enum tradeanim_get_trademon_sfx_command +tradeanim_get_trademon_sfx: macro + db tradeanim_get_trademon_sfx_command +endm + + enum tradeanim_end_command +tradeanim_end: macro + db tradeanim_end_command +endm + + enum tradeanim_animate_frontpic_command +tradeanim_animate_frontpic: macro + db tradeanim_animate_frontpic_command +endm + + enum tradeanim_wait_96_command +tradeanim_wait_96: macro + db tradeanim_wait_96_command +endm + + enum tradeanim_wait_80_if_ot_egg_command +tradeanim_wait_80_if_ot_egg: macro + db tradeanim_wait_80_if_ot_egg_command +endm + + enum tradeanim_wait_180_if_ot_egg_command +tradeanim_wait_180_if_ot_egg: macro + db tradeanim_wait_180_if_ot_egg_command +endm + |