mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Sync with pokecrystal up to b0ddb07
This commit is contained in:
xCrystal
parent
d6001be90c
commit
5e78fd1ecc
3
.github/workflows/main.yml
vendored
3
.github/workflows/main.yml
vendored
@ -66,11 +66,12 @@ jobs:
|
||||
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
|
||||
run: |
|
||||
cp -v *.sym symbols/
|
||||
cp -v *.map symbols/
|
||||
|
||||
- name: Update symbols
|
||||
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
|
||||
uses: EndBug/add-and-commit@v9
|
||||
with:
|
||||
cwd: "./symbols"
|
||||
add: "*.sym"
|
||||
add: "*.sym *.map"
|
||||
message: ${{ github.event.commits[0].message }}
|
||||
|
||||
@ -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
|
||||
@ -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)
|
||||
|
||||
@ -65,77 +65,116 @@ DEF NUM_DECO_NAMES EQU const_value
|
||||
const PUT_AWAY_DOLL
|
||||
DEF NUM_DECO_ACTIONS EQU const_value - 1
|
||||
|
||||
DEF __deco_value__ = 0
|
||||
|
||||
MACRO deco
|
||||
const DECO_\1
|
||||
DEF DECOFLAG_\1 EQU __deco_value__
|
||||
DEF __deco_value__ += 1
|
||||
ENDM
|
||||
; DecorationIDs indexes (see data/decorations/decorations.asm)
|
||||
const_def
|
||||
const DECOFLAG_FEATHERY_BED
|
||||
const DECOFLAG_PINK_BED
|
||||
const DECOFLAG_POLKADOT_BED
|
||||
const DECOFLAG_PIKACHU_BED
|
||||
const DECOFLAG_RED_CARPET
|
||||
const DECOFLAG_BLUE_CARPET
|
||||
const DECOFLAG_YELLOW_CARPET
|
||||
const DECOFLAG_GREEN_CARPET
|
||||
const DECOFLAG_MAGNAPLANT
|
||||
const DECOFLAG_TROPICPLANT
|
||||
const DECOFLAG_JUMBOPLANT
|
||||
const DECOFLAG_TOWN_MAP
|
||||
const DECOFLAG_PIKACHU_POSTER
|
||||
const DECOFLAG_CLEFAIRY_POSTER
|
||||
const DECOFLAG_JIGGLYPUFF_POSTER
|
||||
const DECOFLAG_FAMICOM
|
||||
const DECOFLAG_SNES
|
||||
const DECOFLAG_N64
|
||||
const DECOFLAG_VIRTUAL_BOY
|
||||
const DECOFLAG_PIKACHU_DOLL
|
||||
const DECOFLAG_SURF_PIKACHU_DOLL
|
||||
const DECOFLAG_CLEFAIRY_DOLL
|
||||
const DECOFLAG_JIGGLYPUFF_DOLL
|
||||
const DECOFLAG_BULBASAUR_DOLL
|
||||
const DECOFLAG_CHARMANDER_DOLL
|
||||
const DECOFLAG_SQUIRTLE_DOLL
|
||||
const DECOFLAG_POLIWAG_DOLL
|
||||
const DECOFLAG_DIGLETT_DOLL
|
||||
const DECOFLAG_STARYU_DOLL
|
||||
const DECOFLAG_MAGIKARP_DOLL
|
||||
const DECOFLAG_ODDISH_DOLL
|
||||
const DECOFLAG_GENGAR_DOLL
|
||||
const DECOFLAG_SHELLDER_DOLL
|
||||
const DECOFLAG_GRIMER_DOLL
|
||||
const DECOFLAG_VOLTORB_DOLL
|
||||
const DECOFLAG_WEEDLE_DOLL
|
||||
const DECOFLAG_UNOWN_DOLL
|
||||
const DECOFLAG_GEODUDE_DOLL
|
||||
const DECOFLAG_MACHOP_DOLL
|
||||
const DECOFLAG_TENTACOOL_DOLL
|
||||
const DECOFLAG_BIG_SNORLAX_DOLL
|
||||
const DECOFLAG_BIG_ONIX_DOLL
|
||||
const DECOFLAG_BIG_LAPRAS_DOLL
|
||||
DEF NUM_NON_TROPHY_DECOS EQU const_value
|
||||
const DECOFLAG_GOLD_TROPHY_DOLL
|
||||
const DECOFLAG_SILVER_TROPHY_DOLL
|
||||
DEF NUM_DECOS EQU const_value
|
||||
|
||||
; decorations:
|
||||
; - DecorationAttributes (see data/decorations/attributes.asm)
|
||||
; - DecorationIDs (see data/decorations/decorations.asm)
|
||||
const_def 1
|
||||
; FindOwnedBeds.beds values (see engine/overworld/decorations.asm)
|
||||
const BEDS
|
||||
deco FEATHERY_BED
|
||||
deco PINK_BED
|
||||
deco POLKADOT_BED
|
||||
deco PIKACHU_BED
|
||||
const DECO_FEATHERY_BED
|
||||
const DECO_PINK_BED
|
||||
const DECO_POLKADOT_BED
|
||||
const DECO_PIKACHU_BED
|
||||
; FindOwnedCarpets.carpets values (see engine/overworld/decorations.asm)
|
||||
const CARPETS
|
||||
deco RED_CARPET
|
||||
deco BLUE_CARPET
|
||||
deco YELLOW_CARPET
|
||||
deco GREEN_CARPET
|
||||
const DECO_RED_CARPET
|
||||
const DECO_BLUE_CARPET
|
||||
const DECO_YELLOW_CARPET
|
||||
const DECO_GREEN_CARPET
|
||||
; FindOwnedPlants.plants values (see engine/overworld/decorations.asm)
|
||||
const PLANTS
|
||||
deco MAGNAPLANT
|
||||
deco TROPICPLANT
|
||||
deco JUMBOPLANT
|
||||
const DECO_MAGNAPLANT
|
||||
const DECO_TROPICPLANT
|
||||
const DECO_JUMBOPLANT
|
||||
; FindOwnedPosters.posters values (see engine/overworld/decorations.asm)
|
||||
const POSTERS
|
||||
deco TOWN_MAP
|
||||
deco PIKACHU_POSTER
|
||||
deco CLEFAIRY_POSTER
|
||||
deco JIGGLYPUFF_POSTER
|
||||
const DECO_TOWN_MAP
|
||||
const DECO_PIKACHU_POSTER
|
||||
const DECO_CLEFAIRY_POSTER
|
||||
const DECO_JIGGLYPUFF_POSTER
|
||||
; FindOwnedConsoles.consoles values (see engine/overworld/decorations.asm)
|
||||
const CONSOLES
|
||||
deco FAMICOM
|
||||
deco SNES
|
||||
deco N64
|
||||
deco VIRTUAL_BOY
|
||||
const DECO_FAMICOM
|
||||
const DECO_SNES
|
||||
const DECO_N64
|
||||
const DECO_VIRTUAL_BOY
|
||||
; FindOwnedBigDolls.big_dolls values (see engine/overworld/decorations.asm)
|
||||
const BIG_DOLLS
|
||||
deco BIG_SNORLAX_DOLL
|
||||
deco BIG_ONIX_DOLL
|
||||
deco BIG_LAPRAS_DOLL
|
||||
const DECO_BIG_SNORLAX_DOLL
|
||||
const DECO_BIG_ONIX_DOLL
|
||||
const DECO_BIG_LAPRAS_DOLL
|
||||
; FindOwnedOrnaments.ornaments values (see engine/overworld/decorations.asm)
|
||||
const DOLLS
|
||||
deco PIKACHU_DOLL
|
||||
deco SURF_PIKACHU_DOLL
|
||||
deco CLEFAIRY_DOLL
|
||||
deco JIGGLYPUFF_DOLL
|
||||
deco BULBASAUR_DOLL
|
||||
deco CHARMANDER_DOLL
|
||||
deco SQUIRTLE_DOLL
|
||||
deco POLIWAG_DOLL
|
||||
deco DIGLETT_DOLL
|
||||
deco STARMIE_DOLL
|
||||
deco MAGIKARP_DOLL
|
||||
deco ODDISH_DOLL
|
||||
deco GENGAR_DOLL
|
||||
deco SHELLDER_DOLL
|
||||
deco GRIMER_DOLL
|
||||
deco VOLTORB_DOLL
|
||||
deco WEEDLE_DOLL
|
||||
deco UNOWN_DOLL
|
||||
deco GEODUDE_DOLL
|
||||
deco MACHOP_DOLL
|
||||
deco TENTACOOL_DOLL
|
||||
DEF NUM_NON_TROPHY_DECOS EQU __deco_value__
|
||||
deco GOLD_TROPHY_DOLL
|
||||
deco SILVER_TROPHY_DOLL
|
||||
DEF NUM_DECOS EQU __deco_value__
|
||||
const DECO_PIKACHU_DOLL
|
||||
const DECO_SURF_PIKACHU_DOLL
|
||||
const DECO_CLEFAIRY_DOLL
|
||||
const DECO_JIGGLYPUFF_DOLL
|
||||
const DECO_BULBASAUR_DOLL
|
||||
const DECO_CHARMANDER_DOLL
|
||||
const DECO_SQUIRTLE_DOLL
|
||||
const DECO_POLIWAG_DOLL
|
||||
const DECO_DIGLETT_DOLL
|
||||
const DECO_STARYU_DOLL
|
||||
const DECO_MAGIKARP_DOLL
|
||||
const DECO_ODDISH_DOLL
|
||||
const DECO_GENGAR_DOLL
|
||||
const DECO_SHELLDER_DOLL
|
||||
const DECO_GRIMER_DOLL
|
||||
const DECO_VOLTORB_DOLL
|
||||
const DECO_WEEDLE_DOLL
|
||||
const DECO_UNOWN_DOLL
|
||||
const DECO_GEODUDE_DOLL
|
||||
const DECO_MACHOP_DOLL
|
||||
const DECO_TENTACOOL_DOLL
|
||||
const DECO_GOLD_TROPHY_DOLL
|
||||
const DECO_SILVER_TROPHY_DOLL
|
||||
DEF NUM_DECO_CATEGORIES EQU const_value - 1 - NUM_DECOS
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
const EVENT_DECO_SQUIRTLE_DOLL
|
||||
const EVENT_DECO_POLIWAG_DOLL
|
||||
const EVENT_DECO_DIGLETT_DOLL
|
||||
const EVENT_DECO_STARMIE_DOLL
|
||||
const EVENT_DECO_STARYU_DOLL
|
||||
const EVENT_DECO_MAGIKARP_DOLL
|
||||
const EVENT_DECO_ODDISH_DOLL
|
||||
const EVENT_DECO_GENGAR_DOLL
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -47,7 +47,7 @@ DecorationAttributes:
|
||||
decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE
|
||||
decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG
|
||||
decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT
|
||||
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE
|
||||
decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARYU_DOLL, SPRITE_STARMIE
|
||||
decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP
|
||||
decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH
|
||||
decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR
|
||||
|
||||
@ -35,7 +35,7 @@ DecorationIDs:
|
||||
db DECO_SQUIRTLE_DOLL ; 24
|
||||
db DECO_POLIWAG_DOLL ; 25
|
||||
db DECO_DIGLETT_DOLL ; 26
|
||||
db DECO_STARMIE_DOLL ; 27
|
||||
db DECO_STARYU_DOLL ; 27
|
||||
db DECO_MAGIKARP_DOLL ; 28
|
||||
db DECO_ODDISH_DOLL ; 29
|
||||
db DECO_GENGAR_DOLL ; 2a
|
||||
|
||||
@ -1240,7 +1240,7 @@ BattleAnim_Thunderpunch:
|
||||
anim_obj ANIM_OBJ_PUNCH_SHAKE, 136, 56, $43
|
||||
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2
|
||||
anim_sound 0, 1, SFX_THUNDER
|
||||
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
|
||||
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
|
||||
anim_wait 64
|
||||
anim_ret
|
||||
|
||||
@ -1280,13 +1280,13 @@ BattleAnim_Thunder:
|
||||
anim_1gfx ANIM_GFX_LIGHTNING
|
||||
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20
|
||||
anim_sound 0, 1, SFX_THUNDER
|
||||
anim_obj ANIM_OBJ_THUNDER2, 120, 68, $0
|
||||
anim_obj ANIM_OBJ_THUNDER_LEFT, 120, 68, $0
|
||||
anim_wait 16
|
||||
anim_sound 0, 1, SFX_THUNDER
|
||||
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
|
||||
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
|
||||
anim_wait 16
|
||||
anim_sound 0, 1, SFX_THUNDER
|
||||
anim_obj ANIM_OBJ_THUNDER1, 136, 68, $0
|
||||
anim_obj ANIM_OBJ_THUNDER_CENTER, 136, 68, $0
|
||||
anim_wait 48
|
||||
anim_ret
|
||||
|
||||
@ -2645,7 +2645,7 @@ BattleAnim_TriAttack:
|
||||
anim_wait 16
|
||||
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $4
|
||||
anim_sound 0, 1, SFX_THUNDER
|
||||
anim_obj ANIM_OBJ_THUNDER3, 152, 68, $0
|
||||
anim_obj ANIM_OBJ_THUNDER_RIGHT, 152, 68, $0
|
||||
anim_wait 16
|
||||
anim_ret
|
||||
|
||||
|
||||
@ -303,14 +303,14 @@ BattleAnimFunction_PokeBall:
|
||||
add hl, bc
|
||||
add [hl]
|
||||
ld [hl], a
|
||||
ld a, BATTLEANIMFRAMESET_0B
|
||||
ld a, BATTLEANIMFRAMESET_POKE_BALL_3
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ret
|
||||
|
||||
.three
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_09
|
||||
ld a, BATTLEANIMFRAMESET_POKE_BALL_1
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1
|
||||
add hl, bc
|
||||
@ -340,13 +340,13 @@ BattleAnimFunction_PokeBall:
|
||||
sub $4
|
||||
ld [hl], a
|
||||
ret nz
|
||||
ld a, BATTLEANIMFRAMESET_0C
|
||||
ld a, BATTLEANIMFRAMESET_POKE_BALL_4
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ret
|
||||
|
||||
.six
|
||||
ld a, BATTLEANIMFRAMESET_0D
|
||||
ld a, BATTLEANIMFRAMESET_POKE_BALL_5
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
|
||||
add hl, bc
|
||||
@ -358,7 +358,7 @@ BattleAnimFunction_PokeBall:
|
||||
|
||||
.seven
|
||||
call GetBallAnimPal
|
||||
ld a, BATTLEANIMFRAMESET_0A
|
||||
ld a, BATTLEANIMFRAMESET_POKE_BALL_2
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld hl, BATTLEANIMSTRUCT_VAR2
|
||||
@ -495,7 +495,7 @@ BattleAnimFunction_Ember:
|
||||
|
||||
.three
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_0F
|
||||
ld a, BATTLEANIMFRAMESET_FLAMETHROWER
|
||||
call ReinitBattleAnimFrameset
|
||||
.four
|
||||
ret
|
||||
@ -733,7 +733,7 @@ BattleAnimFunction_FireBlast:
|
||||
ld [hl], a
|
||||
cp $7
|
||||
jr z, .seven
|
||||
ld a, BATTLEANIMFRAMESET_11
|
||||
ld a, BATTLEANIMFRAMESET_BURNED
|
||||
call ReinitBattleAnimFrameset
|
||||
ret
|
||||
|
||||
@ -752,7 +752,7 @@ BattleAnimFunction_FireBlast:
|
||||
|
||||
.set_up_eight
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_10
|
||||
ld a, BATTLEANIMFRAMESET_EMBER
|
||||
call ReinitBattleAnimFrameset
|
||||
.eight
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1
|
||||
@ -841,7 +841,7 @@ BattleAnimFunction_RazorLeaf:
|
||||
add hl, bc
|
||||
ld [hli], a
|
||||
ld [hl], a
|
||||
ld a, BATTLEANIMFRAMESET_17
|
||||
ld a, BATTLEANIMFRAMESET_RAZOR_LEAF_2
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
@ -937,7 +937,7 @@ BattleAnimFunction_RazorLeaf:
|
||||
ret
|
||||
|
||||
.three
|
||||
ld a, BATTLEANIMFRAMESET_16
|
||||
ld a, BATTLEANIMFRAMESET_RAZOR_LEAF_1
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_OAMFLAGS
|
||||
add hl, bc
|
||||
@ -1014,7 +1014,7 @@ BattleAnimFunction_RockSmash:
|
||||
and $40
|
||||
rlca
|
||||
rlca
|
||||
add BATTLEANIMFRAMESET_19
|
||||
add BATTLEANIMFRAMESET_BIG_ROCK
|
||||
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
@ -1093,7 +1093,7 @@ BattleAnimFunction_Bubble:
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1
|
||||
add hl, bc
|
||||
ld [hl], $0
|
||||
ld a, BATTLEANIMFRAMESET_22
|
||||
ld a, BATTLEANIMFRAMESET_PULSING_BUBBLE
|
||||
call ReinitBattleAnimFrameset
|
||||
.two
|
||||
ld hl, BATTLEANIMSTRUCT_XCOORD
|
||||
@ -1243,8 +1243,8 @@ BattleAnimFunction_Sing:
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
ld a, BATTLEANIMFRAMESET_24
|
||||
add [hl] ; BATTLEANIMFRAMESET_25 BATTLEANIMFRAMESET_26
|
||||
ld a, BATTLEANIMFRAMESET_MUSIC_NOTE_1
|
||||
add [hl] ; BATTLEANIMFRAMESET_MUSIC_NOTE_2 BATTLEANIMFRAMESET_MUSIC_NOTE_3
|
||||
call ReinitBattleAnimFrameset
|
||||
|
||||
.one
|
||||
@ -1301,7 +1301,7 @@ BattleAnimFunction_WaterGun:
|
||||
|
||||
.run_down
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_28
|
||||
ld a, BATTLEANIMFRAMESET_WATER_GUN_2
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_YOFFSET
|
||||
add hl, bc
|
||||
@ -1325,7 +1325,7 @@ BattleAnimFunction_WaterGun:
|
||||
|
||||
.splash
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_29
|
||||
ld a, BATTLEANIMFRAMESET_WATER_GUN_3
|
||||
call ReinitBattleAnimFrameset
|
||||
.three
|
||||
ret
|
||||
@ -1443,7 +1443,7 @@ BattleAnimFunction_ThunderWave:
|
||||
|
||||
.one
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_35
|
||||
ld a, BATTLEANIMFRAMESET_THUNDER_WAVE_EXTRA
|
||||
call ReinitBattleAnimFrameset
|
||||
.zero
|
||||
.two
|
||||
@ -1589,11 +1589,11 @@ BattleAnimFunction_Bite:
|
||||
ld [hl], a
|
||||
bit 7, a
|
||||
jr nz, .flipped2
|
||||
ld a, BATTLEANIMFRAMESET_3D
|
||||
ld a, BATTLEANIMFRAMESET_BITE_2
|
||||
jr .got_frameset
|
||||
|
||||
.flipped2
|
||||
ld a, BATTLEANIMFRAMESET_3C
|
||||
ld a, BATTLEANIMFRAMESET_BITE_1
|
||||
.got_frameset
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1
|
||||
@ -1844,8 +1844,8 @@ BattleAnimFunction_Wrap:
|
||||
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
inc a ; BATTLEANIMFRAMESET_53
|
||||
; BATTLEANIMFRAMESET_55
|
||||
inc a ; BATTLEANIMFRAMESET_BIND_2
|
||||
; BATTLEANIMFRAMESET_BIND_4
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1 ; Unused?
|
||||
@ -1880,7 +1880,7 @@ BattleAnimFunction_LeechSeed:
|
||||
|
||||
.sprout
|
||||
ld [hl], $40
|
||||
ld a, BATTLEANIMFRAMESET_57
|
||||
ld a, BATTLEANIMFRAMESET_LEECH_SEED_2
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ret
|
||||
@ -1896,7 +1896,7 @@ BattleAnimFunction_LeechSeed:
|
||||
|
||||
.flutter
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_58
|
||||
ld a, BATTLEANIMFRAMESET_LEECH_SEED_3
|
||||
call ReinitBattleAnimFrameset
|
||||
.three
|
||||
ret
|
||||
@ -2197,7 +2197,7 @@ BattleAnimFunction_Egg:
|
||||
|
||||
.seven
|
||||
; Switches Softboiled frameset to egg wobbling
|
||||
ld a, BATTLEANIMFRAMESET_4E ; Egg wobbling
|
||||
ld a, BATTLEANIMFRAMESET_EGG_WOBBLE ; Egg wobbling
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ret
|
||||
@ -2218,7 +2218,7 @@ BattleAnimFunction_Egg:
|
||||
|
||||
.nine
|
||||
; First Softboiled ANIM_OBJ_EGG turns into the bottom half frameset
|
||||
ld a, BATTLEANIMFRAMESET_50 ; Cracked egg bottom
|
||||
ld a, BATTLEANIMFRAMESET_EGG_CRACKED_BOTTOM ; Cracked egg bottom
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_YOFFSET
|
||||
add hl, bc
|
||||
@ -2228,7 +2228,7 @@ BattleAnimFunction_Egg:
|
||||
|
||||
.eleven
|
||||
; Second Softboiled ANIM_OBJ_EGG
|
||||
ld a, BATTLEANIMFRAMESET_4F ; Cracked egg top
|
||||
ld a, BATTLEANIMFRAMESET_EGG_CRACKED_TOP ; Cracked egg top
|
||||
call ReinitBattleAnimFrameset
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld hl, BATTLEANIMSTRUCT_VAR1
|
||||
@ -2319,7 +2319,7 @@ BattleAnimFunction_MoveUp:
|
||||
|
||||
BattleAnimFunction_Sound:
|
||||
; Moves object back and forth in one of three angles using a sine behavior and disappear after 8 frames. Used in Growl, Snore and Kinesis
|
||||
; Obj Param: Used to define object angle. How much to increase from base frameset, which is hardcoded as BATTLEANIMFRAMESET_59
|
||||
; Obj Param: Used to define object angle. How much to increase from base frameset, which is hardcoded as BATTLEANIMFRAMESET_SOUND_1
|
||||
call BattleAnim_AnonJumptable
|
||||
.anon_dw
|
||||
dw .zero
|
||||
@ -2343,8 +2343,8 @@ BattleAnimFunction_Sound:
|
||||
ld [hl], $8 ; duration
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
ld a, BATTLEANIMFRAMESET_59
|
||||
add [hl] ; BATTLEANIMFRAMESET_5A BATTLEANIMFRAMESET_5B
|
||||
ld a, BATTLEANIMFRAMESET_SOUND_1
|
||||
add [hl] ; BATTLEANIMFRAMESET_SOUND_2 BATTLEANIMFRAMESET_SOUND_3
|
||||
call ReinitBattleAnimFrameset
|
||||
ret
|
||||
|
||||
@ -2420,7 +2420,7 @@ BattleAnimFunction_ConfuseRay:
|
||||
and $80
|
||||
rlca
|
||||
ld [hl], a
|
||||
add BATTLEANIMFRAMESET_5D ; BATTLEANIMFRAMESET_5E
|
||||
add BATTLEANIMFRAMESET_CONFUSE_RAY_1 ; BATTLEANIMFRAMESET_CONFUSE_RAY_2
|
||||
call ReinitBattleAnimFrameset
|
||||
ret
|
||||
|
||||
@ -2543,7 +2543,7 @@ BattleAnimFunction_Dizzy:
|
||||
|
||||
BattleAnimFunction_Amnesia:
|
||||
; Creates 3 objects based on Obj Param
|
||||
; Obj Param: How much to increase from base frameset, which is hardcoded as BATTLEANIMFRAMESET_63
|
||||
; Obj Param: How much to increase from base frameset, which is hardcoded as BATTLEANIMFRAMESET_AMNESIA_1
|
||||
; anim_incobj is used to DeInit object (used by Present)
|
||||
call BattleAnim_AnonJumptable
|
||||
.anon_dw
|
||||
@ -2556,7 +2556,7 @@ BattleAnimFunction_Amnesia:
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
add BATTLEANIMFRAMESET_63 ; BATTLEANIMFRAMESET_64 BATTLEANIMFRAMESET_65
|
||||
add BATTLEANIMFRAMESET_AMNESIA_1 ; BATTLEANIMFRAMESET_AMNESIA_2 BATTLEANIMFRAMESET_AMNESIA_3
|
||||
call ReinitBattleAnimFrameset
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
@ -2644,7 +2644,7 @@ BattleAnimFunction_String:
|
||||
add hl, bc
|
||||
set OAM_Y_FLIP, [hl]
|
||||
.not_param_zero
|
||||
add BATTLEANIMFRAMESET_6A ; BATTLEANIMFRAMESET_6B BATTLEANIMFRAMESET_6C
|
||||
add BATTLEANIMFRAMESET_STRING_SHOT_1 ; BATTLEANIMFRAMESET_STRING_SHOT_2 BATTLEANIMFRAMESET_STRING_SHOT_3
|
||||
call ReinitBattleAnimFrameset
|
||||
.one
|
||||
ret
|
||||
@ -2685,7 +2685,7 @@ BattleAnimFunction_Paralyzed:
|
||||
xor $ff
|
||||
inc a
|
||||
ld [hl], a
|
||||
ld a, BATTLEANIMFRAMESET_6E
|
||||
ld a, BATTLEANIMFRAMESET_PARALYZED_FLIPPED
|
||||
call ReinitBattleAnimFrameset
|
||||
ret
|
||||
|
||||
@ -3531,7 +3531,7 @@ BattleAnimFunction_SpeedLine:
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
and $7f
|
||||
add BATTLEANIMFRAMESET_81 ; BATTLEANIMFRAMESET_82 BATTLEANIMFRAMESET_83
|
||||
add BATTLEANIMFRAMESET_SPEED_LINE_1 ; BATTLEANIMFRAMESET_SPEED_LINE_2 BATTLEANIMFRAMESET_SPEED_LINE_3
|
||||
call ReinitBattleAnimFrameset
|
||||
.one
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
@ -3550,7 +3550,7 @@ BattleAnimFunction_SpeedLine:
|
||||
ret
|
||||
|
||||
BattleAnimFunction_Sludge:
|
||||
; Object moves upward for $c frames and switches to FRAMESET_20
|
||||
; Object moves upward for $c frames and switches to BATTLEANIMFRAMESET_SLUDGE_BUBBLE_BURST
|
||||
call BattleAnim_AnonJumptable
|
||||
.anon_dw
|
||||
dw .zero
|
||||
@ -3575,7 +3575,7 @@ BattleAnimFunction_Sludge:
|
||||
|
||||
.done
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld a, BATTLEANIMFRAMESET_20
|
||||
ld a, BATTLEANIMFRAMESET_SLUDGE_BUBBLE_BURST
|
||||
call ReinitBattleAnimFrameset
|
||||
.two
|
||||
ld hl, BATTLEANIMSTRUCT_YOFFSET
|
||||
@ -3763,8 +3763,8 @@ BattleAnimFunction_HealBellNotes:
|
||||
call BattleAnim_IncAnonJumptableIndex
|
||||
ld hl, BATTLEANIMSTRUCT_PARAM
|
||||
add hl, bc
|
||||
ld a, BATTLEANIMFRAMESET_24
|
||||
add [hl] ; BATTLEANIMFRAMESET_25 BATTLEANIMFRAMESET_26
|
||||
ld a, BATTLEANIMFRAMESET_MUSIC_NOTE_1
|
||||
add [hl] ; BATTLEANIMFRAMESET_MUSIC_NOTE_2 BATTLEANIMFRAMESET_MUSIC_NOTE_3
|
||||
call ReinitBattleAnimFrameset
|
||||
.one
|
||||
ld hl, BATTLEANIMSTRUCT_YOFFSET
|
||||
|
||||
@ -303,7 +303,7 @@ FindOwnedOrnaments:
|
||||
db DECO_SQUIRTLE_DOLL ; 24
|
||||
db DECO_POLIWAG_DOLL ; 25
|
||||
db DECO_DIGLETT_DOLL ; 26
|
||||
db DECO_STARMIE_DOLL ; 27
|
||||
db DECO_STARYU_DOLL ; 27
|
||||
db DECO_MAGIKARP_DOLL ; 28
|
||||
db DECO_ODDISH_DOLL ; 29
|
||||
db DECO_GENGAR_DOLL ; 2a
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user