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

2026-06-07 12:07:37 -04:00 · 2021-11-05 01:58:55 -07:00
parent 9cfbb3a27a 90ed4a86ce
commit a9bb5184d0
440 changed files with 7319 additions and 11526 deletions
@@ -267,7 +267,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) {
 */

 void sub_08054870(void) {
-#ifndef DEMO
+#if !(defined(DEMO_USA) || defined(DEMO_JP))
    gUnk_080FE2A0[gMenu.menuType]();
 #endif
 }