Merge TheMoonPeople#97 into beta for testing

Author: millerscout

port/src/mainloop.cpp

@@ -30,7 +30,6 @@
 #include "mainloop3.hpp"
 #include "mainloop_port.hpp"
 #include "mapjump.hpp"
-#include "options/retail_system_mes.hpp"
 #include "port_memory_budget.hpp"
 #include "mapselect.hpp"
 #include "menuchr_port.hpp"

ps2/src/charasetup.cpp

@@ -46,12 +46,20 @@ struct SetupPartStack {
 // Retail budgets were counted at PS2 pointer widths; SetActionScript's stack and call allocations grow on PC. Zero on PS2.
 #define CHARA_SCRIPT_RUNTIME_DELTA (((sizeof(RS_STACKDATA) - 8) * 0x80 + (sizeof(RS_CALLDATA) - 12) * 0x200) / 16)
 
-// Retail sized the model stacks at PS2 pointer widths too; LoadPack's model structures grow on PC, and Max's
-// dungeon model already fills 68492 of 68500, so a reload after an event overflows. Zero on PS2.
 #ifdef PORT
-#define CHARA_MODEL_RUNTIME_DELTA 32768
+#include "port_memory_budget.hpp"
+
+static constexpr int CharaMemModelDelta(int row, int col) {
+    if ((row == CHARA_MEM_LAYOUT_HUMAN && col <= 1) || (row == CHARA_MEM_LAYOUT_ROBO && col <= 2) ||
+        (row == CHARA_MEM_LAYOUT_EDIT && col == 0) || (row == CHARA_MEM_LAYOUT_MONSTER && col == 0)) {
+        return CHARA_MODEL_LOAD_DELTA;
+    }
+    return 0;
+}
+
+#define MEM_TBL(v, row, col) ((v) + CharaMemModelDelta(row, col))
 #else
-#define CHARA_MODEL_RUNTIME_DELTA 0
+#define MEM_TBL(v, row, col) (v)
 #endif
 
 /**
@@ -60,10 +68,12 @@ struct SetupPartStack {
  *
  */
 static int mem_table[CHARA_MEM_LAYOUT_NUM][CHARA_MEM_STACK_NUM] = {
-    {68500 + CHARA_MODEL_RUNTIME_DELTA,  40000, 7000,  4650,  3000,  9900 + CHARA_SCRIPT_RUNTIME_DELTA, 4500 + CHARA_SCRIPT_RUNTIME_DELTA},
-    {30000,  30000, 60000, 10000, 10000 + CHARA_SCRIPT_RUNTIME_DELTA, 0,    0   },
-    {75000 + CHARA_MODEL_RUNTIME_DELTA,  40000, 7000,  4650,  3000,  9900, 0   },
-    {120000 + CHARA_MODEL_RUNTIME_DELTA, 0,     0,     0,     0,     5500, 0   }
+    {MEM_TBL(68500, CHARA_MEM_LAYOUT_HUMAN, 0),   MEM_TBL(40000, CHARA_MEM_LAYOUT_HUMAN, 1),   7000,  4650,  3000,
+     9900 + CHARA_SCRIPT_RUNTIME_DELTA,            4500 + CHARA_SCRIPT_RUNTIME_DELTA},
+    {MEM_TBL(30000, CHARA_MEM_LAYOUT_ROBO, 0),    MEM_TBL(30000, CHARA_MEM_LAYOUT_ROBO, 1),    MEM_TBL(60000, CHARA_MEM_LAYOUT_ROBO, 2), 10000,
+     10000 + CHARA_SCRIPT_RUNTIME_DELTA,          0,                                             0},
+    {MEM_TBL(75000, CHARA_MEM_LAYOUT_EDIT, 0),    40000,                                         7000,  4650,  3000,  9900, 0},
+    {MEM_TBL(120000, CHARA_MEM_LAYOUT_MONSTER, 0), 0,                                             0,     0,     0,     5500, 0}
 };
 
 #ifdef PORT

ps2/src/dng_event.cpp

@@ -28,7 +28,6 @@
 #include "mainloop.hpp"
 #ifdef PORT
 #include "port_memory_budget.hpp"
-#include "port_monster_limit.hpp"
 #endif
 #include "maintex.hpp"
 #include "mapinfo.hpp"

scripts/port/header_fixups.py

@@ -34,11 +34,14 @@
     ("menusys.hpp", "    int MenuItemCommandSelect(int select_key, int push_button);",
      "    int MenuItemCommandSelect(int select_key, int push_button);\n"
      "    int PortRetailMenuItemCommandSelect(int select_key, int push_button);"),
-    # The floor information's monster page wraps the tree map's step and draw; retail's routines stay under these names.
-    ("dngmenu.hpp", "    int FadeInOutMenu();",
-     "    int FadeInOutMenu();\n"
-     "    int PortRetailStep();\n"
-     "    void PortRetailDraw();"),
+    ("menusys.hpp", "    int PushKey(int pad, int trigger);",
+     "    int PushKey(int pad, int trigger);\n"
+     "    int PortRetailMenuItemInfoPushKey(int pad, int trigger);"),
+    ("menusys.hpp", "    void KeyStepLocal(int select_key, int push_button, int flag);",
+     "    void KeyStepLocal(int select_key, int push_button, int flag);\n"
+     "    void PortRetailMenuItemInfoKeyStepLocal(int select_key, int push_button, int flag);"),
+    ("menusys.hpp", "int MenuItemKey();",
+     "int MenuItemKey();\nvoid PortRetailMenuItemDraw();"),
     ("nd_meswin.hpp", "#ifndef MES_WINDOW_OUT_OF_LINE_INIT", "#if 1"),
     ("collision.hpp", "memset(&bbox, 0, sizeof(bbox));", "memset(static_cast<void *>(&bbox), 0, sizeof(bbox));"),
     # kernel32 exports these three names on Windows; the PS2 kernel's versions take their own link names so they never bind to kernel32.

scripts/port/unit_copy.py

@@ -54,10 +54,6 @@ def load_port_override(path: Path):
         ("CMenuItemInfo::KeyStepLocal(int,int,int)", "KeyStepLocal", "PortRetailMenuItemInfoKeyStepLocal"),
         ("MenuItemDraw()", "MenuItemDraw", "PortRetailMenuItemDraw"),
     ],
-    "dngmenu.cpp": [
-        ("CMenuTreeMap::Step()", "Step", "PortRetailStep"),
-        ("CMenuTreeMap::Draw()", "Draw", "PortRetailDraw"),
-    ],
     "menuchr.cpp": [
         ("InitMainCharaBG(int,mgCMemory*,int)", "InitMainCharaBG", "PortRetailInitMainCharaBG"),
         ("KeyMainCharaBG()", "KeyMainCharaBG", "PortRetailKeyMainCharaBG"),