diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/animations.asm | 346 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 10 | ||||
| -rwxr-xr-x | engine/evos_moves.asm | 4 | ||||
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 2 | ||||
| -rwxr-xr-x | engine/items/items.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/elevator.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 12 |
11 files changed, 195 insertions, 195 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 5e3ff37b..104d32ff 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -76,7 +76,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ld hl,vBGMap1 call CopyTileMapToVRAM call FillMiddleOfScreenWithWhite - ld a,%11111100 ; make the mon a black silhouette + ld a,%11111100 ; make the mon a black silhouette ld [rBGP],a ; scroll the mon left by one tile 7 times @@ -88,7 +88,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ; scroll the mon left by one tile 20 times ; This time, we have to move the window left too in order to hide the text that -; is wrapping around to the right side of the screen. +; is wrapping around to the right side of the screen. ld c,20 .scrollLoop2 call ScrollCreditsMonLeft diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d9406257..73d152b8 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -741,7 +741,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,11 ; is it the beginning of the subanimation? jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,SFX_BATTLE_01 + ld a,SFX_BALL_TOSS call PlaySound .skipPlayingSound ld a,[W_ISINBATTLE] @@ -820,7 +820,7 @@ DoPoofSpecialEffects: ; 78fce (1e:4fce) ld a,[W_SUBANIMCOUNTER] cp a,5 ret nz - ld a,SFX_BATTLE_02 + ld a,SFX_BALL_POOF jp PlaySound DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) @@ -2274,7 +2274,7 @@ GetMoveSoundB: ; 79869 (1e:5869) ld b, a ret -; get the sound of the move id in a +; get the sound of the (move id - 1) in a GetMoveSound: ; 7986f (1e:586f) ld hl,MoveSoundTable ld e,a @@ -2329,172 +2329,172 @@ IsCryMove: ; 798ad (1e:58ad) ret MoveSoundTable: ; 798bc (1e:58bc) - db SFX_BATTLE_0A,$00,$80 - db SFX_BATTLE_0C,$10,$80 - db SFX_BATTLE_1D,$00,$80 - db SFX_BATTLE_0B,$01,$80 - db SFX_BATTLE_0D,$00,$40 - db SFX_BATTLE_37,$00,$ff - db SFX_BATTLE_0D,$10,$60 - db SFX_BATTLE_0D,$20,$80 - db SFX_BATTLE_0D,$00,$a0 - db SFX_BATTLE_10,$00,$80 - db SFX_BATTLE_0F,$20,$40 - db SFX_BATTLE_0F,$00,$80 - db SFX_BATTLE_0E,$00,$a0 - db SFX_BATTLE_11,$10,$c0 - db SFX_BATTLE_11,$00,$a0 - db SFX_BATTLE_12,$00,$c0 - db SFX_BATTLE_12,$10,$a0 - db SFX_BATTLE_13,$00,$e0 - db SFX_BATTLE_11,$20,$c0 - db SFX_BATTLE_14,$00,$80 - db SFX_BATTLE_22,$00,$80 - db SFX_BATTLE_15,$01,$80 - db SFX_BATTLE_20,$00,$80 - db SFX_BATTLE_17,$f0,$40 - db SFX_BATTLE_1A,$00,$80 - db SFX_BATTLE_17,$00,$80 - db SFX_BATTLE_21,$10,$80 - db SFX_BATTLE_1B,$01,$a0 - db SFX_BATTLE_18,$00,$80 - db SFX_BATTLE_1E,$00,$60 - db SFX_BATTLE_1E,$01,$40 - db SFX_BATTLE_1F,$00,$a0 - db SFX_BATTLE_1A,$10,$a0 - db SFX_BATTLE_20,$00,$c0 - db SFX_BATTLE_14,$10,$60 - db SFX_BATTLE_1A,$00,$a0 - db SFX_BATTLE_22,$11,$c0 - db SFX_BATTLE_1A,$20,$c0 - db SFX_BATTLE_21,$00,$80 - db SFX_BATTLE_1B,$00,$80 - db SFX_BATTLE_1B,$20,$c0 - db SFX_BATTLE_19,$00,$80 - db SFX_BATTLE_31,$ff,$40 - db SFX_BATTLE_1E,$00,$80 - db SFX_BATTLE_0B,$00,$c0 - db SFX_BATTLE_0B,$00,$40 - db SFX_BATTLE_35,$00,$80 - db SFX_BATTLE_27,$40,$60 - db SFX_BATTLE_27,$00,$80 - db SFX_BATTLE_27,$ff,$40 - db SFX_BATTLE_2A,$80,$c0 - db SFX_BATTLE_19,$10,$a0 - db SFX_BATTLE_19,$21,$e0 - db SFX_BATTLE_29,$00,$80 - db SFX_BATTLE_24,$20,$60 - db SFX_BATTLE_2A,$00,$80 - db SFX_BATTLE_2C,$00,$80 - db SFX_BATTLE_28,$40,$80 - db SFX_BATTLE_29,$f0,$e0 - db SFX_BATTLE_2D,$00,$80 - db SFX_BATTLE_2A,$f0,$60 - db SFX_BATTLE_28,$00,$80 - db SFX_BATTLE_36,$00,$80 - db SFX_BATTLE_07,$01,$a0 - db SFX_BATTLE_13,$f0,$20 - db SFX_BATTLE_23,$01,$c0 - db SFX_BATTLE_23,$00,$80 - db SFX_BATTLE_1A,$00,$e0 - db SFX_BATTLE_26,$01,$60 - db SFX_BATTLE_26,$20,$40 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_24,$40,$c0 - db SFX_BATTLE_1B,$03,$60 - db SFX_BATTLE_25,$11,$e0 - db SFX_BATTLE_12,$20,$e0 - db SFX_BATTLE_2E,$00,$80 - db SFX_BATTLE_1C,$00,$80 - db SFX_BATTLE_1C,$11,$a0 - db SFX_BATTLE_1C,$01,$c0 - db SFX_BATTLE_13,$14,$c0 - db SFX_BATTLE_1B,$02,$a0 - db SFX_BATTLE_29,$f0,$80 - db SFX_BATTLE_29,$20,$c0 - db SFX_BATTLE_2F,$00,$20 - db SFX_BATTLE_2F,$20,$80 - db SFX_BATTLE_2E,$12,$60 - db SFX_BATTLE_26,$00,$80 - db SFX_BATTLE_14,$01,$e0 - db SFX_BATTLE_29,$0f,$e0 - db SFX_BATTLE_29,$11,$20 - db SFX_BATTLE_10,$10,$40 - db SFX_BATTLE_0F,$10,$c0 - db SFX_BATTLE_14,$00,$20 - db SFX_BATTLE_30,$00,$80 - db SFX_BATTLE_35,$11,$18 - db SFX_BATTLE_09,$20,$c0 - db SFX_BATTLE_08,$20,$c0 - db SFX_BATTLE_25,$00,$10 - db SFX_BATTLE_26,$f0,$20 - db SFX_BATTLE_33,$f0,$c0 - db SFX_BATTLE_11,$f0,$e0 - db SFX_BATTLE_09,$f0,$40 - db SFX_BATTLE_31,$00,$80 - db SFX_BATTLE_33,$80,$40 - db SFX_BATTLE_33,$00,$80 - db SFX_BATTLE_14,$11,$20 - db SFX_BATTLE_14,$22,$10 - db SFX_BATTLE_1B,$f1,$ff - db SFX_BATTLE_13,$f1,$ff - db SFX_BATTLE_14,$33,$30 - db SFX_BATTLE_32,$40,$c0 - db SFX_BATTLE_0E,$20,$20 - db SFX_BATTLE_0E,$f0,$10 - db SFX_BATTLE_0F,$f8,$10 - db SFX_BATTLE_11,$f0,$10 - db SFX_BATTLE_25,$00,$80 - db SFX_BATTLE_18,$00,$c0 - db SFX_BATTLE_32,$c0,$ff - db SFX_BATTLE_09,$f2,$20 - db SFX_BATTLE_34,$00,$80 - db SFX_BATTLE_34,$00,$40 - db SFX_BATTLE_09,$00,$40 - db SFX_BATTLE_11,$10,$ff - db SFX_BATTLE_2A,$20,$20 - db SFX_BATTLE_32,$00,$80 - db SFX_BATTLE_29,$1f,$20 - db SFX_BATTLE_25,$2f,$80 - db SFX_BATTLE_0F,$1f,$ff - db SFX_BATTLE_2B,$1f,$60 - db SFX_BATTLE_26,$1e,$20 - db SFX_BATTLE_26,$1f,$18 - db SFX_BATTLE_14,$0f,$80 - db SFX_BATTLE_09,$f8,$10 - db SFX_BATTLE_08,$18,$20 - db SFX_BATTLE_32,$08,$40 - db SFX_BATTLE_17,$01,$e0 - db SFX_BATTLE_11,$09,$ff - db SFX_BATTLE_35,$42,$01 - db SFX_BATTLE_1C,$00,$ff - db SFX_BATTLE_32,$08,$e0 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_09,$88,$10 - db SFX_BATTLE_25,$48,$ff - db SFX_BATTLE_08,$ff,$ff - db SFX_BATTLE_24,$ff,$10 - db SFX_BATTLE_08,$ff,$04 - db SFX_BATTLE_1C,$01,$ff - db SFX_BATTLE_13,$f8,$ff - db SFX_BATTLE_0C,$f0,$f0 - db SFX_BATTLE_0F,$08,$10 - db SFX_BATTLE_0D,$f0,$ff - db SFX_BATTLE_1A,$f0,$ff - db SFX_BATTLE_34,$10,$ff - db SFX_BATTLE_0E,$f0,$20 - db SFX_BATTLE_2B,$f0,$60 - db SFX_BATTLE_21,$12,$10 - db SFX_BATTLE_36,$f0,$20 - db SFX_BATTLE_1E,$12,$ff - db SFX_BATTLE_31,$80,$04 - db SFX_BATTLE_33,$f0,$10 - db SFX_BATTLE_29,$f8,$ff - db SFX_BATTLE_26,$f0,$ff - db SFX_BATTLE_11,$01,$ff - db SFX_BATTLE_2C,$d8,$04 - db SFX_BATTLE_0B,$00,$80 - db SFX_BATTLE_0B,$00,$80 + 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 CopyPicTiles: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] @@ -2929,7 +2929,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld a,TOSS_ANIM ld [W_ANIMATIONID],a call PlayAnimation - ld a,SFX_BATTLE_03 + ld a,SFX_FAINT_THUD call PlaySound ld a,BLOCKBALL_ANIM ld [W_ANIMATIONID],a @@ -2945,15 +2945,15 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) cp $a ld a, $20 ld b, $30 - ld c, SFX_BATTLE_10 + ld c, SFX_DAMAGE jr z, .asm_79e8b ld a, $e0 ld b, $ff - ld c, SFX_BATTLE_1A + ld c, SFX_SUPER_EFFECTIVE jr nc, .asm_79e8b ld a, $50 ld b, $1 - ld c, SFX_BATTLE_11 + ld c, SFX_NOT_VERY_EFFECTIVE .asm_79e8b ld [wc0f1], a ld a, b diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 41e402f3..1acef280 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -64,7 +64,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld [wc0f1], a ld a, $80 ld [wc0f2], a - ld a, SFX_BATTLE_37 + ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a74e0a27..4c29e003 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -353,7 +353,7 @@ EnemyRan: ; 3c202 (f:4202) ld hl, EnemyRanText .printText call PrintText - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a @@ -860,13 +860,13 @@ FaintEnemyPokemon: ; 0x3c567 xor a ld [wc0f1], a ld [wc0f2], a - ld a, SFX_BATTLE_08 ; SFX_FALL? + ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait ld a, [wc02a] - cp SFX_BATTLE_08 + cp SFX_FAINT_FALL jr z, .sfxwait - ld a, SFX_BATTLE_03 ; SFX_DROP + ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish jr .sfxplayed @@ -1672,7 +1672,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) dec a .playSound ld [wBattleResult], a - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent ld hl, GotAwayText call PrintText diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2c668d63..b9b4bb0f 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -443,7 +443,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr nz, .findEmptySlotLoop ; no empty move slots found - pop de + pop de push de push hl ld h, d @@ -472,7 +472,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr z, .nextMove ; write move PP value if learning moves from day care - push hl + push hl ld a, [hl] ld hl, wPartyMon1PP - wPartyMon1Moves add hl, de diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 08aadf02..6f1eef61 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -66,7 +66,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) ld [wMusicHeaderPointer], a dec a call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 diff --git a/engine/items/items.asm b/engine/items/items.asm index eb9f5663..a60d765a 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1713,7 +1713,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ld a,$ff call PlaySound ; turn off music ld a, SFX_POKEFLUE - ld c, BANK(SFX_02_5e) + ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wc028] diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2f22f78e..76eb7450 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -139,7 +139,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ; play pokemon cry .choseCry ld a,[wd11e] - call GetCryData ; get cry data + call GetCryData call PlaySound jr .handleMenuInput .choseArea diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 09a38012..eb62fee7 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -17,7 +17,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) add d ld [hSCY], a push bc - ld c, BANK(SFX_02_5b) + ld c, BANK(SFX_Collision_1) ld a, SFX_COLLISION call PlayMusic pop bc @@ -29,7 +29,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld [hSCY], a ld a, $ff call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index f9dcc3a5..b123f33f 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -35,7 +35,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) dec b jr nz, .asm_7046e ld a, [wc0ef] - cp BANK(Music1f_UpdateMusic) + cp BANK(Audio3_UpdateMusic) ld [wc0f0], a jr nz, .asm_70495 ld a, $ff diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 5ce2b2a6..a9aa2cf2 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, SFX_TELEPORT_2 + ld a, SFX_TELEPORT_ENTER_1 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510) pop hl jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, SFX_FLY_1 + ld a, SFX_TELEPORT_ENTER_2 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510) ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData call LoadBirdSpriteGraphics - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, SFX_TELEPORT_1 + ld a, SFX_TELEPORT_EXIT_1 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], SFX_TELEPORT_EXIT_2 ; wPlayerSpinInPlaceAnimSoundID ld hl, wFacingDirectionList call PlayerSpinInPlace jr .spinWhileMovingUp @@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list |