diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-05 01:58:55 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-05 01:58:55 -0700 |
| commit | a9bb5184d02c1d46860680278fcfc5d6c94b08ce (patch) | |
| tree | 5ed602505a1f3677098d307f77bccf9c1e07d233 /src/script.c | |
| parent | 9cfbb3a27a4c8be6adad1ab060db777b30d52ec2 (diff) | |
| parent | 90ed4a86cec815af8fb37d998f96a5c22945f9c2 (diff) | |
Merge remote-tracking branch 'upstream/master' into m
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/script.c b/src/script.c index 4b30e004..e38dee61 100644 --- a/src/script.c +++ b/src/script.c @@ -2142,9 +2142,13 @@ void sub_0807FBFC(Entity* entity, ScriptExecutionContext* context) { gSave.stats.effectTimer = 0; } -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) void sub_0807FC24(Entity* entity, ScriptExecutionContext* context) { +#if defined(DEMO_JP) + u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd0; +#else u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd1; +#endif SetLocalFlag(idx); } #endif |