diff options
35 files changed, 1478 insertions, 1518 deletions
diff --git a/constants.asm b/constants.asm index dc2a6679..a9004b73 100644 --- a/constants.asm +++ b/constants.asm @@ -33,3 +33,4 @@ INCLUDE "constants/cgb_constants.asm" INCLUDE "constants/battle_tower_constants.asm" INCLUDE "constants/cry_constants.asm" INCLUDE "constants/audio_constants.asm" +INCLUDE "constants/printer_constants.asm" diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 5ae2f324..ea052aab 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -5,484 +5,484 @@ const BATTLEANIMSTRUCT_FRAMESET_ID const BATTLEANIMSTRUCT_FUNCTION const BATTLEANIMSTRUCT_PALETTE - const BATTLEANIMSTRUCT_TILEID - const BATTLEANIMSTRUCT_XCOORD - const BATTLEANIMSTRUCT_YCOORD - const BATTLEANIMSTRUCT_XOFFSET - const BATTLEANIMSTRUCT_YOFFSET - const BATTLEANIMSTRUCT_0B - const BATTLEANIMSTRUCT_DURATION - const BATTLEANIMSTRUCT_FRAME - const BATTLEANIMSTRUCT_ANON_JT_INDEX - const BATTLEANIMSTRUCT_0F - const BATTLEANIMSTRUCT_10 - const BATTLEANIMSTRUCT_11 - const BATTLEANIMSTRUCT_12 - const BATTLEANIMSTRUCT_13 - const BATTLEANIMSTRUCT_14 - const BATTLEANIMSTRUCT_15 - const BATTLEANIMSTRUCT_16 - const BATTLEANIMSTRUCT_17 + const BATTLEANIMSTRUCT_TILEID + const BATTLEANIMSTRUCT_XCOORD + const BATTLEANIMSTRUCT_YCOORD + const BATTLEANIMSTRUCT_XOFFSET + const BATTLEANIMSTRUCT_YOFFSET + const BATTLEANIMSTRUCT_0B + const BATTLEANIMSTRUCT_DURATION + const BATTLEANIMSTRUCT_FRAME + const BATTLEANIMSTRUCT_ANON_JT_INDEX + const BATTLEANIMSTRUCT_0F + const BATTLEANIMSTRUCT_10 + const BATTLEANIMSTRUCT_11 + const BATTLEANIMSTRUCT_12 + const BATTLEANIMSTRUCT_13 + const BATTLEANIMSTRUCT_14 + const BATTLEANIMSTRUCT_15 + const BATTLEANIMSTRUCT_16 + const BATTLEANIMSTRUCT_17 BATTLEANIMSTRUCT_LENGTH EQU const_value const_def const ANIM_OBJ_00 - const ANIM_OBJ_01 - const ANIM_OBJ_02 - const ANIM_OBJ_03 - const ANIM_OBJ_04 - const ANIM_OBJ_05 - const ANIM_OBJ_06 - const ANIM_OBJ_07 - const ANIM_OBJ_08 - const ANIM_OBJ_09 - const ANIM_OBJ_0A - const ANIM_OBJ_0B - const ANIM_OBJ_0C - const ANIM_OBJ_0D - const ANIM_OBJ_0E - const ANIM_OBJ_0F - const ANIM_OBJ_BURNED - const ANIM_OBJ_11 - const ANIM_OBJ_12 - const ANIM_OBJ_13 - const ANIM_OBJ_14 - const ANIM_OBJ_POKE_BALL - const ANIM_OBJ_16 - const ANIM_OBJ_17 - const ANIM_OBJ_18 - const ANIM_OBJ_19 - const ANIM_OBJ_1A - const ANIM_OBJ_1B - const ANIM_OBJ_1C - const ANIM_OBJ_1D - const ANIM_OBJ_1E - const ANIM_OBJ_1F - const ANIM_OBJ_20 - const ANIM_OBJ_21 - const ANIM_OBJ_22 - const ANIM_OBJ_23 - const ANIM_OBJ_24 - const ANIM_OBJ_25 - const ANIM_OBJ_26 - const ANIM_OBJ_27 - const ANIM_OBJ_28 - const ANIM_OBJ_29 - const ANIM_OBJ_FROZEN - const ANIM_OBJ_2B - const ANIM_OBJ_2C - const ANIM_OBJ_2D - const ANIM_OBJ_2E - const ANIM_OBJ_2F - const ANIM_OBJ_30 - const ANIM_OBJ_31 - const ANIM_OBJ_32 - const ANIM_OBJ_33 - const ANIM_OBJ_34 - const ANIM_OBJ_35 - const ANIM_OBJ_36 - const ANIM_OBJ_37 - const ANIM_OBJ_38 - const ANIM_OBJ_39 - const ANIM_OBJ_3A - const ANIM_OBJ_3B - const ANIM_OBJ_3C - const ANIM_OBJ_3D - const ANIM_OBJ_GUST - const ANIM_OBJ_3F - const ANIM_OBJ_40 - const ANIM_OBJ_41 - const ANIM_OBJ_42 - const ANIM_OBJ_43 - const ANIM_OBJ_44 - const ANIM_OBJ_45 - const ANIM_OBJ_46 - const ANIM_OBJ_47 - const ANIM_OBJ_48 - const ANIM_OBJ_49 - const ANIM_OBJ_4A - const ANIM_OBJ_4B - const ANIM_OBJ_4C - const ANIM_OBJ_4D - const ANIM_OBJ_4E - const ANIM_OBJ_4F - const ANIM_OBJ_50 - const ANIM_OBJ_51 - const ANIM_OBJ_CHICK - const ANIM_OBJ_53 - const ANIM_OBJ_54 - const ANIM_OBJ_SKULL - const ANIM_OBJ_56 - const ANIM_OBJ_57 - const ANIM_OBJ_58 - const ANIM_OBJ_PARALYZED - const ANIM_OBJ_5A - const ANIM_OBJ_5B - const ANIM_OBJ_5C - const ANIM_OBJ_5D - const ANIM_OBJ_5E - const ANIM_OBJ_5F - const ANIM_OBJ_60 - const ANIM_OBJ_61 - const ANIM_OBJ_62 - const ANIM_OBJ_63 - const ANIM_OBJ_64 - const ANIM_OBJ_65 - const ANIM_OBJ_66 - const ANIM_OBJ_67 - const ANIM_OBJ_68 - const ANIM_OBJ_69 - const ANIM_OBJ_6A - const ANIM_OBJ_6B - const ANIM_OBJ_6C - const ANIM_OBJ_6D - const ANIM_OBJ_6E - const ANIM_OBJ_6F - const ANIM_OBJ_70 - const ANIM_OBJ_71 - const ANIM_OBJ_72 - const ANIM_OBJ_73 - const ANIM_OBJ_74 - const ANIM_OBJ_75 - const ANIM_OBJ_76 - const ANIM_OBJ_77 - const ANIM_OBJ_78 - const ANIM_OBJ_79 - const ANIM_OBJ_7A - const ANIM_OBJ_7B - const ANIM_OBJ_7C - const ANIM_OBJ_7D - const ANIM_OBJ_HEART - const ANIM_OBJ_7F - const ANIM_OBJ_80 - const ANIM_OBJ_81 - const ANIM_OBJ_82 - const ANIM_OBJ_83 - const ANIM_OBJ_84 - const ANIM_OBJ_85 - const ANIM_OBJ_86 - const ANIM_OBJ_87 - const ANIM_OBJ_88 - const ANIM_OBJ_89 - const ANIM_OBJ_8A - const ANIM_OBJ_8B - const ANIM_OBJ_8C - const ANIM_OBJ_8D - const ANIM_OBJ_8E - const ANIM_OBJ_8F - const ANIM_OBJ_90 - const ANIM_OBJ_91 - const ANIM_OBJ_92 - const ANIM_OBJ_93 - const ANIM_OBJ_94 - const ANIM_OBJ_95 - const ANIM_OBJ_96 - const ANIM_OBJ_97 - const ANIM_OBJ_98 - const ANIM_OBJ_99 - const ANIM_OBJ_9A - const ANIM_OBJ_9B - const ANIM_OBJ_9C - const ANIM_OBJ_9D - const ANIM_OBJ_9E - const ANIM_OBJ_9F - const ANIM_OBJ_A0 - const ANIM_OBJ_A1 - const ANIM_OBJ_A2 - const ANIM_OBJ_A3 - const ANIM_OBJ_A4 - const ANIM_OBJ_A5 - const ANIM_OBJ_A6 - const ANIM_OBJ_A7 - const ANIM_OBJ_A8 - const ANIM_OBJ_A9 - const ANIM_OBJ_AA - const ANIM_OBJ_AB - const ANIM_OBJ_AC - const ANIM_OBJ_AD - const ANIM_OBJ_AE - const ANIM_OBJ_AF - const ANIM_OBJ_B0 - const ANIM_OBJ_B1 - const ANIM_OBJ_B2 - const ANIM_OBJ_B3 - const ANIM_OBJ_B4 - const ANIM_OBJ_B5 - const ANIM_OBJ_FLOWER - const ANIM_OBJ_COTTON - const ANIM_OBJ_PLAYERFEETFOLLOW - const ANIM_OBJ_ENEMYFEETFOLLOW - const ANIM_OBJ_BA - const ANIM_OBJ_BB + const ANIM_OBJ_01 + const ANIM_OBJ_02 + const ANIM_OBJ_03 + const ANIM_OBJ_04 + const ANIM_OBJ_05 + const ANIM_OBJ_06 + const ANIM_OBJ_07 + const ANIM_OBJ_08 + const ANIM_OBJ_09 + const ANIM_OBJ_0A + const ANIM_OBJ_0B + const ANIM_OBJ_0C + const ANIM_OBJ_0D + const ANIM_OBJ_0E + const ANIM_OBJ_0F + const ANIM_OBJ_BURNED + const ANIM_OBJ_BLIZZARD + const ANIM_OBJ_12 + const ANIM_OBJ_ICE_BEAM + const ANIM_OBJ_RAZOR_LEAF + const ANIM_OBJ_POKE_BALL + const ANIM_OBJ_POKE_BALL_BLOCKED + const ANIM_OBJ_17 + const ANIM_OBJ_18 + const ANIM_OBJ_19 + const ANIM_OBJ_1A + const ANIM_OBJ_1B + const ANIM_OBJ_BALL_POOF + const ANIM_OBJ_1D + const ANIM_OBJ_1E + const ANIM_OBJ_1F + const ANIM_OBJ_20 + const ANIM_OBJ_BUBBLE + const ANIM_OBJ_22 + const ANIM_OBJ_23 + const ANIM_OBJ_24 + const ANIM_OBJ_25 + const ANIM_OBJ_26 + const ANIM_OBJ_27 + const ANIM_OBJ_28 + const ANIM_OBJ_ICE_BUILDUP + const ANIM_OBJ_FROZEN + const ANIM_OBJ_MASTER_BALL_SPARKLE + const ANIM_OBJ_2C + const ANIM_OBJ_2D + const ANIM_OBJ_2E + const ANIM_OBJ_2F + const ANIM_OBJ_30 + const ANIM_OBJ_31 + const ANIM_OBJ_LIGHTNING_BOLT + const ANIM_OBJ_33 + const ANIM_OBJ_34 + const ANIM_OBJ_35 + const ANIM_OBJ_36 + const ANIM_OBJ_37 + const ANIM_OBJ_38 + const ANIM_OBJ_39 + const ANIM_OBJ_3A + const ANIM_OBJ_3B + const ANIM_OBJ_3C + const ANIM_OBJ_3D + const ANIM_OBJ_GUST + const ANIM_OBJ_3F + const ANIM_OBJ_40 + const ANIM_OBJ_41 + const ANIM_OBJ_42 + const ANIM_OBJ_43 + const ANIM_OBJ_44 + const ANIM_OBJ_ABSORB + const ANIM_OBJ_46 + const ANIM_OBJ_47 + const ANIM_OBJ_48 + const ANIM_OBJ_49 + const ANIM_OBJ_LEECH_SEED + const ANIM_OBJ_4B + const ANIM_OBJ_4C + const ANIM_OBJ_4D + const ANIM_OBJ_4E + const ANIM_OBJ_4F + const ANIM_OBJ_50 + const ANIM_OBJ_51 + const ANIM_OBJ_CHICK + const ANIM_OBJ_53 + const ANIM_OBJ_54 + const ANIM_OBJ_SKULL + const ANIM_OBJ_56 + const ANIM_OBJ_57 + const ANIM_OBJ_58 + const ANIM_OBJ_PARALYZED + const ANIM_OBJ_5A + const ANIM_OBJ_HAZE + const ANIM_OBJ_MIST + const ANIM_OBJ_SMOG + const ANIM_OBJ_POISON_GAS + const ANIM_OBJ_HORN + const ANIM_OBJ_60 + const ANIM_OBJ_61 + const ANIM_OBJ_62 + const ANIM_OBJ_63 + const ANIM_OBJ_64 + const ANIM_OBJ_65 + const ANIM_OBJ_66 + const ANIM_OBJ_67 + const ANIM_OBJ_68 + const ANIM_OBJ_69 + const ANIM_OBJ_6A + const ANIM_OBJ_6B + const ANIM_OBJ_6C + const ANIM_OBJ_6D + const ANIM_OBJ_SKY_ATTACK_FEAROW + const ANIM_OBJ_LICK + const ANIM_OBJ_WITHDRAW + const ANIM_OBJ_71 + const ANIM_OBJ_72 + const ANIM_OBJ_73 + const ANIM_OBJ_74 + const ANIM_OBJ_75 + const ANIM_OBJ_76 + const ANIM_OBJ_77 + const ANIM_OBJ_78 + const ANIM_OBJ_79 + const ANIM_OBJ_7A + const ANIM_OBJ_7B + const ANIM_OBJ_7C + const ANIM_OBJ_7D + const ANIM_OBJ_HEART + const ANIM_OBJ_7F + const ANIM_OBJ_80 + const ANIM_OBJ_COTTON_SPORE + const ANIM_OBJ_82 + const ANIM_OBJ_83 + const ANIM_OBJ_84 + const ANIM_OBJ_85 + const ANIM_OBJ_86 + const ANIM_OBJ_87 + const ANIM_OBJ_88 + const ANIM_OBJ_89 + const ANIM_OBJ_8A + const ANIM_OBJ_8B + const ANIM_OBJ_8C + const ANIM_OBJ_8D + const ANIM_OBJ_SPIKES + const ANIM_OBJ_8F + const ANIM_OBJ_90 + const ANIM_OBJ_91 + const ANIM_OBJ_92 + const ANIM_OBJ_93 + const ANIM_OBJ_94 + const ANIM_OBJ_95 + const ANIM_OBJ_96 + const ANIM_OBJ_97 + const ANIM_OBJ_98 + const ANIM_OBJ_99 + const ANIM_OBJ_9A + const ANIM_OBJ_9B + const ANIM_OBJ_9C + const ANIM_OBJ_9D + const ANIM_OBJ_9E + const ANIM_OBJ_9F + const ANIM_OBJ_A0 + const ANIM_OBJ_A1 + const ANIM_OBJ_A2 + const ANIM_OBJ_A3 + const ANIM_OBJ_A4 + const ANIM_OBJ_A5 + const ANIM_OBJ_PERISH_SONG + const ANIM_OBJ_A7 + const ANIM_OBJ_A8 + const ANIM_OBJ_A9 + const ANIM_OBJ_AA + const ANIM_OBJ_AB + const ANIM_OBJ_AC + const ANIM_OBJ_AD + const ANIM_OBJ_AE + const ANIM_OBJ_AF + const ANIM_OBJ_B0 + const ANIM_OBJ_B1 + const ANIM_OBJ_B2 + const ANIM_OBJ_B3 + const ANIM_OBJ_B4 + const ANIM_OBJ_B5 + const ANIM_OBJ_FLOWER + const ANIM_OBJ_COTTON + const ANIM_OBJ_PLAYERFEETFOLLOW + const ANIM_OBJ_ENEMYFEETFOLLOW + const ANIM_OBJ_BA + const ANIM_OBJ_BB const_def const BATTLEANIMFUNC_00 - const BATTLEANIMFUNC_01 - const BATTLEANIMFUNC_02 - const BATTLEANIMFUNC_03 - const BATTLEANIMFUNC_04 - const BATTLEANIMFUNC_05 - const BATTLEANIMFUNC_06 - const BATTLEANIMFUNC_07 - const BATTLEANIMFUNC_08 - const BATTLEANIMFUNC_09 - const BATTLEANIMFUNC_0A - const BATTLEANIMFUNC_0B - const BATTLEANIMFUNC_0C - const BATTLEANIMFUNC_0D - const BATTLEANIMFUNC_0E - const BATTLEANIMFUNC_0F - const BATTLEANIMFUNC_10 - const BATTLEANIMFUNC_11 - const BATTLEANIMFUNC_12 - const BATTLEANIMFUNC_13 - const BATTLEANIMFUNC_14 - const BATTLEANIMFUNC_15 - const BATTLEANIMFUNC_16 - const BATTLEANIMFUNC_17 - const BATTLEANIMFUNC_18 - const BATTLEANIMFUNC_19 - const BATTLEANIMFUNC_1A - const BATTLEANIMFUNC_1B - const BATTLEANIMFUNC_1C - const BATTLEANIMFUNC_1D - const BATTLEANIMFUNC_1E - const BATTLEANIMFUNC_1F - const BATTLEANIMFUNC_20 - const BATTLEANIMFUNC_21 - const BATTLEANIMFUNC_22 - const BATTLEANIMFUNC_23 - const BATTLEANIMFUNC_24 - const BATTLEANIMFUNC_25 - const BATTLEANIMFUNC_26 - const BATTLEANIMFUNC_27 - const BATTLEANIMFUNC_28 - const BATTLEANIMFUNC_29 - const BATTLEANIMFUNC_2A - const BATTLEANIMFUNC_2B - const BATTLEANIMFUNC_2C - const BATTLEANIMFUNC_2D - const BATTLEANIMFUNC_2E - const BATTLEANIMFUNC_2F - const BATTLEANIMFUNC_30 - const BATTLEANIMFUNC_31 - const BATTLEANIMFUNC_32 - const BATTLEANIMFUNC_33 - const BATTLEANIMFUNC_34 - const BATTLEANIMFUNC_35 - const BATTLEANIMFUNC_36 - const BATTLEANIMFUNC_37 - const BATTLEANIMFUNC_38 - const BATTLEANIMFUNC_39 - const BATTLEANIMFUNC_3A - const BATTLEANIMFUNC_3B - const BATTLEANIMFUNC_3C - const BATTLEANIMFUNC_3D - const BATTLEANIMFUNC_3E - const BATTLEANIMFUNC_3F - const BATTLEANIMFUNC_40 - const BATTLEANIMFUNC_41 - const BATTLEANIMFUNC_42 - const BATTLEANIMFUNC_43 - const BATTLEANIMFUNC_44 - const BATTLEANIMFUNC_45 - const BATTLEANIMFUNC_46 - const BATTLEANIMFUNC_47 - const BATTLEANIMFUNC_48 - const BATTLEANIMFUNC_49 - const BATTLEANIMFUNC_4A - const BATTLEANIMFUNC_4B - const BATTLEANIMFUNC_4C - const BATTLEANIMFUNC_4D - const BATTLEANIMFUNC_4E - const BATTLEANIMFUNC_4F + const BATTLEANIMFUNC_01 + const BATTLEANIMFUNC_02 + const BATTLEANIMFUNC_03 + const BATTLEANIMFUNC_04 + const BATTLEANIMFUNC_05 + const BATTLEANIMFUNC_06 + const BATTLEANIMFUNC_07 + const BATTLEANIMFUNC_08 + const BATTLEANIMFUNC_09 + const BATTLEANIMFUNC_0A + const BATTLEANIMFUNC_RAZOR_LEAF + const BATTLEANIMFUNC_0C + const BATTLEANIMFUNC_0D + const BATTLEANIMFUNC_0E + const BATTLEANIMFUNC_0F + const BATTLEANIMFUNC_10 + const BATTLEANIMFUNC_11 + const BATTLEANIMFUNC_12 + const BATTLEANIMFUNC_13 + const BATTLEANIMFUNC_14 + const BATTLEANIMFUNC_15 + const BATTLEANIMFUNC_16 + const BATTLEANIMFUNC_17 + const BATTLEANIMFUNC_18 + const BATTLEANIMFUNC_19 + const BATTLEANIMFUNC_1A + const BATTLEANIMFUNC_1B + const BATTLEANIMFUNC_1C + const BATTLEANIMFUNC_1D + const BATTLEANIMFUNC_1E + const BATTLEANIMFUNC_1F + const BATTLEANIMFUNC_LEECH_SEED + const BATTLEANIMFUNC_21 + const BATTLEANIMFUNC_22 + const BATTLEANIMFUNC_23 + const BATTLEANIMFUNC_24 + const BATTLEANIMFUNC_25 + const BATTLEANIMFUNC_26 + const BATTLEANIMFUNC_27 + const BATTLEANIMFUNC_28 + const BATTLEANIMFUNC_SPRIAL_DESCENT + const BATTLEANIMFUNC_POISON_GAS + const BATTLEANIMFUNC_HORN + const BATTLEANIMFUNC_2C + const BATTLEANIMFUNC_2D + const BATTLEANIMFUNC_2E + const BATTLEANIMFUNC_2F + const BATTLEANIMFUNC_30 + const BATTLEANIMFUNC_31 + const BATTLEANIMFUNC_32 + const BATTLEANIMFUNC_33 + const BATTLEANIMFUNC_34 + const BATTLEANIMFUNC_35 + const BATTLEANIMFUNC_36 + const BATTLEANIMFUNC_37 + const BATTLEANIMFUNC_38 + const BATTLEANIMFUNC_39 + const BATTLEANIMFUNC_3A + const BATTLEANIMFUNC_3B + const BATTLEANIMFUNC_3C + const BATTLEANIMFUNC_3D + const BATTLEANIMFUNC_3E + const BATTLEANIMFUNC_3F + const BATTLEANIMFUNC_40 + const BATTLEANIMFUNC_41 + const BATTLEANIMFUNC_42 + const BATTLEANIMFUNC_43 + const BATTLEANIMFUNC_44 + const BATTLEANIMFUNC_45 + const BATTLEANIMFUNC_46 + const BATTLEANIMFUNC_47 + const BATTLEANIMFUNC_48 + const BATTLEANIMFUNC_49 + const BATTLEANIMFUNC_4A + const BATTLEANIMFUNC_4B + const BATTLEANIMFUNC_4C + const BATTLEANIMFUNC_4D + const BATTLEANIMFUNC_4E + const BATTLEANIMFUNC_4F const_def const BATTLEANIMFRAMESET_00 - const BATTLEANIMFRAMESET_01 - const BATTLEANIMFRAMESET_02 - const BATTLEANIMFRAMESET_03 - const BATTLEANIMFRAMESET_04 - const BATTLEANIMFRAMESET_05 - const BATTLEANIMFRAMESET_06 - const BATTLEANIMFRAMESET_07 - const BATTLEANIMFRAMESET_08 - const BATTLEANIMFRAMESET_09 - const BATTLEANIMFRAMESET_0A - const BATTLEANIMFRAMESET_0B - const BATTLEANIMFRAMESET_0C - const BATTLEANIMFRAMESET_0D - const BATTLEANIMFRAMESET_0E - const BATTLEANIMFRAMESET_0F - const BATTLEANIMFRAMESET_10 - const BATTLEANIMFRAMESET_11 - const BATTLEANIMFRAMESET_12 - const BATTLEANIMFRAMESET_13 - const BATTLEANIMFRAMESET_14 - const BATTLEANIMFRAMESET_15 - const BATTLEANIMFRAMESET_16 - const BATTLEANIMFRAMESET_17 - const BATTLEANIMFRAMESET_18 - const BATTLEANIMFRAMESET_19 - const BATTLEANIMFRAMESET_1A - const BATTLEANIMFRAMESET_1B - const BATTLEANIMFRAMESET_1C - const BATTLEANIMFRAMESET_1D - const BATTLEANIMFRAMESET_1E - const BATTLEANIMFRAMESET_1F - const BATTLEANIMFRAMESET_20 - const BATTLEANIMFRAMESET_21 - const BATTLEANIMFRAMESET_22 - const BATTLEANIMFRAMESET_23 - const BATTLEANIMFRAMESET_24 - const BATTLEANIMFRAMESET_25 - const BATTLEANIMFRAMESET_26 - const BATTLEANIMFRAMESET_27 - const BATTLEANIMFRAMESET_28 - const BATTLEANIMFRAMESET_29 - const BATTLEANIMFRAMESET_2A - const BATTLEANIMFRAMESET_2B - const BATTLEANIMFRAMESET_2C - const BATTLEANIMFRAMESET_2D - const BATTLEANIMFRAMESET_2E - const BATTLEANIMFRAMESET_2F - const BATTLEANIMFRAMESET_30 - const BATTLEANIMFRAMESET_31 - const BATTLEANIMFRAMESET_32 - const BATTLEANIMFRAMESET_33 - const BATTLEANIMFRAMESET_34 - const BATTLEANIMFRAMESET_35 - const BATTLEANIMFRAMESET_36 - const BATTLEANIMFRAMESET_37 - const BATTLEANIMFRAMESET_38 - const BATTLEANIMFRAMESET_39 - const BATTLEANIMFRAMESET_3A - const BATTLEANIMFRAMESET_3B - const BATTLEANIMFRAMESET_3C - const BATTLEANIMFRAMESET_3D - const BATTLEANIMFRAMESET_3E - const BATTLEANIMFRAMESET_3F - const BATTLEANIMFRAMESET_40 - const BATTLEANIMFRAMESET_41 - const BATTLEANIMFRAMESET_42 - const BATTLEANIMFRAMESET_43 - const BATTLEANIMFRAMESET_44 - const BATTLEANIMFRAMESET_45 - const BATTLEANIMFRAMESET_46 - const BATTLEANIMFRAMESET_47 - const BATTLEANIMFRAMESET_48 - const BATTLEANIMFRAMESET_49 - const BATTLEANIMFRAMESET_4A - const BATTLEANIMFRAMESET_4B - const BATTLEANIMFRAMESET_4C - const BATTLEANIMFRAMESET_4D - const BATTLEANIMFRAMESET_4E - const BATTLEANIMFRAMESET_4F - const BATTLEANIMFRAMESET_50 - const BATTLEANIMFRAMESET_51 - const BATTLEANIMFRAMESET_52 - const BATTLEANIMFRAMESET_53 - const BATTLEANIMFRAMESET_54 - const BATTLEANIMFRAMESET_55 - const BATTLEANIMFRAMESET_56 - const BATTLEANIMFRAMESET_57 - const BATTLEANIMFRAMESET_58 - const BATTLEANIMFRAMESET_59 - const BATTLEANIMFRAMESET_5A - const BATTLEANIMFRAMESET_5B - const BATTLEANIMFRAMESET_5C - const BATTLEANIMFRAMESET_5D - const BATTLEANIMFRAMESET_5E - const BATTLEANIMFRAMESET_5F - const BATTLEANIMFRAMESET_60 - const BATTLEANIMFRAMESET_61 - const BATTLEANIMFRAMESET_62 - const BATTLEANIMFRAMESET_63 - const BATTLEANIMFRAMESET_64 - const BATTLEANIMFRAMESET_65 - const BATTLEANIMFRAMESET_66 - const BATTLEANIMFRAMESET_67 - const BATTLEANIMFRAMESET_68 - const BATTLEANIMFRAMESET_69 - const BATTLEANIMFRAMESET_6A - const BATTLEANIMFRAMESET_6B - const BATTLEANIMFRAMESET_6C - const BATTLEANIMFRAMESET_6D - const BATTLEANIMFRAMESET_6E - const BATTLEANIMFRAMESET_6F - const BATTLEANIMFRAMESET_70 - const BATTLEANIMFRAMESET_71 - const BATTLEANIMFRAMESET_72 - const BATTLEANIMFRAMESET_73 - const BATTLEANIMFRAMESET_74 - const BATTLEANIMFRAMESET_75 - const BATTLEANIMFRAMESET_76 - const BATTLEANIMFRAMESET_77 - const BATTLEANIMFRAMESET_78 - const BATTLEANIMFRAMESET_79 - const BATTLEANIMFRAMESET_7A - const BATTLEANIMFRAMESET_7B - const BATTLEANIMFRAMESET_7C - const BATTLEANIMFRAMESET_7D - const BATTLEANIMFRAMESET_7E - const BATTLEANIMFRAMESET_7F - const BATTLEANIMFRAMESET_80 - const BATTLEANIMFRAMESET_81 - const BATTLEANIMFRAMESET_82 - const BATTLEANIMFRAMESET_83 - const BATTLEANIMFRAMESET_84 - const BATTLEANIMFRAMESET_85 - const BATTLEANIMFRAMESET_86 - const BATTLEANIMFRAMESET_87 - const BATTLEANIMFRAMESET_88 - const BATTLEANIMFRAMESET_89 - const BATTLEANIMFRAMESET_8A - const BATTLEANIMFRAMESET_8B - const BATTLEANIMFRAMESET_8C - const BATTLEANIMFRAMESET_8D - const BATTLEANIMFRAMESET_8E - const BATTLEANIMFRAMESET_8F - const BATTLEANIMFRAMESET_90 - const BATTLEANIMFRAMESET_91 - const BATTLEANIMFRAMESET_92 - const BATTLEANIMFRAMESET_93 - const BATTLEANIMFRAMESET_94 - const BATTLEANIMFRAMESET_95 - const BATTLEANIMFRAMESET_96 - const BATTLEANIMFRAMESET_97 - const BATTLEANIMFRAMESET_98 - const BATTLEANIMFRAMESET_99 - const BATTLEANIMFRAMESET_9A - const BATTLEANIMFRAMESET_9B - const BATTLEANIMFRAMESET_9C - const BATTLEANIMFRAMESET_9D - const BATTLEANIMFRAMESET_9E - const BATTLEANIMFRAMESET_9F - const BATTLEANIMFRAMESET_A0 - const BATTLEANIMFRAMESET_A1 - const BATTLEANIMFRAMESET_A2 - const BATTLEANIMFRAMESET_A3 - const BATTLEANIMFRAMESET_A4 - const BATTLEANIMFRAMESET_A5 - const BATTLEANIMFRAMESET_A6 - const BATTLEANIMFRAMESET_A7 - const BATTLEANIMFRAMESET_A8 - const BATTLEANIMFRAMESET_A9 - const BATTLEANIMFRAMESET_AA - const BATTLEANIMFRAMESET_AB - const BATTLEANIMFRAMESET_AC - const BATTLEANIMFRAMESET_AD - const BATTLEANIMFRAMESET_AE - const BATTLEANIMFRAMESET_AF - const BATTLEANIMFRAMESET_B0 - const BATTLEANIMFRAMESET_B1 - const BATTLEANIMFRAMESET_B2 - const BATTLEANIMFRAMESET_B3 - const BATTLEANIMFRAMESET_B4 - const BATTLEANIMFRAMESET_B5 - const BATTLEANIMFRAMESET_B6 - const BATTLEANIMFRAMESET_B7 - const BATTLEANIMFRAMESET_B8 + const BATTLEANIMFRAMESET_01 + const BATTLEANIMFRAMESET_02 + const BATTLEANIMFRAMESET_03 + const BATTLEANIMFRAMESET_04 + const BATTLEANIMFRAMESET_05 + const BATTLEANIMFRAMESET_06 + const BATTLEANIMFRAMESET_07 + const BATTLEANIMFRAMESET_08 + const BATTLEANIMFRAMESET_09 + const BATTLEANIMFRAMESET_0A + const BATTLEANIMFRAMESET_0B + const BATTLEANIMFRAMESET_0C + const BATTLEANIMFRAMESET_0D + const BATTLEANIMFRAMESET_0E + const BATTLEANIMFRAMESET_0F + const BATTLEANIMFRAMESET_10 + const BATTLEANIMFRAMESET_11 + const BATTLEANIMFRAMESET_12 + const BATTLEANIMFRAMESET_13 + const BATTLEANIMFRAMESET_14 + const BATTLEANIMFRAMESET_15 + const BATTLEANIMFRAMESET_16 + const BATTLEANIMFRAMESET_17 + const BATTLEANIMFRAMESET_18 + const BATTLEANIMFRAMESET_19 + const BATTLEANIMFRAMESET_1A + const BATTLEANIMFRAMESET_1B + const BATTLEANIMFRAMESET_1C + const BATTLEANIMFRAMESET_1D + const BATTLEANIMFRAMESET_1E + const BATTLEANIMFRAMESET_1F + const BATTLEANIMFRAMESET_20 + const BATTLEANIMFRAMESET_21 + const BATTLEANIMFRAMESET_22 + const BATTLEANIMFRAMESET_23 + const BATTLEANIMFRAMESET_24 + const BATTLEANIMFRAMESET_25 + const BATTLEANIMFRAMESET_26 + const BATTLEANIMFRAMESET_27 + const BATTLEANIMFRAMESET_28 + const BATTLEANIMFRAMESET_29 + const BATTLEANIMFRAMESET_2A + const BATTLEANIMFRAMESET_2B + const BATTLEANIMFRAMESET_2C + const BATTLEANIMFRAMESET_2D + const BATTLEANIMFRAMESET_2E + const BATTLEANIMFRAMESET_2F + const BATTLEANIMFRAMESET_30 + const BATTLEANIMFRAMESET_31 + const BATTLEANIMFRAMESET_32 + const BATTLEANIMFRAMESET_33 + const BATTLEANIMFRAMESET_34 + const BATTLEANIMFRAMESET_35 + const BATTLEANIMFRAMESET_36 + const BATTLEANIMFRAMESET_37 + const BATTLEANIMFRAMESET_38 + const BATTLEANIMFRAMESET_39 + const BATTLEANIMFRAMESET_3A + const BATTLEANIMFRAMESET_3B + const BATTLEANIMFRAMESET_3C + const BATTLEANIMFRAMESET_3D + const BATTLEANIMFRAMESET_3E + const BATTLEANIMFRAMESET_3F + const BATTLEANIMFRAMESET_40 + const BATTLEANIMFRAMESET_41 + const BATTLEANIMFRAMESET_42 + const BATTLEANIMFRAMESET_43 + const BATTLEANIMFRAMESET_44 + const BATTLEANIMFRAMESET_45 + const BATTLEANIMFRAMESET_46 + const BATTLEANIMFRAMESET_47 + const BATTLEANIMFRAMESET_48 + const BATTLEANIMFRAMESET_49 + const BATTLEANIMFRAMESET_4A + const BATTLEANIMFRAMESET_4B + const BATTLEANIMFRAMESET_4C + const BATTLEANIMFRAMESET_4D + const BATTLEANIMFRAMESET_4E + const BATTLEANIMFRAMESET_4F + const BATTLEANIMFRAMESET_50 + const BATTLEANIMFRAMESET_51 + const BATTLEANIMFRAMESET_52 + const BATTLEANIMFRAMESET_53 + const BATTLEANIMFRAMESET_54 + const BATTLEANIMFRAMESET_55 + const BATTLEANIMFRAMESET_56 + const BATTLEANIMFRAMESET_57 + const BATTLEANIMFRAMESET_58 + const BATTLEANIMFRAMESET_59 + const BATTLEANIMFRAMESET_5A + const BATTLEANIMFRAMESET_5B + const BATTLEANIMFRAMESET_5C + const BATTLEANIMFRAMESET_5D + const BATTLEANIMFRAMESET_5E + const BATTLEANIMFRAMESET_5F + const BATTLEANIMFRAMESET_60 + const BATTLEANIMFRAMESET_61 + const BATTLEANIMFRAMESET_62 + const BATTLEANIMFRAMESET_63 + const BATTLEANIMFRAMESET_64 + const BATTLEANIMFRAMESET_65 + const BATTLEANIMFRAMESET_66 + const BATTLEANIMFRAMESET_67 + const BATTLEANIMFRAMESET_68 + const BATTLEANIMFRAMESET_69 + const BATTLEANIMFRAMESET_6A + const BATTLEANIMFRAMESET_6B + const BATTLEANIMFRAMESET_6C + const BATTLEANIMFRAMESET_6D + const BATTLEANIMFRAMESET_6E + const BATTLEANIMFRAMESET_6F + const BATTLEANIMFRAMESET_70 + const BATTLEANIMFRAMESET_71 + const BATTLEANIMFRAMESET_72 + const BATTLEANIMFRAMESET_73 + const BATTLEANIMFRAMESET_74 + const BATTLEANIMFRAMESET_75 + const BATTLEANIMFRAMESET_76 + const BATTLEANIMFRAMESET_77 + const BATTLEANIMFRAMESET_78 + const BATTLEANIMFRAMESET_79 + const BATTLEANIMFRAMESET_7A + const BATTLEANIMFRAMESET_7B + const BATTLEANIMFRAMESET_7C + const BATTLEANIMFRAMESET_7D + const BATTLEANIMFRAMESET_7E + const BATTLEANIMFRAMESET_7F + const BATTLEANIMFRAMESET_80 + const BATTLEANIMFRAMESET_81 + const BATTLEANIMFRAMESET_82 + const BATTLEANIMFRAMESET_83 + const BATTLEANIMFRAMESET_84 + const BATTLEANIMFRAMESET_85 + const BATTLEANIMFRAMESET_86 + const BATTLEANIMFRAMESET_87 + const BATTLEANIMFRAMESET_88 + const BATTLEANIMFRAMESET_89 + const BATTLEANIMFRAMESET_8A + const BATTLEANIMFRAMESET_8B + const BATTLEANIMFRAMESET_8C + const BATTLEANIMFRAMESET_8D + const BATTLEANIMFRAMESET_8E + const BATTLEANIMFRAMESET_8F + const BATTLEANIMFRAMESET_90 + const BATTLEANIMFRAMESET_91 + const BATTLEANIMFRAMESET_92 + const BATTLEANIMFRAMESET_93 + const BATTLEANIMFRAMESET_94 + const BATTLEANIMFRAMESET_95 + const BATTLEANIMFRAMESET_96 + const BATTLEANIMFRAMESET_97 + const BATTLEANIMFRAMESET_98 + const BATTLEANIMFRAMESET_99 + const BATTLEANIMFRAMESET_9A + const BATTLEANIMFRAMESET_9B + const BATTLEANIMFRAMESET_9C + const BATTLEANIMFRAMESET_9D + const BATTLEANIMFRAMESET_9E + const BATTLEANIMFRAMESET_9F + const BATTLEANIMFRAMESET_A0 + const BATTLEANIMFRAMESET_A1 + const BATTLEANIMFRAMESET_A2 + const BATTLEANIMFRAMESET_A3 + const BATTLEANIMFRAMESET_A4 + const BATTLEANIMFRAMESET_A5 + const BATTLEANIMFRAMESET_A6 + const BATTLEANIMFRAMESET_A7 + const BATTLEANIMFRAMESET_A8 + const BATTLEANIMFRAMESET_A9 + const BATTLEANIMFRAMESET_AA + const BATTLEANIMFRAMESET_AB + const BATTLEANIMFRAMESET_AC + const BATTLEANIMFRAMESET_AD + const BATTLEANIMFRAMESET_AE + const BATTLEANIMFRAMESET_AF + const BATTLEANIMFRAMESET_B0 + const BATTLEANIMFRAMESET_B1 + const BATTLEANIMFRAMESET_B2 + const BATTLEANIMFRAMESET_B3 + const BATTLEANIMFRAMESET_B4 + const BATTLEANIMFRAMESET_B5 + const BATTLEANIMFRAMESET_B6 + const BATTLEANIMFRAMESET_B7 + const BATTLEANIMFRAMESET_B8 const_def const BATTLEANIMOAMSET_00 @@ -735,14 +735,14 @@ const_value SET 1 const ANIM_BG_1E const ANIM_BG_1F const ANIM_BG_20 - const ANIM_BG_21 + const ANIM_BG_WITHDRAW const ANIM_BG_BOUNCE_DOWN const ANIM_BG_DIG const ANIM_BG_TACKLE const ANIM_BG_25 const ANIM_BG_26 const ANIM_BG_27 - const ANIM_BG_28 + const ANIM_BG_WAVE_DEFORM_USER const ANIM_BG_PSYCHIC const ANIM_BG_2A const ANIM_BG_2B @@ -768,6 +768,47 @@ const_value SET 1 const ANIM_MON_EGG1 ; 7 const ANIM_MON_EGG2 ; 8 +const_value SET 1 + const ANIM_GFX_HIT + const ANIM_GFX_CUT + const ANIM_GFX_FIRE + const ANIM_GFX_WATER + const ANIM_GFX_LIGHTNING + const ANIM_GFX_PLANT + const ANIM_GFX_SMOKE + const ANIM_GFX_EXPLOSION + const ANIM_GFX_ROCKS + const ANIM_GFX_ICE + const ANIM_GFX_POKE_BALL + const ANIM_GFX_POISON + const ANIM_GFX_BUBBLE + const ANIM_GFX_NOISE + const ANIM_GFX_POWDER + const ANIM_GFX_BEAM + const ANIM_GFX_SPEED + const ANIM_GFX_CHARGE + const ANIM_GFX_WIND + const ANIM_GFX_WHIP + const ANIM_GFX_EGG + const ANIM_GFX_ROPE + const ANIM_GFX_PSYCHIC + const ANIM_GFX_REFLECT + const ANIM_GFX_STATUS + const ANIM_GFX_SAND + const ANIM_GFX_WEB + const ANIM_GFX_HAZE + const ANIM_GFX_HORN + const ANIM_GFX_FLOWER + const ANIM_GFX_MISC + const ANIM_GFX_SKY_ATTACK + const ANIM_GFX_GLOBE + const ANIM_GFX_SHAPES + const ANIM_GFX_OBJECTS + const ANIM_GFX_SHINE + const ANIM_GFX_ANGELS + const ANIM_GFX_WAVE + const ANIM_GFX_AEROBLAST + const_def const BG_EFFECT_STRUCT_FUNCTION const BG_EFFECT_STRUCT_JT_INDEX diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index df32eb58..c341e901 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -2,19 +2,19 @@ ; pitch const_def - const __ ; 0 - const C_ ; 1 - const C# ; 2 - const D_ ; 3 - const D# ; 4 - const E_ ; 5 - const F_ ; 6 - const F# ; 7 - const G_ ; 8 - const G# ; 9 - const A_ ; a - const A# ; b - const B_ ; c + const __ + const C_ + const C# + const D_ + const D# + const E_ + const F_ + const F# + const G_ + const G# + const A_ + const A# + const B_ ; channel const_def @@ -41,7 +41,7 @@ SOUND_REST EQU 5 ; Flags2 SOUND_VIBRATO EQU 0 -SOUND_UNKN_09 EQU 1 +SOUND_PITCH_WHEEL EQU 1 SOUND_DUTY EQU 2 SOUND_UNKN_0B EQU 3 SOUND_CRY_PITCH EQU 4 @@ -51,7 +51,7 @@ SOUND_UNKN_0F EQU 7 ; Flags3 SOUND_VIBRATO_DIR EQU 0 -SOUND_UNKN_11 EQU 1 +SOUND_PITCH_WHEEL_DIR EQU 1 ; NoteFlags NOTE_UNKN_0 EQU 0 diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 1e5b0d62..c690c9b0 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -19,8 +19,8 @@ const BATTLETOWERACTION_11 ; store 0 in 5:aa8d const BATTLETOWERACTION_12 ; store 1 in 5:aa8d const BATTLETOWERACTION_13 ; check 5:aa8d - const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f] - const BATTLETOWERACTION_15 ; set 0, [sbe4f] + const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [s1_be4f] + const BATTLETOWERACTION_15 ; set 0, [s1_be4f] const BATTLETOWERACTION_16 ; update time in SRAM bank 5 const BATTLETOWERACTION_17 ; check time in SRAM bank 5 const BATTLETOWERACTION_18 ; level check diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index 0f0590f3..36cf369c 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -3,32 +3,32 @@ const SCGB_BATTLE_COLORS const SCGB_POKEGEAR_PALS const SCGB_STATS_SCREEN_HP_PALS - const SCGB_04 + const SCGB_POKEDEX const SCGB_SLOT_MACHINE const SCGB_06 const SCGB_07 - const SCGB_08 + const SCGB_DIPLOMA const SCGB_MAPPALS - const SCGB_0A - const SCGB_0B + const SCGB_PARTY_MENU + const SCGB_EVOLUTION const SCGB_0C const SCGB_0D - const SCGB_0E + const SCGB_MOVE_LIST const SCGB_0F - const SCGB_10 + const SCGB_POKEDEX_SEARCH_OPTION const SCGB_11 const SCGB_POKEPIC const SCGB_13 const SCGB_PACKPALS const SCGB_TRAINER_CARD - const SCGB_16 - const SCGB_17 - const SCGB_18 - const SCGB_19 - const SCGB_1A - const SCGB_1B - const SCGB_FRONTPICPALS - const SCGB_1D + const SCGB_POKEDEX_UNOWN_MODE + const SCGB_BILLS_PC + const SCGB_UNOWN_PUZZLE + const SCGB_GAMEFREAK_LOGO + const SCGB_PLAYER_OR_MON_FRONTPIC_PALS + const SCGB_TRADE_TUBE + const SCGB_TRAINER_OR_MON_FRONTPIC_PALS + const SCGB_MYSTERY_GIFT const SCGB_1E SCGB_PARTY_MENU_HP_PALS EQU -4 diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 775991a8..636d0226 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1232,7 +1232,7 @@ const EVENT_BEAT_BLACKBELT_LUNG const EVENT_BEAT_BLACKBELT_KENJI const EVENT_BEAT_BLACKBELT_WAI -; Beauti +; Beauty const EVENT_BEAT_BEAUTY_VICTORIA const EVENT_BEAT_BEAUTY_SAMANTHA const EVENT_BEAT_BEAUTY_JULIE diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index c774faa9..9478cd12 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,45 +1,3 @@ -const_value SET 1 - const ANIM_GFX_HIT - const ANIM_GFX_CUT - const ANIM_GFX_FIRE - const ANIM_GFX_WATER - const ANIM_GFX_LIGHTNING - const ANIM_GFX_PLANT - const ANIM_GFX_SMOKE - const ANIM_GFX_EXPLOSION - const ANIM_GFX_ROCKS - const ANIM_GFX_ICE - const ANIM_GFX_POKE_BALL - const ANIM_GFX_POISON - const ANIM_GFX_BUBBLE - const ANIM_GFX_NOISE - const ANIM_GFX_POWDER - const ANIM_GFX_BEAM - const ANIM_GFX_SPEED - const ANIM_GFX_CHARGE - const ANIM_GFX_WIND - const ANIM_GFX_WHIP - const ANIM_GFX_EGG - const ANIM_GFX_ROPE - const ANIM_GFX_PSYCHIC - const ANIM_GFX_REFLECT - const ANIM_GFX_STATUS - const ANIM_GFX_SAND - const ANIM_GFX_WEB - const ANIM_GFX_HAZE - const ANIM_GFX_HORN - const ANIM_GFX_FLOWER - const ANIM_GFX_MISC - const ANIM_GFX_SKY_ATTACK - const ANIM_GFX_GLOBE - const ANIM_GFX_SHAPES - const ANIM_GFX_OBJECTS - const ANIM_GFX_SHINE - const ANIM_GFX_ANGELS - const ANIM_GFX_WAVE - const ANIM_GFX_AEROBLAST - - LEN_2BPP_TILE EQU 16 LEN_1BPP_TILE EQU 8 TILES_PER_FRAME EQU 6 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index bedcf29d..1ed12662 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -10,7 +10,7 @@ MAP_NONE EQU 0 mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1 mapgroup OLIVINE_GYM, 8, 5 ; 2 - mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 ; 3 + mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3 mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4 mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 @@ -144,7 +144,7 @@ MAP_NONE EQU 0 mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1 mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2 mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 ; 4 + mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 mapgroup BLACKTHORN_MART, 4, 6 ; 5 mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7 @@ -233,7 +233,7 @@ MAP_NONE EQU 0 mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 ; 10 + mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10 mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 @@ -518,39 +518,39 @@ const_value SET 1 ; object struct const_def - const OBJECT_SPRITE - const OBJECT_MAP_OBJECT_INDEX - const OBJECT_SPRITE_TILE - const OBJECT_MOVEMENTTYPE - const OBJECT_FLAGS1 - const OBJECT_FLAGS2 - const OBJECT_PALETTE - const OBJECT_DIRECTION_WALKING - const OBJECT_FACING - const OBJECT_STEP_TYPE - const OBJECT_STEP_DURATION - const OBJECT_ACTION - const OBJECT_STEP_FRAME - const OBJECT_FACING_STEP - const OBJECT_NEXT_TILE - const OBJECT_STANDING_TILE - const OBJECT_NEXT_MAP_X - const OBJECT_NEXT_MAP_Y - const OBJECT_MAP_X - const OBJECT_MAP_Y - const OBJECT_INIT_X - const OBJECT_INIT_Y - const OBJECT_RADIUS - const OBJECT_SPRITE_X - const OBJECT_SPRITE_Y - const OBJECT_SPRITE_X_OFFSET - const OBJECT_SPRITE_Y_OFFSET - const OBJECT_MOVEMENT_BYTE_INDEX - const OBJECT_28 - const OBJECT_29 - const OBJECT_30 - const OBJECT_31 - const OBJECT_RANGE + const OBJECT_SPRITE ; 00 + const OBJECT_MAP_OBJECT_INDEX ; 01 + const OBJECT_SPRITE_TILE ; 02 + const OBJECT_MOVEMENTTYPE ; 03 + const OBJECT_FLAGS1 ; 04 + const OBJECT_FLAGS2 ; 05 + const OBJECT_PALETTE ; 06 + const OBJECT_DIRECTION_WALKING ; 07 + const OBJECT_FACING ; 08 + const OBJECT_STEP_TYPE ; 09 + const OBJECT_STEP_DURATION ; 0a + const OBJECT_ACTION ; 0b + const OBJECT_STEP_FRAME ; 0c + const OBJECT_FACING_STEP ; 0d + const OBJECT_NEXT_TILE ; 0e + const OBJECT_STANDING_TILE ; 0f + const OBJECT_NEXT_MAP_X ; 10 + const OBJECT_NEXT_MAP_Y ; 11 + const OBJECT_MAP_X ; 12 + const OBJECT_MAP_Y ; 13 + const OBJECT_INIT_X ; 14 + const OBJECT_INIT_Y ; 15 + const OBJECT_RADIUS ; 16 + const OBJECT_SPRITE_X ; 17 + const OBJECT_SPRITE_Y ; 18 + const OBJECT_SPRITE_X_OFFSET ; 19 + const OBJECT_SPRITE_Y_OFFSET ; 1a + const OBJECT_MOVEMENT_BYTE_INDEX ; 1b + const OBJECT_28 ; 1c + const OBJECT_29 ; 1d + const OBJECT_30 ; 1e + const OBJECT_31 ; 1f + const OBJECT_RANGE ; 20 ; 33-39 are not used ; map object struct @@ -707,3 +707,5 @@ CMDQUEUE_04 EQU 4 CMDQUEUE_05 EQU 5 CMDQUEUE_ENTRY_SIZE EQU 6 CMDQUEUE_CAPACITY EQU 4 + +CMDQUEUE_STONETABLE EQU 2 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index 0ee137ea..1a3f60e7 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -19,7 +19,7 @@ const_value SET 1 const MAPCALLBACK_SPRITES const MAPCALLBACK_NEWMAP -; Command descriptions from Condensation water's scripting compendium. const_def +; Command descriptions from Condensation water's scripting compendium. const_def const map_lcd_on ; 00 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 56f57fef..807c9b93 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -18,10 +18,12 @@ LV_CHAR EQU $6e ; GetName types PKMN_NAME EQU 1 MOVE_NAME EQU 2 +; dummied out EQU 3 ITEM_NAME EQU 4 PARTY_OT_NAME EQU 5 ENEMY_OT_NAME EQU 6 TRAINER_NAME EQU 7 +; broken ptr EQU 8 ; hp HP_GREEN EQU 0 @@ -172,7 +174,7 @@ const_value = 1 const HAPPINESS_REVIVALHERB ; 11 const HAPPINESS_MASSAGE ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 - + const_def const LINK_NULL @@ -213,6 +215,23 @@ NUM_KANTO_BADGES EQU const_value NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES NUM_KANA EQU $2d + const_def + const EZCHAT_POKEMON + const EZCHAT_TYPES + const EZCHAT_GREETINGS + const EZCHAT_PEOPLE + const EZCHAT_BATTLE + const EZCHAT_EXCLAMATIONS + const EZCHAT_CONVERSATION + const EZCHAT_FEELINGS + const EZCHAT_CONDITIONS + const EZCHAT_LIFE + const EZCHAT_HOBBIES + const EZCHAT_ACTIONS + const EZCHAT_TIME + const EZCHAT_FAREWELLS + const EZCHAT_THISANDTHAT + SWARM_DUNSPARCE EQU 0 SWARM_YANMA EQU 1 @@ -259,4 +278,3 @@ SERIAL_NO_DATA_BYTE EQU $FE ; signals the end of one part of a patch list (there are two parts) for player/enemy party data SERIAL_PATCH_LIST_PART_TERMINATOR EQU $FF - diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 383e9bac..9a34e2ae 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -4,8 +4,8 @@ const SLIGHTLY_FAST const SLIGHTLY_SLOW const MEDIUM_SLOW - const SLOW const FAST + const SLOW ; egg group constants const_value SET 1 diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm new file mode 100755 index 00000000..e69de29b --- /dev/null +++ b/constants/predef_constants.asm diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm new file mode 100755 index 00000000..5cd8fcd7 --- /dev/null +++ b/constants/printer_constants.asm @@ -0,0 +1,9 @@ +const_value SET 1 + + const PRINTER_STATUS_CHECKING + const PRINTER_STATUS_TRANSMITTING + const PRINTER_STATUS_PRINTING + const PRINTER_ERROR_1 + const PRINTER_ERROR_2 + const PRINTER_ERROR_3 + const PRINTER_ERROR_4 diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index 92aa39ad..14bc75a4 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -1,6 +1,6 @@ const_def const OAKS_POKEMON_TALK ; $00 - const POKEDEX_SHOW ; $01 + const POKEDEX_SHOW ; $01 const POKEMON_MUSIC ; $02 const LUCKY_CHANNEL ; $03 const BUENAS_PASSWORD ; $04 diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index d0d2a8b3..65abfc3c 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -1,192 +1,210 @@ const_def - const SFX_DEX_FANFARE_50_79 - const SFX_ITEM - const SFX_CAUGHT_MON - const SFX_POKEBALLS_PLACED_ON_TABLE - const SFX_POTION - const SFX_FULL_HEAL - const SFX_MENU - const SFX_READ_TEXT - const SFX_READ_TEXT_2 - const SFX_DEX_FANFARE_20_49 - const SFX_DEX_FANFARE_80_109 - const SFX_POISON - const SFX_GOT_SAFARI_BALLS - const SFX_BOOT_PC - const SFX_SHUT_DOWN_PC - const SFX_CHOOSE_PC_OPTION - const SFX_ESCAPE_ROPE - const SFX_PUSH_BUTTON - const SFX_SECOND_PART_OF_ITEMFINDER - const SFX_WARP_TO - const SFX_WARP_FROM - const SFX_CHANGE_DEX_MODE - const SFX_JUMP_OVER_LEDGE - const SFX_GRASS_RUSTLE - const SFX_FLY - const SFX_WRONG - const SFX_SQUEAK - const SFX_STRENGTH - const SFX_BOAT - const SFX_WALL_OPEN - const SFX_PLACE_PUZZLE_PIECE_DOWN - const SFX_ENTER_DOOR - const SFX_SWITCH_POKEMON - const SFX_TALLY - const SFX_TRANSACTION - const SFX_EXIT_BUILDING - const SFX_BUMP - const SFX_SAVE - const SFX_POKEFLUTE - const SFX_ELEVATOR_END - const SFX_THROW_BALL - const SFX_BALL_POOF - const SFX_FAINT - const SFX_RUN - const SFX_SLOT_MACHINE_START - const SFX_FANFARE - const SFX_PECK - const SFX_KINESIS - const SFX_LICK - const SFX_POUND - const SFX_MOVE_PUZZLE_PIECE - const SFX_COMET_PUNCH - const SFX_MEGA_PUNCH - const SFX_SCRATCH - const SFX_VICEGRIP - const SFX_RAZOR_WIND - const SFX_CUT - const SFX_WING_ATTACK - const SFX_WHIRLWIND - const SFX_BIND - const SFX_VINE_WHIP - const SFX_DOUBLE_KICK - const SFX_MEGA_KICK - const SFX_HEADBUTT - const SFX_HORN_ATTACK - const SFX_TACKLE - const SFX_POISON_STING - const SFX_POWDER - const SFX_DOUBLESLAP - const SFX_BITE - const SFX_JUMP_KICK - const SFX_STOMP - const SFX_TAIL_WHIP - const SFX_KARATE_CHOP - const SFX_SUBMISSION - const SFX_WATER_GUN - const SFX_SWORDS_DANCE - const SFX_THUNDER - const SFX_SUPERSONIC - const SFX_LEER - const SFX_EMBER - const SFX_BUBBLEBEAM - const SFX_HYDRO_PUMP - const SFX_SURF - const SFX_PSYBEAM - const SFX_CHARGE - const SFX_THUNDERSHOCK - const SFX_PSYCHIC - const SFX_SCREECH - const SFX_BONE_CLUB - const SFX_SHARPEN - const SFX_EGG_BOMB - const SFX_SING - const SFX_HYPER_BEAM - const SFX_SHINE - const SFX_UNKNOWN_5F - const SFX_UNKNOWN_60 - const SFX_UNKNOWN_61 - const SFX_SWITCH_POCKETS - const SFX_UNKNOWN_63 - const SFX_BURN - const SFX_TITLE_SCREEN_ENTRANCE - const SFX_UNKNOWN_66 - const SFX_GET_COIN_FROM_SLOTS - const SFX_PAY_DAY - const SFX_METRONOME - const SFX_CALL - const SFX_HANG_UP - const SFX_NO_SIGNAL - const SFX_SANDSTORM - const SFX_ELEVATOR - const SFX_PROTECT - const SFX_SKETCH - const SFX_RAIN_DANCE - const SFX_AEROBLAST - const SFX_SPARK - const SFX_CURSE - const SFX_RAGE - const SFX_THIEF - const SFX_THIEF_2 - const SFX_SPIDER_WEB - const SFX_MIND_READER - const SFX_NIGHTMARE - const SFX_SNORE - const SFX_SWEET_KISS - const SFX_SWEET_KISS_2 - const SFX_BELLY_DRUM - const SFX_UNKNOWN_7F - const SFX_SLUDGE_BOMB - const SFX_FORESIGHT - const SFX_SPITE - const SFX_OUTRAGE - const SFX_PERISH_SONG - const SFX_GIGA_DRAIN - const SFX_ATTRACT - const SFX_KINESIS_2 - const SFX_ZAP_CANNON - const SFX_MEAN_LOOK - const SFX_HEAL_BELL - const SFX_RETURN - const SFX_EXP_BAR - const SFX_MILK_DRINK - const SFX_PRESENT - const SFX_MORNING_SUN - const SFX_LEVEL_UP - const SFX_KEY_ITEM - const SFX_FANFARE_2 - const SFX_REGISTER_PHONE_NUMBER - const SFX_3RD_PLACE - const SFX_GET_EGG_FROM_DAYCARE_MAN - const SFX_GET_EGG_FROM_DAYCARE_LADY - const SFX_MOVE_DELETED - const SFX_2ND_PLACE - const SFX_1ST_PLACE - const SFX_CHOOSE_A_CARD - const SFX_GET_TM - const SFX_GET_BADGE - const SFX_QUIT_SLOTS - const SFX_EGG_CRACK - const SFX_DEX_FANFARE_LESS_THAN_20 - const SFX_DEX_FANFARE_140_169 - const SFX_DEX_FANFARE_170_199 - const SFX_DEX_FANFARE_200_229 - const SFX_DEX_FANFARE_230_PLUS - const SFX_EVOLVED - const SFX_MASTER_BALL - const SFX_EGG_HATCH - const SFX_GS_INTRO_CHARIZARD_FIREBALL - const SFX_GS_INTRO_POKEMON_APPEARS - const SFX_FLASH - const SFX_GAME_FREAK_LOGO_GS - const SFX_NOT_VERY_EFFECTIVE - const SFX_DAMAGE - const SFX_SUPER_EFFECTIVE - const SFX_BALL_BOUNCE - const SFX_MOONLIGHT - const SFX_ENCORE - const SFX_BEAT_UP - const SFX_BATON_PASS - const SFX_BALL_WIGGLE - const SFX_SWEET_SCENT - const SFX_SWEET_SCENT_2 - const SFX_HIT_END_OF_EXP_BAR - const SFX_GIVE_TRADEMON - const SFX_GET_TRADEMON - const SFX_TRAIN_ARRIVED - const SFX_STOP_SLOT - const SFX_2_BOOPS - const SFX_GLASS_TING - const SFX_GLASS_TING_2 + const SFX_DEX_FANFARE_50_79 ; 00 + const SFX_ITEM ; 01 + const SFX_CAUGHT_MON ; 02 + const SFX_POKEBALLS_PLACED_ON_TABLE ; 03 + const SFX_POTION ; 04 + const SFX_FULL_HEAL ; 05 + const SFX_MENU ; 06 + const SFX_READ_TEXT ; 07 + const SFX_READ_TEXT_2 ; 08 + const SFX_DEX_FANFARE_20_49 ; 09 + const SFX_DEX_FANFARE_80_109 ; 0a + const SFX_POISON ; 0b + const SFX_GOT_SAFARI_BALLS ; 0c + const SFX_BOOT_PC ; 0d + const SFX_SHUT_DOWN_PC ; 0e + const SFX_CHOOSE_PC_OPTION ; 0f + const SFX_ESCAPE_ROPE ; 10 + const SFX_PUSH_BUTTON ; 11 + const SFX_SECOND_PART_OF_ITEMFINDER ; 12 + const SFX_WARP_TO ; 13 + const SFX_WARP_FROM ; 14 + const SFX_CHANGE_DEX_MODE ; 15 + const SFX_JUMP_OVER_LEDGE ; 16 + const SFX_GRASS_RUSTLE ; 17 + const SFX_FLY ; 18 + const SFX_WRONG ; 19 + const SFX_SQUEAK ; 1a + const SFX_STRENGTH ; 1b + const SFX_BOAT ; 1c + const SFX_WALL_OPEN ; 1d + const SFX_PLACE_PUZZLE_PIECE_DOWN ; 1e + const SFX_ENTER_DOOR ; 1f + const SFX_SWITCH_POKEMON ; 20 + const SFX_TALLY ; 21 + const SFX_TRANSACTION ; 22 + const SFX_EXIT_BUILDING ; 23 + const SFX_BUMP ; 24 + const SFX_SAVE ; 25 + const SFX_POKEFLUTE ; 26 + const SFX_ELEVATOR_END ; 27 + const SFX_THROW_BALL ; 28 + const SFX_BALL_POOF ; 29 + const SFX_FAINT ; 2a + const SFX_RUN ; 2b + const SFX_SLOT_MACHINE_START ; 2c + const SFX_FANFARE ; 2d + const SFX_PECK ; 2e + const SFX_KINESIS ; 2f + const SFX_LICK ; 30 + const SFX_POUND ; 31 + const SFX_MOVE_PUZZLE_PIECE ; 32 + const SFX_COMET_PUNCH ; 33 + const SFX_MEGA_PUNCH ; 34 + const SFX_SCRATCH ; 35 + const SFX_VICEGRIP ; 36 + const SFX_RAZOR_WIND ; 37 + const SFX_CUT ; 38 + const SFX_WING_ATTACK ; 39 + const SFX_WHIRLWIND ; 3a + const SFX_BIND ; 3b + const SFX_VINE_WHIP ; 3c + const SFX_DOUBLE_KICK ; 3d + const SFX_MEGA_KICK ; 3e + const SFX_HEADBUTT ; 3f + const SFX_HORN_ATTACK ; 40 + const SFX_TACKLE ; 41 + const SFX_POISON_STING ; 42 + const SFX_POWDER ; 43 + const SFX_DOUBLESLAP ; 44 + const SFX_BITE ; 45 + const SFX_JUMP_KICK ; 46 + const SFX_STOMP ; 47 + const SFX_TAIL_WHIP ; 48 + const SFX_KARATE_CHOP ; 49 + const SFX_SUBMISSION ; 4a + const SFX_WATER_GUN ; 4b + const SFX_SWORDS_DANCE ; 4c + const SFX_THUNDER ; 4d + const SFX_SUPERSONIC ; 4e + const SFX_LEER ; 4f + const SFX_EMBER ; 50 + const SFX_BUBBLEBEAM ; 51 + const SFX_HYDRO_PUMP ; 52 + const SFX_SURF ; 53 + const SFX_PSYBEAM ; 54 + const SFX_CHARGE ; 55 + const SFX_THUNDERSHOCK ; 56 + const SFX_PSYCHIC ; 57 + const SFX_SCREECH ; 58 + const SFX_BONE_CLUB ; 59 + const SFX_SHARPEN ; 5a + const SFX_EGG_BOMB ; 5b + const SFX_SING ; 5c + const SFX_HYPER_BEAM ; 5d + const SFX_SHINE ; 5e + const SFX_UNKNOWN_5F ; 5f + const SFX_UNKNOWN_60 ; 60 + const SFX_UNKNOWN_61 ; 61 + const SFX_SWITCH_POCKETS ; 62 + const SFX_UNKNOWN_63 ; 63 + const SFX_BURN ; 64 + const SFX_TITLE_SCREEN_ENTRANCE ; 65 + const SFX_UNKNOWN_66 ; 66 + const SFX_GET_COIN_FROM_SLOTS ; 67 + const SFX_PAY_DAY ; 68 + const SFX_METRONOME ; 69 + const SFX_CALL ; 6a + const SFX_HANG_UP ; 6b + const SFX_NO_SIGNAL ; 6c + const SFX_SANDSTORM ; 6d + const SFX_ELEVATOR ; 6e + const SFX_PROTECT ; 6f + const SFX_SKETCH ; 70 + const SFX_RAIN_DANCE ; 71 + const SFX_AEROBLAST ; 72 + const SFX_SPARK ; 73 + const SFX_CURSE ; 74 + const SFX_RAGE ; 75 + const SFX_THIEF ; 76 + const SFX_THIEF_2 ; 77 + const SFX_SPIDER_WEB ; 78 + const SFX_MIND_READER ; 79 + const SFX_NIGHTMARE ; 7a + const SFX_SNORE ; 7b + const SFX_SWEET_KISS ; 7c + const SFX_SWEET_KISS_2 ; 7d + const SFX_BELLY_DRUM ; 7e + const SFX_UNKNOWN_7F ; 7f + const SFX_SLUDGE_BOMB ; 80 + const SFX_FORESIGHT ; 81 + const SFX_SPITE ; 82 + const SFX_OUTRAGE ; 83 + const SFX_PERISH_SONG ; 84 + const SFX_GIGA_DRAIN ; 85 + const SFX_ATTRACT ; 86 + const SFX_KINESIS_2 ; 87 + const SFX_ZAP_CANNON ; 88 + const SFX_MEAN_LOOK ; 89 + const SFX_HEAL_BELL ; 8a + const SFX_RETURN ; 8b + const SFX_EXP_BAR ; 8c + const SFX_MILK_DRINK ; 8d + const SFX_PRESENT ; 8e + const SFX_MORNING_SUN ; 8f + const SFX_LEVEL_UP ; 90 + const SFX_KEY_ITEM ; 91 + const SFX_FANFARE_2 ; 92 + const SFX_REGISTER_PHONE_NUMBER ; 93 + const SFX_3RD_PLACE ; 94 + const SFX_GET_EGG_FROM_DAYCARE_MAN ; 95 + const SFX_GET_EGG_FROM_DAYCARE_LADY ; 96 + const SFX_MOVE_DELETED ; 97 + const SFX_2ND_PLACE ; 98 + const SFX_1ST_PLACE ; 99 + const SFX_CHOOSE_A_CARD ; 9a + const SFX_GET_TM ; 9b + const SFX_GET_BADGE ; 9c + const SFX_QUIT_SLOTS ; 9d + const SFX_EGG_CRACK ; 9e + const SFX_DEX_FANFARE_LESS_THAN_20 ; 9f + const SFX_DEX_FANFARE_140_169 ; a0 + const SFX_DEX_FANFARE_170_199 ; a1 + const SFX_DEX_FANFARE_200_229 ; a2 + const SFX_DEX_FANFARE_230_PLUS ; a3 + const SFX_EVOLVED ; a4 + const SFX_MASTER_BALL ; a5 + const SFX_EGG_HATCH ; a6 + const SFX_GS_INTRO_CHARIZARD_FIREBALL ; a7 + const SFX_GS_INTRO_POKEMON_APPEARS ; a8 + const SFX_FLASH ; a9 + const SFX_GAME_FREAK_LOGO_GS ; aa + const SFX_NOT_VERY_EFFECTIVE ; ab + const SFX_DAMAGE ; ac + const SFX_SUPER_EFFECTIVE ; ad + const SFX_BALL_BOUNCE ; ae + const SFX_MOONLIGHT ; af + const SFX_ENCORE ; b0 + const SFX_BEAT_UP ; b1 + const SFX_BATON_PASS ; b2 + const SFX_BALL_WIGGLE ; b3 + const SFX_SWEET_SCENT ; b4 + const SFX_SWEET_SCENT_2 ; b5 + const SFX_HIT_END_OF_EXP_BAR ; b6 + const SFX_GIVE_TRADEMON ; b7 + const SFX_GET_TRADEMON ; b8 + const SFX_TRAIN_ARRIVED ; b9 + const SFX_STOP_SLOT ; ba + const SFX_2_BOOPS ; bb + const SFX_GLASS_TING ; bc + const SFX_GLASS_TING_2 ; bd + + const SFX_INTRO_UNOWN_1 ; be + const SFX_INTRO_UNOWN_2 ; bf + const SFX_INTRO_UNOWN_3 ; c0 + const SFX_DITTO_POP_UP ; c1 + const SFX_DITTO_TRANSFORM ; c2 + const SFX_INTRO_SUICUNE_1 ; c3 + const SFX_INTRO_PICHU ; c4 + const SFX_INTRO_SUICUNE_2 ; c5 + const SFX_INTRO_SUICUNE_3 ; c6 + const SFX_DITTO_BOUNCE ; c7 + const SFX_INTRO_SUICUNE_4 ; c8 + const SFX_GAME_FREAK_PRESENTS ; c9 + const SFX_TINGLE ; ca + const SFX_UNKNOWN_CB ; cb + const SFX_TWO_PC_BEEPS ; cc + const SFX_4_NOTE_DITTY ; cd + const SFX_TWINKLE ; ce diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 70399052..541934b8 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -193,44 +193,44 @@ NUM_SPRITEHEADER_FIELDS EQU const_value ; sprite movement data table indices const_def - const SPRITEMOVEDATA_00 - const SPRITEMOVEDATA_ITEM_TREE - const SPRITEMOVEDATA_WANDER - const SPRITEMOVEDATA_SPINRANDOM_SLOW - const SPRITEMOVEDATA_WALK_UP_DOWN - const SPRITEMOVEDATA_WALK_LEFT_RIGHT - const SPRITEMOVEDATA_STANDING_DOWN - const SPRITEMOVEDATA_STANDING_UP - const SPRITEMOVEDATA_STANDING_LEFT - const SPRITEMOVEDATA_STANDING_RIGHT - const SPRITEMOVEDATA_SPINRANDOM_FAST - const SPRITEMOVEDATA_PLAYER - const SPRITEMOVEDATA_0C - const SPRITEMOVEDATA_0D - const SPRITEMOVEDATA_0E - const SPRITEMOVEDATA_0F - const SPRITEMOVEDATA_10 - const SPRITEMOVEDATA_11 - const SPRITEMOVEDATA_12 - const SPRITEMOVEDATA_FOLLOWING - const SPRITEMOVEDATA_SCRIPTED - const SPRITEMOVEDATA_SNORLAX - const SPRITEMOVEDATA_POKEMON - const SPRITEMOVEDATA_SUDOWOODO - const SPRITEMOVEDATA_SMASHABLE_ROCK - const SPRITEMOVEDATA_STRENGTH_BOULDER - const SPRITEMOVEDATA_FOLLOWNOTEXACT - const SPRITEMOVEDATA_SHADOW - const SPRITEMOVEDATA_EMOTE - const SPRITEMOVEDATA_SCREENSHAKE - const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE - const SPRITEMOVEDATA_SPINCLOCKWISE - const SPRITEMOVEDATA_20 - const SPRITEMOVEDATA_BIGDOLL - const SPRITEMOVEDATA_BOULDERDUST - const SPRITEMOVEDATA_GRASS - const SPRITEMOVEDATA_LAPRAS - const SPRITEMOVEDATA_25 + const SPRITEMOVEDATA_00 ; 00 + const SPRITEMOVEDATA_ITEM_TREE ; 01 + const SPRITEMOVEDATA_WANDER ; 02 + const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 + const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 + const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 + const SPRITEMOVEDATA_STANDING_DOWN ; 06 + const SPRITEMOVEDATA_STANDING_UP ; 07 + const SPRITEMOVEDATA_STANDING_LEFT ; 08 + const SPRITEMOVEDATA_STANDING_RIGHT ; 09 + const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a + const SPRITEMOVEDATA_PLAYER ; 0b + const SPRITEMOVEDATA_0C ; 0c + const SPRITEMOVEDATA_0D ; 0d + const SPRITEMOVEDATA_0E ; 0e + const SPRITEMOVEDATA_0F ; 0f + const SPRITEMOVEDATA_10 ; 10 + const SPRITEMOVEDATA_11 ; 11 + const SPRITEMOVEDATA_12 ; 12 + const SPRITEMOVEDATA_FOLLOWING ; 13 + const SPRITEMOVEDATA_SCRIPTED ; 14 + const SPRITEMOVEDATA_SNORLAX ; 15 + const SPRITEMOVEDATA_POKEMON ; 16 + const SPRITEMOVEDATA_SUDOWOODO ; 17 + const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 + const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 + const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a + const SPRITEMOVEDATA_SHADOW ; 1b + const SPRITEMOVEDATA_EMOTE ; 1c + const SPRITEMOVEDATA_SCREENSHAKE ; 1d + const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e + const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f + const SPRITEMOVEDATA_20 ; 20 + const SPRITEMOVEDATA_BIGDOLL ; 21 + const SPRITEMOVEDATA_BOULDERDUST ; 22 + const SPRITEMOVEDATA_GRASS ; 23 + const SPRITEMOVEDATA_LAPRAS ; 24 + const SPRITEMOVEDATA_25 ; 25 NUM_SPRITEMOVEDATA EQU const_value +- 1 SPRITEMOVEDATA_FIELDS EQU 6 @@ -349,22 +349,22 @@ MAX_OUTDOOR_SPRITES EQU 23 const FACING_1F const_def - const SPRITEANIMSTRUCT_INDEX ; 0 - const SPRITEANIMSTRUCT_FRAMESET_ID ; 1 - const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2 - const SPRITEANIMSTRUCT_TILE_ID ; 3 - const SPRITEANIMSTRUCT_XCOORD ; 4 - const SPRITEANIMSTRUCT_YCOORD ; 5 - const SPRITEANIMSTRUCT_XOFFSET ; 6 - const SPRITEANIMSTRUCT_YOFFSET ; 7 - const SPRITEANIMSTRUCT_DURATION ; 8 - const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9 - const SPRITEANIMSTRUCT_FRAME ; a - const SPRITEANIMSTRUCT_0B ; b - const SPRITEANIMSTRUCT_0C ; c - const SPRITEANIMSTRUCT_0D ; d - const SPRITEANIMSTRUCT_0E ; e - const SPRITEANIMSTRUCT_0F ; f + const SPRITEANIMSTRUCT_INDEX ; 0 + const SPRITEANIMSTRUCT_FRAMESET_ID ; 1 + const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2 + const SPRITEANIMSTRUCT_TILE_ID ; 3 + const SPRITEANIMSTRUCT_XCOORD ; 4 + const SPRITEANIMSTRUCT_YCOORD ; 5 + const SPRITEANIMSTRUCT_XOFFSET ; 6 + const SPRITEANIMSTRUCT_YOFFSET ; 7 + const SPRITEANIMSTRUCT_DURATION ; 8 + const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9 + const SPRITEANIMSTRUCT_FRAME ; a + const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b + const SPRITEANIMSTRUCT_0C ; c + const SPRITEANIMSTRUCT_0D ; d + const SPRITEANIMSTRUCT_0E ; e + const SPRITEANIMSTRUCT_0F ; f const_def const SPRITE_ANIM_FRAMESET_00 @@ -390,8 +390,8 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_FRAMESET_14 const SPRITE_ANIM_FRAMESET_15 const SPRITE_ANIM_FRAMESET_16 - const SPRITE_ANIM_FRAMESET_17 - const SPRITE_ANIM_FRAMESET_18 + const SPRITE_ANIM_FRAMESET_TRADEMON_ICON + const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE const SPRITE_ANIM_FRAMESET_19 const SPRITE_ANIM_FRAMESET_1A const SPRITE_ANIM_FRAMESET_1B @@ -453,7 +453,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_SEQ_0F const SPRITE_ANIM_SEQ_10 const SPRITE_ANIM_SEQ_11 - const SPRITE_ANIM_SEQ_12 + const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE const SPRITE_ANIM_SEQ_13 const SPRITE_ANIM_SEQ_14 const SPRITE_ANIM_SEQ_15 @@ -489,8 +489,8 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_INDEX_0E const SPRITE_ANIM_INDEX_0F const SPRITE_ANIM_INDEX_10 - const SPRITE_ANIM_INDEX_11 - const SPRITE_ANIM_INDEX_12 + const SPRITE_ANIM_INDEX_TRADEMON_ICON + const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE const SPRITE_ANIM_INDEX_13 const SPRITE_ANIM_INDEX_14 const SPRITE_ANIM_INDEX_15 @@ -517,3 +517,146 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_INDEX_2A const SPRITE_ANIM_INDEX_2B const SPRITE_ANIM_INDEX_2C + + const_def + + const SPRITE_ANIM_FRAME_IDX_00 + const SPRITE_ANIM_FRAME_IDX_01 + const SPRITE_ANIM_FRAME_IDX_02 + const SPRITE_ANIM_FRAME_IDX_03 + const SPRITE_ANIM_FRAME_IDX_04 + const SPRITE_ANIM_FRAME_IDX_05 + const SPRITE_ANIM_FRAME_IDX_06 + const SPRITE_ANIM_FRAME_IDX_07 + const SPRITE_ANIM_FRAME_IDX_08 + const SPRITE_ANIM_FRAME_IDX_09 + const SPRITE_ANIM_FRAME_IDX_0A + const SPRITE_ANIM_FRAME_IDX_0B + const SPRITE_ANIM_FRAME_IDX_0C + const SPRITE_ANIM_FRAME_IDX_0D + const SPRITE_ANIM_FRAME_IDX_0E + const SPRITE_ANIM_FRAME_IDX_0F + const SPRITE_ANIM_FRAME_IDX_10 + const SPRITE_ANIM_FRAME_IDX_11 + const SPRITE_ANIM_FRAME_IDX_12 + const SPRITE_ANIM_FRAME_IDX_13 + const SPRITE_ANIM_FRAME_IDX_14 + const SPRITE_ANIM_FRAME_IDX_15 + const SPRITE_ANIM_FRAME_IDX_16 + const SPRITE_ANIM_FRAME_IDX_17 + const SPRITE_ANIM_FRAME_IDX_18 + const SPRITE_ANIM_FRAME_IDX_19 + const SPRITE_ANIM_FRAME_IDX_1A + const SPRITE_ANIM_FRAME_IDX_1B + const SPRITE_ANIM_FRAME_IDX_1C + const SPRITE_ANIM_FRAME_IDX_1D + const SPRITE_ANIM_FRAME_IDX_1E + const SPRITE_ANIM_FRAME_IDX_1F + const SPRITE_ANIM_FRAME_IDX_20 + const SPRITE_ANIM_FRAME_IDX_21 + const SPRITE_ANIM_FRAME_IDX_22 + const SPRITE_ANIM_FRAME_IDX_23 + const SPRITE_ANIM_FRAME_IDX_24 + const SPRITE_ANIM_FRAME_IDX_25 + const SPRITE_ANIM_FRAME_IDX_26 + const SPRITE_ANIM_FRAME_IDX_27 + const SPRITE_ANIM_FRAME_IDX_28 + const SPRITE_ANIM_FRAME_IDX_29 + const SPRITE_ANIM_FRAME_IDX_2A + const SPRITE_ANIM_FRAME_IDX_2B + const SPRITE_ANIM_FRAME_IDX_2C + const SPRITE_ANIM_FRAME_IDX_2D + const SPRITE_ANIM_FRAME_IDX_2E + const SPRITE_ANIM_FRAME_IDX_2F + const SPRITE_ANIM_FRAME_IDX_30 + const SPRITE_ANIM_FRAME_IDX_31 + const SPRITE_ANIM_FRAME_IDX_32 + const SPRITE_ANIM_FRAME_IDX_33 + const SPRITE_ANIM_FRAME_IDX_34 + const SPRITE_ANIM_FRAME_IDX_35 + const SPRITE_ANIM_FRAME_IDX_36 + const SPRITE_ANIM_FRAME_IDX_37 + const SPRITE_ANIM_FRAME_IDX_38 + const SPRITE_ANIM_FRAME_IDX_39 + const SPRITE_ANIM_FRAME_IDX_3A + const SPRITE_ANIM_FRAME_IDX_3B + const SPRITE_ANIM_FRAME_IDX_3C + const SPRITE_ANIM_FRAME_IDX_3D + const SPRITE_ANIM_FRAME_IDX_3E + const SPRITE_ANIM_FRAME_IDX_3F + const SPRITE_ANIM_FRAME_IDX_40 + const SPRITE_ANIM_FRAME_IDX_41 + const SPRITE_ANIM_FRAME_IDX_42 + const SPRITE_ANIM_FRAME_IDX_43 + const SPRITE_ANIM_FRAME_IDX_44 + const SPRITE_ANIM_FRAME_IDX_45 + const SPRITE_ANIM_FRAME_IDX_46 + const SPRITE_ANIM_FRAME_IDX_47 + const SPRITE_ANIM_FRAME_IDX_48 + const SPRITE_ANIM_FRAME_IDX_49 + const SPRITE_ANIM_FRAME_IDX_4A + const SPRITE_ANIM_FRAME_IDX_4B + const SPRITE_ANIM_FRAME_IDX_4C + const SPRITE_ANIM_FRAME_IDX_4D + const SPRITE_ANIM_FRAME_IDX_4E + const SPRITE_ANIM_FRAME_IDX_4F + const SPRITE_ANIM_FRAME_IDX_50 + const SPRITE_ANIM_FRAME_IDX_51 + const SPRITE_ANIM_FRAME_IDX_52 + const SPRITE_ANIM_FRAME_IDX_53 + const SPRITE_ANIM_FRAME_IDX_54 + const SPRITE_ANIM_FRAME_IDX_55 + const SPRITE_ANIM_FRAME_IDX_56 + const SPRITE_ANIM_FRAME_IDX_57 + const SPRITE_ANIM_FRAME_IDX_58 + const SPRITE_ANIM_FRAME_IDX_59 + const SPRITE_ANIM_FRAME_IDX_5A + const SPRITE_ANIM_FRAME_IDX_5B + const SPRITE_ANIM_FRAME_IDX_5C + const SPRITE_ANIM_FRAME_IDX_5D + const SPRITE_ANIM_FRAME_IDX_5E + const SPRITE_ANIM_FRAME_IDX_5F + const SPRITE_ANIM_FRAME_IDX_60 + const SPRITE_ANIM_FRAME_IDX_61 + const SPRITE_ANIM_FRAME_IDX_62 + const SPRITE_ANIM_FRAME_IDX_63 + const SPRITE_ANIM_FRAME_IDX_64 + const SPRITE_ANIM_FRAME_IDX_65 + const SPRITE_ANIM_FRAME_IDX_66 + const SPRITE_ANIM_FRAME_IDX_67 + const SPRITE_ANIM_FRAME_IDX_68 + const SPRITE_ANIM_FRAME_IDX_69 + const SPRITE_ANIM_FRAME_IDX_6A + const SPRITE_ANIM_FRAME_IDX_6B + const SPRITE_ANIM_FRAME_IDX_6C + const SPRITE_ANIM_FRAME_IDX_6D + const SPRITE_ANIM_FRAME_IDX_6E + const SPRITE_ANIM_FRAME_IDX_6F + const SPRITE_ANIM_FRAME_IDX_70 + const SPRITE_ANIM_FRAME_IDX_71 + const SPRITE_ANIM_FRAME_IDX_72 + const SPRITE_ANIM_FRAME_IDX_73 + const SPRITE_ANIM_FRAME_IDX_74 + const SPRITE_ANIM_FRAME_IDX_75 + const SPRITE_ANIM_FRAME_IDX_76 + const SPRITE_ANIM_FRAME_IDX_77 + const SPRITE_ANIM_FRAME_IDX_78 + const SPRITE_ANIM_FRAME_IDX_79 + const SPRITE_ANIM_FRAME_IDX_7A + const SPRITE_ANIM_FRAME_IDX_7B + const SPRITE_ANIM_FRAME_IDX_7C + const SPRITE_ANIM_FRAME_IDX_7D + const SPRITE_ANIM_FRAME_IDX_7E + const SPRITE_ANIM_FRAME_IDX_7F + const SPRITE_ANIM_FRAME_IDX_80 + const SPRITE_ANIM_FRAME_IDX_81 + const SPRITE_ANIM_FRAME_IDX_82 + const SPRITE_ANIM_FRAME_IDX_83 + const SPRITE_ANIM_FRAME_IDX_84 + const SPRITE_ANIM_FRAME_IDX_85 + const SPRITE_ANIM_FRAME_IDX_86 + const SPRITE_ANIM_FRAME_IDX_87 + const SPRITE_ANIM_FRAME_IDX_88 + const SPRITE_ANIM_FRAME_IDX_89 + const SPRITE_ANIM_FRAME_IDX_8A + const SPRITE_ANIM_FRAME_IDX_8B diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm index e64d042d..9307a22a 100644 --- a/constants/tilemap_constants.asm +++ b/constants/tilemap_constants.asm @@ -36,8 +36,18 @@ const_value SET 1 const TILESET_ICE_PATH ; 1d const TILESET_WHIRL_ISLANDS ; 1e const TILESET_ILEX_FOREST ; 1f - const TILESET_20 ; 20 + const TILESET_32 ; 20 const TILESET_HO_OH_WORD_ROOM ; 21 const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_AERODACTYL_WORD_ROOM ; 24 + + const_def + const PAL_BG_GRAY + const PAL_BG_RED + const PAL_BG_GREEN + const PAL_BG_WATER + const PAL_BG_YELLOW + const PAL_BG_BROWN + const PAL_BG_ROOF + const PAL_BG_TEXT diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 06a26334..74b1e341 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -7,7 +7,7 @@ CHRIS EQU __enum__ const PHONECONTACT_BILL const PHONECONTACT_ELM const PHONECONTACT_BUENA - + KRIS EQU __enum__ trainerclass FALKNER ; 1 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index f7486fc8..09d457f5 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -3,7 +3,7 @@ PARTYMON EQU 0 OTPARTYMON EQU 1 BOXMON EQU 2 -BREEDMON EQU 3 +TEMPMON EQU 3 WILDMON EQU 4 ; Options: ; cfcc @@ -1,4 +1,4 @@ -INCLUDE "constants.asm" +INCLUDE "includes.asm" ; rst vectors INCLUDE "rst.asm" @@ -25,9 +25,11 @@ INCLUDE "home/copy.asm" INCLUDE "home/text.asm" INCLUDE "home/video.asm" INCLUDE "home/map_objects.asm" +INCLUDE "home/sine.asm" +INCLUDE "home/movement.asm" -Function19ac:: - dr $19ac, $1eb3 +SetMenuAttributes:: ; 1a4e + dr $1a4e, $1eb3 PrinterReceive:: dr $1eb3, $1ebf diff --git a/home/movement.asm b/home/movement.asm index f962c831..c15b6aa5 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -1,117 +1,103 @@ -InitMovementBuffer:: ; 1b1e +InitMovementBuffer:: ld [wMovementBufferPerson], a xor a ld [wMovementBufferCount], a - ld a, $0 ; useless - ld [wd004], a - ld a, $7 - ld [wd005], a - ld a, $d0 - ld [wd006], a + ld a, $0 + ld [wceef], a + ld a, wMovementBuffer % $100 + ld [wcef0], a + ld a, wMovementBuffer / $100 + ld [wcef1], a ret -; 1b35 -DecrementMovementBufferCount:: ; 1b35 +DecrementMovementBufferCount:: ld a, [wMovementBufferCount] and a ret z dec a ld [wMovementBufferCount], a ret -; 1b3f -AppendToMovementBuffer:: ; 1b3f +AppendToMovementBuffer:: ; 19dc (0:19dc) push hl push de ld hl, wMovementBufferCount ld e, [hl] inc [hl] - ld d, 0 - ld hl, MovementBuffer + ld d, $0 + ld hl, wMovementBuffer add hl, de ld [hl], a pop de pop hl ret -; 1b50 -AppendToMovementBufferNTimes:: ; 1b50 +AppendToMovementBufferNTimes:: ; 19ed (0:19ed) push af ld a, c and a - jr nz, .okay + jr nz, .asm_19f4 pop af ret -.okay +.asm_19f4 pop af -.loop +.asm_19f5 call AppendToMovementBuffer dec c - jr nz, .loop + jr nz, .asm_19f5 ret -; 1b5f -ComputePathToWalkToPlayer:: ; 1b5f +ComputePathToWalkToPlayer:: push af -; compare x coords, load left/right into h, and x distance into d ld a, b sub d - ld h, LEFT - jr nc, .got_x_distance + ld h, $2 + jr nc, .asm_1a07 dec a cpl - ld h, RIGHT - -.got_x_distance + ld h, $3 +.asm_1a07 ld d, a -; compare y coords, load up/down into l, and y distance into e ld a, c sub e - ld l, UP - jr nc, .got_y_distance + ld l, $1 + jr nc, .asm_1a12 dec a cpl - ld l, DOWN - -.got_y_distance + ld l, $0 +.asm_1a12 ld e, a -; if the x distance is less than the y distance, swap h and l, and swap d and e cp d - jr nc, .done + jr nc, .asm_1a1c ld a, h ld h, l ld l, a ld a, d ld d, e ld e, a - -.done +.asm_1a1c pop af ld b, a -; Add movement in the longer direction first... ld a, h - call .GetMovementData + call WalkToPlayer_GetMovementByte ld c, d call AppendToMovementBufferNTimes -; ... then add the shorter direction. ld a, l - call .GetMovementData + call WalkToPlayer_GetMovementByte ld c, e call AppendToMovementBufferNTimes ret -; 1b92 -.GetMovementData: ; 1b92 +WalkToPlayer_GetMovementByte:: ; 1a2f (0:1a2f) push de push hl ld l, b - ld h, 0 -rept 2 + ld h, $0 + add hl, hl add hl, hl -endr ld e, a - ld d, 0 + ld d, $0 add hl, de ld de, .MovementData add hl, de @@ -119,90 +105,17 @@ endr pop hl pop de ret -; 1ba5 - -.MovementData - slow_step_down - slow_step_up - slow_step_left - slow_step_right - step_down - step_up - step_left - step_right - big_step_down - big_step_up - big_step_left - big_step_right -; 1bb1 - -SetMenuAttributes:: ; 1bb1 - push hl - push bc - ld hl, w2DMenuCursorInitY - ld b, $8 -.loop - ld a, [de] - inc de - ld [hli], a - dec b - jr nz, .loop - ld a, $1 -rept 2 - ld [hli], a -endr - xor a -rept 3 - ld [hli], a -endr - pop bc - pop hl - ret -; 1bc9 - -StaticMenuJoypad:: ; 1bc9 - callab _StaticMenuJoypad - call GetMenuJoypad - ret -; 1bd3 - -ScrollingMenuJoypad:: ; 1bd3 - callab _ScrollingMenuJoypad - call GetMenuJoypad - ret -; 1bdd - -GetMenuJoypad:: ; 1bdd - push bc - push af - ld a, [hJoyLast] - and D_PAD - ld b, a - ld a, [hJoyPressed] - and BUTTONS - or b - ld b, a - pop af - ld a, b - pop bc - ret -; 1bee - -PlaceHollowCursor:: ; 1bee - ld hl, wCursorCurrentTile - ld a, [hli] - ld h, [hl] - ld l, a - ld [hl], "▷" - ret -; 1bf7 - -HideCursor:: ; 1bf7 - ld hl, wCursorCurrentTile - ld a, [hli] - ld h, [hl] - ld l, a - ld [hl], " " - ret -; 1c00 +.MovementData: + slow_step DOWN + slow_step UP + slow_step LEFT + slow_step RIGHT + step DOWN + step UP + step LEFT + step RIGHT + big_step DOWN + big_step UP + big_step LEFT + big_step RIGHT diff --git a/home/sine.asm b/home/sine.asm index e1552db2..5965d497 100644 --- a/home/sine.asm +++ b/home/sine.asm @@ -1,21 +1,6 @@ -Cosine:: ; 1b0f -; Return d * cos(a) in hl - add $10 ; 90 degrees - -Sine:: ; 1b11 -; Return d * sin(a) in hl -; a is a signed 6-bit value. - +Cosine:: ; 19ac (0:19ac) + add $10 +Sine:: ld e, a - - ld a, [hROMBank] - push af - ld a, BANK(_Sine) - rst Bankswitch - - call _Sine - - pop af - rst Bankswitch + homecall Sine_e ret -; 1b1e diff --git a/includes.asm b/includes.asm new file mode 100644 index 00000000..456623d9 --- /dev/null +++ b/includes.asm @@ -0,0 +1,2 @@ +INCLUDE "contents.asm" +INCLUDE "constants.asm" @@ -15,14 +15,14 @@ INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" INCLUDE "macros/trainer.asm" INCLUDE "macros/trade_anim.asm" -INCLUDE "macros/wram.asm" +INCLUDE "macros/pals.asm" -dr: MACRO +dr: macro IF DEF(GOLD) -INCBIN "baserom-gold.gbc", \1, \2 - \1 +INCBIN "baserom-gold.gbc", \1, \2 +- \1 ELSE IF DEF(SILVER) -INCBIN "baserom-silver.gbc", \1, \2 - \1 +INCBIN "baserom-silver.gbc", \1, \2 +- \1 ENDC ENDC ENDM @@ -123,7 +123,7 @@ coord: MACRO endc ENDM -dwCoord: MACRO +dwcoord: MACRO rept _NARG / 2 dw wTileMap + SCREEN_WIDTH * (\2) + (\1) shift @@ -150,7 +150,14 @@ aCoord: MACRO ; pic animations frame: MACRO db \1 - db \2 +x = \2 +IF _NARG > 2 +rept _NARG +- 2 +x = x | (1 << (\3 + 1)) + shift +endr +endc + db x ENDM setrepeat: MACRO db $fe @@ -165,6 +172,12 @@ endanim: MACRO ENDM +delanim: MACRO + db $fc + ENDM +dorestart: MACRO + db $fe + ENDM sine_wave: MACRO ; \1: amplitude @@ -254,9 +267,9 @@ debgcoord EQUS "bgcoord de," bcbgcoord EQUS "bgcoord bc," bgrows EQUS "* $20" -palred EQUS "$0400 *" +palred EQUS "$0001 *" palgreen EQUS "$0020 *" -palblue EQUS "$0001 *" +palblue EQUS "$0400 *" dsprite: MACRO ; conditional segment is there because not every instance of @@ -281,3 +294,33 @@ jumptable: MACRO jp [hl] endm +maskbits: macro +; returns to x +; usage in rejection sampling +; .loop +; call Random +; maskbits 30 +; and x +; cp 30 +; jr nc, .loop + +x = 1 +rept 8 +IF \1 > x +x = (x + 1) * 2 +- 1 +ENDC +endr +endm + +homecall: MACRO + ld a, [hROMBank] + push af + ld a, BANK(\1) + rst Bankswitch + + call \1 + + pop af + rst Bankswitch +ENDM + diff --git a/macros/charmap.asm b/macros/charmap.asm index 9eee57a0..44592293 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -191,6 +191,7 @@ charmap "ビ", $1a charmap "ブ", $1b charmap "ボ", $1c +; charmap "ベ", $1d charmap "が", $26 charmap "ぎ", $27 @@ -273,11 +274,13 @@ charmap "ュ", $ae charmap "ョ", $af charmap "ィ", $b0 + charmap "あ", $b1 charmap "い", $b2 charmap "う", $b3 charmap "え", $b4 charmap "お", $b5 + charmap "か", $b6 charmap "き", $b7 charmap "く", $b8 @@ -303,6 +306,7 @@ charmap "ふ", $cc charmap "へ", $cd charmap "ほ", $ce + charmap "ま", $cf charmap "み", $d0 charmap "む", $d1 @@ -323,6 +327,10 @@ charmap "ゃ", $e0 charmap "ゅ", $e1 charmap "ょ", $e2 + charmap "ー", $e3 + charmap "ﾟ", $e4 + charmap "ﾞ", $e5 + charmap "ァ", $e9 diff --git a/macros/move_anim.asm b/macros/move_anim.asm index 05faf253..c795f561 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/move_effect.asm b/macros/move_effect.asm index d25db45b..d3761c9a 100644 --- a/macros/move_effect.asm +++ b/macros/move_effect.asm @@ -5,181 +5,181 @@ endm enum_start 1 - command checkturn - command checkobedience - command usedmovetext - command doturn - command critical - command damagestats - command stab - command damagevariation - command checkhit - command lowersub - command hittargetnosub - command raisesub - command failuretext - command checkfaint - command criticaltext - command supereffectivetext - command checkdestinybond - command buildopponentrage - command poisontarget - command sleeptarget - command draintarget - command eatdream - command burntarget - command freezetarget - command paralyzetarget - command selfdestruct - command mirrormove - command statup - command statdown - command payday - command conversion - command resetstats - command storeenergy - command unleashenergy - command forceswitch - command endloop - command flinchtarget - command ohko - command recoil - command mist - command focusenergy - command confuse - command confusetarget - command heal - command transform - command screen - command poison - command paralyze - command substitute - command rechargenextturn - command mimic - command metronome - command leechseed - command splash - command disable - command cleartext - command charge - command checkcharge - command traptarget - command effect0x3c - command rampage - command checkrampage - command constantdamage - command counter - command encore - command painsplit - command snore - command conversion2 - command lockon - command sketch - command defrostopponent - command sleeptalk - command destinybond - command spite - command falseswipe - command healbell - command kingsrock - command triplekick - command kickcounter - command thief - command arenatrap - command nightmare - command defrost - command curse - command protect - command spikes - command foresight - command perishsong - command startsandstorm - command endure - command checkcurl - command rolloutpower - command effect0x5d - command furycutter - command attract - command happinesspower - command present - command damagecalc - command frustrationpower - command safeguard - command checksafeguard - command getmagnitude - command batonpass - command pursuit - command clearhazards - command healmorn - command healday - command healnite - command hiddenpower - command startrain - command startsun - command attackup - command defenseup - command speedup - command specialattackup - command specialdefenseup - command accuracyup - command evasionup - command attackup2 - command defenseup2 - command speedup2 - command specialattackup2 - command specialdefenseup2 - command accuracyup2 - command evasionup2 - command attackdown - command defensedown - command speeddown - command specialattackdown - command specialdefensedown - command accuracydown - command evasiondown - command attackdown2 - command defensedown2 - command speeddown2 - command specialattackdown2 - command specialdefensedown2 - command accuracydown2 - command evasiondown2 - command statupmessage - command statdownmessage - command statupfailtext - command statdownfailtext - command effectchance - command statdownanim - command statupanim - command switchturn - command fakeout - command bellydrum - command psychup - command rage - command doubleflyingdamage - command doubleundergrounddamage - command mirrorcoat - command checkfuturesight - command futuresight - command doubleminimizedamage - command skipsuncharge - command thunderaccuracy - command teleport - command beatup - command ragedamage - command resettypematchup - command allstatsup - command effect0xa5 - command raisesubnoanim - command lowersubnoanim - command effect0xa8 - command clearmissdamage - command movedelay - command hittarget - command tristatuschance - command supereffectivelooptext - command startloop - command curl + command checkturn ; 01 + command checkobedience ; 02 + command usedmovetext ; 03 + command doturn ; 04 + command critical ; 05 + command damagestats ; 06 + command stab ; 07 + command damagevariation ; 08 + command checkhit ; 09 + command lowersub ; 0a + command hittargetnosub ; 0b + command raisesub ; 0c + command failuretext ; 0d + command checkfaint ; 0e + command criticaltext ; 0f + command supereffectivetext ; 10 + command checkdestinybond ; 11 + command buildopponentrage ; 12 + command poisontarget ; 13 + command sleeptarget ; 14 + command draintarget ; 15 + command eatdream ; 16 + command burntarget ; 17 + command freezetarget ; 18 + command paralyzetarget ; 19 + command selfdestruct ; 1a + command mirrormove ; 1b + command statup ; 1c + command statdown ; 1d + command payday ; 1e + command conversion ; 1f + command resetstats ; 20 + command storeenergy ; 21 + command unleashenergy ; 22 + command forceswitch ; 23 + command endloop ; 24 + command flinchtarget ; 25 + command ohko ; 26 + command recoil ; 27 + command mist ; 28 + command focusenergy ; 29 + command confuse ; 2a + command confusetarget ; 2b + command heal ; 2c + command transform ; 2d + command screen ; 2e + command poison ; 2f + command paralyze ; 30 + command substitute ; 31 + command rechargenextturn ; 32 + command mimic ; 33 + command metronome ; 34 + command leechseed ; 35 + command splash ; 36 + command disable ; 37 + command cleartext ; 38 + command charge ; 39 + command checkcharge ; 3a + command traptarget ; 3b + command effect0x3c ; 3c + command rampage ; 3d + command checkrampage ; 3e + command constantdamage ; 3f + command counter ; 40 + command encore ; 41 + command painsplit ; 42 + command snore ; 43 + command conversion2 ; 44 + command lockon ; 45 + command sketch ; 46 + command defrostopponent ; 47 + command sleeptalk ; 48 + command destinybond ; 49 + command spite ; 4a + command falseswipe ; 4b + command healbell ; 4c + command kingsrock ; 4d + command triplekick ; 4e + command kickcounter ; 4f + command thief ; 50 + command arenatrap ; 51 + command nightmare ; 52 + command defrost ; 53 + command curse ; 54 + command protect ; 55 + command spikes ; 56 + command foresight ; 57 + command perishsong ; 58 + command startsandstorm ; 59 + command endure ; 5a + command checkcurl ; 5b + command rolloutpower ; 5c + command effect0x5d ; 5d + command furycutter ; 5e + command attract ; 5f + command happinesspower ; 60 + command present ; 61 + command damagecalc ; 62 + command frustrationpower ; 63 + command safeguard ; 64 + command checksafeguard ; 65 + command getmagnitude ; 66 + command batonpass ; 67 + command pursuit ; 68 + command clearhazards ; 69 + command healmorn ; 6a + command healday ; 6b + command healnite ; 6c + command hiddenpower ; 6d + command startrain ; 6e + command startsun ; 6f + command attackup ; 70 + command defenseup ; 71 + command speedup ; 72 + command specialattackup ; 73 + command specialdefenseup ; 74 + command accuracyup ; 75 + command evasionup ; 76 + command attackup2 ; 77 + command defenseup2 ; 78 + command speedup2 ; 79 + command specialattackup2 ; 7a + command specialdefenseup2 ; 7b + command accuracyup2 ; 7c + command evasionup2 ; 7d + command attackdown ; 7e + command defensedown ; 7f + command speeddown ; 80 + command specialattackdown ; 81 + command specialdefensedown ; 82 + command accuracydown ; 83 + command evasiondown ; 84 + command attackdown2 ; 85 + command defensedown2 ; 86 + command speeddown2 ; 87 + command specialattackdown2 ; 88 + command specialdefensedown2 ; 89 + command accuracydown2 ; 8a + command evasiondown2 ; 8b + command statupmessage ; 8c + command statdownmessage ; 8d + command statupfailtext ; 8e + command statdownfailtext ; 8f + command effectchance ; 90 + command statdownanim ; 91 + command statupanim ; 92 + command switchturn ; 93 + command fakeout ; 94 + command bellydrum ; 95 + command psychup ; 96 + command rage ; 97 + command doubleflyingdamage ; 98 + command doubleundergrounddamage ; 99 + command mirrorcoat ; 9a + command checkfuturesight ; 9b + command futuresight ; 9c + command doubleminimizedamage ; 9d + command skipsuncharge ; 9e + command thunderaccuracy ; 9f + command teleport ; a0 + command beatup ; a1 + command ragedamage ; a2 + command resettypematchup ; a3 + command allstatsup ; a4 + command effect0xa5 ; a5 + command raisesubnoanim ; a6 + command lowersubnoanim ; a7 + command effect0xa8 ; a8 + command clearmissdamage ; a9 + command movedelay ; aa + command hittarget ; ab + command tristatuschance ; ac + command supereffectivelooptext ; ad + command startloop ; ae + command curl ; af enum_start -1, -1 command endmove diff --git a/macros/movement.asm b/macros/movement.asm index fd4852e8..49d95f82 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -1,288 +1,115 @@ enum_start - enum movement_turn_head_down -turn_head_down: macro - db movement_turn_head_down ; $00 + enum movement_turn_head +turn_head: macro + db movement_turn_head | \1 ; $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 +__enum__ SET $4 - enum movement_slow_slide_step_right -slow_slide_step_right: macro - db movement_slow_slide_step_right ; $17 + enum movement_turn_step +turn_step: macro + db movement_turn_step | \1 ; $04 endm - enum movement_slide_step_down -slide_step_down: macro - db movement_slide_step_down ; $18 - endm - - enum movement_slide_step_up -slide_step_up: macro - db movement_slide_step_up ; $19 - endm +__enum__ SET $8 - enum movement_slide_step_left -slide_step_left: macro - db movement_slide_step_left ; $1a + enum movement_slow_step +slow_step: macro + db movement_slow_step | \1; $08 endm - enum movement_slide_step_right -slide_step_right: macro - db movement_slide_step_right ; $1b - endm - - enum movement_fast_slide_step_down -fast_slide_step_down: macro - db movement_fast_slide_step_down ; $1c - endm +__enum__ SET $c - 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 movement_fast_slide_step_right -fast_slide_step_right: macro - db movement_fast_slide_step_right ; $1f - endm - - enum movement_turn_away_down -turn_away_down: macro - db movement_turn_away_down ; $20 - endm +__enum__ SET $10 - enum movement_turn_away_up -turn_away_up: macro - db movement_turn_away_up ; $21 + enum movement_big_step +big_step: macro + db movement_big_step | \1 ; $10 endm - enum movement_turn_away_left -turn_away_left: macro - db movement_turn_away_left ; $22 - endm +__enum__ SET $14 - enum movement_turn_away_right -turn_away_right: macro - db movement_turn_away_right ; $23 + enum movement_slow_slide_step +slow_slide_step: macro + db movement_slow_slide_step | \1 ; $14 endm - enum movement_turn_in_down -turn_in_down: macro - db movement_turn_in_down ; $24 - endm +__enum__ SET $18 - enum movement_turn_in_up -turn_in_up: macro - db movement_turn_in_up ; $25 + enum movement_slide_step +slide_step: macro + db movement_slide_step | \1 ; $18 endm - enum movement_turn_in_left -turn_in_left: macro - db movement_turn_in_left ; $26 - endm +__enum__ SET $1c - enum movement_turn_in_right -turn_in_right: macro - db movement_turn_in_right ; $27 + enum movement_fast_slide_step +fast_slide_step: macro + db movement_fast_slide_step | \1 ; $1c endm - enum movement_turn_waterfall_down -turn_waterfall_down: macro - db movement_turn_waterfall_down ; $28 - endm +__enum__ SET $20 - enum movement_turn_waterfall_up -turn_waterfall_up: macro - db movement_turn_waterfall_up ; $29 + enum movement_turn_away +turn_away: macro + db movement_turn_away | \1 ; $20 endm - enum movement_turn_waterfall_left -turn_waterfall_left: macro - db movement_turn_waterfall_left ; $2a - endm +__enum__ SET $24 - enum movement_turn_waterfall_right -turn_waterfall_right: macro - db movement_turn_waterfall_right ; $2b + enum movement_turn_in +turn_in: macro + db movement_turn_in | \1 ; $24 endm - enum movement_slow_jump_step_down -slow_jump_step_down: macro - db movement_slow_jump_step_down ; $2c - endm +__enum__ SET $28 - enum movement_slow_jump_step_up -slow_jump_step_up: macro - db movement_slow_jump_step_up ; $2d + enum movement_turn_waterfall +turn_waterfall: macro + db movement_turn_waterfall | \1 ; $28 endm - enum movement_slow_jump_step_left -slow_jump_step_left: macro - db movement_slow_jump_step_left ; $2e - endm +__enum__ SET $2c - enum movement_slow_jump_step_right -slow_jump_step_right: macro - db movement_slow_jump_step_right ; $2f + enum movement_slow_jump_step +slow_jump_step: macro + db movement_slow_jump_step | \1 ; $2c endm - enum movement_jump_step_down -jump_step_down: macro - db movement_jump_step_down ; $30 - endm +__enum__ SET $30 - enum movement_jump_step_up -jump_step_up: macro - db movement_jump_step_up ; $31 + enum movement_jump_step +jump_step: macro + db movement_jump_step | \1 ; $30 endm - enum movement_jump_step_left -jump_step_left: macro - db movement_jump_step_left ; $32 - endm +__enum__ SET $34 - 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 +; Control +__enum__ SET $38 - enum movement_fast_jump_step_up -fast_jump_step_up: macro - db movement_fast_jump_step_up ; $35 + enum movement_remove_sliding +remove_sliding: macro + db movement_remove_sliding ; $38 endm - enum movement_fast_jump_step_left -fast_jump_step_left: macro - db movement_fast_jump_step_left ; $36 + enum movement_set_sliding +set_sliding: macro + db movement_set_sliding ; $39 endm - enum movement_fast_jump_step_right -fast_jump_step_right: macro - db movement_fast_jump_step_right ; $37 - endm - -__enum__ = $3a - enum movement_remove_fixed_facing remove_fixed_facing: macro db movement_remove_fixed_facing ; $3a @@ -303,51 +130,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__ SET $47 enum movement_step_end step_end: macro @@ -425,7 +219,11 @@ step_shake: macro db \1 ; displacement endm -__enum__ = $57 + enum movement_tree_shake +tree_shake: macro + db movement_tree_shake + endm + enum movement_rock_smash rock_smash: macro db movement_rock_smash ; $57 diff --git a/macros/pals.asm b/macros/pals.asm new file mode 100755 index 00000000..44f1f794 --- /dev/null +++ b/macros/pals.asm @@ -0,0 +1,9 @@ +tilepal: MACRO +; vram bank, pals +x = \1 << 3 +rept (_NARG +- 1) / 2 + dn (x | PAL_BG_\3), (x | PAL_BG_\2) + shift + shift +endr +endm diff --git a/macros/rst.asm b/macros/rst.asm index cc79ccad..50259c96 100644 --- a/macros/rst.asm +++ b/macros/rst.asm @@ -15,13 +15,3 @@ callab: MACRO ; address, bank ld a, BANK(\1) rst FarCall ENDM - -homecall: macro - ld a, [hROMBank] - push af - ld a, BANK(\1) - rst Bankswitch - call \1 - pop af - rst Bankswitch - endm diff --git a/macros/sound.asm b/macros/sound.asm index 82ef6a31..a0eacc1e 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -15,7 +15,7 @@ noise: macro endm musicheader: macro - ; number of tracks, which track, address + ; number of tracks, track idx, address dbw ((\1 - 1) << 6) + (\2 - 1), \3 endm @@ -29,7 +29,7 @@ octave: macro db notetype_cmd - (\1) endm -notetype: macro ; d8 +notetype: macro db notetype_cmd db \1 ; note_length if _NARG >= 2 @@ -38,139 +38,138 @@ notetype: macro ; d8 endm enum forceoctave_cmd -forceoctave: macro ; d9 +forceoctave: macro db forceoctave_cmd db \1 ; octave endm enum tempo_cmd -tempo: macro ; da +tempo: macro db tempo_cmd bigdw \1 ; tempo endm enum dutycycle_cmd -dutycycle: macro ; db +dutycycle: macro db dutycycle_cmd db \1 ; duty_cycle endm enum intensity_cmd -intensity: macro ; dc +intensity: macro db intensity_cmd db \1 ; intensity endm enum soundinput_cmd -soundinput: macro ; dd +soundinput: macro db soundinput_cmd db \1 ; input endm - enum unknownmusic0xde_cmd -unknownmusic0xde: macro ; de - 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 -togglesfx: macro ; df +togglesfx: macro db togglesfx_cmd endm - enum unknownmusic0xe0_cmd -unknownmusic0xe0: macro ; e0 - db unknownmusic0xe0_cmd + enum slidepitchto_cmd +slidepitchto: macro + db slidepitchto_cmd db \1 ; unknown - ; db \2 ; unknown dn \2, \3 ; octave, pitch endm enum vibrato_cmd -vibrato: macro ; e1 +vibrato: macro db vibrato_cmd db \1 ; delay db \2 ; extent endm enum unknownmusic0xe2_cmd -unknownmusic0xe2: macro ; e2 +unknownmusic0xe2: macro db unknownmusic0xe2_cmd db \1 ; unknown endm enum togglenoise_cmd -togglenoise: macro ; e3 +togglenoise: macro db togglenoise_cmd db \1 ; id endm enum panning_cmd -panning: macro ; e4 +panning: macro db panning_cmd db \1 ; tracks endm enum volume_cmd -volume: macro ; e5 +volume: macro db volume_cmd db \1 ; volume endm enum tone_cmd -tone: macro ; e6 +tone: macro db tone_cmd bigdw \1 ; tone endm enum unknownmusic0xe7_cmd -unknownmusic0xe7: macro ; e7 +unknownmusic0xe7: macro db unknownmusic0xe7_cmd db \1 ; unknown endm enum unknownmusic0xe8_cmd -unknownmusic0xe8: macro ; e8 +unknownmusic0xe8: macro db unknownmusic0xe8_cmd db \1 ; unknown endm enum tempo_relative_cmd -tempo_relative: macro ; e9 +tempo_relative: macro db tempo_relative_cmd bigdw \1 ; value endm enum restartchannel_cmd -restartchannel: macro ; ea +restartchannel: macro db restartchannel_cmd dw \1 ; address endm enum newsong_cmd -newsong: macro ; eb +newsong: macro db newsong_cmd bigdw \1 ; id endm enum sfxpriorityon_cmd -sfxpriorityon: macro ; ec +sfxpriorityon: macro db sfxpriorityon_cmd endm enum sfxpriorityoff_cmd -sfxpriorityoff: macro ; ed +sfxpriorityoff: macro db sfxpriorityoff_cmd endm enum unknownmusic0xee_cmd -unknownmusic0xee: macro ; ee +unknownmusic0xee: macro db unknownmusic0xee_cmd dw \1 ; address endm enum stereopanning_cmd -stereopanning: macro ; ef +stereopanning: macro db stereopanning_cmd db \1 ; tracks endm @@ -246,19 +245,19 @@ jumpchannel: macro endm enum loopchannel_cmd -loopchannel: macro ; fd +loopchannel: macro db loopchannel_cmd db \1 ; count dw \2 ; address endm enum callchannel_cmd -callchannel: macro ; fe +callchannel: macro db callchannel_cmd dw \1 ; address endm enum endchannel_cmd -endchannel: macro ; ff +endchannel: macro db endchannel_cmd endm diff --git a/macros/text.asm b/macros/text.asm index 37ce72d9..cc7f609b 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -19,7 +19,7 @@ text_from_ram: MACRO db TX_RAM dw \1 ENDM - + enum TX_BCD text_bcd: macro db TX_BCD diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm index eeaf1589..c590cb62 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 @@ -167,7 +167,7 @@ endm ; Mobile enum_start 1 - + enum mobiletradeanim_showgivemon_command mobiletradeanim_showgivemon: macro db mobiletradeanim_showgivemon_command ; 01 @@ -1,4 +1,4 @@ -INCLUDE "constants.asm" +INCLUDE "includes.asm" SECTION "bank1", DATA, BANK[$1] PlaceWaitingText:: @@ -32,7 +32,9 @@ SwapTextboxPalettes:: ScrollBGMapPalettes:: dr $804f, $86d7 CopyObjectStruct_:: - dr $86d7, $9cfd + dr $86d7, $8ac9 +Sine_e:: + dr $8ac9, $9cfd InitCGBPals:: ; 9cfd dr $9cfd, $c000 @@ -1,4 +1,5 @@ -INCLUDE "constants.asm" +INCLUDE "includes.asm" +INCLUDE "macros/wram.asm" SECTION "Audio", WRAM0 wc000:: @@ -2201,12 +2202,20 @@ wVBlankOccurred:: ds 1 ; ceea wceeb:: ds 1 ; ceeb wceec:: ds 1 ; ceec + +wMovementBufferCount:: ; ceed wceed:: ds 1 ; ceed + +wMovementBufferPerson:: wceee:: ds 1 ; ceee + wceef:: ds 1 ; ceef wcef0:: ds 1 ; cef0 wcef1:: ds 1 ; cef1 + +wMovementBuffer:: wcef2:: ds 1 ; cef2 + wcef3:: ds 1 ; cef3 wcef4:: ds 1 ; cef4 wcef5:: ds 1 ; cef5 |