diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-07 08:13:08 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-07 08:13:08 -0400 |
commit | ca01a92880a5d71bce2bec6caa7714c8e1cf0f17 (patch) | |
tree | 44d1d4d16fd6785c68845839eac4b4c13780e05d | |
parent | b0e7d04ccfc19dfac96c703d56d7ef8e30938624 (diff) |
Fix indentation in many places
-rw-r--r-- | constants/animation_constants.asm | 936 | ||||
-rw-r--r-- | constants/sprite_constants.asm | 278 | ||||
-rwxr-xr-x | engine/move_mon.asm | 12 | ||||
-rwxr-xr-x | engine/startmenu.asm | 18 | ||||
-rw-r--r-- | home/decompress.asm | 2 | ||||
-rw-r--r-- | items/item_effects.asm | 2 | ||||
-rwxr-xr-x | misc/fixed_words.asm | 16 |
7 files changed, 632 insertions, 632 deletions
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index a938b963b..ea052aabb 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_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 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_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 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 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 53837880d..541934b83 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -521,142 +521,142 @@ MAX_OUTDOOR_SPRITES EQU 23 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 + 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/engine/move_mon.asm b/engine/move_mon.asm index 55a5b9201..e07237d68 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -266,15 +266,15 @@ endr ld [de], a inc de ld hl, EnemyMonStatus - ; Copy EnemyMonStatus + ; Copy EnemyMonStatus ld a, [hli] ld [de], a inc de - ; Copy EnemyMonUnused + ; Copy EnemyMonUnused ld a, [hli] ld [de], a inc de - ; Copy EnemyMonHP + ; Copy EnemyMonHP ld a, [hli] ld [de], a inc de @@ -452,8 +452,8 @@ SentGetPkmnIntoFromBox: ; db3f ld hl, wBreedMon1Species jr z, .breedmon - ; we want to sent a Pkmn into the Box - ; so check if there's enough space + ; we want to sent a Pkmn into the Box + ; so check if there's enough space ld hl, sBoxCount ld a, [hl] cp MONS_PER_BOX @@ -973,7 +973,7 @@ SentPkmnIntoBox: ; de6e ld [de], a inc de - ; Set all 5 Experience Values to 0 + ; Set all 5 Experience Values to 0 xor a ld b, 2 * 5 .loop2 diff --git a/engine/startmenu.asm b/engine/startmenu.asm index f03d661dd..bf71a0b8d 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -194,31 +194,31 @@ StartMenu:: ; 125cd .QuitString: db "QUIT@" .PokedexDesc: db "#MON" - next "database@" + next "database@" .PartyDesc: db "Party ", $4a - next "status@" + next "status@" .PackDesc: db "Contains" - next "items@" + next "items@" .PokegearDesc: db "Trainer's" - next "key device@" + next "key device@" .StatusDesc: db "Your own" - next "status@" + next "status@" .SaveDesc: db "Save your" - next "progress@" + next "progress@" .OptionDesc: db "Change" - next "settings@" + next "settings@" .ExitDesc: db "Close this" - next "menu@" + next "menu@" .QuitDesc: db "Quit and" - next "be judged.@" + next "be judged.@" .OpenMenu: ; 127e5 diff --git a/home/decompress.asm b/home/decompress.asm index 373e9fe89..216b861f6 100644 --- a/home/decompress.asm +++ b/home/decompress.asm @@ -99,7 +99,7 @@ LZ_LONG_HI EQU %00000011 add a ; << 3 add a - ; This is our new control code. + ; This is our new control code. and LZ_CMD push af diff --git a/items/item_effects.asm b/items/item_effects.asm index 21707e3e3..3c2dc2457 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2515,7 +2515,7 @@ Mysteryberry: ; f5bf ld [wd002], a .loop - ; Party Screen opens to choose on which Pkmn to use the Item + ; Party Screen opens to choose on which Pkmn to use the Item ld b, PARTYMENUACTION_HEALING_ITEM call UseItem_SelectMon jp c, PPRestoreItem_Cancel diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 5797343fc..703b5cf73 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -4267,14 +4267,14 @@ endm macro_11f220 69 ; 04: Battle macro_11f220 66 ; 05: Exclamations macro_11f220 66 ; 06: Conversation - macro_11f220 69 ; 07: Feelings - macro_11f220 66 ; 08: Conditions - macro_11f220 39 ; 09: Life - macro_11f220 39 ; 0a: Hobbies - macro_11f220 69 ; 0b: Actions - macro_11f220 39 ; 0c: Time - macro_11f220 66 ; 0d: Farewells - macro_11f220 36 ; 0e: ThisAndThat + macro_11f220 69 ; 07: Feelings + macro_11f220 66 ; 08: Conditions + macro_11f220 39 ; 09: Life + macro_11f220 39 ; 0a: Hobbies + macro_11f220 69 ; 0b: Actions + macro_11f220 39 ; 0c: Time + macro_11f220 66 ; 0d: Farewells + macro_11f220 36 ; 0e: ThisAndThat EZChat_SortedWords: ; Addresses in WRAM bank 3 where EZChat words beginning |