mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-05 11:18:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m

Browse Source
This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
parent 9cfbb3a27a 90ed4a86ce
commit a9bb5184d0
440 changed files with 7319 additions and 11526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script.c
+5 -1
View File
@@ -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