rh-hideout / pokeemerald-expansion Goto Github PK

Originally submitted by LOuroboros on DizzyEggg's bev2 branch as Issue 492. Being resubmitted just before submitting my pull request for future clarification.

As brought up by @Ryuhouji on Discord, multi battles on an up-to-date copy of the battle_engine_v2 are freezing right after your partner and you send out their Pokémon.
https://streamable.com/xr2nae

However, I noticed that it all works normally if I go back to the commit a42bd3f, @DizzyEggg.
https://streamable.com/5hep7y

I suppose the problem may have been caused by one of the following commits: 9a7963e, f70a9ce or 97d0643, since they're the only commits you submitted after commit a42bd3f.

For reference, the tests were done using this script: https://pastebin.com/raw/mGQdvCv9

Blackforest: "The status icon stay there when you highlight the CANCEL button."

Reposting this from @DizzyEggg's repository.
Bug Bite is a move that does damage. If the opponent is holding a berry, the user steals the berry and eats it on the spot effectively benefitting from said berry's effect.

In the battle_engine however, while there's a text string saying that the user stole and ate the berry, the user is not actually eating the berry.

Test case:
-Made Torchic learn Bug Bite at Lv1
-Changed all the encounters in Route 102 with Lv2 Golem
-Changed Golem's held items to ITEM_ORAN_BERRY in src/data/pokemon/base_stats.h
-Built a ROM and tested the move

I used a clean copy of the RHH's battle_engine branch with no major modifications to test this out.

• abomasnow
• abomasnow (female)
• abomasnow_mega
• abra
• absol
• absol_mega
• accelgor
• aegislash
• aegislash_blade
• aerodactyl
• aerodactyl_mega
• aggron
• aggron_mega
• aipom
• aipom (female)
• alakazam
• alakazam (female)
• alakazam_mega
• alcremie_caramel_swirl
• alcremie
• alcremie_lemon_cream
• alcremie_matcha_cream
• alcremie_mint_cream
• alcremie_rainbow_swirl
• alcremie_ruby_cream
• alcremie_ruby_swirl
• alcremie_salted_cream
• alomomola
• altaria
• altaria_mega
• amaura
• ambipom
• ambipom (female)
• amoonguss
• ampharos
• ampharos_mega
• anorith
• appletun
• applin
• araquanid
• arbok
• arcanine
• arcanine_hisuian
• arceus
• archen
• archeops
• arctovish
• arctozolt
• ariados
• armaldo
• aromatisse
• aron
• arrokuda
• articuno
• articuno_galarian
• audino
• audino_mega
• aurorus
• avalugg
• avalugg_hisuian
• axew
• azelf
• azumarill
• azurill
• bagon
• baltoy
• banette
• banette_mega
• barbaracle
• barboach
• barraskewda
• basculegion_female
• basculegion
• basculin
• basculin_blue_striped
• basculin_white_striped
• bastiodon
• bayleef
• beartic
• beautifly
• beautifly (female)
• beedrill
• beedrill_mega
• beheeyem
• beldum
• bellossom
• bellsprout
• bergmite
• bewear
• bibarel
• bibarel (female)
• bidoof
• bidoof (female)
• binacle
• bisharp
• blacephalon
• blastoise
• blastoise_mega
• blaziken
• blaziken (female)
• blaziken_mega
• blipbug
• blissey
• blitzle
• boldore
• boltund
• bonsly
• bouffalant
• bounsweet
• braixen
• braviary
• braviary_hisuian
• breloom
• brionne
• bronzong
• bronzor
• bruxish
• budew
• buizel
• bulbasaur
• buneary
• bunnelby
• burmy
• burmy_sandy_cloak
• burmy_trash_cloak
• butterfree
• butterfree (female)
• buzzwole
• cacnea
• cacturne
• cacturne (female)
• calyrex
• calyrex_ice_rider
• calyrex_shadow_rider
• camerupt
• camerupt (female)
• camerupt_mega
• carbink
• carkol
• carnivine
• carracosta
• carvanha
• cascoon
• castform
• castform_rainy
• castform_snowy
• castform_sunny
• caterpie
• celebi
• celesteela
• centiskorch
• chandelure
• chansey
• charizard
• charizard_mega_x
• charizard_mega_y
• charjabug
• charmander
• charmeleon
• chatot
• cherrim_normal
• cherrim_sunshine
• cherubi
• chesnaught
• chespin
• chewtle
• chikorita
• chimchar
• chimecho
• chinchou
• chingling
• cinccino
• cinderace
• clamperl
• clauncher
• clawitzer
• claydol
• clefable
• clefairy
• cleffa
• clobbopus
• cloyster
• coalossal
• cobalion
• cofagrigus
• combee
• combusken
• combusken (female)
• comfey
• conkeldurr
• copperajah
• corphish
• corsola
• corsola_galarian
• corviknight
• corvisquire
• cosmoem
• cosmog
• cottonee
• crabominable
• crabrawler
• cradily
• cramorant
• cramorant_gorging
• cramorant_gulping
• cranidos
• crawdaunt
• cresselia
• croagunk
• croagunk (female)
• crobat
• croconaw
• crustle
• cryogonal
• cubchoo
• cubone
• cufant
• cursola
• cutiefly
• cyndaquil
• darkrai
• darmanitan
• darmanitan_galarian
• darmanitan_zen_mode
• darmanitan_zen_mode_galarian
• dartrix
• darumaka
• darumaka_galarian
• decidueye
• decidueye_hisuian
• dedenne
• deerling
• deino
• delcatty
• delibird
• delphox
• deoxys
• deoxys_attack
• deoxys_defense
• deoxys_speed
• dewgong
• dewott
• dewpider
• dhelmise
• dialga
• dialga_origin
• diancie
• diancie_mega
• diggersby
• diglett_alolan
• diglett
• ditto
• dodrio
• dodrio (female)
• doduo
• doduo (female)
• donphan
• donphan (female)
• dottler
• doublade
• dracovish
• dracozolt
• dragalge
• dragapult
• dragonair
• dragonite
• drakloak
• drampa
• drapion
• dratini
• drednaw
• dreepy
• drifblim
• drifloon
• drilbur
• drizzile
• drowzee
• druddigon
• dubwool
• ducklett
• dugtrio_alolan
• dugtrio
• dunsparce
• duosion
• duraludon
• durant
• dusclops
• dusknoir
• duskull
• dustox
• dustox (female)
• dwebble
• eelektrik
• eelektross
• eevee
• eevee (female)
• egg
• eiscue
• eiscue_noice_face
• ekans
• eldegoss
• electabuzz
• electivire
• electrike
• electrode
• electrode_hisuian
• elekid
• elgyem
• emboar
• emolga
• empoleon
• enamorus
• enamorus_therian
• entei
• escavalier
• espeon
• espurr
• eternatus_eternamax
• eternatus
• excadrill
• exeggcute
• exeggutor_alolan
• exeggutor
• exploud
• falinks
• farfetchd
• farfetchd_galarian
• fearow
• feebas
• fennekin
• feraligatr
• ferroseed
• ferrothorn
• finneon
• finneon (female)
• flaaffy
• flabebe
• flapple
• flareon
• fletchinder
• fletchling
• floatzel
• floette
• floette_eternal_flower
• florges
• flygon
• fomantis
• foongus
• forretress
• fraxure
• frillish
• frillish (female)
• froakie
• frogadier
• froslass
• frosmoth
• furfrou
• furfrou_dandy_trim
• furfrou_debutante_trim
• furfrou_diamond_trim
• furfrou_heart_trim
• furfrou_kabuki_trim
• furfrou_la_reine_trim
• furfrou_matron_trim
• furfrou_pharaoh_trim
• furfrou_star_trim
• furret
• gabite
• gabite (female)
• gallade
• gallade_mega
• galvantula
• garbodor
• garchomp
• garchomp (female)
• garchomp_mega
• gardevoir
• gardevoir_mega
• gastly
• gastrodon
• gastrodon_east_sea
• genesect
• gengar
• gengar_mega
• geodude_alolan
• geodude
• gible
• gible (female)
• gigalith
• girafarig
• girafarig (female)
• giratina
• giratina_origin
• glaceon
• glalie
• glalie_mega
• glameow
• glastrier
• gligar
• gligar (female)
• gliscor
• gloom
• gloom (female)
• gogoat
• golbat
• golbat (female)
• goldeen
• goldeen (female)
• golduck
• golem_alolan
• golem
• golett
• golisopod
• golurk
• goodra
• goodra_hisuian
• goomy
• gorebyss
• gossifleur
• gothita
• gothitelle
• gothorita
• gourgeist
• gourgeist_large
• gourgeist_small
• gourgeist_super
• granbull
• grapploct
• graveler_alolan
• graveler
• greedent
• greninja
• greninja_ash
• grimer_alolan
• grimer
• grimmsnarl
• grookey
• grotle
• groudon
• groudon_primal
• grovyle
• growlithe
• growlithe_hisuian
• grubbin
• grumpig
• gulpin
• gulpin (female)
• gumshoos
• gurdurr
• guzzlord
• gyarados
• gyarados (female)
• gyarados_mega
• hakamo_o
• happiny
• hariyama
• hatenna
• hatterene
• hattrem
• haunter
• hawlucha
• haxorus
• heatmor
• heatran
• heliolisk
• helioptile
• heracross
• heracross (female)
• heracross_mega
• herdier
• hippopotas
• hippowdon
• hitmonchan
• hitmonlee
• hitmontop
• ho_oh
• honchkrow
• honedge
• hoopa
• hoopa_unbound
• hoothoot
• hoppip
• horsea
• houndoom
• houndoom (female)
• houndoom_mega
• houndour
• huntail
• hydreigon
• hypno
• hypno (female)
• igglybuff
• illumise
• impidimp
• incineroar
• indeedee_female
• indeedee
• infernape
• inkay
• inteleon
• ivysaur
• jangmo_o
• jellicent
• jellicent (female)
• jigglypuff
• jirachi
• jolteon
• joltik
• jumpluff
• jynx
• kabuto
• kabutops
• kadabra
• kadabra (female)
• kakuna
• kangaskhan
• kangaskhan_mega
• karrablast
• kartana
• kecleon
• keldeo
• keldeo_resolute
• kingdra
• kingler
• kirlia
• klang
• kleavor
• klefki
• klink
• klinklang
• koffing
• komala
• kommo_o
• krabby
• kricketot
• kricketot (female)
• kricketune
• kricketune (female)
• krokorok
• krookodile
• kubfu
• kyogre
• kyogre_primal
• kyurem
• kyurem_black
• kyurem_white
• lairon
• lampent
• landorus
• landorus_therian
• lanturn
• lapras
• larvesta
• larvitar
• latias
• latias_mega
• latios
• latios_mega
• leafeon
• leavanny
• ledian
• ledian (female)
• ledyba
• ledyba (female)
• lickilicky
• lickitung
• liepard
• lileep
• lilligant
• lilligant_hisuian
• lillipup
• linoone
• linoone_galarian
• litleo
• litten
• litwick
• lombre
• lopunny
• lopunny_mega
• lotad
• loudred
• lucario
• lucario_mega
• ludicolo
• ludicolo (female)
• lugia
• lumineon
• lumineon (female)
• lunala
• lunatone
• lurantis
• luvdisc
• luxio
• luxio (female)
• luxray
• luxray (female)
• lycanroc_dusk
• lycanroc
• lycanroc_midnight
• machamp
• machoke
• machop
• magby
• magcargo
• magearna
• magearna_original_color
• magikarp
• magikarp (female)
• magmar
• magmortar
• magnemite
• magneton
• magnezone
• makuhita
• malamar
• mamoswine
• mamoswine (female)
• manaphy
• mandibuzz
• manectric
• manectric_mega
• mankey
• mantine
• mantyke
• maractus
• mareanie
• mareep
• marill
• marowak_alolan
• marowak
• marshadow
• marshtomp
• masquerain
• mawile
• mawile_mega
• medicham
• medicham (female)
• medicham_mega
• meditite
• meditite (female)
• meganium
• meganium (female)
• melmetal
• meloetta
• meloetta_pirouette
• meltan
• meowstic
• meowstic_female
• meowth_alolan
• meowth
• meowth_galarian
• mesprit
• metagross
• metagross_mega
• metang
• metapod
• mew
• mewtwo
• mewtwo_mega_x
• mewtwo_mega_y
• mienfoo
• mienshao
• mightyena
• milcery
• milotic
• milotic (female)
• miltank
• mime_jr
• mimikyu_busted
• mimikyu
• minccino
• minior_core
• minior
• minun
• misdreavus
• mismagius
• moltres
• moltres_galarian
• monferno
• morelull
• morgrem
• morpeko
• morpeko_hangry
• mothim
• mr_mime
• mr_mime_galarian
• mr_rime
• mudbray
• mudkip
• mudsdale
• muk_alolan
• muk
• munchlax
• munna
• murkrow
• murkrow (female)
• musharna
• naganadel
• natu
• necrozma_dawn_wings
• necrozma_dusk_mane
• necrozma
• necrozma_ultra
• nickit
• nidoking
• nidoqueen
• nidoran_f
• nidoran_m
• nidorina
• nidorino
• nihilego
• nincada
• ninetales_alolan
• ninetales
• ninjask
• noctowl
• noibat
• noivern
• nosepass
• numel
• numel (female)
• nuzleaf
• nuzleaf (female)
• obstagoon
• octillery
• octillery (female)
• oddish
• omanyte
• omastar
• onix
• oranguru
• orbeetle
• oricorio
• oricorio_pau
• oricorio_pom_pom
• oricorio_sensu
• oshawott
• overqwil
• pachirisu
• pachirisu (female)
• palkia
• palkia_origin
• palossand
• palpitoad
• pancham
• pangoro
• panpour
• pansage
• pansear
• paras
• parasect
• passimian
• patrat
• pawniard
• pelipper
• perrserker
• persian_alolan
• persian
• petilil
• phanpy
• phantump
• pheromosa
• phione
• pichu
• pichu_spiky_eared
• pidgeot
• pidgeot_mega
• pidgeotto
• pidgey
• pidove
• pignite
• pikachu_alola_cap
• pikachu
• pikachu (female)
• pikachu_belle
• pikachu_cosplay
• pikachu_hoenn_cap
• pikachu_kalos_cap
• pikachu_libre
• pikachu_original_cap
• pikachu_partner_cap
• pikachu_ph_d
• pikachu_pop_star
• pikachu_rock_star
• pikachu_sinnoh_cap
• pikachu_unova_cap
• pikachu_world_cap
• pikipek
• piloswine
• piloswine (female)
• pincurchin
• pineco
• pinsir
• pinsir_mega
• piplup
• plusle
• poipole
• politoed
• politoed (female)
• poliwag
• poliwhirl
• poliwrath
• polteageist
• ponyta
• ponyta_galarian
• poochyena
• popplio
• porygon_z
• porygon
• porygon2
• primarina
• primeape
• prinplup
• probopass
• psyduck
• pumpkaboo
• pumpkaboo_large
• pumpkaboo_small
• pumpkaboo_super
• pupitar
• purrloin
• purugly
• pyroar
• pyroar (female)
• pyukumuku
• quagsire
• quagsire (female)
• question_mark_circled
• question_mark_double
• quilava
• quilladin
• qwilfish
• qwilfish_hisuian
• raboot
• raichu_alolan
• raichu
• raichu (female)
• raikou
• ralts
• rampardos
• rapidash
• rapidash_galarian
• raticate_alolan
• raticate
• raticate (female)
• rattata_alolan
• rattata
• rattata (female)
• rayquaza
• rayquaza_mega
• regice
• regidrago
• regieleki
• regigigas
• regirock
• registeel
• relicanth
• relicanth (female)
• remoraid
• reshiram
• reuniclus
• rhydon
• rhydon (female)
• rhyhorn
• rhyhorn (female)
• rhyperior
• rhyperior (female)
• ribombee
• rillaboom
• riolu
• rockruff
• roggenrola
• rolycoly
• rookidee
• roselia
• roselia (female)
• roserade
• roserade (female)
• rotom
• rotom_fan
• rotom_frost
• rotom_heat
• rotom_mow
• rotom_wash
• rowlet
• rufflet
• runerigus
• sableye
• sableye_mega
• salamence
• salamence_mega
• salandit
• salazzle
• samurott
• samurott_hisuian
• sandaconda
• sandile
• sandshrew_alolan
• sandshrew
• sandslash_alolan
• sandslash
• sandygast
• sawk
• sawsbuck
• sawsbuck_autumn
• sawsbuck_summer
• sawsbuck_winter
• scatterbug
• sceptile
• sceptile_mega
• scizor
• scizor (female)
• scizor_mega
• scolipede
• scorbunny
• scrafty
• scraggy
• scyther
• scyther (female)
• seadra
• seaking
• seaking (female)
• sealeo
• seedot
• seel
• seismitoad
• sentret
• serperior
• servine
• seviper
• sewaddle
• sharpedo
• sharpedo_mega
• shaymin
• shaymin_sky
• shedinja
• shelgon
• shellder
• shellos
• shellos_east_sea
• shelmet
• shieldon
• shiftry
• shiftry (female)
• shiinotic
• shinx
• shinx (female)
• shroomish
• shuckle
• shuppet
• sigilyph
• silcoon
• silicobra
• silvally
• simipour
• simisage
• simisear
• sinistea
• sirfetchd
• sizzlipede
• skarmory
• skiddo
• skiploom
• skitty
• skorupi
• skrelp
• skuntank
• skwovet
• slaking
• slakoth
• sliggoo
• sliggoo_hisuian
• slowbro
• slowbro_galarian
• slowbro_mega
• slowking
• slowking_galarian
• slowpoke
• slowpoke_galarian
• slugma
• slurpuff
• smeargle
• smoochum
• sneasel
• sneasel (female)
• sneasel_hisuian
• sneasel_hisuian (female)
• sneasler
• snivy
• snom
• snorlax
• snorunt
• snover
• snover (female)
• snubbull
• sobble
• solgaleo
• solosis
• solrock
• spearow
• spectrier
• spewpa
• spheal
• spinarak
• spinda
• spiritomb
• spoink
• spritzee
• squirtle
• stakataka
• stantler
• staraptor
• staraptor (female)
• staravia
• staravia (female)
• starly
• starly (female)
• starmie
• staryu
• steelix
• steelix (female)
• steelix_mega
• steenee
• stonjourner
• stoutland
• stufful
• stunfisk
• stunfisk_galarian
• stunky
• sudowoodo
• sudowoodo (female)
• suicune
• sunflora
• sunkern
• surskit
• swablu
• swadloon
• swalot
• swalot (female)
• swampert
• swampert_mega
• swanna
• swellow
• swinub
• swirlix
• swoobat
• sylveon
• taillow
• talonflame
• tangela
• tangrowth
• tangrowth (female)
• tapu_bulu
• tapu_fini
• tapu_koko
• tapu_lele
• tauros
• teddiursa
• tentacool
• tentacruel
• tepig
• terrakion
• thievul
• throh
• thundurus
• thundurus_therian
• thwackey
• timburr
• tirtouga
• togedemaru
• togekiss
• togepi
• togetic
• torchic
• torkoal
• tornadus
• tornadus_therian
• torracat
• torterra
• totodile
• toucannon
• toxapex
• toxel
• toxicroak
• toxicroak (female)
• toxtricity
• toxtricity_low_key
• tranquill
• trapinch
• treecko
• trevenant
• tropius
• trubbish
• trumbeak
• tsareena
• turtonator
• turtwig
• tympole
• tynamo
• type_null
• typhlosion
• typhlosion_hisuian
• tyranitar
• tyranitar_mega
• tyrantrum
• tyrogue
• tyrunt
• umbreon
• unfezant
• unfezant (female)
• unown
• unown_b
• unown_c
• unown_d
• unown_e
• unown_exclamation_mark
• unown_f
• unown_g
• unown_h
• unown_i
• unown_j
• unown_k
• unown_l
• unown_m
• unown_n
• unown_o
• unown_p
• unown_q
• unown_question_mark
• unown_r
• unown_s
• unown_t
• unown_u
• unown_v
• unown_w
• unown_x
• unown_y
• unown_z
• ursaluna
• ursaring
• ursaring (female)
• urshifu
• urshifu_rapid_strike_style
• uxie
• vanillish
• vanillite
• vanilluxe
• vaporeon
• venipede
• venomoth
• venonat
• venusaur
• venusaur (female)
• venusaur_mega
• vespiquen
• vibrava
• victini
• victreebel
• vigoroth
• vikavolt
• vileplume
• vileplume (female)
• virizion
• vivillon
• vivillon_archipelago
• vivillon_continental
• vivillon_elegant
• vivillon_fancy
• vivillon_garden
• vivillon_high_plains
• vivillon_jungle
• vivillon_marine
• vivillon_meadow
• vivillon_modern
• vivillon_monsoon
• vivillon_ocean
• vivillon_poke_ball
• vivillon_polar
• vivillon_river
• vivillon_sandstorm
• vivillon_savanna
• vivillon_sun
• vivillon_tundra
• volbeat
• volcanion
• volcarona
• voltorb
• voltorb_hisuian
• vullaby
• vulpix_alolan
• vulpix
• wailmer
• wailord
• walrein
• wartortle
• watchog
• weavile
• weavile (female)
• weedle
• weepinbell
• weezing
• weezing_galarian
• whimsicott
• whirlipede
• whiscash
• whismur
• wigglytuff
• wimpod
• wingull
• wishiwashi
• wishiwashi_school
• wobbuffet
• wobbuffet (female)
• woobat
• wooloo
• wooper
• wooper (female)
• wormadam
• wormadam_sandy_cloak
• wormadam_trash_cloak
• wurmple
• wynaut
• wyrdeer
• xatu
• xatu (female)
• xerneas_active
• xerneas
• xurkitree
• yamask
• yamask_galarian
• yamper
• yanma
• yanmega
• yungoos
• yveltal
• zacian_crowned_sword
• zacian
• zamazenta_crowned_shield
• zamazenta
• zangoose
• zapdos
• zapdos_galarian
• zarude_dada
• zarude
• zebstrika
• zekrom
• zeraora
• zigzagoon
• zigzagoon_galarian
• zoroark
• zoroark_hisuian
• zorua
• zorua_hisuian
• zubat
• zubat (female)
• zweilous
• zygarde_10_percent
• zygarde
• zygarde_complete

Some mons in base_stats.h have Gen 4+ abilities assigned to them instead of them being commented out. Example:

    [SPECIES_CAMERUPT] =
    {
...
        .abilities = {ABILITY_MAGMA_ARMOR, ABILITY_SOLID_ROCK},
...
    },

Solid Rock was introduced in Gen 4. If this ability gets loaded in game, it displays as garbage and does nothing.

All abilities like this should be revised to the following:

    [SPECIES_CAMERUPT] =
    {
...
        .abilities = {ABILITY_MAGMA_ARMOR, ABILITY_NONE}, //ABILITY_SOLID_ROCK},
...
    },

So that one could delete all instances of ABILITY_NONE}, // to automatically get Gen 4+ abilities for battle_engine.

Title