mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-30 07:34:37 -04:00
Compare commits
67 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fae9add351 | |||
| 95608438c1 | |||
| 3e343acc86 | |||
| 9696c12563 | |||
| d3e05a4f37 | |||
| 27c9719abc | |||
| 8caab1a6ba | |||
| e3075520e7 | |||
| ce386d8dbd | |||
| 1654d256ec | |||
| 241927b489 | |||
| 8051679c96 | |||
| 6058a0c597 | |||
| 1bae8a5e6a | |||
| ec51ba298b | |||
| 76b56cd8b8 | |||
| e9ebb174f1 | |||
| 12261dbc49 | |||
| 5db55c508b | |||
| 5ea7f7ca9a | |||
| 0f2a00cd1f | |||
| adfb830b4d | |||
| a2fd82d18b | |||
| 30def245f0 | |||
| a6f059827b | |||
| 49a3c9e2ac | |||
| eed14acdc6 | |||
| a95bc76237 | |||
| f000ccce0b | |||
| 8471fa0107 | |||
| d5fcd79306 | |||
| 26d22d414a | |||
| f14278cec8 | |||
| f5d30a886d | |||
| dfc3077333 | |||
| 1bd8682855 | |||
| d2cdbf0a83 | |||
| 700bbf0a5a | |||
| cdb36e9c42 | |||
| cca104584e | |||
| 9687a9d95a | |||
| 8cc4ce94b8 | |||
| 641ac5877e | |||
| da38a1d2d3 | |||
| 6a79bf1e79 | |||
| 20f786a43e | |||
| 4c2bb26df7 | |||
| 229c162580 | |||
| 6d4a7e55e9 | |||
| b6e3c50d88 | |||
| 287ee6b2ee | |||
| 7113584632 | |||
| 867ec7fbab | |||
| 157bbfb4c9 | |||
| 2fcbebcd51 | |||
| 50565b37fc | |||
| 84e7394d5b | |||
| 409b60836b | |||
| 75a249f3e1 | |||
| d9a978f21f | |||
| 3585ab8a59 | |||
| 7df07c6904 | |||
| 1a7c853d9b | |||
| 9a3428983b | |||
| 15a846478b | |||
| 00704ad838 | |||
| f52c715364 |
@@ -80,6 +80,7 @@ jobs:
|
||||
path: |
|
||||
build/install/Dusklight-*.AppImage
|
||||
build/install/debug.tar.*
|
||||
build/install/sdk/
|
||||
|
||||
build-apple:
|
||||
name: Build Apple (${{matrix.name}})
|
||||
@@ -148,6 +149,7 @@ jobs:
|
||||
path: |
|
||||
build/install/Dusklight.app
|
||||
build/install/debug.tar.*
|
||||
build/install/sdk/
|
||||
|
||||
build-android:
|
||||
name: Build Android (${{matrix.name}})
|
||||
@@ -203,6 +205,9 @@ jobs:
|
||||
- name: Build native library
|
||||
run: cmake --build --preset ${{matrix.preset}} --target dusklight
|
||||
|
||||
- name: Build bundled mods
|
||||
run: cmake --build --preset ${{matrix.preset}} --target dusklight_mods
|
||||
|
||||
- name: Stage stripped JNI library
|
||||
run: ANDROID_STAGE_ABIS="${{matrix.abi}}" platforms/android/scripts/stage-jni-libs.sh
|
||||
|
||||
@@ -210,11 +215,17 @@ jobs:
|
||||
working-directory: platforms/android
|
||||
run: ./gradlew :app:assembleRelease --rerun-tasks
|
||||
|
||||
- name: Stage artifacts
|
||||
run: |
|
||||
mkdir -p upload/sdk
|
||||
cp build/*/stub-android-*.so upload/sdk/
|
||||
cp platforms/android/app/build/outputs/apk/release/app-${{matrix.abi}}-release-unsigned.apk upload/
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: dusklight-${{env.DUSK_VERSION}}-android-${{matrix.artifact_arch}}
|
||||
path: platforms/android/app/build/outputs/apk/release/app-${{matrix.abi}}-release-unsigned.apk
|
||||
path: upload/
|
||||
|
||||
build-windows:
|
||||
name: Build Windows (${{matrix.name}})
|
||||
@@ -280,4 +291,6 @@ jobs:
|
||||
build/install/*.exe
|
||||
build/install/*.dll
|
||||
build/install/res/
|
||||
build/install/mods/
|
||||
build/install/debug.7z
|
||||
build/install/sdk/
|
||||
|
||||
+65
-14
@@ -91,6 +91,35 @@ option(DUSK_PACKAGE_INSTALL "Install Dusklight with a Linux-native file structur
|
||||
option(DUSK_GFX_DEBUG_GROUPS "Report debug groups to the native graphics API" ${DUSK_GFX_DEBUG_GROUPS_DEFAULT})
|
||||
option(DUSK_ENABLE_CODE_MODS "Enable code mods" OFF)
|
||||
|
||||
set(DUSK_HAS_FUNCHOOK OFF)
|
||||
if (DUSK_ENABLE_CODE_MODS AND (NOT APPLE OR CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
|
||||
set(DUSK_HAS_FUNCHOOK ON)
|
||||
endif ()
|
||||
set(DUSK_HAS_FUNCHOOK ${DUSK_HAS_FUNCHOOK} CACHE INTERNAL "Enable funchook" FORCE)
|
||||
|
||||
set(_target_architectures ${CMAKE_OSX_ARCHITECTURES})
|
||||
if (NOT _target_architectures)
|
||||
set(_target_architectures ${CMAKE_SYSTEM_PROCESSOR})
|
||||
endif ()
|
||||
list(LENGTH _target_architectures _target_arch_count)
|
||||
set(DUSK_HAS_PREPATCH OFF)
|
||||
if (DUSK_ENABLE_CODE_MODS AND APPLE AND _target_arch_count EQUAL 1)
|
||||
list(GET _target_architectures 0 _target_arch)
|
||||
if (_target_arch STREQUAL "arm64")
|
||||
set(DUSK_HAS_PREPATCH ON)
|
||||
endif ()
|
||||
endif ()
|
||||
set(DUSK_HAS_PREPATCH ${DUSK_HAS_PREPATCH} CACHE INTERNAL "Enable symgen prepatch support" FORCE)
|
||||
|
||||
if (DUSK_ENABLE_CODE_MODS AND CMAKE_SYSTEM_NAME MATCHES "^(iOS|tvOS)$")
|
||||
list(LENGTH CMAKE_OSX_ARCHITECTURES _mobile_arch_count)
|
||||
if (NOT _mobile_arch_count EQUAL 1 OR NOT CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
|
||||
message(FATAL_ERROR
|
||||
"iOS/tvOS code mods require a single arm64 architecture; got "
|
||||
"CMAKE_OSX_ARCHITECTURES='${CMAKE_OSX_ARCHITECTURES}'")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
# Edit & Continue
|
||||
if (MSVC)
|
||||
if ("${CMAKE_MSVC_DEBUG_INFORMATION_FORMAT}" STREQUAL "" AND CMAKE_BUILD_TYPE STREQUAL "Debug"
|
||||
@@ -175,8 +204,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
||||
set(CMAKE_BUILD_RPATH "$ORIGIN")
|
||||
elseif (APPLE)
|
||||
add_compile_options(-Wno-declaration-after-statement -Wno-non-pod-varargs)
|
||||
set(CMAKE_INSTALL_RPATH "$ORIGIN")
|
||||
set(CMAKE_BUILD_RPATH "$ORIGIN")
|
||||
set(CMAKE_INSTALL_RPATH "@loader_path")
|
||||
set(CMAKE_BUILD_RPATH "@loader_path")
|
||||
elseif (MSVC)
|
||||
add_compile_options(
|
||||
$<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>
|
||||
@@ -219,7 +248,7 @@ FetchContent_Declare(miniz
|
||||
)
|
||||
|
||||
set(_fetch_content_deps cxxopts json miniz)
|
||||
if (DUSK_ENABLE_CODE_MODS)
|
||||
if (DUSK_HAS_FUNCHOOK)
|
||||
message(STATUS "dusklight: Fetching funchook")
|
||||
# cmake/PatchFunchook.cmake patches funchook's cmake/capstone.cmake.in to inject a
|
||||
# PATCH_COMMAND into capstone's inner ExternalProject. That PATCH_COMMAND runs
|
||||
@@ -272,10 +301,10 @@ if (DUSK_ENABLE_SENTRY_NATIVE)
|
||||
)
|
||||
if (NOT sentry_native_POPULATED)
|
||||
FetchContent_Populate(sentry_native)
|
||||
set(_dusk_skip_install_rules ${CMAKE_SKIP_INSTALL_RULES})
|
||||
set(_skip_install_rules ${CMAKE_SKIP_INSTALL_RULES})
|
||||
set(CMAKE_SKIP_INSTALL_RULES ON)
|
||||
add_subdirectory(${sentry_native_SOURCE_DIR} ${sentry_native_BINARY_DIR} EXCLUDE_FROM_ALL)
|
||||
set(CMAKE_SKIP_INSTALL_RULES ${_dusk_skip_install_rules})
|
||||
set(CMAKE_SKIP_INSTALL_RULES ${_skip_install_rules})
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@@ -304,10 +333,11 @@ source_group("dusklight" FILES ${DUSK_FILES} ${DUSK_HTTP_BACKEND_FILES})
|
||||
include(cmake/GameABIConfig.cmake)
|
||||
|
||||
find_package(Threads REQUIRED)
|
||||
set(GAME_COMPILE_DEFS DUSK_BUILDING_GAME=1)
|
||||
set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd
|
||||
aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt
|
||||
Threads::Threads zstd::libzstd dusklight_game_headers)
|
||||
if (DUSK_ENABLE_CODE_MODS)
|
||||
if (DUSK_HAS_FUNCHOOK)
|
||||
list(APPEND GAME_LIBS funchook-static)
|
||||
endif ()
|
||||
|
||||
@@ -380,6 +410,9 @@ endif ()
|
||||
if (DUSK_ENABLE_CODE_MODS)
|
||||
list(APPEND GAME_COMPILE_DEFS DUSK_CODE_MODS=1)
|
||||
endif ()
|
||||
list(APPEND GAME_COMPILE_DEFS
|
||||
DUSK_HAS_FUNCHOOK=$<BOOL:${DUSK_HAS_FUNCHOOK}>
|
||||
DUSK_HAS_PREPATCH=$<BOOL:${DUSK_HAS_PREPATCH}>)
|
||||
|
||||
if (DUSK_PACKAGE_INSTALL)
|
||||
include(GNUInstallDirs)
|
||||
@@ -472,27 +505,40 @@ if (MSVC)
|
||||
else ()
|
||||
target_link_options(dusklight PRIVATE /FUNCTIONPADMIN /OPT:NOICF)
|
||||
endif ()
|
||||
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
elseif (CMAKE_CXX_COMPILER_ID MATCHES "^(AppleClang|Clang)$")
|
||||
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
|
||||
set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=2,1>)
|
||||
else ()
|
||||
set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=10,5>)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (DEFINED DUSK_PATCHABLE_ENTRY_FLAG)
|
||||
target_compile_options(dusklight PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
|
||||
foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
|
||||
target_compile_options(${jsystem_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
|
||||
endforeach()
|
||||
foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
|
||||
aurora_os aurora_pad aurora_si aurora_vi)
|
||||
if (TARGET ${_sdk_lib})
|
||||
get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
|
||||
if (NOT _sdk_lib_imported)
|
||||
target_compile_options(${_sdk_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
|
||||
endif ()
|
||||
endif ()
|
||||
endforeach ()
|
||||
endif ()
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(dusklight PRIVATE Psapi)
|
||||
endif ()
|
||||
if (APPLE)
|
||||
# Mods resolve game symbols from the executable at dlopen time.
|
||||
target_link_options(dusklight PRIVATE -Wl,-export_dynamic)
|
||||
elseif (UNIX AND NOT ANDROID)
|
||||
include(cmake/AppleExports.cmake)
|
||||
setup_apple_exports(dusklight)
|
||||
elseif (ANDROID)
|
||||
include(cmake/AndroidExports.cmake)
|
||||
setup_android_exports(dusklight)
|
||||
elseif (UNIX)
|
||||
target_link_options(dusklight PRIVATE -rdynamic)
|
||||
endif ()
|
||||
|
||||
@@ -515,6 +561,8 @@ endif ()
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
||||
target_link_options(dusklight PRIVATE "-Wl,--build-id=sha1")
|
||||
target_link_libraries(dusklight PRIVATE dl)
|
||||
elseif (ANDROID)
|
||||
target_link_options(dusklight PRIVATE "-Wl,--build-id=sha1")
|
||||
endif ()
|
||||
|
||||
if (NOT APPLE)
|
||||
@@ -559,7 +607,10 @@ include(cmake/ModSDK.cmake)
|
||||
|
||||
if (DUSK_ENABLE_CODE_MODS AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||||
add_custom_target(dusklight_mods) # Aggregate target for all in-tree mods
|
||||
add_subdirectory(tools/mod_template)
|
||||
add_subdirectory(mods/template_mod)
|
||||
add_subdirectory(mods/ao_mod)
|
||||
add_subdirectory(mods/shadow_mod)
|
||||
add_subdirectory(mods/randomizer)
|
||||
endif ()
|
||||
|
||||
if (APPLE)
|
||||
@@ -604,13 +655,13 @@ if (APPLE)
|
||||
list(APPEND _apple_bundle_properties
|
||||
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${DUSK_ENTITLEMENTS})
|
||||
endif ()
|
||||
if (NOT IOS AND NOT TVOS)
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
list(APPEND _apple_bundle_properties
|
||||
XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME "YES")
|
||||
endif ()
|
||||
set_target_properties(dusklight PROPERTIES ${_apple_bundle_properties})
|
||||
|
||||
if (NOT IOS AND NOT TVOS AND NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
|
||||
set(_sign_nested_commands)
|
||||
if (TARGET crashpad_handler)
|
||||
list(APPEND _sign_nested_commands
|
||||
@@ -627,7 +678,7 @@ if (APPLE)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (APPLE AND NOT IOS AND NOT TVOS)
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
find_library(APPKIT_FRAMEWORK AppKit REQUIRED)
|
||||
target_sources(dusklight PRIVATE src/dusk/file_select_macos.mm)
|
||||
set_source_files_properties(src/dusk/file_select_macos.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
|
||||
|
||||
+20
-21
@@ -22,18 +22,6 @@
|
||||
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "release",
|
||||
"hidden": true,
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL",
|
||||
"CMAKE_INTERPROCEDURAL_OPTIMIZATION": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "ci",
|
||||
"hidden": true,
|
||||
@@ -208,17 +196,13 @@
|
||||
{
|
||||
"name": "windows-arm64-msvc",
|
||||
"displayName": "Windows ARM64 (MSVC)",
|
||||
"generator": "Ninja",
|
||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||
"inherits": [
|
||||
"windows-msvc"
|
||||
],
|
||||
"architecture": {
|
||||
"value": "arm64",
|
||||
"strategy": "external"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"CMAKE_C_COMPILER": "cl",
|
||||
"CMAKE_CXX_COMPILER": "cl",
|
||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
|
||||
},
|
||||
"vendor": {
|
||||
"microsoft.com/VisualStudioSettings/CMake/1.0": {
|
||||
"hostOS": [
|
||||
@@ -330,11 +314,19 @@
|
||||
"type": "BOOL",
|
||||
"value": false
|
||||
},
|
||||
"ENABLE_VISIBILITY": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
},
|
||||
"Rust_CARGO_TARGET": "aarch64-apple-ios",
|
||||
"BUILD_SHARED_LIBS": {
|
||||
"type": "BOOL",
|
||||
"value": false
|
||||
},
|
||||
"DUSK_ENABLE_CODE_MODS": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
},
|
||||
"CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
@@ -370,12 +362,20 @@
|
||||
"type": "BOOL",
|
||||
"value": false
|
||||
},
|
||||
"ENABLE_VISIBILITY": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
},
|
||||
"Rust_CARGO_TARGET": "aarch64-apple-tvos",
|
||||
"Rust_TOOLCHAIN": "nightly",
|
||||
"BUILD_SHARED_LIBS": {
|
||||
"type": "BOOL",
|
||||
"value": false
|
||||
},
|
||||
"DUSK_ENABLE_CODE_MODS": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
},
|
||||
"CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
|
||||
"type": "BOOL",
|
||||
"value": true
|
||||
@@ -445,8 +445,7 @@
|
||||
"hidden": true,
|
||||
"inherits": [
|
||||
"android-base",
|
||||
"ci",
|
||||
"release"
|
||||
"ci"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"DUSK_ENABLE_SENTRY_NATIVE": {
|
||||
|
||||
@@ -26,7 +26,7 @@ It aims to be as accurate as possible to the original while also providing new o
|
||||
|
||||
You must dump your own copy of the game. Please see [this article](https://wiki.dolphin-emu.org/index.php?title=Ripping_Games) for instructions. After dumping, you can use a program like [Dolphin](https://dolphin-emu.org/) or [nodtool](https://github.com/encounter/nod/releases) to convert the `.iso` to `.rvz` to save space.
|
||||
|
||||
Currently, only the GameCube USA and EUR releases are supported. Support for other versions of the game is planned in the future.
|
||||
Currently, only the GameCube releases are supported. Support for other versions of the game is planned in the future.
|
||||
|
||||
### 2. Install Dusklight
|
||||
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
include_guard(GLOBAL)
|
||||
|
||||
get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
|
||||
|
||||
# Android mod linking: symgen scans and filters the game's exports, generating a version script used for the executable
|
||||
# link step, and generates a shared object stub that mods can link against without having to build the whole game.
|
||||
function(setup_android_exports target)
|
||||
include("${_dir}/SymbolManifest.cmake")
|
||||
ensure_symgen(TRUE)
|
||||
add_dependencies(${target} symgen)
|
||||
|
||||
set(_rsp_lines "$<TARGET_OBJECTS:${target}>")
|
||||
foreach (_lib IN LISTS JSYSTEM_LIBRARIES)
|
||||
list(APPEND _rsp_lines "$<TARGET_FILE:${_lib}>")
|
||||
endforeach ()
|
||||
list(JOIN _rsp_lines "\n" _rsp_content)
|
||||
set(_rsp "${CMAKE_BINARY_DIR}/dusklight_exports_input.rsp")
|
||||
file(GENERATE OUTPUT "${_rsp}" CONTENT "${_rsp_content}")
|
||||
|
||||
set(_sdk_args)
|
||||
foreach (_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
|
||||
aurora_os aurora_pad aurora_si aurora_vi)
|
||||
if (TARGET ${_lib})
|
||||
list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:${_lib}>")
|
||||
endif ()
|
||||
endforeach ()
|
||||
if (TARGET dawn::webgpu_dawn)
|
||||
get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
|
||||
if (_dawn_type STREQUAL "STATIC_LIBRARY")
|
||||
list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:dawn::webgpu_dawn>")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
set(_vscript "${CMAKE_BINARY_DIR}/dusklight_exports.ver")
|
||||
add_custom_command(TARGET ${target} PRE_LINK
|
||||
COMMAND "${SYMGEN_EXE}" exports
|
||||
"@${_rsp}"
|
||||
--out "${_vscript}"
|
||||
--format version-script
|
||||
--exclude cmake_pch
|
||||
--exclude miniz
|
||||
--exclude asan_options
|
||||
--exclude src/dusk
|
||||
# Resolved from the Java side; the SDL ones live in the statically-linked
|
||||
# SDL archive, outside the provenance scan.
|
||||
--extra-sym JNI_OnLoad
|
||||
--extra-sym SDL_main
|
||||
--extra-sym "Java_*"
|
||||
${_sdk_args}
|
||||
COMMENT "Generating dusklight exports"
|
||||
VERBATIM)
|
||||
target_link_options(${target} PRIVATE "-Wl,--version-script=${_vscript}")
|
||||
|
||||
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _arch)
|
||||
set(_stub "${CMAKE_BINARY_DIR}/stub-android-${_arch}.so")
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${SYMGEN_EXE}" stub -f elf "$<TARGET_FILE:${target}>" -o "${_stub}"
|
||||
--soname "$<TARGET_FILE_NAME:${target}>" --arch "${_arch}"
|
||||
BYPRODUCTS "${_stub}"
|
||||
COMMENT "Generating dusklight link stub"
|
||||
VERBATIM)
|
||||
install(FILES "${_stub}" DESTINATION sdk)
|
||||
endfunction()
|
||||
@@ -0,0 +1,90 @@
|
||||
include_guard(GLOBAL)
|
||||
|
||||
get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
|
||||
|
||||
# Apple mod linking: symgen scans and filters the game's exports, generating an exports list used for the executable
|
||||
# link step, and generates a MH_EXECUTE Mach-O stub that mods can link against without having to build the whole game.
|
||||
function(setup_apple_exports target)
|
||||
include("${_dir}/SymbolManifest.cmake")
|
||||
ensure_symgen(TRUE)
|
||||
set(_symgen "${SYMGEN_EXE}")
|
||||
add_dependencies(${target} symgen)
|
||||
|
||||
set(_config_subdir "")
|
||||
if (CMAKE_CONFIGURATION_TYPES)
|
||||
set(_config_subdir "$<CONFIG>/")
|
||||
endif ()
|
||||
|
||||
set(_rsp_lines "$<TARGET_OBJECTS:${target}>")
|
||||
foreach (_lib IN LISTS JSYSTEM_LIBRARIES)
|
||||
list(APPEND _rsp_lines "$<TARGET_FILE:${_lib}>")
|
||||
endforeach ()
|
||||
list(JOIN _rsp_lines "\n" _rsp_content)
|
||||
set(_rsp "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports_input.rsp")
|
||||
file(GENERATE OUTPUT "${_rsp}" CONTENT "${_rsp_content}")
|
||||
|
||||
set(_sdk_args)
|
||||
foreach (_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
|
||||
aurora_os aurora_pad aurora_si aurora_vi)
|
||||
if (TARGET ${_lib})
|
||||
list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:${_lib}>")
|
||||
endif ()
|
||||
endforeach ()
|
||||
|
||||
# Dawn is linked statically on Apple; mods reach wgpu* through the executable.
|
||||
if (TARGET dawn::webgpu_dawn)
|
||||
get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
|
||||
if (_dawn_type STREQUAL "STATIC_LIBRARY")
|
||||
list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:dawn::webgpu_dawn>")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
set(_exp "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports.exp")
|
||||
add_custom_command(TARGET ${target} PRE_LINK
|
||||
COMMAND "${_symgen}" exports
|
||||
"@${_rsp}"
|
||||
--out "${_exp}"
|
||||
--exclude cmake_pch
|
||||
--exclude miniz
|
||||
--exclude asan_options
|
||||
--exclude src/dusk
|
||||
${_sdk_args}
|
||||
COMMENT "Generating dusklight exports"
|
||||
VERBATIM)
|
||||
target_link_options(${target} PRIVATE -Xlinker -exported_symbols_list -Xlinker "${_exp}")
|
||||
|
||||
# Generate the stub executable mods link against via -bundle_loader.
|
||||
set(_stub_args)
|
||||
if (IOS)
|
||||
set(_stub_platform "ios")
|
||||
list(APPEND _stub_args --platform ios)
|
||||
elseif (TVOS)
|
||||
set(_stub_platform "tvos")
|
||||
list(APPEND _stub_args --platform tvos)
|
||||
else ()
|
||||
set(_stub_platform "macos")
|
||||
endif ()
|
||||
if (CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
list(APPEND _stub_args --min-os "${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
endif ()
|
||||
if (CMAKE_OSX_ARCHITECTURES)
|
||||
set(_archs "${CMAKE_OSX_ARCHITECTURES}")
|
||||
else ()
|
||||
set(_archs "${CMAKE_SYSTEM_PROCESSOR}")
|
||||
endif ()
|
||||
set(_arch_names "")
|
||||
foreach (_arch IN LISTS _archs)
|
||||
string(TOLOWER "${_arch}" _arch)
|
||||
list(APPEND _stub_args --arch "${_arch}")
|
||||
list(APPEND _arch_names "${_arch}")
|
||||
endforeach ()
|
||||
list(JOIN _arch_names "_" _arch_name)
|
||||
|
||||
set(_stub "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight-stub")
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${_symgen}" stub -f macho "${_exp}" -o "${_stub}" ${_stub_args}
|
||||
BYPRODUCTS "${_stub}"
|
||||
COMMENT "Generating dusklight link stub"
|
||||
VERBATIM)
|
||||
install(FILES "${_stub}" DESTINATION sdk RENAME "stub-${_stub_platform}-${_arch_name}")
|
||||
endfunction()
|
||||
@@ -0,0 +1,10 @@
|
||||
# Copies a mod asset directory for packaging, skipping dotfiles and dot-directories
|
||||
# (.gitkeep, .DS_Store, ...). Usage: cmake -DSRC=<dir> -DDST=<dir> -P CopyModAssets.cmake
|
||||
file(MAKE_DIRECTORY "${DST}")
|
||||
file(GLOB_RECURSE _files RELATIVE "${SRC}" "${SRC}/*")
|
||||
foreach (_file IN LISTS _files)
|
||||
if (NOT _file MATCHES "(^|/)\\.")
|
||||
get_filename_component(_dir "${_file}" DIRECTORY)
|
||||
file(COPY "${SRC}/${_file}" DESTINATION "${DST}/${_dir}")
|
||||
endif ()
|
||||
endforeach ()
|
||||
@@ -9,19 +9,56 @@ if (ANDROID)
|
||||
list(APPEND _game_compile_defs TARGET_ANDROID=1)
|
||||
endif ()
|
||||
|
||||
set(_game_include_dirs
|
||||
# Public game headers
|
||||
set(_game_abi_include_dirs
|
||||
${_game_root}/include
|
||||
${_game_root}/src
|
||||
${_game_root}/assets/GZ2E01 # TODO: make this dynamic if needed?
|
||||
${_game_root}/assets/GZ2E01
|
||||
${_game_root}/libs/JSystem/include
|
||||
${_game_root}/libs
|
||||
${_game_root}/extern/aurora/include/dolphin
|
||||
${_game_root}/extern/aurora/include
|
||||
${_game_root}/sdk/include
|
||||
)
|
||||
|
||||
# Internal game headers
|
||||
set(_game_include_dirs
|
||||
${_game_abi_include_dirs}
|
||||
${_game_root}/src
|
||||
${_game_root}/extern
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
# Interface target for mods and sub-projects to inherit game headers/defines.
|
||||
# Mod API, including services
|
||||
add_library(dusklight_mod_api INTERFACE)
|
||||
target_include_directories(dusklight_mod_api INTERFACE ${_game_root}/sdk/include)
|
||||
|
||||
# Full internal headers used to build the game
|
||||
add_library(dusklight_game_headers INTERFACE)
|
||||
target_include_directories(dusklight_game_headers INTERFACE ${_game_include_dirs})
|
||||
target_compile_definitions(dusklight_game_headers INTERFACE ${_game_compile_defs})
|
||||
|
||||
# Public game ABI for mods
|
||||
add_library(dusklight_game_abi_headers INTERFACE)
|
||||
target_include_directories(dusklight_game_abi_headers INTERFACE ${_game_abi_include_dirs})
|
||||
target_compile_definitions(dusklight_game_abi_headers INTERFACE ${_game_compile_defs})
|
||||
|
||||
# Mod feature targets
|
||||
add_library(dusklight_mod_feature_game INTERFACE)
|
||||
target_link_libraries(dusklight_mod_feature_game INTERFACE
|
||||
dusklight_mod_api
|
||||
dusklight_game_abi_headers)
|
||||
target_compile_definitions(dusklight_mod_feature_game INTERFACE DUSK_MOD_FEATURE_GAME=1)
|
||||
# Game headers assume global.h comes first in the translation unit (it defines DUSK_GAME_DATA
|
||||
# and friends); force-include it so mods don't depend on include order.
|
||||
if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
|
||||
target_compile_options(dusklight_mod_feature_game INTERFACE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:/FIglobal.h>")
|
||||
else ()
|
||||
target_compile_options(dusklight_mod_feature_game INTERFACE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include global.h>")
|
||||
endif ()
|
||||
target_sources(dusklight_mod_feature_game INTERFACE
|
||||
${_game_root}/sdk/src/game_feature.cpp)
|
||||
|
||||
add_library(dusklight_mod_feature_webgpu INTERFACE)
|
||||
target_link_libraries(dusklight_mod_feature_webgpu INTERFACE dusklight_mod_api)
|
||||
target_compile_definitions(dusklight_mod_feature_webgpu INTERFACE DUSK_MOD_FEATURE_WEBGPU=1)
|
||||
|
||||
+303
-90
@@ -1,8 +1,11 @@
|
||||
# add_mod(<target> SOURCES <file>... MOD_JSON <mod.json> [RES_DIR <res>] [OVERLAY_DIR <overlay>]
|
||||
# add_mod(<target> [FEATURES <feature>...] SOURCES <file>... MOD_JSON <mod.json>
|
||||
# [RUNTIME_LIBRARIES <file>...] [RES_DIR <res>] [OVERLAY_DIR <overlay>]
|
||||
# [TEXTURES_DIR <textures>] [OUTPUT_DIR <dir>] [BUNDLE])
|
||||
set(DUSK_MODS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/mods" CACHE PATH "Directory to write mod packages into")
|
||||
set(DUSKLIGHT_SDK_STUB_URL "https://github.com/encounter/dusklight/releases/download/sdk"
|
||||
CACHE STRING "Base URL for game link stubs downloaded by out-of-tree mod builds")
|
||||
|
||||
function(_mod_lib_name out_var)
|
||||
function(_mod_lib_info out_platform_var out_name_var)
|
||||
set(_arch "${CMAKE_SYSTEM_PROCESSOR}")
|
||||
if (APPLE AND CMAKE_OSX_ARCHITECTURES)
|
||||
list(LENGTH CMAKE_OSX_ARCHITECTURES _count)
|
||||
@@ -10,20 +13,62 @@ function(_mod_lib_name out_var)
|
||||
message(FATAL_ERROR "add_mod: universal binaries are not supported")
|
||||
endif ()
|
||||
set(_arch "${CMAKE_OSX_ARCHITECTURES}")
|
||||
elseif (WIN32)
|
||||
set(_arch_id "${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
|
||||
if (NOT _arch_id)
|
||||
set(_arch_id "${CMAKE_C_COMPILER_ARCHITECTURE_ID}")
|
||||
endif ()
|
||||
if (_arch_id MATCHES "^ARM64(EC)?$")
|
||||
set(_arch "arm64")
|
||||
elseif (_arch_id STREQUAL "x64")
|
||||
set(_arch "amd64")
|
||||
elseif (_arch_id STREQUAL "X86")
|
||||
set(_arch "x86")
|
||||
endif ()
|
||||
endif ()
|
||||
string(TOLOWER "${CMAKE_SYSTEM_NAME}" _platform)
|
||||
if (_platform STREQUAL "darwin")
|
||||
set(_platform "macos")
|
||||
endif ()
|
||||
string(TOLOWER "${_arch}" _arch)
|
||||
if (_arch MATCHES "^(i[3-6]86|x86)$")
|
||||
set(_arch "x86")
|
||||
endif ()
|
||||
if (WIN32)
|
||||
set(_ext ".dll")
|
||||
elseif (APPLE)
|
||||
set(_ext ".dylib")
|
||||
else ()
|
||||
set(_ext ".so")
|
||||
endif ()
|
||||
set(${out_var} "${_platform}-${_arch}${_ext}" PARENT_SCOPE)
|
||||
set(${out_platform_var} "${_platform}-${_arch}" PARENT_SCOPE)
|
||||
set(${out_name_var} "mod${_ext}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# For out-of-tree builds without a game binary: download the version-independent link stub
|
||||
# (generated by symgen) for the target platform.
|
||||
function(_mod_download_link_stub out_var)
|
||||
_mod_lib_info(_platform _lib_name)
|
||||
if (WIN32)
|
||||
set(_asset "${_platform}.lib")
|
||||
elseif (ANDROID)
|
||||
set(_asset "stub-${_platform}.so")
|
||||
else ()
|
||||
set(_asset "stub-${_platform}")
|
||||
endif ()
|
||||
set(_stub "${CMAKE_BINARY_DIR}/dusklight-sdk-stubs/${_asset}")
|
||||
if (NOT EXISTS "${_stub}")
|
||||
message(STATUS "Mod SDK: downloading link stub ${_asset}")
|
||||
file(DOWNLOAD "${DUSKLIGHT_SDK_STUB_URL}/${_asset}" "${_stub}.tmp" STATUS _status)
|
||||
list(GET _status 0 _code)
|
||||
if (NOT _code EQUAL 0)
|
||||
list(GET _status 1 _error)
|
||||
file(REMOVE "${_stub}.tmp")
|
||||
message(FATAL_ERROR
|
||||
"Mod SDK: failed to download ${DUSKLIGHT_SDK_STUB_URL}/${_asset}: ${_error}\n"
|
||||
"Set DUSK_GAME_EXE to a game binary or link stub to skip the download.")
|
||||
endif ()
|
||||
file(RENAME "${_stub}.tmp" "${_stub}")
|
||||
endif ()
|
||||
set(${out_var} "${_stub}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(_mod_resolve_source_path out_var path)
|
||||
@@ -41,11 +86,39 @@ function(_mod_collect_assets out_var dir)
|
||||
endif ()
|
||||
|
||||
file(GLOB_RECURSE _files CONFIGURE_DEPENDS LIST_DIRECTORIES false "${dir}/*")
|
||||
set(${out_var} ${_files} PARENT_SCOPE)
|
||||
# Dotfiles (.gitkeep, .DS_Store, ...) are not packaged; see CopyModAssets.cmake.
|
||||
set(_assets "")
|
||||
foreach (_file IN LISTS _files)
|
||||
file(RELATIVE_PATH _rel "${dir}" "${_file}")
|
||||
if (NOT _rel MATCHES "(^|/)\\.")
|
||||
list(APPEND _assets "${_file}")
|
||||
endif ()
|
||||
endforeach ()
|
||||
set(${out_var} ${_assets} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(_mod_add_webgpu_headers target_name)
|
||||
if (NOT TARGET dawn::dawncpp_headers AND NOT TARGET dawn::webgpu_dawn)
|
||||
include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../extern/aurora/cmake/AuroraDependencyVersions.cmake")
|
||||
set(AURORA_DAWN_PROVIDER "package" CACHE STRING "How to provide Dawn for the mod SDK")
|
||||
include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../extern/aurora/cmake/AuroraDawnProvider.cmake")
|
||||
endif ()
|
||||
|
||||
if (TARGET dawn::dawncpp_headers)
|
||||
target_link_libraries(${target_name} PRIVATE dawn::dawncpp_headers)
|
||||
elseif (TARGET dawn::webgpu_dawn)
|
||||
target_link_libraries(${target_name} PRIVATE dawn::webgpu_dawn)
|
||||
else ()
|
||||
message(FATAL_ERROR "add_mod: FEATURES webgpu could not provide WebGPU headers")
|
||||
endif ()
|
||||
endfunction()
|
||||
|
||||
function(add_mod target_name)
|
||||
cmake_parse_arguments(ARG "BUNDLE" "MOD_JSON;RES_DIR;OVERLAY_DIR;TEXTURES_DIR;OUTPUT_DIR" "SOURCES" ${ARGN})
|
||||
cmake_parse_arguments(ARG "BUNDLE" "MOD_JSON;RES_DIR;OVERLAY_DIR;TEXTURES_DIR;OUTPUT_DIR"
|
||||
"SOURCES;RUNTIME_LIBRARIES;FEATURES" ${ARGN})
|
||||
if (ARG_UNPARSED_ARGUMENTS)
|
||||
message(FATAL_ERROR "add_mod: unknown arguments: ${ARG_UNPARSED_ARGUMENTS}")
|
||||
endif ()
|
||||
if (NOT ARG_MOD_JSON)
|
||||
message(FATAL_ERROR "add_mod: MOD_JSON is required")
|
||||
endif ()
|
||||
@@ -54,80 +127,141 @@ function(add_mod target_name)
|
||||
message(FATAL_ERROR "add_mod: MOD_JSON does not exist: ${_mod_json}")
|
||||
endif ()
|
||||
|
||||
add_library(${target_name} SHARED ${ARG_SOURCES})
|
||||
_mod_lib_name(_lib_name)
|
||||
set_target_properties(${target_name} PROPERTIES
|
||||
PREFIX ""
|
||||
C_VISIBILITY_PRESET hidden
|
||||
CXX_VISIBILITY_PRESET hidden
|
||||
VISIBILITY_INLINES_HIDDEN ON
|
||||
WINDOWS_EXPORT_ALL_SYMBOLS OFF)
|
||||
target_compile_features(${target_name} PRIVATE cxx_std_20)
|
||||
target_link_libraries(${target_name} PRIVATE dusklight_game_headers)
|
||||
|
||||
if (NOT TARGET dusklight)
|
||||
# Apply global compile options for out-of-tree mod builds
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
-Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations)
|
||||
elseif (APPLE)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
-Wno-declaration-after-statement -Wno-non-pod-varargs)
|
||||
elseif (MSVC)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>"
|
||||
"$<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>")
|
||||
set(_supported_features game webgpu)
|
||||
set(_features "")
|
||||
foreach (_feature IN LISTS ARG_FEATURES)
|
||||
list(FIND _supported_features "${_feature}" _feature_index)
|
||||
if (_feature_index EQUAL -1)
|
||||
list(JOIN _supported_features ", " _supported_features_text)
|
||||
message(FATAL_ERROR
|
||||
"add_mod: unknown feature '${_feature}' (supported: ${_supported_features_text})")
|
||||
endif ()
|
||||
# Use signed char on ARM to match the original game (and x86)
|
||||
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _mod_arch)
|
||||
if (_mod_arch MATCHES "^(arm|aarch64)" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
|
||||
target_compile_options(${target_name} PRIVATE -fsigned-char)
|
||||
list(FIND _features "${_feature}" _duplicate_index)
|
||||
if (NOT _duplicate_index EQUAL -1)
|
||||
message(FATAL_ERROR "add_mod: duplicate feature '${_feature}'")
|
||||
endif ()
|
||||
list(APPEND _features "${_feature}")
|
||||
endforeach ()
|
||||
if (_features AND NOT ARG_SOURCES)
|
||||
message(FATAL_ERROR "add_mod: FEATURES requires SOURCES")
|
||||
endif ()
|
||||
|
||||
if (APPLE)
|
||||
# Game symbols resolve against the host executable at dlopen time.
|
||||
target_link_options(${target_name} PRIVATE -undefined dynamic_lookup)
|
||||
elseif (ANDROID)
|
||||
if (TARGET dusklight)
|
||||
target_link_libraries(${target_name} PRIVATE dusklight)
|
||||
elseif (DUSK_GAME_SOLIB)
|
||||
target_link_libraries(${target_name} PRIVATE "${DUSK_GAME_SOLIB}")
|
||||
else ()
|
||||
message(FATAL_ERROR "add_mod: DUSK_GAME_SOLIB is not set (libmain.so)")
|
||||
endif ()
|
||||
elseif (UNIX)
|
||||
target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined)
|
||||
elseif (WIN32)
|
||||
# Link against the generated import library (game ABI surface). Function calls
|
||||
# resolve through import thunks. Data is toolchain dependent:
|
||||
# - clang-cl: lld's mingw mode auto-imports data references, fixed up at load by
|
||||
# the mod SDK's pseudo-relocation runtime (pseudo_reloc.cpp).
|
||||
# - cl (MSVC): only DUSK_GAME_DATA-annotated data is reachable. Un-annotated
|
||||
# references fail to link.
|
||||
if (NOT DUSK_GAME_IMPLIB)
|
||||
message(FATAL_ERROR "add_mod: DUSK_GAME_IMPLIB is not set.")
|
||||
endif ()
|
||||
target_link_libraries(${target_name} PRIVATE "${DUSK_GAME_IMPLIB}")
|
||||
set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
|
||||
target_compile_definitions(${target_name} PRIVATE _ITERATOR_DEBUG_LEVEL=0)
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/clang:-mcmodel=large>")
|
||||
target_sources(${target_name} PRIVATE "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../sdk/pseudo_reloc.cpp")
|
||||
# lld mingw mode rewrites /DEFAULTLIB directives to -l style and skips %LIB%, so
|
||||
# the CRT libraries and search paths are spelled out explicitly.
|
||||
target_link_options(${target_name} PRIVATE -lldmingw /nodefaultlib /INCREMENTAL:NO)
|
||||
target_link_libraries(${target_name} PRIVATE
|
||||
msvcrt.lib msvcprt.lib vcruntime.lib ucrt.lib
|
||||
oldnames.lib uuid.lib kernel32.lib user32.lib)
|
||||
set(_lib_dirs "$ENV{LIB}")
|
||||
if ("${_lib_dirs}" STREQUAL "")
|
||||
message(FATAL_ERROR "add_mod: %LIB% is empty; configure from a VS dev shell")
|
||||
set(_has_lib FALSE)
|
||||
set(_needs_host_link FALSE)
|
||||
set(_lib_platform "")
|
||||
set(_lib_name "")
|
||||
if (ARG_SOURCES)
|
||||
set(_has_lib TRUE)
|
||||
add_library(${target_name} MODULE ${ARG_SOURCES})
|
||||
_mod_lib_info(_lib_platform _lib_name)
|
||||
set_target_properties(${target_name} PROPERTIES
|
||||
PREFIX ""
|
||||
C_VISIBILITY_PRESET hidden
|
||||
CXX_VISIBILITY_PRESET hidden
|
||||
VISIBILITY_INLINES_HIDDEN ON
|
||||
WINDOWS_EXPORT_ALL_SYMBOLS OFF)
|
||||
target_compile_features(${target_name} PRIVATE cxx_std_20)
|
||||
target_link_libraries(${target_name} PRIVATE dusklight_mod_api)
|
||||
foreach (_feature IN LISTS _features)
|
||||
target_link_libraries(${target_name} PRIVATE dusklight_mod_feature_${_feature})
|
||||
if (_feature STREQUAL "webgpu")
|
||||
_mod_add_webgpu_headers(${target_name})
|
||||
endif ()
|
||||
if (_feature STREQUAL "game" OR _feature STREQUAL "webgpu")
|
||||
set(_needs_host_link TRUE)
|
||||
endif ()
|
||||
endforeach ()
|
||||
|
||||
if (NOT TARGET dusklight)
|
||||
# Apply global compile options for out-of-tree mod builds
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
-Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations)
|
||||
elseif (APPLE)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
-Wno-declaration-after-statement -Wno-non-pod-varargs)
|
||||
elseif (MSVC)
|
||||
target_compile_options(${target_name} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>"
|
||||
"$<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>")
|
||||
endif ()
|
||||
# Use signed char on ARM to match the original game (and x86)
|
||||
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _mod_arch)
|
||||
if (_mod_arch MATCHES "^(arm|aarch64)" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
|
||||
target_compile_options(${target_name} PRIVATE -fsigned-char)
|
||||
endif ()
|
||||
foreach (_libdir IN LISTS _lib_dirs)
|
||||
target_link_options(${target_name} PRIVATE "/libpath:${_libdir}")
|
||||
endforeach ()
|
||||
endif ()
|
||||
|
||||
if (APPLE)
|
||||
if (_needs_host_link)
|
||||
if (TARGET dusklight)
|
||||
set(_game_exe "$<TARGET_FILE:dusklight>")
|
||||
add_dependencies(${target_name} dusklight)
|
||||
elseif (DUSK_GAME_EXE)
|
||||
_mod_resolve_source_path(_game_exe "${DUSK_GAME_EXE}")
|
||||
else ()
|
||||
_mod_download_link_stub(_game_exe)
|
||||
endif ()
|
||||
target_link_options(${target_name} PRIVATE
|
||||
-Xlinker -bundle_loader -Xlinker "${_game_exe}")
|
||||
set_property(TARGET ${target_name} APPEND PROPERTY LINK_DEPENDS "${_game_exe}")
|
||||
endif ()
|
||||
set_target_properties(${target_name} PROPERTIES
|
||||
BUILD_RPATH "@loader_path"
|
||||
INSTALL_RPATH "@loader_path")
|
||||
elseif (ANDROID)
|
||||
if (_needs_host_link)
|
||||
if (TARGET dusklight)
|
||||
target_link_libraries(${target_name} PRIVATE dusklight)
|
||||
else ()
|
||||
if (DUSK_GAME_EXE)
|
||||
_mod_resolve_source_path(_game_lib "${DUSK_GAME_EXE}")
|
||||
else ()
|
||||
_mod_download_link_stub(_game_lib)
|
||||
endif ()
|
||||
target_link_libraries(${target_name} PRIVATE "${_game_lib}")
|
||||
endif ()
|
||||
endif ()
|
||||
set_target_properties(${target_name} PROPERTIES
|
||||
BUILD_RPATH "$ORIGIN"
|
||||
INSTALL_RPATH "$ORIGIN")
|
||||
elseif (UNIX)
|
||||
if (_needs_host_link)
|
||||
target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined)
|
||||
endif ()
|
||||
set_target_properties(${target_name} PROPERTIES
|
||||
BUILD_RPATH "$ORIGIN"
|
||||
INSTALL_RPATH "$ORIGIN")
|
||||
elseif (WIN32)
|
||||
# Mods link against the game's import library (sdk/windows-<arch>.lib, generated by
|
||||
# setup_windows_exports); cl and clang-cl both consume it in MSVC mode. Function
|
||||
# calls resolve through import thunks; game data is reachable only through
|
||||
# __declspec(dllimport), i.e. DUSK_GAME_DATA-annotated declarations.
|
||||
if (_needs_host_link)
|
||||
if (TARGET dusklight)
|
||||
if (NOT DUSK_GAME_IMPLIB)
|
||||
message(FATAL_ERROR
|
||||
"add_mod: DUSK_GAME_IMPLIB is not set (see setup_windows_exports)")
|
||||
endif ()
|
||||
set(_game_lib "${DUSK_GAME_IMPLIB}")
|
||||
elseif (DUSK_GAME_EXE)
|
||||
_mod_resolve_source_path(_game_lib "${DUSK_GAME_EXE}")
|
||||
if (NOT _game_lib MATCHES "\\.lib$")
|
||||
message(FATAL_ERROR
|
||||
"add_mod: DUSK_GAME_EXE must be an import library on Windows "
|
||||
"(sdk/windows-<arch>.lib)")
|
||||
endif ()
|
||||
else ()
|
||||
_mod_download_link_stub(_game_lib)
|
||||
endif ()
|
||||
target_link_libraries(${target_name} PRIVATE "${_game_lib}")
|
||||
endif ()
|
||||
set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
|
||||
target_compile_definitions(${target_name} PRIVATE _ITERATOR_DEBUG_LEVEL=0)
|
||||
endif ()
|
||||
endif ()
|
||||
if (ARG_RUNTIME_LIBRARIES AND NOT _has_lib)
|
||||
message(FATAL_ERROR "add_mod: RUNTIME_LIBRARIES requires SOURCES")
|
||||
endif ()
|
||||
|
||||
set(_output_dir "${DUSK_MODS_OUTPUT_DIR}")
|
||||
@@ -137,18 +271,47 @@ function(add_mod target_name)
|
||||
set(_stage "${CMAKE_CURRENT_BINARY_DIR}/${target_name}_stage")
|
||||
set(_out "${_output_dir}/${target_name}.dusk")
|
||||
|
||||
set(_zip_args "${_lib_name}" mod.json)
|
||||
set(_zip_args mod.json)
|
||||
set(_package_deps "${_mod_json}")
|
||||
set(_package_inputs "${_mod_json}")
|
||||
set(_extra_cmds "")
|
||||
set(_lib_copy_cmd "")
|
||||
set(_target_depend "")
|
||||
if (_has_lib)
|
||||
list(APPEND _zip_args lib)
|
||||
set(_lib_copy_cmd
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}/lib/${_lib_platform}"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"$<TARGET_FILE:${target_name}>" "${_stage}/lib/${_lib_platform}/${_lib_name}")
|
||||
set(_target_depend ${target_name})
|
||||
endif ()
|
||||
string(TOLOWER "${_lib_name}" _lib_name_key)
|
||||
set(_runtime_lib_name_keys "${_lib_name_key}")
|
||||
foreach (_runtime_lib IN LISTS ARG_RUNTIME_LIBRARIES)
|
||||
_mod_resolve_source_path(_runtime_lib_path "${_runtime_lib}")
|
||||
if (NOT EXISTS "${_runtime_lib_path}" OR IS_DIRECTORY "${_runtime_lib_path}")
|
||||
message(FATAL_ERROR "add_mod: runtime library does not exist or is not a file: ${_runtime_lib_path}")
|
||||
endif ()
|
||||
get_filename_component(_runtime_lib_name "${_runtime_lib_path}" NAME)
|
||||
string(TOLOWER "${_runtime_lib_name}" _runtime_lib_name_key)
|
||||
list(FIND _runtime_lib_name_keys "${_runtime_lib_name_key}" _runtime_lib_name_index)
|
||||
if (NOT _runtime_lib_name_index EQUAL -1)
|
||||
message(FATAL_ERROR "add_mod: duplicate runtime library filename: ${_runtime_lib_name}")
|
||||
endif ()
|
||||
list(APPEND _runtime_lib_name_keys "${_runtime_lib_name_key}")
|
||||
list(APPEND _package_deps "${_runtime_lib_path}")
|
||||
list(APPEND _package_inputs "${_runtime_lib_path}")
|
||||
list(APPEND _lib_copy_cmd COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
"${_runtime_lib_path}" "${_stage}/lib/${_lib_platform}/${_runtime_lib_name}")
|
||||
endforeach ()
|
||||
if (ARG_RES_DIR)
|
||||
_mod_resolve_source_path(_res_dir "${ARG_RES_DIR}")
|
||||
_mod_collect_assets(_res_deps "${_res_dir}")
|
||||
list(APPEND _package_deps ${_res_deps})
|
||||
list(APPEND _package_inputs "${_res_dir}" ${_res_deps})
|
||||
list(APPEND _zip_args res)
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||
"${_res_dir}" "${_stage}/res")
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_res_dir}"
|
||||
"-DDST=${_stage}/res" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
|
||||
endif ()
|
||||
if (ARG_OVERLAY_DIR)
|
||||
_mod_resolve_source_path(_overlay_dir "${ARG_OVERLAY_DIR}")
|
||||
@@ -156,8 +319,8 @@ function(add_mod target_name)
|
||||
list(APPEND _package_deps ${_overlay_deps})
|
||||
list(APPEND _package_inputs "${_overlay_dir}" ${_overlay_deps})
|
||||
list(APPEND _zip_args overlay)
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||
"${_overlay_dir}" "${_stage}/overlay")
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_overlay_dir}"
|
||||
"-DDST=${_stage}/overlay" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
|
||||
endif ()
|
||||
if (ARG_TEXTURES_DIR)
|
||||
_mod_resolve_source_path(_textures_dir "${ARG_TEXTURES_DIR}")
|
||||
@@ -165,8 +328,8 @@ function(add_mod target_name)
|
||||
list(APPEND _package_deps ${_textures_deps})
|
||||
list(APPEND _package_inputs "${_textures_dir}" ${_textures_deps})
|
||||
list(APPEND _zip_args textures)
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||
"${_textures_dir}" "${_stage}/textures")
|
||||
list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_textures_dir}"
|
||||
"-DDST=${_stage}/textures" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
|
||||
endif ()
|
||||
|
||||
set(_bundle_cmds "")
|
||||
@@ -177,6 +340,7 @@ function(add_mod target_name)
|
||||
set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_IDS "${_mod_id}")
|
||||
set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_STAGES "${_stage}")
|
||||
set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_PACKAGES "${_out}")
|
||||
set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_LIB_PLATFORMS "${_lib_platform}")
|
||||
set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_LIB_NAMES "${_lib_name}")
|
||||
set(_bundle_cmds
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundled_mods"
|
||||
@@ -194,12 +358,12 @@ function(add_mod target_name)
|
||||
add_custom_command(OUTPUT "${_out}"
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -rf "${_stage}"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}" "${_output_dir}"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${target_name}>" "${_stage}/${_lib_name}"
|
||||
${_lib_copy_cmd}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_mod_json}" "${_stage}/mod.json"
|
||||
${_extra_cmds}
|
||||
COMMAND ${CMAKE_COMMAND} -E chdir "${_stage}" ${CMAKE_COMMAND} -E tar cvf "${_out}" --format=zip ${_zip_args}
|
||||
${_bundle_cmds}
|
||||
DEPENDS ${target_name} ${_package_deps} "${_package_inputs_file}"
|
||||
DEPENDS ${_target_depend} ${_package_deps} "${_package_inputs_file}"
|
||||
COMMENT "Packaging ${target_name} -> ${_out}"
|
||||
COMMAND_EXPAND_LISTS
|
||||
VERBATIM
|
||||
@@ -215,9 +379,10 @@ endfunction()
|
||||
# user cache).
|
||||
# - Linux: pre-extracted stage dirs into <install>/mods so native libs dlopen in place from
|
||||
# read-only installs.
|
||||
# - macOS: pre-extracted stage dirs into the installed app's Contents/Resources/mods, dylibs
|
||||
# ad-hoc signed in place, then the whole bundle re-signed.
|
||||
# - iOS/tvOS: assets into <app>/mods/<id> and the dylib into Frameworks/<id>.dylib.
|
||||
# - macOS: pre-extracted stage dirs into the installed app's Contents/Resources/mods, native
|
||||
# libs ad-hoc signed in place, then the whole bundle re-signed.
|
||||
# - iOS/tvOS: assets into <app>/mods/<id>, the mod library into Frameworks/<id>.so,
|
||||
# and runtime libraries alongside it.
|
||||
# - Android: nothing here; gradle packs ${CMAKE_BINARY_DIR}/bundled_mods into APK assets.
|
||||
function(install_bundled_mods)
|
||||
get_property(_targets GLOBAL PROPERTY DUSK_BUNDLED_MOD_TARGETS)
|
||||
@@ -226,6 +391,7 @@ function(install_bundled_mods)
|
||||
endif ()
|
||||
get_property(_ids GLOBAL PROPERTY DUSK_BUNDLED_MOD_IDS)
|
||||
get_property(_stages GLOBAL PROPERTY DUSK_BUNDLED_MOD_STAGES)
|
||||
get_property(_lib_platforms GLOBAL PROPERTY DUSK_BUNDLED_MOD_LIB_PLATFORMS)
|
||||
get_property(_lib_names GLOBAL PROPERTY DUSK_BUNDLED_MOD_LIB_NAMES)
|
||||
list(LENGTH _targets _count)
|
||||
math(EXPR _last "${_count} - 1")
|
||||
@@ -241,20 +407,67 @@ function(install_bundled_mods)
|
||||
list(GET _targets ${_i} _target)
|
||||
list(GET _ids ${_i} _id)
|
||||
list(GET _stages ${_i} _stage)
|
||||
list(GET _lib_platforms ${_i} _lib_platform)
|
||||
list(GET _lib_names ${_i} _lib_name)
|
||||
install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/mods/${_id}"
|
||||
PATTERN "${_lib_name}" EXCLUDE)
|
||||
PATTERN "lib" EXCLUDE)
|
||||
install(PROGRAMS "$<TARGET_FILE:${_target}>"
|
||||
DESTINATION "${_bundle_dir}/Frameworks" RENAME "${_id}.dylib")
|
||||
DESTINATION "${_bundle_dir}/Frameworks" RENAME "${_id}.so")
|
||||
install(DIRECTORY "${_stage}/lib/${_lib_platform}/"
|
||||
DESTINATION "${_bundle_dir}/Frameworks"
|
||||
PATTERN "${_lib_name}" EXCLUDE)
|
||||
endforeach ()
|
||||
if (DUSK_HAS_PREPATCH)
|
||||
set(_prepatch_executable "${_bundle_dir}/Dusklight")
|
||||
set(_prepatch_mod_args "")
|
||||
foreach (_id IN LISTS _ids)
|
||||
string(APPEND _prepatch_mod_args
|
||||
" \"${_bundle_dir}/Frameworks/${_id}.so\"")
|
||||
endforeach ()
|
||||
install(CODE "
|
||||
execute_process(
|
||||
COMMAND \"${SYMGEN_EXE}\" prepatch
|
||||
--binary \"${_prepatch_executable}\"
|
||||
--report \"${CMAKE_BINARY_DIR}/prepatch-report-$<CONFIG>.json\"
|
||||
${_prepatch_mod_args}
|
||||
COMMAND_ERROR_IS_FATAL ANY)")
|
||||
endif ()
|
||||
else ()
|
||||
foreach (_i RANGE ${_last})
|
||||
list(GET _ids ${_i} _id)
|
||||
list(GET _stages ${_i} _stage)
|
||||
list(GET _lib_platforms ${_i} _lib_platform)
|
||||
list(GET _lib_names ${_i} _lib_name)
|
||||
install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/Contents/Resources/mods/${_id}")
|
||||
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/Resources/mods/${_id}/${_lib_name}\" COMMAND_ERROR_IS_FATAL ANY)")
|
||||
install(CODE "
|
||||
file(GLOB _mod_libs \"${_bundle_dir}/Contents/Resources/mods/${_id}/lib/${_lib_platform}/*\")
|
||||
foreach (_mod_lib IN LISTS _mod_libs)
|
||||
if (NOT IS_DIRECTORY \"\${_mod_lib}\")
|
||||
execute_process(COMMAND /usr/bin/codesign --force --sign - \"\${_mod_lib}\" COMMAND_ERROR_IS_FATAL ANY)
|
||||
endif ()
|
||||
endforeach ()")
|
||||
endforeach ()
|
||||
if (DUSK_HAS_PREPATCH)
|
||||
set(_prepatch_executable "${_bundle_dir}/Contents/MacOS/Dusklight")
|
||||
set(_prepatch_mod_args "")
|
||||
foreach (_i RANGE ${_last})
|
||||
list(GET _ids ${_i} _id)
|
||||
list(GET _lib_platforms ${_i} _lib_platform)
|
||||
list(GET _lib_names ${_i} _lib_name)
|
||||
string(APPEND _prepatch_mod_args
|
||||
" \"${_bundle_dir}/Contents/Resources/mods/${_id}/lib/${_lib_platform}/${_lib_name}\"")
|
||||
endforeach ()
|
||||
install(CODE "
|
||||
execute_process(
|
||||
COMMAND \"${SYMGEN_EXE}\" prepatch
|
||||
--binary \"${_prepatch_executable}\"
|
||||
--report \"${CMAKE_BINARY_DIR}/prepatch-report-$<CONFIG>.json\"
|
||||
${_prepatch_mod_args}
|
||||
COMMAND_ERROR_IS_FATAL ANY)")
|
||||
endif ()
|
||||
if (TARGET crashpad_handler)
|
||||
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/MacOS/$<TARGET_FILE_NAME:crashpad_handler>\" COMMAND_ERROR_IS_FATAL ANY)")
|
||||
endif ()
|
||||
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - --entitlements \"${DUSK_ENTITLEMENTS}\" \"${_bundle_dir}\" COMMAND_ERROR_IS_FATAL ANY)")
|
||||
endif ()
|
||||
return ()
|
||||
|
||||
@@ -2,7 +2,7 @@ include_guard(GLOBAL)
|
||||
|
||||
get_filename_component(_SYMBOL_MANIFEST_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
|
||||
|
||||
set(_SYMGEN_VERSION "1.1.0")
|
||||
set(_SYMGEN_VERSION "1.3.1")
|
||||
set(_SYMGEN_RELEASE_BASE_URL "https://github.com/encounter/symgen/releases/download/v${_SYMGEN_VERSION}")
|
||||
set(SYMGEN_PATH "" CACHE FILEPATH "Path to a symgen executable; empty downloads the pinned release")
|
||||
mark_as_advanced(SYMGEN_PATH)
|
||||
@@ -108,18 +108,25 @@ function(setup_symbol_manifest target)
|
||||
|
||||
if (WIN32)
|
||||
set(_input --pdb "$<TARGET_PDB_FILE:${target}>")
|
||||
set(_out "$<TARGET_FILE_DIR:${target}>/dusklight.symdb")
|
||||
else ()
|
||||
set(_input --binary "$<TARGET_FILE:${target}>")
|
||||
if (APPLE)
|
||||
set(_out "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/dusklight.symdb")
|
||||
else ()
|
||||
set(_out "$<TARGET_FILE_DIR:${target}>/dusklight.symdb")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (APPLE)
|
||||
# Room for the symbol manifest and several prepatch arenas.
|
||||
target_link_options(${target} PRIVATE "LINKER:-headerpad,0x1000")
|
||||
# ld64 may update an existing output, which breaks our symdb insertion. Remove it first.
|
||||
add_custom_command(TARGET ${target} PRE_LINK
|
||||
COMMAND "${CMAKE_COMMAND}" -E rm -f "$<TARGET_FILE:${target}>"
|
||||
VERBATIM)
|
||||
endif ()
|
||||
|
||||
# The manifest is embedded into the image as a new section, located at runtime through
|
||||
# the descriptor manifest.cpp reserves. On Apple platforms this command must stay
|
||||
# attached before the ad-hoc codesign POST_BUILD command: the patch removes any existing
|
||||
# signature.
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND "${SYMGEN_EXE}" manifest ${_input} --out "${_out}"
|
||||
COMMENT "Generating symbol manifest"
|
||||
COMMAND "${SYMGEN_EXE}" manifest ${_input} --embed "$<TARGET_FILE:${target}>"
|
||||
COMMENT "Embedding symbol manifest"
|
||||
VERBATIM)
|
||||
endfunction()
|
||||
|
||||
+28
-14
@@ -6,9 +6,16 @@ get_filename_component(_DUSK_WINDOWS_EXPORTS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FIL
|
||||
# import library mods link against. symgen scans the built objects, filters by source, and
|
||||
# writes a .def used by the main link and import library generation.
|
||||
function(setup_windows_exports target)
|
||||
if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
message(WARNING "dusklight: Windows code-mod exports are x64-only for now; skipping")
|
||||
return()
|
||||
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _implib_arch)
|
||||
if (_implib_arch STREQUAL "arm64")
|
||||
set(_dlltool_machine "arm64")
|
||||
set(_lib_machine "arm64")
|
||||
elseif (_implib_arch MATCHES "^(amd64|x86_64)$")
|
||||
set(_dlltool_machine "i386:x86-64")
|
||||
set(_lib_machine "x64")
|
||||
else ()
|
||||
message(FATAL_ERROR
|
||||
"dusklight: no Windows mod linking support for ${CMAKE_SYSTEM_PROCESSOR}")
|
||||
endif ()
|
||||
|
||||
include("${_DUSK_WINDOWS_EXPORTS_CMAKE_DIR}/SymbolManifest.cmake")
|
||||
@@ -37,19 +44,29 @@ function(setup_windows_exports target)
|
||||
endif ()
|
||||
endforeach ()
|
||||
|
||||
set(_forward_args)
|
||||
if (TARGET dawn::webgpu_dawn)
|
||||
get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
|
||||
if (_dawn_type STREQUAL "SHARED_LIBRARY")
|
||||
list(APPEND _forward_args
|
||||
--forward-dll "$<TARGET_FILE:dawn::webgpu_dawn>"
|
||||
--forward-sym-prefix wgpu)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
# Generate curated exports list from the main binary
|
||||
set(_def "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports.def")
|
||||
add_custom_command(TARGET ${target} PRE_LINK
|
||||
# TODO: src/dusk/ is NOT excluded: inline code in game headers
|
||||
# currently call into it (e.g. dusk::frame_interp::lookup_replacement).
|
||||
COMMAND "${_symgen}" def
|
||||
--rsp "${_rsp}"
|
||||
"@${_rsp}"
|
||||
--out "${_def}"
|
||||
--exclude cmake_pch
|
||||
--exclude miniz
|
||||
--exclude asan_options
|
||||
--exclude src/dusk
|
||||
--max-exports 58000
|
||||
${_sdk_args}
|
||||
${_forward_args}
|
||||
COMMENT "Generating dusklight exports"
|
||||
VERBATIM)
|
||||
target_link_options(${target} PRIVATE "/DEF:${_def}")
|
||||
@@ -59,11 +76,11 @@ function(setup_windows_exports target)
|
||||
get_filename_component(_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
|
||||
find_program(DUSK_LLVM_DLLTOOL llvm-dlltool HINTS "${_compiler_dir}")
|
||||
if (DUSK_LLVM_DLLTOOL)
|
||||
set(_implib_cmd "${DUSK_LLVM_DLLTOOL}" -d "${_def}" -D dusklight.exe -m i386:x86-64
|
||||
-l "${_implib}")
|
||||
set(_implib_cmd "${DUSK_LLVM_DLLTOOL}" -d "${_def}" -D dusklight.exe
|
||||
-m "${_dlltool_machine}" -l "${_implib}")
|
||||
else ()
|
||||
set(_implib_cmd "${CMAKE_AR}" /nologo "/def:${_def}" /machine:x64 /name:dusklight.exe
|
||||
"/out:${_implib}")
|
||||
set(_implib_cmd "${CMAKE_AR}" /nologo "/def:${_def}" "/machine:${_lib_machine}"
|
||||
/name:dusklight.exe "/out:${_implib}")
|
||||
endif ()
|
||||
add_custom_command(TARGET ${target} POST_BUILD
|
||||
COMMAND ${_implib_cmd}
|
||||
@@ -71,9 +88,6 @@ function(setup_windows_exports target)
|
||||
COMMENT "Generating dusklight import library"
|
||||
VERBATIM)
|
||||
set(DUSK_GAME_IMPLIB "${_implib}" CACHE INTERNAL "Import library for Windows mod linking")
|
||||
set(DUSK_GAME_DEF "${_def}" CACHE INTERNAL "Curated export .def for the game executable")
|
||||
|
||||
# Ship the import library as sdk/dusklight.lib in the install tree: mods may use it to
|
||||
# compile against Dusklight without having to build the whole game. (See DUSK_GAME_IMPLIB)
|
||||
install(FILES "${_implib}" DESTINATION sdk RENAME dusklight.lib)
|
||||
install(FILES "${_implib}" DESTINATION sdk RENAME "windows-${_implib_arch}.lib")
|
||||
endfunction()
|
||||
|
||||
+159
-97
@@ -22,13 +22,14 @@ function, read and write data fields, and hook the vast majority of game functio
|
||||
7. [Asset Overlays](#asset-overlays)
|
||||
8. [Runtime Lifecycle](#runtime-lifecycle)
|
||||
9. [Error Handling](#error-handling)
|
||||
10. [Advanced: Exporting Services](#advanced-exporting-services)
|
||||
10. [Advanced](#advanced)
|
||||
|
||||
---
|
||||
|
||||
## Getting Started
|
||||
|
||||
Fork the [mod template](../tools/mod_template/), a self-contained CMake project that uses the Dusklight mod SDK.
|
||||
Fork the [mod template](https://github.com/TwilitRealm/mod-template), a self-contained CMake project that uses the
|
||||
Dusklight mod SDK.
|
||||
|
||||
```
|
||||
my_mod/
|
||||
@@ -43,26 +44,32 @@ my_mod/
|
||||
**CMakeLists.txt:**
|
||||
|
||||
```cmake
|
||||
cmake_minimum_required(VERSION 3.25)
|
||||
cmake_minimum_required(VERSION 3.26)
|
||||
project(my_mod CXX)
|
||||
|
||||
set(DUSKLIGHT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dusklight" CACHE PATH "Path to dusklight source root")
|
||||
if (NOT DUSKLIGHT_VERSION)
|
||||
set(DUSKLIGHT_VERSION "76b56cd8b81809fce0a5c2a44e2f6d437591132f")
|
||||
endif ()
|
||||
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchDusklight.cmake")
|
||||
add_subdirectory("${DUSKLIGHT_DIR}/sdk" dusklight-sdk EXCLUDE_FROM_ALL)
|
||||
|
||||
add_mod(my_mod
|
||||
FEATURES game # remove for service/asset-only mods; add webgpu for GfxService
|
||||
SOURCES src/mod.cpp
|
||||
MOD_JSON mod.json
|
||||
RES_DIR res # optional
|
||||
OVERLAY_DIR overlay # optional
|
||||
TEXTURES_DIR textures # optional
|
||||
RES_DIR res # mod resources, including icon.png and banner.png
|
||||
OVERLAY_DIR overlay # game file overlays; remove if unused
|
||||
TEXTURES_DIR textures # texture replacements; remove if unused
|
||||
)
|
||||
```
|
||||
|
||||
Building produces `my_mod.dusk` in `build/<preset>/mods/` (configurable via the `DUSK_MODS_OUTPUT_DIR` cache variable).
|
||||
Dusklight searches a `mods/` directory next to the app in addition to the user directory, so a dev build launched from
|
||||
`build/<preset>/` picks these up automatically: rebuild, relaunch (or click Reload), done.
|
||||
Available features:
|
||||
- `game`: Allows calling into and hooking game code. Mods that **only** use services may omit it, providing a wider
|
||||
range of compatibility with Dusklight versions and a slightly faster build process.
|
||||
- `webgpu`: Allows importing the WebGPU API (`webgpu/webgpu.h`). Must be enabled when using
|
||||
[GfxService](#gfxservice-modssvcgfxh).
|
||||
|
||||
For a regular game install, copy the `.dusk` into the user mods folder:
|
||||
Building produces `my_mod.dusk` in `build/mods/`. Copy the `.dusk` into the user mods folder:
|
||||
|
||||
- Windows: `%APPDATA%\TwilitRealm\Dusklight\mods`
|
||||
- Linux: `~/.local/share/TwilitRealm/Dusklight/mods`
|
||||
@@ -131,26 +138,30 @@ A service is a struct of C function pointers with a version header. You declare
|
||||
loader resolves it before your mod initializes:
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(LogService, svc_log); // required, any minor version
|
||||
IMPORT_SERVICE_VERSION(LogService, svc_log, 2); // required, minor version >= 2
|
||||
IMPORT_SERVICE(LogService, svc_log); // required, latest minor version
|
||||
IMPORT_SERVICE_VERSION(LogService, svc_log, 0); // required, minimum minor version 0 (for backwards compatibility)
|
||||
IMPORT_OPTIONAL_SERVICE(SomeService, svc_maybe); // may be null
|
||||
```
|
||||
|
||||
Each service is individually versioned, and there may be multiple major versions of a service provided at once,
|
||||
allowing backwards compatibility with older mods while still changing services fundamentally if necessary. A **major**
|
||||
bump is a breaking change, treated as a different service entirely. For **additive** changes, a service appends new
|
||||
functions to the end of the struct without breaking existing callers and simply bumps the minor version. Mods that
|
||||
want the newer functions may use `IMPORT_SERVICE_VERSION` to require that minor at **load time**, or `SERVICE_HAS` to
|
||||
check at **runtime** whether a specific function is available.
|
||||
functions to the end of the struct without breaking existing callers and simply bumps the minor version.
|
||||
|
||||
The contract (see `include/mods/api.h` for the full version):
|
||||
`IMPORT_SERVICE` and `IMPORT_OPTIONAL_SERVICE` require the latest minor version compiled against, making every field in
|
||||
the service safe to call. A mod can use `IMPORT_SERVICE_VERSION` (or its optional counterpart) with an older minor
|
||||
version to remain compatible with older Dusklight versions, then use `SERVICE_HAS` to check at runtime for fields added
|
||||
after that explicitly requested version.
|
||||
|
||||
The contract (see `sdk/include/mods/api.h` for the full version):
|
||||
|
||||
- **A required import is guaranteed valid.** If the service is missing or too old, the mod fails to load with a clear
|
||||
error. No need to null check at call sites.
|
||||
- **Anything at or below the minor version you imported can be called unconditionally.**
|
||||
- **Anything at or below the minor version you imported can be called unconditionally.** The default macros import
|
||||
the service type's current minor version; the versioned macros explicitly override that minimum.
|
||||
- Optional imports may be null; check once in `mod_initialize`.
|
||||
- Fields newer than your imported minor must be gated behind `SERVICE_HAS(service, ServiceType, field)` plus a null
|
||||
check.
|
||||
- Fields newer than your imported minor version must be gated behind `SERVICE_HAS(service, ServiceType, field)` plus a
|
||||
null check.
|
||||
|
||||
---
|
||||
|
||||
@@ -200,13 +211,13 @@ const char* dir = svc_host->mod_dir(mod_ctx); // writable per-mod directory
|
||||
svc_host->fail(mod_ctx, MOD_ERROR, "something unrecoverable happened"); // disables the mod
|
||||
```
|
||||
|
||||
`get_service`/`publish_service` provide dynamic service lookup; see [Advanced](#advanced-exporting-services).
|
||||
`get_service`/`publish_service` provide dynamic service lookup; see [Exporting Services](#exporting-services).
|
||||
|
||||
**Lifecycle watches.** If your mod provides a service that hands out per-caller state (registrations, callbacks,
|
||||
handles), watch other mods' lifecycle and drop what you hold for a mod when it detaches.
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE_VERSION(HostService, svc_host, 1);
|
||||
IMPORT_SERVICE(HostService, svc_host);
|
||||
|
||||
void on_mod_lifecycle(ModContext* ctx, ModContext* subject, const char* subject_id,
|
||||
ModLifecycleEvent event, void* user_data) {
|
||||
@@ -409,10 +420,62 @@ existing documents restyle immediately, and future ones pick it up when created.
|
||||
host styles and may override them. Scope selectors tightly (use `[mod-id="..."]`!), especially for `UI_SCOPE_WINDOW`,
|
||||
unless changing host UI is intentional.
|
||||
|
||||
### GfxService (`mods/svc/gfx.h`)
|
||||
|
||||
**Requires `add_mod(... FEATURES webgpu)`**
|
||||
|
||||
Direct WebGPU access at various stages of the rendering pipeline. Mods use the `wgpu*` C API (via `webgpu/webgpu.h`) for
|
||||
custom draws and compute dispatches. Mods must manage their own WebGPU state, including pipelines and bind groups.
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(GfxService, svc_gfx);
|
||||
|
||||
GfxDeviceInfo info = GFX_DEVICE_INFO_INIT;
|
||||
svc_gfx->get_device_info(mod_ctx, &info);
|
||||
```
|
||||
|
||||
`register_stage_hook` runs a game-thread callback during frame recording. The public stages are:
|
||||
|
||||
- `GFX_STAGE_SCENE_BEGIN`: world camera window after camera/projection/light setup
|
||||
- `GFX_STAGE_SCENE_AFTER_TERRAIN`: after terrain/shadow lists, before object and translucent lists
|
||||
- `GFX_STAGE_SCENE_AFTER_OPAQUE`: after sky/terrain/object opaque lists, before translucent lists
|
||||
- `GFX_STAGE_FRAME_BEFORE_HUD`: 3D scene and wipe are complete, before 2D/HUD lists
|
||||
- `GFX_STAGE_FRAME_AFTER_HUD`: full game scene, including HUD
|
||||
|
||||
Inside a stage callback, record work with `push_draw`, stream per-frame data with `push_verts`, `push_indices`,
|
||||
`push_uniform`, or `push_storage`, snapshot the current frame with `resolve_pass`, and use `create_pass`/`resolve_pass`
|
||||
for temporary offscreen passes. Draw callbacks run later on the render worker thread with the live
|
||||
`WGPURenderPassEncoder`; they may use only their `GfxDrawContext` handles and raw `wgpu*` calls. Compute callbacks
|
||||
registered with `register_compute_type` follow the same worker-thread rule and run on the frame command encoder.
|
||||
|
||||
All WGPU handles from the service are borrowed. Resolved target views are valid for the current frame only. GPU objects
|
||||
created by a mod are owned by that mod and should be released in `mod_shutdown`.
|
||||
|
||||
### CameraService (`mods/svc/camera.h`)
|
||||
|
||||
Converts a game view provided by a render callback into WebGPU-convention camera data. Matrix fields are column-major
|
||||
`float[16]` values using the matrix * column-vector convention (transpose of the game's row-major `Mtx`/`Mtx44` layout),
|
||||
ready to copy into WGSL `mat4x4f` uniforms.
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(CameraService, svc_camera);
|
||||
|
||||
CameraInfo camera = CAMERA_INFO_INIT;
|
||||
if (svc_camera->get_camera(mod_ctx, game_view, &camera) == MOD_OK) {
|
||||
// camera.view_from_world, camera.proj_from_view, camera.eye, ...
|
||||
}
|
||||
```
|
||||
|
||||
`get_camera` returns `MOD_UNAVAILABLE` while the view is not a valid perspective camera, such as before the
|
||||
first in-game frame. Projection matrices match the renderer's WebGPU clip convention and renderer depth convention
|
||||
(reversed-Z by default).
|
||||
|
||||
---
|
||||
|
||||
## Hooking Game Functions
|
||||
|
||||
**Requires `add_mod(... FEATURES game)`**
|
||||
|
||||
Mods may hook the vast majority of game functions, including file-local static, private and virtual functions.
|
||||
`mods/hook.hpp` provides typed helpers over the hook service:
|
||||
|
||||
@@ -421,22 +484,28 @@ Mods may hook the vast majority of game functions, including file-local static,
|
||||
#include "mods/svc/hook.h"
|
||||
|
||||
IMPORT_SERVICE(HookService, svc_hook);
|
||||
|
||||
DEFINE_HOOK(&daAlink_c::posMove, LinkPosMove);
|
||||
DEFINE_HOOK(&daAlink_c::execute, LinkExecute);
|
||||
```
|
||||
|
||||
Every hook target must be **declared** at namespace scope with `DEFINE_HOOK` (a target you can name in C++) or
|
||||
`DEFINE_HOOK_SYMBOL` (a symbol name).
|
||||
|
||||
### Pre-hooks
|
||||
|
||||
Run before the original. Return `HOOK_SKIP_ORIGINAL` to cancel it (post-hooks still run).
|
||||
|
||||
```cpp
|
||||
HookAction on_pos_move_pre(ModContext*, void* args, void* retval, void* userdata) {
|
||||
daAlink_c* link = dusk::mods::arg<daAlink_c*>(args, 0); // arg 0 is `this`
|
||||
daAlink_c* link = mods::arg<daAlink_c*>(args, 0); // arg 0 is `this`
|
||||
if (link->shape_angle.y > 10000) {
|
||||
return HOOK_SKIP_ORIGINAL;
|
||||
}
|
||||
return HOOK_CONTINUE;
|
||||
}
|
||||
|
||||
dusk::mods::hook_add_pre<&daAlink_c::posMove>(svc_hook, on_pos_move_pre);
|
||||
mods::hook_add_pre<LinkPosMove>(svc_hook, on_pos_move_pre);
|
||||
```
|
||||
|
||||
### Post-hooks
|
||||
@@ -447,24 +516,22 @@ if any.
|
||||
```cpp
|
||||
void on_pos_move_post(ModContext*, void* args, void* retval, void* userdata) { ... }
|
||||
|
||||
dusk::mods::hook_add_post<&daAlink_c::posMove>(svc_hook, on_pos_move_post);
|
||||
mods::hook_add_post<LinkPosMove>(svc_hook, on_pos_move_post);
|
||||
```
|
||||
|
||||
### Replace-hooks
|
||||
|
||||
Substitute the original entirely. Call through to it via `Hook<...>::g_orig` if needed:
|
||||
Substitute the original entirely. Call through to it via the declaration's `g_orig` if needed:
|
||||
|
||||
```cpp
|
||||
using ExecuteEntry = dusk::mods::Hook<&daAlink_c::execute>;
|
||||
|
||||
void on_execute_replace(ModContext*, void* args, void* retval, void*) {
|
||||
int result = ExecuteEntry::g_orig(dusk::mods::arg<daAlink_c*>(args, 0));
|
||||
int result = LinkExecute::g_orig(mods::arg<daAlink_c*>(args, 0));
|
||||
if (retval != nullptr) {
|
||||
*static_cast<int*>(retval) = result;
|
||||
}
|
||||
}
|
||||
|
||||
dusk::mods::hook_replace<&daAlink_c::execute>(svc_hook, on_execute_replace);
|
||||
mods::hook_replace<LinkExecute>(svc_hook, on_execute_replace);
|
||||
```
|
||||
|
||||
By default a second replace-hook on the same function is a conflict; `HookOptions` (`replace_policy`, `priority`,
|
||||
@@ -477,63 +544,16 @@ Functions you can't name in C++ (file-local statics, private class members, anyt
|
||||
symbol name instead. You must supply the signature along with the name.
|
||||
|
||||
```cpp
|
||||
// static callback used by Link's hookshot collider in d_a_alink_hook.inc
|
||||
using HookshotHit = dusk::mods::NamedHook<
|
||||
"daAlink_hookshotAtHitCallBack",
|
||||
void(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*)>;
|
||||
DEFINE_HOOK_SYMBOL("daAlink_hookshotAtHitCallBack",
|
||||
void(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*), HookshotHit);
|
||||
|
||||
dusk::mods::hook_add_pre<HookshotHit>(svc_hook, on_hookshot_hit_pre);
|
||||
mods::hook_add_pre<HookshotHit>(svc_hook, on_hookshot_hit_pre);
|
||||
...
|
||||
HookshotHit::g_orig(link, atObjInf, target, tgObjInf); // call through to the original
|
||||
```
|
||||
|
||||
Class member functions must include `Class*` as the first argument.
|
||||
|
||||
The install fails with the resolve error when the name is missing (`MOD_UNAVAILABLE`), ambiguous (`MOD_CONFLICT`),
|
||||
or the manifest is absent (`MOD_UNSUPPORTED`). Unlike `Hook<&Class::method>`, the signature is **not**
|
||||
compiler-checked: a mismatched signature will corrupt the call.
|
||||
|
||||
### Reading and writing arguments
|
||||
|
||||
`args` is an array of pointers to the arguments. For member functions, index 0 is `this`; parameters follow in
|
||||
declaration order.
|
||||
|
||||
```cpp
|
||||
T value = dusk::mods::arg<T>(args, n); // copy
|
||||
T& ref = dusk::mods::arg_ref<T>(args, n); // read/write reference
|
||||
```
|
||||
|
||||
```cpp
|
||||
// fpc_ProcID fopAcM_createItem(..., int itemNo, ...): turn heart drops into green rupees
|
||||
HookAction on_create_item_pre(ModContext*, void* args, void*, void*) {
|
||||
int& itemNo = dusk::mods::arg_ref<int>(args, 1);
|
||||
if (itemNo == dItemNo_HEART_e) {
|
||||
itemNo = dItemNo_GREEN_RUPEE_e;
|
||||
}
|
||||
return HOOK_CONTINUE;
|
||||
}
|
||||
|
||||
dusk::mods::hook_add_pre<&fopAcM_createItem>(svc_hook, on_create_item_pre);
|
||||
```
|
||||
|
||||
For reference parameters (e.g. `const cXyz& pos`), `arg_ref<cXyz>` yields a direct reference.
|
||||
|
||||
### Resolving symbols by name
|
||||
|
||||
`resolve` looks a symbol up in the **symbol manifest**: a name→address map generated alongside every game build and
|
||||
keyed to that exact binary. It covers the whole image, including functions that aren't exported (file-local statics),
|
||||
which makes them hookable:
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(HookService, svc_hook);
|
||||
|
||||
void* addr = nullptr;
|
||||
uint32_t flags = 0;
|
||||
if (svc_hook->resolve(mod_ctx, "GXSetProjection", &addr, &flags) == MOD_OK) {
|
||||
// addr is the function's real address in the running game; hook or call it.
|
||||
}
|
||||
```
|
||||
|
||||
Two spellings work on every platform:
|
||||
|
||||
- **Display names** (`daAlink_c::posMove`, `fapGm_Before`): the qualified name with no parameter list. They carry no
|
||||
@@ -541,25 +561,36 @@ Two spellings work on every platform:
|
||||
- **Decorated names** (`_ZN9daAlink_c7posMoveEv` / `?posMove@daAlink_c@@...`): the platform's mangled spelling in
|
||||
dlsym convention (no Mach-O leading underscore). The escape hatch for overloads.
|
||||
|
||||
`MOD_UNSUPPORTED` means the manifest is missing or was built for a different game binary.
|
||||
Installing fails with `MOD_UNAVAILABLE` when it didn't resolve (missing, ambiguous, or no symbol manifest). Unlike
|
||||
`DEFINE_HOOK`, the signature is **not** compiler-checked: a mismatched signature will corrupt the
|
||||
call.
|
||||
|
||||
### Game code ABI contract
|
||||
### Reading and writing arguments
|
||||
|
||||
A primary consideration when letting mods link against the game is maintaining ABI stability across Dusklight
|
||||
versions. If your mod calls or hooks game code directly (anything beyond the service APIs), import `GameService`
|
||||
(`mods/svc/game.h`):
|
||||
`args` is an array of pointers to the arguments. For member functions, index 0 is `this`; parameters follow in
|
||||
declaration order.
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(GameService, svc_game);
|
||||
T value = mods::arg<T>(args, n); // copy
|
||||
T& ref = mods::arg_ref<T>(args, n); // read/write reference
|
||||
```
|
||||
|
||||
Its major version is the game code ABI epoch: it's bumped when game struct or vtable layouts change incompatibly, and
|
||||
the ordinary service version check then rejects your mod with a clear error instead of letting it corrupt memory in a
|
||||
version it wasn't built for. Service-only and asset-only mods should *not* import it and will continue to work across
|
||||
game ABI changes.
|
||||
```cpp
|
||||
DEFINE_HOOK(fopAcM_createItem, CreateItem);
|
||||
|
||||
The more you can do through services, the better: a mod that avoids touching game code directly sidesteps future ABI
|
||||
breaks entirely and plays nicer with other enabled mods.
|
||||
// fpc_ProcID fopAcM_createItem(..., int itemNo, ...): turn heart drops into green rupees
|
||||
HookAction on_create_item_pre(ModContext*, void* args, void*, void*) {
|
||||
int& itemNo = mods::arg_ref<int>(args, 1);
|
||||
if (itemNo == dItemNo_HEART_e) {
|
||||
itemNo = dItemNo_GREEN_RUPEE_e;
|
||||
}
|
||||
return HOOK_CONTINUE;
|
||||
}
|
||||
|
||||
mods::hook_add_pre<CreateItem>(svc_hook, on_create_item_pre);
|
||||
```
|
||||
|
||||
For reference parameters (e.g. `const cXyz& pos`), `arg_ref<cXyz>` yields a direct reference.
|
||||
|
||||
---
|
||||
|
||||
@@ -615,13 +646,13 @@ the stack for the whole session (e.g. the outermost main loop); a mod that does
|
||||
|
||||
Service calls report failure through `ModResult` return values (`MOD_OK`, `MOD_UNAVAILABLE`,
|
||||
`MOD_INVALID_ARGUMENT`, ...). Lifecycle exports additionally receive a `ModError*`: fill it (e.g. with
|
||||
`dusk::mods::set_error(error, code, "message")`) and return the code, and the loader disables the mod and shows the
|
||||
`mods::set_error(error, code, "message")`) and return the code, and the loader disables the mod and shows the
|
||||
message to the user.
|
||||
|
||||
```cpp
|
||||
MOD_EXPORT ModResult mod_initialize(ModError* error) {
|
||||
if (!load_my_data()) {
|
||||
return dusk::mods::set_error(error, MOD_ERROR, "failed to load data");
|
||||
return mods::set_error(error, MOD_ERROR, "failed to load data");
|
||||
}
|
||||
return MOD_OK;
|
||||
}
|
||||
@@ -632,7 +663,9 @@ explicit results.
|
||||
|
||||
---
|
||||
|
||||
## Advanced: Exporting Services
|
||||
## Advanced
|
||||
|
||||
### Exporting Services
|
||||
|
||||
Mods may export services of their own, permitting framework mods and cross-mod integration. Define the interface in a
|
||||
header both mods share:
|
||||
@@ -653,9 +686,10 @@ typedef struct MyModService {
|
||||
#ifdef __cplusplus
|
||||
#include "mods/service.hpp"
|
||||
template <>
|
||||
struct dusk::mods::ServiceTraits<MyModService> {
|
||||
struct mods::ServiceTraits<MyModService> {
|
||||
static constexpr const char* id = MY_MOD_SERVICE_ID;
|
||||
static constexpr uint16_t major_version = MY_MOD_SERVICE_MAJOR;
|
||||
static constexpr uint16_t minor_version = MY_MOD_SERVICE_MINOR;
|
||||
};
|
||||
#endif
|
||||
```
|
||||
@@ -684,7 +718,7 @@ svc_my_mod->do_thing(mod_ctx, 42);
|
||||
The loader registers all exports before resolving any imports, so declaration order between mods doesn't matter. Note
|
||||
that the `ctx` a provider receives identifies the *calling* mod.
|
||||
|
||||
### Dependencies between mods
|
||||
#### Dependencies between mods
|
||||
|
||||
Service imports are also dependency declarations: the loader initializes mods in dependency order, so by the time your
|
||||
`mod_initialize` runs, every mod you import services from (required *or* optional) has already finished its own
|
||||
@@ -714,3 +748,31 @@ For services whose construction can't happen at static-init time, declare the ex
|
||||
and publish the pointer later via `svc_host->publish_service(...)`. Consumers can fetch services dynamically with
|
||||
`svc_host->get_service(...)`; prefer manifest imports whenever possible, since they give the loader dependency
|
||||
information and fail fast with good errors.
|
||||
|
||||
### Native Runtime Libraries
|
||||
|
||||
`RUNTIME_LIBRARIES` passed to `add_mod` are packaged beside the mod's native module in `lib/<platform>/`. Dusklight
|
||||
extracts the whole directory before loading the mod, so libraries linked by the mod resolve normally. The SDK links the
|
||||
mod itself with `$ORIGIN` on Linux and `@loader_path` on Apple platforms; runtime libraries with their own non-system
|
||||
dependencies must also be built with origin-relative lookup paths. On Windows, Dusklight uses an isolated DLL search
|
||||
rooted at this directory.
|
||||
|
||||
```cmake
|
||||
add_mod(my_mod
|
||||
SOURCES src/mod.cpp
|
||||
MOD_JSON mod.json
|
||||
RUNTIME_LIBRARIES "${VENDOR_RUNTIME_LIBRARY}")
|
||||
```
|
||||
|
||||
SDKs that load plugins by directory can pass them the absolute runtime path from the current HostService:
|
||||
|
||||
```cpp
|
||||
IMPORT_SERVICE(HostService, svc_host);
|
||||
|
||||
const char* nativeDir = svc_host->native_dir(mod_ctx); // read-only
|
||||
```
|
||||
|
||||
Libraries loaded explicitly by the mod remain its responsibility: stop their threads and unload them during
|
||||
`mod_shutdown`. Do not write into `native_dir`; use `mod_dir` for writable state. Native library namespaces are
|
||||
process-wide on some platforms, so two mods cannot safely assume that incompatible libraries with the same filename
|
||||
will remain isolated.
|
||||
|
||||
Vendored
+1
-1
Submodule extern/aurora updated: 0a5a5d90ef...2bbb1229a9
+89
-86
@@ -1411,68 +1411,103 @@ set(DOLPHIN_FILES
|
||||
)
|
||||
|
||||
set(DUSK_FILES
|
||||
include/dusk/action_bindings.h
|
||||
include/dusk/endian_gx.hpp
|
||||
include/dusk/config.hpp
|
||||
include/dusk/dvd_asset.hpp
|
||||
include/dusk/scope_guard.hpp
|
||||
src/dusk/dvd_asset.cpp
|
||||
include/helpers/batch.hpp
|
||||
include/helpers/endian_gx.hpp
|
||||
src/d/actor/d_a_alink_dusk.cpp
|
||||
src/dusk/android_frame_rate.hpp
|
||||
src/dusk/OSContext.cpp
|
||||
src/dusk/OSMutex.cpp
|
||||
src/dusk/OSReport.cpp
|
||||
src/dusk/OSThread.cpp
|
||||
src/dusk/achievements.cpp
|
||||
src/dusk/action_bindings.cpp
|
||||
src/dusk/action_bindings.h
|
||||
src/dusk/android_frame_rate.cpp
|
||||
src/dusk/android_frame_rate.hpp
|
||||
src/dusk/asserts.cpp
|
||||
src/dusk/batch.cpp
|
||||
src/dusk/batch.hpp
|
||||
src/dusk/autosave.cpp
|
||||
src/dusk/config.cpp
|
||||
src/dusk/config.hpp
|
||||
src/dusk/crash_handler.cpp
|
||||
src/dusk/crash_reporting.cpp
|
||||
src/dusk/data.cpp
|
||||
src/dusk/data.hpp
|
||||
src/dusk/endian.cpp
|
||||
src/dusk/discord.cpp
|
||||
src/dusk/discord.hpp
|
||||
src/dusk/discord_presence.cpp
|
||||
src/dusk/dvd_asset.cpp
|
||||
src/dusk/dvd_asset.hpp
|
||||
src/dusk/extras.c
|
||||
src/dusk/file_select.cpp
|
||||
src/dusk/file_select.hpp
|
||||
src/dusk/frame_interpolation.cpp
|
||||
src/dusk/game_clock.cpp
|
||||
src/dusk/gamepad_color.cpp
|
||||
src/dusk/globals.cpp
|
||||
src/dusk/gyro.cpp
|
||||
include/dusk/menu_pointer.h
|
||||
src/dusk/menu_pointer.cpp
|
||||
src/dusk/mouse.cpp
|
||||
src/dusk/gamepad_color.cpp
|
||||
src/dusk/autosave.cpp
|
||||
src/dusk/http/http.hpp
|
||||
src/dusk/io.cpp
|
||||
src/dusk/layout.cpp
|
||||
src/dusk/logging.cpp
|
||||
src/dusk/settings.cpp
|
||||
src/dusk/speedrun.cpp
|
||||
src/dusk/string.cpp
|
||||
src/dusk/stubs.cpp
|
||||
include/dusk/texture_replacements.hpp
|
||||
src/dusk/texture_replacements.cpp
|
||||
src/dusk/touch_camera.cpp
|
||||
src/dusk/update_check.cpp
|
||||
src/dusk/update_check.hpp
|
||||
#src/dusk/m_Do_ext_dusk.cpp
|
||||
src/dusk/imgui/ImGuiConfig.hpp
|
||||
src/dusk/imgui/ImGuiConsole.hpp
|
||||
src/dusk/imgui/ImGuiConsole.cpp
|
||||
src/dusk/imgui/ImGuiEngine.cpp
|
||||
src/dusk/imgui/ImGuiEngine.hpp
|
||||
src/dusk/imgui/ImGuiActorSpawner.cpp
|
||||
src/dusk/imgui/ImGuiBloomWindow.cpp
|
||||
src/dusk/imgui/ImGuiBloomWindow.hpp
|
||||
src/dusk/imgui/ImGuiCameraOverlay.cpp
|
||||
src/dusk/imgui/ImGuiConfig.hpp
|
||||
src/dusk/imgui/ImGuiConsole.cpp
|
||||
src/dusk/imgui/ImGuiConsole.hpp
|
||||
src/dusk/imgui/ImGuiControllerOverlay.cpp
|
||||
src/dusk/imgui/ImGuiEngine.cpp
|
||||
src/dusk/imgui/ImGuiEngine.hpp
|
||||
src/dusk/imgui/ImGuiHeapOverlay.cpp
|
||||
src/dusk/imgui/ImGuiMenuTools.cpp
|
||||
src/dusk/imgui/ImGuiMenuTools.hpp
|
||||
src/dusk/imgui/ImGuiActorSpawner.cpp
|
||||
src/dusk/imgui/ImGuiProcessOverlay.cpp
|
||||
src/dusk/imgui/ImGuiCameraOverlay.cpp
|
||||
src/dusk/imgui/ImGuiHeapOverlay.cpp
|
||||
src/dusk/imgui/ImGuiControllerOverlay.cpp
|
||||
src/dusk/imgui/ImGuiStubLog.cpp
|
||||
src/dusk/imgui/ImGuiSaveEditor.cpp
|
||||
src/dusk/imgui/ImGuiStateShare.hpp
|
||||
src/dusk/imgui/ImGuiStateShare.cpp
|
||||
src/dusk/imgui/ImGuiStateShare.hpp
|
||||
src/dusk/imgui/ImGuiStubLog.cpp
|
||||
src/dusk/io.cpp
|
||||
src/dusk/iso_validate.cpp
|
||||
src/dusk/layout.cpp
|
||||
src/dusk/livesplit.cpp
|
||||
src/dusk/logging.cpp
|
||||
src/dusk/menu_pointer.cpp
|
||||
src/dusk/menu_pointer.h
|
||||
src/dusk/mods/loader/bundle_disk.cpp
|
||||
src/dusk/mods/loader/bundle_zip.cpp
|
||||
src/dusk/mods/loader/context.cpp
|
||||
src/dusk/mods/loader/depgraph.cpp
|
||||
src/dusk/mods/loader/depgraph.hpp
|
||||
src/dusk/mods/loader/loader.cpp
|
||||
src/dusk/mods/loader/loader.hpp
|
||||
src/dusk/mods/loader/native_module.cpp
|
||||
src/dusk/mods/loader/native_module.hpp
|
||||
src/dusk/mods/loader/prepatch.cpp
|
||||
src/dusk/mods/loader/prepatch.hpp
|
||||
src/dusk/mods/log_buffer.cpp
|
||||
src/dusk/mods/log_buffer.hpp
|
||||
src/dusk/mods/manifest.cpp
|
||||
src/dusk/mods/manifest.hpp
|
||||
src/dusk/mods/svc/camera.cpp
|
||||
src/dusk/mods/svc/config.cpp
|
||||
src/dusk/mods/svc/config.hpp
|
||||
src/dusk/mods/svc/game.cpp
|
||||
src/dusk/mods/svc/gfx.cpp
|
||||
src/dusk/mods/svc/hook.cpp
|
||||
src/dusk/mods/svc/host.cpp
|
||||
src/dusk/mods/svc/log.cpp
|
||||
src/dusk/mods/svc/overlay.cpp
|
||||
src/dusk/mods/svc/registry.cpp
|
||||
src/dusk/mods/svc/registry.hpp
|
||||
src/dusk/mods/svc/resource.cpp
|
||||
src/dusk/mods/svc/texture.cpp
|
||||
src/dusk/mods/svc/ui.cpp
|
||||
src/dusk/mods/svc/ui.hpp
|
||||
src/dusk/mouse.cpp
|
||||
src/dusk/scope_guard.hpp
|
||||
src/dusk/settings.cpp
|
||||
src/dusk/speedrun.cpp
|
||||
src/dusk/stubs.cpp
|
||||
src/dusk/texture_replacements.cpp
|
||||
src/dusk/texture_replacements.hpp
|
||||
src/dusk/touch_camera.cpp
|
||||
src/dusk/ui/achievements.cpp
|
||||
src/dusk/ui/achievements.hpp
|
||||
src/dusk/ui/bool_button.cpp
|
||||
@@ -1481,9 +1516,9 @@ set(DUSK_FILES
|
||||
src/dusk/ui/button.hpp
|
||||
src/dusk/ui/component.cpp
|
||||
src/dusk/ui/component.hpp
|
||||
src/dusk/ui/controls.hpp
|
||||
src/dusk/ui/controller_config.cpp
|
||||
src/dusk/ui/controller_config.hpp
|
||||
src/dusk/ui/controls.hpp
|
||||
src/dusk/ui/document.cpp
|
||||
src/dusk/ui/document.hpp
|
||||
src/dusk/ui/editor.cpp
|
||||
@@ -1492,18 +1527,22 @@ set(DUSK_FILES
|
||||
src/dusk/ui/event.hpp
|
||||
src/dusk/ui/graphics_tuner.cpp
|
||||
src/dusk/ui/graphics_tuner.hpp
|
||||
src/dusk/ui/input.cpp
|
||||
src/dusk/ui/input.hpp
|
||||
src/dusk/ui/icon_provider.cpp
|
||||
src/dusk/ui/icon_provider.hpp
|
||||
src/dusk/ui/input.cpp
|
||||
src/dusk/ui/input.hpp
|
||||
src/dusk/ui/logs_window.cpp
|
||||
src/dusk/ui/logs_window.hpp
|
||||
src/dusk/ui/menu_bar.cpp
|
||||
src/dusk/ui/menu_bar.hpp
|
||||
src/dusk/ui/mod_texture_provider.cpp
|
||||
src/dusk/ui/mod_texture_provider.hpp
|
||||
src/dusk/ui/mod_window.cpp
|
||||
src/dusk/ui/mod_window.hpp
|
||||
src/dusk/ui/modal.cpp
|
||||
src/dusk/ui/modal.hpp
|
||||
src/dusk/ui/mods_window.cpp
|
||||
src/dusk/ui/mods_window.hpp
|
||||
src/dusk/ui/nav_types.hpp
|
||||
src/dusk/ui/number_button.cpp
|
||||
src/dusk/ui/number_button.hpp
|
||||
@@ -1511,10 +1550,6 @@ set(DUSK_FILES
|
||||
src/dusk/ui/overlay.hpp
|
||||
src/dusk/ui/pane.cpp
|
||||
src/dusk/ui/pane.hpp
|
||||
src/dusk/ui/menu_bar.cpp
|
||||
src/dusk/ui/menu_bar.hpp
|
||||
src/dusk/ui/mods_window.cpp
|
||||
src/dusk/ui/mods_window.hpp
|
||||
src/dusk/ui/prelaunch.cpp
|
||||
src/dusk/ui/prelaunch.hpp
|
||||
src/dusk/ui/preset.cpp
|
||||
@@ -1529,10 +1564,10 @@ set(DUSK_FILES
|
||||
src/dusk/ui/string_button.hpp
|
||||
src/dusk/ui/tab_bar.cpp
|
||||
src/dusk/ui/tab_bar.hpp
|
||||
src/dusk/ui/touch_controls_common.cpp
|
||||
src/dusk/ui/touch_controls_common.hpp
|
||||
src/dusk/ui/touch_controls.cpp
|
||||
src/dusk/ui/touch_controls.hpp
|
||||
src/dusk/ui/touch_controls_common.cpp
|
||||
src/dusk/ui/touch_controls_common.hpp
|
||||
src/dusk/ui/touch_controls_editor.cpp
|
||||
src/dusk/ui/touch_controls_editor.hpp
|
||||
src/dusk/ui/ui.cpp
|
||||
@@ -1541,45 +1576,13 @@ set(DUSK_FILES
|
||||
src/dusk/ui/warp.hpp
|
||||
src/dusk/ui/window.cpp
|
||||
src/dusk/ui/window.hpp
|
||||
src/dusk/achievements.cpp
|
||||
src/dusk/iso_validate.cpp
|
||||
src/dusk/livesplit.cpp
|
||||
src/dusk/offset_ptr.cpp
|
||||
src/dusk/OSContext.cpp
|
||||
src/dusk/OSReport.cpp
|
||||
src/dusk/OSThread.cpp
|
||||
src/dusk/OSMutex.cpp
|
||||
src/dusk/mods/log_buffer.cpp
|
||||
src/dusk/mods/log_buffer.hpp
|
||||
src/dusk/mods/manifest.cpp
|
||||
src/dusk/mods/manifest.hpp
|
||||
src/dusk/mods/loader/bundle_disk.cpp
|
||||
src/dusk/mods/loader/bundle_zip.cpp
|
||||
src/dusk/mods/loader/context.cpp
|
||||
src/dusk/mods/loader/depgraph.cpp
|
||||
src/dusk/mods/loader/depgraph.hpp
|
||||
src/dusk/mods/loader/loader.cpp
|
||||
src/dusk/mods/loader/loader.hpp
|
||||
src/dusk/mods/loader/native_module.cpp
|
||||
src/dusk/mods/loader/native_module.hpp
|
||||
src/dusk/mods/svc/config.cpp
|
||||
src/dusk/mods/svc/config.hpp
|
||||
src/dusk/mods/svc/game.cpp
|
||||
src/dusk/mods/svc/hook.cpp
|
||||
src/dusk/mods/svc/host.cpp
|
||||
src/dusk/mods/svc/log.cpp
|
||||
src/dusk/mods/svc/overlay.cpp
|
||||
src/dusk/mods/svc/resource.cpp
|
||||
src/dusk/mods/svc/texture.cpp
|
||||
src/dusk/mods/svc/ui.cpp
|
||||
src/dusk/mods/svc/ui.hpp
|
||||
src/dusk/mods/svc/registry.cpp
|
||||
src/dusk/mods/svc/registry.hpp
|
||||
src/dusk/discord.cpp
|
||||
src/dusk/discord.hpp
|
||||
src/dusk/discord_presence.cpp
|
||||
src/dusk/update_check.cpp
|
||||
src/dusk/update_check.hpp
|
||||
src/dusk/version.cpp
|
||||
src/dusk/action_bindings.cpp
|
||||
src/helpers/batch.cpp
|
||||
src/helpers/endian.cpp
|
||||
src/helpers/offset_ptr.cpp
|
||||
src/helpers/string.cpp
|
||||
)
|
||||
|
||||
set(DUSK_HTTP_BACKEND_FILES
|
||||
|
||||
@@ -88,9 +88,9 @@ struct DynamicModuleControl : DynamicModuleControlBase {
|
||||
/* 0x24 */ s32 mSize;
|
||||
/* 0x28 */ mDoDvdThd_callback_c* mAsyncLoadCallback;
|
||||
|
||||
static u32 sAllocBytes;
|
||||
static JKRArchive* sArchive;
|
||||
static JKRFileCache* sFileCache;
|
||||
static DUSK_GAME_DATA u32 sAllocBytes;
|
||||
static DUSK_GAME_DATA JKRArchive* sArchive;
|
||||
static DUSK_GAME_DATA JKRFileCache* sFileCache;
|
||||
};
|
||||
|
||||
#endif /* DYNAMICLINK_H */
|
||||
|
||||
@@ -12,6 +12,6 @@ struct cAPI_Interface {
|
||||
/* 0x14 */ cAPIGph_Mthd blankingOffMtd;
|
||||
};
|
||||
|
||||
extern cAPI_Interface g_cAPI_Interface;
|
||||
DUSK_GAME_EXTERN cAPI_Interface g_cAPI_Interface;
|
||||
|
||||
#endif /* C_API_H */
|
||||
|
||||
@@ -24,11 +24,11 @@ private:
|
||||
s16 mAngle;
|
||||
|
||||
public:
|
||||
const static cSAngle _0;
|
||||
const static cSAngle _1;
|
||||
const static cSAngle _90;
|
||||
const static cSAngle _180;
|
||||
const static cSAngle _270;
|
||||
const static DUSK_GAME_DATA cSAngle _0;
|
||||
const static DUSK_GAME_DATA cSAngle _1;
|
||||
const static DUSK_GAME_DATA cSAngle _90;
|
||||
const static DUSK_GAME_DATA cSAngle _180;
|
||||
const static DUSK_GAME_DATA cSAngle _270;
|
||||
#ifdef __MWERKS__
|
||||
cSAngle() {}
|
||||
~cSAngle() {}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
|
||||
#include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"
|
||||
#include "dusk/endian.h"
|
||||
#include "helpers/endian.h"
|
||||
|
||||
struct cBgD_Vtx_t : public Vec {};
|
||||
|
||||
|
||||
@@ -435,7 +435,7 @@ public:
|
||||
|
||||
cM3dGAab& GetWorkAab() { return mAab; }
|
||||
|
||||
static cXyz m_virtual_center;
|
||||
static DUSK_GAME_DATA cXyz m_virtual_center;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr));
|
||||
|
||||
@@ -9,7 +9,7 @@ struct counter_class {
|
||||
u32 mTimer;
|
||||
};
|
||||
|
||||
extern counter_class g_Counter;
|
||||
DUSK_GAME_EXTERN counter_class g_Counter;
|
||||
|
||||
void cCt_Counter(int resetCounter1);
|
||||
|
||||
|
||||
@@ -102,6 +102,6 @@ void MtxPosition(cXyz DUSK_CONST*, cXyz*);
|
||||
void MtxPush(void);
|
||||
void MtxPull(void);
|
||||
|
||||
extern Mtx* calc_mtx;
|
||||
DUSK_GAME_EXTERN Mtx* calc_mtx;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -20,7 +20,7 @@ struct cM3d_Range {
|
||||
};
|
||||
|
||||
#define G_CM3D_F_INF (1000000000.0f)
|
||||
extern const f32 G_CM3D_F_ABS_MIN;
|
||||
DUSK_GAME_EXTERN const f32 G_CM3D_F_ABS_MIN;
|
||||
|
||||
static void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*);
|
||||
void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define C_M3D_G_TRI_H_
|
||||
|
||||
#include "SSystem/SComponent/c_m3d_g_pla.h"
|
||||
#include "dusk/endian.h"
|
||||
#include "helpers/endian.h"
|
||||
|
||||
class cM3dGCyl;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
class JKRHeap;
|
||||
|
||||
struct cMl {
|
||||
static JKRHeap* Heap;
|
||||
static DUSK_GAME_DATA JKRHeap* Heap;
|
||||
static void init(JKRHeap*);
|
||||
static void* memalignB(int, u32);
|
||||
static void free(void*);
|
||||
|
||||
@@ -9,7 +9,7 @@ struct SVec {
|
||||
|
||||
class csXyz : public SVec {
|
||||
public:
|
||||
static const csXyz Zero;
|
||||
static DUSK_GAME_DATA const csXyz Zero;
|
||||
~csXyz() {}
|
||||
csXyz() {}
|
||||
csXyz(s16, s16, s16);
|
||||
|
||||
@@ -14,14 +14,14 @@ struct cXy {
|
||||
};
|
||||
|
||||
struct cXyz : Vec {
|
||||
static const cXyz Zero;
|
||||
static const cXyz BaseX;
|
||||
static const cXyz BaseY;
|
||||
static const cXyz BaseZ;
|
||||
static const cXyz BaseXY;
|
||||
static const cXyz BaseXZ;
|
||||
static const cXyz BaseYZ;
|
||||
static const cXyz BaseXYZ;
|
||||
static DUSK_GAME_DATA const cXyz Zero;
|
||||
static DUSK_GAME_DATA const cXyz BaseX;
|
||||
static DUSK_GAME_DATA const cXyz BaseY;
|
||||
static DUSK_GAME_DATA const cXyz BaseZ;
|
||||
static DUSK_GAME_DATA const cXyz BaseXY;
|
||||
static DUSK_GAME_DATA const cXyz BaseXZ;
|
||||
static DUSK_GAME_DATA const cXyz BaseYZ;
|
||||
static DUSK_GAME_DATA const cXyz BaseXYZ;
|
||||
#ifdef __MWERKS__
|
||||
cXyz() {}
|
||||
~cXyz() {}
|
||||
|
||||
@@ -256,7 +256,7 @@ inline Z2Audience* Z2GetAudience() {
|
||||
return JASGlobalInstance<Z2Audience>::getInstance();
|
||||
}
|
||||
|
||||
extern s8 data_80451358;
|
||||
extern s8 data_80451359;
|
||||
DUSK_GAME_EXTERN s8 data_80451358;
|
||||
DUSK_GAME_EXTERN s8 data_80451359;
|
||||
|
||||
#endif /* Z2AUDIENCE_H */
|
||||
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
bool isResetting() { return mResettingFlag; }
|
||||
|
||||
static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
|
||||
static Z2AudioMgr* mAudioMgrPtr;
|
||||
static DUSK_GAME_DATA Z2AudioMgr* mAudioMgrPtr;
|
||||
|
||||
/* 0x0514 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
|
||||
/* 0x0518 */ bool mResettingFlag;
|
||||
|
||||
@@ -42,8 +42,8 @@ f32 getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32
|
||||
f32 getRandom(f32 magnitude, f32 exponent, f32 bias);
|
||||
f32 getRandom_0_1();
|
||||
|
||||
extern const f32 cEqualCSlope;
|
||||
extern const f32 cEqualPSlope;
|
||||
DUSK_GAME_EXTERN const f32 cEqualCSlope;
|
||||
DUSK_GAME_EXTERN const f32 cEqualPSlope;
|
||||
} // namespace Z2Calc
|
||||
|
||||
#endif /* Z2CALC_H */
|
||||
|
||||
@@ -175,7 +175,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
|
||||
|
||||
STATIC_ASSERT(sizeof(Z2EnvSeMgr) == 0x30C);
|
||||
|
||||
extern Z2EnvSeMgr g_mEnvSeMgr;
|
||||
DUSK_GAME_EXTERN Z2EnvSeMgr g_mEnvSeMgr;
|
||||
|
||||
inline Z2EnvSeMgr* Z2GetEnvSeMgr() {
|
||||
return JASGlobalInstance<Z2EnvSeMgr>::getInstance();
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
void setUsingIronBall(bool isUsingIronBall) { mUsingIronBall = isUsingIronBall; }
|
||||
void setMarkState(u8 state) { mMarkState = state; }
|
||||
|
||||
static Z2CreatureLink* mLinkPtr;
|
||||
static DUSK_GAME_DATA Z2CreatureLink* mLinkPtr;
|
||||
static Z2CreatureLink* getLink() { return mLinkPtr; }
|
||||
|
||||
friend class Z2LinkSoundStarter;
|
||||
|
||||
@@ -4,72 +4,72 @@
|
||||
#include <types.h>
|
||||
|
||||
struct Z2Param {
|
||||
static f32 DISTANCE_MAX;
|
||||
static f32 MAX_VOLUME_DISTANCE;
|
||||
static f32 DOLBY_CENTER_VALUE;
|
||||
static f32 DOLBY_FLONT_DISTANCE_MAX;
|
||||
static f32 DOLBY_BEHIND_DISTANCE_MAX;
|
||||
static f32 DISTANCE_FX_PARAM;
|
||||
static f32 SONIC_SPEED;
|
||||
static f32 VOL_BGM_DEFAULT;
|
||||
static f32 VOL_SE_SYSTEM_DEFAULT;
|
||||
static f32 VOL_SE_LINK_VOICE_DEFAULT;
|
||||
static f32 VOL_SE_LINK_MOTION_DEFAULT;
|
||||
static f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
|
||||
static f32 VOL_SE_CHAR_VOICE_DEFAULT;
|
||||
static f32 VOL_SE_CHAR_MOVE_DEFAULT;
|
||||
static f32 VOL_SE_OBJECT_DEFAULT;
|
||||
static f32 VOL_SE_ATMOSPHERE_DEFAULT;
|
||||
static f32 VOL_BGM_TALKING;
|
||||
static f32 VOL_SE_SYSTEM_TALKING;
|
||||
static f32 VOL_SE_LINK_VOICE_TALKING;
|
||||
static f32 VOL_SE_LINK_MOTION_TALKING;
|
||||
static f32 VOL_SE_LINK_FOOTNOTE_TALKING;
|
||||
static f32 VOL_SE_CHAR_VOICE_TALKING;
|
||||
static f32 VOL_SE_CHAR_MOVE_TALKING;
|
||||
static f32 VOL_SE_OBJECT_TALKING;
|
||||
static f32 VOL_SE_ATMOSPHERE_TALKING;
|
||||
static f32 VOL_BGM_PAUSING;
|
||||
static f32 VOL_SE_SYSTEM_PAUSING;
|
||||
static f32 VOL_SE_LINK_VOICE_PAUSING;
|
||||
static f32 VOL_SE_LINK_MOTION_PAUSING;
|
||||
static f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
|
||||
static f32 VOL_SE_CHAR_VOICE_PAUSING;
|
||||
static f32 VOL_SE_CHAR_MOVE_PAUSING;
|
||||
static f32 VOL_SE_OBJECT_PAUSING;
|
||||
static f32 VOL_SE_ATMOSPHERE_PAUSING;
|
||||
static f32 MIN_DISTANCE_VOLUME;
|
||||
static f32 ENEMY_LASTHIT_MUTE_VOLUME;
|
||||
static DUSK_GAME_DATA f32 DISTANCE_MAX;
|
||||
static DUSK_GAME_DATA f32 MAX_VOLUME_DISTANCE;
|
||||
static DUSK_GAME_DATA f32 DOLBY_CENTER_VALUE;
|
||||
static DUSK_GAME_DATA f32 DOLBY_FLONT_DISTANCE_MAX;
|
||||
static DUSK_GAME_DATA f32 DOLBY_BEHIND_DISTANCE_MAX;
|
||||
static DUSK_GAME_DATA f32 DISTANCE_FX_PARAM;
|
||||
static DUSK_GAME_DATA f32 SONIC_SPEED;
|
||||
static DUSK_GAME_DATA f32 VOL_BGM_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_DEFAULT;
|
||||
static DUSK_GAME_DATA f32 VOL_BGM_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_TALKING;
|
||||
static DUSK_GAME_DATA f32 VOL_BGM_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_OBJECT_PAUSING;
|
||||
static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_PAUSING;
|
||||
static DUSK_GAME_DATA f32 MIN_DISTANCE_VOLUME;
|
||||
static DUSK_GAME_DATA f32 ENEMY_LASTHIT_MUTE_VOLUME;
|
||||
|
||||
// made up names based on HIO labels
|
||||
static u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
|
||||
static u8 BGM_CROSS_FADEIN_TIME;
|
||||
static u8 BGM_CROSS_FADEOUT_TIME;
|
||||
static u8 BATTLE_BGM_WAIT_TIME;
|
||||
static DUSK_GAME_DATA u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
|
||||
static DUSK_GAME_DATA u8 BGM_CROSS_FADEIN_TIME;
|
||||
static DUSK_GAME_DATA u8 BGM_CROSS_FADEOUT_TIME;
|
||||
static DUSK_GAME_DATA u8 BATTLE_BGM_WAIT_TIME;
|
||||
|
||||
static f32 ENEMY_NEARBY_DIST;
|
||||
static f32 BATTLE_FADEIN_DIST;
|
||||
static f32 BATTLE_FADEOUT_DIST;
|
||||
|
||||
static u8 FOUND_TRACK_FI_TIME;
|
||||
static u8 FOUND_TRACK_FO_TIME;
|
||||
static u8 CLOSE_BATTLE_TRACK_FI_TIME;
|
||||
static u8 CLOSE_BATTLE_TRACK_FO_TIME;
|
||||
static DUSK_GAME_DATA u8 FOUND_TRACK_FI_TIME;
|
||||
static DUSK_GAME_DATA u8 FOUND_TRACK_FO_TIME;
|
||||
static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FI_TIME;
|
||||
static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FO_TIME;
|
||||
|
||||
static u8 ENDING_BLOW_VOL_DOWN_TIME;
|
||||
static u8 ENDING_BLOW_VOL_LOWER_TIME;
|
||||
static u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
|
||||
static u8 ENDING_BLOW_MIN_FINISH_TIME;
|
||||
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_DOWN_TIME;
|
||||
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_TIME;
|
||||
static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
|
||||
static DUSK_GAME_DATA u8 ENDING_BLOW_MIN_FINISH_TIME;
|
||||
|
||||
static u8 DARK_SE_FILTER_ON;
|
||||
static u8 DARK_SE_LOW_PASS_FILTER_SETTING;
|
||||
static u8 SYSTEM_SE_USE_DARK_SE_SETTING;
|
||||
static DUSK_GAME_DATA u8 DARK_SE_FILTER_ON;
|
||||
static DUSK_GAME_DATA u8 DARK_SE_LOW_PASS_FILTER_SETTING;
|
||||
static DUSK_GAME_DATA u8 SYSTEM_SE_USE_DARK_SE_SETTING;
|
||||
|
||||
static f32 AUDIBLE_DELTA_RANGE_VOLUME;
|
||||
static f32 AUDIBLE_DELTA_RANGE_PAN;
|
||||
static f32 AUDIBLE_DELTA_RANGE_DOLBY;
|
||||
};
|
||||
|
||||
extern u8 data_8045086C;
|
||||
DUSK_GAME_EXTERN u8 data_8045086C;
|
||||
|
||||
#endif /* Z2PARAM_H */
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
s32 getBgmLoadStatus(u32 wave) { return getWaveLoadStatus(wave, 1); }
|
||||
u8 getDemoSeWaveNum() { return loadedDemoWave; }
|
||||
|
||||
private:
|
||||
// private:
|
||||
/* 0x00 */ JAISoundID BGM_ID;
|
||||
/* 0x04 */ int sceneNum;
|
||||
/* 0x08 */ int timer;
|
||||
|
||||
@@ -12,18 +12,18 @@ public:
|
||||
|
||||
BOOL cDmrNowMidnaTalk();
|
||||
|
||||
extern u8 cDmr_SkipInfo;
|
||||
extern u8 data_80450C99;
|
||||
extern u8 data_80450C9A;
|
||||
extern u8 data_80450C9B;
|
||||
extern u8 data_80450C9C;
|
||||
extern u8 data_80450C9D;
|
||||
extern u8 data_80450C9E;
|
||||
extern u8 cDmr_FishingWether;
|
||||
extern u8 data_80450CA0;
|
||||
DUSK_GAME_EXTERN u8 cDmr_SkipInfo;
|
||||
DUSK_GAME_EXTERN u8 data_80450C99;
|
||||
DUSK_GAME_EXTERN u8 data_80450C9A;
|
||||
DUSK_GAME_EXTERN u8 data_80450C9B;
|
||||
DUSK_GAME_EXTERN u8 data_80450C9C;
|
||||
DUSK_GAME_EXTERN u8 data_80450C9D;
|
||||
DUSK_GAME_EXTERN u8 data_80450C9E;
|
||||
DUSK_GAME_EXTERN u8 cDmr_FishingWether;
|
||||
DUSK_GAME_EXTERN u8 data_80450CA0;
|
||||
|
||||
extern "C" {
|
||||
extern JPTraceParticleCallBack4 JPTracePCB4;
|
||||
DUSK_GAME_EXTERN JPTraceParticleCallBack4 JPTracePCB4;
|
||||
}
|
||||
|
||||
void debug_actor_create();
|
||||
|
||||
+127
-127
@@ -57,8 +57,8 @@ public:
|
||||
void setNowOffsetX(f32 i_offset) { mNowOffsetX = i_offset; }
|
||||
void setNowOffsetY(f32 i_offset) { mNowOffsetY = i_offset; }
|
||||
|
||||
static bool m_eye_move_flg;
|
||||
static u8 m_morf_frame;
|
||||
static DUSK_GAME_DATA bool m_eye_move_flg;
|
||||
static DUSK_GAME_DATA u8 m_morf_frame;
|
||||
|
||||
/* 0x0F4 */ mutable f32 field_0xf4;
|
||||
/* 0x0F8 */ mutable f32 field_0xf8;
|
||||
@@ -3913,20 +3913,20 @@ public:
|
||||
|
||||
static u32 getOtherHeapSize() { return 0xF0A60; }
|
||||
|
||||
static daAlink_BckData const m_mainBckShield[20];
|
||||
static daAlink_BckData const m_mainBckSword[5];
|
||||
static daAlink_BckData const m_mainBckFishing[28];
|
||||
static daAlink_AnmData const m_anmDataTable[ANM_MAX];
|
||||
static daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
|
||||
static daAlink_FaceTexData const m_faceTexDataTable[];
|
||||
static Vec const m_handLeftOutSidePos;
|
||||
static Vec const m_handRightOutSidePos;
|
||||
static Vec const m_handLeftInSidePos;
|
||||
static Vec const m_handRightInSidePos;
|
||||
static DUSK_GAME_DATA daAlink_BckData const m_mainBckShield[20];
|
||||
static DUSK_GAME_DATA daAlink_BckData const m_mainBckSword[5];
|
||||
static DUSK_GAME_DATA daAlink_BckData const m_mainBckFishing[28];
|
||||
static DUSK_GAME_DATA daAlink_AnmData const m_anmDataTable[ANM_MAX];
|
||||
static DUSK_GAME_DATA daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
|
||||
static DUSK_GAME_DATA daAlink_FaceTexData const m_faceTexDataTable[];
|
||||
static DUSK_GAME_DATA Vec const m_handLeftOutSidePos;
|
||||
static DUSK_GAME_DATA Vec const m_handRightOutSidePos;
|
||||
static DUSK_GAME_DATA Vec const m_handLeftInSidePos;
|
||||
static DUSK_GAME_DATA Vec const m_handRightInSidePos;
|
||||
|
||||
static const daAlink_procInitTable m_procInitTable[];
|
||||
static daAlink_procFunc m_demoInitTable[];
|
||||
static const EffParamProc m_fEffParamProc[];
|
||||
static DUSK_GAME_DATA const daAlink_procInitTable m_procInitTable[];
|
||||
static DUSK_GAME_DATA daAlink_procFunc m_demoInitTable[];
|
||||
static DUSK_GAME_DATA const EffParamProc m_fEffParamProc[];
|
||||
|
||||
/* 0x0062C */ request_of_phase_process_class mPhaseReq;
|
||||
/* 0x00634 */ const char* mArcName;
|
||||
@@ -4649,7 +4649,7 @@ struct daAlinkHIO_basic_c1 {
|
||||
|
||||
class daAlinkHIO_basic_c0 {
|
||||
public:
|
||||
static daAlinkHIO_basic_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_basic_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_basic_c : public daAlinkHIO_data_c {
|
||||
@@ -4700,7 +4700,7 @@ public:
|
||||
|
||||
class daAlinkHIO_move_c0 {
|
||||
public:
|
||||
static daAlinkHIO_move_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_move_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_move_c : public daAlinkHIO_data_c {
|
||||
@@ -4746,7 +4746,7 @@ public:
|
||||
|
||||
class daAlinkHIO_atnMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_atnMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_atnMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c {
|
||||
@@ -4792,7 +4792,7 @@ public:
|
||||
|
||||
class daAlinkHIO_noActAtnMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_noActAtnMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_noActAtnMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c {
|
||||
@@ -4834,7 +4834,7 @@ public:
|
||||
|
||||
class daAlinkHIO_frontRoll_c0 {
|
||||
public:
|
||||
static daAlinkHIO_frontRoll_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_frontRoll_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c {
|
||||
@@ -4864,7 +4864,7 @@ public:
|
||||
|
||||
class daAlinkHIO_backJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_backJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_backJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_backJump_c : public daAlinkHIO_data_c {
|
||||
@@ -4898,7 +4898,7 @@ public:
|
||||
|
||||
class daAlinkHIO_sideStep_c0 {
|
||||
public:
|
||||
static daAlinkHIO_sideStep_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_sideStep_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c {
|
||||
@@ -4936,7 +4936,7 @@ public:
|
||||
|
||||
class daAlinkHIO_slide_c0 {
|
||||
public:
|
||||
static daAlinkHIO_slide_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_slide_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_slide_c : public daAlinkHIO_data_c {
|
||||
@@ -4964,27 +4964,27 @@ public:
|
||||
|
||||
class daAlinkHIO_cutNmV_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutNmL_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutNmR_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutNmSL_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutNmSR_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c {
|
||||
@@ -5015,32 +5015,32 @@ public:
|
||||
|
||||
class daAlinkHIO_cutFnL_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnV_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnS_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnSl_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnSm_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnR_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFinish_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c {
|
||||
@@ -5077,7 +5077,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutFnJU_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutFnJU_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutFnJU_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c {
|
||||
@@ -5104,17 +5104,17 @@ public:
|
||||
|
||||
class daAlinkHIO_cutDaL_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutDash_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutDaR_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutDash_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutDaCharge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutDash_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c {
|
||||
@@ -5146,7 +5146,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c {
|
||||
@@ -5197,7 +5197,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutTurn_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutTurn_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutTurn_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c {
|
||||
@@ -5225,22 +5225,22 @@ public:
|
||||
|
||||
class daAlinkHIO_hoCutLA_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hoCut_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hoCutLB_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hoCut_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hoCutRA_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hoCut_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hoCutRB_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hoCut_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c {
|
||||
@@ -5273,7 +5273,7 @@ public:
|
||||
|
||||
class daAlinkHIO_hoCutCharge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hoCutCharge_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hoCutCharge_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c {
|
||||
@@ -5307,7 +5307,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutDown_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutDown_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutDown_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c {
|
||||
@@ -5343,7 +5343,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutHead_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutHead_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutHead_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c {
|
||||
@@ -5380,7 +5380,7 @@ public:
|
||||
|
||||
class daAlinkHIO_cutLargeJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_cutLargeJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cutLargeJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c {
|
||||
@@ -5457,7 +5457,7 @@ public:
|
||||
static daAlinkHIO_cutDown_c0 const mCutDown;
|
||||
static daAlinkHIO_cutHead_c0 const mCutHead;
|
||||
static daAlinkHIO_cutLargeJump_c0 const mCutLargeJump;
|
||||
static daAlinkHIO_cut_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_cut_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_cut_c : public daAlinkHIO_data_c {
|
||||
@@ -5513,12 +5513,12 @@ public:
|
||||
|
||||
class daAlinkHIO_gAtPush_c0 {
|
||||
public:
|
||||
static daAlinkHIO_guardAttack_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_gAtKick_c0 {
|
||||
public:
|
||||
static daAlinkHIO_guardAttack_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c {
|
||||
@@ -5550,7 +5550,7 @@ public:
|
||||
|
||||
class daAlinkHIO_turnMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_turnMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_turnMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c {
|
||||
@@ -5595,7 +5595,7 @@ public:
|
||||
static daAlinkHIO_gAtPush_c0 const mAtPush;
|
||||
static daAlinkHIO_gAtKick_c0 const mAtKick;
|
||||
static daAlinkHIO_turnMove_c0 const mTurnMove;
|
||||
static daAlinkHIO_guard_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_guard_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_guard_c : public daAlinkHIO_data_c {
|
||||
@@ -5634,7 +5634,7 @@ public:
|
||||
|
||||
class daAlinkHIO_crouch_c0 {
|
||||
public:
|
||||
static daAlinkHIO_crouch_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_crouch_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_crouch_c : public daAlinkHIO_data_c {
|
||||
@@ -5689,7 +5689,7 @@ public:
|
||||
|
||||
class daAlinkHIO_autoJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_autoJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_autoJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c {
|
||||
@@ -5719,7 +5719,7 @@ public:
|
||||
|
||||
class daAlinkHIO_smallJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_smallJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_smallJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c {
|
||||
@@ -5748,7 +5748,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wallCatch_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wallCatch_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wallCatch_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c {
|
||||
@@ -5774,7 +5774,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wallFall_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wallFall_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wallFall_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c {
|
||||
@@ -5803,7 +5803,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wallMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wallMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wallMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c {
|
||||
@@ -5839,7 +5839,7 @@ public:
|
||||
static daAlinkHIO_wallCatch_c0 const mWallCatch;
|
||||
static daAlinkHIO_wallFall_c0 const mWallFall;
|
||||
static daAlinkHIO_wallMove_c0 const mWallMove;
|
||||
static daAlinkHIO_wallHang_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wallHang_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c {
|
||||
@@ -5886,7 +5886,7 @@ public:
|
||||
|
||||
class daAlinkHIO_pushpull_c0 {
|
||||
public:
|
||||
static daAlinkHIO_pushpull_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_pushpull_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c {
|
||||
@@ -5920,7 +5920,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damNormal_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c {
|
||||
@@ -5959,12 +5959,12 @@ public:
|
||||
|
||||
class daAlinkHIO_damLarge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damLaHu_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damHuge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damLaHu_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c {
|
||||
@@ -5992,7 +5992,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damHorse_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damHorse_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damHorse_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c {
|
||||
@@ -6027,7 +6027,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damFall_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damFall_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damFall_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damFall_c : public daAlinkHIO_data_c {
|
||||
@@ -6057,7 +6057,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damCaught_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damCaught_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damCaught_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c {
|
||||
@@ -6093,7 +6093,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damSwim_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damSwim_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damSwim_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c {
|
||||
@@ -6140,7 +6140,7 @@ public:
|
||||
|
||||
class daAlinkHIO_damage_c0 {
|
||||
public:
|
||||
static daAlinkHIO_damage_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_damage_c1 const m;
|
||||
static daAlinkHIO_damNormal_c0 const mDamNormal;
|
||||
static daAlinkHIO_damLarge_c0 const mDamLarge;
|
||||
static daAlinkHIO_damHuge_c0 const mDamHuge;
|
||||
@@ -6192,7 +6192,7 @@ public:
|
||||
|
||||
class daAlinkHIO_horse_c0 {
|
||||
public:
|
||||
static daAlinkHIO_horse_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_horse_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_horse_c : public daAlinkHIO_data_c {
|
||||
@@ -6231,7 +6231,7 @@ public:
|
||||
|
||||
class daAlinkHIO_canoe_c0 {
|
||||
public:
|
||||
static daAlinkHIO_canoe_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_canoe_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_canoe_c : public daAlinkHIO_data_c {
|
||||
@@ -6276,7 +6276,7 @@ public:
|
||||
|
||||
class daAlinkHIO_bow_c0 {
|
||||
public:
|
||||
static daAlinkHIO_bow_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_bow_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_bow_c : public daAlinkHIO_data_c {
|
||||
@@ -6312,7 +6312,7 @@ public:
|
||||
|
||||
class daAlinkHIO_boom_c0 {
|
||||
public:
|
||||
static daAlinkHIO_boom_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_boom_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_boom_c : public daAlinkHIO_data_c {
|
||||
@@ -6356,7 +6356,7 @@ public:
|
||||
|
||||
class daAlinkHIO_bomb_c0 {
|
||||
public:
|
||||
static daAlinkHIO_bomb_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_bomb_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_bomb_c : public daAlinkHIO_data_c {
|
||||
@@ -6391,7 +6391,7 @@ public:
|
||||
|
||||
class daAlinkHIO_huLight_c0 {
|
||||
public:
|
||||
static daAlinkHIO_huLight_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_huLight_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlLight_c1 {
|
||||
@@ -6410,7 +6410,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlLight_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlLight_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlLight_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_zwLight_c1 { // may be wrong
|
||||
@@ -6429,7 +6429,7 @@ public:
|
||||
|
||||
class daAlinkHIO_zwLight_c0 {
|
||||
public:
|
||||
static daAlinkHIO_zwLight_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_zwLight_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_light_c : public daAlinkHIO_data_c {
|
||||
@@ -6465,7 +6465,7 @@ public:
|
||||
|
||||
class daAlinkHIO_kandelaar_c0 {
|
||||
public:
|
||||
static daAlinkHIO_kandelaar_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_kandelaar_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c {
|
||||
@@ -6504,7 +6504,7 @@ public:
|
||||
|
||||
class daAlinkHIO_magneBoots_c0 {
|
||||
public:
|
||||
static daAlinkHIO_magneBoots_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_magneBoots_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c {
|
||||
@@ -6530,7 +6530,7 @@ public:
|
||||
|
||||
class daAlinkHIO_fmChain_c0 {
|
||||
public:
|
||||
static daAlinkHIO_fmChain_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_fmChain_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c {
|
||||
@@ -6570,7 +6570,7 @@ public:
|
||||
|
||||
class daAlinkHIO_hookshot_c0 {
|
||||
public:
|
||||
static daAlinkHIO_hookshot_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_hookshot_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c {
|
||||
@@ -6608,7 +6608,7 @@ public:
|
||||
|
||||
class daAlinkHIO_spinner_c0 {
|
||||
public:
|
||||
static daAlinkHIO_spinner_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_spinner_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_spinner_c : public daAlinkHIO_data_c {
|
||||
@@ -6664,7 +6664,7 @@ public:
|
||||
|
||||
class daAlinkHIO_ironBall_c0 {
|
||||
public:
|
||||
static daAlinkHIO_ironBall_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_ironBall_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c {
|
||||
@@ -6694,7 +6694,7 @@ public:
|
||||
|
||||
class daAlinkHIO_copyRod_c0 {
|
||||
public:
|
||||
static daAlinkHIO_copyRod_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_copyRod_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c {
|
||||
@@ -6722,7 +6722,7 @@ public:
|
||||
|
||||
class daAlinkHIO_pickUp_c0 {
|
||||
public:
|
||||
static daAlinkHIO_pickUp_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_pickUp_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c {
|
||||
@@ -6769,7 +6769,7 @@ public:
|
||||
|
||||
class daAlinkHIO_board_c0 {
|
||||
public:
|
||||
static daAlinkHIO_board_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_board_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_board_c : public daAlinkHIO_data_c {
|
||||
@@ -6802,7 +6802,7 @@ public:
|
||||
|
||||
class daAlinkHIO_bottle_c0 {
|
||||
public:
|
||||
static daAlinkHIO_bottle_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_bottle_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_bottle_c : public daAlinkHIO_data_c {
|
||||
@@ -6850,7 +6850,7 @@ public:
|
||||
static daAlinkHIO_ironBall_c0 const mIronBall;
|
||||
static daAlinkHIO_copyRod_c0 const mCopyRod;
|
||||
static daAlinkHIO_zwLight_c0 const mZoraArmorPL;
|
||||
static daAlinkHIO_item_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_item_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_item_c : public daAlinkHIO_data_c {
|
||||
@@ -6909,7 +6909,7 @@ public:
|
||||
|
||||
class daAlinkHIO_ladder_c0 {
|
||||
public:
|
||||
static daAlinkHIO_ladder_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_ladder_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_ladder_c : public daAlinkHIO_data_c {
|
||||
@@ -6949,7 +6949,7 @@ public:
|
||||
|
||||
class daAlinkHIO_roofHang_c0 {
|
||||
public:
|
||||
static daAlinkHIO_roofHang_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_roofHang_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c {
|
||||
@@ -6987,7 +6987,7 @@ public:
|
||||
|
||||
class daAlinkHIO_grab_c0 {
|
||||
public:
|
||||
static daAlinkHIO_grab_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_grab_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_grab_c : public daAlinkHIO_data_c {
|
||||
@@ -7062,7 +7062,7 @@ public:
|
||||
|
||||
class daAlinkHIO_swim_c0 {
|
||||
public:
|
||||
static daAlinkHIO_swim_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_swim_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_swim_c : public daAlinkHIO_data_c {
|
||||
@@ -7138,7 +7138,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c {
|
||||
@@ -7181,7 +7181,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlMoveNoP_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlMoveNoP_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlMoveNoP_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c {
|
||||
@@ -7220,7 +7220,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtnMove_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtnMove_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtnMove_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c {
|
||||
@@ -7252,7 +7252,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlHowl_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlHowl_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlHowl_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c {
|
||||
@@ -7286,7 +7286,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlSideStep_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlSideStep_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlSideStep_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c {
|
||||
@@ -7316,7 +7316,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlBackJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlBackJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlBackJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c {
|
||||
@@ -7361,7 +7361,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAutoJump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAutoJump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAutoJump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c {
|
||||
@@ -7390,7 +7390,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlPush_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlPush_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlPush_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c {
|
||||
@@ -7426,7 +7426,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlLie_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlLie_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlLie_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c {
|
||||
@@ -7465,7 +7465,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlWallHang_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlWallHang_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlWallHang_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c {
|
||||
@@ -7497,7 +7497,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlDamNormal_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamNormal_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamNormal_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c {
|
||||
@@ -7532,12 +7532,12 @@ public:
|
||||
|
||||
class daAlinkHIO_wlDamLarge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamLaHu_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlDamHuge_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamLaHu_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c {
|
||||
@@ -7566,7 +7566,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlDamCaught_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamCaught_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamCaught_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c {
|
||||
@@ -7599,7 +7599,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlDamFall_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamFall_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamFall_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c {
|
||||
@@ -7626,7 +7626,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlDamage_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlDamage_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlDamage_c1 const m;
|
||||
static daAlinkHIO_wlDamNormal_c0 const mNormal;
|
||||
static daAlinkHIO_wlDamLarge_c0 const mLarge;
|
||||
static daAlinkHIO_wlDamHuge_c0 const mHuge;
|
||||
@@ -7676,7 +7676,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlSlide_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlSlide_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlSlide_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c {
|
||||
@@ -7711,7 +7711,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlRope_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlRope_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlRope_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c {
|
||||
@@ -7747,17 +7747,17 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtWaTl_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtWait_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtWaSc_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtWait_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtWaLr_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtWait_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c {
|
||||
@@ -7784,7 +7784,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtRoll_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtRoll_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtRoll_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c {
|
||||
@@ -7819,7 +7819,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtNjump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtNjump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtNjump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c {
|
||||
@@ -7860,7 +7860,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtCjump_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtCjump_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtCjump_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c {
|
||||
@@ -7888,7 +7888,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtLand_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtLand_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtLand_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c {
|
||||
@@ -7924,7 +7924,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtDown_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtDown_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtDown_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c {
|
||||
@@ -7961,7 +7961,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtLock_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtLock_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtLock_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c {
|
||||
@@ -8001,7 +8001,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlAtBite_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlAtBite_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAtBite_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c {
|
||||
@@ -8046,7 +8046,7 @@ public:
|
||||
static daAlinkHIO_wlAtDown_c0 const mWlAtDown;
|
||||
static daAlinkHIO_wlAtLock_c0 const mWlAtLock;
|
||||
static daAlinkHIO_wlAtBite_c0 const mWlAtBite;
|
||||
static daAlinkHIO_wlAttack_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlAttack_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c {
|
||||
@@ -8093,7 +8093,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlPoint_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlPoint_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlPoint_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c {
|
||||
@@ -8129,7 +8129,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlChain_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlChain_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlChain_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c {
|
||||
@@ -8186,7 +8186,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlSwim_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlSwim_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlSwim_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c {
|
||||
@@ -8215,7 +8215,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlGrab_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlGrab_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlGrab_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c {
|
||||
@@ -8245,7 +8245,7 @@ public:
|
||||
|
||||
class daAlinkHIO_wlBall_c0 {
|
||||
public:
|
||||
static daAlinkHIO_wlBall_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wlBall_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c {
|
||||
@@ -8300,7 +8300,7 @@ public:
|
||||
static daAlinkHIO_wlSwim_c0 const mWlSwim;
|
||||
static daAlinkHIO_wlGrab_c0 const mWlGrab;
|
||||
static daAlinkHIO_wlBall_c0 const mWlBall;
|
||||
static daAlinkHIO_wolf_c1 const m;
|
||||
static DUSK_GAME_DATA daAlinkHIO_wolf_c1 const m;
|
||||
};
|
||||
|
||||
class daAlinkHIO_wolf_c : public daAlinkHIO_data_c {
|
||||
|
||||
@@ -161,7 +161,7 @@ private:
|
||||
/* 0xA10 */ dPa_hermiteEcallBack_c field_0xa10;
|
||||
/* 0xA28 */ int (daArrow_c::*mProcFunc)();
|
||||
|
||||
static s16 m_count;
|
||||
static DUSK_GAME_DATA s16 m_count;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daArrow_c) == 0xA34);
|
||||
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
void hide() { mIsVisible = 0; }
|
||||
u8 isVisible() { return mIsVisible; }
|
||||
|
||||
static daBalloon2D_c* myclass;
|
||||
static DUSK_GAME_DATA daBalloon2D_c* myclass;
|
||||
|
||||
struct ScoreCount {
|
||||
cXyz field_0x0;
|
||||
|
||||
@@ -89,10 +89,10 @@ public:
|
||||
|
||||
void setAction(u8 i_action) { mAction = i_action; }
|
||||
|
||||
static createHeapFunc mCreateHeapFunc[];
|
||||
static createInitFunc mCreateInitFunc[];
|
||||
static executeFunc mExecuteFunc[];
|
||||
static tgSetFunc mTgSetFunc[];
|
||||
static DUSK_GAME_DATA createHeapFunc mCreateHeapFunc[];
|
||||
static DUSK_GAME_DATA createInitFunc mCreateInitFunc[];
|
||||
static DUSK_GAME_DATA executeFunc mExecuteFunc[];
|
||||
static DUSK_GAME_DATA tgSetFunc mTgSetFunc[];
|
||||
|
||||
/* 0x5A0 */ request_of_phase_process_class mPhase;
|
||||
/* 0x5A8 */ J3DModel* field_0x5a8[2][2];
|
||||
|
||||
@@ -190,12 +190,12 @@ STATIC_ASSERT(sizeof(daBoomerang_c) == 0xDE4);
|
||||
|
||||
class daBoomerang_HIO_c0 {
|
||||
public:
|
||||
static u16 const m_lockWaitTime;
|
||||
static f32 const m_minCircleR;
|
||||
static f32 const m_middleCircleR;
|
||||
static f32 const m_maxCircleR;
|
||||
static f32 const m_scale;
|
||||
static f32 const m_lockWindScale;
|
||||
static DUSK_GAME_DATA u16 const m_lockWaitTime;
|
||||
static DUSK_GAME_DATA f32 const m_minCircleR;
|
||||
static DUSK_GAME_DATA f32 const m_middleCircleR;
|
||||
static DUSK_GAME_DATA f32 const m_maxCircleR;
|
||||
static DUSK_GAME_DATA f32 const m_scale;
|
||||
static DUSK_GAME_DATA f32 const m_lockWindScale;
|
||||
};
|
||||
|
||||
#endif /* D_A_BOOMERANG_H */
|
||||
|
||||
@@ -18,7 +18,7 @@ class daBullet_Param_c {
|
||||
public:
|
||||
virtual ~daBullet_Param_c() {}
|
||||
|
||||
static daBullet_HIOParam const m;
|
||||
static DUSK_GAME_DATA daBullet_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -80,8 +80,8 @@ public:
|
||||
int wait(void*);
|
||||
int move(void*);
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static dCcD_SrcSph mCcDSph;
|
||||
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daBullet_c) == 0x95c);
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
|
||||
const CoachFireAttr& attr() { return M_attr; }
|
||||
|
||||
static CoachFireAttr const M_attr;
|
||||
static DUSK_GAME_DATA CoachFireAttr const M_attr;
|
||||
|
||||
inline ~daCoachFire_c();
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
struct BckTbl {
|
||||
u16 idx[4];
|
||||
};
|
||||
static const BckTbl m_bckIdxTable[];
|
||||
static DUSK_GAME_DATA const BckTbl m_bckIdxTable[];
|
||||
|
||||
private:
|
||||
/* 0x5A0 */ const char* m_arcName;
|
||||
|
||||
@@ -99,7 +99,7 @@ public:
|
||||
mWarpMode = daCstatueWarpMode_Active;
|
||||
}
|
||||
|
||||
static u16 const m_bckIdxTable[daCstatueType_N][7];
|
||||
static DUSK_GAME_DATA u16 const m_bckIdxTable[daCstatueType_N][7];
|
||||
|
||||
private:
|
||||
/* 0x568 */ const char* mResName;
|
||||
|
||||
@@ -65,15 +65,15 @@ public:
|
||||
f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
|
||||
f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
|
||||
|
||||
static f32 const OPEN_SIZE;
|
||||
static f32 const OPEN_ACCEL;
|
||||
static f32 const OPEN_SPEED;
|
||||
static f32 const OPEN_BOUND_SPEED;
|
||||
static f32 const OPEN_BOUND_RATIO;
|
||||
static f32 const CLOSE_ACCEL;
|
||||
static f32 const CLOSE_SPEED;
|
||||
static f32 const CLOSE_BOUND_SPEED;
|
||||
static f32 const CLOSE_BOUND_RATIO;
|
||||
static DUSK_GAME_DATA f32 const OPEN_SIZE;
|
||||
static DUSK_GAME_DATA f32 const OPEN_ACCEL;
|
||||
static DUSK_GAME_DATA f32 const OPEN_SPEED;
|
||||
static DUSK_GAME_DATA f32 const OPEN_BOUND_SPEED;
|
||||
static DUSK_GAME_DATA f32 const OPEN_BOUND_RATIO;
|
||||
static DUSK_GAME_DATA f32 const CLOSE_ACCEL;
|
||||
static DUSK_GAME_DATA f32 const CLOSE_SPEED;
|
||||
static DUSK_GAME_DATA f32 const CLOSE_BOUND_SPEED;
|
||||
static DUSK_GAME_DATA f32 const CLOSE_BOUND_RATIO;
|
||||
|
||||
/* 0x5A0 */ dComIfG_resLoader_c mResLoader;
|
||||
/* 0x5B0 */ J3DModel* mpModel;
|
||||
|
||||
@@ -175,14 +175,14 @@ private:
|
||||
STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174);
|
||||
|
||||
struct E_DT_n {
|
||||
static f32 eDt_ShakeFrame[10];
|
||||
static f32 eDt_ShakeFrameDemo[10];
|
||||
static dCcD_SrcSph cc_dt_body_src;
|
||||
static dCcD_SrcSph cc_dt_tongue_src;
|
||||
static int mDt_OtamaNum;
|
||||
static int mDt_OtamaNo[20];
|
||||
static int m_fall_no;
|
||||
static cXyz m_tongue_pos;
|
||||
static DUSK_GAME_DATA f32 eDt_ShakeFrame[10];
|
||||
static DUSK_GAME_DATA f32 eDt_ShakeFrameDemo[10];
|
||||
static DUSK_GAME_DATA dCcD_SrcSph cc_dt_body_src;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph cc_dt_tongue_src;
|
||||
static DUSK_GAME_DATA int mDt_OtamaNum;
|
||||
static DUSK_GAME_DATA int mDt_OtamaNo[20];
|
||||
static DUSK_GAME_DATA int m_fall_no;
|
||||
static DUSK_GAME_DATA cXyz m_tongue_pos;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ private:
|
||||
/* 0xB9E */ u8 field_0xb9e;
|
||||
/* 0xB9F */ u8 mHIOInit;
|
||||
|
||||
static actionFunc l_actionmenu[9];
|
||||
static DUSK_GAME_DATA actionFunc l_actionmenu[9];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daE_GE_c) == 0xBA0);
|
||||
|
||||
@@ -159,14 +159,14 @@ private:
|
||||
STATIC_ASSERT(sizeof(daE_OC_c) == 0xe88);
|
||||
|
||||
struct E_OC_n {
|
||||
static f32 const oc_attackb_trans[10];
|
||||
static f32 const oc_attackc_trans[10];
|
||||
static dCcD_SrcSph cc_sph_src;
|
||||
static dCcD_SrcSph at_sph_src;
|
||||
static daE_OC_c* m_battle_oc;
|
||||
static daE_OC_c* m_damage_oc;
|
||||
static daE_OC_c* m_death_oc;
|
||||
static daE_OC_c* m_talk_oc;
|
||||
static DUSK_GAME_DATA f32 const oc_attackb_trans[10];
|
||||
static DUSK_GAME_DATA f32 const oc_attackc_trans[10];
|
||||
static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph at_sph_src;
|
||||
static DUSK_GAME_DATA daE_OC_c* m_battle_oc;
|
||||
static DUSK_GAME_DATA daE_OC_c* m_damage_oc;
|
||||
static DUSK_GAME_DATA daE_OC_c* m_death_oc;
|
||||
static DUSK_GAME_DATA daE_OC_c* m_talk_oc;
|
||||
};
|
||||
|
||||
#endif /* D_A_E_OC_H */
|
||||
|
||||
@@ -215,7 +215,7 @@ private:
|
||||
STATIC_ASSERT(sizeof(daE_YM_c) == 0xAF8);
|
||||
|
||||
struct E_YM_n {
|
||||
static dCcD_SrcSph cc_sph_src;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -311,10 +311,10 @@ struct daFmtMng_c : public fopAc_ac_c {
|
||||
}
|
||||
|
||||
static FmtMngAttributes const& attr() { return M_attr; }
|
||||
static FmtMngAttributes const M_attr;
|
||||
static DUSK_GAME_DATA FmtMngAttributes const M_attr;
|
||||
|
||||
typedef void (daFmtMng_c::*ActionFunc)();
|
||||
static daFmtMng_c::ActionFunc ActionTable[10];
|
||||
static DUSK_GAME_DATA daFmtMng_c::ActionFunc ActionTable[10];
|
||||
|
||||
/* 0x568 */ FmtPos_c* mPos;
|
||||
/* 0x56C */ FmtMember_c* mMember;
|
||||
|
||||
@@ -41,9 +41,9 @@ public:
|
||||
static void deleteRoomGrass(int);
|
||||
static void deleteRoomFlower(int);
|
||||
|
||||
static daGrass_c* m_myObj;
|
||||
static dGrass_packet_c* m_grass;
|
||||
static dFlower_packet_c* m_flower;
|
||||
static DUSK_GAME_DATA daGrass_c* m_myObj;
|
||||
static DUSK_GAME_DATA dGrass_packet_c* m_grass;
|
||||
static DUSK_GAME_DATA dFlower_packet_c* m_flower;
|
||||
|
||||
/* 0x568 */ u8 unk_0x568[0x570 - 0x568];
|
||||
};
|
||||
|
||||
@@ -351,8 +351,8 @@ public:
|
||||
m_modelData->getMaterialNodePointer(5)->getShape()->hide();
|
||||
}
|
||||
|
||||
static u16 const m_footJointTable[];
|
||||
static f32 const m_callLimitDistance2;
|
||||
static DUSK_GAME_DATA u16 const m_footJointTable[];
|
||||
static DUSK_GAME_DATA f32 const m_callLimitDistance2;
|
||||
|
||||
/* 0x0568 */ request_of_phase_process_class m_phase;
|
||||
/* 0x0570 */ J3DModel* m_model;
|
||||
@@ -567,7 +567,7 @@ public:
|
||||
|
||||
class daHorse_hio_c0 {
|
||||
public:
|
||||
static const daHorse_hio_c1 m;
|
||||
static DUSK_GAME_DATA const daHorse_hio_c1 m;
|
||||
};
|
||||
|
||||
class daHorse_hio_c : public JORReflexible {
|
||||
|
||||
@@ -29,8 +29,8 @@ public:
|
||||
static void setMorfFrame(u8 i_frame) { mMorfFrame = i_frame; }
|
||||
static void decMorfFrame() { cLib_calcTimer<u8>(&mMorfFrame); }
|
||||
|
||||
static u8 mEyeMoveFlg;
|
||||
static u8 mMorfFrame;
|
||||
static DUSK_GAME_DATA u8 mEyeMoveFlg;
|
||||
static DUSK_GAME_DATA u8 mMorfFrame;
|
||||
|
||||
/* 0x0F4 */ f32 field_0xf4;
|
||||
/* 0x0F8 */ f32 field_0xf8;
|
||||
@@ -50,7 +50,7 @@ struct daHoZelda_hio_c1 {
|
||||
struct daHoZelda_hio_c0 {
|
||||
daHoZelda_hio_c0() {}
|
||||
|
||||
static daHoZelda_hio_c1 const m;
|
||||
static DUSK_GAME_DATA daHoZelda_hio_c1 const m;
|
||||
};
|
||||
|
||||
class daHoZelda_hio_c : public JORReflexible {
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
virtual u8 getCollisionH();
|
||||
virtual u8 getCollisionR();
|
||||
|
||||
static daItemBase_data const m_data;
|
||||
static DUSK_GAME_DATA daItemBase_data const m_data;
|
||||
|
||||
/* 0x56C */ request_of_phase_process_class mPhase;
|
||||
/* 0x574 */ J3DModel* mpModel;
|
||||
|
||||
@@ -32,7 +32,7 @@ public:
|
||||
|
||||
class daMidna_hio_c0 {
|
||||
public:
|
||||
static daMidna_hio_c1 const m;
|
||||
static DUSK_GAME_DATA daMidna_hio_c1 const m;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daMidna_hio_c0::m) == 0x20);
|
||||
@@ -87,8 +87,8 @@ public:
|
||||
/* 0x0FC */ f32 mNowOffsetX;
|
||||
/* 0x100 */ f32 mNowOffsetY;
|
||||
|
||||
static bool sEyeMoveFlg;
|
||||
static u8 sMorfFrame;
|
||||
static DUSK_GAME_DATA bool sEyeMoveFlg;
|
||||
static DUSK_GAME_DATA u8 sMorfFrame;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daMidna_matAnm_c) == 0x104);
|
||||
@@ -420,8 +420,8 @@ public:
|
||||
|
||||
static u32 getOtherHeapSize() { return 0x1D0; }
|
||||
|
||||
static daMidna_texData_s const m_texDataTable[21];
|
||||
static daMidna_anmData_s const m_anmDataTable[53];
|
||||
static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21];
|
||||
static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53];
|
||||
|
||||
private:
|
||||
/* 0x568 */ request_of_phase_process_class mPhase;
|
||||
|
||||
@@ -58,8 +58,8 @@ public:
|
||||
static u32 getMirrorRoomPrm() { return 0xFF03; }
|
||||
|
||||
typedef int (daMirror_c::*entryModelFunc)(J3DModel*);
|
||||
static entryModelFunc m_entryModel;
|
||||
static daMirror_c* m_myObj;
|
||||
static DUSK_GAME_DATA entryModelFunc m_entryModel;
|
||||
static DUSK_GAME_DATA daMirror_c* m_myObj;
|
||||
|
||||
/* 0x570 */ dMirror_packet_c mPacket;
|
||||
/* 0x6f8 */ J3DModel* mpModel;
|
||||
|
||||
@@ -95,12 +95,6 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
|
||||
#define THP_TEXTURE_SET_COUNT 3
|
||||
#endif
|
||||
|
||||
#if TARGET_PC
|
||||
namespace dusk {
|
||||
void MoviePlayerShutdown();
|
||||
}
|
||||
#endif
|
||||
|
||||
struct daMP_THPPlayer {
|
||||
/* 0x000 */ DVDFileInfo fileInfo;
|
||||
/* 0x03C */ THPHeader header;
|
||||
@@ -170,7 +164,7 @@ public:
|
||||
static int daMP_c_Callback_Main(daMP_c*);
|
||||
static int daMP_c_Callback_Draw(daMP_c*);
|
||||
|
||||
static daMP_c* m_myObj;
|
||||
static DUSK_GAME_DATA daMP_c* m_myObj;
|
||||
|
||||
private:
|
||||
/* 0x568 */ u32 (*mpGetMovieRestFrame)(void);
|
||||
|
||||
@@ -131,8 +131,8 @@ public:
|
||||
typedef void (daMyna_c::*ProcFunc)();
|
||||
typedef int (daMyna_c::*BaseMotionFunc)(int);
|
||||
|
||||
static dCcD_SrcSph const mCcDSph;
|
||||
static daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
|
||||
static DUSK_GAME_DATA dCcD_SrcSph const mCcDSph;
|
||||
static DUSK_GAME_DATA daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
|
||||
|
||||
/* 0x56C */ request_of_phase_process_class mPhase;
|
||||
/* 0x574 */ mDoExt_McaMorfSO* mpMorf;
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
|
||||
s16 getExTime() { return mExTime; }
|
||||
|
||||
static const char* m_arcNameList[6];
|
||||
static DUSK_GAME_DATA const char* m_arcNameList[6];
|
||||
|
||||
/* 0x56C */ request_of_phase_process_class mPhase;
|
||||
/* 0x574 */ J3DModel* mpModel;
|
||||
|
||||
@@ -776,12 +776,12 @@ public:
|
||||
return chkFindActor(daPy_getPlayerActorClass(), param_0, param_1);
|
||||
}
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObjData;
|
||||
static dCcD_SrcCyl mCcDCyl;
|
||||
static dCcD_SrcSph mCcDSph;
|
||||
static fopAc_ac_c* mFindActorPtrs[50];
|
||||
static s16 mSrchName;
|
||||
static int mFindCount;
|
||||
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjData;
|
||||
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
|
||||
static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50];
|
||||
static DUSK_GAME_DATA s16 mSrchName;
|
||||
static DUSK_GAME_DATA int mFindCount;
|
||||
|
||||
enum Mode {
|
||||
/* 0 */ MODE_ENTER,
|
||||
|
||||
@@ -113,9 +113,9 @@ public:
|
||||
virtual void drawOtherMdls();
|
||||
virtual bool dbgDraw();
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObj;
|
||||
static dCcD_SrcCyl mCcDCyl;
|
||||
static dCcD_SrcSph mCcDSph;
|
||||
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObj;
|
||||
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
|
||||
|
||||
public:
|
||||
/* 0x56C */ dBgS_ObjAcch mAcch;
|
||||
@@ -173,9 +173,9 @@ public:
|
||||
virtual int ToFore() { return 1; }
|
||||
virtual int ToBack() { return 1; }
|
||||
|
||||
static const char* m_name;
|
||||
static int m_dzb_id;
|
||||
static MoveBGActor_SetFunc m_set_func;
|
||||
static DUSK_GAME_DATA const char* m_name;
|
||||
static DUSK_GAME_DATA int m_dzb_id;
|
||||
static DUSK_GAME_DATA MoveBGActor_SetFunc m_set_func;
|
||||
|
||||
public:
|
||||
/* 0xA14 */ dBgW* mpBgw;
|
||||
|
||||
@@ -394,13 +394,13 @@ public:
|
||||
void onHide() { mHide = true; }
|
||||
void offHide() { mHide = false; }
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static dCcD_SrcCyl mCcDCyl;
|
||||
static dCcD_SrcSph mCcDSph;
|
||||
static fopAc_ac_c* mFindActorPList[100];
|
||||
static s32 mFindCount;
|
||||
static s16 mSrchActorName;
|
||||
static char mFileNameBuf[0x15];
|
||||
static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
|
||||
static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
|
||||
static DUSK_GAME_DATA fopAc_ac_c* mFindActorPList[100];
|
||||
static DUSK_GAME_DATA s32 mFindCount;
|
||||
static DUSK_GAME_DATA s16 mSrchActorName;
|
||||
static DUSK_GAME_DATA char mFileNameBuf[0x15];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);
|
||||
|
||||
@@ -17,7 +17,7 @@ class daNpc_Aru_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Aru_Param_c() {}
|
||||
|
||||
static daNpc_Aru_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_Aru_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -171,8 +171,8 @@ public:
|
||||
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
|
||||
void setLastIn() { mLastGoatIn = true; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
|
||||
static cutFunc DUSK_CONST mCutList[7];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
|
||||
|
||||
private:
|
||||
/* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -12,7 +12,7 @@ public:
|
||||
daNpcAsh_Param_c() {}
|
||||
virtual ~daNpcAsh_Param_c() {}
|
||||
|
||||
static const daNpcAsh_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcAsh_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
inline bool step(s16, bool);
|
||||
inline void playExpression();
|
||||
|
||||
static EventFn mEvtSeqList[6];
|
||||
static DUSK_GAME_DATA EventFn mEvtSeqList[6];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mCreatureSound;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcAshB_Param_c {
|
||||
public:
|
||||
virtual ~daNpcAshB_Param_c() {}
|
||||
|
||||
static const daNpcAshB_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcAshB_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -135,7 +135,7 @@ public:
|
||||
inline bool step(s16, int, f32);
|
||||
inline void playExpression();
|
||||
|
||||
static EventFn DUSK_CONST mEvtSeqList[2];
|
||||
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[2];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mCreatureSound;
|
||||
|
||||
@@ -22,7 +22,7 @@ class daNpc_Bans_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Bans_Param_c() {}
|
||||
|
||||
static daNpc_Bans_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_Bans_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -117,8 +117,8 @@ public:
|
||||
return rv;
|
||||
}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[4];
|
||||
static cutFunc DUSK_CONST mCutList[4];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[4];
|
||||
|
||||
/* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf;
|
||||
/* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO;
|
||||
|
||||
@@ -15,7 +15,7 @@ class daNpc_Besu_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Besu_Param_c() {}
|
||||
|
||||
static const daNpc_Besu_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Besu_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -140,8 +140,8 @@ public:
|
||||
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
|
||||
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[15];
|
||||
static cutFunc DUSK_CONST mCutList[15];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[15];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[15];
|
||||
|
||||
private:
|
||||
/* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;
|
||||
|
||||
@@ -14,7 +14,7 @@ class daNpcBlueNS_Param_c {
|
||||
public:
|
||||
virtual ~daNpcBlueNS_Param_c() {}
|
||||
|
||||
static const daNpcBlueNS_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcBlueNS_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -124,7 +124,7 @@ public:
|
||||
return var_r30;
|
||||
}
|
||||
|
||||
static EventFn DUSK_CONST mEvtSeqList[];
|
||||
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[];
|
||||
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
/* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];
|
||||
|
||||
@@ -16,7 +16,7 @@ struct daNpc_Bou_HIOParam {
|
||||
public:
|
||||
virtual ~daNpc_Bou_Param_c() {}
|
||||
|
||||
static const daNpc_Bou_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Bou_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -114,8 +114,8 @@ public:
|
||||
virtual int drawDbgInfo();
|
||||
virtual void changeAnm(int*, int*);
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[9];
|
||||
static cutFunc DUSK_CONST mCutList[9];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[9];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[9];
|
||||
|
||||
int getFlowNodeNo() {
|
||||
u16 nodeNo = home.angle.x;
|
||||
|
||||
@@ -29,7 +29,7 @@ class daNpcBouS_Param_c {
|
||||
public:
|
||||
virtual ~daNpcBouS_Param_c() {}
|
||||
|
||||
static daNpcBouS_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpcBouS_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
mForcibleTalk = 1;
|
||||
}
|
||||
|
||||
static eventFunc mEvtSeqList[4];
|
||||
static DUSK_GAME_DATA eventFunc mEvtSeqList[4];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -25,7 +25,7 @@ public:
|
||||
J3DModelData* getObjMdlDataP(int);
|
||||
virtual ~daNpcCd_c() {}
|
||||
|
||||
static dCcD_SrcCyl const m_cylDat;
|
||||
static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
|
||||
|
||||
/* 0x56C */ request_of_phase_process_class mPhase1;
|
||||
/* 0x574 */ request_of_phase_process_class mPhase2;
|
||||
@@ -101,7 +101,7 @@ public:
|
||||
|
||||
STATIC_ASSERT(sizeof(daNpcCd_HIO_c) == 0x29BC);
|
||||
|
||||
extern daNpcCd_HIO_c l_Cd_HIO;
|
||||
DUSK_GAME_EXTERN daNpcCd_HIO_c l_Cd_HIO;
|
||||
inline f32 HIO_atnOfs(int param_1) {
|
||||
s16 rv;
|
||||
if (param_1 < 16) {
|
||||
|
||||
@@ -87,7 +87,7 @@ struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c {
|
||||
/* 0x20C4 */ daNpcCd2_HIO_WChild_c field_0x20c4[14];
|
||||
};
|
||||
|
||||
extern daNpcCd2_HIO_c l_Cd2_HIO;
|
||||
DUSK_GAME_EXTERN daNpcCd2_HIO_c l_Cd2_HIO;
|
||||
|
||||
inline s16 Cd2_HIO_atnOfs(int param_1) {
|
||||
s16 rv;
|
||||
@@ -269,7 +269,7 @@ public:
|
||||
J3DAnmTexPattern* getTexAnmP(int);
|
||||
virtual ~daNpcCd2_c() {}
|
||||
|
||||
static dCcD_SrcCyl const m_cylDat;
|
||||
static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
|
||||
|
||||
/* 0x56C */ request_of_phase_process_class mPhase1;
|
||||
/* 0x574 */ request_of_phase_process_class mPhase2;
|
||||
|
||||
@@ -334,52 +334,52 @@ public:
|
||||
actionFunc mExecFn;
|
||||
};
|
||||
|
||||
static const ActionPair ActionTable[8];
|
||||
static seqFunc* m_funcTbl[44];
|
||||
static seqFunc m_seq00_funcTbl[2];
|
||||
static seqFunc m_seq01_funcTbl[2];
|
||||
static seqFunc m_seq02_funcTbl[2];
|
||||
static seqFunc m_seq03_funcTbl[2];
|
||||
static seqFunc m_seq04_funcTbl[2];
|
||||
static seqFunc m_seq05_funcTbl[4];
|
||||
static seqFunc m_seq06_funcTbl[4];
|
||||
static seqFunc m_seq07_funcTbl[2];
|
||||
static seqFunc m_seq08_funcTbl[7];
|
||||
static seqFunc m_seq09_funcTbl[2];
|
||||
static seqFunc m_seq10_funcTbl[2];
|
||||
static seqFunc m_seq11_funcTbl[6];
|
||||
static seqFunc m_seq12_funcTbl[2];
|
||||
static seqFunc m_seq13_funcTbl[6];
|
||||
static seqFunc m_seq14_funcTbl[2];
|
||||
static seqFunc m_seq15_funcTbl[2];
|
||||
static seqFunc m_seq16_funcTbl[7];
|
||||
static seqFunc m_seq17_funcTbl[2];
|
||||
static seqFunc m_seq18_funcTbl[2];
|
||||
static seqFunc m_seq19_funcTbl[7];
|
||||
static seqFunc m_seq20_funcTbl[2];
|
||||
static seqFunc m_seq21_funcTbl[2];
|
||||
static seqFunc m_seq22_funcTbl[4];
|
||||
static seqFunc m_seq23_funcTbl[7];
|
||||
static seqFunc m_seq24_funcTbl[5];
|
||||
static seqFunc m_seq25_funcTbl[7];
|
||||
static seqFunc m_seq26_funcTbl[3];
|
||||
static seqFunc m_seq27_funcTbl[2];
|
||||
static seqFunc m_seq28_funcTbl[3];
|
||||
static seqFunc m_seq29_funcTbl[3];
|
||||
static seqFunc m_seq30_funcTbl[6];
|
||||
static seqFunc m_seq31_funcTbl[6];
|
||||
static seqFunc m_seq32_funcTbl[7];
|
||||
static seqFunc m_seq33_funcTbl[7];
|
||||
static seqFunc m_seq34_funcTbl[9];
|
||||
static seqFunc m_seq35_funcTbl[2];
|
||||
static seqFunc m_seq36_funcTbl[4];
|
||||
static seqFunc m_seq37_funcTbl[2];
|
||||
static seqFunc m_seq38_funcTbl[2];
|
||||
static seqFunc m_seq39_funcTbl[2];
|
||||
static seqFunc m_seq40_funcTbl[3];
|
||||
static seqFunc m_seq41_funcTbl[2];
|
||||
static seqFunc m_seq42_funcTbl[2];
|
||||
static seqFunc m_seq43_funcTbl[3];
|
||||
static DUSK_GAME_DATA const ActionPair ActionTable[8];
|
||||
static DUSK_GAME_DATA seqFunc* m_funcTbl[44];
|
||||
static DUSK_GAME_DATA seqFunc m_seq00_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq01_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq02_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq03_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq04_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq05_funcTbl[4];
|
||||
static DUSK_GAME_DATA seqFunc m_seq06_funcTbl[4];
|
||||
static DUSK_GAME_DATA seqFunc m_seq07_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq08_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq09_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq10_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq11_funcTbl[6];
|
||||
static DUSK_GAME_DATA seqFunc m_seq12_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq13_funcTbl[6];
|
||||
static DUSK_GAME_DATA seqFunc m_seq14_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq15_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq16_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq17_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq18_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq19_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq20_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq21_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq22_funcTbl[4];
|
||||
static DUSK_GAME_DATA seqFunc m_seq23_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq24_funcTbl[5];
|
||||
static DUSK_GAME_DATA seqFunc m_seq25_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq26_funcTbl[3];
|
||||
static DUSK_GAME_DATA seqFunc m_seq27_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq28_funcTbl[3];
|
||||
static DUSK_GAME_DATA seqFunc m_seq29_funcTbl[3];
|
||||
static DUSK_GAME_DATA seqFunc m_seq30_funcTbl[6];
|
||||
static DUSK_GAME_DATA seqFunc m_seq31_funcTbl[6];
|
||||
static DUSK_GAME_DATA seqFunc m_seq32_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq33_funcTbl[7];
|
||||
static DUSK_GAME_DATA seqFunc m_seq34_funcTbl[9];
|
||||
static DUSK_GAME_DATA seqFunc m_seq35_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq36_funcTbl[4];
|
||||
static DUSK_GAME_DATA seqFunc m_seq37_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq38_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq39_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq40_funcTbl[3];
|
||||
static DUSK_GAME_DATA seqFunc m_seq41_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq42_funcTbl[2];
|
||||
static DUSK_GAME_DATA seqFunc m_seq43_funcTbl[3];
|
||||
|
||||
/* 0xAC8 */ J3DModel* field_0xac8;
|
||||
/* 0xACC */ J3DModel* field_0xacc;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpcChat_Param_c {
|
||||
public:
|
||||
virtual ~daNpcChat_Param_c() {}
|
||||
|
||||
static daNpcChat_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpcChat_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
void setFear() { mFear = true; }
|
||||
void setTalkFlag() { mTalkFlag = true; }
|
||||
|
||||
static eventFunc DUSK_CONST mEvtSeqList[1];
|
||||
static DUSK_GAME_DATA eventFunc DUSK_CONST mEvtSeqList[1];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2CreatureCitizen mSound;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcChin_Param_c {
|
||||
public:
|
||||
virtual ~daNpcChin_Param_c() {}
|
||||
|
||||
static daNpcChin_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpcChin_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -183,7 +183,7 @@ public:
|
||||
inline void ForcibleTalk_Off() { field_0xe06 = 0; }
|
||||
inline u8 getForcibleTalk2() { return field_0xe06; }
|
||||
|
||||
static eventFunc mEvtSeqList[8];
|
||||
static DUSK_GAME_DATA eventFunc mEvtSeqList[8];
|
||||
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
|
||||
|
||||
@@ -14,7 +14,7 @@ class daNpc_clerkA_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_clerkA_Param_c() {}
|
||||
|
||||
static const daNpc_clerkA_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_clerkA_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -124,8 +124,8 @@ public:
|
||||
|
||||
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -15,7 +15,7 @@ class daNpc_clerkB_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_clerkB_Param_c() {}
|
||||
|
||||
static const daNpc_clerkB_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_clerkB_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -137,8 +137,8 @@ public:
|
||||
|
||||
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcClerkt_Param_c {
|
||||
public:
|
||||
virtual ~daNpcClerkt_Param_c() {}
|
||||
|
||||
static const daNpcClerkt_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcClerkt_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -125,8 +125,8 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -295,7 +295,7 @@ public:
|
||||
|
||||
const daNpcCoach_Attr_c& attr() const { return M_attr; }
|
||||
|
||||
static daNpcCoach_Attr_c const M_attr;
|
||||
static DUSK_GAME_DATA daNpcCoach_Attr_c const M_attr;
|
||||
static u16 const ParticleName[10];
|
||||
private:
|
||||
/* 0x0568 */ daNpcChHorse_c mChHorse;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpc_Doc_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Doc_Param_c() {}
|
||||
|
||||
static const daNpc_Doc_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Doc_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -133,8 +133,8 @@ public:
|
||||
return (fopAcM_GetParam(this) & 0xFF00) >> 8;
|
||||
}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcDoorBoy_Param_c {
|
||||
public:
|
||||
virtual ~daNpcDoorBoy_Param_c() {}
|
||||
|
||||
static daNpcDoorBoy_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpcDoorBoy_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
inline int getTimeHour();
|
||||
inline bool isDummyTalk();
|
||||
|
||||
static EventFn DUSK_CONST mEvtSeqList[1];
|
||||
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2CreatureCitizen mSound;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpcDrSol_Param_c {
|
||||
public:
|
||||
virtual ~daNpcDrSol_Param_c() {}
|
||||
|
||||
static const daNpcDrSol_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcDrSol_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
|
||||
@@ -94,7 +94,7 @@ class daNpc_Fairy_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Fairy_Param_c() {}
|
||||
|
||||
static daNpc_Fairy_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_Fairy_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -294,8 +294,8 @@ public:
|
||||
u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
|
||||
u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[18];
|
||||
static cutFunc DUSK_CONST mCutList[18];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[18];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[18];
|
||||
private:
|
||||
/* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
|
||||
/* 0x0E44 */ dCcD_Cyl mCyl;
|
||||
|
||||
@@ -13,7 +13,7 @@ class daNpc_FairySeirei_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_FairySeirei_Param_c() {}
|
||||
|
||||
static daNpc_FairySeirei_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_FairySeirei_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -90,8 +90,8 @@ public:
|
||||
|
||||
int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
|
||||
|
||||
static DUSK_CONST char* mCutNameList[1];
|
||||
static DUSK_CONST cutFunc mCutList[1];
|
||||
static DUSK_GAME_DATA DUSK_CONST char* mCutNameList[1];
|
||||
static DUSK_GAME_DATA DUSK_CONST cutFunc mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpc_Gnd_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Gnd_Param_c() {}
|
||||
|
||||
static const daNpc_Gnd_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Gnd_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -96,8 +96,8 @@ public:
|
||||
s32 getNeckJointNo() { return 3; }
|
||||
s32 getBackboneJointNo() { return 1; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -21,7 +21,7 @@ class daNpc_grA_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grA_Param_c() {}
|
||||
|
||||
static daNpc_grA_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grA_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -138,9 +138,9 @@ public:
|
||||
void addCarryNum() { field_0x1692++; }
|
||||
u8 getPathNoFromParam() { return home.angle.z; }
|
||||
void setGateWalk() { field_0x14D0 = 1; }
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
|
||||
typedef BOOL (daNpc_grA_c::*cut_type)(int);
|
||||
static cut_type DUSK_CONST mEvtCutList[];
|
||||
static DUSK_GAME_DATA cut_type DUSK_CONST mEvtCutList[];
|
||||
|
||||
private:
|
||||
typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*);
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpc_grC_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grC_Param_c() {}
|
||||
|
||||
static daNpc_grC_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grC_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -89,8 +89,8 @@ public:
|
||||
void setPrtcl();
|
||||
void adjustShapeAngle() {}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
|
||||
static EventFn DUSK_CONST mEvtCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
|
||||
static DUSK_GAME_DATA EventFn DUSK_CONST mEvtCutList[1];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpc_Grd_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Grd_Param_c() {}
|
||||
|
||||
static daNpc_Grd_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_Grd_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -81,8 +81,8 @@ public:
|
||||
BOOL ECut_nodToGrz(int);
|
||||
void adjustShapeAngle() {}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
|
||||
static cutFunc DUSK_CONST mEvtCutList[2];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpc_grM_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grM_Param_c() {}
|
||||
|
||||
static daNpc_grM_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grM_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -131,8 +131,8 @@ public:
|
||||
BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
|
||||
BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[2];
|
||||
static cutFunc DUSK_CONST mCutList[2];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[2];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[2];
|
||||
|
||||
private:
|
||||
/* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -38,7 +38,7 @@ class daNpc_grMC_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grMC_Param_c() {}
|
||||
|
||||
static daNpc_grMC_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grMC_HIOParam const m;
|
||||
};
|
||||
|
||||
class daNpc_grMC_c : public dShopSystem_c {
|
||||
@@ -124,8 +124,8 @@ public:
|
||||
BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
|
||||
u16 getEyeballMaterialNo() { return 1; };
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList;
|
||||
static cutFunc DUSK_CONST mCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList;
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
|
||||
|
||||
private:
|
||||
/* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -20,7 +20,7 @@ class daNpc_grO_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grO_Param_c() {}
|
||||
|
||||
static daNpc_grO_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grO_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -85,8 +85,8 @@ public:
|
||||
int test(void*);
|
||||
void adjustShapeAngle() {}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
|
||||
static cutFunc DUSK_CONST mEvtCutList[3];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[3];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpc_grR_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grR_Param_c() {}
|
||||
|
||||
static daNpc_grR_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_grR_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -83,8 +83,8 @@ public:
|
||||
int test(void*);
|
||||
void adjustShapeAngle() {}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
|
||||
static cutFunc DUSK_CONST mEvtCutList[1];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList;
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[1];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -11,7 +11,7 @@ class daNpc_grS_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_grS_Param_c() {}
|
||||
|
||||
static const daNpc_grS_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_grS_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -84,8 +84,8 @@ public:
|
||||
void setPrtcl();
|
||||
void adjustShapeAngle() {}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
|
||||
static cutFunc DUSK_CONST mEvtCutList[2];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[2];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -28,7 +28,7 @@ class daNpc_Grz_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Grz_Param_c() {}
|
||||
|
||||
static daNpc_Grz_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_Grz_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -116,8 +116,8 @@ public:
|
||||
|
||||
u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
|
||||
static cutFunc DUSK_CONST mEvtCutList[7];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[7];
|
||||
|
||||
private:
|
||||
/* 0x0B48 */ Z2Creature mSound;
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
|
||||
u32 getPathID() { return fopAcM_GetParam(this) >> 0x10 & 0xFF; }
|
||||
|
||||
static actionFunc ActionTable[7][2];
|
||||
static DUSK_GAME_DATA actionFunc ActionTable[7][2];
|
||||
|
||||
private:
|
||||
/* 0xAC8 */ J3DModel* mpModel;
|
||||
|
||||
@@ -19,7 +19,7 @@ class daNpc_GWolf_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_GWolf_Param_c() {}
|
||||
|
||||
static daNpc_GWolf_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpc_GWolf_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -104,8 +104,8 @@ public:
|
||||
void setHowlingEndFlag() { field_0xe1c = 2; }
|
||||
void setHowlingFlag() { field_0xe1c = 1; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
|
||||
static cutFunc DUSK_CONST mEvtCutList[5];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mEvtCutList[5];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -23,7 +23,7 @@ class daNpc_Hanjo_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Hanjo_Param_c() {}
|
||||
|
||||
static const daNpc_Hanjo_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Hanjo_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -217,10 +217,10 @@ public:
|
||||
|
||||
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
|
||||
|
||||
static dCcD_SrcGObjInf const mStoneCcDObjInfo;
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[6];
|
||||
static cutFunc DUSK_CONST mCutList[6];
|
||||
static dCcD_SrcSph DUSK_CONST mStoneCcDSph;
|
||||
static DUSK_GAME_DATA dCcD_SrcGObjInf const mStoneCcDObjInfo;
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[6];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[6];
|
||||
static DUSK_GAME_DATA dCcD_SrcSph DUSK_CONST mStoneCcDSph;
|
||||
private:
|
||||
/* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
|
||||
/* 0x0E44 */ J3DModel* mModel1;
|
||||
|
||||
@@ -13,7 +13,7 @@ class daNpc_Hoz_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Hoz_Param_c() {}
|
||||
|
||||
static const daNpc_Hoz_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Hoz_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -125,8 +125,8 @@ public:
|
||||
bool getGameStartFlag() { return mGameStartFlag; }
|
||||
void setPotBreakFlag() { mPotBreakFlag = true; }
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[8];
|
||||
static cutFunc DUSK_CONST mCutList[];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[8];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[];
|
||||
|
||||
private:
|
||||
/* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcImpal_Param_c {
|
||||
public:
|
||||
virtual ~daNpcImpal_Param_c() {}
|
||||
|
||||
static const daNpcImpal_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpcImpal_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -121,7 +121,7 @@ public:
|
||||
inline void setLookMode(int i_lookMode);
|
||||
inline void deleteObstacle();
|
||||
|
||||
static EventFn mEvtSeqList[4];
|
||||
static DUSK_GAME_DATA EventFn mEvtSeqList[4];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mCreatureSound;
|
||||
|
||||
@@ -12,7 +12,7 @@ class daNpcIns_Param_c {
|
||||
public:
|
||||
virtual ~daNpcIns_Param_c() {}
|
||||
|
||||
static daNpcIns_HIOParam const m;
|
||||
static DUSK_GAME_DATA daNpcIns_HIOParam const m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -119,7 +119,7 @@ public:
|
||||
inline void playExpression();
|
||||
BOOL chkAction(actionFunc action) { return action == mAction; }
|
||||
|
||||
static eventFunc mEvtSeqList[1];
|
||||
static DUSK_GAME_DATA eventFunc mEvtSeqList[1];
|
||||
|
||||
private:
|
||||
/* 0xB48 */ Z2Creature mSound;
|
||||
|
||||
@@ -25,7 +25,7 @@ class daNpc_Jagar_Param_c {
|
||||
public:
|
||||
virtual ~daNpc_Jagar_Param_c() {}
|
||||
|
||||
static const daNpc_Jagar_HIOParam m;
|
||||
static DUSK_GAME_DATA const daNpc_Jagar_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
@@ -223,8 +223,8 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char DUSK_CONST* DUSK_CONST mCutNameList[7];
|
||||
static cutFunc DUSK_CONST mCutList[7];
|
||||
static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
|
||||
static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
|
||||
private:
|
||||
/* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO;
|
||||
/* 0x0E44 */ dCcD_Cyl mCyl1;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user