Adds OW_BERRY_IMMORTAL

[pkmnsnfrn]

Description

• Adds OW_BERRY_IMMORTAL. If enabled, once a Berry tree has grown a berry, the tree will not disappear until picked by the player.

Details

Usage

OW_BERRY_IMMORTAL

Developers must change this value to TRUE in include/config/overworld.h to enable.

Testing

Clean Branch

You can recreate this branch by applying a patch or pulling the repo. From a clean version of expansion's upcoming, you can either:

Patch

wget https://files.catbox.moe/inkkw3.patch -O immortal.patch ; git apply immortal.patch ; rm immortal.patch

Repo

git remote add psf-expansion https://github.com/PokemonSanFran/pokeemerald-expansion/ ; git pull psf-expansion immortalBerries

Manual Tests

After replicating the branch, to recreate my testing environment, you can either directly download the debug script, or manually create the changes.

Download

OW_BERRY_IMMORTAL == TRUE

wget https://files.catbox.moe/2oij37.h -O include/config/overworld.h

OW_BERRY_IMMORTAL == FALSE

wget https://files.catbox.moe/fv3nbk.h -O include/config/overworld.h

Manual Testing

• Modify include/config/overworld.h to the desired values
• Compile
• Start new game
• Debug > Utilities > Warp to Map Warp > 0 > 19 > 1
• Pick Oran berry
• Plant Oran Berry
• Debug > Utilities > Berry Functions > Grow map trees (run this five times)

Verified Scenarios

All videos show the steps described in "Manual Testing"

TRUE

true.mp4

FALSE

false.mp4

People who collaborated with me in this PR

This was originally written by by @BuffelSaft. Give them all the credit.

Discord Contact Info

I am pkmnsnfrn on Discord.

[Bassoonian]

@pkmnsnfrn can you merge upcoming into this again? #5193 is needed to make this compile again