Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-11-23 05:09:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix moves using names from other generations

Browse Source
This commit is contained in:
cbt6 2023-09-27 03:12:23 +08:00
parent feacd38986
commit c4ba7955f2
5 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/unk_02078E30.s
View File

@ -7793,7 +7793,7 @@ _021013C4:
.short MOVE_CHATTER
.short MOVE_HEADBUTT
.short MOVE_MILK_DRINK
.short MOVE_SOFT_BOILED
.short MOVE_SOFTBOILED
_021013E4:
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00

14
asm/unk_02091880.s
View File

@ -2899,7 +2899,7 @@ sECMenu_Move_AtoL:
.short EC_WORD_MOVE(MOVE_EXTRASENSORY)
.short EC_WORD_MOVE(MOVE_EXTREME_SPEED)
.short EC_WORD_MOVE(MOVE_FACADE)
.short EC_WORD_MOVE(MOVE_FEINT_ATTACK)
.short EC_WORD_MOVE(MOVE_FAINT_ATTACK)
.short EC_WORD_MOVE(MOVE_FAKE_OUT)
.short EC_WORD_MOVE(MOVE_FAKE_TEARS)
.short EC_WORD_MOVE(MOVE_FALSE_SWIPE)
@ -2959,7 +2959,7 @@ sECMenu_Move_AtoL:
.short EC_WORD_MOVE(MOVE_HEART_SWAP)
.short EC_WORD_MOVE(MOVE_HEAT_WAVE)
.short EC_WORD_MOVE(MOVE_HELPING_HAND)
.short EC_WORD_MOVE(MOVE_HIGH_JUMP_KICK)
.short EC_WORD_MOVE(MOVE_HI_JUMP_KICK)
.short EC_WORD_MOVE(MOVE_HIDDEN_POWER)
.short EC_WORD_MOVE(MOVE_HORN_ATTACK)
.short EC_WORD_MOVE(MOVE_HORN_DRILL)
@ -3361,7 +3361,7 @@ sECMenu_Move_MtoZ:
.short EC_WORD_MOVE(MOVE_SECRET_POWER)
.short EC_WORD_MOVE(MOVE_SEED_BOMB)
.short EC_WORD_MOVE(MOVE_SEISMIC_TOSS)
.short EC_WORD_MOVE(MOVE_SELF_DESTRUCT)
.short EC_WORD_MOVE(MOVE_SELFDESTRUCT)
.short EC_WORD_MOVE(MOVE_SHADOW_BALL)
.short EC_WORD_MOVE(MOVE_SHADOW_CLAW)
.short EC_WORD_MOVE(MOVE_SHADOW_FORCE)
@ -3385,12 +3385,12 @@ sECMenu_Move_MtoZ:
.short EC_WORD_MOVE(MOVE_SLEEP_TALK)
.short EC_WORD_MOVE(MOVE_SLUDGE)
.short EC_WORD_MOVE(MOVE_SLUDGE_BOMB)
.short EC_WORD_MOVE(MOVE_SMELLING_SALTS)
.short EC_WORD_MOVE(MOVE_SMELLING_SALT)
.short EC_WORD_MOVE(MOVE_SMOG)
.short EC_WORD_MOVE(MOVE_SMOKESCREEN)
.short EC_WORD_MOVE(MOVE_SMOKE_SCREEN)
.short EC_WORD_MOVE(MOVE_SNATCH)
.short EC_WORD_MOVE(MOVE_SNORE)
.short EC_WORD_MOVE(MOVE_SOFT_BOILED)
.short EC_WORD_MOVE(MOVE_SOFTBOILED)
.short EC_WORD_MOVE(MOVE_SOLAR_BEAM)
.short EC_WORD_MOVE(MOVE_SONIC_BOOM)
.short EC_WORD_MOVE(MOVE_SPACIAL_REND)
@ -3458,7 +3458,7 @@ sECMenu_Move_MtoZ:
.short EC_WORD_MOVE(MOVE_U_TURN)
.short EC_WORD_MOVE(MOVE_UPROAR)
.short EC_WORD_MOVE(MOVE_VACUUM_WAVE)
.short EC_WORD_MOVE(MOVE_VISE_GRIP)
.short EC_WORD_MOVE(MOVE_VICE_GRIP)
.short EC_WORD_MOVE(MOVE_VINE_WHIP)
.short EC_WORD_MOVE(MOVE_VITAL_THROW)
.short EC_WORD_MOVE(MOVE_VOLT_TACKLE)

116
files/poketool/trainer/trainers.json
View File

@ -1667,7 +1667,7 @@
"species": "SPECIES_KINGDRA",
"item": "ITEM_SITRUS_BERRY",
"moves": [
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_HYDRO_PUMP",
"MOVE_HYPER_BEAM",
"MOVE_DRAGON_PULSE"
@ -4122,7 +4122,7 @@
"species": "SPECIES_HORSEA",
"moves": [
"MOVE_BUBBLE",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_LEER",
"MOVE_BUBBLE_BEAM"
],
@ -4136,7 +4136,7 @@
"species": "SPECIES_HORSEA",
"moves": [
"MOVE_FOCUS_ENERGY",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_LEER",
"MOVE_BUBBLE_BEAM"
],
@ -8615,7 +8615,7 @@
"species": "SPECIES_CHARMANDER",
"moves": [
"MOVE_FIRE_FANG",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_DRAGON_RAGE",
"MOVE_SCARY_FACE"
],
@ -8927,7 +8927,7 @@
"moves": [
"MOVE_BUBBLE_BEAM",
"MOVE_LEER",
"MOVE_VISE_GRIP",
"MOVE_VICE_GRIP",
"MOVE_HARDEN"
],
"capsule": 0
@ -8941,7 +8941,7 @@
"moves": [
"MOVE_BUBBLE_BEAM",
"MOVE_MUD_SHOT",
"MOVE_VISE_GRIP",
"MOVE_VICE_GRIP",
"MOVE_HARDEN"
],
"capsule": 0
@ -9896,7 +9896,7 @@
"species": "SPECIES_ELECTRODE",
"moves": [
"MOVE_THUNDER",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_SWIFT",
"MOVE_RAIN_DANCE"
],
@ -10146,7 +10146,7 @@
"MOVE_LAVA_PLUME",
"MOVE_FIRE_PUNCH",
"MOVE_CONFUSE_RAY",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -10441,7 +10441,7 @@
"moves": [
"MOVE_DOUBLE_TEAM",
"MOVE_CONFUSE_RAY",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_PAYBACK"
],
"capsule": 0
@ -10487,7 +10487,7 @@
"MOVE_PLUCK",
"MOVE_WHIRLWIND",
"MOVE_SUCKER_PUNCH",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -11110,7 +11110,7 @@
"moves": [
"MOVE_SCREECH",
"MOVE_DOUBLE_TEAM",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_CHARGE_BEAM"
],
"capsule": 0
@ -11853,7 +11853,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_FURY_SWIPES"
],
"capsule": 0
@ -12077,7 +12077,7 @@
"species": "SPECIES_QUILAVA",
"moves": [
"MOVE_FLAME_WHEEL",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_EMBER",
"MOVE_QUICK_ATTACK"
],
@ -12120,7 +12120,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_FURY_SWIPES"
],
"capsule": 0
@ -12411,7 +12411,7 @@
"MOVE_ICY_WIND",
"MOVE_QUICK_ATTACK",
"MOVE_FURY_SWIPES",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -12466,7 +12466,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_FURY_SWIPES"
],
"capsule": 0
@ -12970,7 +12970,7 @@
"MOVE_TACKLE",
"MOVE_SMOG",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
}
@ -13063,7 +13063,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_SHADOW_CLAW"
],
"capsule": 0
@ -13175,7 +13175,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_SHADOW_CLAW"
],
"capsule": 0
@ -13287,7 +13287,7 @@
"moves": [
"MOVE_QUICK_ATTACK",
"MOVE_ICY_WIND",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_SHADOW_CLAW"
],
"capsule": 0
@ -13442,7 +13442,7 @@
"MOVE_ICY_WIND",
"MOVE_QUICK_ATTACK",
"MOVE_FURY_SWIPES",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -13540,7 +13540,7 @@
"MOVE_ICY_WIND",
"MOVE_QUICK_ATTACK",
"MOVE_FURY_SWIPES",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -13551,7 +13551,7 @@
"level": 34,
"species": "SPECIES_QUILAVA",
"moves": [
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_SWIFT",
"MOVE_QUICK_ATTACK",
"MOVE_FLAME_WHEEL"
@ -16825,7 +16825,7 @@
"level": 45,
"species": "SPECIES_BRONZOR",
"moves": [
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_SKILL_SWAP",
"MOVE_SAFEGUARD",
"MOVE_GYRO_BALL"
@ -18509,7 +18509,7 @@
"species": "SPECIES_CHARMELEON",
"moves": [
"MOVE_EMBER",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_FIRE_FANG",
"MOVE_SCARY_FACE"
],
@ -19038,7 +19038,7 @@
"moves": [
"MOVE_SWAGGER",
"MOVE_FOCUS_ENERGY",
"MOVE_HIGH_JUMP_KICK",
"MOVE_HI_JUMP_KICK",
"MOVE_BLAZE_KICK"
],
"capsule": 0
@ -21716,7 +21716,7 @@
"MOVE_FIRE_FANG",
"MOVE_ROAR",
"MOVE_BITE",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
},
@ -21729,7 +21729,7 @@
"moves": [
"MOVE_TACKLE",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_HAZE"
],
"capsule": 0
@ -21744,7 +21744,7 @@
"MOVE_FIRE_FANG",
"MOVE_SMOG",
"MOVE_BITE",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
}
@ -21820,9 +21820,9 @@
"species": "SPECIES_KOFFING",
"moves": [
"MOVE_TACKLE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
},
@ -21834,9 +21834,9 @@
"species": "SPECIES_KOFFING",
"moves": [
"MOVE_TACKLE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
},
@ -21848,9 +21848,9 @@
"species": "SPECIES_KOFFING",
"moves": [
"MOVE_TACKLE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
},
@ -21864,7 +21864,7 @@
"MOVE_TACKLE",
"MOVE_EXPLOSION",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
},
@ -21876,9 +21876,9 @@
"species": "SPECIES_KOFFING",
"moves": [
"MOVE_TACKLE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
},
@ -21892,7 +21892,7 @@
"MOVE_TACKLE",
"MOVE_SMOG",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN"
"MOVE_SMOKE_SCREEN"
],
"capsule": 0
}
@ -21980,7 +21980,7 @@
"moves": [
"MOVE_ICY_WIND",
"MOVE_SHADOW_CLAW",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_METAL_CLAW"
],
"capsule": 0
@ -22095,7 +22095,7 @@
"moves": [
"MOVE_ICY_WIND",
"MOVE_SHADOW_CLAW",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_METAL_CLAW"
],
"capsule": 0
@ -22211,7 +22211,7 @@
"moves": [
"MOVE_ICY_WIND",
"MOVE_SHADOW_CLAW",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_METAL_CLAW"
],
"capsule": 0
@ -22710,7 +22710,7 @@
"level": 33,
"species": "SPECIES_HORSEA",
"moves": [
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_LEER",
"MOVE_BRINE",
"MOVE_TWISTER"
@ -22724,7 +22724,7 @@
"level": 33,
"species": "SPECIES_HORSEA",
"moves": [
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_LEER",
"MOVE_BRINE",
"MOVE_TWISTER"
@ -23785,7 +23785,7 @@
"species": "SPECIES_GRAVELER",
"moves": [
"MOVE_MAGNITUDE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_DEFENSE_CURL",
"MOVE_ROLLOUT"
],
@ -23799,7 +23799,7 @@
"species": "SPECIES_GOLEM",
"moves": [
"MOVE_MAGNITUDE",
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_DEFENSE_CURL",
"MOVE_ROLLOUT"
],
@ -23885,7 +23885,7 @@
"level": 33,
"species": "SPECIES_GRAVELER",
"moves": [
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_ROCK_THROW",
"MOVE_HARDEN",
"MOVE_MAGNITUDE"
@ -23899,7 +23899,7 @@
"level": 33,
"species": "SPECIES_GRAVELER",
"moves": [
"MOVE_SELF_DESTRUCT",
"MOVE_SELFDESTRUCT",
"MOVE_ROCK_THROW",
"MOVE_HARDEN",
"MOVE_MAGNITUDE"
@ -24403,7 +24403,7 @@
"level": 39,
"species": "SPECIES_SEADRA",
"moves": [
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_TWISTER",
"MOVE_SURF",
"MOVE_WATERFALL"
@ -28081,7 +28081,7 @@
"moves": [
"MOVE_SLUDGE_BOMB",
"MOVE_DOUBLE_HIT",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_ASSURANCE"
],
"capsule": 0
@ -28125,7 +28125,7 @@
"moves": [
"MOVE_SLUDGE_BOMB",
"MOVE_DOUBLE_HIT",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_ASSURANCE"
],
"capsule": 0
@ -28169,7 +28169,7 @@
"moves": [
"MOVE_SLUDGE_BOMB",
"MOVE_DOUBLE_HIT",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_THUNDER"
],
"capsule": 0
@ -29755,7 +29755,7 @@
"species": "SPECIES_BLISSEY",
"item": "ITEM_SITRUS_BERRY",
"moves": [
"MOVE_SOFT_BOILED",
"MOVE_SOFTBOILED",
"MOVE_COUNTER",
"MOVE_PSYCHIC",
"MOVE_TOXIC"
@ -30982,7 +30982,7 @@
"MOVE_OVERHEAT",
"MOVE_FIRE_PUNCH",
"MOVE_CONFUSE_RAY",
"MOVE_FEINT_ATTACK"
"MOVE_FAINT_ATTACK"
],
"capsule": 0
}
@ -31944,7 +31944,7 @@
"moves": [
"MOVE_DOUBLE_HIT",
"MOVE_SLUDGE",
"MOVE_SMOKESCREEN",
"MOVE_SMOKE_SCREEN",
"MOVE_SMOG"
],
"capsule": 0
@ -32796,7 +32796,7 @@
"species": "SPECIES_MEDICHAM",
"item": "ITEM_SITRUS_BERRY",
"moves": [
"MOVE_HIGH_JUMP_KICK",
"MOVE_HI_JUMP_KICK",
"MOVE_PSYCHO_CUT",
"MOVE_ATTRACT",
"MOVE_THUNDER_PUNCH"
@ -32826,7 +32826,7 @@
"species": "SPECIES_HITMONLEE",
"item": "ITEM_NONE",
"moves": [
"MOVE_HIGH_JUMP_KICK",
"MOVE_HI_JUMP_KICK",
"MOVE_FAKE_OUT",
"MOVE_BLAZE_KICK",
"MOVE_BULK_UP"
@ -34072,7 +34072,7 @@
"moves": [
"MOVE_FLAMETHROWER",
"MOVE_CONFUSE_RAY",
"MOVE_FEINT_ATTACK",
"MOVE_FAINT_ATTACK",
"MOVE_PROTECT"
],
"capsule": 0

14
include/constants/moves.h
View File

@ -12,7 +12,7 @@
#define MOVE_ICE_PUNCH 8
#define MOVE_THUNDER_PUNCH 9
#define MOVE_SCRATCH 10
#define MOVE_VISE_GRIP 11
#define MOVE_VICE_GRIP 11
#define MOVE_GUILLOTINE 12
#define MOVE_RAZOR_WIND 13
#define MOVE_SWORDS_DANCE 14
@ -109,7 +109,7 @@
#define MOVE_RECOVER 105
#define MOVE_HARDEN 106
#define MOVE_MINIMIZE 107
#define MOVE_SMOKESCREEN 108
#define MOVE_SMOKE_SCREEN 108
#define MOVE_CONFUSE_RAY 109
#define MOVE_WITHDRAW 110
#define MOVE_DEFENSE_CURL 111
@ -121,7 +121,7 @@
#define MOVE_BIDE 117
#define MOVE_METRONOME 118
#define MOVE_MIRROR_MOVE 119
#define MOVE_SELF_DESTRUCT 120
#define MOVE_SELFDESTRUCT 120
#define MOVE_EGG_BOMB 121
#define MOVE_LICK 122
#define MOVE_SMOG 123
@ -136,8 +136,8 @@
#define MOVE_CONSTRICT 132
#define MOVE_AMNESIA 133
#define MOVE_KINESIS 134
#define MOVE_SOFT_BOILED 135
#define MOVE_HIGH_JUMP_KICK 136
#define MOVE_SOFTBOILED 135
#define MOVE_HI_JUMP_KICK 136
#define MOVE_GLARE 137
#define MOVE_DREAM_EATER 138
#define MOVE_POISON_GAS 139
@ -186,7 +186,7 @@
#define MOVE_PROTECT 182
#define MOVE_MACH_PUNCH 183
#define MOVE_SCARY_FACE 184
#define MOVE_FEINT_ATTACK 185
#define MOVE_FAINT_ATTACK 185
#define MOVE_SWEET_KISS 186
#define MOVE_BELLY_DRUM 187
#define MOVE_SLUDGE_BOMB 188
@ -266,7 +266,7 @@
#define MOVE_MEMENTO 262
#define MOVE_FACADE 263
#define MOVE_FOCUS_PUNCH 264
#define MOVE_SMELLING_SALTS 265
#define MOVE_SMELLING_SALT 265
#define MOVE_FOLLOW_ME 266
#define MOVE_NATURE_POWER 267
#define MOVE_CHARGE 268

4
src/battle/overlay_12_0224E4FC.c
View File

@ -2962,7 +2962,7 @@ static const u16 sGravityUnusableMoves[] = {
MOVE_FLY,
MOVE_BOUNCE,
MOVE_JUMP_KICK,
MOVE_HIGH_JUMP_KICK,
MOVE_HI_JUMP_KICK,
MOVE_SPLASH,
MOVE_MAGNET_RISE
};
@ -2985,7 +2985,7 @@ BOOL BattleContext_CheckMoveUnuseableInGravity(BattleSystem *bsys, BattleContext
static const u16 sHealBlockUnusableMoves[] = {
MOVE_RECOVER,
MOVE_SOFT_BOILED,
MOVE_SOFTBOILED,
MOVE_REST,
MOVE_MILK_DRINK,
MOVE_MORNING_SUN,