Skip to content

Commit

Permalink
Labeled framesets and related constants (#1063)
Browse files Browse the repository at this point in the history 
* Labeled Framesets and Constants Related

* Feedback Implemented with PascalCase and Constant Renames

* Fix framset.asm comment spacing

* `BATTLEANIMFRAMESET_35` to `BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA`

* Feedback applied and labeled 1E & B2

* Fixed SpinningBone

---------

Co-authored-by: vulcandth <vulcandth@gmail.com>
  • Loading branch information
@SoupPotato @vulcandth
SoupPotato and vulcandth committed Aug 22, 2023
1 parent 5db85ba commit 6180be3
Show file tree
Hide file tree
Showing 5 changed files with 798 additions and 798 deletions.
376 changes: 188 additions & 188 deletions constants/battle_anim_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture
const ANIM_OBJ_FROZEN
const ANIM_OBJ_MASTER_BALL_SPARKLE
const ANIM_OBJ_RECOVER
const ANIM_OBJ_THUNDER1
const ANIM_OBJ_THUNDER2
const ANIM_OBJ_THUNDER3
const ANIM_OBJ_THUNDER_CENTER
const ANIM_OBJ_THUNDER_LEFT
const ANIM_OBJ_THUNDER_RIGHT
const ANIM_OBJ_THUNDER_WAVE
const ANIM_OBJ_SPARKS_CIRCLE_BIG
const ANIM_OBJ_THUNDERBOLT_BALL
Expand Down Expand Up @@ -306,191 +306,191 @@ DEF NUM_BATTLEANIMFUNCS EQU const_value

; BattleAnimFrameData indexes (see data/battle_anims/framesets.asm)
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_HIT_BIG
const BATTLEANIMFRAMESET_HIT
const BATTLEANIMFRAMESET_HIT_SMALL
const BATTLEANIMFRAMESET_PUNCH
const BATTLEANIMFRAMESET_KICK
const BATTLEANIMFRAMESET_PALM
const BATTLEANIMFRAMESET_FANG
const BATTLEANIMFRAMESET_PUNCH_SHAKE
const BATTLEANIMFRAMESET_BALL_POOF
const BATTLEANIMFRAMESET_POKE_BALL_1
const BATTLEANIMFRAMESET_POKE_BALL_2
const BATTLEANIMFRAMESET_POKE_BALL_3
const BATTLEANIMFRAMESET_POKE_BALL_4
const BATTLEANIMFRAMESET_POKE_BALL_5
const BATTLEANIMFRAMESET_DRAGON_RAGE
const BATTLEANIMFRAMESET_FLAMETHROWER
const BATTLEANIMFRAMESET_EMBER
const BATTLEANIMFRAMESET_BURNED
const BATTLEANIMFRAMESET_BLIZZARD
const BATTLEANIMFRAMESET_ICE
const BATTLEANIMFRAMESET_ICE_BEAM
const BATTLEANIMFRAMESET_POWDER_SNOW
const BATTLEANIMFRAMESET_RAZOR_LEAF_1
const BATTLEANIMFRAMESET_RAZOR_LEAF_2
const BATTLEANIMFRAMESET_EXPLOSION
const BATTLEANIMFRAMESET_BIG_ROCK
const BATTLEANIMFRAMESET_SMALL_ROCK
const BATTLEANIMFRAMESET_STRENGTH
const BATTLEANIMFRAMESET_SKULL_CROSSBONE
const BATTLEANIMFRAMESET_ACID
const BATTLEANIMFRAMESET_POISON_DROPLET_UNUSED
const BATTLEANIMFRAMESET_SLUDGE_BUBBLE
const BATTLEANIMFRAMESET_SLUDGE_BUBBLE_BURST
const BATTLEANIMFRAMESET_SMALL_BUBBLE
const BATTLEANIMFRAMESET_PULSING_BUBBLE
const BATTLEANIMFRAMESET_SURF
const BATTLEANIMFRAMESET_MUSIC_NOTE_1
const BATTLEANIMFRAMESET_MUSIC_NOTE_2
const BATTLEANIMFRAMESET_MUSIC_NOTE_3
const BATTLEANIMFRAMESET_WATER_GUN_1
const BATTLEANIMFRAMESET_WATER_GUN_2
const BATTLEANIMFRAMESET_WATER_GUN_3
const BATTLEANIMFRAMESET_HYDRO_PUMP
const BATTLEANIMFRAMESET_POWDER
const BATTLEANIMFRAMESET_BEAM
const BATTLEANIMFRAMESET_BEAM_TIP
const BATTLEANIMFRAMESET_ICE_BUILDUP
const BATTLEANIMFRAMESET_FROZEN
const BATTLEANIMFRAMESET_CIRCLING_SPARKLE
const BATTLEANIMFRAMESET_THUNDER_CENTER
const BATTLEANIMFRAMESET_THUNDER_LEFT
const BATTLEANIMFRAMESET_THUNDER_RIGHT
const BATTLEANIMFRAMESET_THUNDER_WAVE_DISABLE
const BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA
const BATTLEANIMFRAMESET_THUNDERBOLT_SPARKS
const BATTLEANIMFRAMESET_THUNDERBOLT_CORE
const BATTLEANIMFRAMESET_THUNDERSHOCK_SPARKS
const BATTLEANIMFRAMESET_THUNDERSHOCK_CORE
const BATTLEANIMFRAMESET_CLAMP
const BATTLEANIMFRAMESET_CLAMP_FLIPPED
const BATTLEANIMFRAMESET_BITE_1
const BATTLEANIMFRAMESET_BITE_2
const BATTLEANIMFRAMESET_CUT_DOWN_LEFT
const BATTLEANIMFRAMESET_CUT_DOWN_RIGHT
const BATTLEANIMFRAMESET_CUT_UP_RIGHT
const BATTLEANIMFRAMESET_CUT_LONG_DOWN_LEFT
const BATTLEANIMFRAMESET_CUT_LONG_DOWN_RIGHT
const BATTLEANIMFRAMESET_CHARGE_ORB_1
const BATTLEANIMFRAMESET_ABSORB_CENTER
const BATTLEANIMFRAMESET_GUST
const BATTLEANIMFRAMESET_VINE_WHIP_1
const BATTLEANIMFRAMESET_VINE_WHIP_2
const BATTLEANIMFRAMESET_RAZOR_WIND_1
const BATTLEANIMFRAMESET_RAZOR_WIND_2
const BATTLEANIMFRAMESET_SONICBOOM_JP
const BATTLEANIMFRAMESET_WARP
const BATTLEANIMFRAMESET_CHARGE_ORB_2
const BATTLEANIMFRAMESET_EGG
const BATTLEANIMFRAMESET_EGG_WOBBLE
const BATTLEANIMFRAMESET_EGG_CRACKED_TOP
const BATTLEANIMFRAMESET_EGG_CRACKED_BOTTOM
const BATTLEANIMFRAMESET_FOCUS
const BATTLEANIMFRAMESET_BIND_1
const BATTLEANIMFRAMESET_BIND_2
const BATTLEANIMFRAMESET_BIND_3
const BATTLEANIMFRAMESET_BIND_4
const BATTLEANIMFRAMESET_LEECH_SEED_1
const BATTLEANIMFRAMESET_LEECH_SEED_2
const BATTLEANIMFRAMESET_LEECH_SEED_3
const BATTLEANIMFRAMESET_SOUND_1
const BATTLEANIMFRAMESET_SOUND_2
const BATTLEANIMFRAMESET_SOUND_3
const BATTLEANIMFRAMESET_WAVE
const BATTLEANIMFRAMESET_CONFUSE_RAY_1
const BATTLEANIMFRAMESET_CONFUSE_RAY_2
const BATTLEANIMFRAMESET_LEER
const BATTLEANIMFRAMESET_REFLECT
const BATTLEANIMFRAMESET_CHICK_1
const BATTLEANIMFRAMESET_CHICK_2
const BATTLEANIMFRAMESET_AMNESIA_1
const BATTLEANIMFRAMESET_AMNESIA_2
const BATTLEANIMFRAMESET_AMNESIA_3
const BATTLEANIMFRAMESET_ASLEEP
const BATTLEANIMFRAMESET_DIG_SAND
const BATTLEANIMFRAMESET_DIG_PILE
const BATTLEANIMFRAMESET_SAND
const BATTLEANIMFRAMESET_STRING_SHOT_1
const BATTLEANIMFRAMESET_STRING_SHOT_2
const BATTLEANIMFRAMESET_STRING_SHOT_3
const BATTLEANIMFRAMESET_PARALYZED
const BATTLEANIMFRAMESET_PARALYZED_FLIPPED
const BATTLEANIMFRAMESET_HAZE
const BATTLEANIMFRAMESET_MIST
const BATTLEANIMFRAMESET_HORN
const BATTLEANIMFRAMESET_NEEDLE
const BATTLEANIMFRAMESET_FLOWER
const BATTLEANIMFRAMESET_BARRAGE_BALL
const BATTLEANIMFRAMESET_PAY_DAY
const BATTLEANIMFRAMESET_HEART
const BATTLEANIMFRAMESET_SPINNING_BONE
const BATTLEANIMFRAMESET_STAR
const BATTLEANIMFRAMESET_SPOON
const BATTLEANIMFRAMESET_SPARKLE
const BATTLEANIMFRAMESET_SKY_ATTACK
const BATTLEANIMFRAMESET_LICK
const BATTLEANIMFRAMESET_WITHDRAW_SHELL
const BATTLEANIMFRAMESET_SHRINKING_CHARGE_ORB
const BATTLEANIMFRAMESET_CONVERSION
const BATTLEANIMFRAMESET_SWORD
const BATTLEANIMFRAMESET_SPEED_LINE_1
const BATTLEANIMFRAMESET_SPEED_LINE_2
const BATTLEANIMFRAMESET_SPEED_LINE_3
const BATTLEANIMFRAMESET_SEISMIC_TOSS
const BATTLEANIMFRAMESET_SHARPEN
const BATTLEANIMFRAMESET_DEFENSE_CURL
const BATTLEANIMFRAMESET_METRONOME_HAND
const BATTLEANIMFRAMESET_AGILITY
const BATTLEANIMFRAMESET_COTTON
const BATTLEANIMFRAMESET_MILK_BOTTLE
const BATTLEANIMFRAMESET_SPIKE
const BATTLEANIMFRAMESET_ANGER_VEIN
const BATTLEANIMFRAMESET_HEAL_BELL
const BATTLEANIMFRAMESET_BATON_PASS
const BATTLEANIMFRAMESET_LOCK_ON_1
const BATTLEANIMFRAMESET_LOCK_ON_2
const BATTLEANIMFRAMESET_LOCK_ON_3
const BATTLEANIMFRAMESET_LOCK_ON_4
const BATTLEANIMFRAMESET_MIND_READER_1
const BATTLEANIMFRAMESET_MIND_READER_2
const BATTLEANIMFRAMESET_MIND_READER_3
const BATTLEANIMFRAMESET_MIND_READER_4
const BATTLEANIMFRAMESET_SAFEGUARD
const BATTLEANIMFRAMESET_MEGAPHONE_UNUSED
const BATTLEANIMFRAMESET_ITEM_BAG
const BATTLEANIMFRAMESET_SPIDER_WEB
const BATTLEANIMFRAMESET_UNUSED_CAKE
const BATTLEANIMFRAMESET_IMP
const BATTLEANIMFRAMESET_IMP_FLIPPED
const BATTLEANIMFRAMESET_CHERUB
const BATTLEANIMFRAMESET_PENCIL
const BATTLEANIMFRAMESET_ENCORE_HAND
const BATTLEANIMFRAMESET_ENCORE_HAND_FLIPPED
const BATTLEANIMFRAMESET_DESTINY_BOND
const BATTLEANIMFRAMESET_MORNING_SUN
const BATTLEANIMFRAMESET_GLIMMER
const BATTLEANIMFRAMESET_MOONLIGHT
const BATTLEANIMFRAMESET_CROSS_CHOP_1
const BATTLEANIMFRAMESET_CROSS_CHOP_2
const BATTLEANIMFRAMESET_ZAP_CANNON
const BATTLEANIMFRAMESET_CURSE_NAIL
const BATTLEANIMFRAMESET_FORESIGHT_SHINE
const BATTLEANIMFRAMESET_RAPID_SPIN
const BATTLEANIMFRAMESET_SWAGGER
const BATTLEANIMFRAMESET_MEAN_LOOK
const BATTLEANIMFRAMESET_UPSIDE_DOWN_PUNCH
const BATTLEANIMFRAMESET_GROWING_SPARKLE
const BATTLEANIMFRAMESET_RAIN
const BATTLEANIMFRAMESET_PSYCH_UP
const BATTLEANIMFRAMESET_SPIRAL_UNUSED
const BATTLEANIMFRAMESET_AEROBLAST
const BATTLEANIMFRAMESET_SANDSTORM
const BATTLEANIMFRAMESET_ENEMYFEET_1ROW
const BATTLEANIMFRAMESET_PLAYERHEAD_1ROW
const BATTLEANIMFRAMESET_ENEMYFEET_2ROW
const BATTLEANIMFRAMESET_PLAYERHEAD_2ROW
DEF NUM_BATTLEANIMFRAMESETS EQU const_value

; BattleAnimOAMData indexes (see data/battle_anims/oam.asm)
Expand Down

0 comments on commit 6180be3

Please sign in to comment.