Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MB_X_Y_STAIR_WARP metatile behaviors #5278

Merged
merged 24 commits into from
Sep 28, 2024

Conversation

pkmnsnfrn
Copy link
Collaborator

@pkmnsnfrn pkmnsnfrn commented Aug 28, 2024

INCORPORATES A FEATURE BRANCH - DO NOT SQUASH!

Description

Player navigates around sideways stairs

Usage

Metatile Behaviors

No tilesets within vanilla Emerald have been modified. Users will need to manually add the new metatile behaviors to the relevent metatiles.

Functionality

When player is standing on a metatile with MB_X_Y_STAIR_WARP behavior and walks towards a warp, they player's x and y position changes to simulate the player going up and down the stairs.

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/3o61ki.patch -O stair_warps.patch ; git apply stair_warps.patch ; rm stair_warps.patch

Repo

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

Manual Tests

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

Download

wget https://github.com/rh-hideout/pokeemerald-expansion/commit/6ea73bb8b41615deaab776b0ffac11061228a5b6.patch -O stair_warps_testing.patch ; git apply stair_warps_testing.patch ; rm stair_warps_testing.patch ; wget https://github.com/rh-hideout/pokeemerald-expansion/commit/e44beb77fd2b34f0b4db4789b5d0ecbfcf156cf8.patch -O stair_warps_testing2.patch ; git apply stair_warps_testing2.patch ; rm stair_warps_testing2.patch

Manual Testing

  • Start a New Game
  • R + Start to open Overworld Debug Menu
  • Utilites > Cheat Start
  • R + Start to open Overworld Debug Menu
  • Utilities > Warp to map warp > Group 24 > Map 7 > Warp 0
  • Walk up and down every stair case
  • Run up and down every stair case
  • Use the Acro Bike up and down every stair case

Verified Scenarios

The video shows all the Manual Testing.

test.mp4

People who collaborated with me in this PR

This was originally written by by @ghoulslash.

Discord Contact Info

I am pkmnsnfrn on Discord.

@pkmnsnfrn pkmnsnfrn added new-feature Adds a feature type: feature branch merge Update from feature branches category: overworld Pertains to out-of-battle mechanics labels Aug 28, 2024
@AlexOn1ine
Copy link
Collaborator

I assume this is the same pr as #4836?

@pkmnsnfrn
Copy link
Collaborator Author

pkmnsnfrn commented Sep 10, 2024

I assume this is the same pr as #4836?

incorrect, they are different.

@Bassoonian
Copy link
Collaborator

Please solve conflicts

src/field_screen_effect.c Outdated Show resolved Hide resolved
src/field_screen_effect.c Outdated Show resolved Hide resolved
src/field_screen_effect.c Outdated Show resolved Hide resolved
src/field_screen_effect.c Outdated Show resolved Hide resolved
src/field_screen_effect.c Outdated Show resolved Hide resolved
src/field_screen_effect.c Outdated Show resolved Hide resolved
src/metatile_behavior.c Outdated Show resolved Hide resolved
@Bassoonian Bassoonian merged commit 7dad830 into rh-hideout:upcoming Sep 28, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: overworld Pertains to out-of-battle mechanics new-feature Adds a feature type: feature branch merge Update from feature branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants