diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm
index fb06d931b..726e712c2 100644
--- a/audio/sfx_pointers.asm
+++ b/audio/sfx_pointers.asm
@@ -1,212 +1,213 @@
 ; e927c
-	dbw $3c, $4b3f ; dex fanfare 50-79
-	dbw $3c, $4c2f ; item
-	dbw $3c, $4c89 ; caught mon
-	dbw $3c, $4941 ; pokeballs placed on table
-	dbw $3c, $4947 ; potion
-	dbw $3c, $494a ; full heal
-	dbw $3c, $494d ; menu
-	dbw $3c, $4950 ; read text
-	dbw $3c, $4950 ; read text
-	dbw $3c, $4bd5 ; dex fanfare 20-49
-	dbw $3c, $4cea ; dex fanfare 80-109
-	dbw $3c, $4953 ; poison
-	dbw $3c, $4956 ; got safari balls
-	dbw $3c, $4959 ; boot pc
-	dbw $3c, $495c ; shut down pc
-	dbw $3c, $495f ; choose pc option
-	dbw $3c, $4962 ; bide / escape rope
-	dbw $3c, $4965 ; push button
-	dbw $3c, $4968 ; second part of itemfinder
-	dbw $3c, $496b ; warp to
-	dbw $3c, $496e ; warp from
-	dbw $3c, $4971 ; change dex mode
-	dbw $3c, $4974 ; jump over ledge
-	dbw $3c, $4977 ; grass rustle
-	dbw $3c, $497a ; fly
-	dbw $3c, $497d ; wrong
-	dbw $3c, $4983 ; squeak
-	dbw $3c, $4986 ; strength
-	dbw $3c, $4989 ; boat
-	dbw $3c, $498f ; wall open
-	dbw $3c, $4992 ; place puzzle piece down
-	dbw $3c, $4995 ; enter door
-	dbw $3c, $4998 ; switch pokemon
-	dbw $3c, $499e ; score tally? ; sounds like something out of game corner
-	dbw $3c, $49a4 ; buy/sell
-	dbw $3c, $49ad ; exit building
-	dbw $3c, $49aa ; bump
-	dbw $3c, $49b0 ; save
-	dbw $3c, $49f8 ; pokeflute
-	dbw $3c, $49fb ; elevator end
-	dbw $3c, $49fe ; throw ball
-	dbw $3c, $4a04 ; smokescreen
-	dbw $3c, $4a0a ;	; something skidding on water?
-	dbw $3c, $4a10 ; run
-	dbw $3c, $4a13 ; slot machine start
-	dbw $3c, $4dbe ; fanfare
-	dbw $3c, $4a3d ; peck
-	dbw $3c, $4a40 ; kinesis
-	dbw $3c, $4a43 ; lick
-	dbw $3c, $4a46 ; pound
-	dbw $3c, $4a49 ; move puzzle piece
-	dbw $3c, $4a4c ; comet punch
-	dbw $3c, $4a4f ; mega punch
-	dbw $3c, $4a52 ; scratch
-	dbw $3c, $4a55 ; vicegrip
-	dbw $3c, $4a58 ; razor wind
-	dbw $3c, $4a5b ; cut
-	dbw $3c, $4a5e ; wing attack
-	dbw $3c, $4a61 ; whirlwind
-	dbw $3c, $4a64 ; bind
-	dbw $3c, $4a67 ; vine whip
-	dbw $3c, $4a6a ; double kick
-	dbw $3c, $4a6d ; mega kick
-	dbw $3c, $4a70 ; headbutt
-	dbw $3c, $4a73 ; horn attack
-	dbw $3c, $4a76 ; tackle
-	dbw $3c, $4a79 ; poison sting
-	dbw $3c, $4a7c ; poisonpowder
-	dbw $3c, $4a7f ; doubleslap
-	dbw $3c, $4a82 ; bite
-	dbw $3c, $4a88 ; jump kick
-	dbw $3c, $4a8b ; stomp
-	dbw $3c, $4a8e ; tail whip
-	dbw $3c, $4a91 ; karate chop
-	dbw $3c, $4a94 ; submission
-	dbw $3c, $4a97 ; water gun
-	dbw $3c, $4a9d ; swords dance
-	dbw $3c, $4aa0 ; thunder
-	dbw $3c, $4aa3 ; supersonic
-	dbw $3c, $4aac ; leer
-	dbw $3c, $4ab5 ; ember
-	dbw $3c, $4abb ; bubblebeam
-	dbw $3c, $4ac4 ; hydro pump
-	dbw $3c, $4aca ; surf
-	dbw $3c, $4ad3 ; psybeam
-	dbw $3c, $4adc ; leech seed
-	dbw $3c, $4ae5 ; thundershock
-	dbw $3c, $4aee ; psychic
-	dbw $3c, $4af7 ; screech
-	dbw $3c, $4afd ; bone club
-	dbw $3c, $4b03 ; sharpen
-	dbw $3c, $4b09 ; egg bomb
-	dbw $3c, $4b12 ; sing
-	dbw $3c, $4b18 ; sky attack
-	dbw $3c, $4b21 ; hyper beam
-	dbw $3c, $4b24 ; shine
-	dbw $3c, $4a1c ;
-	dbw $3c, $4a1f ; $60
-	dbw $3c, $4a22 ; tap
-	dbw $3c, $4a25 ; tap
-	dbw $3c, $4a28 ; burn ; that is not a burn
-	dbw $3c, $4a2b ; title screen sound
-	dbw $3c, $4a2e ; similar to $60
-	dbw $3c, $4a31 ; get coin from slots
-	dbw $3c, $4a34 ; pay day
-	dbw $3c, $4a3a ; metronome
-	dbw $3c, $4a19 ; call
-	dbw $3c, $4b2d ; hang up
-	dbw $3c, $4b30 ; no signal
-	dbw $3c, $4b2a ; sandstorm
-	dbw $3c, $4b33 ; elevator
-	dbw $3c, $52b4 ; protect
-	dbw $3c, $52f6 ; sketch
-	dbw $3c, $5314 ; rain dance
-	dbw $3c, $5334 ; aeroblast
-	dbw $3c, $5352 ; spark
-	dbw $3c, $5360 ; curse
-	dbw $3c, $537d ; rage
-	dbw $3c, $539c ; thief
-	dbw $3c, $53b0 ; thief
-	dbw $3c, $53ca ; spider web
-	dbw $3c, $53f7 ; mind reader
-	dbw $3c, $541d ; nighmare
-	dbw $3c, $5453 ; snore
-	dbw $3c, $5469 ; sweet kiss
-	dbw $3c, $547f ; sweet kiss
-	dbw $3c, $54a5 ; belly drum
-	dbw $3c, $54ba ;
-	dbw $3c, $54d0 ; sludge bomb
-	dbw $3c, $54f5 ; foresight
-	dbw $3c, $5515 ; spite
-	dbw $3c, $553a ; outrage
-	dbw $3c, $554d ; perish song
-	dbw $3c, $5570 ; giga drain
-	dbw $3c, $55b4 ; attract
-	dbw $3c, $55cc ; kinesis
-	dbw $3c, $55de ; zap cannon
-	dbw $3c, $55ef ; mean look
-	dbw $3c, $5621 ; heal bell
-	dbw $3c, $5637 ; return
-	dbw $3c, $5653 ; exp bar
-	dbw $3c, $567f ; milk drink
-	dbw $3c, $569f ; present
-	dbw $3c, $56b9 ; morning sun
-	dbw $3c, $4b3f ; level up
-	dbw $3c, $4b86 ; key item
-	dbw $3c, $4d56 ; fanfare
-	dbw $3c, $4dc7 ; register phone #
-	dbw $3c, $4e26 ; 3rd place
-	dbw $3c, $4e66 ; get egg from daycare man
-	dbw $3c, $4e66 ; get egg from daycare lady
-	dbw $3c, $4edc ; move deleted
-	dbw $3c, $4f5e ; 2nd place
-	dbw $3c, $4fe2 ; 1st place
-	dbw $3c, $5069 ; choose a card
-	dbw $3c, $5104 ; get tm
-	dbw $3c, $517d ; get badge
-	dbw $3c, $5236 ; quit slots
-	dbw $3c, $5775 ; nothing
-	dbw $3c, $5878 ; dex fanfare <20
-	dbw $3c, $58d2 ; dex fanfare 140-169
-	dbw $3c, $5951 ; dex fanfare 170-199
-	dbw $3c, $59d6 ; dex fanfare 200-229
-	dbw $3c, $5a66 ; dex fanfare >=230
-	dbw $3c, $5784 ; evolved
-	dbw $3c, $579b ; master ball
-	dbw $3c, $57c0 ; egg crack
-	dbw $3c, $57d9 ; charizard fireball (gs intro)
-	dbw $3c, $57ff ; pokemon appears (gs intro)
-	dbw $3c, $5818 ; flash
-	dbw $3c, $5846 ; game freak logo
-	dbw $3c, $5b33 ; not very effective
-	dbw $3c, $5b40 ; damage
-	dbw $3c, $5b50 ; super effective
-	dbw $3c, $5b63 ; ball bounce
-	dbw $3c, $56df ; moonlight
-	dbw $3c, $56fd ; encore
-	dbw $3c, $5721 ; beat up
-	dbw $3c, $574c ; batom pass
-	dbw $3c, $4944 ; ball wiggle
-	dbw $3c, $5734 ; sweet scent
-	dbw $3c, $5bb3 ; sweet scent
-	dbw $3c, $5bec ; hit end of exp bar
-	dbw $3c, $5c10 ; give trademon
-	dbw $3c, $5c3e ; get trademon
-	dbw $3c, $5c6c ; train arrived
-	dbw $3c, $675b ; stop slot
-	dbw $3c, $5cb4 ; 2 boops
-	dbw $3c, $6769 ; glass ting
-	dbw $3c, $6773 ; 2 glass ting
+	dbw $3c, $4b3f ; Dex Fanfare 50-79
+	dbw $3c, $4c2f ; Item
+	dbw $3c, $4c89 ; Caught Mon
+	dbw $3c, $4941 ; Pokeballs Placed On Table
+	dbw $3c, $4947 ; Potion
+	dbw $3c, $494a ; Full Heal
+	dbw $3c, $494d ; Menu
+	dbw $3c, $4950 ; Read Text
+	dbw $3c, $4950 ; Read Text 2
+	dbw $3c, $4bd5 ; Dex Fanfare 20-49
+	dbw $3c, $4cea ; Dex Fanfare 80-109
+	dbw $3c, $4953 ; Poison
+	dbw $3c, $4956 ; Got Safari Balls
+	dbw $3c, $4959 ; Boot Pc
+	dbw $3c, $495c ; Shut Down Pc
+	dbw $3c, $495f ; Choose Pc Option
+	dbw $3c, $4962 ; Escape Rope
+	dbw $3c, $4965 ; Push Button
+	dbw $3c, $4968 ; Second Part Of Itemfinder
+	dbw $3c, $496b ; Warp To
+	dbw $3c, $496e ; Warp From
+	dbw $3c, $4971 ; Change Dex Mode
+	dbw $3c, $4974 ; Jump Over Ledge
+	dbw $3c, $4977 ; Grass Rustle
+	dbw $3c, $497a ; Fly
+	dbw $3c, $497d ; Wrong
+	dbw $3c, $4983 ; Squeak
+	dbw $3c, $4986 ; Strength
+	dbw $3c, $4989 ; Boat
+	dbw $3c, $498f ; Wall Open
+	dbw $3c, $4992 ; Place Puzzle Piece Down
+	dbw $3c, $4995 ; Enter Door
+	dbw $3c, $4998 ; Switch Pokemon
+	dbw $3c, $499e ; Tally
+	dbw $3c, $49a4 ; Transaction
+	dbw $3c, $49ad ; Exit Building
+	dbw $3c, $49aa ; Bump
+	dbw $3c, $49b0 ; Save
+	dbw $3c, $49f8 ; Pokeflute
+	dbw $3c, $49fb ; Elevator End
+	dbw $3c, $49fe ; Throw Ball
+	dbw $3c, $4a04 ; Ball Poof
+	dbw $3c, $4a0a ; Unknown 3A
+	dbw $3c, $4a10 ; Run
+	dbw $3c, $4a13 ; Slot Machine Start
+	dbw $3c, $4dbe ; Fanfare
+	dbw $3c, $4a3d ; Peck
+	dbw $3c, $4a40 ; Kinesis
+	dbw $3c, $4a43 ; Lick
+	dbw $3c, $4a46 ; Pound
+	dbw $3c, $4a49 ; Move Puzzle Piece
+	dbw $3c, $4a4c ; Comet Punch
+	dbw $3c, $4a4f ; Mega Punch
+	dbw $3c, $4a52 ; Scratch
+	dbw $3c, $4a55 ; Vicegrip
+	dbw $3c, $4a58 ; Razor Wind
+	dbw $3c, $4a5b ; Cut
+	dbw $3c, $4a5e ; Wing Attack
+	dbw $3c, $4a61 ; Whirlwind
+	dbw $3c, $4a64 ; Bind
+	dbw $3c, $4a67 ; Vine Whip
+	dbw $3c, $4a6a ; Double Kick
+	dbw $3c, $4a6d ; Mega Kick
+	dbw $3c, $4a70 ; Headbutt
+	dbw $3c, $4a73 ; Horn Attack
+	dbw $3c, $4a76 ; Tackle
+	dbw $3c, $4a79 ; Poison Sting
+	dbw $3c, $4a7c ; Powder
+	dbw $3c, $4a7f ; Doubleslap
+	dbw $3c, $4a82 ; Bite
+	dbw $3c, $4a88 ; Jump Kick
+	dbw $3c, $4a8b ; Stomp
+	dbw $3c, $4a8e ; Tail Whip
+	dbw $3c, $4a91 ; Karate Chop
+	dbw $3c, $4a94 ; Submission
+	dbw $3c, $4a97 ; Water Gun
+	dbw $3c, $4a9d ; Swords Dance
+	dbw $3c, $4aa0 ; Thunder
+	dbw $3c, $4aa3 ; Supersonic
+	dbw $3c, $4aac ; Leer
+	dbw $3c, $4ab5 ; Ember
+	dbw $3c, $4abb ; Bubblebeam
+	dbw $3c, $4ac4 ; Hydro Pump
+	dbw $3c, $4aca ; Surf
+	dbw $3c, $4ad3 ; Psybeam
+	dbw $3c, $4adc ; Charge
+	dbw $3c, $4ae5 ; Thundershock
+	dbw $3c, $4aee ; Psychic
+	dbw $3c, $4af7 ; Screech
+	dbw $3c, $4afd ; Bone Club
+	dbw $3c, $4b03 ; Sharpen
+	dbw $3c, $4b09 ; Egg Bomb
+	dbw $3c, $4b12 ; Sing
+	dbw $3c, $4b18 ; Hyper Beam
+	dbw $3c, $4b21 ; Shine
+	dbw $3c, $4b24 ; Unknown 5F
+	dbw $3c, $4a1c ; Unknown 60
+	dbw $3c, $4a1f ; Unknown 61
+	dbw $3c, $4a22 ; Unknown 62
+	dbw $3c, $4a25 ; Unknown 63
+	dbw $3c, $4a28 ; Burn
+	dbw $3c, $4a2b ; Title Screen Entrance
+	dbw $3c, $4a2e ; Unknown 66
+	dbw $3c, $4a31 ; Get Coin From Slots
+	dbw $3c, $4a34 ; Pay Day
+	dbw $3c, $4a3a ; Metronome
+	dbw $3c, $4a19 ; Call
+	dbw $3c, $4b2d ; Hang Up
+	dbw $3c, $4b30 ; No Signal
+	dbw $3c, $4b2a ; Sandstorm
+	dbw $3c, $4b33 ; Elevator
+	dbw $3c, $52b4 ; Protect
+	dbw $3c, $52f6 ; Sketch
+	dbw $3c, $5314 ; Rain Dance
+	dbw $3c, $5334 ; Aeroblast
+	dbw $3c, $5352 ; Spark
+	dbw $3c, $5360 ; Curse
+	dbw $3c, $537d ; Rage
+	dbw $3c, $539c ; Thief
+	dbw $3c, $53b0 ; Thief 2
+	dbw $3c, $53ca ; Spider Web
+	dbw $3c, $53f7 ; Mind Reader
+	dbw $3c, $541d ; Nightmare
+	dbw $3c, $5453 ; Snore
+	dbw $3c, $5469 ; Sweet Kiss
+	dbw $3c, $547f ; Sweet Kiss 2
+	dbw $3c, $54a5 ; Belly Drum
+	dbw $3c, $54ba ; Unknown 7F
+	dbw $3c, $54d0 ; Sludge Bomb
+	dbw $3c, $54f5 ; Foresight
+	dbw $3c, $5515 ; Spite
+	dbw $3c, $553a ; Outrage
+	dbw $3c, $554d ; Perish Song
+	dbw $3c, $5570 ; Giga Drain
+	dbw $3c, $55b4 ; Attract
+	dbw $3c, $55cc ; Kinesis 2
+	dbw $3c, $55de ; Zap Cannon
+	dbw $3c, $55ef ; Mean Look
+	dbw $3c, $5621 ; Heal Bell
+	dbw $3c, $5637 ; Return
+	dbw $3c, $5653 ; Exp Bar
+	dbw $3c, $567f ; Milk Drink
+	dbw $3c, $569f ; Present
+	dbw $3c, $56b9 ; Morning Sun
+	dbw $3c, $4b3f ; Level Up
+	dbw $3c, $4b86 ; Key Item
+	dbw $3c, $4d56 ; Fanfare 2
+	dbw $3c, $4dc7 ; Register Phone #
+	dbw $3c, $4e26 ; 3Rd Place
+	dbw $3c, $4e66 ; Get Egg From Daycare Man
+	dbw $3c, $4e66 ; Get Egg From Daycare Lady
+	dbw $3c, $4edc ; Move Deleted
+	dbw $3c, $4f5e ; 2Nd Place
+	dbw $3c, $4fe2 ; 1St Place
+	dbw $3c, $5069 ; Choose A Card
+	dbw $3c, $5104 ; Get Tm
+	dbw $3c, $517d ; Get Badge
+	dbw $3c, $5236 ; Quit Slots
+	dbw $3c, $5775 ; Egg Crack
+	dbw $3c, $5878 ; Dex Fanfare < 20
+	dbw $3c, $58d2 ; Dex Fanfare 140-169
+	dbw $3c, $5951 ; Dex Fanfare 170-199
+	dbw $3c, $59d6 ; Dex Fanfare 200-229
+	dbw $3c, $5a66 ; Dex Fanfare 230 +
+	dbw $3c, $5784 ; Evolved
+	dbw $3c, $579b ; Master Ball
+	dbw $3c, $57c0 ; Egg Hatch
+	dbw $3c, $57d9 ; Gs Intro Charizard Fireball
+	dbw $3c, $57ff ; Gs Intro Pokemon Appears
+	dbw $3c, $5818 ; Flash
+	dbw $3c, $5846 ; Game Freak Logo Gs
+	dbw $3c, $5b33 ; Not Very Effective
+	dbw $3c, $5b40 ; Damage
+	dbw $3c, $5b50 ; Super Effective
+	dbw $3c, $5b63 ; Ball Bounce
+	dbw $3c, $56df ; Moonlight
+	dbw $3c, $56fd ; Encore
+	dbw $3c, $5721 ; Beat Up
+	dbw $3c, $574c ; Baton Pass
+	dbw $3c, $4944 ; Ball Wiggle
+	dbw $3c, $5734 ; Sweet Scent
+	dbw $3c, $5bb3 ; Sweet Scent 2
+	dbw $3c, $5bec ; Hit End Of Exp Bar
+	dbw $3c, $5c10 ; Give Trademon
+	dbw $3c, $5c3e ; Get Trademon
+	dbw $3c, $5c6c ; Train Arrived
+	dbw $3c, $675b ; Stop Slot
+	dbw $3c, $5cb4 ; 2 Boops
+	dbw $3c, $6769 ; Glass Ting
+	dbw $3c, $6773 ; Glass Ting 2
 	
 ; Crystal adds the following SFX:
 	
-	dbw $5e, $582d ; intro unown 1
-	dbw $5e, $583e ; intro unown 2
-	dbw $5e, $584f ; intro unown 3
-	dbw $5e, $586e ; boop
-	dbw $5e, $5888 ; game freak ditto transform
-	dbw $5e, $58a0 ; intro suicune 1
-	dbw $5e, $58aa ; intro pichu
-	dbw $5e, $58c0 ; intro suicune 2
-	dbw $5e, $58f4 ; intro suicune 3
-	dbw $5e, $5907 ; game freak ditto bounce
-	dbw $5e, $591d ; intro suicune 4
-	dbw $5e, $5942 ; game freak presents
-	dbw $5e, $5961 ; tingle
-	dbw $3c, $5cd0 ; sand?
-	dbw $5e, $597c ; two pc beeps
-	dbw $5e, $5992 ; 4 note ditty
-	dbw $5e, $59cb ; twinkle
+	dbw $5e, $582d ; Intro Unown 1
+	dbw $5e, $583e ; Intro Unown 2
+	dbw $5e, $584f ; Intro Unown 3
+	dbw $5e, $586e ; Ditto Pop Up
+	dbw $5e, $5888 ; Ditto Transform
+	dbw $5e, $58a0 ; Intro Suicune 1
+	dbw $5e, $58aa ; Intro Pichu
+	dbw $5e, $58c0 ; Intro Suicune 2
+	dbw $5e, $58f4 ; Intro Suicune 3
+	dbw $5e, $5907 ; Ditto Bounce
+	dbw $5e, $591d ; Intro Suicune 4
+	dbw $5e, $5942 ; Game Freak Presents
+	dbw $5e, $5961 ; Tingle
+	dbw $3c, $5cd0 ; Unknown Cb
+	dbw $5e, $597c ; Two Pc Beeps
+	dbw $5e, $5992 ; 4 Note Ditty
+	dbw $5e, $59cb ; Twinkle
 ; e94e9
+