shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

Split move names out

--- /dev/null

+++ b/battle/move_names.asm

@@ -1,0 +1,252 @@

+	db "POUND@"

+	db "KARATE CHOP@"

+	db "DOUBLESLAP@"

+	db "COMET PUNCH@"

+	db "MEGA PUNCH@"

+	db "PAY DAY@"

+	db "FIRE PUNCH@"

+	db "ICE PUNCH@"

+	db "THUNDERPUNCH@"

+	db "SCRATCH@"

+	db "VICEGRIP@"

+	db "GUILLOTINE@"

+	db "RAZOR WIND@"

+	db "SWORDS DANCE@"

+	db "CUT@"

+	db "GUST@"

+	db "WING ATTACK@"

+	db "WHIRLWIND@"

+	db "FLY@"

+	db "BIND@"

+	db "SLAM@"

+	db "VINE WHIP@"

+	db "STOMP@"

+	db "DOUBLE KICK@"

+	db "MEGA KICK@"

+	db "JUMP KICK@"

+	db "ROLLING KICK@"

+	db "SAND-ATTACK@"

+	db "HEADBUTT@"

+	db "HORN ATTACK@"

+	db "FURY ATTACK@"

+	db "HORN DRILL@"

+	db "TACKLE@"

+	db "BODY SLAM@"

+	db "WRAP@"

+	db "TAKE DOWN@"

+	db "THRASH@"

+	db "DOUBLE-EDGE@"

+	db "TAIL WHIP@"

+	db "POISON STING@"

+	db "TWINEEDLE@"

+	db "PIN MISSILE@"

+	db "LEER@"

+	db "BITE@"

+	db "GROWL@"

+	db "ROAR@"

+	db "SING@"

+	db "SUPERSONIC@"

+	db "SONICBOOM@"

+	db "DISABLE@"

+	db "ACID@"

+	db "EMBER@"

+	db "FLAMETHROWER@"

+	db "MIST@"

+	db "WATER GUN@"

+	db "HYDRO PUMP@"

+	db "SURF@"

+	db "ICE BEAM@"

+	db "BLIZZARD@"

+	db "PSYBEAM@"

+	db "BUBBLEBEAM@"

+	db "AURORA BEAM@"

+	db "HYPER BEAM@"

+	db "PECK@"

+	db "DRILL PECK@"

+	db "SUBMISSION@"

+	db "LOW KICK@"

+	db "COUNTER@"

+	db "SEISMIC TOSS@"

+	db "STRENGTH@"

+	db "ABSORB@"

+	db "MEGA DRAIN@"

+	db "LEECH SEED@"

+	db "GROWTH@"

+	db "RAZOR LEAF@"

+	db "SOLARBEAM@"

+	db "POISONPOWDER@"

+	db "STUN SPORE@"

+	db "SLEEP POWDER@"

+	db "PETAL DANCE@"

+	db "STRING SHOT@"

+	db "DRAGON RAGE@"

+	db "FIRE SPIN@"

+	db "THUNDERSHOCK@"

+	db "THUNDERBOLT@"

+	db "THUNDER WAVE@"

+	db "THUNDER@"

+	db "ROCK THROW@"

+	db "EARTHQUAKE@"

+	db "FISSURE@"

+	db "DIG@"

+	db "TOXIC@"

+	db "CONFUSION@"

+	db "PSYCHIC@"

+	db "HYPNOSIS@"

+	db "MEDITATE@"

+	db "AGILITY@"

+	db "QUICK ATTACK@"

+	db "RAGE@"

+	db "TELEPORT@"

+	db "NIGHT SHADE@"

+	db "MIMIC@"

+	db "SCREECH@"

+	db "DOUBLE TEAM@"

+	db "RECOVER@"

+	db "HARDEN@"

+	db "MINIMIZE@"

+	db "SMOKESCREEN@"

+	db "CONFUSE RAY@"

+	db "WITHDRAW@"

+	db "DEFENSE CURL@"

+	db "BARRIER@"

+	db "LIGHT SCREEN@"

+	db "HAZE@"

+	db "REFLECT@"

+	db "FOCUS ENERGY@"

+	db "BIDE@"

+	db "METRONOME@"

+	db "MIRROR MOVE@"

+	db "SELFDESTRUCT@"

+	db "EGG BOMB@"

+	db "LICK@"

+	db "SMOG@"

+	db "SLUDGE@"

+	db "BONE CLUB@"

+	db "FIRE BLAST@"

+	db "WATERFALL@"

+	db "CLAMP@"

+	db "SWIFT@"

+	db "SKULL BASH@"

+	db "SPIKE CANNON@"

+	db "CONSTRICT@"

+	db "AMNESIA@"

+	db "KINESIS@"

+	db "SOFTBOILED@"

+	db "HI JUMP KICK@"

+	db "GLARE@"

+	db "DREAM EATER@"

+	db "POISON GAS@"

+	db "BARRAGE@"

+	db "LEECH LIFE@"

+	db "LOVELY KISS@"

+	db "SKY ATTACK@"

+	db "TRANSFORM@"

+	db "BUBBLE@"

+	db "DIZZY PUNCH@"

+	db "SPORE@"

+	db "FLASH@"

+	db "PSYWAVE@"

+	db "SPLASH@"

+	db "ACID ARMOR@"

+	db "CRABHAMMER@"

+	db "EXPLOSION@"

+	db "FURY SWIPES@"

+	db "BONEMERANG@"

+	db "REST@"

+	db "ROCK SLIDE@"

+	db "HYPER FANG@"

+	db "SHARPEN@"

+	db "CONVERSION@"

+	db "TRI ATTACK@"

+	db "SUPER FANG@"

+	db "SLASH@"

+	db "SUBSTITUTE@"

+	db "STRUGGLE@"

+	db "SKETCH@"

+	db "TRIPLE KICK@"

+	db "THIEF@"

+	db "SPIDER WEB@"

+	db "MIND READER@"

+	db "NIGHTMARE@"

+	db "FLAME WHEEL@"

+	db "SNORE@"

+	db "CURSE@"

+	db "FLAIL@"

+	db "CONVERSION2@"

+	db "AEROBLAST@"

+	db "COTTON SPORE@"

+	db "REVERSAL@"

+	db "SPITE@"

+	db "POWDER SNOW@"

+	db "PROTECT@"

+	db "MACH PUNCH@"

+	db "SCARY FACE@"

+	db "FAINT ATTACK@"

+	db "SWEET KISS@"

+	db "BELLY DRUM@"

+	db "SLUDGE BOMB@"

+	db "MUD-SLAP@"

+	db "OCTAZOOKA@"

+	db "SPIKES@"

+	db "ZAP CANNON@"

+	db "FORESIGHT@"

+	db "DESTINY BOND@"

+	db "PERISH SONG@"

+	db "ICY WIND@"

+	db "DETECT@"

+	db "BONE RUSH@"

+	db "LOCK-ON@"

+	db "OUTRAGE@"

+	db "SANDSTORM@"

+	db "GIGA DRAIN@"

+	db "ENDURE@"

+	db "CHARM@"

+	db "ROLLOUT@"

+	db "FALSE SWIPE@"

+	db "SWAGGER@"

+	db "MILK DRINK@"

+	db "SPARK@"

+	db "FURY CUTTER@"

+	db "STEEL WING@"

+	db "MEAN LOOK@"

+	db "ATTRACT@"

+	db "SLEEP TALK@"

+	db "HEAL BELL@"

+	db "RETURN@"

+	db "PRESENT@"

+	db "FRUSTRATION@"

+	db "SAFEGUARD@"

+	db "PAIN SPLIT@"

+	db "SACRED FIRE@"

+	db "MAGNITUDE@"

+	db "DYNAMICPUNCH@"

+	db "MEGAHORN@"

+	db "DRAGONBREATH@"

+	db "BATON PASS@"

+	db "ENCORE@"

+	db "PURSUIT@"

+	db "RAPID SPIN@"

+	db "SWEET SCENT@"

+	db "IRON TAIL@"

+	db "METAL CLAW@"

+	db "VITAL THROW@"

+	db "MORNING SUN@"

+	db "SYNTHESIS@"

+	db "MOONLIGHT@"

+	db "HIDDEN POWER@"

+	db "CROSS CHOP@"

+	db "TWISTER@"

+	db "RAIN DANCE@"

+	db "SUNNY DAY@"

+	db "CRUNCH@"

+	db "MIRROR COAT@"

+	db "PSYCH UP@"

+	db "EXTREMESPEED@"

+	db "ANCIENTPOWER@"

+	db "SHADOW BALL@"

+	db "FUTURE SIGHT@"

+	db "ROCK SMASH@"

+	db "WHIRLPOOL@"

+	db "BEAT UP@"

+

--- a/main.asm

+++ b/main.asm

@@ -14979,258 +14979,10 @@

 INCLUDE "items/item_descriptions.asm"

+

 MoveNames:

-	db "POUND@"

-	db "KARATE CHOP@"

-	db "DOUBLESLAP@"

-	db "COMET PUNCH@"

-	db "MEGA PUNCH@"

-	db "PAY DAY@"

-	db "FIRE PUNCH@"

-	db "ICE PUNCH@"

-	db "THUNDERPUNCH@"

-	db "SCRATCH@"

-	db "VICEGRIP@"

-	db "GUILLOTINE@"

-	db "RAZOR WIND@"

-	db "SWORDS DANCE@"

-	db "CUT@"

-	db "GUST@"

-	db "WING ATTACK@"

-	db "WHIRLWIND@"

-	db "FLY@"

-	db "BIND@"

-	db "SLAM@"

-	db "VINE WHIP@"

-	db "STOMP@"

-	db "DOUBLE KICK@"

-	db "MEGA KICK@"

-	db "JUMP KICK@"

-	db "ROLLING KICK@"

-	db "SAND-ATTACK@"

-	db "HEADBUTT@"

-	db "HORN ATTACK@"

-	db "FURY ATTACK@"

-	db "HORN DRILL@"

-	db "TACKLE@"

-	db "BODY SLAM@"

-	db "WRAP@"

-	db "TAKE DOWN@"

-	db "THRASH@"

-	db "DOUBLE-EDGE@"

-	db "TAIL WHIP@"

-	db "POISON STING@"

-	db "TWINEEDLE@"

-	db "PIN MISSILE@"

-	db "LEER@"

-	db "BITE@"

-	db "GROWL@"

-	db "ROAR@"

-	db "SING@"

-	db "SUPERSONIC@"

-	db "SONICBOOM@"

-	db "DISABLE@"

-	db "ACID@"

-	db "EMBER@"

-	db "FLAMETHROWER@"

-	db "MIST@"

-	db "WATER GUN@"

-	db "HYDRO PUMP@"

-	db "SURF@"

-	db "ICE BEAM@"

-	db "BLIZZARD@"

-	db "PSYBEAM@"

-	db "BUBBLEBEAM@"

-	db "AURORA BEAM@"

-	db "HYPER BEAM@"

-	db "PECK@"

-	db "DRILL PECK@"

-	db "SUBMISSION@"

-	db "LOW KICK@"

-	db "COUNTER@"

-	db "SEISMIC TOSS@"

-	db "STRENGTH@"

-	db "ABSORB@"

-	db "MEGA DRAIN@"

-	db "LEECH SEED@"

-	db "GROWTH@"

-	db "RAZOR LEAF@"

-	db "SOLARBEAM@"

-	db "POISONPOWDER@"

-	db "STUN SPORE@"

-	db "SLEEP POWDER@"

-	db "PETAL DANCE@"

-	db "STRING SHOT@"

-	db "DRAGON RAGE@"

-	db "FIRE SPIN@"

-	db "THUNDERSHOCK@"

-	db "THUNDERBOLT@"

-	db "THUNDER WAVE@"

-	db "THUNDER@"

-	db "ROCK THROW@"

-	db "EARTHQUAKE@"

-	db "FISSURE@"

-	db "DIG@"

-	db "TOXIC@"

-	db "CONFUSION@"

-	db "PSYCHIC@"

-	db "HYPNOSIS@"

-	db "MEDITATE@"

-	db "AGILITY@"

-	db "QUICK ATTACK@"

-	db "RAGE@"

-	db "TELEPORT@"

-	db "NIGHT SHADE@"

-	db "MIMIC@"

-	db "SCREECH@"

-	db "DOUBLE TEAM@"

-	db "RECOVER@"

-	db "HARDEN@"

-	db "MINIMIZE@"

-	db "SMOKESCREEN@"

-	db "CONFUSE RAY@"

-	db "WITHDRAW@"

-	db "DEFENSE CURL@"

-	db "BARRIER@"

-	db "LIGHT SCREEN@"

-	db "HAZE@"

-	db "REFLECT@"

-	db "FOCUS ENERGY@"

-	db "BIDE@"

-	db "METRONOME@"

-	db "MIRROR MOVE@"

-	db "SELFDESTRUCT@"

-	db "EGG BOMB@"

-	db "LICK@"

-	db "SMOG@"

-	db "SLUDGE@"

-	db "BONE CLUB@"

-	db "FIRE BLAST@"

-	db "WATERFALL@"

-	db "CLAMP@"

-	db "SWIFT@"

-	db "SKULL BASH@"

-	db "SPIKE CANNON@"

-	db "CONSTRICT@"

-	db "AMNESIA@"

-	db "KINESIS@"

-	db "SOFTBOILED@"

-	db "HI JUMP KICK@"

-	db "GLARE@"

-	db "DREAM EATER@"

-	db "POISON GAS@"

-	db "BARRAGE@"

-	db "LEECH LIFE@"

-	db "LOVELY KISS@"

-	db "SKY ATTACK@"

-	db "TRANSFORM@"

-	db "BUBBLE@"

-	db "DIZZY PUNCH@"

-	db "SPORE@"

-	db "FLASH@"

-	db "PSYWAVE@"

-	db "SPLASH@"

-	db "ACID ARMOR@"

-	db "CRABHAMMER@"

-	db "EXPLOSION@"

-	db "FURY SWIPES@"

-	db "BONEMERANG@"

-	db "REST@"

-	db "ROCK SLIDE@"

-	db "HYPER FANG@"

-	db "SHARPEN@"

-	db "CONVERSION@"

-	db "TRI ATTACK@"

-	db "SUPER FANG@"

-	db "SLASH@"

-	db "SUBSTITUTE@"

-	db "STRUGGLE@"

-	db "SKETCH@"

-	db "TRIPLE KICK@"

-	db "THIEF@"

-	db "SPIDER WEB@"

-	db "MIND READER@"

-	db "NIGHTMARE@"

-	db "FLAME WHEEL@"

-	db "SNORE@"

-	db "CURSE@"

-	db "FLAIL@"

-	db "CONVERSION2@"

-	db "AEROBLAST@"

-	db "COTTON SPORE@"

-	db "REVERSAL@"

-	db "SPITE@"

-	db "POWDER SNOW@"

-	db "PROTECT@"

-	db "MACH PUNCH@"

-	db "SCARY FACE@"

-	db "FAINT ATTACK@"

-	db "SWEET KISS@"

-	db "BELLY DRUM@"

-	db "SLUDGE BOMB@"

-	db "MUD-SLAP@"

-	db "OCTAZOOKA@"

-	db "SPIKES@"

-	db "ZAP CANNON@"

-	db "FORESIGHT@"

-	db "DESTINY BOND@"

-	db "PERISH SONG@"

-	db "ICY WIND@"

-	db "DETECT@"

-	db "BONE RUSH@"

-	db "LOCK-ON@"

-	db "OUTRAGE@"

-	db "SANDSTORM@"

-	db "GIGA DRAIN@"

-	db "ENDURE@"

-	db "CHARM@"

-	db "ROLLOUT@"

-	db "FALSE SWIPE@"

-	db "SWAGGER@"

-	db "MILK DRINK@"

-	db "SPARK@"

-	db "FURY CUTTER@"

-	db "STEEL WING@"

-	db "MEAN LOOK@"

-	db "ATTRACT@"

-	db "SLEEP TALK@"

-	db "HEAL BELL@"

-	db "RETURN@"

-	db "PRESENT@"

-	db "FRUSTRATION@"

-	db "SAFEGUARD@"

-	db "PAIN SPLIT@"

-	db "SACRED FIRE@"

-	db "MAGNITUDE@"

-	db "DYNAMICPUNCH@"

-	db "MEGAHORN@"

-	db "DRAGONBREATH@"

-	db "BATON PASS@"

-	db "ENCORE@"

-	db "PURSUIT@"

-	db "RAPID SPIN@"

-	db "SWEET SCENT@"

-	db "IRON TAIL@"

-	db "METAL CLAW@"

-	db "VITAL THROW@"

-	db "MORNING SUN@"

-	db "SYNTHESIS@"

-	db "MOONLIGHT@"

-	db "HIDDEN POWER@"

-	db "CROSS CHOP@"

-	db "TWISTER@"

-	db "RAIN DANCE@"

-	db "SUNNY DAY@"

-	db "CRUNCH@"

-	db "MIRROR COAT@"

-	db "PSYCH UP@"

-	db "EXTREMESPEED@"

-	db "ANCIENTPOWER@"

-	db "SHADOW BALL@"

-	db "FUTURE SIGHT@"

-	db "ROCK SMASH@"

-	db "WHIRLPOOL@"

-	db "BEAT UP@"

+INCLUDE "battle/move_names.asm"

+

 GetLandmarkCoords: ; 0x1ca896

 ; given a landmark id in e, return the y coord in d, and the x coord in e.