Match 3 files from the dol

config/RSBE01_02/splits.txt

@@ -13,6 +13,10 @@ Sections:
 	.sdata2     type:rodata align:16
 	.sbss2      type:bss align:32
 
+sora/sr/sr_getappname.cpp:
+	.text       start:0x8000C860 end:0x8000C8A4
+	.data       start:0x80420680 end:0x80420690
+
 sora/sr/sr_common.cpp:
 	.text       start:0x8000C8A4 end:0x8000C8E0
 	.sdata      start:0x8059C420 end:0x8059C428
@@ -43,10 +47,17 @@ sora/mt/mt_prng.cpp:
 	.sbss       start:0x805A00B8 end:0x805A00C0
 	.sdata2     start:0x805A1748 end:0x805A176C
 
+sora/ef/ef_screen_handle.cpp:
+	.text       start:0x8005E5C8 end:0x8005E5E8
+
 sora/cm/cm_controller_default.cpp:
 	.text       start:0x8009F560 end:0x8009F564
 	.data       start:0x80454CC0 end:0x80454CD0
 
+sora/cm/cm_stage_param.cpp:
+	.text       start:0x800AC9B8 end:0x800AC9DC
+	.sdata2     start:0x805A21D8 end:0x805A21E8
+
 sora/ty/ty_fig_listmng.cpp:
 	.text       start:0x800AC9DC end:0x800AD808
 	.data       start:0x80455120 end:0x80455180

configure.py

@@ -286,14 +286,17 @@ def MatchingFor(*versions):
         "cflags": cflags_common,
         "host": False,
         "objects": [
+            Object(Matching, "sora/sr/sr_getappname.cpp"),
             Object(Matching, "sora/sr/sr_common.cpp"),
             Object(Matching, "sora/sr/sr_revision.cpp"),
             Object(Matching, "sora/gf/gf_3d_scene_light_resource.cpp"),
             Object(Matching, "sora/gf/gf_archive_load_thread.cpp"),
             Object(Matching, "sora/gf/gf_camera_controller.cpp"),
             Object(Matching, "sora/gf/gf_memory_util.cpp"),
             Object(Matching, "sora/mt/mt_prng.cpp", extra_cflags=["-RTTI off"]),
+            Object(Matching, "sora/ef/ef_screen_handle.cpp"),
             Object(Matching, "sora/cm/cm_controller_default.cpp", extra_cflags=["-RTTI off"]),
+            Object(Matching, "sora/cm/cm_stage_param.cpp"),
             Object(NonMatching, "sora/ty/ty_fig_listmng.cpp"),
             Object(NonMatching, "sora/ac/ac_cmd_interpreter.cpp"),
             Object(Matching, "sora/ac/ac_anim_cmd_impl.cpp"),

src/mo_enemy/sora_enemy/em_info.cpp

@@ -327,7 +327,7 @@ emInfo::emInfo() { }
 
 emInfo::~emInfo() { }
 
-u32 emInfo::isInvalidKind(EnemyKind kind) {
+bool emInfo::isInvalidKind(int kind) {
     if (kind <= Enemy_Invalid || kind >= NumEnemies) {
         return 1;
     }
@@ -344,7 +344,7 @@ u32 emInfo::isPrimKind(EnemyKind kind) {
     return 0;
 }
 
-EnemyKind emInfo::getInvalidKind() {
+int emInfo::getInvalidKind() {
     return Enemy_Invalid;
 }
 
@@ -355,14 +355,14 @@ u32 emInfo::getNodeNum(EnemyKind kind) {
     return NodeNumTable[kind];
 }
 
-u32 emInfo::getMotionNum(EnemyKind kind) {
+u32 emInfo::getMotionNum(int kind) {
     if (isInvalidKind(kind) == 1) {
         return 0;
     }
     return MotionNumTable[kind];
 }
 
-u32 emInfo::getStatusNum(EnemyKind kind) {
+u32 emInfo::getStatusNum(int kind) {
     if (isInvalidKind(kind) == 1) {
         return 0;
     }
@@ -453,6 +453,6 @@ u32 emInfo::StandByStatusKind(EnemyKind kind) {
     return StandByStatusKindTable[kind];
 }
 
-const char* emInfo::getNamePtr() {
+const char* emInfo::getNamePtr(int kind) {
     return 0;
 }

src/sora/cm/cm_stage_param.cpp

@@ -0,0 +1,4 @@
+#include <cm/cm_stage_param.h>
+
+cmStageParamPausedOffsetRange::cmStageParamPausedOffsetRange() :
+    m_0(-70.0f), m_4(70.0f), m_8(30.0f), m_12(1.0f) { }

src/sora/ef/ef_screen_handle.cpp

@@ -0,0 +1,5 @@
+#include <ef/ef_screen_handle.h>
+
+bool efScreenHandle::isValid() const {
+    return (unk0 >= 0 && unk0 < 10);
+}

src/sora/sr/sr_getappname.cpp

@@ -0,0 +1,36 @@
+#ifndef MATCHING
+#include <arpa/inet.h>
+#endif
+#include <revolution/OS/OS.h>
+#include <sr/sr_getappname.h>
+#include <types.h>
+
+const char* srGetAppGamename() {
+    return OSGetAppGamename();
+}
+
+// Note: The matching code assumes big-endian
+u32 srGetAppInitialCode() {
+#ifdef MATCHING
+    return *reinterpret_cast<const u32*>(OSGetAppGamename());
+#else
+    u32 code;
+    memcpy(&code, OSGetAppGamename(), sizeof(u32));
+    return ntohl(code);
+#endif
+}
+
+u32 srGetAppInitialCodeLocaleNum() {
+    return 3;
+}
+
+// Note: The matching code assumes big-endian
+u32 srGetAppInitialCodeLocale(u32 i) {
+#ifdef MATCHING
+    return *reinterpret_cast<const u32*>(&"RSBJRSBERSBP"[sizeof(u32)*i]);
+#else
+    u32 code;
+    memcpy(&code, &"RSBJRSBERSBP"[sizeof(u32)*i], sizeof(u32));
+    return ntohl(code);
+#endif
+}