Fix move reconcile string tables

This commit is contained in:
Brandon M. M. Green
2026-07-10 02:18:42 +00:00
parent 8185564b09
commit 1bacdf1db0
2 changed files with 176 additions and 177 deletions

View File

@@ -2,14 +2,13 @@
; RGBDS source is untouched.
; WLA-DX representation for reconciliation only.
; FieldMoveNames:
; Names of field moves (corresponds to FieldMoveDisplayData)
.dw "CUT@"
.dw "FLY@"
.dw "@"
.dw "SURF@"
.dw "STRENGTH@"
.dw "FLASH@"
.dw "DIG@"
.dw "TELEPORT@"
.dw "SOFTBOILED@"
FieldMoveNames:
.DB "CUT@"
.DB "FLY@"
.DB "@"
.DB "SURF@"
.DB "STRENGTH@"
.DB "FLASH@"
.DB "DIG@"
.DB "TELEPORT@"
.DB "SOFTBOILED@"

View File

@@ -2,170 +2,170 @@
; RGBDS source is untouched.
; WLA-DX representation for reconciliation only.
MoveNames:
MoveNames::
; in-battle "used <move name>!" text can only fit 12 (MOVE_NAME_LENGTH - 2) characters
.DW "POUND"
.DW "KARATE CHOP"
.DW "DOUBLESLAP"
.DW "COMET PUNCH"
.DW "MEGA PUNCH"
.DW "PAY DAY"
.DW "FIRE PUNCH"
.DW "ICE PUNCH"
.DW "THUNDERPUNCH"
.DW "SCRATCH"
.DW "VICEGRIP"
.DW "GUILLOTINE"
.DW "RAZOR WIND"
.DW "SWORDS DANCE"
.DW "CUT"
.DW "GUST"
.DW "WING ATTACK"
.DW "WHIRLWIND"
.DW "FLY"
.DW "BIND"
.DW "SLAM"
.DW "VINE WHIP"
.DW "STOMP"
.DW "DOUBLE KICK"
.DW "MEGA KICK"
.DW "JUMP KICK"
.DW "ROLLING KICK"
.DW "SAND-ATTACK"
.DW "HEADBUTT"
.DW "HORN ATTACK"
.DW "FURY ATTACK"
.DW "HORN DRILL"
.DW "TACKLE"
.DW "BODY SLAM"
.DW "WRAP"
.DW "TAKE DOWN"
.DW "THRASH"
.DW "DOUBLE-EDGE"
.DW "TAIL WHIP"
.DW "POISON STING"
.DW "TWINEEDLE"
.DW "PIN MISSILE"
.DW "LEER"
.DW "BITE"
.DW "GROWL"
.DW "ROAR"
.DW "SING"
.DW "SUPERSONIC"
.DW "SONICBOOM"
.DW "DISABLE"
.DW "ACID"
.DW "EMBER"
.DW "FLAMETHROWER"
.DW "MIST"
.DW "WATER GUN"
.DW "HYDRO PUMP"
.DW "SURF"
.DW "ICE BEAM"
.DW "BLIZZARD"
.DW "PSYBEAM"
.DW "BUBBLEBEAM"
.DW "AURORA BEAM"
.DW "HYPER BEAM"
.DW "PECK"
.DW "DRILL PECK"
.DW "SUBMISSION"
.DW "LOW KICK"
.DW "COUNTER"
.DW "SEISMIC TOSS"
.DW "STRENGTH"
.DW "ABSORB"
.DW "MEGA DRAIN"
.DW "LEECH SEED"
.DW "GROWTH"
.DW "RAZOR LEAF"
.DW "SOLARBEAM"
.DW "POISONPOWDER"
.DW "STUN SPORE"
.DW "SLEEP POWDER"
.DW "PETAL DANCE"
.DW "STRING SHOT"
.DW "DRAGON RAGE"
.DW "FIRE SPIN"
.DW "THUNDERSHOCK"
.DW "THUNDERBOLT"
.DW "THUNDER WAVE"
.DW "THUNDER"
.DW "ROCK THROW"
.DW "EARTHQUAKE"
.DW "FISSURE"
.DW "DIG"
.DW "TOXIC"
.DW "CONFUSION"
.DW "PSYCHIC"
.DW "HYPNOSIS"
.DW "MEDITATE"
.DW "AGILITY"
.DW "QUICK ATTACK"
.DW "RAGE"
.DW "TELEPORT"
.DW "NIGHT SHADE"
.DW "MIMIC"
.DW "SCREECH"
.DW "DOUBLE TEAM"
.DW "RECOVER"
.DW "HARDEN"
.DW "MINIMIZE"
.DW "SMOKESCREEN"
.DW "CONFUSE RAY"
.DW "WITHDRAW"
.DW "DEFENSE CURL"
.DW "BARRIER"
.DW "LIGHT SCREEN"
.DW "HAZE"
.DW "REFLECT"
.DW "FOCUS ENERGY"
.DW "BIDE"
.DW "METRONOME"
.DW "MIRROR MOVE"
.DW "SELFDESTRUCT"
.DW "EGG BOMB"
.DW "LICK"
.DW "SMOG"
.DW "SLUDGE"
.DW "BONE CLUB"
.DW "FIRE BLAST"
.DW "WATERFALL"
.DW "CLAMP"
.DW "SWIFT"
.DW "SKULL BASH"
.DW "SPIKE CANNON"
.DW "CONSTRICT"
.DW "AMNESIA"
.DW "KINESIS"
.DW "SOFTBOILED"
.DW "HI JUMP KICK"
.DW "GLARE"
.DW "DREAM EATER"
.DW "POISON GAS"
.DW "BARRAGE"
.DW "LEECH LIFE"
.DW "LOVELY KISS"
.DW "SKY ATTACK"
.DW "TRANSFORM"
.DW "BUBBLE"
.DW "DIZZY PUNCH"
.DW "SPORE"
.DW "FLASH"
.DW "PSYWAVE"
.DW "SPLASH"
.DW "ACID ARMOR"
.DW "CRABHAMMER"
.DW "EXPLOSION"
.DW "FURY SWIPES"
.DW "BONEMERANG"
.DW "REST"
.DW "ROCK SLIDE"
.DW "HYPER FANG"
.DW "SHARPEN"
.DW "CONVERSION"
.DW "TRI ATTACK"
.DW "SUPER FANG"
.DW "SLASH"
.DW "SUBSTITUTE"
.DW "STRUGGLE"
.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@"