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

Config for running indoors #2388

Merged
merged 1 commit into from
Oct 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions include/constants/overworld_config.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#ifndef GUARD_CONSTANTS_OVERWORLD_CONFIG_H
#define GUARD_CONSTANTS_OVERWORLD_CONFIG_H

// Movement config
#define OW_RUNNING_INDOORS GEN_LATEST // In Gen4+, players are allowed to run indoors.

// Overworld flags
#define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled.
#define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to.
#define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled.
#define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to.

// Debug options
#define DEBUG_SYSTEM_ENABLE TRUE // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
Expand Down
4 changes: 4 additions & 0 deletions src/bike.c
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,11 @@ void Bike_HandleBumpySlopeJump(void)

bool32 IsRunningDisallowed(u8 metatile)
{
#if OW_RUNNING_INDOORS == GEN_3
if (!gMapHeader.allowRunning || IsRunningDisallowedByMetatile(metatile) == TRUE)
#else
if (IsRunningDisallowedByMetatile(metatile) == TRUE)
#endif
return TRUE;
else
return FALSE;
Expand Down