Merge pull request #40 from klorfmorf/no-tlb

Remove TLB emulation in favor of using relocations

Author: klorfmorf

CMakeLists.txt

@@ -130,7 +130,7 @@ endif()
 add_custom_target(PatchesBin
     COMMAND ${CMAKE_COMMAND} -E env CC=${PATCHES_C_COMPILER} LD=${PATCHES_LD} make
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/patches
-    BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/patches.elf
+    BYPRODUCTS ${CMAKE_SOURCE_DIR}/patches/build/patches.elf
 )
 
 # Generate patches_bin.c from patches.bin
@@ -148,7 +148,7 @@ add_custom_command(OUTPUT
                    # TODO: Look into why modifying patches requires two builds to take
                    COMMAND ./N64Recomp patches.toml
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                   DEPENDS ${CMAKE_SOURCE_DIR}/patches/patches.elf
+                   DEPENDS ${CMAKE_SOURCE_DIR}/patches/build/patches.elf
 )
 
 # Main executable
@@ -164,8 +164,8 @@ set (SOURCES
     ${CMAKE_SOURCE_DIR}/src/game/input.cpp
     ${CMAKE_SOURCE_DIR}/src/game/controls.cpp
     ${CMAKE_SOURCE_DIR}/src/game/config.cpp
+    ${CMAKE_SOURCE_DIR}/src/game/scene_table.cpp
     ${CMAKE_SOURCE_DIR}/src/game/debug.cpp
-    ${CMAKE_SOURCE_DIR}/src/game/patch_api.cpp
     ${CMAKE_SOURCE_DIR}/src/game/quicksaving.cpp
     ${CMAKE_SOURCE_DIR}/src/game/recomp_api.cpp
     ${CMAKE_SOURCE_DIR}/src/game/recomp_actor_api.cpp
@@ -419,3 +419,10 @@ target_sources(Goemon64Recompiled PRIVATE ${GENERATED_NRM_SOURCES})
 target_sources(Goemon64Recompiled PRIVATE ${SOURCES})
 
 set_property(TARGET Goemon64Recompiled PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+
+if(CMAKE_EXPORT_COMPILE_COMMANDS)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "${CMAKE_BINARY_DIR}/compile_commands.json"
+        "${CMAKE_SOURCE_DIR}/compile_commands.json"
+    )
+endif()

Goemon64RecompSyms

@@ -17,7 +17,7 @@
 
   <description>
     <p>
-      Zelda 64: Recompiled is a project that uses N64: Recompiled to statically recompile Majora's Mask (and soon Ocarina of Time) into a native port with many new features and enhancements. This project uses RT64 as the rendering engine to provide some of these enhancements.
+      Goemon 64: Recompiled is a project that uses N64: Recompiled to statically recompile Mystical Ninja Starring Goemon (and soon Goemon's Great Adventure) into a native port with many new features and enhancements. This project uses RT64 as the rendering engine to provide some of these enhancements.
 
       The original game is required to run this project.
 

flatpak/io.github.klorfmorf.goemon64recomp.metainfo.xml

@@ -11,15 +11,12 @@ namespace goemon64 {
         std::vector<std::string> entrances;
     };
 
-    //! REMOVED
-    /*
     struct AreaWarps {
         std::string name;
         std::vector<SceneWarps> scenes;
     };
 
     extern std::vector<AreaWarps> game_warps;
-    */
 
     void do_warp(int area, int scene, int entrance);
     void set_time(uint8_t day, uint8_t hour, uint8_t minute);