mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
This commit is contained in:
Rangi
parent
bdeb494add
commit
0a62d48df2
65 changed files with 2863 additions and 2825 deletions
|
|
@ -649,81 +649,7 @@ DoSpecialEffectByAnimationId:
|
|||
pop hl
|
||||
ret
|
||||
|
||||
; Format: Animation ID (1 byte), Address (2 bytes)
|
||||
AnimationIdSpecialEffects:
|
||||
db MEGA_PUNCH
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db GUILLOTINE
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db MEGA_KICK
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db HEADBUTT
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db TAIL_WHIP
|
||||
dw TailWhipAnimationUnused
|
||||
|
||||
db GROWL
|
||||
dw DoGrowlSpecialEffects
|
||||
|
||||
db DISABLE
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db BLIZZARD
|
||||
dw DoBlizzardSpecialEffects
|
||||
|
||||
db BUBBLEBEAM
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db HYPER_BEAM
|
||||
dw FlashScreenEveryFourFrameBlocks
|
||||
|
||||
db THUNDERBOLT
|
||||
dw FlashScreenEveryEightFrameBlocks
|
||||
|
||||
db REFLECT
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db SELFDESTRUCT
|
||||
dw DoExplodeSpecialEffects
|
||||
|
||||
db SPORE
|
||||
dw AnimationFlashScreen
|
||||
|
||||
db EXPLOSION
|
||||
dw DoExplodeSpecialEffects
|
||||
|
||||
db ROCK_SLIDE
|
||||
dw DoRockSlideSpecialEffects
|
||||
|
||||
db TRADE_BALL_DROP_ANIM
|
||||
dw TradeHidePokemon
|
||||
|
||||
db TRADE_BALL_SHAKE_ANIM
|
||||
dw TradeShakePokeball
|
||||
|
||||
db TRADE_BALL_TILT_ANIM
|
||||
dw TradeJumpPokeball
|
||||
|
||||
db TOSS_ANIM
|
||||
dw DoBallTossSpecialEffects
|
||||
|
||||
db SHAKE_ANIM
|
||||
dw DoBallShakeSpecialEffects
|
||||
|
||||
db POOF_ANIM
|
||||
dw DoPoofSpecialEffects
|
||||
|
||||
db GREATTOSS_ANIM
|
||||
dw DoBallTossSpecialEffects
|
||||
|
||||
db ULTRATOSS_ANIM
|
||||
dw DoBallTossSpecialEffects
|
||||
|
||||
db $FF ; terminator
|
||||
INCLUDE "data/move_animation_special_effects.asm"
|
||||
|
||||
DoBallTossSpecialEffects:
|
||||
ld a, [wcf91]
|
||||
|
|
@ -985,87 +911,7 @@ TailWhipAnimationUnused:
|
|||
ld c, 20
|
||||
jp DelayFrames
|
||||
|
||||
; Format: Special Effect ID (1 byte), Address (2 bytes)
|
||||
SpecialEffectPointers:
|
||||
db SE_DARK_SCREEN_FLASH ; $FE
|
||||
dw AnimationFlashScreen
|
||||
db SE_DARK_SCREEN_PALETTE ; $FD
|
||||
dw AnimationDarkScreenPalette
|
||||
db SE_RESET_SCREEN_PALETTE ; $FC
|
||||
dw AnimationResetScreenPalette
|
||||
db SE_SHAKE_SCREEN ; $FB
|
||||
dw AnimationShakeScreen
|
||||
db SE_WATER_DROPLETS_EVERYWHERE ; $FA
|
||||
dw AnimationWaterDropletsEverywhere
|
||||
db SE_DARKEN_MON_PALETTE ; $F9
|
||||
dw AnimationDarkenMonPalette
|
||||
db SE_FLASH_SCREEN_LONG ; $F8
|
||||
dw AnimationFlashScreenLong
|
||||
db SE_SLIDE_MON_UP ; $F7
|
||||
dw AnimationSlideMonUp
|
||||
db SE_SLIDE_MON_DOWN ; $F6
|
||||
dw AnimationSlideMonDown
|
||||
db SE_FLASH_MON_PIC ; $F5
|
||||
dw AnimationFlashMonPic
|
||||
db SE_SLIDE_MON_OFF ; $F4
|
||||
dw AnimationSlideMonOff
|
||||
db SE_BLINK_MON ; $F3
|
||||
dw AnimationBlinkMon
|
||||
db SE_MOVE_MON_HORIZONTALLY ; $F2
|
||||
dw AnimationMoveMonHorizontally
|
||||
db SE_RESET_MON_POSITION ; $F1
|
||||
dw AnimationResetMonPosition
|
||||
db SE_LIGHT_SCREEN_PALETTE ; $F0
|
||||
dw AnimationLightScreenPalette
|
||||
db SE_HIDE_MON_PIC ; $EF
|
||||
dw AnimationHideMonPic
|
||||
db SE_SQUISH_MON_PIC ; $EE
|
||||
dw AnimationSquishMonPic
|
||||
db SE_SHOOT_BALLS_UPWARD ; $ED
|
||||
dw AnimationShootBallsUpward
|
||||
db SE_SHOOT_MANY_BALLS_UPWARD ; $EC
|
||||
dw AnimationShootManyBallsUpward
|
||||
db SE_BOUNCE_UP_AND_DOWN ; $EB
|
||||
dw AnimationBoundUpAndDown
|
||||
db SE_MINIMIZE_MON ; $EA
|
||||
dw AnimationMinimizeMon
|
||||
db SE_SLIDE_MON_DOWN_AND_HIDE ; $E9
|
||||
dw AnimationSlideMonDownAndHide
|
||||
db SE_TRANSFORM_MON ; $E8
|
||||
dw AnimationTransformMon
|
||||
db SE_LEAVES_FALLING ; $E7
|
||||
dw AnimationLeavesFalling
|
||||
db SE_PETALS_FALLING ; $E6
|
||||
dw AnimationPetalsFalling
|
||||
db SE_SLIDE_MON_HALF_OFF ; $E5
|
||||
dw AnimationSlideMonHalfOff
|
||||
db SE_SHAKE_ENEMY_HUD ; $E4
|
||||
dw AnimationShakeEnemyHUD
|
||||
db SE_SHAKE_ENEMY_HUD_2 ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4)
|
||||
dw AnimationShakeEnemyHUD
|
||||
db SE_SPIRAL_BALLS_INWARD ; $E2
|
||||
dw AnimationSpiralBallsInward
|
||||
db SE_DELAY_ANIMATION_10 ; $E1
|
||||
dw AnimationDelay10
|
||||
db SE_FLASH_ENEMY_MON_PIC ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon
|
||||
dw AnimationFlashEnemyMonPic
|
||||
db SE_HIDE_ENEMY_MON_PIC ; $DF
|
||||
dw AnimationHideEnemyMonPic
|
||||
db SE_BLINK_ENEMY_MON ; $DE
|
||||
dw AnimationBlinkEnemyMon
|
||||
db SE_SHOW_MON_PIC ; $DD
|
||||
dw AnimationShowMonPic
|
||||
db SE_SHOW_ENEMY_MON_PIC ; $DC
|
||||
dw AnimationShowEnemyMonPic
|
||||
db SE_SLIDE_ENEMY_MON_OFF ; $DB
|
||||
dw AnimationSlideEnemyMonOff
|
||||
db SE_SHAKE_BACK_AND_FORTH ; $DA
|
||||
dw AnimationShakeBackAndForth
|
||||
db SE_SUBSTITUTE_MON ; $D9
|
||||
dw AnimationSubstitute
|
||||
db SE_WAVY_SCREEN ; $D8
|
||||
dw AnimationWavyScreen
|
||||
db $FF
|
||||
INCLUDE "data/move_animation_pointers.asm"
|
||||
|
||||
AnimationDelay10:
|
||||
ld c, 10
|
||||
|
|
@ -2362,174 +2208,7 @@ IsCryMove:
|
|||
scf
|
||||
ret
|
||||
|
||||
MoveSoundTable:
|
||||
; ID, pitch mod, tempo mod
|
||||
db SFX_POUND, $00,$80 ; POUND
|
||||
db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP
|
||||
db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP
|
||||
db SFX_BATTLE_0B, $01,$80 ; COMET_PUNCH
|
||||
db SFX_BATTLE_0D, $00,$40 ; MEGA_PUNCH
|
||||
db SFX_SILPH_SCOPE, $00,$ff ; PAY_DAY
|
||||
db SFX_BATTLE_0D, $10,$60 ; FIRE_PUNCH
|
||||
db SFX_BATTLE_0D, $20,$80 ; ICE_PUNCH
|
||||
db SFX_BATTLE_0D, $00,$a0 ; THUNDERPUNCH
|
||||
db SFX_DAMAGE, $00,$80 ; SCRATCH
|
||||
db SFX_BATTLE_0F, $20,$40 ; VICEGRIP
|
||||
db SFX_BATTLE_0F, $00,$80 ; GUILLOTINE
|
||||
db SFX_BATTLE_0E, $00,$a0 ; RAZOR_WIND
|
||||
db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE
|
||||
db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT
|
||||
db SFX_BATTLE_12, $00,$c0 ; GUST
|
||||
db SFX_BATTLE_12, $10,$a0 ; WING_ATTACK
|
||||
db SFX_BATTLE_13, $00,$e0 ; WHIRLWIND
|
||||
db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY
|
||||
db SFX_BATTLE_14, $00,$80 ; BIND
|
||||
db SFX_BATTLE_22, $00,$80 ; SLAM
|
||||
db SFX_VINE_WHIP, $01,$80 ; VINE_WHIP
|
||||
db SFX_BATTLE_20, $00,$80 ; STOMP
|
||||
db SFX_BATTLE_17, $f0,$40 ; DOUBLE_KICK
|
||||
db SFX_SUPER_EFFECTIVE, $00,$80 ; MEGA_KICK
|
||||
db SFX_BATTLE_17, $00,$80 ; JUMP_KICK
|
||||
db SFX_BATTLE_21, $10,$80 ; ROLLING_KICK
|
||||
db SFX_BATTLE_1B, $01,$a0 ; SAND_ATTACK
|
||||
db SFX_BATTLE_18, $00,$80 ; HEADBUTT
|
||||
db SFX_BATTLE_1E, $00,$60 ; HORN_ATTACK
|
||||
db SFX_BATTLE_1E, $01,$40 ; FURY_ATTACK
|
||||
db SFX_HORN_DRILL, $00,$a0 ; HORN_DRILL
|
||||
db SFX_SUPER_EFFECTIVE, $10,$a0 ; TACKLE
|
||||
db SFX_BATTLE_20, $00,$c0 ; BODY_SLAM
|
||||
db SFX_BATTLE_14, $10,$60 ; WRAP
|
||||
db SFX_SUPER_EFFECTIVE, $00,$a0 ; TAKE_DOWN
|
||||
db SFX_BATTLE_22, $11,$c0 ; THRASH
|
||||
db SFX_SUPER_EFFECTIVE, $20,$c0 ; DOUBLE_EDGE
|
||||
db SFX_BATTLE_21, $00,$80 ; TAIL_WHIP
|
||||
db SFX_BATTLE_1B, $00,$80 ; POISON_STING
|
||||
db SFX_BATTLE_1B, $20,$c0 ; TWINEEDLE
|
||||
db SFX_BATTLE_19, $00,$80 ; PIN_MISSILE
|
||||
db SFX_BATTLE_31, $ff,$40 ; LEER
|
||||
db SFX_BATTLE_1E, $00,$80 ; BITE
|
||||
db SFX_BATTLE_0B, $00,$c0 ; GROWL
|
||||
db SFX_BATTLE_0B, $00,$40 ; ROAR
|
||||
db SFX_BATTLE_35, $00,$80 ; SING
|
||||
db SFX_BATTLE_27, $40,$60 ; SUPERSONIC
|
||||
db SFX_BATTLE_27, $00,$80 ; SONICBOOM
|
||||
db SFX_BATTLE_27, $ff,$40 ; DISABLE
|
||||
db SFX_BATTLE_2A, $80,$c0 ; ACID
|
||||
db SFX_BATTLE_19, $10,$a0 ; EMBER
|
||||
db SFX_BATTLE_19, $21,$e0 ; FLAMETHROWER
|
||||
db SFX_BATTLE_29, $00,$80 ; MIST
|
||||
db SFX_BATTLE_24, $20,$60 ; WATER_GUN
|
||||
db SFX_BATTLE_2A, $00,$80 ; HYDRO_PUMP
|
||||
db SFX_BATTLE_2C, $00,$80 ; SURF
|
||||
db SFX_BATTLE_28, $40,$80 ; ICE_BEAM
|
||||
db SFX_BATTLE_29, $f0,$e0 ; BLIZZARD
|
||||
db SFX_PSYBEAM, $00,$80 ; PSYBEAM
|
||||
db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM
|
||||
db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM
|
||||
db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM
|
||||
db SFX_PECK, $01,$a0 ; PECK
|
||||
db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK
|
||||
db SFX_BATTLE_23, $01,$c0 ; SUBMISSION
|
||||
db SFX_BATTLE_23, $00,$80 ; LOW_KICK
|
||||
db SFX_SUPER_EFFECTIVE, $00,$e0 ; COUNTER
|
||||
db SFX_BATTLE_26, $01,$60 ; SEISMIC_TOSS
|
||||
db SFX_BATTLE_26, $20,$40 ; STRENGTH
|
||||
db SFX_BATTLE_24, $00,$80 ; ABSORB
|
||||
db SFX_BATTLE_24, $40,$c0 ; MEGA_DRAIN
|
||||
db SFX_BATTLE_1B, $03,$60 ; LEECH_SEED
|
||||
db SFX_BATTLE_25, $11,$e0 ; GROWTH
|
||||
db SFX_BATTLE_12, $20,$e0 ; RAZOR_LEAF
|
||||
db SFX_BATTLE_2E, $00,$80 ; SOLARBEAM
|
||||
db SFX_BATTLE_1C, $00,$80 ; POISONPOWDER
|
||||
db SFX_BATTLE_1C, $11,$a0 ; STUN_SPORE
|
||||
db SFX_BATTLE_1C, $01,$c0 ; SLEEP_POWDER
|
||||
db SFX_BATTLE_13, $14,$c0 ; PETAL_DANCE
|
||||
db SFX_BATTLE_1B, $02,$a0 ; STRING_SHOT
|
||||
db SFX_BATTLE_29, $f0,$80 ; DRAGON_RAGE
|
||||
db SFX_BATTLE_29, $20,$c0 ; FIRE_SPIN
|
||||
db SFX_BATTLE_2F, $00,$20 ; THUNDERSHOCK
|
||||
db SFX_BATTLE_2F, $20,$80 ; THUNDERBOLT
|
||||
db SFX_BATTLE_2E, $12,$60 ; THUNDER_WAVE
|
||||
db SFX_BATTLE_26, $00,$80 ; THUNDER
|
||||
db SFX_BATTLE_14, $01,$e0 ; ROCK_THROW
|
||||
db SFX_BATTLE_29, $0f,$e0 ; EARTHQUAKE
|
||||
db SFX_BATTLE_29, $11,$20 ; FISSURE
|
||||
db SFX_DAMAGE, $10,$40 ; DIG
|
||||
db SFX_BATTLE_0F, $10,$c0 ; TOXIC
|
||||
db SFX_BATTLE_14, $00,$20 ; CONFUSION
|
||||
db SFX_PSYCHIC_M, $00,$80 ; PSYCHIC_M
|
||||
db SFX_BATTLE_35, $11,$18 ; HYPNOSIS
|
||||
db SFX_BATTLE_09, $20,$c0 ; MEDITATE
|
||||
db SFX_FAINT_FALL, $20,$c0 ; AGILITY
|
||||
db SFX_BATTLE_25, $00,$10 ; QUICK_ATTACK
|
||||
db SFX_BATTLE_26, $f0,$20 ; RAGE
|
||||
db SFX_BATTLE_33, $f0,$c0 ; TELEPORT
|
||||
db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE
|
||||
db SFX_BATTLE_09, $f0,$40 ; MIMIC
|
||||
db SFX_BATTLE_31, $00,$80 ; SCREECH
|
||||
db SFX_BATTLE_33, $80,$40 ; DOUBLE_TEAM
|
||||
db SFX_BATTLE_33, $00,$80 ; RECOVER
|
||||
db SFX_BATTLE_14, $11,$20 ; HARDEN
|
||||
db SFX_BATTLE_14, $22,$10 ; MINIMIZE
|
||||
db SFX_BATTLE_1B, $f1,$ff ; SMOKESCREEN
|
||||
db SFX_BATTLE_13, $f1,$ff ; CONFUSE_RAY
|
||||
db SFX_BATTLE_14, $33,$30 ; WITHDRAW
|
||||
db SFX_BATTLE_32, $40,$c0 ; DEFENSE_CURL
|
||||
db SFX_BATTLE_0E, $20,$20 ; BARRIER
|
||||
db SFX_BATTLE_0E, $f0,$10 ; LIGHT_SCREEN
|
||||
db SFX_BATTLE_0F, $f8,$10 ; HAZE
|
||||
db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT
|
||||
db SFX_BATTLE_25, $00,$80 ; FOCUS_ENERGY
|
||||
db SFX_BATTLE_18, $00,$c0 ; BIDE
|
||||
db SFX_BATTLE_32, $c0,$ff ; METRONOME
|
||||
db SFX_BATTLE_09, $f2,$20 ; MIRROR_MOVE
|
||||
db SFX_BATTLE_34, $00,$80 ; SELFDESTRUCT
|
||||
db SFX_BATTLE_34, $00,$40 ; EGG_BOMB
|
||||
db SFX_BATTLE_09, $00,$40 ; LICK
|
||||
db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG
|
||||
db SFX_BATTLE_2A, $20,$20 ; SLUDGE
|
||||
db SFX_BATTLE_32, $00,$80 ; BONE_CLUB
|
||||
db SFX_BATTLE_29, $1f,$20 ; FIRE_BLAST
|
||||
db SFX_BATTLE_25, $2f,$80 ; WATERFALL
|
||||
db SFX_BATTLE_0F, $1f,$ff ; CLAMP
|
||||
db SFX_BATTLE_2B, $1f,$60 ; SWIFT
|
||||
db SFX_BATTLE_26, $1e,$20 ; SKULL_BASH
|
||||
db SFX_BATTLE_26, $1f,$18 ; SPIKE_CANNON
|
||||
db SFX_BATTLE_14, $0f,$80 ; CONSTRICT
|
||||
db SFX_BATTLE_09, $f8,$10 ; AMNESIA
|
||||
db SFX_FAINT_FALL, $18,$20 ; KINESIS
|
||||
db SFX_BATTLE_32, $08,$40 ; SOFTBOILED
|
||||
db SFX_BATTLE_17, $01,$e0 ; HI_JUMP_KICK
|
||||
db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE
|
||||
db SFX_BATTLE_35, $42,$01 ; DREAM_EATER
|
||||
db SFX_BATTLE_1C, $00,$ff ; POISON_GAS
|
||||
db SFX_BATTLE_32, $08,$e0 ; BARRAGE
|
||||
db SFX_BATTLE_24, $00,$80 ; LEECH_LIFE
|
||||
db SFX_BATTLE_09, $88,$10 ; LOVELY_KISS
|
||||
db SFX_BATTLE_25, $48,$ff ; SKY_ATTACK
|
||||
db SFX_FAINT_FALL, $ff,$ff ; TRANSFORM
|
||||
db SFX_BATTLE_24, $ff,$10 ; BUBBLE
|
||||
db SFX_FAINT_FALL, $ff,$04 ; DIZZY_PUNCH
|
||||
db SFX_BATTLE_1C, $01,$ff ; SPORE
|
||||
db SFX_BATTLE_13, $f8,$ff ; FLASH
|
||||
db SFX_BATTLE_0C, $f0,$f0 ; PSYWAVE
|
||||
db SFX_BATTLE_0F, $08,$10 ; SPLASH
|
||||
db SFX_BATTLE_0D, $f0,$ff ; ACID_ARMOR
|
||||
db SFX_SUPER_EFFECTIVE, $f0,$ff ; CRABHAMMER
|
||||
db SFX_BATTLE_34, $10,$ff ; EXPLOSION
|
||||
db SFX_BATTLE_0E, $f0,$20 ; FURY_SWIPES
|
||||
db SFX_BATTLE_2B, $f0,$60 ; BONEMERANG
|
||||
db SFX_BATTLE_21, $12,$10 ; REST
|
||||
db SFX_BATTLE_36, $f0,$20 ; ROCK_SLIDE
|
||||
db SFX_BATTLE_1E, $12,$ff ; HYPER_FANG
|
||||
db SFX_BATTLE_31, $80,$04 ; SHARPEN
|
||||
db SFX_BATTLE_33, $f0,$10 ; CONVERSION
|
||||
db SFX_BATTLE_29, $f8,$ff ; TRI_ATTACK
|
||||
db SFX_BATTLE_26, $f0,$ff ; SUPER_FANG
|
||||
db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH
|
||||
db SFX_BATTLE_2C, $d8,$04 ; SUBSTITUTE
|
||||
db SFX_BATTLE_0B, $00,$80 ; STRUGGLE
|
||||
db SFX_BATTLE_0B, $00,$80
|
||||
INCLUDE "data/move_sfx.asm"
|
||||
|
||||
CopyPicTiles:
|
||||
ld a, [H_WHOSETURN]
|
||||
|
|
|
|||
|
|
@ -151,35 +151,7 @@ GetBattleTransitionID_IsDungeonMap:
|
|||
res 2, c
|
||||
ret
|
||||
|
||||
; GetBattleTransitionID_IsDungeonMap checks if wCurMap
|
||||
; is equal to one of these maps
|
||||
DungeonMaps1:
|
||||
db VIRIDIAN_FOREST
|
||||
db ROCK_TUNNEL_1F
|
||||
db SEAFOAM_ISLANDS_1F
|
||||
db ROCK_TUNNEL_B1F
|
||||
db $FF
|
||||
|
||||
; GetBattleTransitionID_IsDungeonMap checks if wCurMap
|
||||
; is in between or equal to each pair of maps
|
||||
DungeonMaps2:
|
||||
; all MT_MOON maps
|
||||
db MT_MOON_1F
|
||||
db MT_MOON_B2F
|
||||
|
||||
; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
|
||||
db SS_ANNE_1F
|
||||
db HALL_OF_FAME
|
||||
|
||||
; all POKEMON_TOWER maps and Lavender Town buildings
|
||||
db LAVENDER_POKECENTER
|
||||
db LAVENDER_CUBONE_HOUSE
|
||||
|
||||
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
|
||||
; CERULEAN_CAVE maps, except for SILPH_CO_1F
|
||||
db SILPH_CO_2F
|
||||
db CERULEAN_CAVE_1F
|
||||
db $FF
|
||||
INCLUDE "data/dungeon_maps.asm"
|
||||
|
||||
LoadBattleTransitionTile:
|
||||
ld hl, vChars1 + $7f0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ PrintBeginningBattleText:
|
|||
ld a, [wCurMap]
|
||||
cp POKEMON_TOWER_3F
|
||||
jr c, .notPokemonTower
|
||||
cp MR_FUJIS_HOUSE
|
||||
cp POKEMON_TOWER_7F + 1
|
||||
jr c, .pokemonTower
|
||||
.notPokemonTower
|
||||
ld a, [wEnemyMonSpecies2]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
1493
engine/battle/effects.asm
Normal file
1493
engine/battle/effects.asm
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -18,95 +18,4 @@ SaveTrainerName:
|
|||
jr nz, .CopyCharacter
|
||||
ret
|
||||
|
||||
TrainerNamePointers:
|
||||
; what is the point of these?
|
||||
dw YoungsterName
|
||||
dw BugCatcherName
|
||||
dw LassName
|
||||
dw wTrainerName
|
||||
dw JrTrainerMName
|
||||
dw JrTrainerFName
|
||||
dw PokemaniacName
|
||||
dw SuperNerdName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw BurglarName
|
||||
dw EngineerName
|
||||
dw JugglerXName
|
||||
dw wTrainerName
|
||||
dw SwimmerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw BeautyName
|
||||
dw wTrainerName
|
||||
dw RockerName
|
||||
dw JugglerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw BlackbeltName
|
||||
dw wTrainerName
|
||||
dw ProfOakName
|
||||
dw ChiefName
|
||||
dw ScientistName
|
||||
dw wTrainerName
|
||||
dw RocketName
|
||||
dw CooltrainerMName
|
||||
dw CooltrainerFName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
dw wTrainerName
|
||||
|
||||
YoungsterName:
|
||||
db "YOUNGSTER@"
|
||||
BugCatcherName:
|
||||
db "BUG CATCHER@"
|
||||
LassName:
|
||||
db "LASS@"
|
||||
JrTrainerMName:
|
||||
db "JR.TRAINER♂@"
|
||||
JrTrainerFName:
|
||||
db "JR.TRAINER♀@"
|
||||
PokemaniacName:
|
||||
db "POKéMANIAC@"
|
||||
SuperNerdName:
|
||||
db "SUPER NERD@"
|
||||
BurglarName:
|
||||
db "BURGLAR@"
|
||||
EngineerName:
|
||||
db "ENGINEER@"
|
||||
JugglerXName:
|
||||
db "JUGGLER@"
|
||||
SwimmerName:
|
||||
db "SWIMMER@"
|
||||
BeautyName:
|
||||
db "BEAUTY@"
|
||||
RockerName:
|
||||
db "ROCKER@"
|
||||
JugglerName:
|
||||
db "JUGGLER@"
|
||||
BlackbeltName:
|
||||
db "BLACKBELT@"
|
||||
ProfOakName:
|
||||
db "PROF.OAK@"
|
||||
ChiefName:
|
||||
db "CHIEF@"
|
||||
ScientistName:
|
||||
db "SCIENTIST@"
|
||||
RocketName:
|
||||
db "ROCKET@"
|
||||
CooltrainerMName:
|
||||
db "COOLTRAINER♂@"
|
||||
CooltrainerFName:
|
||||
db "COOLTRAINER♀@"
|
||||
INCLUDE "text/trainer_name_pointers.asm"
|
||||
|
|
|
|||
|
|
@ -273,58 +273,9 @@ ReadMove:
|
|||
pop hl
|
||||
ret
|
||||
|
||||
; move choice modification methods that are applied for each trainer class
|
||||
; 0 is sentinel value
|
||||
TrainerClassMoveChoiceModifications:
|
||||
db 0 ; YOUNGSTER
|
||||
db 1,0 ; BUG CATCHER
|
||||
db 1,0 ; LASS
|
||||
db 1,3,0 ; SAILOR
|
||||
db 1,0 ; JR_TRAINER_M
|
||||
db 1,0 ; JR_TRAINER_F
|
||||
db 1,2,3,0; POKEMANIAC
|
||||
db 1,2,0 ; SUPER_NERD
|
||||
db 1,0 ; HIKER
|
||||
db 1,0 ; BIKER
|
||||
db 1,3,0 ; BURGLAR
|
||||
db 1,0 ; ENGINEER
|
||||
db 1,2,0 ; JUGGLER_X
|
||||
db 1,3,0 ; FISHER
|
||||
db 1,3,0 ; SWIMMER
|
||||
db 0 ; CUE_BALL
|
||||
db 1,0 ; GAMBLER
|
||||
db 1,3,0 ; BEAUTY
|
||||
db 1,2,0 ; PSYCHIC_TR
|
||||
db 1,3,0 ; ROCKER
|
||||
db 1,0 ; JUGGLER
|
||||
db 1,0 ; TAMER
|
||||
db 1,0 ; BIRD_KEEPER
|
||||
db 1,0 ; BLACKBELT
|
||||
db 1,0 ; SONY1
|
||||
db 1,3,0 ; PROF_OAK
|
||||
db 1,2,0 ; CHIEF
|
||||
db 1,2,0 ; SCIENTIST
|
||||
db 1,3,0 ; GIOVANNI
|
||||
db 1,0 ; ROCKET
|
||||
db 1,3,0 ; COOLTRAINER_M
|
||||
db 1,3,0 ; COOLTRAINER_F
|
||||
db 1,0 ; BRUNO
|
||||
db 1,0 ; BROCK
|
||||
db 1,3,0 ; MISTY
|
||||
db 1,3,0 ; LT_SURGE
|
||||
db 1,3,0 ; ERIKA
|
||||
db 1,3,0 ; KOGA
|
||||
db 1,3,0 ; BLAINE
|
||||
db 1,3,0 ; SABRINA
|
||||
db 1,2,0 ; GENTLEMAN
|
||||
db 1,3,0 ; SONY2
|
||||
db 1,3,0 ; SONY3
|
||||
db 1,2,3,0; LORELEI
|
||||
db 1,0 ; CHANNELER
|
||||
db 1,0 ; AGATHA
|
||||
db 1,3,0 ; LANCE
|
||||
INCLUDE "data/trainer_move_choices.asm"
|
||||
|
||||
INCLUDE "engine/battle/trainer_pic_money_pointers.asm"
|
||||
INCLUDE "data/trainer_pic_money_pointers.asm"
|
||||
|
||||
INCLUDE "text/trainer_names.asm"
|
||||
|
||||
|
|
@ -368,57 +319,7 @@ TrainerAI:
|
|||
call Random
|
||||
jp hl
|
||||
|
||||
TrainerAIPointers:
|
||||
; one entry per trainer class
|
||||
; first byte, number of times (per Pokémon) it can occur
|
||||
; next two bytes, pointer to AI subroutine for trainer class
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,JugglerAI ; juggler_x
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 3,JugglerAI ; juggler
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 2,BlackbeltAI ; blackbelt
|
||||
dbw 3,GenericAI
|
||||
dbw 3,GenericAI
|
||||
dbw 1,GenericAI ; chief
|
||||
dbw 3,GenericAI
|
||||
dbw 1,GiovanniAI ; giovanni
|
||||
dbw 3,GenericAI
|
||||
dbw 2,CooltrainerMAI ; cooltrainerm
|
||||
dbw 1,CooltrainerFAI ; cooltrainerf
|
||||
dbw 2,BrunoAI ; bruno
|
||||
dbw 5,BrockAI ; brock
|
||||
dbw 1,MistyAI ; misty
|
||||
dbw 1,LtSurgeAI ; surge
|
||||
dbw 1,ErikaAI ; erika
|
||||
dbw 2,KogaAI ; koga
|
||||
dbw 2,BlaineAI ; blaine
|
||||
dbw 1,SabrinaAI ; sabrina
|
||||
dbw 3,GenericAI
|
||||
dbw 1,Sony2AI ; sony2
|
||||
dbw 1,Sony3AI ; sony3
|
||||
dbw 2,LoreleiAI ; lorelei
|
||||
dbw 3,GenericAI
|
||||
dbw 2,AgathaAI ; agatha
|
||||
dbw 1,LanceAI ; lance
|
||||
INCLUDE "data/trainer_ai_pointers.asm"
|
||||
|
||||
JugglerAI:
|
||||
cp 25 percent + 1
|
||||
|
|
|
|||
|
|
@ -1,143 +0,0 @@
|
|||
TrainerPicAndMoneyPointers:
|
||||
; trainer pic pointers and base money.
|
||||
; money received after battle = base money × level of highest-level enemy mon
|
||||
dw YoungsterPic
|
||||
money 1500
|
||||
|
||||
dw BugCatcherPic
|
||||
money 1000
|
||||
|
||||
dw LassPic
|
||||
money 1500
|
||||
|
||||
dw SailorPic
|
||||
money 3000
|
||||
|
||||
dw JrTrainerMPic
|
||||
money 2000
|
||||
|
||||
dw JrTrainerFPic
|
||||
money 2000
|
||||
|
||||
dw PokemaniacPic
|
||||
money 5000
|
||||
|
||||
dw SuperNerdPic
|
||||
money 2500
|
||||
|
||||
dw HikerPic
|
||||
money 3500
|
||||
|
||||
dw BikerPic
|
||||
money 2000
|
||||
|
||||
dw BurglarPic
|
||||
money 9000
|
||||
|
||||
dw EngineerPic
|
||||
money 5000
|
||||
|
||||
dw JugglerPic
|
||||
money 3500
|
||||
|
||||
dw FisherPic
|
||||
money 3500
|
||||
|
||||
dw SwimmerPic
|
||||
money 500
|
||||
|
||||
dw CueBallPic
|
||||
money 2500
|
||||
|
||||
dw GamblerPic
|
||||
money 7000
|
||||
|
||||
dw BeautyPic
|
||||
money 7000
|
||||
|
||||
dw PsychicPic
|
||||
money 1000
|
||||
|
||||
dw RockerPic
|
||||
money 2500
|
||||
|
||||
dw JugglerPic
|
||||
money 3500
|
||||
|
||||
dw TamerPic
|
||||
money 4000
|
||||
|
||||
dw BirdKeeperPic
|
||||
money 2500
|
||||
|
||||
dw BlackbeltPic
|
||||
money 2500
|
||||
|
||||
dw Rival1Pic
|
||||
money 3500
|
||||
|
||||
dw ProfOakPic
|
||||
money 9900
|
||||
|
||||
dw ChiefPic
|
||||
money 3000
|
||||
|
||||
dw ScientistPic
|
||||
money 5000
|
||||
|
||||
dw GiovanniPic
|
||||
money 9900
|
||||
|
||||
dw RocketPic
|
||||
money 3000
|
||||
|
||||
dw CooltrainerMPic
|
||||
money 3500
|
||||
|
||||
dw CooltrainerFPic
|
||||
money 3500
|
||||
|
||||
dw BrunoPic
|
||||
money 9900
|
||||
|
||||
dw BrockPic
|
||||
money 9900
|
||||
|
||||
dw MistyPic
|
||||
money 9900
|
||||
|
||||
dw LtSurgePic
|
||||
money 9900
|
||||
|
||||
dw ErikaPic
|
||||
money 9900
|
||||
|
||||
dw KogaPic
|
||||
money 9900
|
||||
|
||||
dw BlainePic
|
||||
money 9900
|
||||
|
||||
dw SabrinaPic
|
||||
money 9900
|
||||
|
||||
dw GentlemanPic
|
||||
money 7000
|
||||
|
||||
dw Rival2Pic
|
||||
money 6500
|
||||
|
||||
dw Rival3Pic
|
||||
money 9900
|
||||
|
||||
dw LoreleiPic
|
||||
money 9900
|
||||
|
||||
dw ChannelerPic
|
||||
money 3000
|
||||
|
||||
dw AgathaPic
|
||||
money 9900
|
||||
|
||||
dw LancePic
|
||||
money 9900
|
||||
|
|
@ -101,18 +101,4 @@ TryDoWildEncounter:
|
|||
xor a
|
||||
ret
|
||||
|
||||
WildMonEncounterSlotChances:
|
||||
; There are 10 slots for wild pokemon, and this is the table that defines how common each of
|
||||
; those 10 slots is. A random number is generated and then the first byte of each pair in this
|
||||
; table is compared against that random number. If the random number is less than or equal
|
||||
; to the first byte, then that slot is chosen. The second byte is double the slot number.
|
||||
db $32, $00 ; 51/256 = 19.9% chance of slot 0
|
||||
db $65, $02 ; 51/256 = 19.9% chance of slot 1
|
||||
db $8C, $04 ; 39/256 = 15.2% chance of slot 2
|
||||
db $A5, $06 ; 25/256 = 9.8% chance of slot 3
|
||||
db $BE, $08 ; 25/256 = 9.8% chance of slot 4
|
||||
db $D7, $0A ; 25/256 = 9.8% chance of slot 5
|
||||
db $E4, $0C ; 13/256 = 5.1% chance of slot 6
|
||||
db $F1, $0E ; 13/256 = 5.1% chance of slot 7
|
||||
db $FC, $10 ; 11/256 = 4.3% chance of slot 8
|
||||
db $FF, $12 ; 3/256 = 1.2% chance of slot 9
|
||||
INCLUDE "data/wild_probabilities.asm"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue