From af19645a8880d6cc9f36aa4ac322eb6b4d9e77fe Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 29 Sep 2023 16:28:16 -0400 Subject: [PATCH 01/77] Fixup remaining n64ddflag after IS_RANDO merge (#3240) --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 2 +- soh/soh/Enhancements/mods.cpp | 2 +- .../Enhancements/randomizer/randomizer_item_tracker.cpp | 4 ++-- soh/src/code/z_elf_message.c | 2 +- soh/src/code/z_play.c | 3 ++- soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c | 4 ++-- soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c | 2 +- soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c | 8 ++++---- soh/src/overlays/actors/ovl_Fishing/z_fishing.c | 8 ++++---- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 6636f5407..9a8cc2682 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -514,7 +514,7 @@ void DrawInfoTab() { } UIWidgets::InsertHelpHoverText("Z-Targeting behavior"); - if (gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { + if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U16, &gSaveContext.triforcePiecesCollected); UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt."); } diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 634460672..e4a5d37a8 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -998,7 +998,7 @@ void RegisterRandomizerSheikSpawn() { if (!gPlayState) return; bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != RO_GANONS_TRIALS_SKIP && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT)); - if (!gSaveContext.n64ddFlag || !LINK_IS_ADULT || !canSheik) return; + if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return; switch (gPlayState->sceneNum) { case SCENE_TEMPLE_OF_TIME: if (gPlayState->roomCtx.curRoom.num == 1) { diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index bfb44c6c7..22084c11e 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -497,7 +497,7 @@ void DrawItemCount(ItemTrackerItem item) { ImGui::PushStyleColor(ImGuiCol_Text, maxColor); ImGui::Text("%s", maxString.c_str()); ImGui::PopStyleColor(); - } else if (item.id == RG_TRIFORCE_PIECE && gSaveContext.n64ddFlag && + } else if (item.id == RG_TRIFORCE_PIECE && IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT) && IsValidSaveFile()) { std::string currentString = ""; std::string requiredString = ""; @@ -606,7 +606,7 @@ void DrawItem(ItemTrackerItem item) { break; case RG_TRIFORCE_PIECE: actualItemId = item.id; - hasItem = gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT); + hasItem = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT); itemName = "Triforce Piece"; break; } diff --git a/soh/src/code/z_elf_message.c b/soh/src/code/z_elf_message.c index 8236b8a78..6c5558faf 100644 --- a/soh/src/code/z_elf_message.c +++ b/soh/src/code/z_elf_message.c @@ -155,7 +155,7 @@ u16 ElfMessage_GetSariaText(PlayState* play) { if (!LINK_IS_ADULT) { if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) { - if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { + if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { return 0x161; } msgs = sChildSariaMsgs; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 45977b6e7..db938a4c2 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -2319,7 +2319,8 @@ void Play_PerformSave(PlayState* play) { Save_SaveFile(); } uint8_t triforceHuntCompleted = - gSaveContext.n64ddFlag && gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) && + IS_RANDO && + gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) && Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT); if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) { Overlay_DisplayText(3.0f, "Game Saved"); diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 9cbdf05c9..53c149026 100644 --- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -338,8 +338,8 @@ void func_80A2FA50(EnGb* this, PlayState* play) { Rupees_ChangeBy(50); HIGH_SCORE(HS_POE_POINTS) += 100; if ( - (!gSaveContext.n64ddFlag && HIGH_SCORE(HS_POE_POINTS) != 1000) || - (gSaveContext.n64ddFlag && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES))) + (!IS_RANDO && HIGH_SCORE(HS_POE_POINTS) != 1000) || + (IS_RANDO && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES))) ) { if (HIGH_SCORE(HS_POE_POINTS) > 1100) { HIGH_SCORE(HS_POE_POINTS) = 1100; diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 825dc8ef8..9e09a705c 100644 --- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -146,7 +146,7 @@ u16 func_80AF55E0(PlayState* play, Actor* thisx) { if (reaction != 0) { return reaction; } - if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { + if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { return 0x10AD; } if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c index ffc6717d4..c72a82df6 100644 --- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -425,7 +425,7 @@ void EnXc_RandoStand(EnXc* this, PlayState* play) { this->action = SHEIK_ACTION_BLOCK_PEDESTAL; this->drawMode = SHEIK_DRAW_DEFAULT; this->unk_30C = 1; - if (!gSaveContext.n64ddFlag) { + if (!IS_RANDO) { Actor_Kill(&this->actor); } } @@ -2240,13 +2240,13 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) { this->action = SHEIK_ACTION_IN_DIALOGUE; } else { this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY; - if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) { + if (IS_RANDO && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) { if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) { this->actor.textId = TEXT_SHEIK_NEED_HOOK; } else { - this->actor.textId = TEXT_SHEIK_HAVE_HOOK; + this->actor.textId = TEXT_SHEIK_HAVE_HOOK; } - } else if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) { + } else if (IS_RANDO && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) { if (CHECK_OWNED_EQUIP(EQUIP_SWORD, 1) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT && CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired) { this->actor.textId = TEXT_SHEIK_HAVE_HOOK; diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c index fbf82d2a6..ecb16dcb6 100644 --- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -5045,8 +5045,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) { if (sLinkAge == 1) { if ( - (!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x400)) || - (gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING)) + (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x400)) || + (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING)) ) { if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) { HIGH_SCORE(HS_FISHING) |= 0x400; @@ -5062,8 +5062,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) { } } else { if ( - (!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x800)) || - (gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING)) + (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x800)) || + (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING)) ) { if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) { HIGH_SCORE(HS_FISHING) |= 0x800; From 56deb1cf64d1a96dd24f33ecb432b9247f96a6fb Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sat, 30 Sep 2023 09:55:11 -0400 Subject: [PATCH 02/77] unbreakable/always on fire deku stick (#3192) * Adds Ultra Deku Stick Cheat Author: Vexus * implement the stuff * move enum to a resonable spot * Apply suggestions from code review * Update soh/src/overlays/actors/ovl_player_actor/z_player.c * i thought i could do everything through the gh web ui but fine i'll fix it locally --------- Co-authored-by: Vexus --- soh/soh/Enhancements/enhancementTypes.h | 6 +++++ soh/soh/SohMenuBar.cpp | 3 +++ .../actors/ovl_player_actor/z_player.c | 24 +++++++++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h index 7620d3fd8..529ebed81 100644 --- a/soh/soh/Enhancements/enhancementTypes.h +++ b/soh/soh/Enhancements/enhancementTypes.h @@ -68,3 +68,9 @@ typedef enum { BONK_DAMAGE_8_HEARTS, BONK_DAMAGE_OHKO, } BonkDamage; + +typedef enum { + DEKU_STICK_NORMAL, + DEKU_STICK_UNBREAKABLE, + DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, +} DekuStickType; diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index bf14317bf..f2f62c1cf 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -83,6 +83,7 @@ std::string GetWindowButtonText(const char* text, bool menuOpen) { static const char* autosaveLabels[6] = { "Off", "New Location + Major Item", "New Location + Any Item", "New Location", "Major Item", "Any Item" }; static const char* DebugSaveFileModes[3] = { "Off", "Vanilla", "Maxed" }; static const char* FastFileSelect[5] = { "File N.1", "File N.2", "File N.3", "Zelda Map Select (require OoT Debug Mode)", "File select" }; + static const char* DekuStickCheat[3] = { "Normal", "Unbreakable", "Unbreakable + Always on Fire" }; static const char* bonkDamageValues[8] = { "No Damage", "0.25 Heart", @@ -1251,6 +1252,8 @@ void DrawCheatsMenu() { UIWidgets::Tooltip("This allows you to put up your shield with any two-handed weapon in hand except for Deku Sticks"); UIWidgets::PaddedEnhancementCheckbox("Time Sync", "gTimeSync", true, false); UIWidgets::Tooltip("This syncs the ingame time with the real world time"); + ImGui::Text("Deku Sticks:"); + UIWidgets::EnhancementCombobox("gDekuStickCheat", DekuStickCheat, DEKU_STICK_NORMAL); UIWidgets::PaddedEnhancementCheckbox("No ReDead/Gibdo Freeze", "gNoRedeadFreeze", true, false); UIWidgets::Tooltip("Prevents ReDeads and Gibdos from being able to freeze you with their scream"); UIWidgets::Spacer(2.0f); diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index d0c4b362e..25c8887c3 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -7998,13 +7998,15 @@ void func_80842A28(PlayState* play, Player* this) { } void func_80842A88(PlayState* play, Player* this) { - Inventory_ChangeAmmo(ITEM_STICK, -1); - func_80835F44(play, this, ITEM_NONE); + if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { + Inventory_ChangeAmmo(ITEM_STICK, -1); + func_80835F44(play, this, ITEM_NONE); + } } s32 func_80842AC4(PlayState* play, Player* this) { if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) { - if (AMMO(ITEM_STICK) != 0) { + if (AMMO(ITEM_STICK) != 0 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND], this->actor.shape.rot.y + 0x8000); this->unk_85C = 0.5f; @@ -10352,20 +10354,28 @@ static Color_RGBA8 D_808547C0 = { 255, 50, 0, 0 }; void func_80848A04(PlayState* play, Player* this) { f32 temp; - if (this->unk_85C == 0.0f) { + if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE) { + f32 temp2 = 1.0f; // Secondary temporary variable to use with the alleged draw flame function + this->unk_860 = 200; // Keeps the stick's flame lit + this->unk_85C = 1.0f; // Ensures the stick is the proper length + func_8002836C(play, &this->meleeWeaponInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0, temp2 * 200.0f, + 0, 8); // I believe this draws the flame effect + } + + if (this->unk_85C == 0.0f && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { func_80835F44(play, this, 0xFF); return; } temp = 1.0f; - if (DECR(this->unk_860) == 0) { + if (DECR(this->unk_860) == 0 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { Inventory_ChangeAmmo(ITEM_STICK, -1); this->unk_860 = 1; temp = 0.0f; this->unk_85C = temp; } else if (this->unk_860 > 200) { temp = (210 - this->unk_860) / 10.0f; - } else if (this->unk_860 < 20) { + } else if (this->unk_860 < 20 && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { temp = this->unk_860 / 20.0f; this->unk_85C = temp; } @@ -10627,7 +10637,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { func_808473D4(play, this); func_80836BEC(this, play); - if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_860 != 0)) { + if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && ((this->unk_860 != 0) || CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE)) { func_80848A04(play, this); } else if ((this->heldItemAction == PLAYER_IA_FISHING_POLE) && (this->unk_860 < 0)) { this->unk_860++; From 6e50d7110a8ce176f47ee656bc3be77ac01116c2 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Sat, 30 Sep 2023 06:55:43 -0700 Subject: [PATCH 03/77] Open App Files Folder (#3221) * Add "Open App Files Folder" menu item to Ship menu on desktop platforms to open the folder where mods, logs, etc, are found. * Change to `GetAppDirectoryPath` to get config location instead of executable/bundle path. Also unified the absolute path creation across all platforms by using `std::filesystem::absolute`. It manages to even expand the "." returned for portable Windows mode. * Removed unnecessary platform define check. --- soh/soh/SohMenuBar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index f2f62c1cf..f129e0118 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -156,6 +156,12 @@ void DrawShipMenu() { } #if !defined(__SWITCH__) && !defined(__WIIU__) UIWidgets::Spacer(0); + if (ImGui::MenuItem("Open App Files Folder")) { + std::string filesPath = LUS::Context::GetInstance()->GetAppDirectoryPath(); + SDL_OpenURL(std::string("file:///" + std::filesystem::absolute(filesPath).string()).c_str()); + } + UIWidgets::Spacer(0); + if (ImGui::MenuItem("Quit")) { LUS::Context::GetInstance()->GetWindow()->Close(); } From ebfd14974fef83b44a50b38a5ddc20abb66779c1 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Sat, 30 Sep 2023 06:55:51 -0700 Subject: [PATCH 04/77] Modify arrow buttons in Audio Shuffle Pool Manager to be FA times and plus instead of the ImguiArrow to make the difference between "Exclude" and "Play Preview" clearer. (#3226) --- soh/soh/Enhancements/audio/AudioEditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 0e7244122..a640696d6 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -542,7 +542,7 @@ void AudioEditor::DrawElement() { ImGui::BeginChild("ChildIncludedSequences", ImVec2(0, -8)); for (auto seqInfo : AudioCollection::Instance->GetIncludedSequences()) { if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) { - if (ImGui::ArrowButton(seqInfo->sfxKey.c_str(), ImGuiDir_Right)) { + if (ImGui::Button(std::string(ICON_FA_TIMES "##" + seqInfo->sfxKey).c_str())) { seqsToExclude.insert(seqInfo); } ImGui::SameLine(); @@ -566,7 +566,7 @@ void AudioEditor::DrawElement() { ImGui::BeginChild("ChildExcludedSequences", ImVec2(0, -8)); for (auto seqInfo : AudioCollection::Instance->GetExcludedSequences()) { if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) { - if (ImGui::ArrowButton(seqInfo->sfxKey.c_str(), ImGuiDir_Left)) { + if (ImGui::Button(std::string(ICON_FA_PLUS "##" + seqInfo->sfxKey).c_str())) { seqsToInclude.insert(seqInfo); } ImGui::SameLine(); From 82d87ff680d0933c6dbd2fd083b69ac31c92c14e Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:28:27 +0100 Subject: [PATCH 05/77] Clear Cutscene Pointer Button/Cheat (#2837) * clear custcene pointer button * now use RawAction for button * add button to new menu bar --- soh/soh/Enhancements/game-interactor/GameInteractor.h | 1 + .../game-interactor/GameInteractor_RawAction.cpp | 7 +++++++ soh/soh/SohMenuBar.cpp | 7 ++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index 04f021983..e49c99d22 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -229,6 +229,7 @@ public: static void EmulateRandomButtonPress(uint32_t chancePercentage = 100); static void SetRandomWind(bool active); static void SetPlayerInvincibility(bool active); + static void ClearCutscenePointer(); static GameInteractionEffectQueryResult SpawnEnemyWithOffset(uint32_t enemyId, int32_t enemyParams); static GameInteractionEffectQueryResult SpawnActor(uint32_t actorId, int32_t actorParams); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp index 864eef427..1dedc3fa1 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp @@ -542,6 +542,13 @@ void GameInteractor::RawAction::SetPlayerInvincibility(bool active) { } } +/// Clears the cutscene pointer to a value safe for wrong warps. +void GameInteractor::RawAction::ClearCutscenePointer() { + if (!gPlayState) return; + static uint32_t null_cs[] = {0, 0}; + gPlayState->csCtx.segment = &null_cs; +} + GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnEnemyWithOffset(uint32_t enemyId, int32_t enemyParams) { if (!GameInteractor::CanSpawnActor()) { diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index f129e0118..ec663c6b4 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -1354,7 +1354,12 @@ void DrawCheatsMenu() { if (ImGui::Button("Change Age")) { CVarSetInteger("gSwitchAge", 1); } - UIWidgets::Tooltip("Switches Link's age and reloads the area."); + UIWidgets::Tooltip("Switches Link's age and reloads the area."); + + if (ImGui::Button("Clear Cutscene Pointer")) { + GameInteractor::RawAction::ClearCutscenePointer(); + } + UIWidgets::Tooltip("Clears the cutscene pointer to a value safe for wrong warps."); ImGui::EndMenu(); } From b1f0c964d29ff5edc72fe6fad894b01196fa1da0 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:34:37 +0100 Subject: [PATCH 06/77] Item Tracker Combo Button Fix (#3231) * let words be small * change >=1 to >0 --- soh/soh/UIWidgets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/UIWidgets.cpp b/soh/soh/UIWidgets.cpp index 694c025c7..64d94cc69 100644 --- a/soh/soh/UIWidgets.cpp +++ b/soh/soh/UIWidgets.cpp @@ -240,7 +240,7 @@ namespace UIWidgets { std::string comboName = std::string("##") + std::string(cvarName); if (ImGui::BeginCombo(comboName.c_str(), comboArray[selected])) { for (uint8_t i = 0; i < comboArray.size(); i++) { - if (strlen(comboArray[i]) > 1) { + if (strlen(comboArray[i]) > 0) { if (ImGui::Selectable(comboArray[i], i == selected)) { CVarSetInteger(cvarName, i); selected = i; From 70a83f647fa5927d69ea10ff99af24b5ef657095 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Wed, 4 Oct 2023 08:03:36 -0700 Subject: [PATCH 07/77] Check Tracker Update (#2668) * Initial commit. What works so far: Data file loads, saves, deletes, and is created properly. - Need to run `HasItemBeenCollected` when creating in case of mid-seed regen. Organized checks into maps set by area. Areas show in tracker. - Checks pulled from checkObjectsByArea are not currently listed. - Areas are being assumed completed and hidden at the start. * Checks now populate. Still not counting area totals properly. * Don't track RC_LINKS_POCKET in the data file, and instead manually add it in every time a save is load. rcObjects doesn't contain Link's Pocket location (duh). * Moved ItemReceive hook to randomizer_check_tracker.cpp. Skipped items are properly sorted and formatted. Saved items contribute to an area's gotten/skipped checks on load. Changed skipped items default main color to gray. General code cleanup. * Skipped checks now contribute to area totals for area completion logic. * Mid-menu rework transfer. * Started check lookup on item receive. Tried to enable scum checking on save. * Fixed scum check on save. * More code cleanup, which revealed some issues with loading and saving. Loading now works 100%, but entries in checkTrackerData are disappearing in code somewhere, causing issues with later checks. Scummed color now displays properly. Collected but unsaved displays properly. Unchecked, Skipped, Seen and Scummed checks all have arrows for skipping/unskipping. Counts a little messed up, probably double adding skips. * Fixed item counts being off across resets. Restarts were fine. * Beginning of rework for individual check updates. Adds `Actor lastCheck` to PlayState to allow assigning of last actor to give an item. This allows precise tracking of GS, freestanding PoH, etc. Works for chests too. Currently does not work for shops, unknown for normal NPC gives. Doesn't track last gives for non-checks, like drops from grass, pots, crates, etc. * Actor-based checks fully fleshed out, but can't help with sale-based checks. Implemented `pendingSaleCheck` to back out of an RC check cycle if `gSaveContext->pendingSale` is not NONE when `OnItemReceive` is called, processed through `OnSaleEnd`. This should be the final change necessary to streamline the checks. * Temporary hook to message box close to tie in trackers for non-gs/chest actors that aren't added to `GetCheckFromActor`. This triggers a 2-frame countdown to check with `HasItemBeenCollected` since half of the methods in there aren't updated until after a text box closes. Added scene tracking to get last scene so that checks in scenes that span several overworld areas could be tied to their areas properly. Modified tracker data creation to apply Link's Pocket and Song from Impa conditionally based on randomizer settings instead of just being assumed to be done. May need modification for checking click and drag spoiler loading. Removed the scene equivalence check from CheckChecks so that an entire area is checked each time to avoid issues with, e.g., leaving a shop before a pending sale finishes. * Changed check data creation to use RSKs from gRandomizer to account for settings loaded from drag and drop spoilers. * Beginning of tracker code organization. Changed check color defaults. * Reverted moving tracker colors to header. Some individual check fixes. * Missed something from previous merge? * Removed last remnant of removed performance mode. * Better handle checking when skullsanity is off. * Song checks sceneIDs don't match the scenes they're actually in for some reason. Removed that check. * SaleEnd checks don't need the GetItemEntry parameter. Also set a flag that should prevent the check tracker from running during vanilla saves should that not be resolved by the time it's merged. * Attempting to have only the relevant checks added to the tracker data, as well as showing vanilla checks for non-rando saves. Not working yet (everything is displayed in vanilla). * Added vanilla check tracker population via `vanillaCheck` bool in `RandomizerCheckObject`. This is also added to `IsVisibleInImGui` to handle file loading and saving to eliminate checks that aren't part of vanilla or the rando seed. Implemented deleted tracker data file recreation. Added some extra item name text checks. Songs are still... tricky, so they stay blank. Utilize local copies of the randomizer check objects that are applicable for performance purposes. Fixed vanilla item-giving cutscene crashes when triggered mid-transition. * Apparently not all toolchains can handle macro instantiation without all parameters, like VS can. * Fixed scummed detail color not showing properly on tracker. * Fixed dungeon area totals and GS checks not functioning properly. * Major revamp of checking code. Doesn't rely on `GetCheckFromActor` at all anymore, but instead simply sets a flag to evaluate a number of checks in an area every frame until the check that was gotten is identified. With the new setup, it's much less hardware intensive, and at 60fps 6 checks per frame shows no noticeable effect on framerate. I can envision needing to add a collectedCount in order to account for times when two checks are gotten one right after the other. Changed area scroll to happen from `OnTransitionEnd`, and allow for scrolling in bazaar (was disabled previously because it would jump back and forth between Kak and Market while you were in one). Also setup area check order updating by area instead of all at the same time. * Fixed shooting gallery not reporting proper area. Prevent checks from actually happening if area is RCAREA_INVALID, now that all areas are reporting something if they have checks. Fixed `GetCheckArea()` not updating checks for standard scenes. Lots of vanilla tracking updates, mainly manual checks for gems, medallions and songs, since the often don't have proper scenes in the data. Prevent vanilla from triggering check loops if junk items are collected. Fixed sorting based on saved vs collected. Prevent item name display for vanilla runs. Change coloring of checks so the check name reflects status in vanilla runs. * Fixed "Recheck Area" button erroneously adding to an area's check totals? * Fix DMC vanilla checks. * Fix check tracker data recreation on data file loss. Removed redundant file exists check from SaveTrackerDataHook, as it doesn't matter if it exists or not at that point. Limited check loops to 3 to avoid infinite check loops on non-check/junk item pickup. Added more checks to disable tracker operations if a save is not running. Changed check ordering to put boss reward and heart container checks at the end of whatever RCSHOW group they belong to. * Fixed IsRunning calculation. Further improving vanilla checking. Starting framework for checking medallions, stones, and songs on data file recreation. Fixed medallion check collection. Added GIFT_FROM_SAGES to check list for vanilla file for tracking light medallion. Added check loop limitation to prevent infinite checking after picking up junk item from the ground. * Finished vanilla file recreation and recheck (songs and dungeon rewards all check properly now). This includes deku shield with KF shop item 3. Finished Gift from Raoru light medallion tracking for vanilla. Commented all CheckByScene functionality for now. * Fixed new save data file creation. Disabled entrance area calculation for now, as it only tracks the previous entrance for some reason. Fixed area detection for ToT checks. * GetCheckArea() now utilizes EntranceData almost exclusively, via either `gSaveContext.entranceIndex` or the entrance tracker's `currentGrottoId` in the case of grottos. This also means that EVERYTHING CAN AUTOSCROLL NOW. Entrance shuffles are now much easier to track. Autoscroll is now also triggered on save, just in case someone isn't autosaving and has a lot of checks that get converted to saved. * Fixed missing GS check in LW. * Added area scroll on toggling Show Hidden Items. May configure differently later. Fixed area detection for entrances in Gerudo Fortress/Valley and Collossus. Haunted wasteland doesn't autoscroll due to a bug in `OnTransitionEnd` hook, but checks still evaluate properly there. Rely on scene-based area detection if scene is a main overworld or dungeon scene. * Fixed grotto detection when shuffle is off. * Small code cleanup. Fixed Colossus hand chest checks. * Missing lus bump from merge conflict resolution * Fixed Colossus Grotto making `GetCheckArea` return Wasteland. * Improved OnItemReceive processing for non-token GS checks, since they can sometimes take long enough for the checking process to time out before the item is registered as received. * First attempt at thread safety for tracker data file writing. Seems to work, but might need more testing. * Fixed Recheck Area not unskipping items that register as saved. Improved delayed saving with autosaving, as the autosave triggered quite often before the tracker data save, making things not properly register as saved. * merge cleanup * Converted check tracker data to the sectional saves, adding `CheckTrackerData` to `SaveContext`. Implemented section ID returning and fullSave boolean passing to section functions from my PR temporarily for it to work properly. Moved `RandomizerCheckTrackerData` enum to `randomizerTypes.h` to accommodate that. Changed `Randomizer_SaveInit` to a `SaveManager::InitFunc` to allow for other randomizer-dependent sections to be initialized after that. Required a little refactoring to maintain intro cutscene skip when starting a randomizer file. * Revert section index return and randomizer init changes. Will need to wait on yet more changes to main. * Fixed check tracker initialization (shouldn't be tied to window initialization), restored saving/loading functionality. * Removed `CheckTracker::Init` and put SaveManager calls in `CheckTrackerWindow::InitElement`. Also a bit of cleanup from transition back to save file use. * Fixed tracker displaying check categories while file not loaded. * Fix Darunia's Joy check not marking in vanilla. * Fix autosave not triggering change from collected to saved in tracker data. * Changed default colors for scummed and collected display. * Merge upgrade code cleanup. * Add `OnTransitionEnd` calls to sandstorm transitions both to and from Wasteland. Also improved `gSaveContext.lastScene` assignment for both transition types. Allowed a bit of cleanup in `GetCheckArea`. * Added `StateButton`, a button like `ArrowButton` but that allows text instead of arrow icons. Apparently the changes from ArrowButton to StateButton happened in a previous commit... * Changed section name to `trackerDataCheck` to force SoH to load it after the randomizer section, as it required some randoSettings to be loaded first, and nothing else I tried to make the randomizer section load before it worked. This hacks a solution to checks not displaying on fast file load to a specific slot. F*** you, SaveManager, and f*** you too, JSON. * Forgot to change the section string for loading with the name change. * Fix check ordering for checks that trigger the autosave. * Adds option to remove right-side shop items (slots 1-4) from the tracker list. Enabled by default. * Fix default state of Hide Shop Right Checks checkbox. * Fixes grotto and great fairy scrolling and checks. Fixes array overflow from `checkTrackerData` which was creating the issue trying to load the base and randomizer sections first, among other things. That also fixed the massive file loads that were being exhibited in debug mode. * Fix shooting galleries being set as collected again when being played a second time after getting the checks. * Fix Bazaar autoscroll. * Add Saria's Song to `GetCheckFromActor` and removed some limitations from the messageCloseCheck function to make that check track properly. * Fix Song from Impa check. Implemented prevention for multiple "collections" of great fairies, just in case getting the health refill would trigger it with the previous setup. * Fix ice traps on GS tokens not triggering OnItemReceive. * Complete fix for ice trap collection from GS. Add autoscroll when clicking "Expand All". * Add `OnShopSlotChange` with cursorSlot and basePrice parameters. * Fixed include in en_ossan for shop slot hook. Added registration for `OnShopSlotChange` in the tracker, storing the price in a new `price` field in `CheckTrackerData`. Added "seen" functionality to shop checks. Displays the model item name upon first entering a shop, adding the price and switching to trickName (if it's an ice trap) upon navigating to the slot in buy mode, triggered by an invisible "identified" status that mirrors "seen" in every other way. Added tooltips to most options for check tracker color picking to describe what each status actually means. * `std::format` pls * So apparently std::format just decided to break with the latest merge from develop, but fmt::format exists and works? * Removed the last vestiges of `locationsSkipped`. Other general code and formatting cleanups. Moved `IsGameRunning` to `OTRGlobals` so the item tracker could also access it. Used preceding to "fix" item and bottle display in the item tracker on startup. * Some more code cleanup. Removed "Recheck Area" button and relevant code. Backported changes to Anchor branch applicable for single-player, including making a checkAreas vector and structuring the frame by frame checks around that. Also includes fix for Silver Gauntlets and Mirror Shield check collection crash associated with those changes. Fixed Kakariko Bazaar "seen" updates. Fixed tracker window not showing on initial load like it should. * Forgot 1 formatting fix. * Removed conditions for showing Song from Impa (isn't junk under certain conditions, so should show all the time). * Fix vanilla checks, add Zelda's Letter and Malon's Egg to manual check collection. Fix autoscroll while in child stealth section. * Fix crash in Happy Mask Shop in OnSlotChange (referenced non-existent shop id in a tracker-specific enum). * General code cleanup. * Missed one reversion. * One more. * Fix column alignment in `randomizer_check_objects`. * Fix file encoding on `randomizer_check_tracker`. Again. * Fix indentation for `actualItemtrackerItemMap`. Also removed unnecessary parts of the map. * Rename `HasEqItem` to `HasEquipment`. * Slightly better indentation for `actualItemTrackerItemMap`. * Add magic bean salesman to vanilla check tracking, and genericized deku shield to trigger KF shop item 3 wherever you get the shield. Renamed `vanillaCheck` to `vanillaHundoCheck` to (supposedly) clarify the meaning of the usage. * One more rename to `vanillaCompletion` to avoid possible confusion with 100% speedrun conditions. * give me a break XD Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Changes suggested by briaguya (rename `RandomizerCheckShow` to `Status`, unused code, newline formatting) * Remove unused `itemNames` table. * Remove `IsGameRunning` in favor of `GameInteractor::IsSaveLoaded`. * Restore anti-spoiler functionality for dungeons with dungeon maps. * Review cleanup. * Fix prices not showing for Kak bazaar items. --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> --- soh/include/z64save.h | 2 +- .../game-interactor/GameInteractor.h | 1 + .../game-interactor/GameInteractor_Hooks.cpp | 4 + .../game-interactor/GameInteractor_Hooks.h | 1 + soh/soh/Enhancements/gameplaystats.cpp | 9 - .../Enhancements/randomizer/randomizer.cpp | 44 +- soh/soh/Enhancements/randomizer/randomizer.h | 2 +- .../Enhancements/randomizer/randomizerTypes.h | 17 + .../randomizer/randomizer_check_objects.cpp | 3 + .../randomizer/randomizer_check_tracker.cpp | 1568 +++++++++++------ .../randomizer/randomizer_check_tracker.h | 28 +- .../randomizer_entrance_tracker.cpp | 10 +- .../randomizer/randomizer_entrance_tracker.h | 6 +- .../randomizer/randomizer_item_tracker.cpp | 4 +- soh/soh/OTRGlobals.cpp | 4 + soh/soh/OTRGlobals.h | 1 + soh/soh/SaveManager.cpp | 3 - soh/soh/UIWidgets.cpp | 44 + soh/soh/UIWidgets.hpp | 1 + soh/src/code/z_message_PAL.c | 1 + soh/src/code/z_play.c | 7 + .../overlays/actors/ovl_En_Ossan/z_en_ossan.c | 5 + 22 files changed, 1177 insertions(+), 588 deletions(-) diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 8d3acf22f..4b87a179a 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -92,7 +92,6 @@ typedef struct { /* */ u32 count[COUNT_MAX]; /* */ u32 entrancesDiscovered[SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT]; /* */ u32 scenesDiscovered[SAVEFILE_SCENES_DISCOVERED_IDX_COUNT]; - /* */ u8 locationsSkipped[RC_MAX]; /* */ bool rtaTiming; /* */ uint64_t fileCreatedAt; } SohStats; @@ -292,6 +291,7 @@ typedef struct { /* */ SohStats sohStats; /* */ u8 temporaryWeapon; /* */ FaroresWindData backupFW; + /* */ RandomizerCheckTrackerData checkTrackerData[RC_MAX]; // #endregion // #region SOH [Randomizer] // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index e49c99d22..ae711c093 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -159,6 +159,7 @@ public: DEFINE_HOOK(OnSceneSpawnActors, void()); DEFINE_HOOK(OnPlayerUpdate, void()); DEFINE_HOOK(OnOcarinaSongAction, void()); + DEFINE_HOOK(OnShopSlotChange, void(uint8_t cursorIndex, int16_t price)); DEFINE_HOOK(OnActorInit, void(void* actor)); DEFINE_HOOK(OnActorUpdate, void(void* actor)); DEFINE_HOOK(OnActorKill, void(void* actor)); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index 1cb6f48a8..13df133a0 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -58,6 +58,10 @@ void GameInteractor_ExecuteOnOcarinaSongAction() { GameInteractor::Instance->ExecuteHooks(); } +void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price) { + GameInteractor::Instance->ExecuteHooks(cursorIndex, price); +} + void GameInteractor_ExecuteOnActorInit(void* actor) { GameInteractor::Instance->ExecuteHooks(actor); } diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index b23b64798..47114a300 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -24,6 +24,7 @@ void GameInteractor_ExecuteOnActorKill(void* actor); void GameInteractor_ExecuteOnEnemyDefeat(void* actor); void GameInteractor_ExecuteOnPlayerBonk(); void GameInteractor_ExecuteOnOcarinaSongAction(); +void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price); void GameInteractor_ExecuteOnPlayDestroy(); void GameInteractor_ExecuteOnPlayDrawEnd(); diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp index ea95afe8e..31bf36d3c 100644 --- a/soh/soh/Enhancements/gameplaystats.cpp +++ b/soh/soh/Enhancements/gameplaystats.cpp @@ -334,9 +334,6 @@ void LoadStatsVersion1() { SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.sohStats.entrancesDiscovered), [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.sohStats.entrancesDiscovered[i]); }); - SaveManager::Instance->LoadArray("locationsSkipped", ARRAY_COUNT(gSaveContext.sohStats.locationsSkipped), [](size_t i) { - SaveManager::Instance->LoadData("", gSaveContext.sohStats.locationsSkipped[i]); - }); } void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) { @@ -378,9 +375,6 @@ void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) { SaveManager::Instance->SaveArray("entrancesDiscovered", ARRAY_COUNT(saveContext->sohStats.entrancesDiscovered), [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->sohStats.entrancesDiscovered[i]); }); - SaveManager::Instance->SaveArray("locationsSkipped", ARRAY_COUNT(saveContext->sohStats.locationsSkipped), [&](size_t i) { - SaveManager::Instance->SaveData("", saveContext->sohStats.locationsSkipped[i]); - }); } void GameplayStatsRow(const char* label, const std::string& value, ImVec4 color = COLOR_WHITE) { @@ -688,9 +682,6 @@ void InitStats(bool isDebug) { for (int entrancesIdx = 0; entrancesIdx < ARRAY_COUNT(gSaveContext.sohStats.entrancesDiscovered); entrancesIdx++) { gSaveContext.sohStats.entrancesDiscovered[entrancesIdx] = 0; } - for (int rc = 0; rc < ARRAY_COUNT(gSaveContext.sohStats.locationsSkipped); rc++) { - gSaveContext.sohStats.locationsSkipped[rc] = 0; - } strncpy(gSaveContext.sohStats.buildVersion, (const char*) gBuildVersion, sizeof(gSaveContext.sohStats.buildVersion) - 1); gSaveContext.sohStats.buildVersion[sizeof(gSaveContext.sohStats.buildVersion) - 1] = 0; diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 78a9d0525..3e9c0f7c5 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -6,10 +6,9 @@ #include #include #include -#include +#include #include #include -#include #include "3drando/rando_main.hpp" #include "3drando/random.hpp" #include "../../UIWidgets.hpp" @@ -21,14 +20,16 @@ #include #include "randomizer_check_objects.h" #include "randomizer_tricks.h" +#include "randomizer_check_tracker.h" #include #include #include #include "draw.h" #include "rando_hash.h" +#include "soh/Enhancements/game-interactor/GameInteractor.h" #include -#include #include "randomizer_settings_window.h" +#include "savefile.h" extern "C" uint32_t ResourceMgr_IsGameMasterQuest(); extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum); @@ -48,6 +49,8 @@ std::set excludedLocations; std::set enabledTricks; std::set enabledGlitches; +std::set> checkTrackerStates; + u8 generated; char* seedString; @@ -133,18 +136,6 @@ Randomizer::Randomizer() { item.GetName().french, }; } - for (auto area : rcAreaNames) { - SpoilerfileAreaNameToEnum[area.second] = area.first; - } - SpoilerfileAreaNameToEnum["Inside Ganon's Castle"] = RCAREA_GANONS_CASTLE; - SpoilerfileAreaNameToEnum["the Lost Woods"] = RCAREA_LOST_WOODS; - SpoilerfileAreaNameToEnum["the Market"] = RCAREA_MARKET; - SpoilerfileAreaNameToEnum["the Graveyard"] = RCAREA_GRAVEYARD; - SpoilerfileAreaNameToEnum["Haunted Wasteland"] = RCAREA_WASTELAND; - SpoilerfileAreaNameToEnum["outside Ganon's Castle"] = RCAREA_HYRULE_CASTLE; - for (auto [type, name] : hintTypeNames) { - SpoilerfileHintTypeNameToEnum[name] = type; - } } Sprite* Randomizer::GetSeedTexture(uint8_t index) { @@ -2601,6 +2592,11 @@ RandomizerCheckObject Randomizer::GetCheckObjectFromActor(s16 actorId, s16 scene if((actorParams & 0xF) < 10) specialRc = RC_MARKET_TREASURE_CHEST_GAME_ITEM_5; } break; + case SCENE_SACRED_FOREST_MEADOW: + if (actorId == ACTOR_EN_SA) { + specialRc = RC_SONG_FROM_SARIA; + } + break; case SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY: case SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT: case SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS: @@ -4106,9 +4102,8 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::PopItemWidth(); switch (CVarGetInteger("gRandomizeShuffleKeyRings", RO_KEYRINGS_OFF)) { case RO_KEYRINGS_COUNT: - maxKeyringCount = - (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL && - CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8; + maxKeyringCount = (CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) == RO_GF_NORMAL && + CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) != RO_GERUDO_KEYS_VANILLA) ? 9 : 8; UIWidgets::PaddedEnhancementSliderInt("Key Ring Count: %d", "##RandomizeShuffleKeyRingsRandomCount", "gRandomizeShuffleKeyRingsRandomCount", 1, @@ -4117,7 +4112,7 @@ void RandomizerSettingsWindow::DrawElement() { case RO_KEYRINGS_SELECTION: disableGFKeyring = CVarGetInteger("gRandomizeGerudoFortress", RO_GF_NORMAL) != RO_GF_NORMAL || CVarGetInteger("gRandomizeGerudoKeys", RO_GERUDO_KEYS_VANILLA) == RO_GERUDO_KEYS_VANILLA; - UIWidgets::EnhancementCheckbox( "Gerudo Fortress##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsGerudoFortress", + UIWidgets::EnhancementCheckbox("Gerudo Fortress##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsGerudoFortress", disableGFKeyring, "Disabled because the currently selected Gerudo Fortress Carpenters\n setting and/or Gerudo Fortress Keys setting is incompatible with \nhaving a Gerudo Fortress keyring."); UIWidgets::EnhancementCheckbox("Forest Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsForestTemple"); UIWidgets::EnhancementCheckbox("Fire Temple##RandomizeShuffleKeyRings", "gRandomizeShuffleKeyRingsFireTemple"); @@ -4397,15 +4392,13 @@ void RandomizerSettingsWindow::DrawElement() { UIWidgets::PaddedSeparator(); // Complete mask quest - UIWidgets::EnhancementCheckbox(Settings::CompleteMaskQuest.GetName().c_str(), - "gRandomizeCompleteMaskQuest"); + UIWidgets::EnhancementCheckbox(Settings::CompleteMaskQuest.GetName().c_str(), "gRandomizeCompleteMaskQuest"); UIWidgets::InsertHelpHoverText("Once the happy mask shop is opened, all masks will be available to be borrowed."); UIWidgets::PaddedSeparator(); // Skip Scarecrow Song - UIWidgets::EnhancementCheckbox(Settings::FreeScarecrow.GetName().c_str(), - "gRandomizeSkipScarecrowsSong"); + UIWidgets::EnhancementCheckbox(Settings::FreeScarecrow.GetName().c_str(), "gRandomizeSkipScarecrowsSong"); UIWidgets::InsertHelpHoverText( "Start with the ability to summon Pierre the scarecrow. Pulling out an ocarina in the usual locations will automatically summon him." ); @@ -5220,12 +5213,13 @@ void RandomizerSettingsWindow::DrawElement() { UIWidgets::EnhancementCheckbox(Settings::StartingSongOfTime.GetName().c_str(), "gRandomizeStartingSongOfTime"); UIWidgets::EnhancementCheckbox(Settings::StartingSongOfStorms.GetName().c_str(), "gRandomizeStartingSongOfStorms"); UIWidgets::PaddedSeparator(); + ImGui::Text("Warp Songs"); UIWidgets::PaddedSeparator(); - UIWidgets::EnhancementCheckbox(Settings::StartingMinuetOfForest.GetName().c_str(), "gRandomizeStartingMinuetOfForest"); + UIWidgets::EnhancementCheckbox(Settings::StartingMinuetOfForest.GetName().c_str(), "gRandomizeStartingMinuetOfForest"); UIWidgets::EnhancementCheckbox(Settings::StartingBoleroOfFire.GetName().c_str(), "gRandomizeStartingBoleroOfFire"); UIWidgets::EnhancementCheckbox(Settings::StartingSerenadeOfWater.GetName().c_str(), "gRandomizeStartingSerenadeOfWater"); - UIWidgets::EnhancementCheckbox(Settings::StartingRequiemOfSpirit.GetName().c_str(), "gRandomizeStartingRequiemOfSpirit"); + UIWidgets::EnhancementCheckbox(Settings::StartingRequiemOfSpirit.GetName().c_str(), "gRandomizeStartingRequiemOfSpirit"); UIWidgets::EnhancementCheckbox(Settings::StartingNocturneOfShadow.GetName().c_str(), "gRandomizeStartingNocturneOfShadow"); UIWidgets::EnhancementCheckbox(Settings::StartingPreludeOfLight.GetName().c_str(), "gRandomizeStartingPreludeOfLight"); UIWidgets::PaddedSeparator(); diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h index 82347d994..a726cecde 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.h +++ b/soh/soh/Enhancements/randomizer/randomizer.h @@ -38,7 +38,6 @@ class Randomizer { void ParseItemLocationsFile(const char* spoilerFileName, bool silent); void ParseEntranceDataFile(const char* spoilerFileName, bool silent); bool IsItemVanilla(RandomizerGet randoGet); - GetItemEntry GetItemEntryFromRGData(RandomizerGetData rgData, GetItemID ogItemId, bool checkObtainability = true); int16_t GetVanillaMerchantPrice(RandomizerCheck check); public: @@ -78,6 +77,7 @@ class Randomizer { RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc); RandomizerGetData GetRandomizerGetDataFromActor(s16 actorId, s16 sceneNum, s16 actorParams); RandomizerGetData GetRandomizerGetDataFromKnownCheck(RandomizerCheck randomizerCheck); + GetItemEntry GetItemEntryFromRGData(RandomizerGetData rgData, GetItemID ogItemId, bool checkObtainability = true); std::string GetChildAltarText() const; std::string GetAdultAltarText() const; std::string GetGanonText() const; diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 9d77a9a29..b1e843497 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -20,6 +20,16 @@ typedef struct { uint8_t id; } Sprite; +// Check tracker check visibility categories +typedef enum { + RCSHOW_UNCHECKED, + RCSHOW_SEEN, + RCSHOW_IDENTIFIED, + RCSHOW_SCUMMED, + RCSHOW_COLLECTED, + RCSHOW_SAVED, +} RandomizerCheckStatus; + typedef enum { HINT_TYPE_TRIAL, HINT_TYPE_ALWAYS, @@ -1461,6 +1471,13 @@ typedef enum { RSK_MAX } RandomizerSettingKey; +typedef struct { + RandomizerCheckStatus status; + uint16_t skipped; + int16_t price; + uint16_t hintItem; +} RandomizerCheckTrackerData; + //Generic Settings (any binary option can use this) // off/on typedef enum { diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp index c244baffd..be05be35d 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp @@ -891,6 +891,9 @@ std::map RandomizerCheckObjects::GetAllRCAreaBySce for (int id = (int)SCENE_MARKET_ENTRANCE_DAY; id <= (int)SCENE_MARKET_RUINS; id++) { rcAreaBySceneID[(SceneID)id] = RCAREA_MARKET; } + rcAreaBySceneID[SCENE_TEMPLE_OF_TIME] = RCAREA_MARKET; + rcAreaBySceneID[SCENE_CASTLE_COURTYARD_GUARDS_DAY] = RCAREA_HYRULE_CASTLE; + rcAreaBySceneID[SCENE_CASTLE_COURTYARD_GUARDS_NIGHT] = RCAREA_HYRULE_CASTLE; } return rcAreaBySceneID; } diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 6a7f2dc6c..0884a694f 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -1,4 +1,7 @@ #include "randomizer_check_tracker.h" +#include "randomizer_entrance_tracker.h" +#include "randomizer_item_tracker.h" +#include "randomizerTypes.h" #include "../../OTRGlobals.h" #include "../../UIWidgets.hpp" @@ -8,8 +11,7 @@ #include #include "3drando/item_location.hpp" #include "soh/Enhancements/game-interactor/GameInteractor.h" -#include "randomizerTypes.h" - +#include "z64item.h" extern "C" { #include "variables.h" @@ -18,58 +20,123 @@ extern "C" { extern PlayState* gPlayState; } extern "C" uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum); +extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 modIndex, s16 getItemID); + +extern std::vector dungeonRewardStones; +extern std::vector dungeonRewardMedallions; +extern std::vector songItems; +extern std::vector equipmentItems; + +#define RCO_RAORU { RC_GIFT_FROM_SAGES, RCVORMQ_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Gift from Raoru", "Gift from Raoru", true }; + +using json = nlohmann::json; + +void to_json(json& j, const RandomizerCheckTrackerData& rctd) { + j = json { + { "status", rctd.status == RCSHOW_COLLECTED ? RCSHOW_SAVED : rctd.status }, + { "skipped", rctd.skipped }, + { "price", rctd.price }, + { "hintItem", rctd.hintItem }}; + } + +void from_json(const json& j, RandomizerCheckTrackerData& rctd) { + j.at("status").get_to(rctd.status); + j.at("skipped").get_to(rctd.skipped); + j.at("hintItem").get_to(rctd.hintItem); + j.at("price").get_to(rctd.price); +} namespace CheckTracker { -void Teardown(); -void InitializeChecks(); -void UpdateChecks(); -void UpdateInventoryChecks(); -void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckStatus); +// settings +bool showShops; +bool showOverworldTokens; +bool showDungeonTokens; +bool showBeans; +bool showScrubs; +bool showMerchants; +bool showCows; +bool showAdultTrade; +bool showKokiriSword; +bool showWeirdEgg; +bool showGerudoCard; +bool showFrogSongRupees; +bool showStartingMapsCompasses; +bool showKeysanity; +bool showGerudoFortressKeys; +bool showBossKeysanity; +bool showGanonBossKey; +bool showOcarinas; +bool show100SkullReward; +bool showLinksPocket; +bool fortressFast; +bool fortressNormal; + +bool bypassRandoCheck = true; +// persistent during gameplay +bool initialized; +bool doAreaScroll; +bool previousShowHidden = false; +bool hideShopRightChecks = true; + +bool checkCollected = false; +int checkLoops = 0; +int checkCounter = 0; +u16 savedFrames = 0; +bool messageCloseCheck = false; +bool pendingSaleCheck = false; +bool transitionCheck = false; + +std::map startingShopItem = { { SCENE_KOKIRI_SHOP, RC_KF_SHOP_ITEM_1 }, + { SCENE_BAZAAR, RC_MARKET_BAZAAR_ITEM_1 }, + { SCENE_POTION_SHOP_MARKET, RC_MARKET_POTION_SHOP_ITEM_1 }, + { SCENE_BOMBCHU_SHOP, RC_MARKET_BOMBCHU_SHOP_ITEM_1 }, + { SCENE_POTION_SHOP_KAKARIKO, RC_KAK_POTION_SHOP_ITEM_1 }, + { SCENE_ZORA_SHOP, RC_ZD_SHOP_ITEM_1 }, + { SCENE_GORON_SHOP, RC_GC_SHOP_ITEM_1 } }; + +std::map RCAreaFromSceneID = { + {SCENE_DEKU_TREE, RCAREA_DEKU_TREE}, + {SCENE_DODONGOS_CAVERN, RCAREA_DODONGOS_CAVERN}, + {SCENE_JABU_JABU, RCAREA_JABU_JABUS_BELLY}, + {SCENE_FOREST_TEMPLE, RCAREA_FOREST_TEMPLE}, + {SCENE_FIRE_TEMPLE, RCAREA_FIRE_TEMPLE}, + {SCENE_WATER_TEMPLE, RCAREA_WATER_TEMPLE}, + {SCENE_SHADOW_TEMPLE, RCAREA_SHADOW_TEMPLE}, + {SCENE_SPIRIT_TEMPLE, RCAREA_SPIRIT_TEMPLE}, + {SCENE_BOTTOM_OF_THE_WELL, RCAREA_BOTTOM_OF_THE_WELL}, + {SCENE_ICE_CAVERN, RCAREA_ICE_CAVERN}, + {SCENE_GERUDO_TRAINING_GROUND, RCAREA_GERUDO_TRAINING_GROUND}, + {SCENE_INSIDE_GANONS_CASTLE, RCAREA_GANONS_CASTLE}, +}; + +std::map> checksByArea; +bool areasFullyChecked[RCAREA_INVALID]; +u32 areasSpoiled = 0; +bool showVOrMQ; +s8 areaChecksGotten[32]; //| "Kokiri Forest (4/9)" +bool optCollapseAll; // A bool that will collapse all checks once +bool optExpandAll; // A bool that will expand all checks once +RandomizerCheck lastItemGetCheck = RC_UNKNOWN_CHECK; +RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK; +RandomizerCheckArea previousArea = RCAREA_INVALID; +RandomizerCheckArea currentArea = RCAREA_INVALID; +std::vector checkAreas; +std::vector itemsReceived; +OSContPad* trackerButtonsPressed; + void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0); +bool CompareChecks(RandomizerCheckObject, RandomizerCheckObject); +bool CheckByArea(RandomizerCheckArea); +void DrawLocation(RandomizerCheckObject); void EndFloatWindows(); -void UpdateOrdering(bool init = false); -bool ShouldUpdateChecks(); -bool CompareCheckObject(RandomizerCheckObject i, RandomizerCheckObject j); -bool HasItemBeenCollected(RandomizerCheckObject obj); -bool HasItemBeenSkipped(RandomizerCheckObject obj); +bool HasItemBeenCollected(RandomizerCheck); +void LoadSettings(); void RainbowTick(); -RandomizerCheckShow GetCheckStatus(RandomizerCheckObject rcObj, int idx); - - -Color_RGBA8 Color_Bg_Default = { 0, 0, 0, 255 }; // Black -Color_RGBA8 Color_Main_Default = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Area_Incomplete_Extra_Default = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Area_Complete_Extra_Default = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Unchecked_Extra_Default = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Skipped_Main_Default = { 160, 160, 160, 255 }; // Grey -Color_RGBA8 Color_Skipped_Extra_Default = { 160, 160, 160, 255 }; // Grey -Color_RGBA8 Color_Seen_Extra_Default = { 255, 255, 255, 255 }; // TODO -Color_RGBA8 Color_Hinted_Extra_Default = { 255, 255, 255, 255 }; // TODO -Color_RGBA8 Color_Checked_Extra_Default = { 255, 255, 255, 255 }; // TODO -Color_RGBA8 Color_Scummed_Extra_Default = { 255, 255, 255, 255 }; // TODO -Color_RGBA8 Color_Saved_Extra_Default = { 0, 185, 0, 255 }; // Green - -Color_RGBA8 Color_Background = { 0, 0, 0, 255 }; - -Color_RGBA8 Color_Area_Incomplete_Main = { 255, 255, 255, 255 }; //White -Color_RGBA8 Color_Area_Incomplete_Extra = { 255, 255, 255, 255 }; //White -Color_RGBA8 Color_Area_Complete_Main = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Area_Complete_Extra = { 255, 255, 255, 255 }; // White -Color_RGBA8 Color_Unchecked_Main = { 255, 255, 255, 255 }; //White -Color_RGBA8 Color_Unchecked_Extra = { 255, 255, 255, 255 }; //Useless -Color_RGBA8 Color_Skipped_Main = { 255, 255, 255, 255 }; //Grey -Color_RGBA8 Color_Skipped_Extra = { 255, 255, 255, 255 }; //Grey -Color_RGBA8 Color_Seen_Main = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Seen_Extra = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Hinted_Main = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Hinted_Extra = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Checked_Main = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Checked_Extra = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Scummed_Main = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Scummed_Extra = { 255, 255, 255, 255 }; //TODO -Color_RGBA8 Color_Saved_Main = { 255, 255, 255, 255 }; //White -Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 }; //Green +void UpdateAreas(RandomizerCheckArea area); +void UpdateInventoryChecks(); +void UpdateOrdering(RandomizerCheckArea); +int sectionId; SceneID DungeonSceneLookupByArea(RandomizerCheckArea area) { switch (area) { @@ -89,33 +156,620 @@ SceneID DungeonSceneLookupByArea(RandomizerCheckArea area) { } } -// persistent during gameplay -bool initialized = false; -bool doInitialize = false; -std::map checkStatusMap; -u32 areasFullyChecked = 0; -u32 areasSpoiled = 0; -bool showVOrMQ; -s8 areaChecksTotal[32]; //| For sorting and showing -s8 areaChecksGotten[32]; //| "Kokiri Forest (4/9)" -std::vector checks; -bool optCollapseAll; // A bool that will collapse all checks once -bool optExpandAll; // A bool that will expand all checks once -RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK; -RandomizerCheckArea previousArea = RCAREA_INVALID; -RandomizerCheckArea currentArea = RCAREA_INVALID; +Color_RGBA8 Color_Bg_Default = { 0, 0, 0, 255 }; // Black +Color_RGBA8 Color_Main_Default = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Area_Incomplete_Extra_Default = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Area_Complete_Extra_Default = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Unchecked_Extra_Default = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Skipped_Main_Default = { 160, 160, 160, 255 }; // Grey +Color_RGBA8 Color_Skipped_Extra_Default = { 160, 160, 160, 255 }; // Grey +Color_RGBA8 Color_Seen_Extra_Default = { 255, 255, 255, 255 }; // TODO +Color_RGBA8 Color_Hinted_Extra_Default = { 255, 255, 255, 255 }; // TODO +Color_RGBA8 Color_Collected_Extra_Default = { 242, 101, 34, 255 }; // Orange +Color_RGBA8 Color_Scummed_Extra_Default = { 0, 174, 239, 255 }; // Blue +Color_RGBA8 Color_Saved_Extra_Default = { 0, 185, 0, 255 }; // Green + +Color_RGBA8 Color_Background = { 0, 0, 0, 255 }; + +Color_RGBA8 Color_Area_Incomplete_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Area_Incomplete_Extra = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Area_Complete_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Area_Complete_Extra = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Unchecked_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Unchecked_Extra = { 255, 255, 255, 255 }; // Useless +Color_RGBA8 Color_Skipped_Main = { 160, 160, 160, 255 }; // Grey +Color_RGBA8 Color_Skipped_Extra = { 160, 160, 160, 255 }; // Grey +Color_RGBA8 Color_Seen_Main = { 255, 255, 255, 255 }; // TODO +Color_RGBA8 Color_Seen_Extra = { 160, 160, 160, 255 }; // TODO +Color_RGBA8 Color_Hinted_Main = { 255, 255, 255, 255 }; // TODO +Color_RGBA8 Color_Hinted_Extra = { 255, 255, 255, 255 }; // TODO +Color_RGBA8 Color_Collected_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Collected_Extra = { 242, 101, 34, 255 }; // Orange +Color_RGBA8 Color_Scummed_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Scummed_Extra = { 0, 174, 239, 255 }; // Blue +Color_RGBA8 Color_Saved_Main = { 255, 255, 255, 255 }; // White +Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 }; // Green std::vector buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L, BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; +void SetLastItemGetRC(RandomizerCheck rc) { + lastItemGetCheck = rc; +} + +void DefaultCheckData(RandomizerCheck rc) { + gSaveContext.checkTrackerData[rc].status = RCSHOW_UNCHECKED; + gSaveContext.checkTrackerData[rc].skipped = 0; + gSaveContext.checkTrackerData[rc].hintItem = RC_UNKNOWN_CHECK; +} + +void SongFromImpa() { + if (IS_RANDO) { + if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SKIP_CHILD_ZELDA) == RO_GENERIC_ON && IS_RANDO) { + if (gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status != RCSHOW_SAVED) { + gSaveContext.checkTrackerData[RC_SONG_FROM_IMPA].status = RCSHOW_SAVED; + } + } + } +} + +void GiftFromSages() { + if (!IS_RANDO) { + DefaultCheckData(RC_GIFT_FROM_SAGES); + } +} + +std::vector checks; +// Function for adding Link's Pocket check +void LinksPocket() { + if (IS_RANDO) { + if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING || + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DUNGEON_REWARDS) == RO_DUNGEON_REWARDS_END_OF_DUNGEON) { + DefaultCheckData(RC_LINKS_POCKET); + gSaveContext.checkTrackerData[RC_LINKS_POCKET].status = RCSHOW_SAVED; + } + } +} + +void TrySetAreas() { + if (checksByArea.empty()) { + for (int i = RCAREA_KOKIRI_FOREST; i < RCAREA_INVALID; i++) { + checksByArea.emplace(static_cast(i), std::vector()); + } + } +} + +void SetCheckCollected(RandomizerCheck rc) { + gSaveContext.checkTrackerData[rc].status = RCSHOW_COLLECTED; + RandomizerCheckObject rcObj; + if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) { + rcObj = RCO_RAORU; + } else { + rcObj = RandomizerCheckObjects::GetAllRCObjects().find(rc)->second; + } + if (!gSaveContext.checkTrackerData[rc].skipped) { + areaChecksGotten[rcObj.rcArea]++; + } else { + gSaveContext.checkTrackerData[rc].skipped = false; + } + if (!checkAreas.empty()) { + checkAreas.erase(checkAreas.begin()); + } + SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true); + + doAreaScroll = true; + UpdateOrdering(rcObj.rcArea); + UpdateInventoryChecks(); +} + +bool IsAreaScene(SceneID sceneNum) { + switch (sceneNum) { + case SCENE_HYRULE_FIELD: + case SCENE_KAKARIKO_VILLAGE: + case SCENE_GRAVEYARD: + case SCENE_ZORAS_RIVER: + case SCENE_KOKIRI_FOREST: + case SCENE_SACRED_FOREST_MEADOW: + case SCENE_LAKE_HYLIA: + case SCENE_ZORAS_DOMAIN: + case SCENE_ZORAS_FOUNTAIN: + case SCENE_GERUDO_VALLEY: + case SCENE_LOST_WOODS: + case SCENE_DESERT_COLOSSUS: + case SCENE_GERUDOS_FORTRESS: + case SCENE_HAUNTED_WASTELAND: + case SCENE_HYRULE_CASTLE: + case SCENE_DEATH_MOUNTAIN_TRAIL: + case SCENE_DEATH_MOUNTAIN_CRATER: + case SCENE_GORON_CITY: + case SCENE_LON_LON_RANCH: + case SCENE_DEKU_TREE: + case SCENE_DODONGOS_CAVERN: + case SCENE_JABU_JABU: + case SCENE_FOREST_TEMPLE: + case SCENE_FIRE_TEMPLE: + case SCENE_WATER_TEMPLE: + case SCENE_SPIRIT_TEMPLE: + case SCENE_SHADOW_TEMPLE: + case SCENE_BOTTOM_OF_THE_WELL: + case SCENE_ICE_CAVERN: + case SCENE_GERUDO_TRAINING_GROUND: + case SCENE_GANONS_TOWER: + case SCENE_INSIDE_GANONS_CASTLE: + case SCENE_BACK_ALLEY_DAY: + case SCENE_BACK_ALLEY_NIGHT: + case SCENE_MARKET_DAY: + case SCENE_MARKET_NIGHT: + case SCENE_MARKET_RUINS: + return true; + default: + return false; + } +} + +RandomizerCheckArea AreaFromEntranceGroup[] = { + RCAREA_INVALID, + RCAREA_KOKIRI_FOREST, + RCAREA_LOST_WOODS, + RCAREA_SACRED_FOREST_MEADOW, + RCAREA_KAKARIKO_VILLAGE, + RCAREA_GRAVEYARD, + RCAREA_DEATH_MOUNTAIN_TRAIL, + RCAREA_DEATH_MOUNTAIN_CRATER, + RCAREA_GORON_CITY, + RCAREA_ZORAS_RIVER, + RCAREA_ZORAS_DOMAIN, + RCAREA_ZORAS_FOUNTAIN, + RCAREA_HYRULE_FIELD, + RCAREA_LON_LON_RANCH, + RCAREA_LAKE_HYLIA, + RCAREA_GERUDO_VALLEY, + RCAREA_WASTELAND, + RCAREA_MARKET, + RCAREA_HYRULE_CASTLE, +}; + +RandomizerCheckArea GetCheckArea() { + auto scene = static_cast(gPlayState->sceneNum); + bool grottoScene = (scene == SCENE_GROTTOS || scene == SCENE_FAIRYS_FOUNTAIN); + const EntranceData* ent = GetEntranceData(grottoScene ? ENTRANCE_RANDO_GROTTO_EXIT_START + GetCurrentGrottoId() : gSaveContext.entranceIndex); + RandomizerCheckArea area = RCAREA_INVALID; + if (ent != nullptr && !IsAreaScene(scene) && ent->type != ENTRANCE_TYPE_DUNGEON) { + if (ent->source == "Desert Colossus" || ent->destination == "Desert Colossus") { + area = RCAREA_DESERT_COLOSSUS; + } else if (ent->source == "Gerudo Fortress" || ent->destination == "Gerudo Fortress") { + area = RCAREA_GERUDO_FORTRESS; + } else { + area = AreaFromEntranceGroup[ent->dstGroup]; + } + } + if (area == RCAREA_INVALID) { + if (grottoScene && (GetCurrentGrottoId() == -1) && (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GROTTO_ENTRANCES) == RO_GENERIC_OFF)) { + area = previousArea; + } else { + area = RandomizerCheckObjects::GetRCAreaBySceneID(scene); + } + } + return area; +} + +bool vector_contains_scene(std::vector vec, const int16_t scene) { + return std::any_of(vec.begin(), vec.end(), [&](const auto& x) { return x == scene; }); +} + +std::vector skipScenes = {SCENE_GANON_BOSS, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, SCENE_GANON_BOSS, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR}; + +bool EvaluateCheck(RandomizerCheckObject rco) { + if (HasItemBeenCollected(rco.rc) && gSaveContext.checkTrackerData[rco.rc].status != RCSHOW_COLLECTED && + gSaveContext.checkTrackerData[rco.rc].status != RCSHOW_SAVED) { + SetCheckCollected(rco.rc); + return true; + } + return false; +} + +bool CheckByArea(RandomizerCheckArea area = RCAREA_INVALID) { + if (area == RCAREA_INVALID) { + area = checkAreas.front(); + } + if (area != RCAREA_INVALID) { + auto areaChecks = checksByArea.find(area)->second; + if (checkCounter >= areaChecks.size()) { + checkCounter = 0; + checkLoops++; + } + auto rco = areaChecks.at(checkCounter); + return EvaluateCheck(rco); + } +} + +void SetShopSeen(uint32_t sceneNum, bool prices) { + RandomizerCheck start = startingShopItem.find(sceneNum)->second; + if (GetCheckArea() == RCAREA_KAKARIKO_VILLAGE && sceneNum == SCENE_BAZAAR) { + start = RC_KAK_BAZAAR_ITEM_1; + } + bool statusChanged = false; + for (int i = start; i < start + 8; i++) { + if (gSaveContext.checkTrackerData[i].status == RCSHOW_UNCHECKED) { + gSaveContext.checkTrackerData[i].status = RCSHOW_SEEN; + statusChanged = true; + } + } + if (statusChanged) { + SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true); + } +} + +bool HasItemBeenCollected(RandomizerCheck rc) { + if (gPlayState == nullptr) { + return false; + } + ItemLocation* x = Location(rc); + SpoilerCollectionCheck check = x->GetCollectionCheck(); + auto flag = check.flag; + auto scene = check.scene; + auto type = check.type; + + switch (type) { + case SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED: + return true; + case SpoilerCollectionCheckType::SPOILER_CHK_CHEST: + return (gPlayState->sceneNum == scene && gPlayState->actorCtx.flags.chest & (1 << flag)) || + gSaveContext.sceneFlags[scene].chest & (1 << flag); + case SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE: + return (gPlayState->sceneNum == scene && gPlayState->actorCtx.flags.collect & (1 << flag)) || + gSaveContext.sceneFlags[scene].collect & (1 << flag); + case SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT: + case SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM: + case SpoilerCollectionCheckType::SPOILER_CHK_COW: + case SpoilerCollectionCheckType::SPOILER_CHK_SCRUB: + case SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF: + return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(rc)); + case SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF: + return gSaveContext.eventChkInf[flag / 16] & (0x01 << flag % 16); + case SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD: + return CHECK_FLAG_ALL(gSaveContext.eventChkInf[0x09], 0x0F); + case SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA: + return GET_GS_FLAGS(scene) & flag; + case SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE: + return gSaveContext.infTable[scene] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag); + case SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF: + return gSaveContext.itemGetInf[flag / 16] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag); + case SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS: + return BEANS_BOUGHT >= 10; + case SpoilerCollectionCheckType::SPOILER_CHK_NONE: + return false; + case SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER: + // Gravedigger has a fix in place that means one of two save locations. Check both. + return (gSaveContext.itemGetInf[1] & 0x1000) || // vanilla flag + ((IS_RANDO || CVarGetInteger("gGravediggingTourFix", 0)) && + gSaveContext.sceneFlags[scene].collect & (1 << flag) || (gPlayState->actorCtx.flags.collect & (1 << flag))); // rando/fix flag + default: + return false; + } + return false; +} + +void CheckTrackerDialogClosed() { + if (messageCloseCheck) { + messageCloseCheck = false; + } +} + +void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) { + if (gPlayState->sceneNum == SCENE_HAPPY_MASK_SHOP) { // Happy Mask Shop is not used in rando, so is not tracked + return; + } + + auto slot = startingShopItem.find(gPlayState->sceneNum)->second + cursorSlot; + if (GetCheckArea() == RCAREA_KAKARIKO_VILLAGE && gPlayState->sceneNum == SCENE_BAZAAR) { + slot = RC_KAK_BAZAAR_ITEM_1 + cursorSlot; + } + auto status = gSaveContext.checkTrackerData[slot].status; + if (status == RCSHOW_SEEN) { + gSaveContext.checkTrackerData[slot].status = RCSHOW_IDENTIFIED; + gSaveContext.checkTrackerData[slot].price = basePrice; + SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true); + } +} + +void CheckTrackerTransition(uint32_t sceneNum) { + if (!GameInteractor::IsSaveLoaded()) { + return; + } + gSaveContext; + if (transitionCheck) { + transitionCheck = false; + } + doAreaScroll = true; + previousArea = currentArea; + currentArea = GetCheckArea(); + switch (sceneNum) { + case SCENE_KOKIRI_SHOP: + case SCENE_BAZAAR: + case SCENE_POTION_SHOP_MARKET: + case SCENE_BOMBCHU_SHOP: + case SCENE_POTION_SHOP_KAKARIKO: + case SCENE_GORON_SHOP: + case SCENE_ZORA_SHOP: + SetShopSeen(sceneNum, false); + break; + } +} + +void CheckTrackerFrame() { + if (!GameInteractor::IsSaveLoaded()) { + return; + } + if (!checkAreas.empty() && !transitionCheck && !messageCloseCheck && !pendingSaleCheck) { + for (int i = 0; i < 10; i++) { + if (CheckByArea()) { + checkCounter = 0; + break; + } else { + checkCounter++; + } + } + if (checkLoops > 15) { + checkAreas.erase(checkAreas.begin()); + checkLoops = 0; + } + } + if (savedFrames > 0 && !pendingSaleCheck && !messageCloseCheck) { + savedFrames--; + } +} + +void CheckTrackerSaleEnd(GetItemEntry giEntry) { + if (pendingSaleCheck) { + pendingSaleCheck = false; + } +} + +void CheckTrackerItemReceive(GetItemEntry giEntry) { + if (!GameInteractor::IsSaveLoaded() || vector_contains_scene(skipScenes, gPlayState->sceneNum)) { + return; + } + auto scene = static_cast(gPlayState->sceneNum); + // Vanilla special item checks + if (!IS_RANDO) { + if (giEntry.itemId == ITEM_SHIELD_DEKU) { + SetCheckCollected(RC_KF_SHOP_ITEM_3); + return; + }else if (giEntry.itemId == ITEM_KOKIRI_EMERALD) { + SetCheckCollected(RC_QUEEN_GOHMA); + return; + } else if (giEntry.itemId == ITEM_GORON_RUBY) { + SetCheckCollected(RC_KING_DODONGO); + return; + } else if (giEntry.itemId == ITEM_ZORA_SAPPHIRE) { + SetCheckCollected(RC_BARINADE); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_FOREST) { + SetCheckCollected(RC_PHANTOM_GANON); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_FIRE) { + SetCheckCollected(RC_VOLVAGIA); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_WATER) { + SetCheckCollected(RC_MORPHA); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_SHADOW) { + SetCheckCollected(RC_BONGO_BONGO); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_SPIRIT) { + SetCheckCollected(RC_TWINROVA); + return; + } else if (giEntry.itemId == ITEM_MEDALLION_LIGHT) { + SetCheckCollected(RC_GIFT_FROM_SAGES); + return; + } else if (giEntry.itemId == ITEM_SONG_LULLABY) { + SetCheckCollected(RC_SONG_FROM_IMPA); + return; + } else if (giEntry.itemId == ITEM_SONG_EPONA) { + SetCheckCollected(RC_SONG_FROM_MALON); + return; + } else if (giEntry.itemId == ITEM_SONG_SARIA) { + SetCheckCollected(RC_SONG_FROM_SARIA); + return; + } else if (giEntry.itemId == ITEM_SONG_SUN) { + SetCheckCollected(RC_SONG_FROM_ROYAL_FAMILYS_TOMB); + return; + } else if (giEntry.itemId == ITEM_SONG_TIME) { + SetCheckCollected(RC_SONG_FROM_OCARINA_OF_TIME); + return; + } else if (giEntry.itemId == ITEM_SONG_STORMS) { + SetCheckCollected(RC_SONG_FROM_WINDMILL); + return; + } else if (giEntry.itemId == ITEM_SONG_MINUET) { + SetCheckCollected(RC_SHEIK_IN_FOREST); + return; + } else if (giEntry.itemId == ITEM_SONG_BOLERO) { + SetCheckCollected(RC_SHEIK_IN_CRATER); + return; + } else if (giEntry.itemId == ITEM_SONG_SERENADE) { + SetCheckCollected(RC_SHEIK_IN_ICE_CAVERN); + return; + } else if (giEntry.itemId == ITEM_SONG_NOCTURNE) { + SetCheckCollected(RC_SHEIK_IN_KAKARIKO); + return; + } else if (giEntry.itemId == ITEM_SONG_REQUIEM) { + SetCheckCollected(RC_SHEIK_AT_COLOSSUS); + return; + } else if (giEntry.itemId == ITEM_SONG_PRELUDE) { + SetCheckCollected(RC_SHEIK_AT_TEMPLE); + return; + } else if (giEntry.itemId == ITEM_BRACELET) { + SetCheckCollected(RC_GC_DARUNIAS_JOY); + return; + } else if (giEntry.itemId == ITEM_LETTER_ZELDA) { + SetCheckCollected(RC_HC_ZELDAS_LETTER); + return; + } else if (giEntry.itemId == ITEM_WEIRD_EGG) { + SetCheckCollected(RC_HC_MALON_EGG); + return; + } else if (giEntry.itemId == ITEM_BEAN) { + SetCheckCollected(RC_ZR_MAGIC_BEAN_SALESMAN); + return; + } + } + auto checkArea = GetCheckArea(); + if (gSaveContext.pendingSale != ITEM_NONE) { + pendingSaleCheck = true; + checkAreas.push_back(checkArea); + return; + } + if (scene == SCENE_DESERT_COLOSSUS && (gSaveContext.entranceIndex == 485 || gSaveContext.entranceIndex == 489)) { + checkAreas.push_back(RCAREA_SPIRIT_TEMPLE); + return; + } + if (GET_PLAYER(gPlayState) == nullptr) { + transitionCheck = true; + return; + } + if (gPlayState->msgCtx.msgMode != MSGMODE_NONE) { + checkAreas.push_back(checkArea); + messageCloseCheck = true; + return; + } + if (IS_RANDO || (!IS_RANDO && giEntry.getItemCategory != ITEM_CATEGORY_JUNK)) { + checkAreas.push_back(checkArea); + checkCollected = true; + } +} + +void InitTrackerData(bool isDebug) { + TrySetAreas(); + for (auto& [rc, rco] : RandomizerCheckObjects::GetAllRCObjects()) { + if (rc != RC_UNKNOWN_CHECK && rc != RC_MAX) { + DefaultCheckData(rc); + } + } + UpdateAllOrdering(); + UpdateInventoryChecks(); +} + +void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) { + SaveManager::Instance->SaveArray("checks", ARRAY_COUNT(saveContext->checkTrackerData), [&](size_t i) { + if (saveContext->checkTrackerData[i].status == RCSHOW_COLLECTED) { + if (gameSave || savedFrames > 0) { + gSaveContext.checkTrackerData[i].status = saveContext->checkTrackerData[i].status = RCSHOW_SAVED; + UpdateAllOrdering(); + UpdateInventoryChecks(); + } else { + saveContext->checkTrackerData[i].status = RCSHOW_SCUMMED; + } + } + SaveManager::Instance->SaveStruct("", [&]() { + SaveManager::Instance->SaveData("status", saveContext->checkTrackerData[i].status); + SaveManager::Instance->SaveData("skipped", saveContext->checkTrackerData[i].skipped); + SaveManager::Instance->SaveData("price", saveContext->checkTrackerData[i].price); + SaveManager::Instance->SaveData("hintItem", saveContext->checkTrackerData[i].hintItem); + }); + }); +} + +void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) { + SaveTrackerData(saveContext, sectionID, fullSave); + if (fullSave) { + savedFrames = 40; + } +} + +void LoadFile() { + Teardown(); + LoadSettings(); + TrySetAreas(); + SaveManager::Instance->LoadArray("checks", RC_MAX, [](size_t i) { + SaveManager::Instance->LoadStruct("", [&]() { + SaveManager::Instance->LoadData("status", gSaveContext.checkTrackerData[i].status); + SaveManager::Instance->LoadData("skipped", gSaveContext.checkTrackerData[i].skipped); + SaveManager::Instance->LoadData("price", gSaveContext.checkTrackerData[i].price); + SaveManager::Instance->LoadData("hintItem", gSaveContext.checkTrackerData[i].hintItem); + }); + RandomizerCheckTrackerData entry = gSaveContext.checkTrackerData[i]; + RandomizerCheck rc = static_cast(i); + if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX || + !RandomizerCheckObjects::GetAllRCObjects().contains(rc)) + return; + + RandomizerCheckObject entry2; + if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) { + entry2 = RCO_RAORU; + } else { + entry2 = RandomizerCheckObjects::GetAllRCObjects().find(rc)->second; + } + if (!IsVisibleInCheckTracker(entry2)) return; + + checksByArea.find(entry2.rcArea)->second.push_back(entry2); + if (entry.status == RCSHOW_SAVED || entry.skipped) { + areaChecksGotten[entry2.rcArea]++; + } + + if (areaChecksGotten[entry2.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2.rcArea)) { + areasSpoiled |= (1 << entry2.rcArea); + } + }); + if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) { + s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE); + RandomizerCheckArea startingArea; + switch (startingAge) { + case RO_AGE_CHILD: + startingArea = RCAREA_KOKIRI_FOREST; + break; + case RO_AGE_ADULT: + startingArea = RCAREA_MARKET; + break; + default: + startingArea = RCAREA_KOKIRI_FOREST; + break; + } + RandomizerCheckObject linksPocket = { RC_LINKS_POCKET, RCVORMQ_BOTH, RCTYPE_LINKS_POCKET, startingArea, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Link's Pocket", "Link's Pocket" }; + + checksByArea.find(startingArea)->second.push_back(linksPocket); + areaChecksGotten[startingArea]++; + } + + showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_RANDOM_NUMBER || + (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_SET_NUMBER && + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12)); + LinksPocket(); + SongFromImpa(); + GiftFromSages(); + initialized = true; + UpdateAllOrdering(); + UpdateInventoryChecks(); +} + +void Teardown() { + initialized = false; + for (auto& [rcArea, vec] : checksByArea) { + vec.clear(); + areaChecksGotten[rcArea] = 0; + } + checksByArea.clear(); + areasSpoiled = 0; + checkCollected = false; + checkLoops = 0; + + lastLocationChecked = RC_UNKNOWN_CHECK; +} + +void UpdateCheck(uint32_t check, RandomizerCheckTrackerData data) { + auto area = RandomizerCheckObjects::GetAllRCObjects().find(static_cast(check))->second.rcArea; + if (!gSaveContext.checkTrackerData[check].skipped && data.skipped) { + areaChecksGotten[area]++; + } else if (gSaveContext.checkTrackerData[check].skipped && !data.skipped) { + areaChecksGotten[area]--; + } + gSaveContext.checkTrackerData[check] = data; + UpdateOrdering(area); +} + void CheckTrackerWindow::DrawElement() { ImGui::SetNextWindowSize(ImVec2(400, 540), ImGuiCond_FirstUseEver); - if (doInitialize) { - Teardown(); - InitializeChecks(); - } else if (initialized && (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2)) { - Teardown(); + if (!initialized && (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2)) { return; } @@ -139,7 +793,7 @@ void CheckTrackerWindow::DrawElement() { BeginFloatWindows("Check Tracker", mIsVisible, ImGuiWindowFlags_NoScrollbar); - if (!initialized) { + if (!GameInteractor::IsSaveLoaded()) { ImGui::Text("Waiting for file load..."); //TODO Language EndFloatWindows(); return; @@ -148,26 +802,10 @@ void CheckTrackerWindow::DrawElement() { SceneID sceneId = SCENE_ID_MAX; if (gPlayState != nullptr) { sceneId = (SceneID)gPlayState->sceneNum; - currentArea = RandomizerCheckObjects::GetRCAreaBySceneID(sceneId); } - bool doAreaScroll = - (currentArea != RCAREA_INVALID && currentArea != previousArea && - sceneId != SCENE_GROTTOS && // Don't move for grottos - sceneId != SCENE_FAIRYS_FOUNTAIN && sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS && sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC && // Don't move for fairy fountains - sceneId != SCENE_BAZAAR && sceneId != SCENE_SHOOTING_GALLERY // Don't move for Bazaar/Gallery, as it moves between Kak and Market - ); - previousArea = currentArea; areasSpoiled |= (1 << currentArea); - //Only update the checks if something has changed - if (ShouldUpdateChecks()) { - UpdateChecks(); - UpdateInventoryChecks(); - UpdateOrdering(); - } - - //Quick Options #ifdef __WIIU__ float headerHeight = 40.0f; @@ -186,10 +824,11 @@ void CheckTrackerWindow::DrawElement() { UIWidgets::EnhancementCheckbox( "Show Hidden Items", "gCheckTrackerOptionShowHidden", false, "When active, items will show hidden checks by default when updated to this state."); - ImGui::SameLine(); + UIWidgets::PaddedSeparator(); if (ImGui::Button("Expand All")) { optCollapseAll = false; optExpandAll = true; + doAreaScroll = true; } ImGui::SameLine(); if (ImGui::Button("Collapse All")) { @@ -230,93 +869,89 @@ void CheckTrackerWindow::DrawElement() { std::string stemp; s32 areaMask = 1; - // Logic for each check - for (auto& obj : checks) - { + for (auto& [rcArea, objs] : checksByArea) { + RandomizerCheckArea thisArea = currentArea; - //New Area to be drawn - if (obj.rcArea != lastArea) - { - //Last Area needs to be cleaned up - if (lastArea != RCAREA_INVALID && doDraw) { - ImGui::TreePop(); - UIWidgets::PaddedSeparator(); - } - lastArea = obj.rcArea; - - //Decide if we should skip because of hiding rules - thisAreaFullyChecked = ((areasFullyChecked & areaMask) != 0); - if (!showHidden && ( - hideComplete && thisAreaFullyChecked || - hideIncomplete && !thisAreaFullyChecked - )) { - doDraw = false; - } - else { - //Get the colour for the area - if (thisAreaFullyChecked) { - mainColor = areaCompleteColor; - extraColor = extraCompleteColor; - } else { - mainColor = areaIncompleteColor; - extraColor = extraIncompleteColor; - } - - //Draw the area - collapseLogic = !thisAreaFullyChecked; - if (doingCollapseOrExpand) { - if (optExpandAll) { - collapseLogic = true; - } else if (optCollapseAll) { - collapseLogic = false; - } - } - stemp = RandomizerCheckObjects::GetRCAreaName(obj.rcArea) + "##TreeNode"; - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(mainColor.r / 255.0f, mainColor.g / 255.0f, - mainColor.b / 255.0f, mainColor.a / 255.0f)); - if (doingCollapseOrExpand) - ImGui::SetNextItemOpen(collapseLogic, ImGuiCond_Always); - else - ImGui::SetNextItemOpen(!thisAreaFullyChecked, ImGuiCond_Once); - doDraw = ImGui::TreeNode(stemp.c_str()); - ImGui::PopStyleColor(); - ImGui::SameLine(); - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, - extraColor.b / 255.0f, extraColor.a / 255.0f)); - - isThisAreaSpoiled = areasSpoiled & areaMask || CVarGetInteger("gCheckTrackerOptionMQSpoilers", 0); - - if (isThisAreaSpoiled) { - if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(obj.rcArea)) { - if (OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(DungeonSceneLookupByArea(obj.rcArea))) - ImGui::Text("(%d/%d) - MQ", areaChecksGotten[obj.rcArea], areaChecksTotal[obj.rcArea]); - else - ImGui::Text("(%d/%d) - Vanilla", areaChecksGotten[obj.rcArea], areaChecksTotal[obj.rcArea]); - } else { - ImGui::Text("(%d/%d)", areaChecksGotten[obj.rcArea], areaChecksTotal[obj.rcArea]); - } - } else { - ImGui::Text("???", areaChecksGotten[obj.rcArea], areaChecksTotal[obj.rcArea]); - } - - ImGui::PopStyleColor(); - - //Keep areas loaded between transitions - if (currentArea == obj.rcArea && doAreaScroll) - ImGui::SetScrollHereY(0.0f); - } - - areaMask <<= 1; + const int areaChecksTotal = static_cast(objs.size()); + thisAreaFullyChecked = (areaChecksGotten[rcArea] == areaChecksTotal); + //Last Area needs to be cleaned up + if (lastArea != RCAREA_INVALID && doDraw) { + UIWidgets::PaddedSeparator(); } + lastArea = rcArea; + if (previousShowHidden != showHidden) { + previousShowHidden = showHidden; + doAreaScroll = true; + } + if (!showHidden && ( + hideComplete && thisAreaFullyChecked || + hideIncomplete && !thisAreaFullyChecked + )) { + doDraw = false; + } else { + //Get the colour for the area + if (thisAreaFullyChecked) { + mainColor = areaCompleteColor; + extraColor = extraCompleteColor; + } else { + mainColor = areaIncompleteColor; + extraColor = extraIncompleteColor; + } - if (doDraw && isThisAreaSpoiled) - DrawLocation(obj, &checkStatusMap.find(obj.rc)->second); + //Draw the area + collapseLogic = !thisAreaFullyChecked; + if (doingCollapseOrExpand) { + if (optExpandAll) { + collapseLogic = true; + } else if (optCollapseAll) { + collapseLogic = false; + } + } + stemp = RandomizerCheckObjects::GetRCAreaName(rcArea) + "##TreeNode"; + ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(mainColor.r / 255.0f, mainColor.g / 255.0f, + mainColor.b / 255.0f, mainColor.a / 255.0f)); + if (doingCollapseOrExpand) + ImGui::SetNextItemOpen(collapseLogic, ImGuiCond_Always); + else + ImGui::SetNextItemOpen(!thisAreaFullyChecked, ImGuiCond_Once); + doDraw = ImGui::TreeNode(stemp.c_str()); + ImGui::PopStyleColor(); + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, + extraColor.b / 255.0f, extraColor.a / 255.0f)); + + isThisAreaSpoiled = areasSpoiled & areaMask || CVarGetInteger("gCheckTrackerOptionMQSpoilers", 0); + + if (isThisAreaSpoiled) { + if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) { + if (OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(DungeonSceneLookupByArea(rcArea))) + ImGui::Text("(%d/%d) - MQ", areaChecksGotten[rcArea], areaChecksTotal); + else + ImGui::Text("(%d/%d) - Vanilla", areaChecksGotten[rcArea], areaChecksTotal); + } else { + ImGui::Text("(%d/%d)", areaChecksGotten[rcArea], areaChecksTotal); + } + } else { + ImGui::Text("???"); + } + + ImGui::PopStyleColor(); + + //Keep areas loaded between transitions + if (thisArea == rcArea && doAreaScroll) { + ImGui::SetScrollHereY(0.0f); + doAreaScroll = false; + } + for (auto rco : objs) { + if (doDraw && isThisAreaSpoiled && IsVisibleInCheckTracker(rco)) + DrawLocation(rco); + } + if (doDraw) + ImGui::TreePop(); + } + areaMask <<= 1; } - //Clean up last area - if (doDraw) - ImGui::TreePop(); - ImGui::EndTable(); //Checks Lead-out ImGui::EndTable(); //Quick Options Lead-out EndFloatWindows(); @@ -357,30 +992,8 @@ void EndFloatWindows() { ImGui::End(); } -bool showShops; -bool showOverworldTokens; -bool showDungeonTokens; -bool showBeans; -bool showScrubs; -bool showMerchants; -bool showCows; -bool showAdultTrade; -bool showKokiriSword; -bool showWeirdEgg; -bool showGerudoCard; -bool showFrogSongRupees; -bool showStartingMapsCompasses; -bool showKeysanity; -bool showGerudoFortressKeys; -bool showBossKeysanity; -bool showGanonBossKey; -bool showOcarinas; -bool show100SkullReward; -bool fortressFast; -bool fortressNormal; - void LoadSettings() { - //If in randomzer, then get the setting and check if in general we should be showing the settings + //If in randomzer (n64ddFlag), then get the setting and check if in general we should be showing the settings //If in vanilla, _try_ to show items that at least are needed for 100% showShops = IS_RANDO ? ( @@ -435,6 +1048,10 @@ void LoadSettings() { show100SkullReward = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_100_GS_REWARD) == RO_GENERIC_YES : false; + showLinksPocket = IS_RANDO ? // don't show Link's Pocket if not randomizer, or if rando and pocket is disabled + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING + :false; + hideShopRightChecks = IS_RANDO ? CVarGetInteger("gCheckTrackerOptionHideRightShopChecks", 1) : false; if (IS_RANDO) { switch (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS)) { @@ -477,213 +1094,120 @@ void LoadSettings() { } bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) { - return - (rcObj.rcArea != RCAREA_INVALID) && // don't show Invalid locations - (rcObj.rcType != RCTYPE_GOSSIP_STONE) && //TODO: Don't show hints until tracker supports them - (rcObj.rcType != RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them - (rcObj.rc != RC_HC_ZELDAS_LETTER) && // don't show zeldas letter until we support shuffling it - (!RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea) || - rcObj.vOrMQ == RCVORMQ_BOTH || - rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) || - rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) - ) && - (rcObj.rcType != RCTYPE_SHOP || showShops) && - (rcObj.rcType != RCTYPE_SCRUB || - showScrubs || - rcObj.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized - rcObj.rc == RC_HF_DEKU_SCRUB_GROTTO || - rcObj.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT - ) && - (rcObj.rcType != RCTYPE_MERCHANT || showMerchants) && - (rcObj.rcType != RCTYPE_OCARINA || showOcarinas) && - (rcObj.rcType != RCTYPE_SKULL_TOKEN || - (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) || - (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea)) - ) && - (rcObj.rcType != RCTYPE_COW || showCows) && - (rcObj.rcType != RCTYPE_ADULT_TRADE || - showAdultTrade || - rcObj.rc == RC_KAK_ANJU_AS_ADULT || // adult trade checks that are always shuffled - rcObj.rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off - ) && - (rcObj.rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) && - (rcObj.rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) && - (rcObj.rc != RC_HC_MALON_EGG || showWeirdEgg) && - (rcObj.rcType != RCTYPE_FROG_SONG || showFrogSongRupees) && - (rcObj.rcType != RCTYPE_MAP_COMPASS || showStartingMapsCompasses) && - (rcObj.rcType != RCTYPE_SMALL_KEY || showKeysanity) && - (rcObj.rcType != RCTYPE_BOSS_KEY || showBossKeysanity) && - (rcObj.rcType != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) && - (rcObj.rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) && - (rcObj.rcType != RCTYPE_GF_KEY && rcObj.rc != RC_GF_GERUDO_MEMBERSHIP_CARD || - (showGerudoCard && rcObj.rc == RC_GF_GERUDO_MEMBERSHIP_CARD) || - (fortressNormal && showGerudoFortressKeys && rcObj.rcType == RCTYPE_GF_KEY) || - (fortressFast && showGerudoFortressKeys && rcObj.rc == RC_GF_NORTH_F1_CARPENTER) - ); -} - - -void InitializeChecks() { - if (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2) - return; - - int count = 0; - - //Link's Pocket - if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING) { - s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE); - RandomizerCheckArea startingArea; - switch (startingAge) { - case RO_AGE_CHILD: - startingArea = RCAREA_KOKIRI_FOREST; - break; - case RO_AGE_ADULT: - startingArea = RCAREA_MARKET; - break; - default: - startingArea = RCAREA_KOKIRI_FOREST; - break; - } - RandomizerCheckObject linksPocket = { RC_LINKS_POCKET, RCVORMQ_BOTH, RCTYPE_LINKS_POCKET, startingArea, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Link's Pocket", "Link's Pocket" }; - - checks.push_back(linksPocket); - checkStatusMap.emplace(RC_LINKS_POCKET, RCSHOW_SAVED); - count++; - areaChecksTotal[startingArea]++; - areaChecksGotten[startingArea]++; - } - - LoadSettings(); - for (auto& [rcCheck, rcObj] : RandomizerCheckObjects::GetAllRCObjects()) { - if (!IsVisibleInCheckTracker(rcObj)) - continue; - - checks.push_back(rcObj); - checkStatusMap.emplace(rcObj.rc, RCSHOW_UNCHECKED); - count++; - areaChecksTotal[rcObj.rcArea]++; - - if (areaChecksGotten[rcObj.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) - areasSpoiled |= (1 << rcObj.rcArea); - } - - showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_RANDOM_NUMBER || - (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_SET_NUMBER && - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12) + if (IS_RANDO) { + return + (rcObj.rcArea != RCAREA_INVALID) && // don't show Invalid locations + (rcObj.rcType != RCTYPE_GOSSIP_STONE) && //TODO: Don't show hints until tracker supports them + (rcObj.rcType != RCTYPE_CHEST_GAME) && // don't show non final reward chest game checks until we support shuffling them + (rcObj.rc != RC_HC_ZELDAS_LETTER) && // don't show zeldas letter until we support shuffling it + (rcObj.rc != RC_LINKS_POCKET || showLinksPocket) && + (!RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea) || + rcObj.vOrMQ == RCVORMQ_BOTH || + rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) || + rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) + ) && + (rcObj.rcType != RCTYPE_SHOP || (showShops && (!hideShopRightChecks || hideShopRightChecks && rcObj.actorParams > 0x03))) && + (rcObj.rcType != RCTYPE_SCRUB || + showScrubs || + rcObj.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized + rcObj.rc == RC_HF_DEKU_SCRUB_GROTTO || + rcObj.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT + ) && + (rcObj.rcType != RCTYPE_MERCHANT || showMerchants) && + (rcObj.rcType != RCTYPE_OCARINA || showOcarinas) && + (rcObj.rcType != RCTYPE_SKULL_TOKEN || + (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) || + (showDungeonTokens && RandomizerCheckObjects::AreaIsDungeon(rcObj.rcArea)) + ) && + (rcObj.rcType != RCTYPE_COW || showCows) && + (rcObj.rcType != RCTYPE_ADULT_TRADE || + showAdultTrade || + rcObj.rc == RC_KAK_ANJU_AS_ADULT || // adult trade checks that are always shuffled + rcObj.rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off + ) && + (rcObj.rc != RC_KF_KOKIRI_SWORD_CHEST || showKokiriSword) && + (rcObj.rc != RC_ZR_MAGIC_BEAN_SALESMAN || showBeans) && + (rcObj.rc != RC_HC_MALON_EGG || showWeirdEgg) && + (rcObj.rcType != RCTYPE_FROG_SONG || showFrogSongRupees) && + (rcObj.rcType != RCTYPE_MAP_COMPASS || showStartingMapsCompasses) && + (rcObj.rcType != RCTYPE_SMALL_KEY || showKeysanity) && + (rcObj.rcType != RCTYPE_BOSS_KEY || showBossKeysanity) && + (rcObj.rcType != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) && + (rcObj.rc != RC_KAK_100_GOLD_SKULLTULA_REWARD || show100SkullReward) && + (rcObj.rcType != RCTYPE_GF_KEY && rcObj.rc != RC_GF_GERUDO_MEMBERSHIP_CARD || + (showGerudoCard && rcObj.rc == RC_GF_GERUDO_MEMBERSHIP_CARD) || + (fortressNormal && showGerudoFortressKeys && rcObj.rcType == RCTYPE_GF_KEY) || + (fortressFast && showGerudoFortressKeys && rcObj.rc == RC_GF_NORTH_F1_CARPENTER) ); - - UpdateChecks(); - UpdateInventoryChecks(); - UpdateOrdering(true); - doInitialize = false; - initialized = true; -} - -void Teardown() { - initialized = false; - checkStatusMap.clear(); - areasFullyChecked = 0; - areasSpoiled = 0; - checks.clear(); - lastLocationChecked = RC_UNKNOWN_CHECK; - for (int i = 0; i < sizeof(areaChecksTotal); i++) { - areaChecksTotal[i] = 0; - areaChecksGotten[i] = 0; } - doInitialize = true; -} - -int slowCheckIdx = 0; -// Checks only one check every call -bool SlowUpdateCheck() { - bool ret = false; - auto checkIt = checks.begin() + slowCheckIdx; - if (checkIt == checks.end()) { - slowCheckIdx = 0; - return false; + else if (rcObj.vanillaCompletion) { + return (rcObj.vOrMQ == RCVORMQ_BOTH || + rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) || + rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) || + rcObj.rc == RC_GIFT_FROM_SAGES) && rcObj.rc != RC_LINKS_POCKET; } - - RandomizerCheckObject rcObj = *checkIt; - RandomizerCheckShow lastStatus = checkStatusMap.find(rcObj.rc)->second; - if (lastStatus != GetCheckStatus(rcObj, slowCheckIdx)) - ret = true; - - slowCheckIdx++; - return ret; -} - -bool ShouldUpdateChecks() { - // TODO eventually will need to be hooked into game elements rather than just save file - if (CVarGetInteger("gCheckTrackerOptionPerformanceMode", 0)) - return SlowUpdateCheck(); - else - return true; + return false; } void UpdateInventoryChecks() { //For all the areas with compasses, if you have one, spoil the area - for (u8 i = RCAREA_DEKU_TREE; i <= RCAREA_ICE_CAVERN; i++) - if (gSaveContext.inventory.dungeonItems[i - RCAREA_DEKU_TREE] & 0x02) - areasSpoiled |= (1 << i); + for (u8 i = SCENE_DEKU_TREE; i <= SCENE_GERUDO_TRAINING_GROUND; i++) + if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, i)) + areasSpoiled |= (1 << RCAreaFromSceneID.at((SceneID)i)); } -void UpdateChecks() { - int idx = 0; - RandomizerCheckObject* lastCheck; - RandomizerCheckShow lastStatus; - for (auto& rcObj : checks) { - RandomizerCheckShow* checkStatusPtr = &checkStatusMap.find(rcObj.rc)->second; - lastStatus = *checkStatusPtr; - *checkStatusPtr = GetCheckStatus(rcObj, idx); - - //Update areasFullyChecked - if (lastStatus != *checkStatusPtr) { - if (lastStatus != RCSHOW_CHECKED && lastStatus != RCSHOW_SAVED && (*checkStatusPtr == RCSHOW_CHECKED || *checkStatusPtr == RCSHOW_SAVED)) - areaChecksGotten[rcObj.rcArea]++; - else if ((lastStatus == RCSHOW_CHECKED || lastStatus == RCSHOW_SAVED) && *checkStatusPtr != RCSHOW_CHECKED && *checkStatusPtr != RCSHOW_SAVED) - areaChecksGotten[rcObj.rcArea]--; - - if (areaChecksGotten[rcObj.rcArea] == areaChecksTotal[rcObj.rcArea]) - areasFullyChecked |= (1 << rcObj.rcArea); - else - areasFullyChecked &= (0xFFFFFFFF - (1 << rcObj.rcArea)); - - if (areaChecksGotten[rcObj.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) - areasSpoiled |= (1 << rcObj.rcArea); - } - - lastCheck = &rcObj; - - idx++; - } +void UpdateAreaFullyChecked(RandomizerCheckArea area) { } -void UpdateOrdering(bool init) { +void UpdateAreas(RandomizerCheckArea area) { + areasFullyChecked[area] = areaChecksGotten[area] == checksByArea.find(area)->second.size(); + if (areaChecksGotten[area] != 0 || RandomizerCheckObjects::AreaIsOverworld(area)) + areasSpoiled |= (1 << area); +} + +void UpdateAllOrdering() { // Sort the entire thing - if (init) { - std::sort(checks.begin(), checks.end(), CompareCheckObject); - return; - } - - //sort each area individually - int startOffset = 0; - int endOffset = 0; - for (int x = 0; x < sizeof(areaChecksTotal); x++) { - endOffset = startOffset + areaChecksTotal[x]; - std::sort(checks.begin() + startOffset, checks.begin() + endOffset, CompareCheckObject); - startOffset += areaChecksTotal[x]; + for (int i = 0; i < RCAREA_INVALID; i++) { + UpdateOrdering(static_cast(i)); } } -bool CompareCheckObject(RandomizerCheckObject i, RandomizerCheckObject j) { - if (i.rcArea < j.rcArea) +void UpdateOrdering(RandomizerCheckArea rcArea) { + // Sort a single area + if(checksByArea.contains(rcArea)) { + std::sort(checksByArea.find(rcArea)->second.begin(), checksByArea.find(rcArea)->second.end(), CompareChecks); + } +} + +bool IsEoDCheck(RandomizerCheckType type) { + return type == RCTYPE_BOSS_HEART_OR_OTHER_REWARD || type == RCTYPE_DUNGEON_REWARD; +} + +bool CompareChecks(RandomizerCheckObject i, RandomizerCheckObject j) { + RandomizerCheckTrackerData iShow = gSaveContext.checkTrackerData[i.rc]; + RandomizerCheckTrackerData jShow = gSaveContext.checkTrackerData[j.rc]; + bool iCollected = iShow.status == RCSHOW_COLLECTED || iShow.status == RCSHOW_SAVED; + bool iSaved = iShow.status == RCSHOW_SAVED; + bool jCollected = jShow.status == RCSHOW_COLLECTED || jShow.status == RCSHOW_SAVED; + bool jSaved = jShow.status == RCSHOW_SAVED; + if (!iCollected && jCollected) return true; - else if (i.rcArea > j.rcArea) + else if (iCollected && !jCollected) return false; - if (checkStatusMap.find(i.rc)->second < checkStatusMap.find(j.rc)->second) + if (!iSaved && jSaved) return true; - else if (checkStatusMap.find(i.rc)->second > checkStatusMap.find(j.rc)->second) + else if (iSaved && !jSaved) + return false; + + if (!iShow.skipped && jShow.skipped) + return true; + else if (iShow.skipped && !jShow.skipped) + return false; + + if (!IsEoDCheck(i.rcType) && IsEoDCheck(j.rcType)) + return true; + else if (IsEoDCheck(i.rcType) && !IsEoDCheck(j.rcType)) return false; if (i.rc < j.rc) @@ -694,108 +1218,54 @@ bool CompareCheckObject(RandomizerCheckObject i, RandomizerCheckObject j) { return false; } -RandomizerCheckShow GetCheckStatus(RandomizerCheckObject rcObj, int idx) { - if (HasItemBeenCollected(rcObj)) - return RCSHOW_SAVED; // TODO: use SAVED until we hook into game elements without requiring a save. Then we'll use CHECKED - - if (HasItemBeenSkipped(rcObj)) - return RCSHOW_SKIPPED; - - return RCSHOW_UNCHECKED; - - // TODO Seen, Hinted, Scummed, saved/checked +bool IsHeartPiece(GetItemID giid) { + return giid == GI_HEART_PIECE || giid == GI_HEART_PIECE_WIN; } -bool HasItemBeenSkipped(RandomizerCheckObject obj) { - return gSaveContext.sohStats.locationsSkipped[obj.rc] == 1; -} - -bool HasItemBeenCollected(RandomizerCheckObject obj) { - ItemLocation* x = Location(obj.rc); - SpoilerCollectionCheck check = x->GetCollectionCheck(); - auto flag = check.flag; - auto scene = check.scene; - auto type = check.type; - - switch (type) { - case SpoilerCollectionCheckType::SPOILER_CHK_ALWAYS_COLLECTED: - return true; - case SpoilerCollectionCheckType::SPOILER_CHK_CHEST: - return gSaveContext.sceneFlags[scene].chest & (1 << flag); - case SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE: - return gSaveContext.sceneFlags[scene].collect & (1 << flag); - case SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT: - case SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM: - case SpoilerCollectionCheckType::SPOILER_CHK_COW: - case SpoilerCollectionCheckType::SPOILER_CHK_SCRUB: - case SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF: - return Flags_GetRandomizerInf(OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(obj.rc)); - case SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF: - return gSaveContext.eventChkInf[flag / 16] & (0x01 << flag % 16); - case SpoilerCollectionCheckType::SPOILER_CHK_GERUDO_MEMBERSHIP_CARD: - return CHECK_FLAG_ALL(gSaveContext.eventChkInf[0x09], 0x0F); - case SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA: - return GET_GS_FLAGS(scene) & flag; - case SpoilerCollectionCheckType::SPOILER_CHK_INF_TABLE: - return gSaveContext.infTable[scene] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag); - case SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF: - return gSaveContext.itemGetInf[flag / 16] & INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(flag); - case SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS: - return BEANS_BOUGHT >= 10; - case SpoilerCollectionCheckType::SPOILER_CHK_NONE: - return false; - case SpoilerCollectionCheckType::SPOILER_CHK_GRAVEDIGGER: - // Gravedigger has a fix in place that means one of two save locations. Check both. - return (gSaveContext.itemGetInf[1] & 0x1000) || // vanilla flag - ((IS_RANDO || CVarGetInteger("gGravediggingTourFix", 0)) && - gSaveContext.sceneFlags[scene].collect & (1 << flag)); // rando/fix flag - default: - return false; - } - return false; -} - -void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckStatus) { - Color_RGBA8 mainColor; +void DrawLocation(RandomizerCheckObject rcObj) { + Color_RGBA8 mainColor; Color_RGBA8 extraColor; std::string txt; bool showHidden = CVarGetInteger("gCheckTrackerOptionShowHidden", 0); - - if (*thisCheckStatus == RCSHOW_UNCHECKED) { - if (!showHidden && CVarGetInteger("gCheckTrackerUncheckedHide", 0)) + RandomizerCheckTrackerData checkData = gSaveContext.checkTrackerData[rcObj.rc]; + RandomizerCheckStatus status = checkData.status; + bool skipped = checkData.skipped; + if (status == RCSHOW_COLLECTED) { + if (!showHidden && CVarGetInteger("gCheckTrackerCollectedHide", 0)) return; - mainColor = CVarGetColor("gCheckTrackerUncheckedMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerUncheckedExtraColor", Color_Unchecked_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_SKIPPED) { - if (!showHidden && CVarGetInteger("gCheckTrackerSkippedHide", 0)) - return; - mainColor = CVarGetColor("gCheckTrackerSkippedMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_SEEN) { - if (!showHidden && CVarGetInteger("gCheckTrackerSeenHide", 0)) - return; - mainColor = CVarGetColor("gCheckTrackerSeenMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_HINTED) { - if (!showHidden && CVarGetInteger("gCheckTrackerHintedHide", 0)) - return; - mainColor = CVarGetColor("gCheckTrackerHintedMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerHintedExtraColor", Color_Hinted_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_CHECKED) { - if (!showHidden && CVarGetInteger("gCheckTrackerCheckedHide", 0)) - return; - mainColor = CVarGetColor("gCheckTrackerCheckedMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerCheckedExtraColor", Color_Checked_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_SCUMMED) { - if (!showHidden && CVarGetInteger("gCheckTrackerScummedHide", 0)) - return; - mainColor = CVarGetColor("gCheckTrackerScummedMainColor", Color_Main_Default); - extraColor = CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default); - } else if (*thisCheckStatus == RCSHOW_SAVED) { + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default) : + CVarGetColor("gCheckTrackerCollectedMainColor", Color_Main_Default); + extraColor = CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default); + } else if (status == RCSHOW_SAVED) { if (!showHidden && CVarGetInteger("gCheckTrackerSavedHide", 0)) return; - mainColor = CVarGetColor("gCheckTrackerSavedMainColor", Color_Main_Default); + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default) : + CVarGetColor("gCheckTrackerSavedMainColor", Color_Main_Default); extraColor = CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default); + } else if (skipped) { + if (!showHidden && CVarGetInteger("gCheckTrackerSkippedHide", 0)) + return; + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default) : + CVarGetColor("gCheckTrackerSkippedMainColor", Color_Main_Default); + extraColor = CVarGetColor("gCheckTrackerSkippedExtraColor", Color_Skipped_Extra_Default); + } else if (status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED) { + if (!showHidden && CVarGetInteger("gCheckTrackerSeenHide", 0)) + return; + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default) : + CVarGetColor("gCheckTrackerSeenMainColor", Color_Main_Default); + extraColor = CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default); + } else if (status == RCSHOW_SCUMMED) { + if (!showHidden && CVarGetInteger("gCheckTrackerKnownHide", 0)) + return; + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default) : + CVarGetColor("gCheckTrackerScummedMainColor", Color_Main_Default); + extraColor = CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default); + } else if (status == RCSHOW_UNCHECKED) { + if (!showHidden && CVarGetInteger("gCheckTrackerUncheckedHide", 0)) + return; + mainColor = !IsHeartPiece(rcObj.ogItemId) && !IS_RANDO ? CVarGetColor("gCheckTrackerUncheckedExtraColor", Color_Unchecked_Extra_Default) : + CVarGetColor("gCheckTrackerUncheckedMainColor", Color_Main_Default); + extraColor = CVarGetColor("gCheckTrackerUncheckedExtraColor", Color_Unchecked_Extra_Default); } //Main Text @@ -803,17 +1273,19 @@ void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckSta if (lastLocationChecked == rcObj.rc) txt = "* " + txt; - // Draw button - for Skipped/Unchecked only - if (*thisCheckStatus == RCSHOW_UNCHECKED || *thisCheckStatus == RCSHOW_SKIPPED) { - bool skipped = (*thisCheckStatus == RCSHOW_SKIPPED); - if (ImGui::ArrowButton(std::to_string(rcObj.rc).c_str(), skipped ? ImGuiDir_Left : ImGuiDir_Right)) { + // Draw button - for Skipped/Seen/Scummed/Unchecked only + if (status == RCSHOW_UNCHECKED || status == RCSHOW_SEEN || status == RCSHOW_IDENTIFIED || status == RCSHOW_SCUMMED || skipped) { + if (UIWidgets::StateButton(std::to_string(rcObj.rc).c_str(), skipped ? ICON_FA_PLUS : ICON_FA_TIMES)) { if (skipped) { - gSaveContext.sohStats.locationsSkipped[rcObj.rc] = 0; - *thisCheckStatus = RCSHOW_UNCHECKED; + gSaveContext.checkTrackerData[rcObj.rc].skipped = false; + areaChecksGotten[rcObj.rcArea]--; } else { - gSaveContext.sohStats.locationsSkipped[rcObj.rc] = 1; - *thisCheckStatus = RCSHOW_SKIPPED; + gSaveContext.checkTrackerData[rcObj.rc].skipped = true; + areaChecksGotten[rcObj.rcArea]++; } + UpdateOrdering(rcObj.rcArea); + UpdateInventoryChecks(); + SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true); } } else { ImGui::InvisibleButton("", ImVec2(20.0f, 10.0f)); @@ -826,42 +1298,63 @@ void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckSta ImGui::PopStyleColor(); //Draw the extra info - if (*thisCheckStatus != RCSHOW_UNCHECKED) { - switch (*thisCheckStatus) { - case RCSHOW_SAVED: - case RCSHOW_CHECKED: - case RCSHOW_SCUMMED: - if (IS_RANDO) - txt = OTRGlobals::Instance->gRandomizer - ->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.rgID][gSaveContext.language]; - else if (gSaveContext.language == LANGUAGE_ENG) - txt = ItemFromGIID(rcObj.ogItemId).GetName().english; - else if (gSaveContext.language == LANGUAGE_FRA) - txt = ItemFromGIID(rcObj.ogItemId).GetName().french; - break; - case RCSHOW_SKIPPED: - txt = "Skipped"; //TODO language - break; - case RCSHOW_SEEN: - if (IS_RANDO) - txt = OTRGlobals::Instance->gRandomizer - ->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.fakeRgID][gSaveContext.language]; - else if (gSaveContext.language == LANGUAGE_ENG) - txt = ItemFromGIID(rcObj.ogItemId).GetName().english; - else if (gSaveContext.language == LANGUAGE_FRA) - txt = ItemFromGIID(rcObj.ogItemId).GetName().french; - break; - case RCSHOW_HINTED: - txt = "Hints are WIP"; // TODO language - break; - } + txt = ""; + if (checkData.hintItem != 0) { + // TODO hints + } else if (status != RCSHOW_UNCHECKED) { + switch (status) { + case RCSHOW_SAVED: + case RCSHOW_COLLECTED: + case RCSHOW_SCUMMED: + if (IS_RANDO) { + txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.rgID][gSaveContext.language]; + } else { + if (IsHeartPiece(rcObj.ogItemId)) { + if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) { + txt = ItemFromGIID(rcObj.ogItemId).GetName().english; + } else if (gSaveContext.language == LANGUAGE_FRA) { + txt = ItemFromGIID(rcObj.ogItemId).GetName().french; + } + } + } + break; + case RCSHOW_IDENTIFIED: + case RCSHOW_SEEN: + if (IS_RANDO) { + if (gSaveContext.itemLocations[rcObj.rc].get.rgID == RG_ICE_TRAP) { + if (status == RCSHOW_IDENTIFIED) { + txt = gSaveContext.itemLocations[rcObj.rc].get.trickName; + } else { + txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.fakeRgID][gSaveContext.language]; + } + } else { + txt = OTRGlobals::Instance->gRandomizer->EnumToSpoilerfileGetName[gSaveContext.itemLocations[rcObj.rc].get.rgID][gSaveContext.language]; + } + if (status == RCSHOW_IDENTIFIED) { + txt += fmt::format(" - {}", gSaveContext.checkTrackerData[rcObj.rc].price); + } + } else { + if (IsHeartPiece(rcObj.ogItemId)) { + if (gSaveContext.language == LANGUAGE_ENG || gSaveContext.language == LANGUAGE_GER) { + txt = ItemFromGIID(rcObj.ogItemId).GetName().english; + } else if (gSaveContext.language == LANGUAGE_FRA) { + txt = ItemFromGIID(rcObj.ogItemId).GetName().french; + } + } + } + break; + } + } + if (txt == "" && skipped) + txt = "Skipped"; //TODO language + + if (txt != "") { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, extraColor.b / 255.0f, extraColor.a / 255.0f)); ImGui::SameLine(); ImGui::Text(" (%s)", txt.c_str()); ImGui::PopStyleColor(); } - } static std::set rainbowCVars = { @@ -871,7 +1364,7 @@ static std::set rainbowCVars = { "gCheckTrackerSkippedMainColor", "gCheckTrackerSkippedExtraColor", "gCheckTrackerSeenMainColor", "gCheckTrackerSeenExtraColor", "gCheckTrackerHintedMainColor", "gCheckTrackerHintedExtraColor", - "gCheckTrackerCheckedMainColor", "gCheckTrackerCheckedExtraColor", + "gCheckTrackerCollectedMainColor", "gCheckTrackerCollectedExtraColor", "gCheckTrackerScummedMainColor", "gCheckTrackerScummedExtraColor", "gCheckTrackerSavedMainColor", "gCheckTrackerSavedExtraColor", }; @@ -898,7 +1391,7 @@ void RainbowTick() { void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName, const char* cvarExtraName, Color_RGBA8& main_color, Color_RGBA8& extra_color, Color_RGBA8& main_default_color, - Color_RGBA8& extra_default_color, const char* cvarHideName) { + Color_RGBA8& extra_default_color, const char* cvarHideName, const char* tooltip) { Color_RGBA8 cvarMainColor = CVarGetColor(cvarMainName, main_default_color); Color_RGBA8 cvarExtraColor = CVarGetColor(cvarExtraName, extra_default_color); main_color = cvarMainColor; @@ -940,10 +1433,13 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName, ImGui::EndTable(); } } + if (tooltip != "") { + ImGui::SameLine(); + ImGui::Text(" ?"); + UIWidgets::Tooltip(tooltip); + } } - - static const char* windowType[] = { "Floating", "Window" }; static const char* displayType[] = { "Always", "Combo Button Hold" }; static const char* buttonStrings[] = { "A Button", "B Button", "C-Up", "C-Down", "C-Left", "C-Right", "L Button", @@ -983,22 +1479,22 @@ void CheckTrackerSettingsWindow::DrawElement() { UIWidgets::LabeledRightAlignedEnhancementCombobox("Combo Button 2", "gCheckTrackerComboButton2", buttonStrings, TRACKER_COMBO_BUTTON_R); } } - UIWidgets::EnhancementCheckbox("Performance mode", "gCheckTrackerOptionPerformanceMode"); - UIWidgets::Tooltip("Slows down checking for updates to 1 check per frame. Only required if experiencing poor performance when using Check Tracker."); UIWidgets::EnhancementCheckbox("Vanilla/MQ Dungeon Spoilers", "gCheckTrackerOptionMQSpoilers"); - UIWidgets::Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. Otherwise, Vanilla/MQ dungeon locations must be unlocked. "); + UIWidgets::Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. Otherwise, Vanilla/MQ dungeon locations must be unlocked."); + UIWidgets::EnhancementCheckbox("Hide right-side shop item checks", "gCheckTrackerOptionHideRightShopChecks", false, "", UIWidgets::CheckboxGraphics::Cross, true); + UIWidgets::Tooltip("If enabled, will prevent the tracker from displaying slots 1-4 in all shops. Requires save reload."); ImGui::TableNextColumn(); - ImGuiDrawTwoColorPickerSection("Area Incomplete", "gCheckTrackerAreaMainIncompleteColor", "gCheckTrackerAreaExtraIncompleteColor", Color_Area_Incomplete_Main, Color_Area_Incomplete_Extra, Color_Main_Default, Color_Area_Incomplete_Extra_Default, "gCheckTrackerAreaIncompleteHide" ); - ImGuiDrawTwoColorPickerSection("Area Complete", "gCheckTrackerAreaMainCompleteColor", "gCheckTrackerAreaExtraCompleteColor", Color_Area_Complete_Main, Color_Area_Complete_Extra, Color_Main_Default, Color_Area_Complete_Extra_Default, "gCheckTrackerAreaCompleteHide" ); - ImGuiDrawTwoColorPickerSection("Unchecked", "gCheckTrackerUncheckedMainColor", "gCheckTrackerUncheckedExtraColor", Color_Unchecked_Main, Color_Unchecked_Extra, Color_Main_Default, Color_Unchecked_Extra_Default, "gCheckTrackerUncheckedHide" ); - ImGuiDrawTwoColorPickerSection("Skipped", "gCheckTrackerSkippedMainColor", "gCheckTrackerSkippedExtraColor", Color_Skipped_Main, Color_Skipped_Extra, Color_Main_Default, Color_Skipped_Extra_Default, "gCheckTrackerSkippedHide" ); - ImGuiDrawTwoColorPickerSection("Seen (WIP)", "gCheckTrackerSeenMainColor", "gCheckTrackerSeenExtraColor", Color_Seen_Main, Color_Seen_Extra, Color_Main_Default, Color_Seen_Extra_Default, "gCheckTrackerSeenHide" ); - ImGuiDrawTwoColorPickerSection("Hinted (WIP)", "gCheckTrackerHintedMainColor", "gCheckTrackerHintedExtraColor", Color_Hinted_Main, Color_Hinted_Extra, Color_Main_Default, Color_Hinted_Extra_Default, "gCheckTrackerHintedHide" ); - ImGuiDrawTwoColorPickerSection("Checked (WIP)", "gCheckTrackerCheckedMainColor", "gCheckTrackerCheckedExtraColor", Color_Checked_Main, Color_Checked_Extra, Color_Main_Default, Color_Checked_Extra_Default, "gCheckTrackerCheckedHide" ); - ImGuiDrawTwoColorPickerSection("Scummed (WIP)", "gCheckTrackerScummedMainColor", "gCheckTrackerScummedExtraColor", Color_Scummed_Main, Color_Scummed_Extra, Color_Main_Default, Color_Scummed_Extra_Default, "gCheckTrackerScummedHide" ); - ImGuiDrawTwoColorPickerSection("Saved", "gCheckTrackerSavedMainColor", "gCheckTrackerSavedExtraColor", Color_Saved_Main, Color_Saved_Extra, Color_Main_Default, Color_Saved_Extra_Default, "gCheckTrackerSavedHide" ); + CheckTracker::ImGuiDrawTwoColorPickerSection("Area Incomplete", "gCheckTrackerAreaMainIncompleteColor", "gCheckTrackerAreaExtraIncompleteColor", Color_Area_Incomplete_Main, Color_Area_Incomplete_Extra, Color_Main_Default, Color_Area_Incomplete_Extra_Default, "gCheckTrackerAreaIncompleteHide", ""); + CheckTracker::ImGuiDrawTwoColorPickerSection("Area Complete", "gCheckTrackerAreaMainCompleteColor", "gCheckTrackerAreaExtraCompleteColor", Color_Area_Complete_Main, Color_Area_Complete_Extra, Color_Main_Default, Color_Area_Complete_Extra_Default, "gCheckTrackerAreaCompleteHide", ""); + CheckTracker::ImGuiDrawTwoColorPickerSection("Unchecked", "gCheckTrackerUncheckedMainColor", "gCheckTrackerUncheckedExtraColor", Color_Unchecked_Main, Color_Unchecked_Extra, Color_Main_Default, Color_Unchecked_Extra_Default, "gCheckTrackerUncheckedHide", "Checks you have not interacted with at all."); + CheckTracker::ImGuiDrawTwoColorPickerSection("Skipped", "gCheckTrackerSkippedMainColor", "gCheckTrackerSkippedExtraColor", Color_Skipped_Main, Color_Skipped_Extra, Color_Main_Default, Color_Skipped_Extra_Default, "gCheckTrackerSkippedHide", ""); + CheckTracker::ImGuiDrawTwoColorPickerSection("Seen", "gCheckTrackerSeenMainColor", "gCheckTrackerSeenExtraColor", Color_Seen_Main, Color_Seen_Extra, Color_Main_Default, Color_Seen_Extra_Default, "gCheckTrackerSeenHide", "Used for shops. Shows item names for shop slots when walking in, and prices when highlighting them in buy mode."); + CheckTracker::ImGuiDrawTwoColorPickerSection("Scummed", "gCheckTrackerScummedMainColor", "gCheckTrackerScummedExtraColor", Color_Scummed_Main, Color_Scummed_Extra, Color_Main_Default, Color_Scummed_Extra_Default, "gCheckTrackerScummedHide", "Checks you collect, but then reload before saving so you no longer have them."); + //CheckTracker::ImGuiDrawTwoColorPickerSection("Hinted (WIP)", "gCheckTrackerHintedMainColor", "gCheckTrackerHintedExtraColor", Color_Hinted_Main, Color_Hinted_Extra, Color_Main_Default, Color_Hinted_Extra_Default, "gCheckTrackerHintedHide", ""); + CheckTracker::ImGuiDrawTwoColorPickerSection("Collected", "gCheckTrackerCollectedMainColor", "gCheckTrackerCollectedExtraColor", Color_Collected_Main, Color_Collected_Extra, Color_Main_Default, Color_Collected_Extra_Default, "gCheckTrackerCollectedHide", "Checks you have collected without saving or reloading yet."); + CheckTracker::ImGuiDrawTwoColorPickerSection("Saved", "gCheckTrackerSavedMainColor", "gCheckTrackerSavedExtraColor", Color_Saved_Main, Color_Saved_Extra, Color_Main_Default, Color_Saved_Extra_Default, "gCheckTrackerSavedHide", "Checks that you saved the game while having collected."); ImGui::PopStyleVar(1); ImGui::EndTable(); @@ -1006,7 +1502,7 @@ void CheckTrackerSettingsWindow::DrawElement() { } void CheckTrackerWindow::InitElement() { - Color_Background = CVarGetColor("gCheckTrackerBgColor", Color_Bg_Default); + Color_Background = CVarGetColor("gCheckTrackerBgColor", Color_Bg_Default); Color_Area_Incomplete_Main = CVarGetColor("gCheckTrackerAreaMainIncompleteColor", Color_Main_Default); Color_Area_Incomplete_Extra = CVarGetColor("gCheckTrackerAreaExtraIncompleteColor", Color_Area_Incomplete_Extra_Default); Color_Area_Complete_Main = CVarGetColor("gCheckTrackerAreaMainCompleteColor", Color_Main_Default); @@ -1019,19 +1515,25 @@ void CheckTrackerWindow::InitElement() { Color_Seen_Extra = CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default); Color_Hinted_Main = CVarGetColor("gCheckTrackerHintedMainColor", Color_Main_Default); Color_Hinted_Extra = CVarGetColor("gCheckTrackerHintedExtraColor", Color_Hinted_Extra_Default); - Color_Checked_Main = CVarGetColor("gCheckTrackerCheckedMainColor", Color_Main_Default); - Color_Checked_Extra = CVarGetColor("gCheckTrackerCheckedExtraColor", Color_Checked_Extra_Default); + Color_Collected_Main = CVarGetColor("gCheckTrackerCollectedMainColor", Color_Main_Default); + Color_Collected_Extra = CVarGetColor("gCheckTrackerCollectedExtraColor", Color_Collected_Extra_Default); Color_Scummed_Main = CVarGetColor("gCheckTrackerScummedMainColor", Color_Main_Default); Color_Scummed_Extra = CVarGetColor("gCheckTrackerScummedExtraColor", Color_Scummed_Extra_Default); Color_Saved_Main = CVarGetColor("gCheckTrackerSavedMainColor", Color_Main_Default); Color_Saved_Extra = CVarGetColor("gCheckTrackerSavedExtraColor", Color_Saved_Extra_Default); - GameInteractor::Instance->RegisterGameHook([](uint32_t fileNum) { - doInitialize = true; - }); - GameInteractor::Instance->RegisterGameHook([](uint32_t fileNum) { + SaveManager::Instance->AddInitFunction(InitTrackerData); + sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, -1); + SaveManager::Instance->AddLoadFunction("trackerData", 1, LoadFile); + GameInteractor::Instance->RegisterGameHook([](uint32_t fileNum) { Teardown(); }); + GameInteractor::Instance->RegisterGameHook(CheckTrackerItemReceive); + GameInteractor::Instance->RegisterGameHook(CheckTrackerSaleEnd); + GameInteractor::Instance->RegisterGameHook(CheckTrackerFrame); + GameInteractor::Instance->RegisterGameHook(CheckTrackerTransition); + GameInteractor::Instance->RegisterGameHook(CheckTrackerShopSlotChange); + LocationTable_Init(); } diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h index 0ed3a8526..b2193f696 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h @@ -1,4 +1,7 @@ #pragma once +#include +#include "randomizerTypes.h" +#include "randomizer_check_objects.h" #include @@ -26,17 +29,6 @@ class CheckTrackerWindow : public LUS::GuiWindow { void UpdateElement() override {}; }; -// Check tracker check visibility categories -typedef enum { - RCSHOW_UNCHECKED, - RCSHOW_SKIPPED, - RCSHOW_SEEN, - RCSHOW_HINTED, - RCSHOW_CHECKED, - RCSHOW_SCUMMED, - RCSHOW_SAVED, -} RandomizerCheckShow; - //Converts an index into a Little Endian bitmask, as follows: //00: 0000000100000000 //01: 0000001000000000 @@ -51,6 +43,18 @@ typedef enum { //repeat... #define INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(idx) (0x8000 >> (7 - (idx % 8) + ((idx % 16) / 8) * 8)) +void DefaultCheckData(RandomizerCheck rc); +void Teardown(); +void UpdateAllOrdering(); +bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj); +void InitTrackerData(bool isDebug); +void SetLastItemGetRC(RandomizerCheck rc); +RandomizerCheckArea GetCheckArea(); +void CheckTrackerDialogClosed(); +void ToggleShopRightChecks(); +void UpdateCheck(uint32_t, RandomizerCheckTrackerData); +} // namespace CheckTracker -} // namespace CheckTracker \ No newline at end of file +void to_json(nlohmann::json & j, const RandomizerCheckTrackerData& rctd); +void from_json(const nlohmann::json& j, RandomizerCheckTrackerData& rctd); diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp index 3fcfff43b..fe335c2b6 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp @@ -319,7 +319,7 @@ const EntranceData entranceData[] = { { 0x03AC, 0x0130, SINGLE_SCENE_INFO(0x5E), "Haunted Wasteland", "GF", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hw,gerudo fortress"}, { 0x0123, 0x0365, SINGLE_SCENE_INFO(0x5E), "Haunted Wasteland", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, { 0x0365, 0x0123, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Haunted Wasteland", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, - { 0x0588, 0x057C, SINGLE_SCENE_INFO(0x5C), "Colossus", "Colossus Great Fairy Fountain", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc", 1}, + { 0x0588, 0x057C, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Colossus Great Fairy Fountain", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc", 1}, { 0x0700, 0x0800, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Colossus Grotto", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_GROTTO, "dc,scrubs", 1}, { 0x0082, 0x01E1, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Spirit Temple", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "dc", 1}, { 0x057C, 0x0588, {{ 0x3D, 0x02 }}, "Colossus Great Fairy Fountain", "Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc"}, @@ -537,6 +537,14 @@ void SortEntranceListByArea(EntranceOverride* entranceList, u8 byDest) { } } +s16 GetLastEntranceOverride() { + return lastEntranceIndex; +} + +s16 GetCurrentGrottoId() { + return currentGrottoId; +} + void SetCurrentGrottoIDForTracker(s16 entranceIndex) { currentGrottoId = entranceIndex; } diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h index e0c216dcf..fc5346aa3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h @@ -3,6 +3,7 @@ #include #include #include + #include typedef enum { @@ -80,6 +81,9 @@ void SetCurrentGrottoIDForTracker(int16_t entranceIndex); void SetLastEntranceOverrideForTracker(int16_t entranceIndex); void ClearEntranceTrackingData(); void InitEntranceTrackingData(); +s16 GetLastEntranceOverride(); +s16 GetCurrentGrottoId(); +const EntranceData* GetEntranceData(s16); class EntranceTrackerWindow : public LUS::GuiWindow { public: @@ -88,4 +92,4 @@ class EntranceTrackerWindow : public LUS::GuiWindow { void InitElement() override; void DrawElement() override; void UpdateElement() override {}; -}; \ No newline at end of file +}; diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index 22084c11e..f24ab818b 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -611,7 +611,7 @@ void DrawItem(ItemTrackerItem item) { break; } - if (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end()) { + if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) { item = actualItemTrackerItemMap[actualItemId]; } @@ -634,7 +634,7 @@ void DrawBottle(ItemTrackerItem item) { uint32_t actualItemId = gSaveContext.inventory.items[SLOT(item.id) + item.data]; bool hasItem = actualItemId != ITEM_NONE; - if (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end()) { + if (GameInteractor::IsSaveLoaded() && (hasItem && item.id != actualItemId && actualItemTrackerItemMap.find(actualItemId) != actualItemTrackerItemMap.end())) { item = actualItemTrackerItemMap[actualItemId]; } diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 74ca8dc07..8b56d352c 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -2198,3 +2198,7 @@ extern "C" void EntranceTracker_SetLastEntranceOverride(s16 entranceIndex) { extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement) { gfx_register_blended_texture(name, mask, replacement); } + +extern "C" void CheckTracker_OnMessageClose() { + CheckTracker::CheckTrackerDialogClosed(); +} \ No newline at end of file diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index 29d4a3f84..b24f59d8b 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -154,6 +154,7 @@ void EntranceTracker_SetCurrentGrottoID(s16 entranceIndex); void EntranceTracker_SetLastEntranceOverride(s16 entranceIndex); void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement); void SaveManager_ThreadPoolWait(); +void CheckTracker_OnMessageClose(); int32_t GetGIID(uint32_t itemID); #endif diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 4e84bfab5..651c9563c 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -1590,9 +1590,6 @@ void SaveManager::LoadBaseVersion3() { SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.sohStats.entrancesDiscovered), [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.sohStats.entrancesDiscovered[i]); }); - SaveManager::Instance->LoadArray("locationsSkipped", ARRAY_COUNT(gSaveContext.sohStats.locationsSkipped), [](size_t i) { - SaveManager::Instance->LoadData("", gSaveContext.sohStats.locationsSkipped[i]); - }); }); SaveManager::Instance->LoadArray("sceneFlags", ARRAY_COUNT(gSaveContext.sceneFlags), [](size_t i) { SaveManager::Instance->LoadStruct("", [&i]() { diff --git a/soh/soh/UIWidgets.cpp b/soh/soh/UIWidgets.cpp index 64d94cc69..15bb088a3 100644 --- a/soh/soh/UIWidgets.cpp +++ b/soh/soh/UIWidgets.cpp @@ -690,4 +690,48 @@ namespace UIWidgets { } ImGui::PopID(); } + + bool StateButtonEx(const char* str_id, const char* label, ImVec2 size, ImGuiButtonFlags flags) { + ImGuiContext& g = *GImGui; + ImGuiWindow* window = ImGui::GetCurrentWindow(); + if (window->SkipItems) + return false; + + const ImGuiStyle& style = g.Style; + const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true); + + const ImGuiID id = window->GetID(str_id); + const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size); + const float default_size = ImGui::GetFrameHeight(); + ImGui::ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f); + if (!ImGui::ItemAdd(bb, id)) + return false; + + if (g.LastItemData.InFlags & ImGuiItemFlags_ButtonRepeat) + flags |= ImGuiButtonFlags_Repeat; + + bool hovered, held; + bool pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held, flags); + + // Render + const ImU32 bg_col = ImGui::GetColorU32((held && hovered) ? ImGuiCol_ButtonActive + : hovered ? ImGuiCol_ButtonHovered + : ImGuiCol_Button); + //const ImU32 text_col = ImGui::GetColorU32(ImGuiCol_Text); + ImGui::RenderNavHighlight(bb, id); + ImGui::RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding); + ImGui::RenderTextClipped(bb.Min + style.FramePadding, bb.Max - style.FramePadding, label, NULL, &label_size, {0.55f, 0.45f}, &bb); + /*ImGui::RenderArrow(window->DrawList, + bb.Min + + ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)), + text_col, dir);*/ + + IMGUI_TEST_ENGINE_ITEM_INFO(id, str_id, g.LastItemData.StatusFlags); + return pressed; + } + + bool StateButton(const char* str_id, const char* label) { + float sz = ImGui::GetFrameHeight(); + return StateButtonEx(str_id, label, ImVec2(sz, sz), ImGuiButtonFlags_None); + } } diff --git a/soh/soh/UIWidgets.hpp b/soh/soh/UIWidgets.hpp index 5df2f6e9b..b18487977 100644 --- a/soh/soh/UIWidgets.hpp +++ b/soh/soh/UIWidgets.hpp @@ -95,6 +95,7 @@ namespace UIWidgets { void DrawFlagArray32(const std::string& name, uint32_t& flags); void DrawFlagArray16(const std::string& name, uint16_t& flags); void DrawFlagArray8(const std::string& name, uint8_t& flags); + bool StateButton(const char* str_id, const char* label); } #endif /* UIWidgets_hpp */ diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index c88c698c7..78eac4ece 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -3384,6 +3384,7 @@ void Message_Update(PlayState* play) { } sLastPlayedSong = 0xFF; osSyncPrintf("OCARINA_MODE=%d chk_ocarina_no=%d\n", play->msgCtx.ocarinaMode, msgCtx->unk_E3F2); + CheckTracker_OnMessageClose(); break; case MSGMODE_PAUSED: break; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index db938a4c2..dfafbb7ff 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -967,6 +967,7 @@ void Play_Update(PlayState* play) { R_UPDATE_RATE = 3; } + // Transition end for standard transitions GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); } play->sceneLoadFlag = 0; @@ -1075,6 +1076,9 @@ void Play_Update(PlayState* play) { R_UPDATE_RATE = 3; play->sceneLoadFlag = 0; play->transitionMode = 0; + + // Transition end for sandstorm effect (delayed until effect is finished) + GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); } } else { if (play->envCtx.sandstormEnvA == 255) { @@ -1109,6 +1113,9 @@ void Play_Update(PlayState* play) { R_UPDATE_RATE = 3; play->sceneLoadFlag = 0; play->transitionMode = 0; + + // Transition end for sandstorm effect (delayed until effect is finished) + GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); } } break; diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 5d3ebd5eb..2ae32e916 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -15,6 +15,7 @@ #include "objects/object_masterkokirihead/object_masterkokirihead.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" #include "soh/Enhancements/cosmetics/cosmeticsTypes.h" +#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_WHILE_CULLED) @@ -1005,6 +1006,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play Interface_SetDoAction(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; func_80078884(NA_SE_SY_CURSOR); + GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice); } } else if ((this->stickAccumX > 0) || (dpad && CHECK_BTN_ALL(input->press.button, dRight))) { nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0); @@ -1014,6 +1016,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play Interface_SetDoAction(play, DO_ACTION_DECIDE); this->stickRightPrompt.isEnabled = false; func_80078884(NA_SE_SY_CURSOR); + GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice); } } } @@ -1277,6 +1280,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe } EnOssan_CursorUpDown(this, play); if (this->cursorIndex != prevIndex) { + GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice); Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); func_80078884(NA_SE_SY_CURSOR); } @@ -1346,6 +1350,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play } EnOssan_CursorUpDown(this, play); if (this->cursorIndex != prevIndex) { + GameInteractor_ExecuteOnShopSlotChangeHooks(this->cursorIndex, this->shelfSlots[this->cursorIndex]->basePrice); Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); func_80078884(NA_SE_SY_CURSOR); } From b70837f5ea79b51021e7ede1468b2aac3cea4b13 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Wed, 4 Oct 2023 11:05:02 -0400 Subject: [PATCH 08/77] N64 PAL 1.0 support (#3182) * initial n64 pal 1.0 support - hashes and rominfo * initial xml copy pal 1.0 * initial offset fixes * update title copyright to be platform based * bump lus for clearMtx * add scripted xml definitions * offset fixes and xml fixups * rename and sort pal mq definition * more offset fixes --- OTRExporter/rom_info.py | 1 + docs/supportedHashes.json | 4 + scripts/linux/appimage/soh.sh | 14 + soh/assets/extractor/Config_N64_PAL_10.xml | 8 + soh/assets/xml/GC_NMQ_D/objects/object_md.xml | 2 +- .../xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml | 2 +- .../GC_NMQ_D/scenes/dungeons/ddan_boss.xml | 2 +- .../GC_NMQ_D/textures/do_action_static.xml | 6 +- .../xml/GC_NMQ_PAL_F/objects/object_md.xml | 2 +- .../GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml | 2 +- .../GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml | 2 +- .../scenes/dungeons/ddan_boss.xml | 2 +- .../textures/do_action_static.xml | 6 +- soh/assets/xml/N64_PAL_10/audio/Audio.xml | 1558 +++++++++++++++++ .../xml/N64_PAL_10/code/fbdemo_circle.xml | 13 + .../xml/N64_PAL_10/code/fbdemo_triforce.xml | 8 + .../xml/N64_PAL_10/code/fbdemo_wipe1.xml | 10 + .../xml/N64_PAL_10/misc/link_animetion.xml | 577 ++++++ .../objects/gameplay_dangeon_keep.xml | 75 + .../objects/gameplay_field_keep.xml | 62 + .../xml/N64_PAL_10/objects/gameplay_keep.xml | 973 ++++++++++ .../xml/N64_PAL_10/objects/object_Bb.xml | 37 + .../xml/N64_PAL_10/objects/object_ahg.xml | 61 + .../xml/N64_PAL_10/objects/object_am.xml | 22 + .../xml/N64_PAL_10/objects/object_ane.xml | 59 + .../xml/N64_PAL_10/objects/object_ani.xml | 67 + .../xml/N64_PAL_10/objects/object_anubice.xml | 29 + .../xml/N64_PAL_10/objects/object_aob.xml | 59 + .../xml/N64_PAL_10/objects/object_b_heart.xml | 8 + .../xml/N64_PAL_10/objects/object_bba.xml | 45 + .../objects/object_bdan_objects.xml | 61 + .../xml/N64_PAL_10/objects/object_bdoor.xml | 15 + .../xml/N64_PAL_10/objects/object_bg.xml | 50 + .../N64_PAL_10/objects/object_bigokuta.xml | 58 + .../xml/N64_PAL_10/objects/object_bird.xml | 30 + .../xml/N64_PAL_10/objects/object_bji.xml | 56 + .../xml/N64_PAL_10/objects/object_bl.xml | 32 + .../xml/N64_PAL_10/objects/object_blkobj.xml | 37 + .../xml/N64_PAL_10/objects/object_bob.xml | 47 + .../xml/N64_PAL_10/objects/object_boj.xml | 65 + .../xml/N64_PAL_10/objects/object_bombf.xml | 14 + .../xml/N64_PAL_10/objects/object_bombiwa.xml | 7 + .../xml/N64_PAL_10/objects/object_bowl.xml | 18 + .../xml/N64_PAL_10/objects/object_box.xml | 30 + .../xml/N64_PAL_10/objects/object_brob.xml | 25 + .../xml/N64_PAL_10/objects/object_bubble.xml | 6 + .../xml/N64_PAL_10/objects/object_bv.xml | 116 ++ .../xml/N64_PAL_10/objects/object_bw.xml | 29 + .../xml/N64_PAL_10/objects/object_bwall.xml | 7 + .../xml/N64_PAL_10/objects/object_bxa.xml | 13 + .../xml/N64_PAL_10/objects/object_cne.xml | 53 + .../xml/N64_PAL_10/objects/object_cob.xml | 41 + .../xml/N64_PAL_10/objects/object_cow.xml | 55 + .../xml/N64_PAL_10/objects/object_crow.xml | 11 + .../xml/N64_PAL_10/objects/object_cs.xml | 60 + .../N64_PAL_10/objects/object_d_elevator.xml | 7 + .../N64_PAL_10/objects/object_d_hsblock.xml | 10 + .../xml/N64_PAL_10/objects/object_d_lift.xml | 8 + .../xml/N64_PAL_10/objects/object_daiku.xml | 60 + .../objects/object_ddan_objects.xml | 32 + .../N64_PAL_10/objects/object_dekubaba.xml | 38 + .../xml/N64_PAL_10/objects/object_dekujr.xml | 13 + .../N64_PAL_10/objects/object_dekunuts.xml | 32 + .../xml/N64_PAL_10/objects/object_demo_6k.xml | 13 + .../N64_PAL_10/objects/object_demo_kekkai.xml | 57 + .../objects/object_demo_tre_lgt.xml | 6 + .../xml/N64_PAL_10/objects/object_dh.xml | 59 + .../xml/N64_PAL_10/objects/object_dnk.xml | 35 + .../xml/N64_PAL_10/objects/object_dns.xml | 40 + .../xml/N64_PAL_10/objects/object_dodojr.xml | 33 + .../xml/N64_PAL_10/objects/object_dodongo.xml | 41 + .../xml/N64_PAL_10/objects/object_dog.xml | 41 + .../N64_PAL_10/objects/object_door_gerudo.xml | 7 + .../N64_PAL_10/objects/object_door_killer.xml | 17 + .../xml/N64_PAL_10/objects/object_ds.xml | 38 + .../xml/N64_PAL_10/objects/object_ds2.xml | 34 + .../xml/N64_PAL_10/objects/object_du.xml | 81 + .../xml/N64_PAL_10/objects/object_dy_obj.xml | 121 ++ .../xml/N64_PAL_10/objects/object_ec.xml | 26 + .../objects/object_efc_crystal_light.xml | 6 + .../objects/object_efc_doughnut.xml | 8 + .../N64_PAL_10/objects/object_efc_erupc.xml | 12 + .../objects/object_efc_fire_ball.xml | 7 + .../N64_PAL_10/objects/object_efc_flash.xml | 6 + .../objects/object_efc_lgt_shower.xml | 6 + .../objects/object_efc_star_field.xml | 8 + .../xml/N64_PAL_10/objects/object_efc_tw.xml | 13 + .../xml/N64_PAL_10/objects/object_ei.xml | 56 + .../xml/N64_PAL_10/objects/object_fa.xml | 15 + .../xml/N64_PAL_10/objects/object_fd.xml | 103 ++ .../xml/N64_PAL_10/objects/object_fd2.xml | 52 + .../xml/N64_PAL_10/objects/object_fhg.xml | 54 + .../xml/N64_PAL_10/objects/object_fire.xml | 14 + .../xml/N64_PAL_10/objects/object_firefly.xml | 21 + .../xml/N64_PAL_10/objects/object_fish.xml | 180 ++ .../xml/N64_PAL_10/objects/object_fr.xml | 65 + .../xml/N64_PAL_10/objects/object_fu.xml | 55 + .../xml/N64_PAL_10/objects/object_fw.xml | 106 ++ .../xml/N64_PAL_10/objects/object_fz.xml | 12 + .../xml/N64_PAL_10/objects/object_ganon.xml | 106 ++ .../xml/N64_PAL_10/objects/object_ganon2.xml | 174 ++ .../objects/object_ganon_anime1.xml | 29 + .../objects/object_ganon_anime2.xml | 21 + .../objects/object_ganon_anime3.xml | 13 + .../objects/object_ganon_objects.xml | 6 + .../xml/N64_PAL_10/objects/object_ge1.xml | 78 + .../xml/N64_PAL_10/objects/object_geff.xml | 7 + .../xml/N64_PAL_10/objects/object_geldb.xml | 44 + .../N64_PAL_10/objects/object_gi_arrow.xml | 7 + .../objects/object_gi_arrowcase.xml | 12 + .../xml/N64_PAL_10/objects/object_gi_bean.xml | 5 + .../N64_PAL_10/objects/object_gi_bomb_1.xml | 5 + .../N64_PAL_10/objects/object_gi_bomb_2.xml | 5 + .../objects/object_gi_bombpouch.xml | 12 + .../objects/object_gi_boomerang.xml | 5 + .../N64_PAL_10/objects/object_gi_boots_2.xml | 7 + .../N64_PAL_10/objects/object_gi_bosskey.xml | 6 + .../N64_PAL_10/objects/object_gi_bottle.xml | 6 + .../objects/object_gi_bottle_letter.xml | 6 + .../xml/N64_PAL_10/objects/object_gi_bow.xml | 5 + .../N64_PAL_10/objects/object_gi_bracelet.xml | 5 + .../objects/object_gi_brokensword.xml | 5 + .../objects/object_gi_butterfly.xml | 7 + .../N64_PAL_10/objects/object_gi_clothes.xml | 11 + .../xml/N64_PAL_10/objects/object_gi_coin.xml | 10 + .../N64_PAL_10/objects/object_gi_compass.xml | 6 + .../objects/object_gi_dekupouch.xml | 13 + .../xml/N64_PAL_10/objects/object_gi_egg.xml | 6 + .../objects/object_gi_eye_lotion.xml | 6 + .../xml/N64_PAL_10/objects/object_gi_fire.xml | 8 + .../xml/N64_PAL_10/objects/object_gi_fish.xml | 5 + .../xml/N64_PAL_10/objects/object_gi_frog.xml | 7 + .../N64_PAL_10/objects/object_gi_gerudo.xml | 6 + .../objects/object_gi_gerudomask.xml | 10 + .../N64_PAL_10/objects/object_gi_ghost.xml | 11 + .../N64_PAL_10/objects/object_gi_glasses.xml | 6 + .../N64_PAL_10/objects/object_gi_gloves.xml | 11 + .../N64_PAL_10/objects/object_gi_goddess.xml | 9 + .../objects/object_gi_golonmask.xml | 10 + .../N64_PAL_10/objects/object_gi_grass.xml | 5 + .../N64_PAL_10/objects/object_gi_hammer.xml | 5 + .../N64_PAL_10/objects/object_gi_heart.xml | 5 + .../N64_PAL_10/objects/object_gi_hearts.xml | 7 + .../N64_PAL_10/objects/object_gi_hookshot.xml | 6 + .../objects/object_gi_hoverboots.xml | 7 + .../N64_PAL_10/objects/object_gi_insect.xml | 6 + .../N64_PAL_10/objects/object_gi_jewel.xml | 15 + .../xml/N64_PAL_10/objects/object_gi_key.xml | 5 + .../objects/object_gi_ki_tan_mask.xml | 7 + .../N64_PAL_10/objects/object_gi_letter.xml | 8 + .../N64_PAL_10/objects/object_gi_liquid.xml | 19 + .../objects/object_gi_longsword.xml | 5 + .../N64_PAL_10/objects/object_gi_m_arrow.xml | 9 + .../N64_PAL_10/objects/object_gi_magicpot.xml | 6 + .../xml/N64_PAL_10/objects/object_gi_map.xml | 7 + .../N64_PAL_10/objects/object_gi_medal.xml | 11 + .../N64_PAL_10/objects/object_gi_melody.xml | 11 + .../xml/N64_PAL_10/objects/object_gi_milk.xml | 7 + .../N64_PAL_10/objects/object_gi_mushroom.xml | 5 + .../N64_PAL_10/objects/object_gi_niwatori.xml | 10 + .../xml/N64_PAL_10/objects/object_gi_nuts.xml | 6 + .../N64_PAL_10/objects/object_gi_ocarina.xml | 7 + .../objects/object_gi_ocarina_0.xml | 7 + .../N64_PAL_10/objects/object_gi_pachinko.xml | 5 + .../N64_PAL_10/objects/object_gi_powder.xml | 5 + .../objects/object_gi_prescription.xml | 7 + .../N64_PAL_10/objects/object_gi_purse.xml | 17 + .../objects/object_gi_rabit_mask.xml | 7 + .../objects/object_gi_redead_mask.xml | 5 + .../xml/N64_PAL_10/objects/object_gi_rupy.xml | 16 + .../xml/N64_PAL_10/objects/object_gi_saw.xml | 5 + .../N64_PAL_10/objects/object_gi_scale.xml | 10 + .../xml/N64_PAL_10/objects/object_gi_seed.xml | 5 + .../N64_PAL_10/objects/object_gi_shield_1.xml | 6 + .../N64_PAL_10/objects/object_gi_shield_2.xml | 5 + .../N64_PAL_10/objects/object_gi_shield_3.xml | 8 + .../N64_PAL_10/objects/object_gi_skj_mask.xml | 5 + .../N64_PAL_10/objects/object_gi_soldout.xml | 6 + .../xml/N64_PAL_10/objects/object_gi_soul.xml | 8 + .../N64_PAL_10/objects/object_gi_stick.xml | 5 + .../N64_PAL_10/objects/object_gi_sutaru.xml | 6 + .../N64_PAL_10/objects/object_gi_sword_1.xml | 5 + .../objects/object_gi_ticketstone.xml | 8 + .../objects/object_gi_truth_mask.xml | 8 + .../N64_PAL_10/objects/object_gi_zoramask.xml | 10 + .../xml/N64_PAL_10/objects/object_gj.xml | 45 + .../objects/object_gjyo_objects.xml | 7 + .../xml/N64_PAL_10/objects/object_gla.xml | 85 + .../xml/N64_PAL_10/objects/object_gm.xml | 5 + .../xml/N64_PAL_10/objects/object_gnd.xml | 87 + .../N64_PAL_10/objects/object_gnd_magic.xml | 7 + .../xml/N64_PAL_10/objects/object_gndd.xml | 106 ++ .../xml/N64_PAL_10/objects/object_god_lgt.xml | 9 + .../xml/N64_PAL_10/objects/object_gol.xml | 59 + .../xml/N64_PAL_10/objects/object_goma.xml | 169 ++ .../xml/N64_PAL_10/objects/object_goroiwa.xml | 6 + .../xml/N64_PAL_10/objects/object_gr.xml | 27 + .../xml/N64_PAL_10/objects/object_gs.xml | 8 + .../xml/N64_PAL_10/objects/object_gt.xml | 38 + .../xml/N64_PAL_10/objects/object_haka.xml | 10 + .../N64_PAL_10/objects/object_haka_door.xml | 12 + .../objects/object_haka_objects.xml | 85 + .../objects/object_hakach_objects.xml | 29 + .../xml/N64_PAL_10/objects/object_hata.xml | 50 + .../objects/object_heavy_object.xml | 9 + .../objects/object_hidan_objects.xml | 109 ++ .../N64_PAL_10/objects/object_hintnuts.xml | 29 + .../xml/N64_PAL_10/objects/object_hni.xml | 51 + .../xml/N64_PAL_10/objects/object_horse.xml | 67 + .../N64_PAL_10/objects/object_horse_ganon.xml | 33 + .../objects/object_horse_link_child.xml | 30 + .../objects/object_horse_normal.xml | 34 + .../N64_PAL_10/objects/object_horse_zelda.xml | 26 + .../xml/N64_PAL_10/objects/object_hs.xml | 47 + .../xml/N64_PAL_10/objects/object_human.xml | 216 +++ .../N64_PAL_10/objects/object_ice_objects.xml | 26 + .../xml/N64_PAL_10/objects/object_ik.xml | 108 ++ .../xml/N64_PAL_10/objects/object_im.xml | 79 + .../xml/N64_PAL_10/objects/object_in.xml | 142 ++ .../xml/N64_PAL_10/objects/object_ingate.xml | 7 + .../xml/N64_PAL_10/objects/object_jj.xml | 77 + .../xml/N64_PAL_10/objects/object_js.xml | 55 + .../N64_PAL_10/objects/object_jya_door.xml | 8 + .../N64_PAL_10/objects/object_jya_iron.xml | 13 + .../xml/N64_PAL_10/objects/object_jya_obj.xml | 87 + .../xml/N64_PAL_10/objects/object_ka.xml | 64 + .../xml/N64_PAL_10/objects/object_kanban.xml | 18 + .../xml/N64_PAL_10/objects/object_kibako2.xml | 19 + .../N64_PAL_10/objects/object_kingdodongo.xml | 130 ++ .../xml/N64_PAL_10/objects/object_km1.xml | 39 + .../xml/N64_PAL_10/objects/object_kusa.xml | 6 + .../xml/N64_PAL_10/objects/object_kw1.xml | 63 + .../xml/N64_PAL_10/objects/object_kz.xml | 45 + .../N64_PAL_10/objects/object_light_ring.xml | 6 + .../N64_PAL_10/objects/object_lightbox.xml | 15 + .../N64_PAL_10/objects/object_lightswitch.xml | 14 + .../N64_PAL_10/objects/object_link_boy.xml | 282 +++ .../N64_PAL_10/objects/object_link_child.xml | 225 +++ .../xml/N64_PAL_10/objects/object_ma1.xml | 67 + .../xml/N64_PAL_10/objects/object_ma2.xml | 75 + .../xml/N64_PAL_10/objects/object_mag.xml | 20 + .../N64_PAL_10/objects/object_mamenoki.xml | 15 + .../N64_PAL_10/objects/object_mastergolon.xml | 5 + .../objects/object_masterkokiri.xml | 5 + .../objects/object_masterkokirihead.xml | 16 + .../N64_PAL_10/objects/object_masterzoora.xml | 5 + .../xml/N64_PAL_10/objects/object_mb.xml | 73 + .../xml/N64_PAL_10/objects/object_md.xml | 87 + .../xml/N64_PAL_10/objects/object_medal.xml | 17 + .../objects/object_menkuri_objects.xml | 18 + .../xml/N64_PAL_10/objects/object_mir_ray.xml | 13 + .../objects/object_mizu_objects.xml | 55 + .../xml/N64_PAL_10/objects/object_mjin.xml | 8 + .../N64_PAL_10/objects/object_mjin_dark.xml | 5 + .../N64_PAL_10/objects/object_mjin_flame.xml | 5 + .../N64_PAL_10/objects/object_mjin_flash.xml | 5 + .../N64_PAL_10/objects/object_mjin_ice.xml | 5 + .../N64_PAL_10/objects/object_mjin_oka.xml | 8 + .../N64_PAL_10/objects/object_mjin_soul.xml | 5 + .../N64_PAL_10/objects/object_mjin_wind.xml | 5 + .../xml/N64_PAL_10/objects/object_mk.xml | 44 + .../xml/N64_PAL_10/objects/object_mm.xml | 25 + .../xml/N64_PAL_10/objects/object_mo.xml | 87 + .../objects/object_mori_hineri1.xml | 7 + .../objects/object_mori_hineri1a.xml | 7 + .../objects/object_mori_hineri2.xml | 7 + .../objects/object_mori_hineri2a.xml | 7 + .../objects/object_mori_objects.xml | 25 + .../N64_PAL_10/objects/object_mori_tex.xml | 29 + .../xml/N64_PAL_10/objects/object_ms.xml | 43 + .../xml/N64_PAL_10/objects/object_mu.xml | 96 + .../xml/N64_PAL_10/objects/object_nb.xml | 118 ++ .../xml/N64_PAL_10/objects/object_niw.xml | 49 + .../xml/N64_PAL_10/objects/object_nwc.xml | 15 + .../xml/N64_PAL_10/objects/object_ny.xml | 10 + .../xml/N64_PAL_10/objects/object_oA1.xml | 69 + .../xml/N64_PAL_10/objects/object_oA10.xml | 66 + .../xml/N64_PAL_10/objects/object_oA11.xml | 66 + .../xml/N64_PAL_10/objects/object_oA2.xml | 58 + .../xml/N64_PAL_10/objects/object_oA3.xml | 11 + .../xml/N64_PAL_10/objects/object_oA4.xml | 64 + .../xml/N64_PAL_10/objects/object_oA5.xml | 64 + .../xml/N64_PAL_10/objects/object_oA6.xml | 64 + .../xml/N64_PAL_10/objects/object_oA7.xml | 62 + .../xml/N64_PAL_10/objects/object_oA8.xml | 61 + .../xml/N64_PAL_10/objects/object_oA9.xml | 7 + .../xml/N64_PAL_10/objects/object_oB1.xml | 69 + .../xml/N64_PAL_10/objects/object_oB2.xml | 76 + .../xml/N64_PAL_10/objects/object_oB3.xml | 70 + .../xml/N64_PAL_10/objects/object_oB4.xml | 64 + .../xml/N64_PAL_10/objects/object_oE1.xml | 70 + .../xml/N64_PAL_10/objects/object_oE10.xml | 15 + .../xml/N64_PAL_10/objects/object_oE11.xml | 15 + .../xml/N64_PAL_10/objects/object_oE12.xml | 15 + .../xml/N64_PAL_10/objects/object_oE1s.xml | 52 + .../xml/N64_PAL_10/objects/object_oE2.xml | 71 + .../xml/N64_PAL_10/objects/object_oE3.xml | 73 + .../xml/N64_PAL_10/objects/object_oE4.xml | 69 + .../xml/N64_PAL_10/objects/object_oE4s.xml | 48 + .../xml/N64_PAL_10/objects/object_oE5.xml | 64 + .../xml/N64_PAL_10/objects/object_oE6.xml | 15 + .../xml/N64_PAL_10/objects/object_oE7.xml | 14 + .../xml/N64_PAL_10/objects/object_oE8.xml | 15 + .../xml/N64_PAL_10/objects/object_oE9.xml | 15 + .../N64_PAL_10/objects/object_oE_anime.xml | 10 + .../N64_PAL_10/objects/object_oF1d_map.xml | 54 + .../xml/N64_PAL_10/objects/object_oF1s.xml | 58 + .../xml/N64_PAL_10/objects/object_o_anime.xml | 11 + .../xml/N64_PAL_10/objects/object_okuta.xml | 29 + .../objects/object_opening_demo1.xml | 11 + .../xml/N64_PAL_10/objects/object_os.xml | 36 + .../N64_PAL_10/objects/object_os_anime.xml | 69 + .../xml/N64_PAL_10/objects/object_ossan.xml | 23 + .../N64_PAL_10/objects/object_ouke_haka.xml | 6 + .../xml/N64_PAL_10/objects/object_owl.xml | 79 + .../xml/N64_PAL_10/objects/object_peehat.xml | 53 + .../N64_PAL_10/objects/object_po_composer.xml | 30 + .../N64_PAL_10/objects/object_po_field.xml | 31 + .../N64_PAL_10/objects/object_po_sisters.xml | 56 + .../xml/N64_PAL_10/objects/object_poh.xml | 25 + .../xml/N64_PAL_10/objects/object_ps.xml | 42 + .../xml/N64_PAL_10/objects/object_pu_box.xml | 13 + .../xml/N64_PAL_10/objects/object_rd.xml | 124 ++ .../xml/N64_PAL_10/objects/object_reeba.xml | 27 + .../objects/object_relay_objects.xml | 19 + .../xml/N64_PAL_10/objects/object_rl.xml | 52 + .../xml/N64_PAL_10/objects/object_rr.xml | 8 + .../xml/N64_PAL_10/objects/object_rs.xml | 32 + .../xml/N64_PAL_10/objects/object_ru1.xml | 83 + .../xml/N64_PAL_10/objects/object_ru2.xml | 92 + .../xml/N64_PAL_10/objects/object_sa.xml | 100 ++ .../xml/N64_PAL_10/objects/object_sb.xml | 30 + .../xml/N64_PAL_10/objects/object_sd.xml | 70 + .../N64_PAL_10/objects/object_shop_dungen.xml | 10 + .../N64_PAL_10/objects/object_shopnuts.xml | 67 + .../xml/N64_PAL_10/objects/object_siofuki.xml | 7 + .../xml/N64_PAL_10/objects/object_sk2.xml | 130 ++ .../xml/N64_PAL_10/objects/object_skb.xml | 64 + .../xml/N64_PAL_10/objects/object_skj.xml | 75 + .../objects/object_spot00_break.xml | 13 + .../objects/object_spot00_objects.xml | 14 + .../objects/object_spot01_matoya.xml | 30 + .../objects/object_spot01_matoyab.xml | 18 + .../objects/object_spot01_objects.xml | 16 + .../objects/object_spot01_objects2.xml | 6 + .../objects/object_spot02_objects.xml | 44 + .../objects/object_spot03_object.xml | 16 + .../objects/object_spot04_objects.xml | 10 + .../objects/object_spot05_objects.xml | 10 + .../objects/object_spot06_objects.xml | 24 + .../objects/object_spot07_object.xml | 23 + .../N64_PAL_10/objects/object_spot08_obj.xml | 27 + .../N64_PAL_10/objects/object_spot09_obj.xml | 35 + .../N64_PAL_10/objects/object_spot11_obj.xml | 9 + .../N64_PAL_10/objects/object_spot12_obj.xml | 13 + .../N64_PAL_10/objects/object_spot15_obj.xml | 13 + .../N64_PAL_10/objects/object_spot16_obj.xml | 11 + .../N64_PAL_10/objects/object_spot17_obj.xml | 12 + .../N64_PAL_10/objects/object_spot18_obj.xml | 36 + .../xml/N64_PAL_10/objects/object_ssh.xml | 61 + .../xml/N64_PAL_10/objects/object_sst.xml | 71 + .../xml/N64_PAL_10/objects/object_st.xml | 71 + .../xml/N64_PAL_10/objects/object_stream.xml | 6 + .../N64_PAL_10/objects/object_syokudai.xml | 13 + .../xml/N64_PAL_10/objects/object_ta.xml | 72 + .../N64_PAL_10/objects/object_timeblock.xml | 7 + .../xml/N64_PAL_10/objects/object_tite.xml | 55 + .../xml/N64_PAL_10/objects/object_tk.xml | 35 + .../objects/object_toki_objects.xml | 25 + .../xml/N64_PAL_10/objects/object_torch2.xml | 13 + .../xml/N64_PAL_10/objects/object_toryo.xml | 53 + .../xml/N64_PAL_10/objects/object_tp.xml | 17 + .../xml/N64_PAL_10/objects/object_tr.xml | 149 ++ .../xml/N64_PAL_10/objects/object_trap.xml | 11 + .../objects/object_triforce_spot.xml | 14 + .../xml/N64_PAL_10/objects/object_ts.xml | 34 + .../xml/N64_PAL_10/objects/object_tsubo.xml | 9 + .../xml/N64_PAL_10/objects/object_tw.xml | 332 ++++ .../xml/N64_PAL_10/objects/object_umajump.xml | 8 + .../xml/N64_PAL_10/objects/object_vali.xml | 63 + .../xml/N64_PAL_10/objects/object_vase.xml | 7 + .../xml/N64_PAL_10/objects/object_vm.xml | 41 + .../N64_PAL_10/objects/object_wallmaster.xml | 35 + .../xml/N64_PAL_10/objects/object_warp1.xml | 39 + .../xml/N64_PAL_10/objects/object_warp2.xml | 6 + .../xml/N64_PAL_10/objects/object_wf.xml | 128 ++ .../xml/N64_PAL_10/objects/object_wood02.xml | 35 + .../xml/N64_PAL_10/objects/object_xc.xml | 60 + .../objects/object_yabusame_point.xml | 8 + .../objects/object_ydan_objects.xml | 34 + .../N64_PAL_10/objects/object_yukabyun.xml | 9 + .../xml/N64_PAL_10/objects/object_zf.xml | 182 ++ .../xml/N64_PAL_10/objects/object_zg.xml | 8 + .../xml/N64_PAL_10/objects/object_zl1.xml | 115 ++ .../xml/N64_PAL_10/objects/object_zl2.xml | 75 + .../N64_PAL_10/objects/object_zl2_anime1.xml | 30 + .../N64_PAL_10/objects/object_zl2_anime2.xml | 40 + .../xml/N64_PAL_10/objects/object_zl4.xml | 91 + .../xml/N64_PAL_10/objects/object_zo.xml | 88 + .../N64_PAL_10/overlays/ovl_Arrow_Fire.xml | 11 + .../xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml | 11 + .../N64_PAL_10/overlays/ovl_Arrow_Light.xml | 11 + .../overlays/ovl_Bg_Ganon_Otyuka.xml | 29 + .../N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml | 10 + .../N64_PAL_10/overlays/ovl_Boss_Dodongo.xml | 6 + .../N64_PAL_10/overlays/ovl_Boss_Ganon.xml | 68 + .../N64_PAL_10/overlays/ovl_Boss_Ganon2.xml | 76 + .../xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml | 10 + .../xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml | 10 + .../xml/N64_PAL_10/overlays/ovl_En_Bili.xml | 7 + .../N64_PAL_10/overlays/ovl_En_Clear_Tag.xml | 28 + .../N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml | 22 + .../overlays/ovl_En_Ganon_Organ.xml | 19 + .../xml/N64_PAL_10/overlays/ovl_En_Holl.xml | 8 + .../N64_PAL_10/overlays/ovl_En_Jsjutan.xml | 38 + .../xml/N64_PAL_10/overlays/ovl_En_Kanban.xml | 8 + .../xml/N64_PAL_10/overlays/ovl_En_Sda.xml | 9 + .../xml/N64_PAL_10/overlays/ovl_En_Ssh.xml | 8 + .../xml/N64_PAL_10/overlays/ovl_En_St.xml | 8 + .../xml/N64_PAL_10/overlays/ovl_En_Sth.xml | 15 + .../xml/N64_PAL_10/overlays/ovl_End_Title.xml | 17 + .../N64_PAL_10/overlays/ovl_File_Choose.xml | 32 + .../N64_PAL_10/overlays/ovl_Magic_Dark.xml | 12 + .../N64_PAL_10/overlays/ovl_Magic_Fire.xml | 10 + .../N64_PAL_10/overlays/ovl_Magic_Wind.xml | 15 + .../N64_PAL_10/overlays/ovl_Oceff_Spot.xml | 10 + .../N64_PAL_10/overlays/ovl_Oceff_Storm.xml | 11 + .../N64_PAL_10/overlays/ovl_Oceff_Wipe.xml | 10 + .../N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml | 11 + .../N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml | 10 + .../N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml | 11 + .../xml/N64_PAL_10/scenes/dungeons/Bmori1.xml | 231 +++ .../N64_PAL_10/scenes/dungeons/FIRE_bs.xml | 34 + .../N64_PAL_10/scenes/dungeons/HAKAdan.xml | 191 ++ .../N64_PAL_10/scenes/dungeons/HAKAdanCH.xml | 69 + .../N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml | 23 + .../xml/N64_PAL_10/scenes/dungeons/HIDAN.xml | 288 +++ .../N64_PAL_10/scenes/dungeons/MIZUsin.xml | 262 +++ .../N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml | 29 + .../xml/N64_PAL_10/scenes/dungeons/bdan.xml | 95 + .../N64_PAL_10/scenes/dungeons/bdan_boss.xml | 19 + .../xml/N64_PAL_10/scenes/dungeons/ddan.xml | 220 +++ .../N64_PAL_10/scenes/dungeons/ddan_boss.xml | 22 + .../xml/N64_PAL_10/scenes/dungeons/ganon.xml | 121 ++ .../N64_PAL_10/scenes/dungeons/ganon_boss.xml | 31 + .../N64_PAL_10/scenes/dungeons/ganon_demo.xml | 19 + .../scenes/dungeons/ganon_final.xml | 34 + .../scenes/dungeons/ganon_sonogo.xml | 72 + .../N64_PAL_10/scenes/dungeons/ganon_tou.xml | 34 + .../N64_PAL_10/scenes/dungeons/ganontika.xml | 254 +++ .../scenes/dungeons/ganontikasonogo.xml | 36 + .../N64_PAL_10/scenes/dungeons/gerudoway.xml | 55 + .../scenes/dungeons/ice_doukutu.xml | 105 ++ .../N64_PAL_10/scenes/dungeons/jyasinboss.xml | 49 + .../N64_PAL_10/scenes/dungeons/jyasinzou.xml | 358 ++++ .../xml/N64_PAL_10/scenes/dungeons/men.xml | 127 ++ .../scenes/dungeons/moribossroom.xml | 33 + .../xml/N64_PAL_10/scenes/dungeons/ydan.xml | 157 ++ .../N64_PAL_10/scenes/dungeons/ydan_boss.xml | 26 + .../xml/N64_PAL_10/scenes/indoors/bowling.xml | 36 + .../scenes/indoors/daiyousei_izumi.xml | 25 + .../N64_PAL_10/scenes/indoors/hairal_niwa.xml | 32 + .../scenes/indoors/hairal_niwa_n.xml | 21 + .../scenes/indoors/hakasitarelay.xml | 80 + .../xml/N64_PAL_10/scenes/indoors/hut.xml | 8 + .../N64_PAL_10/scenes/indoors/hylia_labo.xml | 39 + .../xml/N64_PAL_10/scenes/indoors/impa.xml | 8 + .../N64_PAL_10/scenes/indoors/kakariko.xml | 8 + .../N64_PAL_10/scenes/indoors/kenjyanoma.xml | 27 + .../N64_PAL_10/scenes/indoors/kokiri_home.xml | 8 + .../scenes/indoors/kokiri_home3.xml | 8 + .../scenes/indoors/kokiri_home4.xml | 8 + .../scenes/indoors/kokiri_home5.xml | 8 + .../xml/N64_PAL_10/scenes/indoors/labo.xml | 8 + .../N64_PAL_10/scenes/indoors/link_home.xml | 8 + .../xml/N64_PAL_10/scenes/indoors/mahouya.xml | 21 + .../scenes/indoors/malon_stable.xml | 8 + .../N64_PAL_10/scenes/indoors/miharigoya.xml | 28 + .../N64_PAL_10/scenes/indoors/nakaniwa.xml | 44 + .../N64_PAL_10/scenes/indoors/syatekijyou.xml | 30 + .../N64_PAL_10/scenes/indoors/takaraya.xml | 53 + .../xml/N64_PAL_10/scenes/indoors/tent.xml | 8 + .../N64_PAL_10/scenes/indoors/tokinoma.xml | 47 + .../scenes/indoors/yousei_izumi_tate.xml | 18 + .../scenes/indoors/yousei_izumi_yoko.xml | 24 + .../xml/N64_PAL_10/scenes/misc/enrui.xml | 8 + .../xml/N64_PAL_10/scenes/misc/entra_n.xml | 8 + .../xml/N64_PAL_10/scenes/misc/hakaana.xml | 18 + .../xml/N64_PAL_10/scenes/misc/hakaana2.xml | 26 + .../N64_PAL_10/scenes/misc/hakaana_ouke.xml | 37 + .../xml/N64_PAL_10/scenes/misc/hiral_demo.xml | 8 + .../xml/N64_PAL_10/scenes/misc/kakariko3.xml | 8 + .../xml/N64_PAL_10/scenes/misc/kakusiana.xml | 113 ++ .../xml/N64_PAL_10/scenes/misc/kinsuta.xml | 23 + .../N64_PAL_10/scenes/misc/market_alley.xml | 8 + .../N64_PAL_10/scenes/misc/market_alley_n.xml | 9 + .../xml/N64_PAL_10/scenes/misc/market_day.xml | 9 + .../N64_PAL_10/scenes/misc/market_night.xml | 9 + .../N64_PAL_10/scenes/misc/market_ruins.xml | 8 + .../xml/N64_PAL_10/scenes/misc/shrine.xml | 8 + .../xml/N64_PAL_10/scenes/misc/shrine_n.xml | 9 + .../xml/N64_PAL_10/scenes/misc/shrine_r.xml | 8 + .../xml/N64_PAL_10/scenes/misc/turibori.xml | 35 + .../xml/N64_PAL_10/scenes/overworld/entra.xml | 8 + .../xml/N64_PAL_10/scenes/overworld/souko.xml | 44 + .../N64_PAL_10/scenes/overworld/spot00.xml | 69 + .../N64_PAL_10/scenes/overworld/spot01.xml | 51 + .../N64_PAL_10/scenes/overworld/spot02.xml | 64 + .../N64_PAL_10/scenes/overworld/spot03.xml | 41 + .../N64_PAL_10/scenes/overworld/spot04.xml | 81 + .../N64_PAL_10/scenes/overworld/spot05.xml | 43 + .../N64_PAL_10/scenes/overworld/spot06.xml | 58 + .../N64_PAL_10/scenes/overworld/spot07.xml | 47 + .../N64_PAL_10/scenes/overworld/spot08.xml | 36 + .../N64_PAL_10/scenes/overworld/spot09.xml | 37 + .../N64_PAL_10/scenes/overworld/spot10.xml | 71 + .../N64_PAL_10/scenes/overworld/spot11.xml | 41 + .../N64_PAL_10/scenes/overworld/spot12.xml | 52 + .../N64_PAL_10/scenes/overworld/spot13.xml | 39 + .../N64_PAL_10/scenes/overworld/spot15.xml | 52 + .../N64_PAL_10/scenes/overworld/spot16.xml | 50 + .../N64_PAL_10/scenes/overworld/spot17.xml | 54 + .../N64_PAL_10/scenes/overworld/spot18.xml | 105 ++ .../N64_PAL_10/scenes/overworld/spot20.xml | 36 + .../N64_PAL_10/scenes/shops/alley_shop.xml | 8 + .../xml/N64_PAL_10/scenes/shops/drag.xml | 8 + .../xml/N64_PAL_10/scenes/shops/face_shop.xml | 8 + .../xml/N64_PAL_10/scenes/shops/golon.xml | 8 + .../N64_PAL_10/scenes/shops/kokiri_shop.xml | 8 + .../N64_PAL_10/scenes/shops/night_shop.xml | 8 + .../xml/N64_PAL_10/scenes/shops/shop1.xml | 8 + .../xml/N64_PAL_10/scenes/shops/zoora.xml | 8 + .../xml/N64_PAL_10/text/elf_message_field.xml | 5 + .../xml/N64_PAL_10/text/elf_message_ydan.xml | 5 + .../N64_PAL_10/text/message_data_static.xml | 14 + .../xml/N64_PAL_10/textures/backgrounds.xml | 246 +++ .../N64_PAL_10/textures/boss_title_cards.xml | 52 + .../N64_PAL_10/textures/do_action_static.xml | 91 + .../textures/icon_item_24_static.xml | 24 + .../textures/icon_item_dungeon_static.xml | 23 + .../textures/icon_item_field_static.xml | 32 + .../textures/icon_item_fra_static.xml | 37 + .../textures/icon_item_gameover_static.xml | 11 + .../textures/icon_item_ger_static.xml | 36 + .../textures/icon_item_nes_static.xml | 35 + .../N64_PAL_10/textures/icon_item_static.xml | 190 ++ .../N64_PAL_10/textures/item_name_static.xml | 373 ++++ .../N64_PAL_10/textures/map_48x85_static.xml | 72 + .../N64_PAL_10/textures/map_grand_static.xml | 28 + .../xml/N64_PAL_10/textures/map_i_static.xml | 243 +++ .../N64_PAL_10/textures/map_name_static.xml | 106 ++ .../N64_PAL_10/textures/message_static.xml | 11 + .../textures/message_texture_static.xml | 6 + .../N64_PAL_10/textures/nes_font_static.xml | 144 ++ .../textures/nintendo_rogo_static.xml | 9 + .../N64_PAL_10/textures/parameter_static.xml | 60 + .../N64_PAL_10/textures/place_title_cards.xml | 287 +++ .../xml/N64_PAL_10/textures/skyboxes.xml | 113 ++ .../xml/N64_PAL_10/textures/title_static.xml | 214 +++ .../xml/N64_PAL_11/code/fbdemo_circle.xml | 4 +- .../xml/N64_PAL_11/code/fbdemo_wipe1.xml | 8 +- .../xml/N64_PAL_11/objects/object_md.xml | 2 +- .../N64_PAL_11/overlays/ovl_Boss_Dodongo.xml | 6 +- .../N64_PAL_11/overlays/ovl_Boss_Ganon.xml | 2 +- .../N64_PAL_11/overlays/ovl_Boss_Ganon2.xml | 2 +- .../N64_PAL_11/overlays/ovl_Oceff_Spot.xml | 10 +- .../N64_PAL_11/scenes/dungeons/ddan_boss.xml | 2 +- .../scenes/dungeons/ice_doukutu.xml | 2 +- .../N64_PAL_11/scenes/indoors/tokinoma.xml | 2 +- .../N64_PAL_11/textures/do_action_static.xml | 6 +- soh/macosx/soh-macos.sh | 11 + soh/soh/Extractor/Extract.cpp | 8 +- soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c | 6 +- 573 files changed, 25206 insertions(+), 41 deletions(-) create mode 100644 soh/assets/extractor/Config_N64_PAL_10.xml create mode 100644 soh/assets/xml/N64_PAL_10/audio/Audio.xml create mode 100644 soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml create mode 100644 soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml create mode 100644 soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml create mode 100644 soh/assets/xml/N64_PAL_10/misc/link_animetion.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_Bb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ahg.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_am.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ane.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ani.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_anubice.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_aob.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bba.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bg.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bird.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bji.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bl.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bob.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_boj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bombf.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bowl.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_box.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_brob.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bubble.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bv.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bwall.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_bxa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_cne.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_cob.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_cow.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_crow.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_cs.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_daiku.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dh.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dnk.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dns.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dog.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ds.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ds2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_du.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ec.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ei.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fd.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fd2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fhg.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fire.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_firefly.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fish.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fu.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_fz.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ge1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_geff.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_geldb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gla.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gm.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gnd.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gndd.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gol.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_goma.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gs.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_gt.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_haka.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hata.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hni.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_horse.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_hs.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_human.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ik.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_im.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_in.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ingate.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_jj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_js.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ka.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kanban.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_km1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kusa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kw1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_kz.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_link_child.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ma1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ma2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mag.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_md.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_medal.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mk.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mm.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ms.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_mu.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_nb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_niw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_nwc.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ny.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA10.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA11.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA3.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA4.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA5.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA6.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA7.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA8.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oA9.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oB1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oB2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oB3.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oB4.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE10.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE11.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE12.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE3.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE4.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE5.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE6.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE7.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE8.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE9.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_okuta.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_os.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ossan.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_owl.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_peehat.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_po_field.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_poh.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ps.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_rd.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_reeba.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_rl.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_rr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_rs.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ru1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ru2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_sa.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_sb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_sd.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_sk2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_skb.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_skj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ssh.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_sst.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_st.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_stream.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ta.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tite.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tk.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_torch2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_toryo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tp.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tr.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_trap.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ts.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_tw.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_umajump.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_vali.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_vase.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_vm.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_warp1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_warp2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_wf.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_wood02.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_xc.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zf.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zg.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zl1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zl2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zl4.xml create mode 100644 soh/assets/xml/N64_PAL_10/objects/object_zo.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml create mode 100644 soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml create mode 100644 soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml create mode 100644 soh/assets/xml/N64_PAL_10/text/elf_message_field.xml create mode 100644 soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml create mode 100644 soh/assets/xml/N64_PAL_10/text/message_data_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/backgrounds.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/do_action_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/item_name_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/map_i_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/map_name_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/message_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/parameter_static.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/skyboxes.xml create mode 100644 soh/assets/xml/N64_PAL_10/textures/title_static.xml diff --git a/OTRExporter/rom_info.py b/OTRExporter/rom_info.py index 8bf471cf0..897b145af 100644 --- a/OTRExporter/rom_info.py +++ b/OTRExporter/rom_info.py @@ -38,6 +38,7 @@ ROM_INFO_TABLE[Checksums.OOT_PAL_GC] = RomVersion("CFG/filelists/gamecube_pal.tx ROM_INFO_TABLE[Checksums.OOT_PAL_MQ] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_MQ_PAL_F") ROM_INFO_TABLE[Checksums.OOT_PAL_GC_DBG1] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_NMQ_D") ROM_INFO_TABLE[Checksums.OOT_PAL_GC_MQ_DBG] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_MQ_D") +ROM_INFO_TABLE[Checksums.OOT_PAL_10] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_10") ROM_INFO_TABLE[Checksums.OOT_PAL_11] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_11") class RomDmaEntry: diff --git a/docs/supportedHashes.json b/docs/supportedHashes.json index 70198f29f..587a64a55 100644 --- a/docs/supportedHashes.json +++ b/docs/supportedHashes.json @@ -1,4 +1,8 @@ [ + { + "name": "PAL 1.0", + "sha1": "328a1f1beba30ce5e178f031662019eb32c5f3b5" + }, { "name": "PAL 1.1", "sha1": "cfbb98d392e4a9d39da8285d10cbef3974c2f012" diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh index b69490912..063fcf79c 100644 --- a/scripts/linux/appimage/soh.sh +++ b/scripts/linux/appimage/soh.sh @@ -46,6 +46,12 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do d6342c59007e57c1194661ec6880b2f078403f4e) # n64 ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 ;; + d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; + 4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 ;; @@ -99,6 +105,14 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do continue fi ;; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then + ROM=N64_PAL_10 + OTRNAME="oot.otr" + else + continue + fi + ;; cfbb98d392e4a9d39da8285d10cbef3974c2f012) if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then ROM=N64_PAL_11 diff --git a/soh/assets/extractor/Config_N64_PAL_10.xml b/soh/assets/extractor/Config_N64_PAL_10.xml new file mode 100644 index 000000000..e4f85e362 --- /dev/null +++ b/soh/assets/extractor/Config_N64_PAL_10.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml index 85e70d8eb..717443537 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml @@ -53,7 +53,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml index 4e3b2de5d..efc258a68 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml index 0c80fb780..161c73dca 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml @@ -53,7 +53,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml index 841bd7c2a..3b4e21d32 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml index 823c6b0f2..23369b37d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_10/audio/Audio.xml b/soh/assets/xml/N64_PAL_10/audio/Audio.xml new file mode 100644 index 000000000..b2e32ab26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/audio/Audio.xml @@ -0,0 +1,1558 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml new file mode 100644 index 000000000..f3f5a04f2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml new file mode 100644 index 000000000..851f06884 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml new file mode 100644 index 000000000..d4783fee2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml b/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml new file mode 100644 index 000000000..9de1e92d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml @@ -0,0 +1,577 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml new file mode 100644 index 000000000..5b1a9050d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml new file mode 100644 index 000000000..011e8f7fc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml new file mode 100644 index 000000000..5ffc52f65 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml @@ -0,0 +1,973 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml b/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml new file mode 100644 index 000000000..5d04bde45 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml b/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml new file mode 100644 index 000000000..4d37b1b11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_am.xml b/soh/assets/xml/N64_PAL_10/objects/object_am.xml new file mode 100644 index 000000000..b70c70d70 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_am.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ane.xml b/soh/assets/xml/N64_PAL_10/objects/object_ane.xml new file mode 100644 index 000000000..1e29b351e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ane.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ani.xml b/soh/assets/xml/N64_PAL_10/objects/object_ani.xml new file mode 100644 index 000000000..c70621c6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ani.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml b/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml new file mode 100644 index 000000000..fb029586b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_aob.xml b/soh/assets/xml/N64_PAL_10/objects/object_aob.xml new file mode 100644 index 000000000..e6202d0cf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_aob.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml b/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml new file mode 100644 index 000000000..00f7cd677 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bba.xml b/soh/assets/xml/N64_PAL_10/objects/object_bba.xml new file mode 100644 index 000000000..ccc5c2136 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bba.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml new file mode 100644 index 000000000..dcd56d385 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml b/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml new file mode 100644 index 000000000..a092f0c23 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bg.xml b/soh/assets/xml/N64_PAL_10/objects/object_bg.xml new file mode 100644 index 000000000..791226b71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bg.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml b/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml new file mode 100644 index 000000000..1c7d39e31 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bird.xml b/soh/assets/xml/N64_PAL_10/objects/object_bird.xml new file mode 100644 index 000000000..167a5022d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bird.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bji.xml b/soh/assets/xml/N64_PAL_10/objects/object_bji.xml new file mode 100644 index 000000000..c665b6b00 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bji.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bl.xml b/soh/assets/xml/N64_PAL_10/objects/object_bl.xml new file mode 100644 index 000000000..1c2ef4ec6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bl.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml b/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml new file mode 100644 index 000000000..345a8ebd9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bob.xml b/soh/assets/xml/N64_PAL_10/objects/object_bob.xml new file mode 100644 index 000000000..289e994e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bob.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_boj.xml b/soh/assets/xml/N64_PAL_10/objects/object_boj.xml new file mode 100644 index 000000000..4be4764ab --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_boj.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml b/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml new file mode 100644 index 000000000..83e60248d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml b/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml new file mode 100644 index 000000000..26ab6b4f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml b/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml new file mode 100644 index 000000000..ffe6d43db --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_box.xml b/soh/assets/xml/N64_PAL_10/objects/object_box.xml new file mode 100644 index 000000000..106d2d335 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_box.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_brob.xml b/soh/assets/xml/N64_PAL_10/objects/object_brob.xml new file mode 100644 index 000000000..718dcd561 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_brob.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml b/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml new file mode 100644 index 000000000..f5de18692 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bv.xml b/soh/assets/xml/N64_PAL_10/objects/object_bv.xml new file mode 100644 index 000000000..f8ffddaee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bv.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bw.xml b/soh/assets/xml/N64_PAL_10/objects/object_bw.xml new file mode 100644 index 000000000..6fd39fbb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bw.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml b/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml new file mode 100644 index 000000000..d4f43ddc1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml b/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml new file mode 100644 index 000000000..fb78c117e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cne.xml b/soh/assets/xml/N64_PAL_10/objects/object_cne.xml new file mode 100644 index 000000000..0c14d0bc5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cne.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cob.xml b/soh/assets/xml/N64_PAL_10/objects/object_cob.xml new file mode 100644 index 000000000..ba051cfa7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cob.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cow.xml b/soh/assets/xml/N64_PAL_10/objects/object_cow.xml new file mode 100644 index 000000000..5d067c329 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cow.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_crow.xml b/soh/assets/xml/N64_PAL_10/objects/object_crow.xml new file mode 100644 index 000000000..77337c644 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_crow.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cs.xml b/soh/assets/xml/N64_PAL_10/objects/object_cs.xml new file mode 100644 index 000000000..83804ccaf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cs.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml new file mode 100644 index 000000000..6be59c154 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml new file mode 100644 index 000000000..4bb50c2b4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml new file mode 100644 index 000000000..291238519 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml b/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml new file mode 100644 index 000000000..1524c7a26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml new file mode 100644 index 000000000..3fc563b96 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml new file mode 100644 index 000000000..7202a833f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml new file mode 100644 index 000000000..e906bf61c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml new file mode 100644 index 000000000..5fceef416 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml new file mode 100644 index 000000000..73058d5e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml new file mode 100644 index 000000000..aa54bc2ee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml new file mode 100644 index 000000000..9ea19012b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dh.xml b/soh/assets/xml/N64_PAL_10/objects/object_dh.xml new file mode 100644 index 000000000..7a52d7dbe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dh.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml b/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml new file mode 100644 index 000000000..3bce34304 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dns.xml b/soh/assets/xml/N64_PAL_10/objects/object_dns.xml new file mode 100644 index 000000000..8b78ffcf2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dns.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml b/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml new file mode 100644 index 000000000..4dfd7d6e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml b/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml new file mode 100644 index 000000000..779e20e9d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dog.xml b/soh/assets/xml/N64_PAL_10/objects/object_dog.xml new file mode 100644 index 000000000..ef00442b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml b/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml new file mode 100644 index 000000000..2f1726204 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml b/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml new file mode 100644 index 000000000..a37f590d6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ds.xml b/soh/assets/xml/N64_PAL_10/objects/object_ds.xml new file mode 100644 index 000000000..0413a9e2e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ds.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml new file mode 100644 index 000000000..683bcc68d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_du.xml b/soh/assets/xml/N64_PAL_10/objects/object_du.xml new file mode 100644 index 000000000..44bbd1aa0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_du.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml new file mode 100644 index 000000000..5e792edb5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ec.xml b/soh/assets/xml/N64_PAL_10/objects/object_ec.xml new file mode 100644 index 000000000..7ec83e284 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ec.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml new file mode 100644 index 000000000..9215b6a39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml new file mode 100644 index 000000000..7f12c56f5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml new file mode 100644 index 000000000..800d9535f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml new file mode 100644 index 000000000..2fc65b16f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml new file mode 100644 index 000000000..5f962f162 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml new file mode 100644 index 000000000..67ef5ce7e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml new file mode 100644 index 000000000..00b47c460 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml new file mode 100644 index 000000000..de5376569 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ei.xml b/soh/assets/xml/N64_PAL_10/objects/object_ei.xml new file mode 100644 index 000000000..e4132491f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ei.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fa.xml b/soh/assets/xml/N64_PAL_10/objects/object_fa.xml new file mode 100644 index 000000000..2f1bf9a5e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fa.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fd.xml b/soh/assets/xml/N64_PAL_10/objects/object_fd.xml new file mode 100644 index 000000000..a1c51c724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fd.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml b/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml new file mode 100644 index 000000000..44b5f5f9c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml b/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml new file mode 100644 index 000000000..e159e2504 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fire.xml b/soh/assets/xml/N64_PAL_10/objects/object_fire.xml new file mode 100644 index 000000000..49bf620cb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fire.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml b/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml new file mode 100644 index 000000000..8c26a4341 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fish.xml b/soh/assets/xml/N64_PAL_10/objects/object_fish.xml new file mode 100644 index 000000000..f5ad4f6da --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fish.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fr.xml b/soh/assets/xml/N64_PAL_10/objects/object_fr.xml new file mode 100644 index 000000000..25ee2ad42 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fr.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fu.xml b/soh/assets/xml/N64_PAL_10/objects/object_fu.xml new file mode 100644 index 000000000..82c449e3d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fu.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fw.xml b/soh/assets/xml/N64_PAL_10/objects/object_fw.xml new file mode 100644 index 000000000..ee9821d26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fw.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fz.xml b/soh/assets/xml/N64_PAL_10/objects/object_fz.xml new file mode 100644 index 000000000..dad6fec5c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fz.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml new file mode 100644 index 000000000..27c36a5f2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml new file mode 100644 index 000000000..93f3a05e5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml new file mode 100644 index 000000000..b1016299b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml new file mode 100644 index 000000000..180e5995c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml new file mode 100644 index 000000000..be4c4dcb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml new file mode 100644 index 000000000..5e32610ff --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml new file mode 100644 index 000000000..79e0768b8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_geff.xml b/soh/assets/xml/N64_PAL_10/objects/object_geff.xml new file mode 100644 index 000000000..f0667743b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_geff.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml b/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml new file mode 100644 index 000000000..49b12ef2e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml new file mode 100644 index 000000000..4b58787a9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml new file mode 100644 index 000000000..267b0a734 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml new file mode 100644 index 000000000..e74247816 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml new file mode 100644 index 000000000..bae86c11d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml new file mode 100644 index 000000000..1400c4a4d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml new file mode 100644 index 000000000..07134748c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml new file mode 100644 index 000000000..3c1a0fe7f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml new file mode 100644 index 000000000..3bcb6a47a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml new file mode 100644 index 000000000..e5e4bc86c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml new file mode 100644 index 000000000..3b0884a03 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml new file mode 100644 index 000000000..443219caf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml new file mode 100644 index 000000000..946e9c496 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml new file mode 100644 index 000000000..5a0b62a60 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml new file mode 100644 index 000000000..408741ac5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml new file mode 100644 index 000000000..7b60a7724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml new file mode 100644 index 000000000..3f897b6d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml new file mode 100644 index 000000000..22e29f255 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml new file mode 100644 index 000000000..076229b11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml new file mode 100644 index 000000000..8925e6fa5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml new file mode 100644 index 000000000..2b2e2847d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml new file mode 100644 index 000000000..5128c5f6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml new file mode 100644 index 000000000..4bfd76a7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml new file mode 100644 index 000000000..edb39dc29 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml new file mode 100644 index 000000000..a656c306b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml new file mode 100644 index 000000000..d65daee8e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml new file mode 100644 index 000000000..cfcb878d9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml new file mode 100644 index 000000000..795f0cfd1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml new file mode 100644 index 000000000..63d32ab5a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml new file mode 100644 index 000000000..0e1c4259d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml new file mode 100644 index 000000000..50cbdd891 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml new file mode 100644 index 000000000..844d90e71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml new file mode 100644 index 000000000..ae7834201 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml new file mode 100644 index 000000000..feb5c8659 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml new file mode 100644 index 000000000..48e78b1b5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml new file mode 100644 index 000000000..d2e763e63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml new file mode 100644 index 000000000..a6b3b0fda --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml new file mode 100644 index 000000000..6d41df8fd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml new file mode 100644 index 000000000..7af5b5b3b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml new file mode 100644 index 000000000..e83c65116 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml new file mode 100644 index 000000000..a37d45a71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml new file mode 100644 index 000000000..46eff7d3e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml new file mode 100644 index 000000000..bea868339 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml new file mode 100644 index 000000000..18a5c3d7a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml new file mode 100644 index 000000000..7161e42e3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml new file mode 100644 index 000000000..0fd659ae9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml new file mode 100644 index 000000000..7623e6353 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml new file mode 100644 index 000000000..471c1dab9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml new file mode 100644 index 000000000..28e5b1e68 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml new file mode 100644 index 000000000..b01fca953 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml new file mode 100644 index 000000000..a3e223b3e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml new file mode 100644 index 000000000..5b19bca74 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml new file mode 100644 index 000000000..c8389f62c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml new file mode 100644 index 000000000..c59903c43 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml new file mode 100644 index 000000000..82607677d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml new file mode 100644 index 000000000..2c5f70d98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml new file mode 100644 index 000000000..5f808baf9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml new file mode 100644 index 000000000..fb7dc0155 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml new file mode 100644 index 000000000..75ae7eb2b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml new file mode 100644 index 000000000..054731dec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml new file mode 100644 index 000000000..9d4eb9487 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml new file mode 100644 index 000000000..7de08487f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml new file mode 100644 index 000000000..0a1af96d0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml new file mode 100644 index 000000000..dcc038b7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml new file mode 100644 index 000000000..1cf5de5b9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml new file mode 100644 index 000000000..82c15c82d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml new file mode 100644 index 000000000..2f11e3f6d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml new file mode 100644 index 000000000..176ae025f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml new file mode 100644 index 000000000..8d1e5dafd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml new file mode 100644 index 000000000..e6c90f76f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml new file mode 100644 index 000000000..a15b1253e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml new file mode 100644 index 000000000..a68178eba --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml new file mode 100644 index 000000000..fed89f465 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml new file mode 100644 index 000000000..a2606afbe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml new file mode 100644 index 000000000..e1119abca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml new file mode 100644 index 000000000..73bf888d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml new file mode 100644 index 000000000..3b4edf3de --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml new file mode 100644 index 000000000..e3b1ab10e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gj.xml b/soh/assets/xml/N64_PAL_10/objects/object_gj.xml new file mode 100644 index 000000000..ee6dab74f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gj.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml new file mode 100644 index 000000000..ea4f8444f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gla.xml b/soh/assets/xml/N64_PAL_10/objects/object_gla.xml new file mode 100644 index 000000000..499a3720d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gla.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gm.xml b/soh/assets/xml/N64_PAL_10/objects/object_gm.xml new file mode 100644 index 000000000..91b10cc42 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gm.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml b/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml new file mode 100644 index 000000000..3ae3b57f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml b/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml new file mode 100644 index 000000000..a88d419d7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml b/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml new file mode 100644 index 000000000..8bf5d770c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml b/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml new file mode 100644 index 000000000..60df9e469 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gol.xml b/soh/assets/xml/N64_PAL_10/objects/object_gol.xml new file mode 100644 index 000000000..7e04508cb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gol.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_goma.xml b/soh/assets/xml/N64_PAL_10/objects/object_goma.xml new file mode 100644 index 000000000..e7a6d0a54 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_goma.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml b/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml new file mode 100644 index 000000000..5d406e957 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gr.xml b/soh/assets/xml/N64_PAL_10/objects/object_gr.xml new file mode 100644 index 000000000..5f7360ae5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gr.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gs.xml b/soh/assets/xml/N64_PAL_10/objects/object_gs.xml new file mode 100644 index 000000000..145be1665 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gs.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gt.xml b/soh/assets/xml/N64_PAL_10/objects/object_gt.xml new file mode 100644 index 000000000..1d79d4e39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gt.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka.xml new file mode 100644 index 000000000..f6b263c37 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml new file mode 100644 index 000000000..1376d0356 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml new file mode 100644 index 000000000..3ca6d27c0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml new file mode 100644 index 000000000..0de02aaf1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hata.xml b/soh/assets/xml/N64_PAL_10/objects/object_hata.xml new file mode 100644 index 000000000..b0324c3be --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hata.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml new file mode 100644 index 000000000..ecc795321 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml new file mode 100644 index 000000000..f41c0ee5e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml new file mode 100644 index 000000000..a7290f395 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hni.xml b/soh/assets/xml/N64_PAL_10/objects/object_hni.xml new file mode 100644 index 000000000..6b317eb7a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hni.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse.xml new file mode 100644 index 000000000..74619e597 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml new file mode 100644 index 000000000..0a55462e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml new file mode 100644 index 000000000..146c564f5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml new file mode 100644 index 000000000..2facab39c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml new file mode 100644 index 000000000..af270c658 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hs.xml b/soh/assets/xml/N64_PAL_10/objects/object_hs.xml new file mode 100644 index 000000000..cf5d06e1a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hs.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_human.xml b/soh/assets/xml/N64_PAL_10/objects/object_human.xml new file mode 100644 index 000000000..05795cb33 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_human.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml new file mode 100644 index 000000000..c7d059d70 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ik.xml b/soh/assets/xml/N64_PAL_10/objects/object_ik.xml new file mode 100644 index 000000000..8a6028f7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ik.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_im.xml b/soh/assets/xml/N64_PAL_10/objects/object_im.xml new file mode 100644 index 000000000..a628a113a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_im.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_in.xml b/soh/assets/xml/N64_PAL_10/objects/object_in.xml new file mode 100644 index 000000000..84c114047 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_in.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml b/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml new file mode 100644 index 000000000..e6be42beb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jj.xml b/soh/assets/xml/N64_PAL_10/objects/object_jj.xml new file mode 100644 index 000000000..62bae8cb9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jj.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_js.xml b/soh/assets/xml/N64_PAL_10/objects/object_js.xml new file mode 100644 index 000000000..ff7bd3efa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_js.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml new file mode 100644 index 000000000..60a7b3788 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml new file mode 100644 index 000000000..c6f6773c6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml new file mode 100644 index 000000000..a1f19b806 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ka.xml b/soh/assets/xml/N64_PAL_10/objects/object_ka.xml new file mode 100644 index 000000000..eb952732b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ka.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml b/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml new file mode 100644 index 000000000..9ffc7a2ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml b/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml new file mode 100644 index 000000000..a701b294d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml b/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml new file mode 100644 index 000000000..9b104b3ea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_km1.xml b/soh/assets/xml/N64_PAL_10/objects/object_km1.xml new file mode 100644 index 000000000..0a918a798 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_km1.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml b/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml new file mode 100644 index 000000000..67291a554 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml b/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml new file mode 100644 index 000000000..eab561b1f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kz.xml b/soh/assets/xml/N64_PAL_10/objects/object_kz.xml new file mode 100644 index 000000000..4624fefdb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kz.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml b/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml new file mode 100644 index 000000000..babe7d2aa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml b/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml new file mode 100644 index 000000000..552a79d7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml b/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml new file mode 100644 index 000000000..cfd5dcfb4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml new file mode 100644 index 000000000..02075c999 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml new file mode 100644 index 000000000..0de400373 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml new file mode 100644 index 000000000..63eeb3895 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml new file mode 100644 index 000000000..ce5910fb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mag.xml b/soh/assets/xml/N64_PAL_10/objects/object_mag.xml new file mode 100644 index 000000000..257f72363 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mag.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml b/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml new file mode 100644 index 000000000..819d89022 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml b/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml new file mode 100644 index 000000000..6dd9d1659 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml new file mode 100644 index 000000000..af5a9ec15 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml new file mode 100644 index 000000000..c64aa1c49 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml new file mode 100644 index 000000000..2c703274e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mb.xml b/soh/assets/xml/N64_PAL_10/objects/object_mb.xml new file mode 100644 index 000000000..23c0930c0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mb.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_md.xml b/soh/assets/xml/N64_PAL_10/objects/object_md.xml new file mode 100644 index 000000000..161c73dca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_md.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_medal.xml b/soh/assets/xml/N64_PAL_10/objects/object_medal.xml new file mode 100644 index 000000000..533872a55 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_medal.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml new file mode 100644 index 000000000..4c2b51df5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml b/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml new file mode 100644 index 000000000..2acc9391a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml new file mode 100644 index 000000000..5a18b95cf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml new file mode 100644 index 000000000..daf9b0541 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml new file mode 100644 index 000000000..2fa0bdbe4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml new file mode 100644 index 000000000..6274feaee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml new file mode 100644 index 000000000..c1040ea11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml new file mode 100644 index 000000000..1aaeea193 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml new file mode 100644 index 000000000..0f823b923 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml new file mode 100644 index 000000000..6386f7f9e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml new file mode 100644 index 000000000..8bba7eb91 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mk.xml b/soh/assets/xml/N64_PAL_10/objects/object_mk.xml new file mode 100644 index 000000000..0b4aaae8a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mk.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mm.xml b/soh/assets/xml/N64_PAL_10/objects/object_mm.xml new file mode 100644 index 000000000..b27837e57 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mm.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mo.xml b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml new file mode 100644 index 000000000..2a6247c9f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml new file mode 100644 index 000000000..bb1b31e2f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml new file mode 100644 index 000000000..c750ce20d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml new file mode 100644 index 000000000..785b85857 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml new file mode 100644 index 000000000..ad1bb4d5f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml new file mode 100644 index 000000000..58ea8c085 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml new file mode 100644 index 000000000..8ba4ff2d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ms.xml b/soh/assets/xml/N64_PAL_10/objects/object_ms.xml new file mode 100644 index 000000000..a87d0e6b3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ms.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mu.xml b/soh/assets/xml/N64_PAL_10/objects/object_mu.xml new file mode 100644 index 000000000..7251ff721 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mu.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_nb.xml b/soh/assets/xml/N64_PAL_10/objects/object_nb.xml new file mode 100644 index 000000000..74de9e285 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_nb.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_niw.xml b/soh/assets/xml/N64_PAL_10/objects/object_niw.xml new file mode 100644 index 000000000..4eafec956 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_niw.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml b/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml new file mode 100644 index 000000000..96ffa3238 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ny.xml b/soh/assets/xml/N64_PAL_10/objects/object_ny.xml new file mode 100644 index 000000000..e2e8187ff --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ny.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml new file mode 100644 index 000000000..1d665f101 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml new file mode 100644 index 000000000..65d080834 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml new file mode 100644 index 000000000..92ae474b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml new file mode 100644 index 000000000..ffdcd7989 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml new file mode 100644 index 000000000..a492bd875 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml new file mode 100644 index 000000000..dcdbbfff9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml new file mode 100644 index 000000000..55072176d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml new file mode 100644 index 000000000..c17a51088 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml new file mode 100644 index 000000000..52c68f639 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml new file mode 100644 index 000000000..8ed2d3df5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml new file mode 100644 index 000000000..d5c16abfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml new file mode 100644 index 000000000..2f50c967b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml new file mode 100644 index 000000000..230783cea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml new file mode 100644 index 000000000..1c42ddacc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml new file mode 100644 index 000000000..2924c9e75 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml new file mode 100644 index 000000000..4d5b1663f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml new file mode 100644 index 000000000..04ce91437 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml new file mode 100644 index 000000000..04f6f186d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml new file mode 100644 index 000000000..a5fa39fd2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml new file mode 100644 index 000000000..d311e6010 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml new file mode 100644 index 000000000..af62ad6d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml new file mode 100644 index 000000000..95227da38 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml new file mode 100644 index 000000000..ae48d2ade --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml new file mode 100644 index 000000000..6037de52f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml new file mode 100644 index 000000000..f5edf745a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml new file mode 100644 index 000000000..95bb602b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml new file mode 100644 index 000000000..b3e588d4c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml new file mode 100644 index 000000000..be5de2494 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml new file mode 100644 index 000000000..8ea7ee18c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml new file mode 100644 index 000000000..f6b4659e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml b/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml new file mode 100644 index 000000000..f14fecd82 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml new file mode 100644 index 000000000..fe41dde63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml new file mode 100644 index 000000000..4ef4ac44c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml b/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml new file mode 100644 index 000000000..b4fccea6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml b/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml new file mode 100644 index 000000000..fd0323027 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_os.xml b/soh/assets/xml/N64_PAL_10/objects/object_os.xml new file mode 100644 index 000000000..5880a9293 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_os.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml new file mode 100644 index 000000000..f23636343 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml b/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml new file mode 100644 index 000000000..5788e3a20 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml b/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml new file mode 100644 index 000000000..11da9b26e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_owl.xml b/soh/assets/xml/N64_PAL_10/objects/object_owl.xml new file mode 100644 index 000000000..64fdf64c5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_owl.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml b/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml new file mode 100644 index 000000000..42ee66cde --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml new file mode 100644 index 000000000..ff995efce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml new file mode 100644 index 000000000..78bc0d65a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml new file mode 100644 index 000000000..b429be258 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_poh.xml b/soh/assets/xml/N64_PAL_10/objects/object_poh.xml new file mode 100644 index 000000000..be6d6eff4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_poh.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ps.xml b/soh/assets/xml/N64_PAL_10/objects/object_ps.xml new file mode 100644 index 000000000..9f9c894a6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ps.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml b/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml new file mode 100644 index 000000000..e1d686e97 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rd.xml b/soh/assets/xml/N64_PAL_10/objects/object_rd.xml new file mode 100644 index 000000000..22c7d3373 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rd.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml b/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml new file mode 100644 index 000000000..32c697bd9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml new file mode 100644 index 000000000..47b92fcd2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rl.xml b/soh/assets/xml/N64_PAL_10/objects/object_rl.xml new file mode 100644 index 000000000..2a5ad30f6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rl.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rr.xml b/soh/assets/xml/N64_PAL_10/objects/object_rr.xml new file mode 100644 index 000000000..98726b14b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rr.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rs.xml b/soh/assets/xml/N64_PAL_10/objects/object_rs.xml new file mode 100644 index 000000000..152b5489e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rs.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml new file mode 100644 index 000000000..3d413619f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml new file mode 100644 index 000000000..fedf37d48 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sa.xml b/soh/assets/xml/N64_PAL_10/objects/object_sa.xml new file mode 100644 index 000000000..ec45ac961 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sa.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sb.xml b/soh/assets/xml/N64_PAL_10/objects/object_sb.xml new file mode 100644 index 000000000..64d3bb005 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sb.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sd.xml b/soh/assets/xml/N64_PAL_10/objects/object_sd.xml new file mode 100644 index 000000000..fb58428c3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sd.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml b/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml new file mode 100644 index 000000000..594c43d39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml new file mode 100644 index 000000000..a4e12e38a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml b/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml new file mode 100644 index 000000000..a23240a72 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml b/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml new file mode 100644 index 000000000..f2e7ef6d8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_skb.xml b/soh/assets/xml/N64_PAL_10/objects/object_skb.xml new file mode 100644 index 000000000..5b5efb484 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_skb.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_skj.xml b/soh/assets/xml/N64_PAL_10/objects/object_skj.xml new file mode 100644 index 000000000..74548e518 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_skj.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml new file mode 100644 index 000000000..d3be88315 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml new file mode 100644 index 000000000..10fb13aea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml new file mode 100644 index 000000000..d44b944e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml new file mode 100644 index 000000000..720f50cd3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml new file mode 100644 index 000000000..413e032a9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml new file mode 100644 index 000000000..36741a949 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml new file mode 100644 index 000000000..65f45ff51 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml new file mode 100644 index 000000000..f182e7d99 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml new file mode 100644 index 000000000..66293d752 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml new file mode 100644 index 000000000..6e7079149 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml new file mode 100644 index 000000000..e3da63b0f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml new file mode 100644 index 000000000..5bc2bfb6b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml new file mode 100644 index 000000000..4d71f3473 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml new file mode 100644 index 000000000..eb6528393 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml new file mode 100644 index 000000000..257298f7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml new file mode 100644 index 000000000..d619c781e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml new file mode 100644 index 000000000..bd59b8cd1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml new file mode 100644 index 000000000..d39de812a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml new file mode 100644 index 000000000..d4239d8d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml new file mode 100644 index 000000000..cc12b7894 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml b/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml new file mode 100644 index 000000000..6283f8e9f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sst.xml b/soh/assets/xml/N64_PAL_10/objects/object_sst.xml new file mode 100644 index 000000000..191c67cc8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sst.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_st.xml b/soh/assets/xml/N64_PAL_10/objects/object_st.xml new file mode 100644 index 000000000..983b9e2ea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_st.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_stream.xml b/soh/assets/xml/N64_PAL_10/objects/object_stream.xml new file mode 100644 index 000000000..59b0838e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_stream.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml b/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml new file mode 100644 index 000000000..c1670edec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ta.xml b/soh/assets/xml/N64_PAL_10/objects/object_ta.xml new file mode 100644 index 000000000..5e446bf5c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ta.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml b/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml new file mode 100644 index 000000000..1d6b9e698 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tite.xml b/soh/assets/xml/N64_PAL_10/objects/object_tite.xml new file mode 100644 index 000000000..1be65c495 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tite.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tk.xml b/soh/assets/xml/N64_PAL_10/objects/object_tk.xml new file mode 100644 index 000000000..6b6cce724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tk.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml new file mode 100644 index 000000000..cd07e60d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml b/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml new file mode 100644 index 000000000..3388e7d34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml b/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml new file mode 100644 index 000000000..73f3dcb1e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tp.xml b/soh/assets/xml/N64_PAL_10/objects/object_tp.xml new file mode 100644 index 000000000..8ea908825 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tp.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tr.xml b/soh/assets/xml/N64_PAL_10/objects/object_tr.xml new file mode 100644 index 000000000..17ab9ae39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tr.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_trap.xml b/soh/assets/xml/N64_PAL_10/objects/object_trap.xml new file mode 100644 index 000000000..56195cf41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_trap.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml b/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml new file mode 100644 index 000000000..87d449458 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ts.xml b/soh/assets/xml/N64_PAL_10/objects/object_ts.xml new file mode 100644 index 000000000..567277bc3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ts.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml b/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml new file mode 100644 index 000000000..ee2c5e184 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tw.xml b/soh/assets/xml/N64_PAL_10/objects/object_tw.xml new file mode 100644 index 000000000..be51f0b6c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tw.xml @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml b/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml new file mode 100644 index 000000000..2ee4ade46 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vali.xml b/soh/assets/xml/N64_PAL_10/objects/object_vali.xml new file mode 100644 index 000000000..2bab5efaa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vali.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vase.xml b/soh/assets/xml/N64_PAL_10/objects/object_vase.xml new file mode 100644 index 000000000..091d4c51e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vase.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vm.xml b/soh/assets/xml/N64_PAL_10/objects/object_vm.xml new file mode 100644 index 000000000..c5b949b36 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vm.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml b/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml new file mode 100644 index 000000000..fbbc4f4af --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml b/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml new file mode 100644 index 000000000..1497d7a10 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml b/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml new file mode 100644 index 000000000..b6d1b3624 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wf.xml b/soh/assets/xml/N64_PAL_10/objects/object_wf.xml new file mode 100644 index 000000000..ebfb708d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wf.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml b/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml new file mode 100644 index 000000000..47ec342ca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_xc.xml b/soh/assets/xml/N64_PAL_10/objects/object_xc.xml new file mode 100644 index 000000000..ab1a34a4b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_xc.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml b/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml new file mode 100644 index 000000000..bed9e8a60 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml new file mode 100644 index 000000000..e2adf307f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml b/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml new file mode 100644 index 000000000..d594ebbb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zf.xml b/soh/assets/xml/N64_PAL_10/objects/object_zf.xml new file mode 100644 index 000000000..7f20eb786 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zf.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zg.xml b/soh/assets/xml/N64_PAL_10/objects/object_zg.xml new file mode 100644 index 000000000..79005516c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zg.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml new file mode 100644 index 000000000..001e5be14 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml new file mode 100644 index 000000000..959a919ec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml new file mode 100644 index 000000000..cada50486 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml new file mode 100644 index 000000000..47016e2e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml new file mode 100644 index 000000000..8e7a2837e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zo.xml b/soh/assets/xml/N64_PAL_10/objects/object_zo.xml new file mode 100644 index 000000000..77465760e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zo.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml new file mode 100644 index 000000000..ffd0d324c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml new file mode 100644 index 000000000..69882e7e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml new file mode 100644 index 000000000..1bd6a5b28 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml new file mode 100644 index 000000000..aa420ca6b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml new file mode 100644 index 000000000..f9e99ec92 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml new file mode 100644 index 000000000..8f0c7612c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml new file mode 100644 index 000000000..769eade34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml new file mode 100644 index 000000000..64e810e97 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml new file mode 100644 index 000000000..e77834c87 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml new file mode 100644 index 000000000..3d92225f1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml new file mode 100644 index 000000000..791bb1e63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml new file mode 100644 index 000000000..8d2e6c7c1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml new file mode 100644 index 000000000..67e9d66e1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml new file mode 100644 index 000000000..507d54930 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml new file mode 100644 index 000000000..7df3f65fe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml new file mode 100644 index 000000000..298c0adb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml new file mode 100644 index 000000000..8cbb6f3ba --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml new file mode 100644 index 000000000..286bc5f06 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml new file mode 100644 index 000000000..5390eb7b9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml new file mode 100644 index 000000000..a0f560c81 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml new file mode 100644 index 000000000..1566da96b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml new file mode 100644 index 000000000..37b2d19d7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml new file mode 100644 index 000000000..8db916ced --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml new file mode 100644 index 000000000..cf1eba6f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml new file mode 100644 index 000000000..ec0b52b86 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml new file mode 100644 index 000000000..b8579f1b5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml new file mode 100644 index 000000000..875ef572c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml new file mode 100644 index 000000000..86f3adba3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml new file mode 100644 index 000000000..c2d58cde9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml new file mode 100644 index 000000000..2b69eb590 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml new file mode 100644 index 000000000..64bf93773 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml new file mode 100644 index 000000000..ed7d2ab02 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml new file mode 100644 index 000000000..ad4311426 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml new file mode 100644 index 000000000..89331ecc2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml new file mode 100644 index 000000000..e557c80a5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml new file mode 100644 index 000000000..97401aff6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml new file mode 100644 index 000000000..d36ac6b77 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml new file mode 100644 index 000000000..fa4d784f1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml new file mode 100644 index 000000000..00c5aa82d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml new file mode 100644 index 000000000..99ae2b3ef --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml new file mode 100644 index 000000000..41c009d7d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml new file mode 100644 index 000000000..b88d6eb03 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml new file mode 100644 index 000000000..1446a9c98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml new file mode 100644 index 000000000..05633e53e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml new file mode 100644 index 000000000..f857dbe94 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml new file mode 100644 index 000000000..36c5e8107 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml new file mode 100644 index 000000000..56c98efed --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml new file mode 100644 index 000000000..3ec568cfb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml new file mode 100644 index 000000000..84ef36950 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml new file mode 100644 index 000000000..1ae37b963 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml new file mode 100644 index 000000000..a5ff210ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml new file mode 100644 index 000000000..060d4941b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml new file mode 100644 index 000000000..827277614 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml new file mode 100644 index 000000000..8aa1788bc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml new file mode 100644 index 000000000..86c0d317b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml new file mode 100644 index 000000000..bc14a46ac --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml new file mode 100644 index 000000000..d9e5960e8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml new file mode 100644 index 000000000..b9959eefa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml new file mode 100644 index 000000000..aed7d2660 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml new file mode 100644 index 000000000..7ea240547 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml new file mode 100644 index 000000000..9a41763a2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml new file mode 100644 index 000000000..4f9a03fc0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml new file mode 100644 index 000000000..06d89f2fe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml new file mode 100644 index 000000000..6f4c181e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml new file mode 100644 index 000000000..91be63d14 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml new file mode 100644 index 000000000..a4ef5715f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml new file mode 100644 index 000000000..56822e67a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml new file mode 100644 index 000000000..db757e3d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml new file mode 100644 index 000000000..e4e9b102c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml new file mode 100644 index 000000000..4e8a58f3b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml new file mode 100644 index 000000000..8c0305493 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml new file mode 100644 index 000000000..9f36eb41c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml new file mode 100644 index 000000000..eb861aedb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml new file mode 100644 index 000000000..974987fed --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml new file mode 100644 index 000000000..c0a9d2eb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml new file mode 100644 index 000000000..2fb88ae34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml new file mode 100644 index 000000000..8ae462f9d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml new file mode 100644 index 000000000..aff97eeb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml new file mode 100644 index 000000000..63f8676ac --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml new file mode 100644 index 000000000..2fb2d5e6a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml new file mode 100644 index 000000000..05243b52c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml new file mode 100644 index 000000000..5b438980b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml new file mode 100644 index 000000000..de72cc5f4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml new file mode 100644 index 000000000..c3f818012 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml new file mode 100644 index 000000000..3b6dd2dec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml new file mode 100644 index 000000000..90a8d95d0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml new file mode 100644 index 000000000..d8c06e545 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml new file mode 100644 index 000000000..5b408ac3a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml new file mode 100644 index 000000000..e7dc93dd0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml new file mode 100644 index 000000000..2d8ba4906 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml new file mode 100644 index 000000000..17f53613e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml new file mode 100644 index 000000000..1331fdd4c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml new file mode 100644 index 000000000..07b62c44d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml new file mode 100644 index 000000000..c3f993ff4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml new file mode 100644 index 000000000..aac0f6c4e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml new file mode 100644 index 000000000..c30467303 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml new file mode 100644 index 000000000..65db60411 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml new file mode 100644 index 000000000..00887e69c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml new file mode 100644 index 000000000..c58e38744 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml new file mode 100644 index 000000000..f0ec75e75 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml new file mode 100644 index 000000000..b9ddf2cf7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml new file mode 100644 index 000000000..4878338aa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml new file mode 100644 index 000000000..122036791 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml new file mode 100644 index 000000000..0633224d9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml new file mode 100644 index 000000000..92ee57f59 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml new file mode 100644 index 000000000..8dd9d9e48 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml new file mode 100644 index 000000000..42d051a44 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml new file mode 100644 index 000000000..c0af66958 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml new file mode 100644 index 000000000..c7924c29d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml new file mode 100644 index 000000000..9434185f4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml new file mode 100644 index 000000000..16503c1b4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml new file mode 100644 index 000000000..c605e9cc9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml new file mode 100644 index 000000000..0d2b16d90 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml new file mode 100644 index 000000000..b833ee3cd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml new file mode 100644 index 000000000..86582f0dc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml new file mode 100644 index 000000000..0983f1e26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml new file mode 100644 index 000000000..66365e3d8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml new file mode 100644 index 000000000..f8682c436 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml new file mode 100644 index 000000000..6171c7e09 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml new file mode 100644 index 000000000..c68913065 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml new file mode 100644 index 000000000..e75f7b684 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml new file mode 100644 index 000000000..4bf535712 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml new file mode 100644 index 000000000..6d598888d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml new file mode 100644 index 000000000..57cb59b98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml new file mode 100644 index 000000000..5580e832c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml new file mode 100644 index 000000000..95548de1b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml new file mode 100644 index 000000000..acb6515fb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml new file mode 100644 index 000000000..16a974608 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml new file mode 100644 index 000000000..c58672798 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml new file mode 100644 index 000000000..50cd633e5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml new file mode 100644 index 000000000..5954d9c83 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml new file mode 100644 index 000000000..525a06d63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml new file mode 100644 index 000000000..0e4ac18f8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml b/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml new file mode 100644 index 000000000..789a554ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml b/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml new file mode 100644 index 000000000..f784afcf4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/text/message_data_static.xml b/soh/assets/xml/N64_PAL_10/text/message_data_static.xml new file mode 100644 index 000000000..f48375c41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/message_data_static.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml b/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml new file mode 100644 index 000000000..c60ff57a8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml b/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml new file mode 100644 index 000000000..3667d2bdf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml b/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml new file mode 100644 index 000000000..2cbd613b3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml new file mode 100644 index 000000000..cdb8cc737 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml new file mode 100644 index 000000000..873c490fc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml new file mode 100644 index 000000000..ed991406b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml new file mode 100644 index 000000000..2c8ccad5b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml new file mode 100644 index 000000000..fc2a50642 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml new file mode 100644 index 000000000..ea71dda35 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml new file mode 100644 index 000000000..6cd92acfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml new file mode 100644 index 000000000..2bd26b79d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml b/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml new file mode 100644 index 000000000..00c497490 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml new file mode 100644 index 000000000..b2ea46340 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml new file mode 100644 index 000000000..201955bfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml new file mode 100644 index 000000000..1721f6d84 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml new file mode 100644 index 000000000..7f9d31589 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/message_static.xml b/soh/assets/xml/N64_PAL_10/textures/message_static.xml new file mode 100644 index 000000000..afdde60de --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/message_static.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml b/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml new file mode 100644 index 000000000..bbf7e1259 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml b/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml new file mode 100644 index 000000000..f1b80ee04 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml new file mode 100644 index 000000000..f09de3b0f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml b/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml new file mode 100644 index 000000000..c51dacf1f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml b/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml new file mode 100644 index 000000000..188661b41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml b/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml new file mode 100644 index 000000000..104ffb2a3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/title_static.xml b/soh/assets/xml/N64_PAL_10/textures/title_static.xml new file mode 100644 index 000000000..eb8d3288f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/title_static.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml index 36d70566d..5a619b8f6 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml @@ -1,5 +1,5 @@ - + @@ -8,6 +8,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml index 19cac4e02..00d067a25 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - - + + - - + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_md.xml b/soh/assets/xml/N64_PAL_11/objects/object_md.xml index 0c80fb780..161c73dca 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_md.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_md.xml @@ -53,7 +53,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml index f2ee5b7b8..cd9069e13 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml index 25d29f441..8f94fe55b 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml index f09784a55..892b63d6a 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml index 9a53952f0..34a8ac209 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml @@ -1,10 +1,10 @@ - - - + + + - - + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml index 4369cf579..8aa1788bc 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml @@ -6,7 +6,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml index 88fc3bad3..c3f818012 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml @@ -10,7 +10,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml b/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh index ee2356ab3..f32fb6363 100755 --- a/soh/macosx/soh-macos.sh +++ b/soh/macosx/soh-macos.sh @@ -24,6 +24,12 @@ remap_hashes () d6342c59007e57c1194661ec6880b2f078403f4e) # n64 ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 ;; + d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; + 4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 ;; @@ -103,6 +109,8 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then ROM_TYPE=0;; 0227d7c0074f2d0ac935631990da8ec5914597b4) ROM_TYPE=0;; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + ROM_TYPE=0;; cfbb98d392e4a9d39da8285d10cbef3974c2f012) ROM_TYPE=0;; f46239439f59a2a594ef83cf68ef65043b1bffe2) @@ -189,6 +197,9 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then 0227d7c0074f2d0ac935631990da8ec5914597b4) ROM=GC_NMQ_PAL_F OTRNAME="oot.otr";; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + ROM=N64_PAL_10 + OTRNAME="oot.otr";; cfbb98d392e4a9d39da8285d10cbef3974c2f012) ROM=N64_PAL_11 OTRNAME="oot.otr";; diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp index 00328348c..d283bc3cc 100644 --- a/soh/soh/Extractor/Extract.cpp +++ b/soh/soh/Extractor/Extract.cpp @@ -60,15 +60,16 @@ static constexpr uint32_t OOT_PAL_11 = 0xB2055FBD; static const std::unordered_map verMap = { { OOT_PAL_GC, "PAL Gamecube" }, + { OOT_PAL_MQ, "PAL MQ" }, { OOT_PAL_GC_DBG1, "PAL Debug 1" }, { OOT_PAL_GC_DBG2, "PAL Debug 2" }, { OOT_PAL_GC_MQ_DBG, "PAL MQ Debug" }, + { OOT_PAL_10, "PAL N64 1.0" }, { OOT_PAL_11, "PAL N64 1.1" }, - { OOT_PAL_MQ, "PAL MQ Gamecube" }, }; // TODO only check the first 54MB of the rom. -static constexpr std::array goodCrcs = { +static constexpr std::array goodCrcs = { 0xfa8c0555, // MQ DBG 64MB (Original overdump) 0x8652ac4c, // MQ DBG 64MB 0x5B8A1EB7, // MQ DBG 64MB (Empty overdump) @@ -77,6 +78,7 @@ static constexpr std::array goodCrcs = { 0xEB15D7B9, // NMQ DBG 64MB 0xDA8E61BF, // GC PAL 0x7A2FAE68, // GC MQ PAL + 0xFD9913B1, // N64 PAL 1.0 0xE033FBBA, // N64 PAL 1.1 }; @@ -495,6 +497,8 @@ const char* Extractor::GetZapdVerStr() const { return "GC_NMQ_D"; case OOT_PAL_GC_MQ_DBG: return "GC_MQ_D"; + case OOT_PAL_10: + return "N64_PAL_10"; case OOT_PAL_11: return "N64_PAL_11"; default: diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 5bde19542..0a55661fe 100644 --- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -620,9 +620,9 @@ s16 GetCharArraySize(const char* str) { } static void EnMag_SetCopyValues(const char** copy_tex, u16* copy_width, u16* copy_xl, u16* copy_xh) { - u32 gameVersion = ResourceMgr_GetGameVersion(0); - switch (gameVersion) { - case OOT_PAL_11: + u32 platform = ResourceMgr_GetGamePlatform(0); + switch (platform) { + case GAME_PLATFORM_N64: *copy_tex = gTitleCopyright1998Tex; *copy_width = 128; *copy_xl = 376; From a92844fa92352734789014508d455d14d84f6dac Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:09:00 +0100 Subject: [PATCH 09/77] Remove rando specific getitemid check (#3237) --- soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 4fe2c817c..7680adb6f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -134,8 +134,7 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) { BgTokiSwd_SetupAction(this, func_808BB0AC); } else { Player* player = GET_PLAYER(play); - if (Actor_IsFacingPlayer(&this->actor, 0x2000) && - (!IS_RANDO || (IS_RANDO && player->getItemId == GI_NONE))) { + if (Actor_IsFacingPlayer(&this->actor, 0x2000)) { func_8002F580(&this->actor, play); } } From 85432ce496143e19fa4ac37b615c14acaeb192bc Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 4 Oct 2023 11:09:37 -0400 Subject: [PATCH 10/77] Adds option for Lost Woods leading music to be disabled. (#3233) In the Audio Editor Options tab, useful for hearing Custom Sequences more clearly in the Lost Woods. --- soh/soh/Enhancements/audio/AudioEditor.cpp | 7 +++++++ .../overlays/actors/ovl_En_River_Sound/z_en_river_sound.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index a640696d6..ce33a0560 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -401,6 +401,13 @@ void AudioEditor::DrawElement() { UIWidgets::InsertHelpHoverText( "Disables the music change when getting close to enemies. Useful for hearing " "your custom music for each scene more often."); + UIWidgets::EnhancementCheckbox("Disable Leading Music in Lost Woods", "gLostWoodsConsistentVolume"); + UIWidgets::InsertHelpHoverText( + "Disables the volume shifting in the Lost Woods. Useful for hearing " + "your custom music in the Lost Woods if you don't need the navigation assitance " + "the volume changing provides. If toggling this while in the Lost Woods, reload " + "the area for the effect to kick in." + ); UIWidgets::EnhancementCheckbox("Display Sequence Name on Overlay", "gSeqNameOverlay"); UIWidgets::InsertHelpHoverText( "Displays the name of the current sequence in the corner of the screen whenever a new sequence " diff --git a/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 9c9816365..4582e0b3f 100644 --- a/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -41,7 +41,10 @@ void EnRiverSound_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); } else if (this->actor.params == RS_SARIAS_SONG) { // Always have leading music in rando - if ((!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) || CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) && !IS_RANDO) { + if ( + CVarGetInteger("gLostWoodsConsistentVolume", 0) || + ((!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY) || CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) && !IS_RANDO) + ) { Actor_Kill(&this->actor); } } From e66be83eb789cbdd3a4891aafd61ae34909bd876 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Thu, 5 Oct 2023 15:35:49 -0400 Subject: [PATCH 11/77] Fix quest type bleeding through saves (#3241) --- soh/soh/SaveManager.cpp | 9 +++++++-- soh/src/code/z_sram.c | 5 +++-- .../overlays/gamestates/ovl_file_choose/z_file_choose.c | 5 +++-- .../misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 651c9563c..e41c6b8ca 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -520,7 +520,7 @@ void SaveManager::InitFileNormal() { } gSaveContext.adultEquips.equipment = 0; gSaveContext.unk_54 = 0; - gSaveContext.savedSceneNum = 0x34; + gSaveContext.savedSceneNum = SCENE_LINKS_HOUSE; // Equipment for (int button = 0; button < ARRAY_COUNT(gSaveContext.equips.buttonItems); button++) { @@ -568,7 +568,6 @@ void SaveManager::InitFileNormal() { gSaveContext.fw.set = 0; gSaveContext.fw.tempSwchFlags = 0; gSaveContext.fw.tempCollectFlags = 0; - gSaveContext.backupFW = gSaveContext.fw; for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.gsFlags); flag++) { gSaveContext.gsFlags[flag] = 0; } @@ -614,11 +613,17 @@ void SaveManager::InitFileNormal() { gSaveContext.magicLevel = 0; gSaveContext.infTable[29] = 1; gSaveContext.sceneFlags[5].swch = 0x40000000; + + // SoH specific + gSaveContext.backupFW = gSaveContext.fw; gSaveContext.pendingSale = ITEM_NONE; gSaveContext.pendingSaleMod = MOD_NONE; + // Boss Rush is set ahead of time in z_file_choose, otherwise init the save with the normal quest if (IS_BOSS_RUSH) { BossRush_InitSave(); + } else { + gSaveContext.questId = QUEST_NORMAL; } //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT) diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index fd2b5ebd9..1612c0fdc 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -220,8 +220,9 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag; - if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == 2 && strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) { - gSaveContext.questId = 2; + if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == QUEST_RANDOMIZER && + strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) { + gSaveContext.questId = QUEST_RANDOMIZER; Randomizer_InitSaveFile(); } diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index ef95b6a71..630a1159a 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -989,7 +989,8 @@ void DrawSeedHashSprites(FileChooseContext* this) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0xFF, 0xFF, 0xFF, alpha); // Draw Seed Icons for spoiler log - if (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER && strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0 && fileSelectSpoilerFileLoaded) { + if (this->configMode == CM_QUEST_MENU && this->questType[this->buttonIndex] == QUEST_RANDOMIZER && + strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0 && fileSelectSpoilerFileLoaded) { u16 xStart = 64; for (unsigned int i = 0; i < 5; i++) { SpriteLoad(this, GetSeedTexture(gSaveContext.seedIcons[i])); @@ -2818,7 +2819,7 @@ void FileChoose_ConfirmFile(GameState* thisx) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); // Reset Boss Rush because it's only ever saved in memory. if (IS_BOSS_RUSH) { - gSaveContext.questId = 0; + gSaveContext.questId = QUEST_NORMAL; } this->selectMode = SM_FADE_OUT; func_800F6964(0xF); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 284f65e69..642fec066 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -4181,7 +4181,7 @@ void KaleidoScope_Update(PlayState* play) } else { play->state.running = 0; if (IS_BOSS_RUSH) { - gSaveContext.questId = 0; + gSaveContext.questId = QUEST_NORMAL; } SET_NEXT_GAMESTATE(&play->state, Opening_Init, OpeningContext); GameInteractor_ExecuteOnExitGame(gSaveContext.fileNum); From 095fd8b625c2d92c225333d7000e9c52104dc73a Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sat, 7 Oct 2023 16:32:02 +0100 Subject: [PATCH 12/77] done (#3248) --- soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 4751d049d..c6224d97f 100644 --- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -353,6 +353,9 @@ s32 EnSsh_IsCloseToLink(EnSsh* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 yDist; + if (IS_RANDO) { + return true; + } if (this->stateFlags & SSH_STATE_GROUND_START) { return true; } From bb23fbc143e11b0a3af7b7ab74a53a2047afbd99 Mon Sep 17 00:00:00 2001 From: Julian Garritano Date: Sat, 7 Oct 2023 11:33:35 -0400 Subject: [PATCH 13/77] Fix Warp Song Hints option (#3260) --- soh/soh/Enhancements/randomizer/3drando/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 42fdae5c1..2cd894ffd 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -327,7 +327,7 @@ namespace Settings { Option GregHintText = Option::Bool("Greg the Rupee Hint", {"Off", "On"}, OptionCategory::Setting, 0); Option SariaHintText = Option::Bool("Saria's Hint", {"Off", "On"}, OptionCategory::Setting, 0); Option FrogsHintText = Option::Bool("Frog Ocarina Game Hint", {"Off", "On"}, OptionCategory::Setting, 0); - Option WarpSongHints = Option::Bool("Warp Songs Hints", {"Off", "On"}, OptionCategory::Setting, 0); + Option WarpSongHints = Option::Bool("Warp Song Hints", {"Off", "On"}, OptionCategory::Setting, 0); Option Kak10GSHintText = Option::Bool("10 GS Hint", {"Off", "On"}, OptionCategory::Setting, 0); Option Kak20GSHintText = Option::Bool("20 GS Hint", {"Off", "On"}, OptionCategory::Setting, 0); Option Kak30GSHintText = Option::Bool("30 GS Hint", {"Off", "On"}, OptionCategory::Setting, 0); From 7e0cb66c5888f8152c4bfb691dc069ea23f0f443 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Mon, 9 Oct 2023 08:27:31 -0700 Subject: [PATCH 14/77] Create GAME_CONTROLLER_DB.md (#3219) --- docs/GAME_CONTROLLER_DB.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 docs/GAME_CONTROLLER_DB.md diff --git a/docs/GAME_CONTROLLER_DB.md b/docs/GAME_CONTROLLER_DB.md new file mode 100644 index 000000000..4728c8981 --- /dev/null +++ b/docs/GAME_CONTROLLER_DB.md @@ -0,0 +1,31 @@ +# SDL GameControllerDB + +The Ship of Harkinian utilizes a text file with SDL controller mappings for extended controller hardware support. +This file is pulled from https://github.com/gabomdq/SDL_GameControllerDB during the build process as [a part of CMakeLists.txt](https://github.com/HarbourMasters/Shipwright/blob/bb643661f62865dfc757c185d0daaebb32f2d53d/soh/CMakeLists.txt#L760). + +## Released versions + +| Release | sha | diff | +| - | - | - | +| Zhora Alfa 4.0.0 | [967daa8](https://github.com/gabomdq/SDL_GameControllerDB/tree/967daa8f89c48b01ed0f9c6a86ac849930442fc6) | | +| Zhora Bravo 4.0.1 | [ccac7cd](https://github.com/gabomdq/SDL_GameControllerDB/tree/ccac7cd97f445955d4437e21c5f82123d9b4349b) | [+1](https://github.com/gabomdq/SDL_GameControllerDB/compare/967daa8...ccac7cd) | +| Zhora Charlie 4.0.2 | [ff26eb0](https://github.com/gabomdq/SDL_GameControllerDB/tree/ff26eb04d0fe18356985d968119429d6012e7d75) | [+8/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/ccac7cd...ff26eb0) | +| Zhora Delta 4.0.3 | [ad02da5](https://github.com/gabomdq/SDL_GameControllerDB/tree/ad02da5a95ca8005f2c1facc11a5a52f8522f0ee) | [+4/-5](https://github.com/gabomdq/SDL_GameControllerDB/compare/ff26eb0...ad02da5) | +| Zohra Echo 4.0.4 | [c203690](https://github.com/gabomdq/SDL_GameControllerDB/tree/c203690b1e13980699802918d362cd9dadf89bd0) | [+8/-4](https://github.com/gabomdq/SDL_GameControllerDB/compare/ad02da5...c203690) | +| Zhora Foxtrot 4.0.5 | [9db8101](https://github.com/gabomdq/SDL_GameControllerDB/tree/9db8101a5780d1b0721bf6de385e6ffe0d07dfc7) | [+6](https://github.com/gabomdq/SDL_GameControllerDB/compare/c203690...9db8101) | +| Flynn Alfa 5.0.0 | [163cc5d](https://github.com/gabomdq/SDL_GameControllerDB/tree/163cc5d45e9fc2f1bb2b95ea7eee4bbc9a57955c) | [+29/-8](https://github.com/gabomdq/SDL_GameControllerDB/compare/9db8101...163cc5d) | +| Flynn Bravo 5.0.1 | [7efce7d](https://github.com/gabomdq/SDL_GameControllerDB/tree/7efce7d3f309ec1fa409b1af09153f9eb77fbedf) | [-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/163cc5d...7efce7d) | +| Flynn Charlie 5.0.2 | [e607703](https://github.com/gabomdq/SDL_GameControllerDB/tree/e607703392145343e8aca42be052121c0b7bd1c9) | [+40/-17](https://github.com/gabomdq/SDL_GameControllerDB/compare/7efce7d...e607703) | +| Bradley Alfa 5.1.0 | [2ba9676](https://github.com/gabomdq/SDL_GameControllerDB/tree/2ba96761af795c15e916cc97790b51e09dc0cd54) | [+1/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/e607703...2ba9676) | +| Bradley Charlie 5.1.2 | [4f5d1d4](https://github.com/gabomdq/SDL_GameControllerDB/tree/4f5d1d497985b75f4a83a5de46f596dc4d7f002e) | [+5/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/2ba9676...4f5d1d4) | +| Bradley Delta 5.1.3 | [9b73049](https://github.com/gabomdq/SDL_GameControllerDB/tree/9b73049ee62a2cc862d6ad94c2c777f2e8363a48) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/4f5d1d4...9b73049) | +| Bradley Echo 5.1.4 | [6d3801f](https://github.com/gabomdq/SDL_GameControllerDB/tree/6d3801fcfe74b1989de96403b7b560eba72a175c) | [+56/-21](https://github.com/gabomdq/SDL_GameControllerDB/compare/9b73049...6d3801f) | +| Gibbs Alfa 6.0.0 | [0562b00](https://github.com/gabomdq/SDL_GameControllerDB/tree/0562b00eaf5c0308c49d329b79263d2dae1c3a85) | [+8/-2](https://github.com/gabomdq/SDL_GameControllerDB/compare/6d3801f...0562b00) | +| Khan Alfa 6.1.0 | [436c7e3](https://github.com/gabomdq/SDL_GameControllerDB/tree/436c7e3d54a57189ea0ab44d05f36b7cc7ea496c) | [+31/-16](https://github.com/gabomdq/SDL_GameControllerDB/compare/0562b00...436c7e3) | +| Khan Bravo 6.1.1 | [01cca2e](https://github.com/gabomdq/SDL_GameControllerDB/tree/01cca2e77f9bf9f1432be04f876f287eb78297fe) | [+23/-6](https://github.com/gabomdq/SDL_GameControllerDB/compare/436c7e3...01cca2e) | +| Khan Charlie 6.1.2 | [6852946](https://github.com/gabomdq/SDL_GameControllerDB/tree/6852946487534c69b7d228fd4eb8c87cf6966475) | [+25/-15](https://github.com/gabomdq/SDL_GameControllerDB/compare/01cca2e...6852946) | +| Spock Alfa 7.0.0 | [38bda81](https://github.com/gabomdq/SDL_GameControllerDB/tree/38bda816dc786f18493876f7bc30bc12dfd2636a) | [+15/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/6852946...38bda81) | +| Spock Bravo 7.0.1 | [228d980](https://github.com/gabomdq/SDL_GameControllerDB/tree/228d980d3d791e9df3b096472f6b97459f8709fe) | [+7/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/38bda81...228d980) | +| Spock Charlie 7.0.2 | [c5b4df0](https://github.com/gabomdq/SDL_GameControllerDB/tree/c5b4df0e1061175cb11e3ebbf8045178339864a5) | [+3](https://github.com/gabomdq/SDL_GameControllerDB/compare/228d980...c5b4df0) | +| Sulu Alfa 7.1.0 | [a2cf171](https://github.com/gabomdq/SDL_GameControllerDB/tree/a2cf1711b4ebc646a3814705d2fb6aac5707bcae) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/c5b4df0...a2cf171) | +| Sulu Bravo 7.1.1 | [cc9f777](https://github.com/gabomdq/SDL_GameControllerDB/tree/cc9f777721f0cb30058d9eef52a295130b734a4a) | [+29/-9](https://github.com/gabomdq/SDL_GameControllerDB/compare/a2cf171...cc9f777) | From 1829a6a154732f80529ee2319fa4def3c74e9a71 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Mon, 9 Oct 2023 11:28:22 -0400 Subject: [PATCH 15/77] Update buildBUILDING.md and adjust cpack for Windows (#3229) --- CMakeLists.txt | 9 +++++++++ docs/BUILDING.md | 9 +++++++++ soh/CMakeLists.txt | 1 + 3 files changed, 19 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 855b9da3d..229a63bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,15 @@ install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DEST install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor) endif() +if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +endif() + find_package(Python3 COMPONENTS Interpreter) # Target to generate OTRs diff --git a/docs/BUILDING.md b/docs/BUILDING.md index d6d061049..56ff9718f 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -48,6 +48,9 @@ cd Shipwright # If you need to regenerate the asset headers to check them into source & 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target ExtractAssetHeaders + +# If you need a newer soh.otr only +& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target GenerateSohOtr ``` ### Developing SoH @@ -110,6 +113,9 @@ cmake --build build-cmake --target clean # If you need to regenerate the asset headers to check them into source cmake --build build-cmake --target ExtractAssetHeaders + +# If you need a newer soh.otr only +cmake --build build-cmake --target GenerateSohOtr ``` ### Generating a distributable @@ -157,6 +163,9 @@ cmake --build build-cmake --target clean # If you need to regenerate the asset headers to check them into source cmake --build build-cmake --target ExtractAssetHeaders + +# If you need a newer soh.otr only +cmake --build build-cmake --target GenerateSohOtr ``` ### Generating a distributable diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index 3c12c41a9..647c491f8 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -754,6 +754,7 @@ endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") INSTALL(FILES $ DESTINATION ./debug COMPONENT ship) +INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION . COMPONENT ship) endif() find_program(CURL NAMES curl DOC "Path to the curl program. Used to download files.") From 2a356b6e9ac64deefcdfc669a2a83136c0240c81 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Wed, 11 Oct 2023 11:10:47 -0400 Subject: [PATCH 16/77] bump lus to latest main (#3249) --- libultraship | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libultraship b/libultraship index ec44917cf..317edd72c 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit ec44917cf5536c8c59aaa7865696926e0bec1ba0 +Subproject commit 317edd72cc317387f8ac010a9ec772d4bfdfdbb6 From 8c7786d4bb39b1098dc8dba09c5203aa61e4e976 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:11:04 +0100 Subject: [PATCH 17/77] Replace Race Preset Magic Numbers and Remove gPreset1 from No Logic Preset (#3255) * magic * Remove gpreset1 --- soh/soh/Enhancements/presets.h | 59 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index a4a1a9d1a..adfb3e080 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -763,7 +763,7 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gInstantPutaway", 1), PRESET_ENTRY_S32("gFastBoomerang", 1), PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1), - PRESET_ENTRY_S32("gMMBunnyHood", 2), + PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), PRESET_ENTRY_S32("gSeparateArrows", 1), PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), PRESET_ENTRY_S32("gEquipmentCanBeRemoved", 1), @@ -803,32 +803,32 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1), PRESET_ENTRY_S32("gRandomizeDampeHint", 1), - PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2), + PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), - PRESET_ENTRY_S32("gRandomizeForest", 2), + PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), - PRESET_ENTRY_S32("gRandomizeGanonTrial", 0), - PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1), + PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), + PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST), PRESET_ENTRY_S32("gRandomizeGregHint", 1), PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 1), - PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1), + PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN), PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5), - PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7), + PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG), PRESET_ENTRY_S32("gRandomizeScrubText", 1), - PRESET_ENTRY_S32("gRandomizeShopsanity", 6), - PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9), - PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2), + PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM), + PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS), + PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT), PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), - PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1), + PRESET_ENTRY_S32("gRandomizeShuffleScrubs", RO_SCRUBS_AFFORDABLE), PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1), PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), - PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), + PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH), PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1), PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), @@ -871,7 +871,7 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gInjectItemCounts", 1), PRESET_ENTRY_S32("gInstantFishing", 1), PRESET_ENTRY_S32("gInstantPutaway", 1), - PRESET_ENTRY_S32("gMMBunnyHood", 2), + PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), PRESET_ENTRY_S32("gMarketSneak", 1), PRESET_ENTRY_S32("gMaskSelect", 1), PRESET_ENTRY_S32("gMweepSpeed", 5), @@ -881,7 +881,6 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gOnFileSelectNameEntry", 0), PRESET_ENTRY_S32("gOpenMenuBar", 1), PRESET_ENTRY_S32("gPauseAnyCursor", 1), - PRESET_ENTRY_S32("gPreset1", 1), PRESET_ENTRY_S32("gRStickOcarina", 1), PRESET_ENTRY_S32("gRandomize10GSHint", 1), PRESET_ENTRY_S32("gRandomize20GSHint", 1), @@ -891,44 +890,44 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gRandomizeAllLocationsReachable", 0), PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1), PRESET_ENTRY_S32("gRandomizeBombchusInLogic", 1), - PRESET_ENTRY_S32("gRandomizeBossKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1), PRESET_ENTRY_S32("gRandomizeDampeHint", 1), - PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2), + PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), - PRESET_ENTRY_S32("gRandomizeForest", 2), + PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), - PRESET_ENTRY_S32("gRandomizeGanonTrial", 0), - PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1), - PRESET_ENTRY_S32("gRandomizeGerudoKeys", 3), + PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), + PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST), + PRESET_ENTRY_S32("gRandomizeGerudoKeys", RO_GERUDO_KEYS_ANYWHERE), PRESET_ENTRY_S32("gRandomizeGregHint", 1), PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 0), - PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1), - PRESET_ENTRY_S32("gRandomizeKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN), + PRESET_ENTRY_S32("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5), - PRESET_ENTRY_S32("gRandomizeLogicRules", 1), - PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7), + PRESET_ENTRY_S32("gRandomizeLogicRules", RO_LOGIC_NO_LOGIC), + PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG), PRESET_ENTRY_S32("gRandomizeScrubText", 1), - PRESET_ENTRY_S32("gRandomizeShopsanity", 6), + PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM), PRESET_ENTRY_S32("gRandomizeShuffleAdultTrade", 0), PRESET_ENTRY_S32("gRandomizeShuffleBeans", 1), - PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9), + PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS), PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1), - PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2), + PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT), PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1), - PRESET_ENTRY_S32("gRandomizeShuffleSongs", 2), - PRESET_ENTRY_S32("gRandomizeShuffleTokens", 3), + PRESET_ENTRY_S32("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_ANYWHERE), + PRESET_ENTRY_S32("gRandomizeShuffleTokens", RO_TOKENSANITY_ALL), PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1), PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), - PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), + PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH), PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1), PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), From 57d4d1ae207cd016c83a4ea27e038632ed8ab523 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 13 Oct 2023 19:12:16 -0400 Subject: [PATCH 18/77] typo on asset attribute for pal1.1 (#3264) * typo on asset attribute * base address fix --- soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml | 2 +- soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml index 8f94fe55b..30b885713 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml @@ -1,7 +1,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml index 34a8ac209..64ddc8e1c 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml @@ -1,5 +1,5 @@ - + From 260078c871baf3b57840f1a47031b7766d93597f Mon Sep 17 00:00:00 2001 From: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> Date: Fri, 13 Oct 2023 19:13:17 -0400 Subject: [PATCH 19/77] [Cosmetic] Adds Bunny Hood to Cosmetic Editor (#3245) * Color and Invisible Checkbox GI model crashes when talking to mask salesman * Update z_player.c Co-authored-by: Garrett Cox * Update z_player.c Co-authored-by: Garrett Cox * Move bunny hood coloring to patch --------- Co-authored-by: Garrett Cox --- .../cosmetics/CosmeticsEditor.cpp | 22 +++++++++++++++++++ soh/soh/SohMenuBar.cpp | 2 ++ .../actors/ovl_player_actor/z_player.c | 6 ++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp index 97b2921c6..548ffa60c 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp @@ -46,6 +46,7 @@ extern PlayState* gPlayState; #include "overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h" #include "objects/object_gjyo_objects/object_gjyo_objects.h" #include "textures/nintendo_rogo_static/nintendo_rogo_static.h" +#include "objects/object_gi_rabit_mask/object_gi_rabit_mask.h" void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction); void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex, int sourceIndex); void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName); @@ -228,6 +229,7 @@ static std::map cosmeticOptions = { COSMETIC_OPTION("Equipment_BowHandle", "Bow Handle", GROUP_EQUIPMENT, ImVec4( 50, 150, 255, 255), false, true, true), COSMETIC_OPTION("Equipment_ChuFace", "Bombchu Face", GROUP_EQUIPMENT, ImVec4( 0, 100, 150, 255), false, true, true), COSMETIC_OPTION("Equipment_ChuBody", "Bombchu Body", GROUP_EQUIPMENT, ImVec4(180, 130, 50, 255), false, true, true), + COSMETIC_OPTION("Equipment_BunnyHood", "Bunny Hood", GROUP_EQUIPMENT, ImVec4(255, 235, 109, 255), false, true, true), COSMETIC_OPTION("Consumable_Hearts", "Hearts", GROUP_CONSUMABLE, ImVec4(255, 70, 50, 255), false, true, false), COSMETIC_OPTION("Consumable_HeartBorder", "Heart Border", GROUP_CONSUMABLE, ImVec4( 50, 40, 60, 255), false, true, true), @@ -916,6 +918,26 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) { PATCH_GFX(gBombchuDL, "Equipment_ChuBody5", equipmentChuBody.changedCvar, 46, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); } + static CosmeticOption& equipmentBunnyHood = cosmeticOptions.at("Equipment_BunnyHood"); + if (manualChange || CVarGetInteger(equipmentBunnyHood.rainbowCvar, 0)) { + static Color_RGBA8 defaultColor = {equipmentBunnyHood.defaultColor.x, equipmentBunnyHood.defaultColor.y, equipmentBunnyHood.defaultColor.z, equipmentBunnyHood.defaultColor.w}; + Color_RGBA8 color = CVarGetColor(equipmentBunnyHood.cvar, defaultColor); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood1", equipmentBunnyHood.changedCvar, 5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood2", equipmentBunnyHood.changedCvar, 6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood3", equipmentBunnyHood.changedCvar, 83, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood4", equipmentBunnyHood.changedCvar, 84, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255)); + PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood5", equipmentBunnyHood.changedCvar, 4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); + + if (manualChange) { + PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood6", equipmentBunnyHood.changedCvar, 13, gsSPGrayscale(true)); + if (CVarGetInteger(equipmentBunnyHood.changedCvar, 0)) { + ResourceMgr_PatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7", 125, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL)); + } else { + ResourceMgr_UnpatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7"); + } + } + } + static CosmeticOption& consumableGreenRupee = cosmeticOptions.at("Consumable_GreenRupee"); if (manualChange || CVarGetInteger(consumableGreenRupee.rainbowCvar, 0)) { static Color_RGBA8 defaultColor = {consumableGreenRupee.defaultColor.x, consumableGreenRupee.defaultColor.y, consumableGreenRupee.defaultColor.z, consumableGreenRupee.defaultColor.w}; diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index ec663c6b4..d2677ee77 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -897,6 +897,8 @@ void DrawEnhancementsMenu() { UIWidgets::Tooltip("Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to replace bombs with 3D objects."); UIWidgets::PaddedEnhancementCheckbox("Disable Grotto Fixed Rotation", "gDisableGrottoRotation", true, false); UIWidgets::Tooltip("Disables grottos rotating with the camera. To be used in conjunction with mods that want to replace grottos with 3D objects."); + UIWidgets::PaddedEnhancementCheckbox("Invisible Bunny Hood", "gHideBunnyHood", true, false); + UIWidgets::Tooltip("Turns Bunny Hood invisible while still maintaining its effects."); ImGui::EndMenu(); } diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 25c8887c3..9b4fbd34f 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -11171,7 +11171,11 @@ void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList, MATRIX_TOMTX(sp70); } - gSPDisplayList(POLY_OPA_DISP++, sMaskDlists[this->currentMask - 1]); + + if (this->currentMask != PLAYER_MASK_BUNNY || !CVarGetInteger("gHideBunnyHood", 0)) { + gSPDisplayList(POLY_OPA_DISP++, sMaskDlists[this->currentMask - 1]); + } + if (CVarGetInteger("gFixIceTrapWithBunnyHood", 1)) Matrix_Pop(); } From 5ddc418777bb02e531104f4b8820647432b2706e Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 13 Oct 2023 19:14:18 -0400 Subject: [PATCH 20/77] redicle -> reticle (#3257) --- soh/assets/objects/object_link_boy/object_link_boy.h | 4 ++-- soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml | 2 +- soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml | 2 +- soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml | 2 +- soh/src/code/z_player_lib.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/soh/assets/objects/object_link_boy/object_link_boy.h b/soh/assets/objects/object_link_boy/object_link_boy.h index 084225d14..13ad2b3a1 100644 --- a/soh/assets/objects/object_link_boy/object_link_boy.h +++ b/soh/assets/objects/object_link_boy/object_link_boy.h @@ -309,8 +309,8 @@ static const ALIGN_ASSET(2) char gLinkAdultHookshotDesignTex[] = dgLinkAdultHook #define dgLinkAdultHookshotChainTex "__OTR__objects/object_link_boy/gLinkAdultHookshotChainTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotChainTex[] = dgLinkAdultHookshotChainTex; -#define dgLinkAdultHookshotRedicleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotRedicleVtx" -static const ALIGN_ASSET(2) char gLinkAdultHookshotRedicleVtx[] = dgLinkAdultHookshotRedicleVtx; +#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx" +static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx; #define dgLinkAdultHookshotReticleTex "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleTex[] = dgLinkAdultHookshotReticleTex; diff --git a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml index 8500b975b..60b9e0984 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml index 7c0014699..5342d5271 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 98dacc982..32a3e6e48 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1369,7 +1369,7 @@ void Player_DrawHookshotReticle(PlayState* play, Player* this, f32 hookshotRange const Color_RGBA8 color = CVarGetColor("gCosmetics.HookshotReticle_NonTarget.Value", defaultColor); gDPSetPrimColor(WORLD_OVERLAY_DISP++, 0, 0, color.r, color.g, color.b, color.a); } - gSPVertex(WORLD_OVERLAY_DISP++, (uintptr_t)gLinkAdultHookshotRedicleVtx, 3, 0); + gSPVertex(WORLD_OVERLAY_DISP++, (uintptr_t)gLinkAdultHookshotReticleVtx, 3, 0); gSP1Triangle(WORLD_OVERLAY_DISP++, 0, 1, 2, 0); CLOSE_DISPS(play->state.gfxCtx); From 041a3792fcb71c275a49f6a661312dd00a7df533 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sun, 15 Oct 2023 23:22:31 +0100 Subject: [PATCH 21/77] Equip Tunic and Boots while performing most actions (#3239) * tunics and boot equips initial todo: find an appropriate place to first put Player_AssignTunicBoots * move to more appropriate place * assign -> use --- .../actors/ovl_player_actor/z_player.c | 66 ++++++++++++------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 9b4fbd34f..a4d933c58 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -2972,33 +2972,9 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { return; } - if (actionParam >= PLAYER_IA_BOOTS_KOKIRI) { - u16 bootsValue = actionParam - PLAYER_IA_BOOTS_KOKIRI + 1; - if (CUR_EQUIP_VALUE(EQUIP_BOOTS) == bootsValue) { - Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_KOKIRI + 1); - } else { - Inventory_ChangeEquipment(EQUIP_BOOTS, bootsValue); - } - Player_SetEquipmentData(play, this); - func_808328EC(this, CUR_EQUIP_VALUE(EQUIP_BOOTS) == PLAYER_BOOTS_IRON + 1 ? NA_SE_PL_WALK_HEAVYBOOTS - : NA_SE_PL_CHANGE_ARMS); - return; - } - - if (actionParam >= PLAYER_IA_TUNIC_KOKIRI) { - u16 tunicValue = actionParam - PLAYER_IA_TUNIC_KOKIRI + 1; - if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == tunicValue) { - Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_KOKIRI + 1); - } else { - Inventory_ChangeEquipment(EQUIP_TUNIC, tunicValue); - } - Player_SetEquipmentData(play, this); - func_808328EC(this, NA_SE_PL_CHANGE_ARMS); - return; - } - if (actionParam >= PLAYER_IA_SHIELD_DEKU) { // Changing shields through action commands is unimplemented + // Boots and tunics handled previously return; } @@ -10597,6 +10573,45 @@ static Vec3f D_80854814 = { 0.0f, 0.0f, 200.0f }; static f32 D_80854820[] = { 2.0f, 4.0f, 7.0f }; static f32 D_8085482C[] = { 0.5f, 1.0f, 3.0f }; +void Player_UseTunicBoots(Player* this, PlayState* play) { + // Boots and tunics equip despite state + s32 i; + s32 item; + s32 actionParam; + if (!(this->stateFlags1 & PLAYER_STATE1_INPUT_DISABLED || this->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || this->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE || this->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN || this->stateFlags2 & PLAYER_STATE2_OCARINA_PLAYING)) { + for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { + if (CHECK_BTN_ALL(sControlInput->press.button, D_80854388[i])) { + break; + } + } + item = func_80833CDC(play, i); + if (item >= ITEM_TUNIC_KOKIRI && item <= ITEM_BOOTS_HOVER) { + this->heldItemButton = i; + actionParam = Player_ItemToItemAction(item); + if (actionParam >= PLAYER_IA_BOOTS_KOKIRI) { + u16 bootsValue = actionParam - PLAYER_IA_BOOTS_KOKIRI + 1; + if (CUR_EQUIP_VALUE(EQUIP_BOOTS) == bootsValue) { + Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_KOKIRI + 1); + } else { + Inventory_ChangeEquipment(EQUIP_BOOTS, bootsValue); + } + Player_SetEquipmentData(play, this); + func_808328EC(this, CUR_EQUIP_VALUE(EQUIP_BOOTS) == PLAYER_BOOTS_IRON + 1 ? NA_SE_PL_WALK_HEAVYBOOTS + : NA_SE_PL_CHANGE_ARMS); + } else if (actionParam >= PLAYER_IA_TUNIC_KOKIRI) { + u16 tunicValue = actionParam - PLAYER_IA_TUNIC_KOKIRI + 1; + if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == tunicValue) { + Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_KOKIRI + 1); + } else { + Inventory_ChangeEquipment(EQUIP_TUNIC, tunicValue); + } + Player_SetEquipmentData(play, this); + func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + } + } + } +} + void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { s32 pad; @@ -10894,6 +10909,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { if (!(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC)) { this->func_674(this, play); + Player_UseTunicBoots(this, play); } Player_UpdateCamAndSeqModes(play, this); From 784737dc7b96830747f26187339b5ecf823c5fc0 Mon Sep 17 00:00:00 2001 From: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> Date: Sun, 15 Oct 2023 18:22:47 -0400 Subject: [PATCH 22/77] [Difficulty Options] All Dogs are Richard (#3243) * Oops, all Richards! * Sure is --- soh/soh/SohMenuBar.cpp | 2 ++ soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index d2677ee77..aac6b6b7b 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -672,6 +672,8 @@ void DrawEnhancementsMenu() { UIWidgets::PaddedEnhancementCheckbox("Always Win Dampe Digging Game", "gDampeWin", true, false, SaveManager::Instance->IsRandoFile(), "This setting is always enabled in randomizer files", UIWidgets::CheckboxGraphics::Checkmark); UIWidgets::Tooltip("Always win the heart piece/purple rupee on the first dig in Dampe's grave digging game, just like in rando\nIn a rando file, this is unconditionally enabled"); + UIWidgets::PaddedEnhancementCheckbox("All Dogs are Richard", "gAllDogsRichard", true, false); + UIWidgets::Tooltip("All dogs can be traded in and will count as Richard."); UIWidgets::Spacer(0); if (ImGui::BeginMenu("Potion Values")) diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 819a432c0..e0ff7470d 100644 --- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -438,7 +438,7 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) { if (followingDog != 0) { this->unk_215 = false; - return (followingDog == 1) ? 0x709F : 0x709E; + return ((followingDog == 1) || (CVarGetInteger("gAllDogsRichard", 0))) ? 0x709F : 0x709E; } else { return 0x709D; } From a3c52626e61b1d8cabd70a98cab3a959f221c22d Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 16 Oct 2023 00:25:43 +0200 Subject: [PATCH 23/77] Randomizer - Colored hints (#3259) * Colored hints * Missed 2 french translations --- .../randomizer/3drando/hint_list.cpp | 4 +-- .../Enhancements/randomizer/3drando/hints.cpp | 32 +++++++++---------- .../Enhancements/randomizer/randomizer.cpp | 32 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index 358ae285d..b830efb60 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -28,12 +28,12 @@ void HintTable_Init() { hintTable[PREFIX] = HintText::Exclude({ Text{ "They say that ", /*french*/ "Selon moi, ", /*spanish*/ "Según dicen, " } }); hintTable[WAY_OF_THE_HERO] = - HintText::Exclude({ Text{ " is on the way of the hero.", /*french*/ " est sur la voie du héros.", + HintText::Exclude({ Text{ " is on %cthe way of the hero%w.", /*french*/ " est sur %cla voie du héros%w.", /*spanish*/ " conduce a la senda del héroe." } }); hintTable[PLUNDERING] = HintText::Exclude({ Text{ "plundering ", /*french*/ "explorer ", /*spanish*/ "inspeccionar " } }); hintTable[FOOLISH] = HintText::Exclude( - { Text{ " is a foolish choice.", /*french*/ " est futile.", /*spanish*/ " no es una sabia decisión." } }); + { Text{ " is %pa foolish choice%w.", /*french*/ " est %pfutile%w.", /*spanish*/ " no es una sabia decisión." } }); hintTable[CAN_BE_FOUND_AT] = HintText::Exclude({ Text{ "can be found at", /*french*/ "se trouve dans", /*spanish*/ "aguarda en" } }); hintTable[HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } }); diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index c1610ce07..dea7833fc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -314,7 +314,7 @@ static void CreateLocationHint(const std::vector& possibleHintLocation Text itemHintText = Location(hintedLocation)->GetPlacedItem().GetHint().GetText(); Text prefix = Hint(PREFIX).GetText(); - Text finalHint = prefix + locationHintText + " #"+itemHintText+"#."; + Text finalHint = prefix + "%r" + locationHintText + " #%g" + itemHintText + "#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); @@ -367,7 +367,7 @@ static void CreateWothHint(uint8_t* remainingDungeonWothHints) { // form hint text Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText(); - Text finalWothHint = Hint(PREFIX).GetText() + "#" + locationText + "#" + Hint(WAY_OF_THE_HERO).GetText(); + Text finalWothHint = Hint(PREFIX).GetText() + "%r#" + locationText + "#%w" + Hint(WAY_OF_THE_HERO).GetText(); SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalWothHint.english); SPDLOG_DEBUG("\n\n"); @@ -411,7 +411,7 @@ static void CreateBarrenHint(uint8_t* remainingDungeonBarrenHints, std::vectorGetParentRegionKey())->GetHint().GetText(); Text finalBarrenHint = - Hint(PREFIX).GetText() + Hint(PLUNDERING).GetText() + "#" + locationText + "#" + Hint(FOOLISH).GetText(); + Hint(PREFIX).GetText() + Hint(PLUNDERING).GetText() + "%r#" + locationText + "#%w" + Hint(FOOLISH).GetText(); SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalBarrenHint.english); SPDLOG_DEBUG("\n\n"); @@ -457,13 +457,13 @@ static void CreateRandomLocationHint(const bool goodItem = false) { Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText(); // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens if (Location(hintedLocation)->IsDungeon()) { - Text finalHint = Hint(PREFIX).GetText()+"#"+locationText+"# "+Hint(HOARDS).GetText()+" #"+itemText+"#."; + Text finalHint = Hint(PREFIX).GetText()+"%r#"+locationText+"#%w "+Hint(HOARDS).GetText()+" %g#"+itemText+"#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); AddHint(finalHint, gossipStone, {QM_GREEN, QM_RED}, HINT_TYPE_NAMED_ITEM, hintedLocation); } else { - Text finalHint = Hint(PREFIX).GetText()+"#"+itemText+"# "+Hint(CAN_BE_FOUND_AT).GetText()+" #"+locationText+"#."; + Text finalHint = Hint(PREFIX).GetText()+"%r#"+itemText+"#%w "+Hint(CAN_BE_FOUND_AT).GetText()+" %g#"+locationText+"#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); @@ -602,7 +602,7 @@ void CreateGanonText() { ganonHintText = hint.GetText()+Hint(YOUR_POCKET).GetText(); lightArrowHintLoc = "Link's Pocket"; } else { - ganonHintText = hint.GetText()+GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); + ganonHintText = hint.GetText() + "%r" + GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); lightArrowHintLoc = Location(lightArrowLocation[0])->GetName(); } ganonHintText = ganonHintText + "!"; @@ -814,9 +814,9 @@ void CreateDampesDiaryText() { uint32_t location = FilterFromPool(allLocations, [item](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == item;})[0]; Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "Whoever reads this, please enter %g", - "Toi qui lit ce journal, rends-toi dans %g", - "Wer immer dies liest, der möge folgenden Ort aufsuchen: %g" + "Whoever reads this, please enter %r", + "Toi qui lit ce journal, rends-toi dans %r", + "Wer immer dies liest, der möge folgenden Ort aufsuchen: %r" }; Text temp2 = { @@ -839,13 +839,13 @@ void CreateGregRupeeHint() { Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%g ", - "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %g", + "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%r ", + "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %r", "" }; Text temp2 = { - "%w.^It's said to have %rmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.", + "%w.^It's said to have %cmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.", "%w. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.", "" }; @@ -859,8 +859,8 @@ void CreateSheikText() { lightArrowHintLoc = Location(lightArrowLocation[0])->GetName(); Text area = GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "I overheard Ganondorf say that he misplaced the %rLight Arrows%w in&%g", - "J'ai entendu dire que Ganondorf aurait caché les %rFlèches de Lumière%w dans %g", + "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r", + "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r", "" }; Text temp2 = Text{"%w.", "%w.", "%w."}; @@ -873,8 +873,8 @@ void CreateSariaText() { sariaHintLoc = Location(magicLocation[0])->GetName(); Text area = GetHintRegion(Location(magicLocation[0])->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g", - "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit qu'elle provenait du %g", + "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r", + "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit qu'elle provenait du %r", "" }; Text temp2 = Text{ diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 3e9c0f7c5..578532a33 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -465,9 +465,9 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) { CustomMessageManager::Instance->CreateMessage( Randomizer::randoMiscHintsTableID, TEXT_CURSED_SKULLTULA_PEOPLE, - CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying&%r{{params}} Spiders of the Curse%w&and I will give you my&%b{{check}}%w!", - "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du %r{{params}} Skulltulas&%wzerstörst und ich werde dir dafür&%b{{check}} %wgeben!", - "Yeaaarrgh! Je suis maudit!^Détruit encore %r{{params}} Araignées de&la Malédiction%w et j'aurai quelque&chose à te donner!&%b({{check}})") + CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying&%r{{params}} Spiders of the Curse%w&and I will give you my&%g{{check}}%w!", + "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem du %r{{params}} Skulltulas&%wzerstörst und ich werde dir dafür&%g{{check}} %wgeben!", + "Yeaaarrgh! Je suis maudit!^Détruit encore %r{{params}} Araignées de&la Malédiction%w et j'aurai quelque&chose à te donner!&%g({{check}})") ); CustomMessageManager::Instance->CreateMessage( Randomizer::randoMiscHintsTableID, TEXT_DAMPES_DIARY, @@ -481,7 +481,7 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) { Randomizer::randoMiscHintsTableID, TEXT_FROGS_UNDERWATER, CustomMessage("Some frogs holding&%g{{item}}%w&are looking at you from underwater...", "Unter Wasser gibt es Frösche,&die %g{{item}}%w&bei sich haben und Dich neugierig&beobachten...", - "Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%r{{item}}%w.", TEXTBOX_TYPE_BLUE) + "Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%g{{item}}%w.", TEXTBOX_TYPE_BLUE) ); CustomMessageManager::Instance->CreateMessage( Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS, @@ -565,17 +565,17 @@ void Randomizer::LoadMerchantMessages(const char* spoilerFileName) { //RANDOTODO: Implement obscure/ambiguous hints CustomMessageManager::Instance->CreateMessage( Randomizer::merchantMessageTableID, TEXT_MEDIGORON, - CustomMessage("How about buying %r&{{item}}%w for %g200 rupees%w?\x1B&%gYes&No%w", - "Wie wäre es mit %r&{{item}}%w für %g200 Rubine?%w\x1B&%gJa!&Nein!%w", - "Veux-tu acheter %r&{{item}}%w pour %g200 rubis?%w\x1B&%gOui&Non&w")); + CustomMessage("How about buying %g&{{item}}%w for %y200 rupees%w?\x1B&%gYes&No%w", + "Wie wäre es mit %g&{{item}}%w für %y200 Rubine?%w\x1B&%gJa!&Nein!%w", + "Veux-tu acheter %g&{{item}}%w pour %y200 rubis?%w\x1B&%gOui&Non&w")); //Granny Shopy //RANDOTODO: Implement obscure/ambiguous hints CustomMessageManager::Instance->CreateMessage( Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP, - CustomMessage("%r{{item}}%w!&How about %g100 rupees%w?\x1B&%gYes&No%w", - "%r{{item}}%w!&Wie wäre es mit %g100 Rubine?%w\x1B&%gJa!&Nein!%w", - "%r{{item}}%w!&Que dis-tu de %g100 rubis?%w\x1B&%gOui&Non&w")); + CustomMessage("%g{{item}}%w!&How about %y100 rupees%w?\x1B&%gYes&No%w", + "%g{{item}}%w!&Wie wäre es mit %y100 Rubine?%w\x1B&%gJa!&Nein!%w", + "%g{{item}}%w!&Que dis-tu de %y100 rubis?%w\x1B&%gOui&Non&w")); //Carpet Salesman //RANDOTODO: Implement obscure/ambiguous hints @@ -596,14 +596,14 @@ void Randomizer::LoadMerchantMessages(const char* spoilerFileName) { CustomMessageManager::Instance->CreateMessage( Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_1, CustomMessage("Welcome!^I am selling stuff, strange and rare, &from all over the world to " - "everybody.&Today's special is...^%r{{item}}" + - cgBoxTwoText[0] + "How about %g200 Rupees?%w\x1B&&%gYes&No%w", + "everybody.&Today's special is...^%g{{item}}" + + cgBoxTwoText[0] + "How about %y200 Rupees?%w\x1B&&%gYes&No%w", "Sei gegrüßt!^Ich verkaufe allerlei Kuriorisäten.&Stets sonderliche und seltene Ware&aus " - "aller Welt für jedermann.&Das heutige Angebot bleibt...^%r{{item}}" + - cgBoxTwoText[1] + "Wie wäre es mit %g200 Rubinen?%w\x1B&&%gJa!&Nein!%w", + "aller Welt für jedermann.&Das heutige Angebot bleibt...^%g{{item}}" + + cgBoxTwoText[1] + "Wie wäre es mit %y200 Rubinen?%w\x1B&&%gJa!&Nein!%w", "Bienvenue!^Je vends des trucs étranges et rares,&de partout dans le monde et à tout " - "le&monde! L'objet du jour est...^%r{{item}}" + - cgBoxTwoText[2] + "Alors, marché conclu pour %g200 rubis?%w\x1B&&%gOui&Non%w")); + "le&monde! L'objet du jour est...^%g{{item}}" + + cgBoxTwoText[2] + "Alors, marché conclu pour %y200 rubis?%w\x1B&&%gOui&Non%w")); CustomMessageManager::Instance->CreateMessage( Randomizer::merchantMessageTableID, TEXT_CARPET_SALESMAN_2, From 42f6cfe66b5f8acdb438587c3c77b7a3c9f4141f Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Sun, 15 Oct 2023 18:25:52 -0400 Subject: [PATCH 24/77] add save editor field for current b button item (#3262) --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 9a8cc2682..cb16a9915 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1694,6 +1694,10 @@ void DrawPlayerTab() { ImU16 one = 1; ImGui::PushItemWidth(ImGui::GetFontSize() * 6); DrawGroupWithBorder([&]() { + ImGui::Text("Current B Item"); + ImGui::InputScalar("B Button", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[0], &one, NULL); + ImGui::NewLine(); + ImGui::Text("Current C Equips"); ImGui::InputScalar("C Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[1], &one, NULL); ImGui::SameLine(); From 3ed976e6af694f4b67ecda6bc1cd2acdb137385e Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Mon, 16 Oct 2023 01:09:55 +0200 Subject: [PATCH 25/77] TWEAK: Add transition to the Time Travel feature (#3276) * ADD/ Proper Transition * REM: Dupe --- soh/soh/Enhancements/mods.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index e4a5d37a8..73d6c4634 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -42,8 +42,8 @@ bool performSave = false; void ReloadSceneTogglingLinkAge() { gPlayState->nextEntranceIndex = gSaveContext.entranceIndex; gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 11; - gSaveContext.nextTransitionType = 11; + gPlayState->fadeTransition = 42; // Fade Out + gSaveContext.nextTransitionType = 42; gPlayState->linkAgeOnLoad ^= 1; // toggle linkAgeOnLoad } From fe90ad0268efbe78fbd73b5567a35563339aa94f Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:10:24 +0100 Subject: [PATCH 26/77] MM Bunny Hood effect separated from ability to equip as adult (#3253) * adult separator * use cross instead of checkmark Co-authored-by: Garrett Cox * suggested load fix --------- Co-authored-by: Garrett Cox --- soh/soh/Enhancements/presets.h | 9 +++++++++ soh/soh/SohMenuBar.cpp | 2 ++ soh/src/code/z_play.c | 2 +- soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index adfb3e080..8847f61f1 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -74,6 +74,7 @@ const std::vector enhancementsCvars = { "gNoForcedNavi", "gSkulltulaFreeze", "gMMBunnyHood", + "gAdultBunnyHood", "gFastChests", "gChestSizeAndTextureMatchesContents", "gFastDrops", @@ -545,6 +546,8 @@ const std::vector enhancedPresetEntries = { PRESET_ENTRY_S32("gSkulltulaFreeze", 1), // MM Bunny Hood PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST_AND_JUMP), + // Adult Bunny Hood + PRESET_ENTRY_S32("gAdultBunnyHood", 1), // Fast Chests PRESET_ENTRY_S32("gFastChests", 1), // Fast Drops @@ -665,6 +668,8 @@ const std::vector randomizerPresetEntries = { PRESET_ENTRY_S32("gSkulltulaFreeze", 1), // MM Bunny Hood PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST_AND_JUMP), + // Adult Bunny Hood + PRESET_ENTRY_S32("gAdultBunnyHood", 1), // Fast Chests PRESET_ENTRY_S32("gFastChests", 1), // Fast Drops @@ -763,6 +768,7 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gInstantPutaway", 1), PRESET_ENTRY_S32("gFastBoomerang", 1), PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), PRESET_ENTRY_S32("gSeparateArrows", 1), PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), @@ -835,6 +841,7 @@ const std::vector spockRacePresetEntries = { }; const std::vector spockRaceNoLogicPresetEntries = { + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gAdultMinimumWeightFish", 6), PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), PRESET_ENTRY_S32("gCheatEasyPauseBufferEnabled", 1), @@ -945,6 +952,7 @@ const std::vector s6PresetEntries = { PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH), PRESET_ENTRY_S32("gFastChests", 1), PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gRandomizeBigPoeTargetCount", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 4), PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), @@ -978,6 +986,7 @@ const std::vector hellModePresetEntries = { PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH), PRESET_ENTRY_S32("gFastChests", 1), PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gRandomizeBigPoeTargetCount", 1), PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1), PRESET_ENTRY_S32("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index aac6b6b7b..d8cbefd0b 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -586,6 +586,8 @@ void DrawEnhancementsMenu() { "Wearing the Bunny Hood grants a speed increase like in Majora's Mask. The longer jump option is not accounted for in randomizer logic.\n\n" "Also disables NPC's reactions to wearing the Bunny Hood." ); + UIWidgets::PaddedEnhancementCheckbox("Bunny Hood Equippable as Adult", "gAdultBunnyHood", true, false, (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) == BUNNY_HOOD_VANILLA), "Only available with increased bunny hood speed", UIWidgets::CheckboxGraphics::Cross, false); + UIWidgets::Tooltip("Allows the bunny hood to be equipped normally from the pause menu as adult."); UIWidgets::PaddedEnhancementCheckbox("Mask Select in Inventory", "gMaskSelect", true, false); UIWidgets::Tooltip("After completing the mask trading sub-quest, press A and any direction on the mask slot to change masks"); UIWidgets::PaddedEnhancementCheckbox("Nuts explode bombs", "gNutsExplodeBombs", true, false); diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index dfafbb7ff..fb4628834 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -653,7 +653,7 @@ void Play_Init(GameState* thisx) { Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); // In order to keep bunny hood equipped on first load, we need to pre-set the age reqs for the item and slot - if (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || CVarGetInteger("gTimelessEquipment", 0)) { + if ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) { gItemAgeReqs[ITEM_MASK_BUNNY] = 9; if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) gSlotAgeReqs[SLOT_TRADE_CHILD] = 9; diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 54b0abab3..2fe8fddb7 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -538,7 +538,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { gSelectingMask = cursorSlot == SLOT_TRADE_CHILD; gSlotAgeReqs[SLOT_TRADE_CHILD] = gItemAgeReqs[ITEM_MASK_BUNNY] = - ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || CVarGetInteger("gTimelessEquipment", 0)) && + ((((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA) && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) && INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) ? 9 : 1; From 4a70fea67f6c1fc5b2765a5d86df51a12d06b954 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:32:42 -0400 Subject: [PATCH 27/77] Move ZAPDTR and OTRExporter to sub modules (#3298) --- .gitmodules | 6 + OTRExporter | 1 + OTRExporter/.gitignore | 353 -- OTRExporter/.gitrepo | 12 - OTRExporter/CFG/ActorList_OoTMqDbg.txt | 472 -- OTRExporter/CFG/Config.xml | 8 - OTRExporter/CFG/ObjectList_OoTMqDbg.txt | 402 -- OTRExporter/CFG/SymbolMap_OoTMqDbg.txt | 1 - OTRExporter/CFG/TexturePool.xml | 952 ---- OTRExporter/CFG/filelists/dbg.txt | 1532 ------- OTRExporter/CFG/filelists/gamecube.txt | 1509 ------- OTRExporter/CFG/filelists/gamecube_pal.txt | 1510 ------- OTRExporter/CFG/filelists/pal_oot.txt | 1511 ------- OTRExporter/CMake/Default.cmake | 65 - OTRExporter/CMake/DefaultCXX.cmake | 12 - OTRExporter/CMake/Utils.cmake | 233 - OTRExporter/CMakeLists.txt | 96 - OTRExporter/LICENSE | 9 - OTRExporter/OTRExporter/AnimationExporter.cpp | 70 - OTRExporter/OTRExporter/AnimationExporter.h | 13 - OTRExporter/OTRExporter/ArrayExporter.cpp | 108 - OTRExporter/OTRExporter/ArrayExporter.h | 12 - OTRExporter/OTRExporter/AudioExporter.cpp | 191 - OTRExporter/OTRExporter/AudioExporter.h | 16 - .../OTRExporter/BackgroundExporter.cpp | 14 - OTRExporter/OTRExporter/BackgroundExporter.h | 12 - OTRExporter/OTRExporter/BlobExporter.cpp | 21 - OTRExporter/OTRExporter/BlobExporter.h | 12 - OTRExporter/OTRExporter/CMakeLists.txt | 245 -- OTRExporter/OTRExporter/CollisionExporter.cpp | 84 - OTRExporter/OTRExporter/CollisionExporter.h | 11 - OTRExporter/OTRExporter/CutsceneExporter.cpp | 444 -- OTRExporter/OTRExporter/CutsceneExporter.h | 11 - .../OTRExporter/DisplayListExporter.cpp | 907 ---- OTRExporter/OTRExporter/DisplayListExporter.h | 17 - OTRExporter/OTRExporter/Exporter.cpp | 21 - OTRExporter/OTRExporter/Exporter.h | 14 - OTRExporter/OTRExporter/Main.cpp | 329 -- OTRExporter/OTRExporter/Main.h | 8 - OTRExporter/OTRExporter/MtxExporter.cpp | 13 - OTRExporter/OTRExporter/MtxExporter.h | 10 - OTRExporter/OTRExporter/PathExporter.cpp | 23 - OTRExporter/OTRExporter/PathExporter.h | 12 - .../OTRExporter/PlayerAnimationExporter.cpp | 21 - .../OTRExporter/PlayerAnimationExporter.h | 13 - OTRExporter/OTRExporter/RoomExporter.cpp | 521 --- OTRExporter/OTRExporter/RoomExporter.h | 14 - OTRExporter/OTRExporter/SkeletonExporter.cpp | 39 - OTRExporter/OTRExporter/SkeletonExporter.h | 14 - .../OTRExporter/SkeletonLimbExporter.cpp | 176 - .../OTRExporter/SkeletonLimbExporter.h | 15 - OTRExporter/OTRExporter/TextExporter.cpp | 19 - OTRExporter/OTRExporter/TextExporter.h | 12 - OTRExporter/OTRExporter/TextureExporter.cpp | 32 - OTRExporter/OTRExporter/TextureExporter.h | 12 - OTRExporter/OTRExporter/VersionInfo.cpp | 25 - OTRExporter/OTRExporter/VersionInfo.h | 7 - OTRExporter/OTRExporter/VtxExporter.cpp | 44 - OTRExporter/OTRExporter/VtxExporter.h | 13 - OTRExporter/OTRExporter/command_macros_base.h | 36 - OTRExporter/OTRExporter/z64cutscene.h | 290 -- .../OTRExporter/z64cutscene_commands.h | 448 -- .../accessibility/texts/filechoose_eng.json | 29 - .../accessibility/texts/filechoose_fra.json | 29 - .../accessibility/texts/filechoose_ger.json | 29 - .../accessibility/texts/kaleidoscope_eng.json | 231 - .../accessibility/texts/kaleidoscope_fra.json | 231 - .../accessibility/texts/kaleidoscope_ger.json | 231 - .../assets/accessibility/texts/misc_eng.json | 24 - .../assets/accessibility/texts/misc_fra.json | 24 - .../assets/accessibility/texts/misc_ger.json | 24 - .../accessibility/texts/scenes_eng.json | 112 - .../accessibility/texts/scenes_fra.json | 112 - .../accessibility/texts/scenes_ger.json | 112 - OTRExporter/assets/fonts/Fipps-Regular.otf | Bin 34220 -> 0 bytes .../assets/fonts/PressStart2P-Regular.ttf | Bin 116008 -> 0 bytes .../cosmetics/gEndGrayscaleAndEndDlistDL | 5 - ...stmasGreenTreasureChestFrontTex.rgb5a1.png | Bin 2917 -> 0 bytes ...GreenTreasureChestSideAndTopTex.rgb5a1.png | Bin 1111 -> 0 bytes ...ristmasRedTreasureChestFrontTex.rgb5a1.png | Bin 3518 -> 0 bytes ...asRedTreasureChestSideAndTopTex.rgb5a1.png | Bin 1661 -> 0 bytes .../gGoldTreasureChestFrontTex.rgb5a1.png | Bin 4727 -> 0 bytes ...gGoldTreasureChestSideAndTopTex.rgb5a1.png | Bin 2338 -> 0 bytes .../gKeyTreasureChestFrontTex.rgb5a1.png | Bin 4233 -> 0 bytes .../gKeyTreasureChestSideAndTopTex.rgb5a1.png | Bin 2184 -> 0 bytes .../gSkullTreasureChestFrontTex.rgb5a1.png | Bin 4265 -> 0 bytes ...SkullTreasureChestSideAndTopTex.rgb5a1.png | Bin 1979 -> 0 bytes .../gTitleBossRushSubtitleTex.rgba32.png | Bin 6291 -> 0 bytes .../gTitleRandomizerSubtitleTex.rgba32.png | Bin 6971 -> 0 bytes .../gTriforcePieceCompletedDL | 13 - .../gTriforcePieceCompletedDL_tri_0 | 58 - .../gTriforcePieceCompletedDL_tri_1 | 7 - .../gTriforcePieceCompletedDL_vtx_0 | 54 - .../gTriforcePieceCompletedDL_vtx_1 | 8 - ...rcePieceCompletedDL_f3dlite_triforce_edges | 21 - ...ePieceCompletedDL_f3dlite_triforce_surface | 21 - .../object_triforce_completed/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_0/gTriforcePiece0DL | 15 - .../gTriforcePiece0DL_tri_0 | 17 - .../gTriforcePiece0DL_tri_1 | 18 - .../gTriforcePiece0DL_tri_2 | 51 - .../gTriforcePiece0DL_vtx_0 | 18 - .../gTriforcePiece0DL_vtx_1 | 22 - .../gTriforcePiece0DL_vtx_2 | 49 - .../mat_gTriforcePiece0DL_f3dlite_shard_edge | 21 - ...t_gTriforcePiece0DL_f3dlite_triforce_edges | 21 - ...gTriforcePiece0DL_f3dlite_triforce_surface | 21 - .../objects/object_triforce_piece_0/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_1/gTriforcePiece1DL | 13 - .../gTriforcePiece1DL_tri_0 | 20 - .../gTriforcePiece1DL_tri_1 | 25 - .../gTriforcePiece1DL_vtx_0 | 23 - .../gTriforcePiece1DL_vtx_1 | 34 - .../mat_gTriforcePiece1DL_f3dlite_shard_edge | 21 - ...gTriforcePiece1DL_f3dlite_triforce_surface | 21 - .../objects/object_triforce_piece_1/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_2/gTriforcePiece2DL | 15 - .../gTriforcePiece2DL_tri_0 | 29 - .../gTriforcePiece2DL_tri_1 | 11 - .../gTriforcePiece2DL_tri_2 | 19 - .../gTriforcePiece2DL_vtx_0 | 36 - .../gTriforcePiece2DL_vtx_1 | 12 - .../gTriforcePiece2DL_vtx_2 | 18 - .../mat_gTriforcePiece2DL_f3dlite_shard_edge | 21 - ...t_gTriforcePiece2DL_f3dlite_triforce_edges | 21 - ...gTriforcePiece2DL_f3dlite_triforce_surface | 21 - .../objects/object_triforce_piece_2/noise_tex | Bin 2140 -> 0 bytes .../scenes/nonmq/syotes_scene/syotes_room_0 | Bin 211 -> 0 bytes OTRExporter/assets/textures/buttons/ABtn.png | Bin 10967 -> 0 bytes OTRExporter/assets/textures/buttons/BBtn.png | Bin 1300 -> 0 bytes OTRExporter/assets/textures/buttons/CDown.png | Bin 11241 -> 0 bytes OTRExporter/assets/textures/buttons/CLeft.png | Bin 11232 -> 0 bytes .../assets/textures/buttons/CRight.png | Bin 11284 -> 0 bytes OTRExporter/assets/textures/buttons/CUp.png | Bin 11219 -> 0 bytes OTRExporter/assets/textures/buttons/LBtn.png | Bin 355 -> 0 bytes OTRExporter/assets/textures/buttons/RBtn.png | Bin 379 -> 0 bytes .../assets/textures/buttons/StartBtn.png | Bin 11868 -> 0 bytes OTRExporter/assets/textures/buttons/ZBtn.png | Bin 1241 -> 0 bytes OTRExporter/assets/textures/icons/gIcon.png | Bin 932 -> 0 bytes .../textures/nintendo_rogo_static/SoHShiny | Bin 1116 -> 0 bytes .../textures/nintendo_rogo_static/gShipLogoDL | 21 - .../nintendo_rogo_static/gShipLogoDL_tri_0 | 241 -- .../nintendo_rogo_static/gShipLogoDL_tri_1 | 80 - .../nintendo_rogo_static/gShipLogoDL_tri_2 | 259 -- .../nintendo_rogo_static/gShipLogoDL_tri_3 | 118 - .../nintendo_rogo_static/gShipLogoDL_vtx_0 | 335 -- .../nintendo_rogo_static/gShipLogoDL_vtx_1 | 98 - .../nintendo_rogo_static/gShipLogoDL_vtx_2 | 323 -- .../nintendo_rogo_static/gShipLogoDL_vtx_3 | 128 - .../mat_gShipLogoDL_f3d_material | 20 - .../mat_gShipLogoDL_f3d_material_001 | 20 - .../mat_gShipLogoDL_f3d_material_002 | 20 - .../mat_gShipLogoDL_f3d_material_003 | 20 - .../mat_revert_gShipLogoDL_f3d_material | 8 - .../mat_revert_gShipLogoDL_f3d_material_001 | 8 - .../mat_revert_gShipLogoDL_f3d_material_002 | 8 - .../mat_revert_gShipLogoDL_f3d_material_003 | 8 - .../nintendo_rogo_static_Tex_LUS_000000 | Bin 6291548 -> 0 bytes .../parameter_static/gArrowDown.ia16.png | Bin 17227 -> 0 bytes .../parameter_static/gArrowUp.ia16.png | Bin 17217 -> 0 bytes .../textures/parameter_static/gDPad.ia16.png | Bin 1017 -> 0 bytes .../gTriforcePiece.rgba32.png | Bin 1761 -> 0 bytes .../gFileSelBossRushSettingsENGTex.ia8.png | Bin 4004 -> 0 bytes .../gFileSelBossRushSettingsFRATex.ia8.png | Bin 3942 -> 0 bytes .../gFileSelBossRushSettingsGERTex.ia8.png | Bin 3884 -> 0 bytes .../title_static/gFileSelMQButtonTex.ia16.png | Bin 883 -> 0 bytes .../gFileSelPleaseChooseAQuestENGTex.ia8.png | Bin 3682 -> 0 bytes .../gFileSelPleaseChooseAQuestFRATex.ia8.png | Bin 3852 -> 0 bytes .../gFileSelPleaseChooseAQuestGERTex.ia8.png | Bin 3666 -> 0 bytes .../gFileSelRANDButtonTex.ia16.png | Bin 1045 -> 0 bytes .../textures/virtual/gEmptyTexture.rgba32.png | Bin 194 -> 0 bytes OTRExporter/extract_assets.py | 78 - OTRExporter/extract_baserom.py | 53 - OTRExporter/offsets.json | 8 - OTRExporter/rom_chooser.py | 54 - OTRExporter/rom_info.py | 100 - ZAPDTR | 1 + ZAPDTR/.clang-format | 84 - ZAPDTR/.gitignore | 341 -- ZAPDTR/.gitrepo | 12 - ZAPDTR/ExporterTest/CollisionExporter.cpp | 76 - ZAPDTR/ExporterTest/CollisionExporter.h | 10 - ZAPDTR/ExporterTest/ExporterTest.vcxproj | 160 - .../ExporterTest/ExporterTest.vcxproj.filters | 42 - ZAPDTR/ExporterTest/Main.cpp | 79 - ZAPDTR/ExporterTest/Makefile | 28 - ZAPDTR/ExporterTest/RoomExporter.cpp | 372 -- ZAPDTR/ExporterTest/RoomExporter.h | 10 - ZAPDTR/ExporterTest/TextureExporter.cpp | 14 - ZAPDTR/ExporterTest/TextureExporter.h | 11 - ZAPDTR/LICENSE | 21 - ZAPDTR/Makefile | 134 - ZAPDTR/README.md | 163 - ZAPDTR/ZAPD/CMakeLists.txt | 497 --- ZAPDTR/ZAPD/CRC32.h | 23 - ZAPDTR/ZAPD/CrashHandler.cpp | 205 - ZAPDTR/ZAPD/CrashHandler.h | 6 - ZAPDTR/ZAPD/Declaration.cpp | 236 - ZAPDTR/ZAPD/Declaration.h | 87 - ZAPDTR/ZAPD/ExecutableMain.cpp | 5 - ZAPDTR/ZAPD/FileWorker.cpp | 0 ZAPDTR/ZAPD/FileWorker.h | 15 - ZAPDTR/ZAPD/GameConfig.cpp | 207 - ZAPDTR/ZAPD/GameConfig.h | 62 - ZAPDTR/ZAPD/Globals.cpp | 325 -- ZAPDTR/ZAPD/Globals.h | 113 - ZAPDTR/ZAPD/ImageBackend.cpp | 506 --- ZAPDTR/ZAPD/ImageBackend.h | 72 - ZAPDTR/ZAPD/Main.cpp | 594 --- ZAPDTR/ZAPD/NuGet/libpng.static.txt | 0 .../ZAPD/OtherStructs/CutsceneMM_Commands.cpp | 213 - .../ZAPD/OtherStructs/CutsceneMM_Commands.h | 140 - .../ZAPD/OtherStructs/Cutscene_Commands.cpp | 596 --- ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h | 267 -- ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp | 352 -- ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h | 114 - ZAPDTR/ZAPD/OutputFormatter.cpp | 123 - ZAPDTR/ZAPD/OutputFormatter.h | 41 - ZAPDTR/ZAPD/Overlays/ZOverlay.cpp | 354 -- ZAPDTR/ZAPD/Overlays/ZOverlay.h | 78 - ZAPDTR/ZAPD/WarningHandler.cpp | 451 -- ZAPDTR/ZAPD/WarningHandler.h | 145 - ZAPDTR/ZAPD/ZAPD.vcxproj | 372 -- ZAPDTR/ZAPD/ZAPD.vcxproj.filters | 572 --- ZAPDTR/ZAPD/ZActorList.cpp | 194 - ZAPDTR/ZAPD/ZActorList.h | 52 - ZAPDTR/ZAPD/ZAnimation.cpp | 580 --- ZAPDTR/ZAPD/ZAnimation.h | 180 - ZAPDTR/ZAPD/ZArray.cpp | 153 - ZAPDTR/ZAPD/ZArray.h | 31 - ZAPDTR/ZAPD/ZAudio.cpp | 415 -- ZAPDTR/ZAPD/ZAudio.h | 134 - ZAPDTR/ZAPD/ZAudioDecode.cpp | 669 --- ZAPDTR/ZAPD/ZBackground.cpp | 195 - ZAPDTR/ZAPD/ZBackground.h | 34 - ZAPDTR/ZAPD/ZBlob.cpp | 116 - ZAPDTR/ZAPD/ZBlob.h | 31 - ZAPDTR/ZAPD/ZCollision.cpp | 400 -- ZAPDTR/ZAPD/ZCollision.h | 90 - ZAPDTR/ZAPD/ZCollisionPoly.cpp | 78 - ZAPDTR/ZAPD/ZCollisionPoly.h | 29 - ZAPDTR/ZAPD/ZCutscene.cpp | 389 -- ZAPDTR/ZAPD/ZCutscene.h | 36 - ZAPDTR/ZAPD/ZDisplayList.cpp | 2257 ---------- ZAPDTR/ZAPD/ZDisplayList.h | 262 -- ZAPDTR/ZAPD/ZFile.cpp | 1429 ------ ZAPDTR/ZAPD/ZFile.h | 141 - ZAPDTR/ZAPD/ZLimb.cpp | 420 -- ZAPDTR/ZAPD/ZLimb.h | 74 - ZAPDTR/ZAPD/ZMtx.cpp | 58 - ZAPDTR/ZAPD/ZMtx.h | 24 - ZAPDTR/ZAPD/ZPath.cpp | 212 - ZAPDTR/ZAPD/ZPath.h | 51 - ZAPDTR/ZAPD/ZPlayerAnimationData.cpp | 101 - ZAPDTR/ZAPD/ZPlayerAnimationData.h | 28 - ZAPDTR/ZAPD/ZPointer.cpp | 57 - ZAPDTR/ZAPD/ZPointer.h | 22 - ZAPDTR/ZAPD/ZResource.cpp | 439 -- ZAPDTR/ZAPD/ZResource.h | 252 -- ZAPDTR/ZAPD/ZRom.cpp | 234 - ZAPDTR/ZAPD/ZRom.h | 28 - ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp | 20 - ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h | 13 - .../ZRoom/Commands/SetActorCutsceneList.cpp | 95 - .../ZRoom/Commands/SetActorCutsceneList.h | 42 - ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp | 59 - ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h | 24 - .../ZRoom/Commands/SetAlternateHeaders.cpp | 84 - .../ZAPD/ZRoom/Commands/SetAlternateHeaders.h | 23 - .../Commands/SetAnimatedMaterialList.cpp | 49 - .../ZRoom/Commands/SetAnimatedMaterialList.h | 21 - .../ZAPD/ZRoom/Commands/SetCameraSettings.cpp | 31 - .../ZAPD/ZRoom/Commands/SetCameraSettings.h | 21 - .../ZRoom/Commands/SetCollisionHeader.cpp | 45 - .../ZAPD/ZRoom/Commands/SetCollisionHeader.h | 20 - ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp | 155 - ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h | 40 - ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp | 146 - ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h | 33 - .../ZAPD/ZRoom/Commands/SetEchoSettings.cpp | 27 - ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h | 18 - .../ZAPD/ZRoom/Commands/SetEntranceList.cpp | 91 - ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h | 31 - ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp | 76 - ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h | 20 - ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp | 100 - ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h | 42 - .../ZRoom/Commands/SetLightingSettings.cpp | 107 - .../ZAPD/ZRoom/Commands/SetLightingSettings.h | 38 - ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp | 616 --- ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h | 159 - .../ZAPD/ZRoom/Commands/SetMinimapChests.cpp | 83 - ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h | 34 - ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp | 98 - ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h | 39 - ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp | 67 - ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h | 19 - ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp | 65 - ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h | 24 - .../ZAPD/ZRoom/Commands/SetRoomBehavior.cpp | 50 - ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h | 29 - ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp | 155 - ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h | 53 - .../ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp | 32 - .../ZAPD/ZRoom/Commands/SetSkyboxModifier.h | 19 - .../ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp | 36 - .../ZAPD/ZRoom/Commands/SetSkyboxSettings.h | 21 - .../ZAPD/ZRoom/Commands/SetSoundSettings.cpp | 30 - ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h | 20 - .../ZAPD/ZRoom/Commands/SetSpecialObjects.cpp | 34 - .../ZAPD/ZRoom/Commands/SetSpecialObjects.h | 19 - .../ZRoom/Commands/SetStartPositionList.cpp | 68 - .../ZRoom/Commands/SetStartPositionList.h | 20 - .../ZAPD/ZRoom/Commands/SetTimeSettings.cpp | 30 - ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h | 20 - .../ZRoom/Commands/SetTransitionActorList.cpp | 93 - .../ZRoom/Commands/SetTransitionActorList.h | 36 - ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp | 32 - ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h | 21 - .../ZRoom/Commands/SetWorldMapVisited.cpp | 22 - .../ZAPD/ZRoom/Commands/SetWorldMapVisited.h | 14 - ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp | 21 - ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h | 14 - ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp | 21 - ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h | 14 - .../ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp | 20 - ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h | 12 - ZAPDTR/ZAPD/ZRoom/ZNames.h | 64 - ZAPDTR/ZAPD/ZRoom/ZRoom.cpp | 427 -- ZAPDTR/ZAPD/ZRoom/ZRoom.h | 50 - ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp | 58 - ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h | 84 - ZAPDTR/ZAPD/ZScalar.cpp | 280 -- ZAPDTR/ZAPD/ZScalar.h | 68 - ZAPDTR/ZAPD/ZSkeleton.cpp | 478 -- ZAPDTR/ZAPD/ZSkeleton.h | 85 - ZAPDTR/ZAPD/ZString.cpp | 69 - ZAPDTR/ZAPD/ZString.h | 24 - ZAPDTR/ZAPD/ZSurfaceType.cpp | 65 - ZAPDTR/ZAPD/ZSurfaceType.h | 27 - ZAPDTR/ZAPD/ZSymbol.cpp | 98 - ZAPDTR/ZAPD/ZSymbol.h | 27 - ZAPDTR/ZAPD/ZText.cpp | 137 - ZAPDTR/ZAPD/ZText.h | 30 - ZAPDTR/ZAPD/ZTexture.cpp | 974 ----- ZAPDTR/ZAPD/ZTexture.h | 93 - ZAPDTR/ZAPD/ZTextureAnimation.cpp | 670 --- ZAPDTR/ZAPD/ZTextureAnimation.h | 151 - ZAPDTR/ZAPD/ZVector.cpp | 126 - ZAPDTR/ZAPD/ZVector.h | 31 - ZAPDTR/ZAPD/ZVtx.cpp | 86 - ZAPDTR/ZAPD/ZVtx.h | 33 - ZAPDTR/ZAPD/any/any/zlib.static.txt | 0 ZAPDTR/ZAPD/ctpl_stl.h | 251 -- ZAPDTR/ZAPD/genbuildinfo.py | 18 - ZAPDTR/ZAPD/packages.config | 9 - ZAPDTR/ZAPD/pathconf.c | 6 - ZAPDTR/ZAPD/yaz0/readwrite.h | 29 - ZAPDTR/ZAPD/yaz0/yaz0.cpp | 227 - ZAPDTR/ZAPD/yaz0/yaz0.h | 6 - ZAPDTR/copycheck.py | 9 - ZAPDTR/docs/zapd_extraction_xml_reference.md | 680 --- ZAPDTR/docs/zapd_warning_example.png | Bin 47521 -> 0 bytes ZAPDTR/docs/zapd_xml_spec.md | 55 - ZAPDTR/lib/libgfxd/.gitrepo | 12 - ZAPDTR/lib/libgfxd/LICENSE | 21 - ZAPDTR/lib/libgfxd/Makefile | 26 - ZAPDTR/lib/libgfxd/README.md | 478 -- ZAPDTR/lib/libgfxd/gbi.h | 3838 ----------------- ZAPDTR/lib/libgfxd/gfxd.c | 863 ---- ZAPDTR/lib/libgfxd/gfxd.h | 387 -- ZAPDTR/lib/libgfxd/priv.h | 125 - ZAPDTR/lib/libgfxd/uc.c | 54 - ZAPDTR/lib/libgfxd/uc_argfn.c | 1814 -------- ZAPDTR/lib/libgfxd/uc_argtbl.c | 485 --- ZAPDTR/lib/libgfxd/uc_f3d.c | 4 - ZAPDTR/lib/libgfxd/uc_f3db.c | 5 - ZAPDTR/lib/libgfxd/uc_f3dex.c | 4 - ZAPDTR/lib/libgfxd/uc_f3dex2.c | 4 - ZAPDTR/lib/libgfxd/uc_f3dexb.c | 5 - ZAPDTR/lib/libgfxd/uc_macrofn.c | 2507 ----------- ZAPDTR/lib/libgfxd/uc_macrotbl.c | 1397 ------ ZAPDTR/lib/tinyxml2/tinyxml2.cpp | 2837 ------------ ZAPDTR/lib/tinyxml2/tinyxml2.h | 2309 ---------- 384 files changed, 8 insertions(+), 61596 deletions(-) create mode 160000 OTRExporter delete mode 100644 OTRExporter/.gitignore delete mode 100644 OTRExporter/.gitrepo delete mode 100644 OTRExporter/CFG/ActorList_OoTMqDbg.txt delete mode 100644 OTRExporter/CFG/Config.xml delete mode 100644 OTRExporter/CFG/ObjectList_OoTMqDbg.txt delete mode 100644 OTRExporter/CFG/SymbolMap_OoTMqDbg.txt delete mode 100644 OTRExporter/CFG/TexturePool.xml delete mode 100644 OTRExporter/CFG/filelists/dbg.txt delete mode 100644 OTRExporter/CFG/filelists/gamecube.txt delete mode 100644 OTRExporter/CFG/filelists/gamecube_pal.txt delete mode 100644 OTRExporter/CFG/filelists/pal_oot.txt delete mode 100644 OTRExporter/CMake/Default.cmake delete mode 100644 OTRExporter/CMake/DefaultCXX.cmake delete mode 100644 OTRExporter/CMake/Utils.cmake delete mode 100644 OTRExporter/CMakeLists.txt delete mode 100644 OTRExporter/LICENSE delete mode 100644 OTRExporter/OTRExporter/AnimationExporter.cpp delete mode 100644 OTRExporter/OTRExporter/AnimationExporter.h delete mode 100644 OTRExporter/OTRExporter/ArrayExporter.cpp delete mode 100644 OTRExporter/OTRExporter/ArrayExporter.h delete mode 100644 OTRExporter/OTRExporter/AudioExporter.cpp delete mode 100644 OTRExporter/OTRExporter/AudioExporter.h delete mode 100644 OTRExporter/OTRExporter/BackgroundExporter.cpp delete mode 100644 OTRExporter/OTRExporter/BackgroundExporter.h delete mode 100644 OTRExporter/OTRExporter/BlobExporter.cpp delete mode 100644 OTRExporter/OTRExporter/BlobExporter.h delete mode 100644 OTRExporter/OTRExporter/CMakeLists.txt delete mode 100644 OTRExporter/OTRExporter/CollisionExporter.cpp delete mode 100644 OTRExporter/OTRExporter/CollisionExporter.h delete mode 100644 OTRExporter/OTRExporter/CutsceneExporter.cpp delete mode 100644 OTRExporter/OTRExporter/CutsceneExporter.h delete mode 100644 OTRExporter/OTRExporter/DisplayListExporter.cpp delete mode 100644 OTRExporter/OTRExporter/DisplayListExporter.h delete mode 100644 OTRExporter/OTRExporter/Exporter.cpp delete mode 100644 OTRExporter/OTRExporter/Exporter.h delete mode 100644 OTRExporter/OTRExporter/Main.cpp delete mode 100644 OTRExporter/OTRExporter/Main.h delete mode 100644 OTRExporter/OTRExporter/MtxExporter.cpp delete mode 100644 OTRExporter/OTRExporter/MtxExporter.h delete mode 100644 OTRExporter/OTRExporter/PathExporter.cpp delete mode 100644 OTRExporter/OTRExporter/PathExporter.h delete mode 100644 OTRExporter/OTRExporter/PlayerAnimationExporter.cpp delete mode 100644 OTRExporter/OTRExporter/PlayerAnimationExporter.h delete mode 100644 OTRExporter/OTRExporter/RoomExporter.cpp delete mode 100644 OTRExporter/OTRExporter/RoomExporter.h delete mode 100644 OTRExporter/OTRExporter/SkeletonExporter.cpp delete mode 100644 OTRExporter/OTRExporter/SkeletonExporter.h delete mode 100644 OTRExporter/OTRExporter/SkeletonLimbExporter.cpp delete mode 100644 OTRExporter/OTRExporter/SkeletonLimbExporter.h delete mode 100644 OTRExporter/OTRExporter/TextExporter.cpp delete mode 100644 OTRExporter/OTRExporter/TextExporter.h delete mode 100644 OTRExporter/OTRExporter/TextureExporter.cpp delete mode 100644 OTRExporter/OTRExporter/TextureExporter.h delete mode 100644 OTRExporter/OTRExporter/VersionInfo.cpp delete mode 100644 OTRExporter/OTRExporter/VersionInfo.h delete mode 100644 OTRExporter/OTRExporter/VtxExporter.cpp delete mode 100644 OTRExporter/OTRExporter/VtxExporter.h delete mode 100644 OTRExporter/OTRExporter/command_macros_base.h delete mode 100644 OTRExporter/OTRExporter/z64cutscene.h delete mode 100644 OTRExporter/OTRExporter/z64cutscene_commands.h delete mode 100644 OTRExporter/assets/accessibility/texts/filechoose_eng.json delete mode 100644 OTRExporter/assets/accessibility/texts/filechoose_fra.json delete mode 100644 OTRExporter/assets/accessibility/texts/filechoose_ger.json delete mode 100644 OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json delete mode 100644 OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json delete mode 100644 OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json delete mode 100644 OTRExporter/assets/accessibility/texts/misc_eng.json delete mode 100644 OTRExporter/assets/accessibility/texts/misc_fra.json delete mode 100644 OTRExporter/assets/accessibility/texts/misc_ger.json delete mode 100644 OTRExporter/assets/accessibility/texts/scenes_eng.json delete mode 100644 OTRExporter/assets/accessibility/texts/scenes_fra.json delete mode 100644 OTRExporter/assets/accessibility/texts/scenes_ger.json delete mode 100644 OTRExporter/assets/fonts/Fipps-Regular.otf delete mode 100644 OTRExporter/assets/fonts/PressStart2P-Regular.ttf delete mode 100644 OTRExporter/assets/helpers/cosmetics/gEndGrayscaleAndEndDlistDL delete mode 100644 OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png delete mode 100644 OTRExporter/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png delete mode 100644 OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface delete mode 100644 OTRExporter/assets/objects/object_triforce_completed/noise_tex delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_0/noise_tex delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_1/noise_tex delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface delete mode 100644 OTRExporter/assets/objects/object_triforce_piece_2/noise_tex delete mode 100644 OTRExporter/assets/scenes/nonmq/syotes_scene/syotes_room_0 delete mode 100644 OTRExporter/assets/textures/buttons/ABtn.png delete mode 100644 OTRExporter/assets/textures/buttons/BBtn.png delete mode 100644 OTRExporter/assets/textures/buttons/CDown.png delete mode 100644 OTRExporter/assets/textures/buttons/CLeft.png delete mode 100644 OTRExporter/assets/textures/buttons/CRight.png delete mode 100644 OTRExporter/assets/textures/buttons/CUp.png delete mode 100644 OTRExporter/assets/textures/buttons/LBtn.png delete mode 100644 OTRExporter/assets/textures/buttons/RBtn.png delete mode 100644 OTRExporter/assets/textures/buttons/StartBtn.png delete mode 100644 OTRExporter/assets/textures/buttons/ZBtn.png delete mode 100644 OTRExporter/assets/textures/icons/gIcon.png delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/SoHShiny delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 delete mode 100644 OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 delete mode 100644 OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png delete mode 100644 OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png delete mode 100644 OTRExporter/assets/textures/parameter_static/gDPad.ia16.png delete mode 100644 OTRExporter/assets/textures/parameter_static/gTriforcePiece.rgba32.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png delete mode 100644 OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png delete mode 100644 OTRExporter/assets/textures/virtual/gEmptyTexture.rgba32.png delete mode 100755 OTRExporter/extract_assets.py delete mode 100644 OTRExporter/extract_baserom.py delete mode 100644 OTRExporter/offsets.json delete mode 100644 OTRExporter/rom_chooser.py delete mode 100644 OTRExporter/rom_info.py create mode 160000 ZAPDTR delete mode 100644 ZAPDTR/.clang-format delete mode 100644 ZAPDTR/.gitignore delete mode 100644 ZAPDTR/.gitrepo delete mode 100644 ZAPDTR/ExporterTest/CollisionExporter.cpp delete mode 100644 ZAPDTR/ExporterTest/CollisionExporter.h delete mode 100644 ZAPDTR/ExporterTest/ExporterTest.vcxproj delete mode 100644 ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters delete mode 100644 ZAPDTR/ExporterTest/Main.cpp delete mode 100644 ZAPDTR/ExporterTest/Makefile delete mode 100644 ZAPDTR/ExporterTest/RoomExporter.cpp delete mode 100644 ZAPDTR/ExporterTest/RoomExporter.h delete mode 100644 ZAPDTR/ExporterTest/TextureExporter.cpp delete mode 100644 ZAPDTR/ExporterTest/TextureExporter.h delete mode 100644 ZAPDTR/LICENSE delete mode 100644 ZAPDTR/Makefile delete mode 100644 ZAPDTR/README.md delete mode 100644 ZAPDTR/ZAPD/CMakeLists.txt delete mode 100644 ZAPDTR/ZAPD/CRC32.h delete mode 100644 ZAPDTR/ZAPD/CrashHandler.cpp delete mode 100644 ZAPDTR/ZAPD/CrashHandler.h delete mode 100644 ZAPDTR/ZAPD/Declaration.cpp delete mode 100644 ZAPDTR/ZAPD/Declaration.h delete mode 100644 ZAPDTR/ZAPD/ExecutableMain.cpp delete mode 100644 ZAPDTR/ZAPD/FileWorker.cpp delete mode 100644 ZAPDTR/ZAPD/FileWorker.h delete mode 100644 ZAPDTR/ZAPD/GameConfig.cpp delete mode 100644 ZAPDTR/ZAPD/GameConfig.h delete mode 100644 ZAPDTR/ZAPD/Globals.cpp delete mode 100644 ZAPDTR/ZAPD/Globals.h delete mode 100644 ZAPDTR/ZAPD/ImageBackend.cpp delete mode 100644 ZAPDTR/ZAPD/ImageBackend.h delete mode 100644 ZAPDTR/ZAPD/Main.cpp delete mode 100644 ZAPDTR/ZAPD/NuGet/libpng.static.txt delete mode 100644 ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp delete mode 100644 ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h delete mode 100644 ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp delete mode 100644 ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h delete mode 100644 ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp delete mode 100644 ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h delete mode 100644 ZAPDTR/ZAPD/OutputFormatter.cpp delete mode 100644 ZAPDTR/ZAPD/OutputFormatter.h delete mode 100644 ZAPDTR/ZAPD/Overlays/ZOverlay.cpp delete mode 100644 ZAPDTR/ZAPD/Overlays/ZOverlay.h delete mode 100644 ZAPDTR/ZAPD/WarningHandler.cpp delete mode 100644 ZAPDTR/ZAPD/WarningHandler.h delete mode 100644 ZAPDTR/ZAPD/ZAPD.vcxproj delete mode 100644 ZAPDTR/ZAPD/ZAPD.vcxproj.filters delete mode 100644 ZAPDTR/ZAPD/ZActorList.cpp delete mode 100644 ZAPDTR/ZAPD/ZActorList.h delete mode 100644 ZAPDTR/ZAPD/ZAnimation.cpp delete mode 100644 ZAPDTR/ZAPD/ZAnimation.h delete mode 100644 ZAPDTR/ZAPD/ZArray.cpp delete mode 100644 ZAPDTR/ZAPD/ZArray.h delete mode 100644 ZAPDTR/ZAPD/ZAudio.cpp delete mode 100644 ZAPDTR/ZAPD/ZAudio.h delete mode 100644 ZAPDTR/ZAPD/ZAudioDecode.cpp delete mode 100644 ZAPDTR/ZAPD/ZBackground.cpp delete mode 100644 ZAPDTR/ZAPD/ZBackground.h delete mode 100644 ZAPDTR/ZAPD/ZBlob.cpp delete mode 100644 ZAPDTR/ZAPD/ZBlob.h delete mode 100644 ZAPDTR/ZAPD/ZCollision.cpp delete mode 100644 ZAPDTR/ZAPD/ZCollision.h delete mode 100644 ZAPDTR/ZAPD/ZCollisionPoly.cpp delete mode 100644 ZAPDTR/ZAPD/ZCollisionPoly.h delete mode 100644 ZAPDTR/ZAPD/ZCutscene.cpp delete mode 100644 ZAPDTR/ZAPD/ZCutscene.h delete mode 100644 ZAPDTR/ZAPD/ZDisplayList.cpp delete mode 100644 ZAPDTR/ZAPD/ZDisplayList.h delete mode 100644 ZAPDTR/ZAPD/ZFile.cpp delete mode 100644 ZAPDTR/ZAPD/ZFile.h delete mode 100644 ZAPDTR/ZAPD/ZLimb.cpp delete mode 100644 ZAPDTR/ZAPD/ZLimb.h delete mode 100644 ZAPDTR/ZAPD/ZMtx.cpp delete mode 100644 ZAPDTR/ZAPD/ZMtx.h delete mode 100644 ZAPDTR/ZAPD/ZPath.cpp delete mode 100644 ZAPDTR/ZAPD/ZPath.h delete mode 100644 ZAPDTR/ZAPD/ZPlayerAnimationData.cpp delete mode 100644 ZAPDTR/ZAPD/ZPlayerAnimationData.h delete mode 100644 ZAPDTR/ZAPD/ZPointer.cpp delete mode 100644 ZAPDTR/ZAPD/ZPointer.h delete mode 100644 ZAPDTR/ZAPD/ZResource.cpp delete mode 100644 ZAPDTR/ZAPD/ZResource.h delete mode 100644 ZAPDTR/ZAPD/ZRom.cpp delete mode 100644 ZAPDTR/ZAPD/ZRom.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/ZNames.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/ZRoom.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/ZRoom.h delete mode 100644 ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp delete mode 100644 ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h delete mode 100644 ZAPDTR/ZAPD/ZScalar.cpp delete mode 100644 ZAPDTR/ZAPD/ZScalar.h delete mode 100644 ZAPDTR/ZAPD/ZSkeleton.cpp delete mode 100644 ZAPDTR/ZAPD/ZSkeleton.h delete mode 100644 ZAPDTR/ZAPD/ZString.cpp delete mode 100644 ZAPDTR/ZAPD/ZString.h delete mode 100644 ZAPDTR/ZAPD/ZSurfaceType.cpp delete mode 100644 ZAPDTR/ZAPD/ZSurfaceType.h delete mode 100644 ZAPDTR/ZAPD/ZSymbol.cpp delete mode 100644 ZAPDTR/ZAPD/ZSymbol.h delete mode 100644 ZAPDTR/ZAPD/ZText.cpp delete mode 100644 ZAPDTR/ZAPD/ZText.h delete mode 100644 ZAPDTR/ZAPD/ZTexture.cpp delete mode 100644 ZAPDTR/ZAPD/ZTexture.h delete mode 100644 ZAPDTR/ZAPD/ZTextureAnimation.cpp delete mode 100644 ZAPDTR/ZAPD/ZTextureAnimation.h delete mode 100644 ZAPDTR/ZAPD/ZVector.cpp delete mode 100644 ZAPDTR/ZAPD/ZVector.h delete mode 100644 ZAPDTR/ZAPD/ZVtx.cpp delete mode 100644 ZAPDTR/ZAPD/ZVtx.h delete mode 100644 ZAPDTR/ZAPD/any/any/zlib.static.txt delete mode 100644 ZAPDTR/ZAPD/ctpl_stl.h delete mode 100644 ZAPDTR/ZAPD/genbuildinfo.py delete mode 100644 ZAPDTR/ZAPD/packages.config delete mode 100644 ZAPDTR/ZAPD/pathconf.c delete mode 100644 ZAPDTR/ZAPD/yaz0/readwrite.h delete mode 100644 ZAPDTR/ZAPD/yaz0/yaz0.cpp delete mode 100644 ZAPDTR/ZAPD/yaz0/yaz0.h delete mode 100755 ZAPDTR/copycheck.py delete mode 100644 ZAPDTR/docs/zapd_extraction_xml_reference.md delete mode 100644 ZAPDTR/docs/zapd_warning_example.png delete mode 100644 ZAPDTR/docs/zapd_xml_spec.md delete mode 100644 ZAPDTR/lib/libgfxd/.gitrepo delete mode 100644 ZAPDTR/lib/libgfxd/LICENSE delete mode 100644 ZAPDTR/lib/libgfxd/Makefile delete mode 100644 ZAPDTR/lib/libgfxd/README.md delete mode 100644 ZAPDTR/lib/libgfxd/gbi.h delete mode 100644 ZAPDTR/lib/libgfxd/gfxd.c delete mode 100644 ZAPDTR/lib/libgfxd/gfxd.h delete mode 100644 ZAPDTR/lib/libgfxd/priv.h delete mode 100644 ZAPDTR/lib/libgfxd/uc.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_argfn.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_argtbl.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_f3d.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_f3db.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_f3dex.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_f3dex2.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_f3dexb.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_macrofn.c delete mode 100644 ZAPDTR/lib/libgfxd/uc_macrotbl.c delete mode 100644 ZAPDTR/lib/tinyxml2/tinyxml2.cpp delete mode 100644 ZAPDTR/lib/tinyxml2/tinyxml2.h diff --git a/.gitmodules b/.gitmodules index 0d73816e3..7098d9d08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "libultraship"] path = libultraship url = https://github.com/kenix3/libultraship.git +[submodule "ZAPDTR"] + path = ZAPDTR + url = https://github.com/harbourmasters/ZAPDTR +[submodule "OTRExporter"] + path = OTRExporter + url = https://github.com/harbourmasters/OTRExporter diff --git a/OTRExporter b/OTRExporter new file mode 160000 index 000000000..89de14726 --- /dev/null +++ b/OTRExporter @@ -0,0 +1 @@ +Subproject commit 89de1472606b101a25d489d3e01f1769d3bc186c diff --git a/OTRExporter/.gitignore b/OTRExporter/.gitignore deleted file mode 100644 index 2080ab480..000000000 --- a/OTRExporter/.gitignore +++ /dev/null @@ -1,353 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -*.out -*.o -*.d -lib/libgfxd/libgfxd.a -ExporterTest/ExporterTest.a -ZAPDUtils/ZAPDUtils.a -.vscode/ -build/ -ZAPDUtils/build/ -ZAPD/BuildInfo.h -baserom/ -baserom_ntsc/ -*.vtx.inc -*.otr -*.swp -*.a -*.z64 -*.n64 -Extract/ - -tmp.txt diff --git a/OTRExporter/.gitrepo b/OTRExporter/.gitrepo deleted file mode 100644 index 80e147d0c..000000000 --- a/OTRExporter/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = https://github.com/HarbourMasters/OTRExporter.git - branch = master - commit = 1503d3eefa0b51164371c60c2aae8ad057678319 - parent = d24c8453db1035f382e1b0853be00ebd281bbbdd - method = rebase - cmdver = 0.4.1 diff --git a/OTRExporter/CFG/ActorList_OoTMqDbg.txt b/OTRExporter/CFG/ActorList_OoTMqDbg.txt deleted file mode 100644 index a0395eb27..000000000 --- a/OTRExporter/CFG/ActorList_OoTMqDbg.txt +++ /dev/null @@ -1,472 +0,0 @@ -ACTOR_PLAYER -ACTOR_UNSET_1 -ACTOR_EN_TEST -ACTOR_UNSET_3 -ACTOR_EN_GIRLA -ACTOR_UNSET_5 -ACTOR_UNSET_6 -ACTOR_EN_PART -ACTOR_EN_LIGHT -ACTOR_EN_DOOR -ACTOR_EN_BOX -ACTOR_BG_DY_YOSEIZO -ACTOR_BG_HIDAN_FIREWALL -ACTOR_EN_POH -ACTOR_EN_OKUTA -ACTOR_BG_YDAN_SP -ACTOR_EN_BOM -ACTOR_EN_WALLMAS -ACTOR_EN_DODONGO -ACTOR_EN_FIREFLY -ACTOR_EN_HORSE -ACTOR_EN_ITEM00 -ACTOR_EN_ARROW -ACTOR_UNSET_17 -ACTOR_EN_ELF -ACTOR_EN_NIW -ACTOR_UNSET_1A -ACTOR_EN_TITE -ACTOR_EN_REEBA -ACTOR_EN_PEEHAT -ACTOR_EN_BUTTE -ACTOR_UNSET_1F -ACTOR_EN_INSECT -ACTOR_EN_FISH -ACTOR_UNSET_22 -ACTOR_EN_HOLL -ACTOR_EN_SCENE_CHANGE -ACTOR_EN_ZF -ACTOR_EN_HATA -ACTOR_BOSS_DODONGO -ACTOR_BOSS_GOMA -ACTOR_EN_ZL1 -ACTOR_EN_VIEWER -ACTOR_EN_GOMA -ACTOR_BG_PUSHBOX -ACTOR_EN_BUBBLE -ACTOR_DOOR_SHUTTER -ACTOR_EN_DODOJR -ACTOR_EN_BDFIRE -ACTOR_UNSET_31 -ACTOR_EN_BOOM -ACTOR_EN_TORCH2 -ACTOR_EN_BILI -ACTOR_EN_TP -ACTOR_UNSET_36 -ACTOR_EN_ST -ACTOR_EN_BW -ACTOR_EN_A_OBJ -ACTOR_EN_EIYER -ACTOR_EN_RIVER_SOUND -ACTOR_EN_HORSE_NORMAL -ACTOR_EN_OSSAN -ACTOR_BG_TREEMOUTH -ACTOR_BG_DODOAGO -ACTOR_BG_HIDAN_DALM -ACTOR_BG_HIDAN_HROCK -ACTOR_EN_HORSE_GANON -ACTOR_BG_HIDAN_ROCK -ACTOR_BG_HIDAN_RSEKIZOU -ACTOR_BG_HIDAN_SEKIZOU -ACTOR_BG_HIDAN_SIMA -ACTOR_BG_HIDAN_SYOKU -ACTOR_EN_XC -ACTOR_BG_HIDAN_CURTAIN -ACTOR_BG_SPOT00_HANEBASI -ACTOR_EN_MB -ACTOR_EN_BOMBF -ACTOR_EN_ZL2 -ACTOR_BG_HIDAN_FSLIFT -ACTOR_EN_OE2 -ACTOR_BG_YDAN_HASI -ACTOR_BG_YDAN_MARUTA -ACTOR_BOSS_GANONDROF -ACTOR_UNSET_53 -ACTOR_EN_AM -ACTOR_EN_DEKUBABA -ACTOR_EN_M_FIRE1 -ACTOR_EN_M_THUNDER -ACTOR_BG_DDAN_JD -ACTOR_BG_BREAKWALL -ACTOR_EN_JJ -ACTOR_EN_HORSE_ZELDA -ACTOR_BG_DDAN_KD -ACTOR_DOOR_WARP1 -ACTOR_OBJ_SYOKUDAI -ACTOR_ITEM_B_HEART -ACTOR_EN_DEKUNUTS -ACTOR_BG_MENKURI_KAITEN -ACTOR_BG_MENKURI_EYE -ACTOR_EN_VALI -ACTOR_BG_MIZU_MOVEBG -ACTOR_BG_MIZU_WATER -ACTOR_ARMS_HOOK -ACTOR_EN_FHG -ACTOR_BG_MORI_HINERI -ACTOR_EN_BB -ACTOR_BG_TOKI_HIKARI -ACTOR_EN_YUKABYUN -ACTOR_BG_TOKI_SWD -ACTOR_EN_FHG_FIRE -ACTOR_BG_MJIN -ACTOR_BG_HIDAN_KOUSI -ACTOR_DOOR_TOKI -ACTOR_BG_HIDAN_HAMSTEP -ACTOR_EN_BIRD -ACTOR_UNSET_73 -ACTOR_UNSET_74 -ACTOR_UNSET_75 -ACTOR_UNSET_76 -ACTOR_EN_WOOD02 -ACTOR_UNSET_78 -ACTOR_UNSET_79 -ACTOR_UNSET_7A -ACTOR_UNSET_7B -ACTOR_EN_LIGHTBOX -ACTOR_EN_PU_BOX -ACTOR_UNSET_7E -ACTOR_UNSET_7F -ACTOR_EN_TRAP -ACTOR_EN_AROW_TRAP -ACTOR_EN_VASE -ACTOR_UNSET_83 -ACTOR_EN_TA -ACTOR_EN_TK -ACTOR_BG_MORI_BIGST -ACTOR_BG_MORI_ELEVATOR -ACTOR_BG_MORI_KAITENKABE -ACTOR_BG_MORI_RAKKATENJO -ACTOR_EN_VM -ACTOR_DEMO_EFFECT -ACTOR_DEMO_KANKYO -ACTOR_BG_HIDAN_FWBIG -ACTOR_EN_FLOORMAS -ACTOR_EN_HEISHI1 -ACTOR_EN_RD -ACTOR_EN_PO_SISTERS -ACTOR_BG_HEAVY_BLOCK -ACTOR_BG_PO_EVENT -ACTOR_OBJ_MURE -ACTOR_EN_SW -ACTOR_BOSS_FD -ACTOR_OBJECT_KANKYO -ACTOR_EN_DU -ACTOR_EN_FD -ACTOR_EN_HORSE_LINK_CHILD -ACTOR_DOOR_ANA -ACTOR_BG_SPOT02_OBJECTS -ACTOR_BG_HAKA -ACTOR_MAGIC_WIND -ACTOR_MAGIC_FIRE -ACTOR_UNSET_A0 -ACTOR_EN_RU1 -ACTOR_BOSS_FD2 -ACTOR_EN_FD_FIRE -ACTOR_EN_DH -ACTOR_EN_DHA -ACTOR_EN_RL -ACTOR_EN_ENCOUNT1 -ACTOR_DEMO_DU -ACTOR_DEMO_IM -ACTOR_DEMO_TRE_LGT -ACTOR_EN_FW -ACTOR_BG_VB_SIMA -ACTOR_EN_VB_BALL -ACTOR_BG_HAKA_MEGANE -ACTOR_BG_HAKA_MEGANEBG -ACTOR_BG_HAKA_SHIP -ACTOR_BG_HAKA_SGAMI -ACTOR_UNSET_B2 -ACTOR_EN_HEISHI2 -ACTOR_EN_ENCOUNT2 -ACTOR_EN_FIRE_ROCK -ACTOR_EN_BROB -ACTOR_MIR_RAY -ACTOR_BG_SPOT09_OBJ -ACTOR_BG_SPOT18_OBJ -ACTOR_BOSS_VA -ACTOR_BG_HAKA_TUBO -ACTOR_BG_HAKA_TRAP -ACTOR_BG_HAKA_HUTA -ACTOR_BG_HAKA_ZOU -ACTOR_BG_SPOT17_FUNEN -ACTOR_EN_SYATEKI_ITM -ACTOR_EN_SYATEKI_MAN -ACTOR_EN_TANA -ACTOR_EN_NB -ACTOR_BOSS_MO -ACTOR_EN_SB -ACTOR_EN_BIGOKUTA -ACTOR_EN_KAREBABA -ACTOR_BG_BDAN_OBJECTS -ACTOR_DEMO_SA -ACTOR_DEMO_GO -ACTOR_EN_IN -ACTOR_EN_TR -ACTOR_BG_SPOT16_BOMBSTONE -ACTOR_UNSET_CE -ACTOR_BG_HIDAN_KOWARERUKABE -ACTOR_BG_BOMBWALL -ACTOR_BG_SPOT08_ICEBLOCK -ACTOR_EN_RU2 -ACTOR_OBJ_DEKUJR -ACTOR_BG_MIZU_UZU -ACTOR_BG_SPOT06_OBJECTS -ACTOR_BG_ICE_OBJECTS -ACTOR_BG_HAKA_WATER -ACTOR_UNSET_D8 -ACTOR_EN_MA2 -ACTOR_EN_BOM_CHU -ACTOR_EN_HORSE_GAME_CHECK -ACTOR_BOSS_TW -ACTOR_EN_RR -ACTOR_EN_BA -ACTOR_EN_BX -ACTOR_EN_ANUBICE -ACTOR_EN_ANUBICE_FIRE -ACTOR_BG_MORI_HASHIGO -ACTOR_BG_MORI_HASHIRA4 -ACTOR_BG_MORI_IDOMIZU -ACTOR_BG_SPOT16_DOUGHNUT -ACTOR_BG_BDAN_SWITCH -ACTOR_EN_MA1 -ACTOR_BOSS_GANON -ACTOR_BOSS_SST -ACTOR_UNSET_EA -ACTOR_UNSET_EB -ACTOR_EN_NY -ACTOR_EN_FR -ACTOR_ITEM_SHIELD -ACTOR_BG_ICE_SHELTER -ACTOR_EN_ICE_HONO -ACTOR_ITEM_OCARINA -ACTOR_UNSET_F2 -ACTOR_UNSET_F3 -ACTOR_MAGIC_DARK -ACTOR_DEMO_6K -ACTOR_EN_ANUBICE_TAG -ACTOR_BG_HAKA_GATE -ACTOR_BG_SPOT15_SAKU -ACTOR_BG_JYA_GOROIWA -ACTOR_BG_JYA_ZURERUKABE -ACTOR_UNSET_FB -ACTOR_BG_JYA_COBRA -ACTOR_BG_JYA_KANAAMI -ACTOR_FISHING -ACTOR_OBJ_OSHIHIKI -ACTOR_BG_GATE_SHUTTER -ACTOR_EFF_DUST -ACTOR_BG_SPOT01_FUSYA -ACTOR_BG_SPOT01_IDOHASHIRA -ACTOR_BG_SPOT01_IDOMIZU -ACTOR_BG_PO_SYOKUDAI -ACTOR_BG_GANON_OTYUKA -ACTOR_BG_SPOT15_RRBOX -ACTOR_BG_UMAJUMP -ACTOR_UNSET_109 -ACTOR_ARROW_FIRE -ACTOR_ARROW_ICE -ACTOR_ARROW_LIGHT -ACTOR_UNSET_10D -ACTOR_UNSET_10E -ACTOR_ITEM_ETCETERA -ACTOR_OBJ_KIBAKO -ACTOR_OBJ_TSUBO -ACTOR_EN_WONDER_ITEM -ACTOR_EN_IK -ACTOR_DEMO_IK -ACTOR_EN_SKJ -ACTOR_EN_SKJNEEDLE -ACTOR_EN_G_SWITCH -ACTOR_DEMO_EXT -ACTOR_DEMO_SHD -ACTOR_EN_DNS -ACTOR_ELF_MSG -ACTOR_EN_HONOTRAP -ACTOR_EN_TUBO_TRAP -ACTOR_OBJ_ICE_POLY -ACTOR_BG_SPOT03_TAKI -ACTOR_BG_SPOT07_TAKI -ACTOR_EN_FZ -ACTOR_EN_PO_RELAY -ACTOR_BG_RELAY_OBJECTS -ACTOR_EN_DIVING_GAME -ACTOR_EN_KUSA -ACTOR_OBJ_BEAN -ACTOR_OBJ_BOMBIWA -ACTOR_UNSET_128 -ACTOR_UNSET_129 -ACTOR_OBJ_SWITCH -ACTOR_OBJ_ELEVATOR -ACTOR_OBJ_LIFT -ACTOR_OBJ_HSBLOCK -ACTOR_EN_OKARINA_TAG -ACTOR_EN_YABUSAME_MARK -ACTOR_EN_GOROIWA -ACTOR_EN_EX_RUPPY -ACTOR_EN_TORYO -ACTOR_EN_DAIKU -ACTOR_UNSET_134 -ACTOR_EN_NWC -ACTOR_EN_BLKOBJ -ACTOR_ITEM_INBOX -ACTOR_EN_GE1 -ACTOR_OBJ_BLOCKSTOP -ACTOR_EN_SDA -ACTOR_EN_CLEAR_TAG -ACTOR_EN_NIW_LADY -ACTOR_EN_GM -ACTOR_EN_MS -ACTOR_EN_HS -ACTOR_BG_INGATE -ACTOR_EN_KANBAN -ACTOR_EN_HEISHI3 -ACTOR_EN_SYATEKI_NIW -ACTOR_EN_ATTACK_NIW -ACTOR_BG_SPOT01_IDOSOKO -ACTOR_EN_SA -ACTOR_EN_WONDER_TALK -ACTOR_BG_GJYO_BRIDGE -ACTOR_EN_DS -ACTOR_EN_MK -ACTOR_EN_BOM_BOWL_MAN -ACTOR_EN_BOM_BOWL_PIT -ACTOR_EN_OWL -ACTOR_EN_ISHI -ACTOR_OBJ_HANA -ACTOR_OBJ_LIGHTSWITCH -ACTOR_OBJ_MURE2 -ACTOR_EN_GO -ACTOR_EN_FU -ACTOR_UNSET_154 -ACTOR_EN_CHANGER -ACTOR_BG_JYA_MEGAMI -ACTOR_BG_JYA_LIFT -ACTOR_BG_JYA_BIGMIRROR -ACTOR_BG_JYA_BOMBCHUIWA -ACTOR_BG_JYA_AMISHUTTER -ACTOR_BG_JYA_BOMBIWA -ACTOR_BG_SPOT18_BASKET -ACTOR_UNSET_15D -ACTOR_EN_GANON_ORGAN -ACTOR_EN_SIOFUKI -ACTOR_EN_STREAM -ACTOR_UNSET_161 -ACTOR_EN_MM -ACTOR_EN_KO -ACTOR_EN_KZ -ACTOR_EN_WEATHER_TAG -ACTOR_BG_SST_FLOOR -ACTOR_EN_ANI -ACTOR_EN_EX_ITEM -ACTOR_BG_JYA_IRONOBJ -ACTOR_EN_JS -ACTOR_EN_JSJUTAN -ACTOR_EN_CS -ACTOR_EN_MD -ACTOR_EN_HY -ACTOR_EN_GANON_MANT -ACTOR_EN_OKARINA_EFFECT -ACTOR_EN_MAG -ACTOR_DOOR_GERUDO -ACTOR_ELF_MSG2 -ACTOR_DEMO_GT -ACTOR_EN_PO_FIELD -ACTOR_EFC_ERUPC -ACTOR_BG_ZG -ACTOR_EN_HEISHI4 -ACTOR_EN_ZL3 -ACTOR_BOSS_GANON2 -ACTOR_EN_KAKASI -ACTOR_EN_TAKARA_MAN -ACTOR_OBJ_MAKEOSHIHIKI -ACTOR_OCEFF_SPOT -ACTOR_END_TITLE -ACTOR_UNSET_180 -ACTOR_EN_TORCH -ACTOR_DEMO_EC -ACTOR_SHOT_SUN -ACTOR_EN_DY_EXTRA -ACTOR_EN_WONDER_TALK2 -ACTOR_EN_GE2 -ACTOR_OBJ_ROOMTIMER -ACTOR_EN_SSH -ACTOR_EN_STH -ACTOR_OCEFF_WIPE -ACTOR_OCEFF_STORM -ACTOR_EN_WEIYER -ACTOR_BG_SPOT05_SOKO -ACTOR_BG_JYA_1FLIFT -ACTOR_BG_JYA_HAHENIRON -ACTOR_BG_SPOT12_GATE -ACTOR_BG_SPOT12_SAKU -ACTOR_EN_HINTNUTS -ACTOR_EN_NUTSBALL -ACTOR_BG_SPOT00_BREAK -ACTOR_EN_SHOPNUTS -ACTOR_EN_IT -ACTOR_EN_GELDB -ACTOR_OCEFF_WIPE2 -ACTOR_OCEFF_WIPE3 -ACTOR_EN_NIW_GIRL -ACTOR_EN_DOG -ACTOR_EN_SI -ACTOR_BG_SPOT01_OBJECTS2 -ACTOR_OBJ_COMB -ACTOR_BG_SPOT11_BAKUDANKABE -ACTOR_OBJ_KIBAKO2 -ACTOR_EN_DNT_DEMO -ACTOR_EN_DNT_JIJI -ACTOR_EN_DNT_NOMAL -ACTOR_EN_GUEST -ACTOR_BG_BOM_GUARD -ACTOR_EN_HS2 -ACTOR_DEMO_KEKKAI -ACTOR_BG_SPOT08_BAKUDANKABE -ACTOR_BG_SPOT17_BAKUDANKABE -ACTOR_UNSET_1AA -ACTOR_OBJ_MURE3 -ACTOR_EN_TG -ACTOR_EN_MU -ACTOR_EN_GO2 -ACTOR_EN_WF -ACTOR_EN_SKB -ACTOR_DEMO_GJ -ACTOR_DEMO_GEFF -ACTOR_BG_GND_FIREMEIRO -ACTOR_BG_GND_DARKMEIRO -ACTOR_BG_GND_SOULMEIRO -ACTOR_BG_GND_NISEKABE -ACTOR_BG_GND_ICEBLOCK -ACTOR_EN_GB -ACTOR_EN_GS -ACTOR_BG_MIZU_BWALL -ACTOR_BG_MIZU_SHUTTER -ACTOR_EN_DAIKU_KAKARIKO -ACTOR_BG_BOWL_WALL -ACTOR_EN_WALL_TUBO -ACTOR_EN_PO_DESERT -ACTOR_EN_CROW -ACTOR_DOOR_KILLER -ACTOR_BG_SPOT11_OASIS -ACTOR_BG_SPOT18_FUTA -ACTOR_BG_SPOT18_SHUTTER -ACTOR_EN_MA3 -ACTOR_EN_COW -ACTOR_BG_ICE_TURARA -ACTOR_BG_ICE_SHUTTER -ACTOR_EN_KAKASI2 -ACTOR_EN_KAKASI3 -ACTOR_OCEFF_WIPE4 -ACTOR_EN_EG -ACTOR_BG_MENKURI_NISEKABE -ACTOR_EN_ZO -ACTOR_OBJ_MAKEKINSUTA -ACTOR_EN_GE3 -ACTOR_OBJ_TIMEBLOCK -ACTOR_OBJ_HAMISHI -ACTOR_EN_ZL4 -ACTOR_EN_MM2 -ACTOR_BG_JYA_BLOCK -ACTOR_OBJ_WARP2BLOCK -ACTOR_ID_MAX \ No newline at end of file diff --git a/OTRExporter/CFG/Config.xml b/OTRExporter/CFG/Config.xml deleted file mode 100644 index adec174ca..000000000 --- a/OTRExporter/CFG/Config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/CFG/ObjectList_OoTMqDbg.txt b/OTRExporter/CFG/ObjectList_OoTMqDbg.txt deleted file mode 100644 index 1ecc3441b..000000000 --- a/OTRExporter/CFG/ObjectList_OoTMqDbg.txt +++ /dev/null @@ -1,402 +0,0 @@ -OBJECT_INVALID -OBJECT_GAMEPLAY_KEEP -OBJECT_GAMEPLAY_FIELD_KEEP -OBJECT_GAMEPLAY_DANGEON_KEEP -OBJECT_UNSET_4 -OBJECT_UNSET_5 -OBJECT_HUMAN -OBJECT_OKUTA -OBJECT_CROW -OBJECT_POH -OBJECT_DY_OBJ -OBJECT_WALLMASTER -OBJECT_DODONGO -OBJECT_FIREFLY -OBJECT_BOX -OBJECT_FIRE -OBJECT_UNSET_10 -OBJECT_UNSET_11 -OBJECT_BUBBLE -OBJECT_NIW -OBJECT_LINK_BOY -OBJECT_LINK_CHILD -OBJECT_TITE -OBJECT_REEBA -OBJECT_PEEHAT -OBJECT_KINGDODONGO -OBJECT_HORSE -OBJECT_ZF -OBJECT_GOMA -OBJECT_ZL1 -OBJECT_GOL -OBJECT_DODOJR -OBJECT_TORCH2 -OBJECT_BL -OBJECT_TP -OBJECT_OA1 -OBJECT_ST -OBJECT_BW -OBJECT_EI -OBJECT_HORSE_NORMAL -OBJECT_OB1 -OBJECT_O_ANIME -OBJECT_SPOT04_OBJECTS -OBJECT_DDAN_OBJECTS -OBJECT_HIDAN_OBJECTS -OBJECT_HORSE_GANON -OBJECT_OA2 -OBJECT_SPOT00_OBJECTS -OBJECT_MB -OBJECT_BOMBF -OBJECT_SK2 -OBJECT_OE1 -OBJECT_OE_ANIME -OBJECT_OE2 -OBJECT_YDAN_OBJECTS -OBJECT_GND -OBJECT_AM -OBJECT_DEKUBABA -OBJECT_UNSET_3A -OBJECT_OA3 -OBJECT_OA4 -OBJECT_OA5 -OBJECT_OA6 -OBJECT_OA7 -OBJECT_JJ -OBJECT_OA8 -OBJECT_OA9 -OBJECT_OB2 -OBJECT_OB3 -OBJECT_OB4 -OBJECT_HORSE_ZELDA -OBJECT_OPENING_DEMO1 -OBJECT_WARP1 -OBJECT_B_HEART -OBJECT_DEKUNUTS -OBJECT_OE3 -OBJECT_OE4 -OBJECT_MENKURI_OBJECTS -OBJECT_OE5 -OBJECT_OE6 -OBJECT_OE7 -OBJECT_OE8 -OBJECT_OE9 -OBJECT_OE10 -OBJECT_OE11 -OBJECT_OE12 -OBJECT_VALI -OBJECT_OA10 -OBJECT_OA11 -OBJECT_MIZU_OBJECTS -OBJECT_FHG -OBJECT_OSSAN -OBJECT_MORI_HINERI1 -OBJECT_BB -OBJECT_TOKI_OBJECTS -OBJECT_YUKABYUN -OBJECT_ZL2 -OBJECT_MJIN -OBJECT_MJIN_FLASH -OBJECT_MJIN_DARK -OBJECT_MJIN_FLAME -OBJECT_MJIN_ICE -OBJECT_MJIN_SOUL -OBJECT_MJIN_WIND -OBJECT_MJIN_OKA -OBJECT_HAKA_OBJECTS -OBJECT_SPOT06_OBJECTS -OBJECT_ICE_OBJECTS -OBJECT_RELAY_OBJECTS -OBJECT_PO_FIELD -OBJECT_PO_COMPOSER -OBJECT_MORI_HINERI1A -OBJECT_MORI_HINERI2 -OBJECT_MORI_HINERI2A -OBJECT_MORI_OBJECTS -OBJECT_MORI_TEX -OBJECT_SPOT08_OBJ -OBJECT_WARP2 -OBJECT_HATA -OBJECT_BIRD -OBJECT_UNSET_78 -OBJECT_UNSET_79 -OBJECT_UNSET_7A -OBJECT_UNSET_7B -OBJECT_WOOD02 -OBJECT_UNSET_7D -OBJECT_UNSET_7E -OBJECT_UNSET_7F -OBJECT_UNSET_80 -OBJECT_LIGHTBOX -OBJECT_PU_BOX -OBJECT_UNSET_83 -OBJECT_UNSET_84 -OBJECT_TRAP -OBJECT_VASE -OBJECT_IM -OBJECT_TA -OBJECT_TK -OBJECT_XC -OBJECT_VM -OBJECT_BV -OBJECT_HAKACH_OBJECTS -OBJECT_EFC_CRYSTAL_LIGHT -OBJECT_EFC_FIRE_BALL -OBJECT_EFC_FLASH -OBJECT_EFC_LGT_SHOWER -OBJECT_EFC_STAR_FIELD -OBJECT_GOD_LGT -OBJECT_LIGHT_RING -OBJECT_TRIFORCE_SPOT -OBJECT_BDAN_OBJECTS -OBJECT_SD -OBJECT_RD -OBJECT_PO_SISTERS -OBJECT_HEAVY_OBJECT -OBJECT_GNDD -OBJECT_FD -OBJECT_DU -OBJECT_FW -OBJECT_MEDAL -OBJECT_HORSE_LINK_CHILD -OBJECT_SPOT02_OBJECTS -OBJECT_HAKA -OBJECT_RU1 -OBJECT_SYOKUDAI -OBJECT_FD2 -OBJECT_DH -OBJECT_RL -OBJECT_EFC_TW -OBJECT_DEMO_TRE_LGT -OBJECT_GI_KEY -OBJECT_MIR_RAY -OBJECT_BROB -OBJECT_GI_JEWEL -OBJECT_SPOT09_OBJ -OBJECT_SPOT18_OBJ -OBJECT_BDOOR -OBJECT_SPOT17_OBJ -OBJECT_SHOP_DUNGEN -OBJECT_NB -OBJECT_MO -OBJECT_SB -OBJECT_GI_MELODY -OBJECT_GI_HEART -OBJECT_GI_COMPASS -OBJECT_GI_BOSSKEY -OBJECT_GI_MEDAL -OBJECT_GI_NUTS -OBJECT_SA -OBJECT_GI_HEARTS -OBJECT_GI_ARROWCASE -OBJECT_GI_BOMBPOUCH -OBJECT_IN -OBJECT_TR -OBJECT_SPOT16_OBJ -OBJECT_OE1S -OBJECT_OE4S -OBJECT_OS_ANIME -OBJECT_GI_BOTTLE -OBJECT_GI_STICK -OBJECT_GI_MAP -OBJECT_OF1D_MAP -OBJECT_RU2 -OBJECT_GI_SHIELD_1 -OBJECT_DEKUJR -OBJECT_GI_MAGICPOT -OBJECT_GI_BOMB_1 -OBJECT_OF1S -OBJECT_MA2 -OBJECT_GI_PURSE -OBJECT_HNI -OBJECT_TW -OBJECT_RR -OBJECT_BXA -OBJECT_ANUBICE -OBJECT_GI_GERUDO -OBJECT_GI_ARROW -OBJECT_GI_BOMB_2 -OBJECT_GI_EGG -OBJECT_GI_SCALE -OBJECT_GI_SHIELD_2 -OBJECT_GI_HOOKSHOT -OBJECT_GI_OCARINA -OBJECT_GI_MILK -OBJECT_MA1 -OBJECT_GANON -OBJECT_SST -OBJECT_NY_UNUSED -OBJECT_UNSET_E4 -OBJECT_NY -OBJECT_FR -OBJECT_GI_PACHINKO -OBJECT_GI_BOOMERANG -OBJECT_GI_BOW -OBJECT_GI_GLASSES -OBJECT_GI_LIQUID -OBJECT_ANI -OBJECT_DEMO_6K -OBJECT_GI_SHIELD_3 -OBJECT_GI_LETTER -OBJECT_SPOT15_OBJ -OBJECT_JYA_OBJ -OBJECT_GI_CLOTHES -OBJECT_GI_BEAN -OBJECT_GI_FISH -OBJECT_GI_SAW -OBJECT_GI_HAMMER -OBJECT_GI_GRASS -OBJECT_GI_LONGSWORD -OBJECT_SPOT01_OBJECTS -OBJECT_MD_UNUSED -OBJECT_MD -OBJECT_KM1 -OBJECT_KW1 -OBJECT_ZO -OBJECT_KZ -OBJECT_UMAJUMP -OBJECT_MASTERKOKIRI -OBJECT_MASTERKOKIRIHEAD -OBJECT_MASTERGOLON -OBJECT_MASTERZOORA -OBJECT_AOB -OBJECT_IK -OBJECT_AHG -OBJECT_CNE -OBJECT_GI_NIWATORI -OBJECT_SKJ -OBJECT_GI_BOTTLE_LETTER -OBJECT_BJI -OBJECT_BBA -OBJECT_GI_OCARINA_0 -OBJECT_DS -OBJECT_ANE -OBJECT_BOJ -OBJECT_SPOT03_OBJECT -OBJECT_SPOT07_OBJECT -OBJECT_FZ -OBJECT_BOB -OBJECT_GE1 -OBJECT_YABUSAME_POINT -OBJECT_GI_BOOTS_2 -OBJECT_GI_SEED -OBJECT_GND_MAGIC -OBJECT_D_ELEVATOR -OBJECT_D_HSBLOCK -OBJECT_D_LIFT -OBJECT_MAMENOKI -OBJECT_GOROIWA -OBJECT_UNSET_120 -OBJECT_TORYO -OBJECT_DAIKU -OBJECT_UNSET_123 -OBJECT_NWC -OBJECT_BLKOBJ -OBJECT_GM -OBJECT_MS -OBJECT_HS -OBJECT_INGATE -OBJECT_LIGHTSWITCH -OBJECT_KUSA -OBJECT_TSUBO -OBJECT_GI_GLOVES -OBJECT_GI_COIN -OBJECT_KANBAN -OBJECT_GJYO_OBJECTS -OBJECT_OWL -OBJECT_MK -OBJECT_FU -OBJECT_GI_KI_TAN_MASK -OBJECT_GI_REDEAD_MASK -OBJECT_GI_SKJ_MASK -OBJECT_GI_RABIT_MASK -OBJECT_GI_TRUTH_MASK -OBJECT_GANON_OBJECTS -OBJECT_SIOFUKI -OBJECT_STREAM -OBJECT_MM -OBJECT_FA -OBJECT_OS -OBJECT_GI_EYE_LOTION -OBJECT_GI_POWDER -OBJECT_GI_MUSHROOM -OBJECT_GI_TICKETSTONE -OBJECT_GI_BROKENSWORD -OBJECT_JS -OBJECT_CS -OBJECT_GI_PRESCRIPTION -OBJECT_GI_BRACELET -OBJECT_GI_SOLDOUT -OBJECT_GI_FROG -OBJECT_MAG -OBJECT_DOOR_GERUDO -OBJECT_GT -OBJECT_EFC_ERUPC -OBJECT_ZL2_ANIME1 -OBJECT_ZL2_ANIME2 -OBJECT_GI_GOLONMASK -OBJECT_GI_ZORAMASK -OBJECT_GI_GERUDOMASK -OBJECT_GANON2 -OBJECT_KA -OBJECT_TS -OBJECT_ZG -OBJECT_GI_HOVERBOOTS -OBJECT_GI_M_ARROW -OBJECT_DS2 -OBJECT_EC -OBJECT_FISH -OBJECT_GI_SUTARU -OBJECT_GI_GODDESS -OBJECT_SSH -OBJECT_BIGOKUTA -OBJECT_BG -OBJECT_SPOT05_OBJECTS -OBJECT_SPOT12_OBJ -OBJECT_BOMBIWA -OBJECT_HINTNUTS -OBJECT_RS -OBJECT_SPOT00_BREAK -OBJECT_GLA -OBJECT_SHOPNUTS -OBJECT_GELDB -OBJECT_GR -OBJECT_DOG -OBJECT_JYA_IRON -OBJECT_JYA_DOOR -OBJECT_UNSET_16E -OBJECT_SPOT11_OBJ -OBJECT_KIBAKO2 -OBJECT_DNS -OBJECT_DNK -OBJECT_GI_FIRE -OBJECT_GI_INSECT -OBJECT_GI_BUTTERFLY -OBJECT_GI_GHOST -OBJECT_GI_SOUL -OBJECT_BOWL -OBJECT_DEMO_KEKKAI -OBJECT_EFC_DOUGHNUT -OBJECT_GI_DEKUPOUCH -OBJECT_GANON_ANIME1 -OBJECT_GANON_ANIME2 -OBJECT_GANON_ANIME3 -OBJECT_GI_RUPY -OBJECT_SPOT01_MATOYA -OBJECT_SPOT01_MATOYAB -OBJECT_MU -OBJECT_WF -OBJECT_SKB -OBJECT_GJ -OBJECT_GEFF -OBJECT_HAKA_DOOR -OBJECT_GS -OBJECT_PS -OBJECT_BWALL -OBJECT_COW -OBJECT_COB -OBJECT_GI_SWORD_1 -OBJECT_DOOR_KILLER -OBJECT_OUKE_HAKA -OBJECT_TIMEBLOCK -OBJECT_ZL4 \ No newline at end of file diff --git a/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt b/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt deleted file mode 100644 index 015e7e88a..000000000 --- a/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt +++ /dev/null @@ -1 +0,0 @@ -8012DB20 gMtxClear \ No newline at end of file diff --git a/OTRExporter/CFG/TexturePool.xml b/OTRExporter/CFG/TexturePool.xml deleted file mode 100644 index 924ded703..000000000 --- a/OTRExporter/CFG/TexturePool.xml +++ /dev/null @@ -1,952 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/CFG/filelists/dbg.txt b/OTRExporter/CFG/filelists/dbg.txt deleted file mode 100644 index 68af5e557..000000000 --- a/OTRExporter/CFG/filelists/dbg.txt +++ /dev/null @@ -1,1532 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_i_static -map_48x85_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -syotes_scene -syotes_room_0 -syotes2_scene -syotes2_room_0 -depth_test_scene -depth_test_room_0 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -testroom_scene -testroom_room_0 -testroom_room_1 -testroom_room_2 -testroom_room_3 -testroom_room_4 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -sutaru_scene -sutaru_room_0 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -sasatest_scene -sasatest_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hairal_niwa2_scene -hairal_niwa2_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -besitu_scene -besitu_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -test01_scene -test01_room_0 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/gamecube.txt b/OTRExporter/CFG/filelists/gamecube.txt deleted file mode 100644 index 23794e1f6..000000000 --- a/OTRExporter/CFG/filelists/gamecube.txt +++ /dev/null @@ -1,1509 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -kanji -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_jpn_static -icon_item_nes_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -jpn_message_data_static -nes_message_data_static -staff_message_data_static -map_grand_static -map_48x85_static -map_i_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/gamecube_pal.txt b/OTRExporter/CFG/filelists/gamecube_pal.txt deleted file mode 100644 index c9746c1da..000000000 --- a/OTRExporter/CFG/filelists/gamecube_pal.txt +++ /dev/null @@ -1,1510 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_48x85_static -map_i_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/pal_oot.txt b/OTRExporter/CFG/filelists/pal_oot.txt deleted file mode 100644 index 812d3ebdd..000000000 --- a/OTRExporter/CFG/filelists/pal_oot.txt +++ /dev/null @@ -1,1511 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_i_static -map_48x85_static -code -n64dd -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_En_GirlA -ovl_En_Part -ovl_En_Light -ovl_En_Door -ovl_En_Box -ovl_En_Poh -ovl_En_Okuta -ovl_En_Bom -ovl_En_Wallmas -ovl_En_Dodongo -ovl_En_Firefly -ovl_En_Horse -ovl_En_Arrow -ovl_En_Elf -ovl_En_Niw -ovl_En_Tite -ovl_En_Reeba -ovl_En_Peehat -ovl_En_Holl -ovl_En_Scene_Change -ovl_En_Zf -ovl_En_Hata -ovl_Boss_Dodongo -ovl_Boss_Goma -ovl_En_Zl1 -ovl_En_Viewer -ovl_En_Goma -ovl_Bg_Pushbox -ovl_En_Bubble -ovl_Door_Shutter -ovl_En_Dodojr -ovl_En_Bdfire -ovl_En_Boom -ovl_En_Torch2 -ovl_En_Bili -ovl_En_Tp -ovl_En_St -ovl_En_Bw -ovl_En_Eiyer -ovl_En_River_Sound -ovl_En_Horse_Normal -ovl_En_Ossan -ovl_Bg_Treemouth -ovl_Bg_Dodoago -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Hrock -ovl_En_Horse_Ganon -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_En_Xc -ovl_Bg_Hidan_Curtain -ovl_Bg_Spot00_Hanebasi -ovl_En_Mb -ovl_En_Bombf -ovl_Bg_Hidan_Firewall -ovl_Bg_Dy_Yoseizo -ovl_En_Zl2 -ovl_Bg_Hidan_Fslift -ovl_En_OE2 -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Boss_Ganondrof -ovl_En_Am -ovl_En_Dekubaba -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_Bg_Ddan_Jd -ovl_Bg_Breakwall -ovl_En_Jj -ovl_En_Horse_Zelda -ovl_Bg_Ddan_Kd -ovl_Door_Warp1 -ovl_Obj_Syokudai -ovl_Item_B_Heart -ovl_En_Dekunuts -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Eye -ovl_En_Vali -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Water -ovl_Arms_Hook -ovl_En_fHG -ovl_Bg_Mori_Hineri -ovl_En_Bb -ovl_Bg_Toki_Hikari -ovl_En_Yukabyun -ovl_Bg_Toki_Swd -ovl_En_Fhg_Fire -ovl_Bg_Mjin -ovl_Bg_Hidan_Kousi -ovl_Door_Toki -ovl_Bg_Hidan_Hamstep -ovl_En_Bird -ovl_En_Wood02 -ovl_En_Lightbox -ovl_En_Pu_box -ovl_En_Trap -ovl_En_Arow_Trap -ovl_En_Vase -ovl_En_Ta -ovl_En_Tk -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_En_Vm -ovl_Demo_Effect -ovl_Demo_Kankyo -ovl_Bg_Hidan_Fwbig -ovl_En_Floormas -ovl_En_Heishi1 -ovl_En_Rd -ovl_En_Po_Sisters -ovl_Bg_Heavy_Block -ovl_Bg_Po_Event -ovl_Obj_Mure -ovl_En_Sw -ovl_Boss_Fd -ovl_Object_Kankyo -ovl_En_Du -ovl_En_Fd -ovl_En_Horse_Link_Child -ovl_Door_Ana -ovl_Bg_Spot02_Objects -ovl_Bg_Haka -ovl_Magic_Wind -ovl_Magic_Fire -ovl_En_Ru1 -ovl_Boss_Fd2 -ovl_En_Fd_Fire -ovl_En_Dh -ovl_En_Dha -ovl_En_Rl -ovl_En_Encount1 -ovl_Demo_Du -ovl_Demo_Im -ovl_Demo_Tre_Lgt -ovl_En_Fw -ovl_Bg_Vb_Sima -ovl_En_Vb_Ball -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Sgami -ovl_En_Heishi2 -ovl_En_Encount2 -ovl_En_Fire_Rock -ovl_En_Brob -ovl_Mir_Ray -ovl_Bg_Spot09_Obj -ovl_Bg_Spot18_Obj -ovl_Boss_Va -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Zou -ovl_Bg_Spot17_Funen -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Tana -ovl_En_Nb -ovl_Boss_Mo -ovl_En_Sb -ovl_En_Bigokuta -ovl_En_Karebaba -ovl_Bg_Bdan_Objects -ovl_Demo_Sa -ovl_Demo_Go -ovl_En_In -ovl_En_Tr -ovl_Bg_Spot16_Bombstone -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Bombwall -ovl_En_Ru2 -ovl_Obj_Dekujr -ovl_Bg_Mizu_Uzu -ovl_Bg_Spot06_Objects -ovl_Bg_Ice_Objects -ovl_Bg_Haka_Water -ovl_En_Ma2 -ovl_En_Bom_Chu -ovl_En_Horse_Game_Check -ovl_Boss_Tw -ovl_En_Rr -ovl_En_Ba -ovl_En_Bx -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Idomizu -ovl_Bg_Spot16_Doughnut -ovl_Bg_Bdan_Switch -ovl_En_Ma1 -ovl_Boss_Ganon -ovl_Boss_Sst -ovl_En_Ny -ovl_En_Fr -ovl_Item_Shield -ovl_Bg_Ice_Shelter -ovl_En_Ice_Hono -ovl_Item_Ocarina -ovl_Magic_Dark -ovl_Demo_6K -ovl_En_Anubice_Tag -ovl_Bg_Haka_Gate -ovl_Bg_Spot15_Saku -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Kanaami -ovl_Fishing -ovl_Obj_Oshihiki -ovl_Bg_Gate_Shutter -ovl_Eff_Dust -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Po_Syokudai -ovl_Bg_Ganon_Otyuka -ovl_Bg_Spot15_Rrbox -ovl_Bg_Umajump -ovl_En_Insect -ovl_En_Butte -ovl_En_Fish -ovl_Bg_Spot08_Iceblock -ovl_Item_Etcetera -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Obj_Kibako -ovl_Obj_Tsubo -ovl_En_Wonder_Item -ovl_En_Ik -ovl_Demo_Ik -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_G_Switch -ovl_Demo_Ext -ovl_Demo_Shd -ovl_En_Dns -ovl_Elf_Msg -ovl_En_Honotrap -ovl_En_Tubo_Trap -ovl_Obj_Ice_Poly -ovl_Bg_Spot03_Taki -ovl_Bg_Spot07_Taki -ovl_En_Fz -ovl_En_Po_Relay -ovl_Bg_Relay_Objects -ovl_En_Diving_Game -ovl_En_Kusa -ovl_Obj_Bean -ovl_Obj_Bombiwa -ovl_Obj_Switch -ovl_Obj_Elevator -ovl_Obj_Lift -ovl_Obj_Hsblock -ovl_En_Okarina_Tag -ovl_En_Yabusame_Mark -ovl_En_Goroiwa -ovl_En_Ex_Ruppy -ovl_En_Toryo -ovl_En_Daiku -ovl_En_Nwc -ovl_En_Blkobj -ovl_Item_Inbox -ovl_En_Ge1 -ovl_Obj_Blockstop -ovl_En_Sda -ovl_En_Clear_Tag -ovl_En_Niw_Lady -ovl_En_Gm -ovl_En_Ms -ovl_En_Hs -ovl_Bg_Ingate -ovl_En_Kanban -ovl_En_Heishi3 -ovl_En_Syateki_Niw -ovl_En_Attack_Niw -ovl_Bg_Spot01_Idosoko -ovl_En_Sa -ovl_En_Wonder_Talk -ovl_Bg_Gjyo_Bridge -ovl_En_Ds -ovl_En_Mk -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Owl -ovl_En_Ishi -ovl_Obj_Hana -ovl_Obj_Lightswitch -ovl_Obj_Mure2 -ovl_En_Go -ovl_En_Fu -ovl_En_Changer -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bombiwa -ovl_Bg_Spot18_Basket -ovl_En_Ganon_Organ -ovl_En_Siofuki -ovl_En_Stream -ovl_En_Mm -ovl_En_Ko -ovl_En_Kz -ovl_En_Weather_Tag -ovl_Bg_Sst_Floor -ovl_En_Ani -ovl_En_Ex_Item -ovl_Bg_Jya_Ironobj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Cs -ovl_En_Md -ovl_En_Hy -ovl_En_Ganon_Mant -ovl_En_Okarina_Effect -ovl_En_Mag -ovl_Door_Gerudo -ovl_Elf_Msg2 -ovl_Demo_Gt -ovl_En_Po_Field -ovl_Efc_Erupc -ovl_Bg_Zg -ovl_En_Heishi4 -ovl_En_Zl3 -ovl_Boss_Ganon2 -ovl_En_Kakasi -ovl_En_Takara_Man -ovl_Obj_Makeoshihiki -ovl_Oceff_Spot -ovl_End_Title -ovl_En_Torch -ovl_Demo_Ec -ovl_Shot_Sun -ovl_En_Dy_Extra -ovl_En_Wonder_Talk2 -ovl_En_Ge2 -ovl_Obj_Roomtimer -ovl_En_Ssh -ovl_En_Sth -ovl_Oceff_Wipe -ovl_Effect_Ss_Dust -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Blast -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_Stone1 -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Oceff_Storm -ovl_En_Weiyer -ovl_Bg_Spot05_Soko -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Haheniron -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_En_Hintnuts -ovl_En_Nutsball -ovl_Bg_Spot00_Break -ovl_En_Shopnuts -ovl_En_It -ovl_En_GeldB -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_En_Niw_Girl -ovl_En_Dog -ovl_En_Si -ovl_Bg_Spot01_Objects2 -ovl_Obj_Comb -ovl_Bg_Spot11_Bakudankabe -ovl_Obj_Kibako2 -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Guest -ovl_Bg_Bom_Guard -ovl_En_Hs2 -ovl_Demo_Kekkai -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot17_Bakudankabe -ovl_Obj_Mure3 -ovl_En_Tg -ovl_En_Mu -ovl_En_Go2 -ovl_En_Wf -ovl_En_Skb -ovl_Demo_Gj -ovl_Demo_Geff -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Iceblock -ovl_Bg_Ydan_Sp -ovl_En_Gb -ovl_En_Gs -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Shutter -ovl_En_Daiku_Kakariko -ovl_Bg_Bowl_Wall -ovl_En_Wall_Tubo -ovl_En_Po_Desert -ovl_En_Crow -ovl_Door_Killer -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Shutter -ovl_En_Ma3 -ovl_En_Cow -ovl_Bg_Ice_Turara -ovl_Bg_Ice_Shutter -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_Oceff_Wipe4 -ovl_En_Eg -ovl_Bg_Menkuri_Nisekabe -ovl_En_Zo -ovl_Effect_Ss_Ice_Smoke -ovl_Obj_Makekinsuta -ovl_En_Ge3 -ovl_Obj_Timeblock -ovl_Obj_Hamishi -ovl_En_Zl4 -ovl_En_Mm2 -ovl_Bg_Jya_Block -ovl_Obj_Warp2block -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CMake/Default.cmake b/OTRExporter/CMake/Default.cmake deleted file mode 100644 index f4d0ba084..000000000 --- a/OTRExporter/CMake/Default.cmake +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# Command for variable_watch. This command issues error message, if a variable -# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens -# variable_watch( property_reader_guard) -################################################################################ -function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK) - if("${PROPERTY_READER_GUARD_DISABLED}") - return() - endif() - - if("${ACCESS}" STREQUAL "MODIFIED_ACCESS") - message(FATAL_ERROR - " Variable ${VARIABLE} is not supposed to be changed.\n" - " It is used only for reading target property ${VARIABLE}.\n" - " Use\n" - " set_target_properties(\"\" PROPERTIES \"${VARIABLE}\" \"\")\n" - " or\n" - " set_target_properties(\"\" PROPERTIES \"${VARIABLE}_\" \"\")\n" - " instead.\n") - endif() -endfunction() - -################################################################################ -# Create variable with generator expression that expands to value of -# target property _. If property is empty or not set then property -# is used instead. Variable has watcher property_reader_guard that -# doesn't allow to edit it. -# create_property_reader() -# Input: -# name - Name of watched property and output variable -################################################################################ -function(create_property_reader NAME) - set(PROPERTY_READER_GUARD_DISABLED TRUE) - set(CONFIG_VALUE "$>>>") - set(IS_CONFIG_VALUE_EMPTY "$") - set(GENERAL_VALUE "$>") - set("${NAME}" "$" PARENT_SCOPE) - variable_watch("${NAME}" property_reader_guard) -endfunction() - -################################################################################ -# Set property $_${PROPS_CONFIG_U} of ${PROPS_TARGET} to -# set_config_specific_property( ) -# Input: -# name - Prefix of property name -# value - New value -################################################################################ -function(set_config_specific_property NAME VALUE) - set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}") -endfunction() - -################################################################################ - -create_property_reader("TARGET_NAME") -create_property_reader("OUTPUT_DIRECTORY") - -set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}") -set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}") - -set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") -set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") -set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") \ No newline at end of file diff --git a/OTRExporter/CMake/DefaultCXX.cmake b/OTRExporter/CMake/DefaultCXX.cmake deleted file mode 100644 index e06b3cd2f..000000000 --- a/OTRExporter/CMake/DefaultCXX.cmake +++ /dev/null @@ -1,12 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake") - -set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}") - -if(MSVC) - create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING") - create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT") - - set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") - set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc") - set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi") -endif() diff --git a/OTRExporter/CMake/Utils.cmake b/OTRExporter/CMake/Utils.cmake deleted file mode 100644 index d9822f0a3..000000000 --- a/OTRExporter/CMake/Utils.cmake +++ /dev/null @@ -1,233 +0,0 @@ -# utils file for projects came from visual studio solution with cmake-converter. - -################################################################################ -# Wrap each token of the command with condition -################################################################################ -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) -macro(prepare_commands) - unset(TOKEN_ROLE) - unset(COMMANDS) - foreach(TOKEN ${ARG_COMMANDS}) - if("${TOKEN}" STREQUAL "COMMAND") - set(TOKEN_ROLE "KEYWORD") - elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD") - set(TOKEN_ROLE "CONDITION") - elseif("${TOKEN_ROLE}" STREQUAL "CONDITION") - set(TOKEN_ROLE "COMMAND") - elseif("${TOKEN_ROLE}" STREQUAL "COMMAND") - set(TOKEN_ROLE "ARG") - endif() - - if("${TOKEN_ROLE}" STREQUAL "KEYWORD") - list(APPEND COMMANDS "${TOKEN}") - elseif("${TOKEN_ROLE}" STREQUAL "CONDITION") - set(CONDITION ${TOKEN}) - elseif("${TOKEN_ROLE}" STREQUAL "COMMAND") - list(APPEND COMMANDS "$<$:${DUMMY}>$<${CONDITION}:${TOKEN}>") - elseif("${TOKEN_ROLE}" STREQUAL "ARG") - list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>") - endif() - endforeach() -endmacro() -cmake_policy(POP) - -################################################################################ -# Transform all the tokens to absolute paths -################################################################################ -macro(prepare_output) - unset(OUTPUT) - foreach(TOKEN ${ARG_OUTPUT}) - if(IS_ABSOLUTE ${TOKEN}) - list(APPEND OUTPUT "${TOKEN}") - else() - list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}") - endif() - endforeach() -endmacro() - -################################################################################ -# Parse add_custom_command_if args. -# -# Input: -# PRE_BUILD - Pre build event option -# PRE_LINK - Pre link event option -# POST_BUILD - Post build event option -# TARGET - Target -# OUTPUT - List of output files -# DEPENDS - List of files on which the command depends -# COMMANDS - List of commands(COMMAND condition1 commannd1 args1 COMMAND -# condition2 commannd2 args2 ...) -# Output: -# OUTPUT - Output files -# DEPENDS - Files on which the command depends -# COMMENT - Comment -# PRE_BUILD - TRUE/FALSE -# PRE_LINK - TRUE/FALSE -# POST_BUILD - TRUE/FALSE -# TARGET - Target name -# COMMANDS - Prepared commands(every token is wrapped in CONDITION) -# NAME - Unique name for custom target -# STEP - PRE_BUILD/PRE_LINK/POST_BUILD -################################################################################ -function(add_custom_command_if_parse_arguments) - cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN}) - - if(WIN32) - set(DUMMY "cd.") - elseif(UNIX) - set(DUMMY "true") - endif() - - prepare_commands() - prepare_output() - - set(DEPENDS "${ARG_DEPENDS}") - set(COMMENT "${ARG_COMMENT}") - set(PRE_BUILD "${ARG_PRE_BUILD}") - set(PRE_LINK "${ARG_PRE_LINK}") - set(POST_BUILD "${ARG_POST_BUILD}") - set(TARGET "${ARG_TARGET}") - if(PRE_BUILD) - set(STEP "PRE_BUILD") - elseif(PRE_LINK) - set(STEP "PRE_LINK") - elseif(POST_BUILD) - set(STEP "POST_BUILD") - endif() - set(NAME "${TARGET}_${STEP}") - - set(OUTPUT "${OUTPUT}" PARENT_SCOPE) - set(DEPENDS "${DEPENDS}" PARENT_SCOPE) - set(COMMENT "${COMMENT}" PARENT_SCOPE) - set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE) - set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE) - set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE) - set(TARGET "${TARGET}" PARENT_SCOPE) - set(COMMANDS "${COMMANDS}" PARENT_SCOPE) - set(STEP "${STEP}" PARENT_SCOPE) - set(NAME "${NAME}" PARENT_SCOPE) -endfunction() - -################################################################################ -# Add conditional custom command -# -# Generating Files -# The first signature is for adding a custom command to produce an output: -# add_custom_command_if( -# -# -# -# [COMMAND condition command2 [args2...]] -# [DEPENDS [depends...]] -# [COMMENT comment] -# -# Build Events -# add_custom_command_if( -# -# -# -# [COMMAND condition command2 [args2...]] -# [COMMENT comment] -# -# Input: -# output - Output files the command is expected to produce -# condition - Generator expression for wrapping the command -# command - Command-line(s) to execute at build time. -# args - Command`s args -# depends - Files on which the command depends -# comment - Display the given message before the commands are executed at -# build time. -# PRE_BUILD - Run before any other rules are executed within the target -# PRE_LINK - Run after sources have been compiled but before linking the -# binary -# POST_BUILD - Run after all other rules within the target have been -# executed -################################################################################ -function(add_custom_command_if) - add_custom_command_if_parse_arguments(${ARGN}) - - if(OUTPUT AND TARGET) - message(FATAL_ERROR "Wrong syntax. A TARGET and OUTPUT can not both be specified.") - endif() - - if(OUTPUT) - add_custom_command(OUTPUT ${OUTPUT} - ${COMMANDS} - DEPENDS ${DEPENDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - elseif(TARGET) - if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio") - add_custom_target( - ${NAME} - ${COMMANDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - add_dependencies(${TARGET} ${NAME}) - else() - add_custom_command( - TARGET ${TARGET} - ${STEP} - ${COMMANDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - endif() - else() - message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.") - endif() -endfunction() - -################################################################################ -# Use props file for a target and configs -# use_props( ) -# Inside there are following variables: -# PROPS_TARGET - -# PROPS_CONFIG - One of -# PROPS_CONFIG_U - Uppercase PROPS_CONFIG -# Input: -# target - Target to apply props file -# configs - Build configurations to apply props file -# props_file - CMake script -################################################################################ -macro(use_props TARGET CONFIGS PROPS_FILE) - set(PROPS_TARGET "${TARGET}") - foreach(PROPS_CONFIG ${CONFIGS}) - string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U) - - get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}") - if(EXISTS "${ABSOLUTE_PROPS_FILE}") - include("${ABSOLUTE_PROPS_FILE}") - else() - message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist") - endif() - endforeach() -endmacro() - -################################################################################ -# Add compile options to source file -# source_file_compile_options( [compile_options...]) -# Input: -# source_file - Source file -# compile_options - Options to add to COMPILE_FLAGS property -################################################################################ -function(source_file_compile_options SOURCE_FILE) - if("${ARGC}" LESS_EQUAL "1") - return() - endif() - - get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS) - - if(COMPILE_OPTIONS) - list(APPEND COMPILE_OPTIONS ${ARGN}) - else() - set(COMPILE_OPTIONS "${ARGN}") - endif() - - set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}") -endfunction() - -################################################################################ -# Default properties of visual studio projects -################################################################################ -set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake") diff --git a/OTRExporter/CMakeLists.txt b/OTRExporter/CMakeLists.txt deleted file mode 100644 index e759cd128..000000000 --- a/OTRExporter/CMakeLists.txt +++ /dev/null @@ -1,96 +0,0 @@ -cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) - -set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE) -set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") -#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") -set(CMAKE_C_STANDARD 11) - -project(OTRExporter C CXX) - -################################################################################ -# Set target arch type if empty. Visual studio solution generator provides it. -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if(NOT CMAKE_VS_PLATFORM_NAME) - set(CMAKE_VS_PLATFORM_NAME "x64") - endif() - message("${CMAKE_VS_PLATFORM_NAME} architecture in use") - - if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64" - OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")) - message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!") - endif() -endif() - -################################################################################ -# Global configuration types -################################################################################ -set(CMAKE_CONFIGURATION_TYPES - "Debug" - "Release" - CACHE STRING "" FORCE -) - -################################################################################ -# Global compiler options -################################################################################ -if(MSVC) - # remove default flags provided with CMake for MSVC - set(CMAKE_C_FLAGS "") - set(CMAKE_C_FLAGS_DEBUG "") - set(CMAKE_C_FLAGS_RELEASE "") - set(CMAKE_CXX_FLAGS "") - set(CMAKE_CXX_FLAGS_DEBUG "") - set(CMAKE_CXX_FLAGS_RELEASE "") -endif() - -################################################################################ -# Global linker options -################################################################################ -if(MSVC) - # remove default flags provided with CMake for MSVC - set(CMAKE_EXE_LINKER_FLAGS "") - set(CMAKE_MODULE_LINKER_FLAGS "") - set(CMAKE_SHARED_LINKER_FLAGS "") - set(CMAKE_STATIC_LINKER_FLAGS "") - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}") -endif() - -################################################################################ -# Common utils -################################################################################ -include(CMake/Utils.cmake) - -################################################################################ -# Additional Global Settings(add specific info there) -################################################################################ -include(CMake/GlobalSettingsInclude.cmake OPTIONAL) - -################################################################################ -# Use solution folders feature -################################################################################ -set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -################################################################################ -# Sub-projects -################################################################################ -if (NOT TARGET libultraship) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship ${CMAKE_BINARY_DIR}/libultraship) -endif() - -if (NOT TARGET ZAPD) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD) -endif() - -if (NOT TARGET ZAPDUtils) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils) -endif() - -add_subdirectory(OTRExporter) diff --git a/OTRExporter/LICENSE b/OTRExporter/LICENSE deleted file mode 100644 index 59ddd97bc..000000000 --- a/OTRExporter/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (c) 2022 Harbour Masters - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/OTRExporter/OTRExporter/AnimationExporter.cpp b/OTRExporter/OTRExporter/AnimationExporter.cpp deleted file mode 100644 index 416d74725..000000000 --- a/OTRExporter/OTRExporter/AnimationExporter.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "AnimationExporter.h" -#include - -void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZAnimation* anim = (ZAnimation*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Animation); - - ZNormalAnimation* normalAnim = dynamic_cast(anim); - ZCurveAnimation* curveAnim = dynamic_cast(anim); - ZLinkAnimation* linkAnim = dynamic_cast(anim); - if (linkAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Link); - writer->Write((uint16_t)linkAnim->frameCount); - writer->Write((uint32_t)linkAnim->segmentAddress); - } - else if (curveAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Curve); - writer->Write((uint16_t)curveAnim->frameCount); - - writer->Write((uint32_t)curveAnim->refIndexArr.size()); - - for (auto val : curveAnim->refIndexArr) - writer->Write(val); - - writer->Write((uint32_t)curveAnim->transformDataArr.size()); - - for (auto val : curveAnim->transformDataArr) - { - writer->Write(val.unk_00); - writer->Write(val.unk_02); - writer->Write(val.unk_04); - writer->Write(val.unk_06); - writer->Write(val.unk_08); - } - - writer->Write((uint32_t)curveAnim->copyValuesArr.size()); - - for (auto val : curveAnim->copyValuesArr) - writer->Write(val); - } - else if (normalAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Normal); - writer->Write((uint16_t)normalAnim->frameCount); - - writer->Write((uint32_t)normalAnim->rotationValues.size()); - - for (size_t i = 0; i < normalAnim->rotationValues.size(); i++) - writer->Write(normalAnim->rotationValues[i]); - - writer->Write((uint32_t)normalAnim->rotationIndices.size()); - - for (size_t i = 0; i < normalAnim->rotationIndices.size(); i++) - { - writer->Write(normalAnim->rotationIndices[i].x); - writer->Write(normalAnim->rotationIndices[i].y); - writer->Write(normalAnim->rotationIndices[i].z); - } - - writer->Write(normalAnim->limit); - } - else - { - writer->Write((uint32_t)LUS::AnimationType::Legacy); - } -} diff --git a/OTRExporter/OTRExporter/AnimationExporter.h b/OTRExporter/OTRExporter/AnimationExporter.h deleted file mode 100644 index 58fddb2fd..000000000 --- a/OTRExporter/OTRExporter/AnimationExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZAnimation.h" -#include "Exporter.h" -#include - -class OTRExporter_Animation : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/ArrayExporter.cpp b/OTRExporter/OTRExporter/ArrayExporter.cpp deleted file mode 100644 index f6b602bbb..000000000 --- a/OTRExporter/OTRExporter/ArrayExporter.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "ArrayExporter.h" -#include "VtxExporter.h" -#include -void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZArray* arr = (ZArray*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Array); - - writer->Write((uint32_t)arr->resList[0]->GetResourceType()); - writer->Write((uint32_t)arr->arrayCnt); - - for (size_t i = 0; i < arr->arrayCnt; i++) - { - if (arr->resList[i]->GetResourceType() == ZResourceType::Vertex) - { - ZVtx* vtx = (ZVtx*)arr->resList[i]; - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); - } - else if (arr->resList[i]->GetResourceType() == ZResourceType::Vector) - { - ZVector* vec = (ZVector*)arr->resList[i]; - writer->Write((uint32_t)vec->scalarType); - writer->Write((uint32_t)vec->dimensions); - - for (size_t k = 0; k < vec->dimensions; k++) - { - // OTRTODO: Duplicate code here. Cleanup at a later date... - switch (vec->scalarType) - { - case ZScalarType::ZSCALAR_U8: - writer->Write(vec->scalars[k].scalarData.u8); - break; - case ZScalarType::ZSCALAR_S8: - writer->Write(vec->scalars[k].scalarData.s8); - break; - case ZScalarType::ZSCALAR_U16: - writer->Write(vec->scalars[k].scalarData.u16); - break; - case ZScalarType::ZSCALAR_S16: - writer->Write(vec->scalars[k].scalarData.s16); - break; - case ZScalarType::ZSCALAR_S32: - writer->Write(vec->scalars[k].scalarData.s32); - break; - case ZScalarType::ZSCALAR_U32: - writer->Write(vec->scalars[k].scalarData.u32); - break; - case ZScalarType::ZSCALAR_S64: - writer->Write(vec->scalars[k].scalarData.s64); - break; - case ZScalarType::ZSCALAR_U64: - writer->Write(vec->scalars[k].scalarData.u64); - break; - // OTRTODO: ADD OTHER TYPES - default: - break; - } - } - } - else - { - ZScalar* scal = (ZScalar*)arr->resList[i]; - - writer->Write((uint32_t)scal->scalarType); - - switch (scal->scalarType) - { - case ZScalarType::ZSCALAR_U8: - writer->Write(scal->scalarData.u8); - break; - case ZScalarType::ZSCALAR_S8: - writer->Write(scal->scalarData.s8); - break; - case ZScalarType::ZSCALAR_U16: - writer->Write(scal->scalarData.u16); - break; - case ZScalarType::ZSCALAR_S16: - writer->Write(scal->scalarData.s16); - break; - case ZScalarType::ZSCALAR_S32: - writer->Write(scal->scalarData.s32); - break; - case ZScalarType::ZSCALAR_U32: - writer->Write(scal->scalarData.u32); - break; - case ZScalarType::ZSCALAR_S64: - writer->Write(scal->scalarData.s64); - break; - case ZScalarType::ZSCALAR_U64: - writer->Write(scal->scalarData.u64); - break; - // OTRTODO: ADD OTHER TYPES - default: - break; - } - } - } -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/ArrayExporter.h b/OTRExporter/OTRExporter/ArrayExporter.h deleted file mode 100644 index 1d2dc0f2b..000000000 --- a/OTRExporter/OTRExporter/ArrayExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZArray.h" -#include "Exporter.h" -#include - -class OTRExporter_Array : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; - -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/AudioExporter.cpp b/OTRExporter/OTRExporter/AudioExporter.cpp deleted file mode 100644 index 6e1f38e79..000000000 --- a/OTRExporter/OTRExporter/AudioExporter.cpp +++ /dev/null @@ -1,191 +0,0 @@ -#include "AudioExporter.h" -#include "Main.h" -#include -#include -#include -#include "DisplayListExporter.h" - -void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map samples, BinaryWriter* writer) -{ - writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); - - if (entry != nullptr) - { - if (audio->sampleOffsets[entry->bankId].find(entry->sampleLoopOffset) != audio->sampleOffsets[entry->bankId].end()) - { - if (audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].find(entry->sampleDataOffset) != audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].end()) - { - writer->Write(StringHelper::Sprintf("audio/samples/%s", audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset][entry->sampleDataOffset].c_str())); - } - else - writer->Write(entry->fileName); - } - else - writer->Write(entry->fileName); - } - else - writer->Write(""); -} - -void OTRExporter_Audio::WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer) -{ - WriteHeader(nullptr, "", writer, LUS::ResourceType::SOH_AudioSample, 2); - - writer->Write(entry->codec); - writer->Write(entry->medium); - writer->Write(entry->unk_bit26); - writer->Write(entry->unk_bit25); - - writer->Write((uint32_t)entry->data.size()); - writer->Write((char*)entry->data.data(), entry->data.size()); - - writer->Write((uint32_t)(entry->loop.start)); - writer->Write((uint32_t)(entry->loop.end)); - writer->Write((uint32_t)(entry->loop.count)); - writer->Write((uint32_t)entry->loop.states.size()); - - for (size_t i = 0; i < entry->loop.states.size(); i++) - writer->Write((entry->loop.states[i])); - - writer->Write((uint32_t)(entry->book.order)); - writer->Write((uint32_t)(entry->book.npredictors)); - writer->Write((uint32_t)entry->book.books.size()); - - for (size_t i = 0; i < entry->book.books.size(); i++) - writer->Write((entry->book.books[i])); -} - -void OTRExporter_Audio::WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map samples, BinaryWriter* writer) -{ - writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); - - if (entry != nullptr) - { - WriteSampleEntryReference(audio, entry->sampleEntry, samples, writer); - writer->Write(entry->tuning); - } -} - -void OTRExporter_Audio::WriteEnvData(std::vector envelopes, BinaryWriter* writer) -{ - writer->Write((uint32_t)envelopes.size()); - - for (auto env : envelopes) - { - writer->Write(env->delay); - writer->Write(env->arg); - } -} - -void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZAudio* audio = (ZAudio*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Audio, 2); - - // Write Samples as individual files - for (auto pair : audio->samples) - { - MemoryStream* sampleStream = new MemoryStream(); - BinaryWriter sampleWriter = BinaryWriter(sampleStream); - - writer->Write((uint32_t)pair.first); - WriteSampleEntry(pair.second, &sampleWriter); - - std::string basePath = ""; - - if (audio->sampleOffsets[pair.second->bankId].find(pair.second->sampleLoopOffset) != audio->sampleOffsets[pair.second->bankId].end()) - { - if (audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].find(pair.second->sampleDataOffset) != audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].end()) - basePath = StringHelper::Sprintf("samples/%s", audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset][pair.second->sampleDataOffset].c_str()); - else - basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first); - } - else - basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, basePath); - AddFile(fName, sampleStream->ToVector()); - } - - // Write the soundfont table - for (size_t i = 0; i < audio->soundFontTable.size(); i++) - { - MemoryStream* fntStream = new MemoryStream(); - BinaryWriter fntWriter = BinaryWriter(fntStream); - - WriteHeader(nullptr, "", &fntWriter, LUS::ResourceType::SOH_AudioSoundFont, 2); - - fntWriter.Write((uint32_t)i); - fntWriter.Write(audio->soundFontTable[i].medium); - fntWriter.Write(audio->soundFontTable[i].cachePolicy); - fntWriter.Write(audio->soundFontTable[i].data1); - fntWriter.Write(audio->soundFontTable[i].data2); - fntWriter.Write(audio->soundFontTable[i].data3); - - fntWriter.Write((uint32_t)audio->soundFontTable[i].drums.size()); - fntWriter.Write((uint32_t)audio->soundFontTable[i].instruments.size()); - fntWriter.Write((uint32_t)audio->soundFontTable[i].soundEffects.size()); - - for (size_t k = 0; k < audio->soundFontTable[i].drums.size(); k++) - { - fntWriter.Write(audio->soundFontTable[i].drums[k].releaseRate); - fntWriter.Write(audio->soundFontTable[i].drums[k].pan); - fntWriter.Write(audio->soundFontTable[i].drums[k].loaded); - - WriteEnvData(audio->soundFontTable[i].drums[k].env, &fntWriter); - - WriteSampleEntryReference(audio, audio->soundFontTable[i].drums[k].sample, audio->samples, &fntWriter); - fntWriter.Write(audio->soundFontTable[i].drums[k].tuning); - } - - for (size_t k = 0; k < audio->soundFontTable[i].instruments.size(); k++) - { - fntWriter.Write((uint8_t)audio->soundFontTable[i].instruments[k].isValidInstrument); - - fntWriter.Write(audio->soundFontTable[i].instruments[k].loaded); - fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeLo); - fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeHi); - fntWriter.Write(audio->soundFontTable[i].instruments[k].releaseRate); - - WriteEnvData(audio->soundFontTable[i].instruments[k].env, &fntWriter); - - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].lowNotesSound, audio->samples, &fntWriter); - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].normalNotesSound, audio->samples, &fntWriter); - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].highNotesSound, audio->samples, &fntWriter); - } - - for (size_t k = 0; k < audio->soundFontTable[i].soundEffects.size(); k++) - { - WriteSoundFontEntry(audio, audio->soundFontTable[i].soundEffects[k], audio->samples, &fntWriter); - } - - //std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/font_%02X", i)); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/%s", audio->soundFontNames[i].c_str())); - AddFile(fName, fntStream->ToVector()); - } - - // Write Sequences - for (size_t i = 0; i < audio->sequences.size(); i++) - { - auto seq = audio->sequences[i]; - - MemoryStream* seqStream = new MemoryStream(); - BinaryWriter seqWriter = BinaryWriter(seqStream); - - WriteHeader(nullptr, "", &seqWriter, LUS::ResourceType::SOH_AudioSequence, 2); - - seqWriter.Write((uint32_t)seq.size()); - seqWriter.Write(seq.data(), seq.size()); - seqWriter.Write((uint8_t)i); - seqWriter.Write((uint8_t)audio->sequenceTable[i].medium); - seqWriter.Write((uint8_t)audio->sequenceTable[i].cachePolicy); - seqWriter.Write((uint32_t)audio->fontIndices[i].size()); - - for (size_t k = 0; k < audio->fontIndices[i].size(); k++) - seqWriter.Write((uint8_t)audio->fontIndices[i][k]); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("sequences/%s", audio->seqNames[i].c_str())); - AddFile(fName, seqStream->ToVector()); - } -} diff --git a/OTRExporter/OTRExporter/AudioExporter.h b/OTRExporter/OTRExporter/AudioExporter.h deleted file mode 100644 index 13a8cc0a0..000000000 --- a/OTRExporter/OTRExporter/AudioExporter.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZAudio.h" -#include "Exporter.h" -#include - -class OTRExporter_Audio : public OTRExporter -{ -public: - void WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer); - void WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map samples, BinaryWriter* writer); - void WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map samples, BinaryWriter* writer); - void WriteEnvData(std::vector envelopes, BinaryWriter* writer); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BackgroundExporter.cpp b/OTRExporter/OTRExporter/BackgroundExporter.cpp deleted file mode 100644 index f0f1a55f4..000000000 --- a/OTRExporter/OTRExporter/BackgroundExporter.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "BackgroundExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Background::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZBackground* bg = (ZBackground*)res; - - WriteHeader(bg, outPath, writer, LUS::ResourceType::SOH_Background); - - writer->Write((uint32_t)bg->GetRawDataSize()); - - auto data = bg->parent->GetRawData(); - writer->Write((char*)data.data() + bg->GetRawDataIndex(), bg->GetRawDataSize()); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BackgroundExporter.h b/OTRExporter/OTRExporter/BackgroundExporter.h deleted file mode 100644 index 30c1adbbc..000000000 --- a/OTRExporter/OTRExporter/BackgroundExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZBackground.h" -#include "Exporter.h" -#include - -class OTRExporter_Background : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BlobExporter.cpp b/OTRExporter/OTRExporter/BlobExporter.cpp deleted file mode 100644 index a547718e3..000000000 --- a/OTRExporter/OTRExporter/BlobExporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "BlobExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Blob::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZBlob* blob = (ZBlob*)res; - - WriteHeader(blob, outPath, writer, LUS::ResourceType::Blob); - - auto start = std::chrono::steady_clock::now(); - - writer->Write((uint32_t)blob->GetRawDataSize()); - - auto data = blob->parent->GetRawData(); - - for (size_t i = blob->GetRawDataIndex(); i < blob->GetRawDataIndex() + blob->GetRawDataSize(); i++) - writer->Write(data[i]); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BlobExporter.h b/OTRExporter/OTRExporter/BlobExporter.h deleted file mode 100644 index 43a262d5e..000000000 --- a/OTRExporter/OTRExporter/BlobExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZBlob.h" -#include "Exporter.h" -#include - -class OTRExporter_Blob : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CMakeLists.txt b/OTRExporter/OTRExporter/CMakeLists.txt deleted file mode 100644 index 9d012af95..000000000 --- a/OTRExporter/OTRExporter/CMakeLists.txt +++ /dev/null @@ -1,245 +0,0 @@ -set(PROJECT_NAME OTRExporter) - -################################################################################ -# Source groups -################################################################################ -set(Header_Files - "AnimationExporter.h" - "ArrayExporter.h" - "AudioExporter.h" - "BackgroundExporter.h" - "BlobExporter.h" - "CollisionExporter.h" - "command_macros_base.h" - "CutsceneExporter.h" - "DisplayListExporter.h" - "Exporter.h" - "Main.h" - "MtxExporter.h" - "PathExporter.h" - "PlayerAnimationExporter.h" - "RoomExporter.h" - "SkeletonExporter.h" - "SkeletonLimbExporter.h" - "TextExporter.h" - "TextureExporter.h" - "VersionInfo.h" - "VtxExporter.h" - "z64cutscene.h" - "z64cutscene_commands.h" -) -source_group("Header Files" FILES ${Header_Files}) - -set(Source_Files - "AnimationExporter.cpp" - "ArrayExporter.cpp" - "AudioExporter.cpp" - "BackgroundExporter.cpp" - "BlobExporter.cpp" - "CollisionExporter.cpp" - "CutsceneExporter.cpp" - "DisplayListExporter.cpp" - "Exporter.cpp" - "Main.cpp" - "MtxExporter.cpp" - "PathExporter.cpp" - "PlayerAnimationExporter.cpp" - "RoomExporter.cpp" - "SkeletonExporter.cpp" - "SkeletonLimbExporter.cpp" - "TextExporter.cpp" - "TextureExporter.cpp" - "VersionInfo.cpp" - "VtxExporter.cpp" -) -source_group("Source Files" FILES ${Source_Files}) - -set(ALL_FILES - ${Header_Files} - ${Source_Files} -) - -################################################################################ -# Target -################################################################################ -add_library(${PROJECT_NAME} STATIC ${ALL_FILES}) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -endif() - -set(ROOT_NAMESPACE OTRExporter) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - set_target_properties(${PROJECT_NAME} PROPERTIES - VS_GLOBAL_KEYWORD "Win32Proj" - ) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() -endif() -################################################################################ -# MSVC runtime library -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() - set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) -endif() -################################################################################ -# Compile definitions -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS" - ">" - "$<$:" - "NDEBUG" - ">" - "WIN32;" - "_CONSOLE;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - ) -endif() -################################################################################ -# Compile and link options -################################################################################ - -target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPD/ - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include - # TODO: these should no longer be necessary if we were to link against LUS - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/Mercury - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/tinyxml2 - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/StormLib/src - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/nlohmann-json/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource - ${CMAKE_CURRENT_SOURCE_DIR}/../../soh/soh - . -) - -if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /OPT:REF; - /OPT:ICF - > - /SUBSYSTEM:CONSOLE - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /DEBUG; - /OPT:REF; - /OPT:ICF; - /INCREMENTAL:NO - > - /SUBSYSTEM:CONSOLE - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_options(${PROJECT_NAME} PRIVATE - -Wall -Wextra -Wno-error - -Wno-unused-parameter - -Wno-unused-function - -Wno-unused-variable - -Wno-missing-field-initializers - -Wno-parentheses - -Wno-narrowing - $<$:-Wno-deprecated-enum-enum-conversion> - ) -endif() -################################################################################ -# Dependencies -################################################################################ -add_dependencies(${PROJECT_NAME} - libultraship -) - -# Link with other targets. -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}") - diff --git a/OTRExporter/OTRExporter/CollisionExporter.cpp b/OTRExporter/OTRExporter/CollisionExporter.cpp deleted file mode 100644 index cbcdbb35f..000000000 --- a/OTRExporter/OTRExporter/CollisionExporter.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "CollisionExporter.h" -#include - -void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZCollisionHeader* col = (ZCollisionHeader*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_CollisionHeader); - - writer->Write(col->absMinX); - writer->Write(col->absMinY); - writer->Write(col->absMinZ); - - writer->Write(col->absMaxX); - writer->Write(col->absMaxY); - writer->Write(col->absMaxZ); - - writer->Write((uint32_t)col->vertices.size()); - - for (uint16_t i = 0; i < col->vertices.size(); i++) - { - writer->Write(col->vertices[i].scalars[0].scalarData.s16); - writer->Write(col->vertices[i].scalars[1].scalarData.s16); - writer->Write(col->vertices[i].scalars[2].scalarData.s16); - } - - writer->Write((uint32_t)col->polygons.size()); - - for (uint16_t i = 0; i < col->polygons.size(); i++) - { - writer->Write(col->polygons[i].type); - writer->Write(col->polygons[i].vtxA); - writer->Write(col->polygons[i].vtxB); - writer->Write(col->polygons[i].vtxC); - writer->Write(col->polygons[i].normX); - writer->Write(col->polygons[i].normY); - writer->Write(col->polygons[i].normZ); - writer->Write(col->polygons[i].dist); - } - - writer->Write((uint32_t)col->PolygonTypes.size()); - - for (uint16_t i = 0; i < col->PolygonTypes.size(); i++) { - writer->Write(col->PolygonTypes[i].data[1]); - writer->Write(col->PolygonTypes[i].data[0]); - } - - writer->Write((uint32_t)col->camData->entries.size()); - - for (auto entry : col->camData->entries) - { - auto camPosDecl = col->parent->GetDeclarationRanged(Seg2Filespace(entry->cameraPosDataSeg, col->parent->baseAddress)); - - int idx = 0; - - if (camPosDecl != nullptr) - idx = ((entry->cameraPosDataSeg & 0x00FFFFFF) - camPosDecl->address) / 6; - - writer->Write(entry->cameraSType); - writer->Write(entry->numData); - writer->Write((uint32_t)idx); - } - - writer->Write((uint32_t)col->camData->cameraPositionData.size()); - - for (auto entry : col->camData->cameraPositionData) - { - writer->Write(entry->x); - writer->Write(entry->y); - writer->Write(entry->z); - } - - writer->Write((uint32_t)col->waterBoxes.size()); - - for (auto waterBox : col->waterBoxes) - { - writer->Write(waterBox.xMin); - writer->Write(waterBox.ySurface); - writer->Write(waterBox.zMin); - writer->Write(waterBox.xLength); - writer->Write(waterBox.zLength); - writer->Write(waterBox.properties); - } -} diff --git a/OTRExporter/OTRExporter/CollisionExporter.h b/OTRExporter/OTRExporter/CollisionExporter.h deleted file mode 100644 index 536d65344..000000000 --- a/OTRExporter/OTRExporter/CollisionExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZCollision.h" -#include "Exporter.h" - -class OTRExporter_Collision : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CutsceneExporter.cpp b/OTRExporter/OTRExporter/CutsceneExporter.cpp deleted file mode 100644 index 2194ce65a..000000000 --- a/OTRExporter/OTRExporter/CutsceneExporter.cpp +++ /dev/null @@ -1,444 +0,0 @@ -#include "CutsceneExporter.h" -#include - -void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZCutscene* cs = (ZCutscene*)res; - - WriteHeader(cs, outPath, writer, LUS::ResourceType::SOH_Cutscene); - - writer->Write((uint32_t)0); - - const auto currentStream = writer->GetBaseAddress(); - - writer->Write(CS_BEGIN_CUTSCENE(cs->numCommands, cs->endFrame)); - - for (size_t i = 0; i < cs->commands.size(); i++) - { - switch (cs->commands[i]->commandID) - { - case (uint32_t)CutsceneCommands::SetCameraPos: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_EYE); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - } - break; - case (uint32_t)CutsceneCommands::SetCameraFocus: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_AT); - writer->Write(CMD_HH(0x0001, cmdCamPos->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - case (uint32_t)CutsceneCommands::Misc: - { - writer->Write(CS_CMD_MISC); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - for (const auto& e : cs->commands[i]->entries) //All in OOT seem to only have 1 entry - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write(CMD_W(cmd->unused8)); - writer->Write(CMD_W(cmd->unused9)); - writer->Write(CMD_W(cmd->unused10)); - } - break; - } - case (uint32_t)CutsceneCommands::SetLighting: - { - writer->Write(CS_CMD_SET_LIGHTING); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0x0); - writer->Write((uint32_t)0x0); - writer->Write((uint32_t)0x0); - } - break; - } - case (uint32_t)CutsceneCommands::SetCameraPosLink: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_EYE_REL_TO_PLAYER); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - case (uint32_t)CutsceneCommands::SetCameraFocusLink: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_AT_REL_TO_PLAYER); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - - case (uint32_t)CutsceneCommands::Cmd07: // Not used in OOT - break; - case (uint32_t)CutsceneCommands::Cmd08: // Not used in OOT - break; - - case (uint32_t)CutsceneCommands::Cmd09: - { - writer->Write(CS_CMD_09); - writer->Write((uint32_t)CMD_W(((CutsceneCommand_Rumble*)cs->commands[i])->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_Rumble* r = (CutsceneSubCommandEntry_Rumble*)e; - writer->Write(CMD_HH(r->base, r->startFrame)); - writer->Write(CMD_HBB(e->endFrame, r->unk_06, r->unk_07)); - writer->Write(CMD_BBH(r->unk_08, r->unk_09, r->unk_0A)); - } - break; - } - case 0x15://Both unused in OoT - case 0x1A://(uint32_t)CutsceneCommands::Unknown: - { -#if 0 - CutsceneCommandUnknown* cmdUnk = (CutsceneCommandUnknown*)cs->commands[i]; - writer->Write((uint32_t)cs->commands[i]->commandID); - writer->Write((uint32_t)cmdUnk->entries.size()); - - for (const auto e : cmdUnk->entries) - { - writer->Write(CMD_W(e->unused0)); - writer->Write(CMD_W(e->unused1)); - writer->Write(CMD_W(e->unused2)); - writer->Write(CMD_W(e->unused3)); - writer->Write(CMD_W(e->unused4)); - writer->Write(CMD_W(e->unused5)); - writer->Write(CMD_W(e->unused6)); - writer->Write(CMD_W(e->unused7)); - writer->Write(CMD_W(e->unused8)); - writer->Write(CMD_W(e->unused9)); - writer->Write(CMD_W(e->unused10)); - writer->Write(CMD_W(e->unused11)); - } -#endif - } - break; - case (uint32_t)CutsceneCommands::Textbox: - { - writer->Write(CS_CMD_TEXTBOX); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_TextBox* textBox = (CutsceneSubCommandEntry_TextBox*)e; - if (textBox->base == 0xFFFF) // CS_TEXT_NONE - { - writer->Write(CMD_HH(0xFFFF, textBox->startFrame)); - writer->Write(CMD_HH(textBox->endFrame, 0xFFFF)); - writer->Write(CMD_HH(0xFFFF, 0xFFFF)); - } - else // CS_TEXT_DISPLAY_TEXTBOX - { - writer->Write(CMD_HH(textBox->base, textBox->startFrame)); - writer->Write(CMD_HH(textBox->endFrame, textBox->type)); - writer->Write(CMD_HH(textBox->textId1, textBox->textId2)); - } - } - break; - } - case 10: //ActorAction0 - case (uint32_t)CutsceneCommands::SetActorAction1: - case 17: - case 18: - case 23: - case 34: - case 39: - case 46: - case 76: - case 85: - case 93: - case 105: - case 107: - case 110: - case 119: - case 123: - case 138: - case 139: - case 144: - case (uint32_t)CutsceneCommands::SetActorAction2: - case 16: - case 24: - case 35: - case 40: - case 48: - case 64: - case 68: - case 70: - case 78: - case 80: - case 94: - case 116: - case 118: - case 120: - case 125: - case 131: - case 141: - case (uint32_t)CutsceneCommands::SetActorAction3: - case 36: - case 41: - case 50: - case 67: - case 69: - case 72: - case 74: - case 81: - case 106: - case 117: - case 121: - case 126: - case 132: - case (uint32_t)CutsceneCommands::SetActorAction4: - case 37: - case 42: - case 51: - case 53: - case 63: - case 65: - case 66: - case 75: - case 82: - case 108: - case 127: - case 133: - case (uint32_t)CutsceneCommands::SetActorAction5: - case 38: - case 43: - case 47: - case 54: - case 79: - case 83: - case 128: - case 135: - case (uint32_t)CutsceneCommands::SetActorAction6: - case 55: - case 77: - case 84: - case 90: - case 129: - case 136: - case (uint32_t)CutsceneCommands::SetActorAction7: - case 52: - case 57: - case 58: - case 88: - case 115: - case 130: - case 137: - case (uint32_t)CutsceneCommands::SetActorAction8: - case 60: - case 89: - case 111: - case 114: - case 134: - case 142: - case (uint32_t)CutsceneCommands::SetActorAction9: - case (uint32_t)CutsceneCommands::SetActorAction10: - { - writer->Write((uint32_t)(CutsceneCommands)cs->commands[i]->commandID); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_ActorAction* actorAct = (CutsceneSubCommandEntry_ActorAction*)e; - writer->Write(CMD_HH(actorAct->base, actorAct->startFrame)); - writer->Write(CMD_HH(actorAct->endFrame, actorAct->rotX)); - writer->Write(CMD_HH(actorAct->rotY, actorAct->rotZ)); - writer->Write(CMD_W(actorAct->startPosX)); - writer->Write(CMD_W(actorAct->startPosY)); - writer->Write(CMD_W(actorAct->startPosZ)); - writer->Write(CMD_W(actorAct->endPosX)); - writer->Write(CMD_W(actorAct->endPosY)); - writer->Write(CMD_W(actorAct->endPosZ)); - writer->Write(CMD_W(actorAct->normalX)); - writer->Write(CMD_W(actorAct->normalY)); - writer->Write(CMD_W(actorAct->normalZ)); - } - - break; - } - case (uint32_t)CutsceneCommands::SetSceneTransFX: - { - CutsceneCommandSceneTransFX* cmdTFX = (CutsceneCommandSceneTransFX*)cs->commands[i]; - - writer->Write(CS_CMD_SCENE_TRANS_FX); - writer->Write((uint32_t)1); - writer->Write(CMD_HH((((CutsceneCommandSceneTransFX*)cs->commands[i])->base), ((CutsceneCommandSceneTransFX*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH((((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame), ((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame)); - break; - } - case (uint32_t)CutsceneCommands::PlayBGM: - { - writer->Write(CS_CMD_PLAYBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::StopBGM: - { - writer->Write(CS_CMD_STOPBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::FadeBGM: - { - writer->Write(CS_CMD_FADEBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::SetTime: - { - writer->Write(CS_CMD_SETTIME); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_SetTime* t = (CutsceneSubCommandEntry_SetTime*)e; - writer->Write(CMD_HH(t->base, t->startFrame)); - writer->Write(CMD_HBB(t->endFrame, t->hour, t->minute)); - writer->Write((uint32_t)CMD_W(t->unk_08)); - } - break; - } - case (uint32_t)CutsceneCommands::Terminator: - { - CutsceneCommand_Terminator* t = (CutsceneCommand_Terminator*)cs->commands[i]; - writer->Write(CS_CMD_TERMINATOR); - writer->Write((uint32_t)1); - writer->Write(CMD_HH(t->base, t->startFrame)); - writer->Write(CMD_HH(t->endFrame, t->endFrame)); - break; - } - default: - { - //writer->Write((uint32_t)cs->commands[i]->commandID); - printf("Undefined CS Opcode: %04X\n", cs->commands[i]->commandID); - } - break; - } - } - - //CS_END - writer->Write(0xFFFFFFFF); - writer->Write((uint32_t)0); - - const auto endStream = writer->GetBaseAddress(); - writer->Seek((uint32_t)currentStream - 4, SeekOffsetType::Start); - writer->Write((uint32_t)((endStream - currentStream) / 4)); - writer->Seek((uint32_t)endStream, SeekOffsetType::Start); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CutsceneExporter.h b/OTRExporter/OTRExporter/CutsceneExporter.h deleted file mode 100644 index 96903fdba..000000000 --- a/OTRExporter/OTRExporter/CutsceneExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZCutscene.h" -#include "z64cutscene_commands.h" -#include "Exporter.h" - -class OTRExporter_Cutscene : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/DisplayListExporter.cpp b/OTRExporter/OTRExporter/DisplayListExporter.cpp deleted file mode 100644 index 81863f09d..000000000 --- a/OTRExporter/OTRExporter/DisplayListExporter.cpp +++ /dev/null @@ -1,907 +0,0 @@ -#include "DisplayListExporter.h" -#include "Main.h" -#include "../ZAPD/ZFile.h" -#include -#include -#include "StrHash64/StrHash64.h" -#include "spdlog/spdlog.h" -#include -#include -#include -#include -#include "MtxExporter.h" -#include -#include "VersionInfo.h" - -#define GFX_SIZE 8 - -#define gsDPSetCombineLERP_NoMacros(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ -{ \ - _SHIFTL(G_SETCOMBINE, 24, 8) | \ - _SHIFTL(GCCc0w0(a0, c0, \ - Aa0, Ac0) | \ - GCCc1w0(a1, c1), 0, 24), \ - (unsigned int)(GCCc0w1(b0, d0, \ - Ab0, Ad0) | \ - GCCc1w1(b1, Aa1, \ - Ac1, d1, \ - Ab1, Ad1)) \ -} - -#define gsSPBranchLessZraw2(dl, vtx, zval) \ -{ _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\ - (unsigned int)(zval), } - -#define gsSPBranchLessZraw3(dl) \ -{ _SHIFTL(G_RDPHALF_1,24,8), \ - (unsigned int)(dl), } - -#define gsDPWordLo(wordlo) \ - gsImmp1(G_RDPHALF_2, (unsigned int)(wordlo)) - -#define gsSPTextureRectangle2(xl, yl, xh, yh, tile) \ -{ (_SHIFTL(G_TEXRECT, 24, 8) | _SHIFTL(xh, 12, 12) | _SHIFTL(yh, 0, 12)),\ - (_SHIFTL(tile, 24, 3) | _SHIFTL(xl, 12, 12) | _SHIFTL(yl, 0, 12)) } - -void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZDisplayList* dList = (ZDisplayList*)res; - - //printf("Exporting DList %s\n", dList->GetName().c_str()); - - WriteHeader(res, outPath, writer, LUS::ResourceType::DisplayList); - - while (writer->GetBaseAddress() % 8 != 0) - writer->Write((uint8_t)0xFF); - - // DEBUG: Write in a marker - Declaration* dbgDecl = dList->parent->GetDeclaration(dList->GetRawDataIndex()); - std::string dbgName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), dbgDecl->varName.c_str()); - uint64_t hash = CRC64(dbgName.c_str()); - writer->Write((uint32_t)(G_MARKER << 24)); - writer->Write((uint32_t)0xBEEFBEEF); - writer->Write((uint32_t)(hash >> 32)); - writer->Write((uint32_t)(hash & 0xFFFFFFFF)); - - auto dlStart = std::chrono::steady_clock::now(); - - //for (auto data : dList->instructions) - for (size_t dataIdx = 0; dataIdx < dList->instructions.size(); dataIdx++) - { - auto data = dList->instructions[dataIdx]; - uint32_t word0 = 0; - uint32_t word1 = 0; - uint8_t opcode = (uint8_t)(data >> 56); - F3DZEXOpcode opF3D = (F3DZEXOpcode)opcode; - - if ((int)opF3D == G_DL)// || (int)opF3D == G_BRANCH_Z) - opcode = (uint8_t)G_DL_OTR_HASH; - - if ((int)opF3D == G_MTX) - opcode = (uint8_t)G_MTX_OTR; - - if ((int)opF3D == G_BRANCH_Z) - opcode = (uint8_t)G_BRANCH_Z_OTR; - - if ((int)opF3D == G_VTX) - opcode = (uint8_t)G_VTX_OTR_HASH; - - if ((int)opF3D == G_SETTIMG) - opcode = (uint8_t)G_SETTIMG_OTR_HASH; - - word0 += (opcode << 24); - - switch ((int)opF3D) - { - case G_NOOP: - { - Gfx value = {gsDPNoOp()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_ENDDL: - { - Gfx value = {gsSPEndDisplayList()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_MODIFYVTX: - { - int32_t ww = (data & 0x00FF000000000000ULL) >> 48; - int32_t nnnn = (data & 0x0000FFFF00000000ULL) >> 32; - int32_t vvvvvvvv = (data & 0x00000000FFFFFFFFULL); - - Gfx value = {gsSPModifyVertex(nnnn / 2, ww, vvvvvvvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - default: - { - printf("Undefined opcode: %02X\n", opcode); - //word0 = _byteswap_ulong((uint32_t)(data >> 32)); - //word1 = _byteswap_ulong((uint32_t)(data & 0xFFFFFFFF)); - } - break; - case G_GEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - - Gfx value = {gsSPGeometryMode(~cccccc, ssssssss)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPPIPESYNC: - { - Gfx value = {gsDPPipeSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPLOADSYNC: - { - Gfx value = {gsDPLoadSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPTILESYNC: - { - Gfx value = {gsDPTileSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPFULLSYNC: - { - Gfx value = {gsDPFullSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPSETOTHERMODE: - { - int32_t hhhhhh = (data & 0x00FFFFFF00000000) >> 32; - int32_t llllllll = (data & 0x00000000FFFFFFFF); - - Gfx value = {gsDPSetOtherMode(hhhhhh, llllllll)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_POPMTX: - { - Gfx value = {gsSPPopMatrix(data)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETENVCOLOR: - { - uint8_t r = (uint8_t)((data & 0xFF000000) >> 24); - uint8_t g = (uint8_t)((data & 0x00FF0000) >> 16); - uint8_t b = (uint8_t)((data & 0xFF00FF00) >> 8); - uint8_t a = (uint8_t)((data & 0x000000FF) >> 0); - - Gfx value = {gsDPSetEnvColor(r, g, b, a)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_MTX: - { - if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID)) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7 - { - uint32_t pp = (data & 0x000000FF00000000) >> 32; - uint32_t mm = (data & 0x00000000FFFFFFFF); - - pp ^= G_MTX_PUSH; - - mm = (mm & 0x0FFFFFFF) + 1; - - Gfx value = {gsSPMatrix(mm, pp)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - uint32_t pp = (data & 0x000000FF00000000) >> 32; - uint32_t mm = (data & 0x00000000FFFFFFFF); - pp ^= G_MTX_PUSH; - - Gfx value = {gsSPMatrix(mm, pp)}; - word0 = value.words.w0; - word1 = value.words.w1; - - word0 = (word0 & 0x00FFFFFF) + (G_MTX_OTR << 24); - - Declaration* mtxDecl = dList->parent->GetDeclaration(GETSEGOFFSET(mm)); - - int bp = 0; - - writer->Write(word0); - writer->Write(word1); - - if (mtxDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), mtxDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - } - break; - case G_LOADBLOCK: - { - int32_t sss = (data & 0x00FFF00000000000) >> 48; - int32_t ttt = (data & 0x00000FFF00000000) >> 36; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t xxx = (data & 0x0000000000FFF000) >> 12; - int32_t ddd = (data & 0x0000000000000FFF); - - Gfx value = {gsDPLoadBlock(i, sss, ttt, xxx, ddd)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_CULLDL: - { - int32_t vvvv = (data & 0xFFFF00000000) >> 32; - int32_t wwww = (data & 0x0000FFFF); - - Gfx value = {gsSPCullDisplayList(vvvv / 2, wwww / 2)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPHALF_1: - { - auto data2 = dList->instructions[dataIdx + 1]; - - if ((data2 >> 56) != G_BRANCH_Z) - { - uint32_t a = (data & 0x00FFF00000000000) >> 44; - uint32_t b = (data & 0x00000FFF00000000) >> 32; - uint32_t z = (data & 0x00000000FFFFFFFF) >> 0; - uint32_t h = (data & 0xFFFFFFFF); - - Gfx value = {gsSPBranchLessZraw3(h & 0x00FFFFFF)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - word0 = (G_NOOP << 24); - word1 = 0; - } - } - break; - case G_RDPHALF_2: - { - Gfx value = {gsDPWordLo(data & 0xFFFFFFFF)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_TEXRECT: - { - int32_t xxx = (data & 0x00FFF00000000000) >> 44; - int32_t yyy = (data & 0x00000FFF00000000) >> 32; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t XXX = (data & 0x0000000000FFF000) >> 12; - int32_t YYY = (data & 0x0000000000000FFF); - - Gfx value = {gsSPTextureRectangle2(XXX, YYY, xxx, yyy, i)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_BRANCH_Z: - { - uint32_t a = (data & 0x00FFF00000000000) >> 44; - uint32_t b = (data & 0x00000FFF00000000) >> 32; - uint32_t z = (data & 0x00000000FFFFFFFF) >> 0; - uint32_t h = (data & 0xFFFFFFFF); - - auto data2 = dList->instructions[dataIdx - 1]; - uint32_t dListPtr = GETSEGOFFSET(data2); - - Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - - int bp = 0; - - Gfx value = {gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z)}; - word0 = (value.words.w0 & 0x00FFFFFF) + (G_BRANCH_Z_OTR << 24); - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - - if (dListDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - - for (size_t i = 0; i < dList->otherDLists.size(); i++) - { - Declaration* dListDecl2 = dList->parent->GetDeclaration(GETSEGOFFSET(dList->otherDLists[i]->GetRawDataIndex())); - - if (dListDecl2 != nullptr) - { - //std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str()); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str()); - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - MemoryStream* dlStream = new MemoryStream(); - BinaryWriter dlWriter = BinaryWriter(dlStream); - - Save(dList->otherDLists[i], outPath, &dlWriter); - AddFile(fName, dlStream->ToVector()); - } - } - else - { - spdlog::error(StringHelper::Sprintf("dListDecl2 == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - - //Gfx value = gsSPBranchLessZraw2(h & 0x00FFFFFF, (a / 5) | (b / 2), z); - //word0 = value.words.w0; - //word1 = value.words.w1; - } - break; - //case G_BRANCH_Z: - case G_DL: - { - if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID) && (int)opF3D != G_BRANCH_Z) - || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7 - { - int32_t pp = (data & 0x00FF000000000000) >> 56; - - Gfx value; - - u32 dListVal = (data & 0x0FFFFFFF) + 1; - - if (pp != 0) - value = {gsSPBranchList(dListVal)}; - else - value = {gsSPDisplayList(dListVal)}; - - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - uint32_t dListPtr = GETSEGOFFSET(data); - - if ((int)opF3D == G_BRANCH_Z) - { - auto data2 = dList->instructions[dataIdx - 1]; - dListPtr = GETSEGOFFSET(data2); - } - else - { - int bp = 0; - } - - Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - - int bp = 0; - - writer->Write(word0); - writer->Write(word1); - - if (dListDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - - for (size_t i = 0; i < dList->otherDLists.size(); i++) - { - Declaration* dListDecl2 = dList->parent->GetDeclaration(GETSEGOFFSET(dList->otherDLists[i]->GetRawDataIndex())); - - if (dListDecl2 != nullptr) - { - //std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str()); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str()); - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - MemoryStream* dlStream = new MemoryStream(); - BinaryWriter dlWriter = BinaryWriter(dlStream); - - Save(dList->otherDLists[i], outPath, &dlWriter); - - AddFile(fName, dlStream->ToVector()); - } - } - else - { - spdlog::error(StringHelper::Sprintf("dListDecl2 == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - } - } - break; - case G_TEXTURE: - { - int32_t ____ = (data & 0x0000FFFF00000000) >> 32; - int32_t ssss = (data & 0x00000000FFFF0000) >> 16; - int32_t tttt = (data & 0x000000000000FFFF); - int32_t lll = (____ & 0x3800) >> 11; - int32_t ddd = (____ & 0x700) >> 8; - int32_t nnnnnnn = (____ & 0xFE) >> 1; - - Gfx value = {gsSPTexture(ssss, tttt, lll, ddd, nnnnnnn)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_TRI1: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - - Gfx test = {gsSP1Triangle(aa, bb, cc, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_TRI2: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x00000000FF0000ULL) >> 16) / 2; - int32_t ee = ((data & 0x0000000000FF00ULL) >> 8) / 2; - int32_t ff = ((data & 0x000000000000FFULL) >> 0) / 2; - - Gfx test = {gsSP2Triangles(aa, bb, cc, 0, dd, ee, ff, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_QUAD: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x000000000000FFULL)) / 2; - - Gfx test = {gsSP1Quadrangle(aa, bb, cc, dd, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_SETPRIMCOLOR: - { - int32_t mm = (data & 0x0000FF0000000000) >> 40; - int32_t ff = (data & 0x000000FF00000000) >> 32; - int32_t rr = (data & 0x00000000FF000000) >> 24; - int32_t gg = (data & 0x0000000000FF0000) >> 16; - int32_t bb = (data & 0x000000000000FF00) >> 8; - int32_t aa = (data & 0x00000000000000FF) >> 0; - - Gfx value = {gsDPSetPrimColor(mm, ff, rr, gg, bb, aa)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETOTHERMODE_L: - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t len = ((data & 0x000000FF00000000) >> 32) + 1; - int32_t sft = 32 - (len)-ss; - int32_t dd = (data & 0xFFFFFFFF); - - // TODO: Output the correct render modes in data - - Gfx value = {gsSPSetOtherMode(0xE2, sft, len, dd)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETOTHERMODE_H: - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t nn = (data & 0x000000FF00000000) >> 32; - int32_t dd = (data & 0xFFFFFFFF); - - int32_t sft = 32 - (nn + 1) - ss; - - Gfx value; - - if (sft == 14) // G_MDSFT_TEXTLUT - { - const char* types[] = { "G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16" }; - value = {gsDPSetTextureLUT(dd >> 14)}; - } - else - { - value = {gsSPSetOtherMode(0xE3, sft, nn + 1, dd)}; - } - - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTILE: - { - int32_t fff = (data & 0b0000000011100000000000000000000000000000000000000000000000000000) >> 53; - int32_t ii = (data & 0b0000000000011000000000000000000000000000000000000000000000000000) >> 51; - int32_t nnnnnnnnn = - (data & 0b0000000000000011111111100000000000000000000000000000000000000000) >> 41; - int32_t mmmmmmmmm = - (data & 0b0000000000000000000000011111111100000000000000000000000000000000) >> 32; - int32_t ttt = (data & 0b0000000000000000000000000000000000000111000000000000000000000000) >> 24; - int32_t pppp = - (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - int32_t cc = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - int32_t aaaa = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - int32_t ssss = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - int32_t dd = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - Gfx value = {gsDPSetTile(fff, ii, nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETCOMBINE: - { - int32_t a0 = (data & 0b000000011110000000000000000000000000000000000000000000000000000) >> 52; - int32_t c0 = (data & 0b000000000001111100000000000000000000000000000000000000000000000) >> 47; - int32_t aa0 = (data & 0b00000000000000011100000000000000000000000000000000000000000000) >> 44; - int32_t ac0 = (data & 0b00000000000000000011100000000000000000000000000000000000000000) >> 41; - int32_t a1 = (data & 0b000000000000000000000011110000000000000000000000000000000000000) >> 37; - int32_t c1 = (data & 0b000000000000000000000000001111100000000000000000000000000000000) >> 32; - int32_t b0 = (data & 0b000000000000000000000000000000011110000000000000000000000000000) >> 28; - int32_t b1 = (data & 0b000000000000000000000000000000000001111000000000000000000000000) >> 24; - int32_t aa1 = (data & 0b00000000000000000000000000000000000000111000000000000000000000) >> 21; - int32_t ac1 = (data & 0b00000000000000000000000000000000000000000111000000000000000000) >> 18; - int32_t d0 = (data & 0b000000000000000000000000000000000000000000000111000000000000000) >> 15; - int32_t ab0 = (data & 0b00000000000000000000000000000000000000000000000111000000000000) >> 12; - int32_t ad0 = (data & 0b00000000000000000000000000000000000000000000000000111000000000) >> 9; - int32_t d1 = (data & 0b000000000000000000000000000000000000000000000000000000111000000) >> 6; - int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3; - int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0; - - Gfx value = { gsDPSetCombineLERP_NoMacros(a0, b0, c0, d0, aa0, ab0, ac0, ad0, a1, b1, c1, d1, aa1, ab1, ac1, ad1)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTILESIZE: - { - int32_t sss = (data & 0x00FFF00000000000) >> 44; - int32_t ttt = (data & 0x00000FFF00000000) >> 32; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - int32_t i = (data & 0x000000000F000000) >> 24; - - Gfx value = {gsDPSetTileSize(i, sss, ttt, uuu, vvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_LOADTLUT: - { - int32_t t = (data & 0x0000000007000000) >> 24; - int32_t ccc = (data & 0x00000000003FF000) >> 14; - - Gfx value = {gsDPLoadTLUTCmd(t, ccc)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_LOADTILE: - { - int sss = (data & 0x00FFF00000000000) >> 44; - int ttt = (data & 0x00000FFF00000000) >> 32; - int i = (data & 0x000000000F000000) >> 24; - int uuu = (data & 0x0000000000FFF000) >> 12; - int vvv= (data & 0x0000000000000FFF); - - Gfx value = {gsDPLoadTile(i, sss, ttt, uuu, vvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTIMG: - { - uint32_t seg = data & 0xFFFFFFFF; - int32_t texAddress = Seg2Filespace(data, dList->parent->baseAddress); - - if (!Globals::Instance->HasSegment(GETSEGNUM(seg), res->parent->workerID) || (res->GetName() == "sShadowMaterialDL")) - { - if (res->GetName() == "sShadowMaterialDL") { - // sShadowMaterialDL (In ovl_En_Jsjutan) has a texture in bss. This is a hack to override the reference to one - // to segment C. The actor has been modified to load the texture into segment C. - seg = 0x0C000000; - } - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1)}; - word0 = value.words.w0; - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - } - else - { - std::string texName = ""; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName, res->parent->workerID); - - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, __)}; - word0 = value.words.w0 & 0x00FFFFFF; - word0 += (G_SETTIMG_OTR_HASH << 24); - //word1 = value.words.w1; - word1 = 0; - - writer->Write(word0); - writer->Write(word1); - - if (foundDecl) - { - ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg), res->parent->workerID); - std::string assocFileName = assocFile->GetName(); - std::string fName = ""; - - if (GETSEGNUM(seg) == SEGMENT_SCENE || GETSEGNUM(seg) == SEGMENT_ROOM) - fName = GetPathToRes(res, texName.c_str()); - else - fName = GetPathToRes(assocFile->resources[0], texName.c_str()); - - uint64_t hash = CRC64(fName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error("texDecl == nullptr! PTR = 0x{:08X}", texAddress); - } - } - } - break; - case G_VTX: - { - if (GETSEGNUM(data) == 0xC || GETSEGNUM(data) == 0x8) - { - // hack for dynamic verticies used in en_ganon_mant and en_jsjutan - // TODO is there a better way? - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - - Gfx value = {gsSPVertex(data & 0xFFFFFFFF, nn, ((aa >> 1) - nn))}; - - word0 = value.words.w0; - word1 = value.words.w1 | 1; - } - else - { - // Write CRC64 of vtx file name - uint32_t addr = data & 0xFFFFFFFF; - - if (GETSEGNUM(data) == 0x80) - addr -= dList->parent->baseAddress; - - auto segOffset = GETSEGOFFSET(addr); - Declaration* vtxDecl = dList->parent->GetDeclarationRanged(segOffset); - - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - - if (vtxDecl != nullptr && vtxDecl->varType != "Gfx") - { - uint32_t diff = segOffset - vtxDecl->address; - - Gfx value = {gsSPVertex(diff, nn, ((aa >> 1) - nn))}; - - word0 = value.words.w0; - word0 &= 0x00FFFFFF; - word0 += (G_VTX_OTR_HASH << 24); - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, vtxDecl->varName); - - uint64_t hash = CRC64(fName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - // Write vertices to file - MemoryStream* vtxStream = new MemoryStream(); - BinaryWriter vtxWriter = BinaryWriter(vtxStream); - - int arrCnt = 0; - - auto split = StringHelper::Split(vtxDecl->text, "\n"); - - for (size_t i = 0; i < split.size(); i++) - { - std::string line = split[i]; - - if (StringHelper::Contains(line, "VTX(")) - arrCnt++; - } - - // OTRTODO: Once we aren't relying on text representations, we should call ArrayExporter... - OTRExporter::WriteHeader(nullptr, "", &vtxWriter, LUS::ResourceType::Array); - - vtxWriter.Write((uint32_t)ZResourceType::Vertex); - vtxWriter.Write((uint32_t)arrCnt); - - auto start = std::chrono::steady_clock::now(); - - // God dammit this is so dumb - for (size_t i = 0; i < split.size(); i++) - { - std::string line = split[i]; - - if (StringHelper::Contains(line, "VTX(")) - { - auto split2 = StringHelper::Split(StringHelper::Split(StringHelper::Split(line, "VTX(")[1], ")")[0], ","); - - vtxWriter.Write((int16_t)std::stoi(split2[0], nullptr, 10)); // v.x - vtxWriter.Write((int16_t)std::stoi(split2[1], nullptr, 10)); // v.y - vtxWriter.Write((int16_t)std::stoi(split2[2], nullptr, 10)); // v.z - - vtxWriter.Write((int16_t)0); // v.flag - - vtxWriter.Write((int16_t)std::stoi(split2[3], nullptr, 10)); // v.s - vtxWriter.Write((int16_t)std::stoi(split2[4], nullptr, 10)); // v.t - - vtxWriter.Write((uint8_t)std::stoi(split2[5], nullptr, 10)); // v.r - vtxWriter.Write((uint8_t)std::stoi(split2[6], nullptr, 10)); // v.g - vtxWriter.Write((uint8_t)std::stoi(split2[7], nullptr, 10)); // v.b - vtxWriter.Write((uint8_t)std::stoi(split2[8], nullptr, 10)); // v.a - } - } - - AddFile(fName, vtxStream->ToVector()); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - } - } - else - { - spdlog::error("vtxDecl == nullptr!"); - } - } - } - break; - } - - writer->Write(word0); - writer->Write(word1); - } - - auto dlEnd = std::chrono::steady_clock::now(); - size_t dlDiff = std::chrono::duration_cast(dlEnd - dlStart).count(); - - //printf("Display List Gen in %zums\n", dlDiff); -} - -std::string OTRExporter_DisplayList::GetPathToRes(ZResource* res, std::string varName) -{ - std::string prefix = GetPrefix(res); - std::string fName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), varName.c_str()); - - return fName; -} - -std::string OTRExporter_DisplayList::GetParentFolderName(ZResource* res) -{ - std::string prefix = GetPrefix(res); - std::string oName = res->parent->GetOutName(); - - if (StringHelper::Contains(oName, "_scene")) - { - auto split = StringHelper::Split(oName, "_"); - oName = ""; - for (size_t i = 0; i < split.size() - 1; i++) - oName += split[i] + "_"; - - oName += "scene"; - } - else if (StringHelper::Contains(oName, "_room")) - { - oName = StringHelper::Split(oName, "_room")[0] + "_scene"; - } - - if (prefix != "") - oName = prefix + "/" + oName; - - return oName; -} - -std::string OTRExporter_DisplayList::GetPrefix(ZResource* res) -{ - std::string oName = res->parent->GetOutName(); - std::string prefix = ""; - std::string xmlPath = StringHelper::Replace(res->parent->GetXmlFilePath().string(), "\\", "/"); - - if (StringHelper::Contains(oName, "_scene") || StringHelper::Contains(oName, "_room")) { - prefix = "scenes"; - if (Globals::Instance->rom->IsMQ()) { - prefix += "/mq"; - } else { - prefix += "/nonmq"; - } - } - else if (StringHelper::Contains(xmlPath, "objects/")) - prefix = "objects"; - else if (StringHelper::Contains(xmlPath, "textures/")) - prefix = "textures"; - else if (StringHelper::Contains(xmlPath, "overlays/")) - prefix = "overlays"; - else if (StringHelper::Contains(xmlPath, "misc/")) - prefix = "misc"; - else if (StringHelper::Contains(xmlPath, "text/")) - prefix = "text"; - else if (StringHelper::Contains(xmlPath, "code/")) - prefix = "code"; - - return prefix; -} diff --git a/OTRExporter/OTRExporter/DisplayListExporter.h b/OTRExporter/OTRExporter/DisplayListExporter.h deleted file mode 100644 index d8d96971c..000000000 --- a/OTRExporter/OTRExporter/DisplayListExporter.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "Exporter.h" -#include - -class OTRExporter_DisplayList : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; - static std::string GetParentFolderName(ZResource* res); - static std::string GetPathToRes(ZResource* res, std::string varName); - static std::string GetPrefix(ZResource* res); - -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/Exporter.cpp b/OTRExporter/OTRExporter/Exporter.cpp deleted file mode 100644 index a523bb16c..000000000 --- a/OTRExporter/OTRExporter/Exporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Exporter.h" -#include "VersionInfo.h" - -void OTRExporter::WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, LUS::ResourceType resType, int32_t resVersion) -{ - writer->Write((uint8_t)Endianness::Little); // 0x00 - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write((uint32_t)resType); // 0x04 - //writer->Write((uint32_t)MAJOR_VERSION); // 0x08 - writer->Write((uint32_t)resVersion); // 0x08 - writer->Write((uint64_t)0xDEADBEEFDEADBEEF); // id, 0x0C - writer->Write((uint32_t)resourceVersions[resType]); // 0x10 - writer->Write((uint64_t)0); // ROM CRC, 0x14 - writer->Write((uint32_t)0); // ROM Enum, 0x1C - - while (writer->GetBaseAddress() < 0x40) - writer->Write((uint32_t)0); // To be used at a later date! -} diff --git a/OTRExporter/OTRExporter/Exporter.h b/OTRExporter/OTRExporter/Exporter.h deleted file mode 100644 index cd4ed9adb..000000000 --- a/OTRExporter/OTRExporter/Exporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZArray.h" -#include "stdint.h" -//#include "OTRExporter.h" -#include -#include -#include "VersionInfo.h" - -class OTRExporter : public ZResourceExporter -{ -protected: - static void WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, LUS::ResourceType resType, int32_t resVersion = 0); -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/Main.cpp b/OTRExporter/OTRExporter/Main.cpp deleted file mode 100644 index 506f8bfd4..000000000 --- a/OTRExporter/OTRExporter/Main.cpp +++ /dev/null @@ -1,329 +0,0 @@ -#include "Main.h" -#include "Exporter.h" -#include "BackgroundExporter.h" -#include "TextureExporter.h" -#include "RoomExporter.h" -#include "CollisionExporter.h" -#include "DisplayListExporter.h" -#include "PlayerAnimationExporter.h" -#include "SkeletonExporter.h" -#include "SkeletonLimbExporter.h" -#include "ArrayExporter.h" -#include "VtxExporter.h" -#include "AnimationExporter.h" -#include "CutsceneExporter.h" -#include "PathExporter.h" -#include "TextExporter.h" -#include "BlobExporter.h" -#include "MtxExporter.h" -#include "AudioExporter.h" -#include -#include -#include -#include -#include -#include -#include -#include - -std::string otrFileName = "oot.otr"; -std::shared_ptr otrArchive; -BinaryWriter* fileWriter; -std::chrono::steady_clock::time_point fileStart, resStart; -std::map> files; -std::mutex fileMutex; - -void InitVersionInfo(); - -enum class ExporterFileMode -{ - BuildOTR = (int)ZFileMode::Custom + 1, -}; - -static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileMode) -{ - if (buildMode == "botr") - { - fileMode = (ZFileMode)ExporterFileMode::BuildOTR; - - printf("BOTR: Generating OTR Archive...\n"); - - if (DiskFile::Exists(otrFileName)) - otrArchive = std::shared_ptr(new LUS::Archive(otrFileName, true)); - else - otrArchive = LUS::Archive::CreateArchive(otrFileName, 40000); - - auto lst = Directory::ListFiles("Extract"); - - for (auto item : lst) - { - auto fileData = DiskFile::ReadAllBytes(item); - otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - } -} - -static void ExporterProgramEnd() -{ - uint32_t crc = 0xFFFFFFFF; - const uint8_t endianness = (uint8_t)Endianness::Big; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - { - std::string romPath = Globals::Instance->baseRomPath.string(); - std::vector romData = DiskFile::ReadAllBytes(romPath); - - BitConverter::RomToBigEndian(romData.data(), romData.size()); - - crc = BitConverter::ToUInt32BE(romData, 0x10); - printf("Creating version file...\n"); - - // Get crc from rom - - MemoryStream *versionStream = new MemoryStream(); - BinaryWriter writer(versionStream); - writer.SetEndianness(Endianness::Big); - writer.Write(endianness); - writer.Write(crc); - writer.Close(); - - printf("Created version file.\n"); - - printf("Generating OTR Archive...\n"); - otrArchive = LUS::Archive::CreateArchive(otrFileName, 40000); - - otrArchive->AddFile("version", (uintptr_t)versionStream->ToVector().data(), versionStream->GetLength()); - - for (const auto& item : files) - { - std::string fName = item.first; - if (fName.find("gTitleZeldaShieldLogoMQTex") != std::string::npos && !ZRom(romPath).IsMQ()) - { - size_t pos = 0; - if ((pos = fName.find("gTitleZeldaShieldLogoMQTex", 0)) != std::string::npos) - { - fName.replace(pos, 27, "gTitleZeldaShieldLogoTex"); - } - } - const auto& fileData = item.second; - otrArchive->AddFile(fName, (uintptr_t)fileData.data(), - fileData.size()); - } - } - otrArchive = nullptr; - delete fileWriter; - files.clear(); - - // Add any additional files that need to be manually copied... - if (DiskFile::Exists("soh.otr")) { - return; - } - const auto& lst = Directory::ListFiles("Extract"); - std::shared_ptr sohOtr = LUS::Archive::CreateArchive("soh.otr", 4096); - //sohOtr->AddFile("version", (uintptr_t)versionStream->ToVector().data(), versionStream->GetLength()); - - for (const auto& item : lst) - { - std::vector splitPath = StringHelper::Split(item, "."); - - if (splitPath.size() >= 3) - { - const std::string extension = splitPath.at(splitPath.size() - 1); - const std::string format = splitPath.at(splitPath.size() - 2); - splitPath.pop_back(); - splitPath.pop_back(); - std::string afterPath = std::accumulate(splitPath.begin(), splitPath.end(), std::string("")); - if (extension == "png" && (format == "rgba32" || format == "rgb5a1" || format == "i4" || format == "i8" || format == "ia4" || format == "ia8" || format == "ia16" || format == "ci4" || format == "ci8")) - { - ZTexture tex(nullptr); - Globals::Instance->buildRawTexture = true; - tex.FromPNG(item, ZTexture::GetTextureTypeFromString(format)); - printf("sohOtr->AddFile(%s)\n", StringHelper::Split(afterPath, "Extract/")[1].c_str()); - - OTRExporter_Texture exporter; - - MemoryStream* stream = new MemoryStream(); - BinaryWriter writer(stream); - - exporter.Save(&tex, "", &writer); - - std::string src = tex.GetBodySourceCode(); - writer.Write((char *)src.c_str(), src.size()); - - std::vector fileData = stream->ToVector(); - sohOtr->AddFile(StringHelper::Split(afterPath, "Extract/assets/")[1], (uintptr_t)fileData.data(), fileData.size()); - continue; - } - } - - if (item.find("accessibility") != std::string::npos) - { - std::string extension = splitPath.at(splitPath.size() - 1); - splitPath.pop_back(); - if (extension == "json") - { - const auto &fileData = DiskFile::ReadAllBytes(item); - printf("Adding accessibility texts %s\n", StringHelper::Split(item, "texts/")[1].c_str()); - sohOtr->AddFile(StringHelper::Split(item, "Extract/assets/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - continue; - } - - const auto& fileData = DiskFile::ReadAllBytes(item); - printf("sohOtr->AddFile(%s)\n", StringHelper::Split(item, "Extract/")[1].c_str()); - sohOtr->AddFile(StringHelper::Split(item, item.find("Extract/assets/") != std::string::npos ? "Extract/assets/" : "Extract/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - sohOtr = nullptr; -} - -static void ExporterParseArgs(int argc, char* argv[], int& i) -{ - std::string arg = argv[i]; - - if (arg == "--otrfile") - { - otrFileName = argv[i + 1]; - i++; - } -} - -static bool ExporterProcessFileMode(ZFileMode fileMode) -{ - // Do whatever work is associated with these custom file modes... - // Return true to indicate one of our own file modes is being processed - if (fileMode == (ZFileMode)ExporterFileMode::BuildOTR) - return true; - - return false; -} - -static void ExporterFileBegin(ZFile* file) -{ - fileStart = std::chrono::steady_clock::now(); - - MemoryStream* stream = new MemoryStream(); - fileWriter = new BinaryWriter(stream); -} - -static void ExporterFileEnd(ZFile* file) -{ - // delete fileWriter; -} - -static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer) -{ - auto streamShared = writer.GetStream(); - MemoryStream* strem = (MemoryStream*)streamShared.get(); - - auto start = std::chrono::steady_clock::now(); - - if (res->GetName() != "") - { - std::string oName = res->parent->GetOutName(); - std::string rName = res->GetName(); - std::string prefix = OTRExporter_DisplayList::GetPrefix(res); - - //auto xmlFilePath = res->parent->GetXmlFilePath(); - //prefix = StringHelper::Split(StringHelper::Split(xmlFilePath.string(), "xml\\")[1], ".xml")[0]; - - if (StringHelper::Contains(oName, "_scene")) - { - auto split = StringHelper::Split(oName, "_"); - oName = ""; - for (size_t i = 0; i < split.size() - 1; i++) - oName += split[i] + "_"; - - oName += "scene"; - } - else if (StringHelper::Contains(oName, "_room")) - { - oName = StringHelper::Split(oName, "_room")[0] + "_scene"; - } - - std::string fName = ""; - - if (prefix != "") - fName = StringHelper::Sprintf("%s/%s/%s", prefix.c_str(), oName.c_str(), rName.c_str()); - else - fName = StringHelper::Sprintf("%s/%s", oName.c_str(), rName.c_str()); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - { - std::unique_lock Lock(fileMutex); - files[fName] = strem->ToVector(); - } - else - DiskFile::WriteAllBytes("Extract/" + fName, strem->ToVector()); - } - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //if (diff > 10) - //printf("Exported Resource End %s in %zums\n", res->GetName().c_str(), diff); -} - -static void ExporterProcessCompilable(tinyxml2::XMLElement* reader) -{ - std::string nodeName = reader->Name(); -} - -static void ExporterXMLBegin() -{ -} - -static void ExporterXMLEnd() -{ -} - -void AddFile(std::string fName, std::vector data) -{ - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - DiskFile::WriteAllBytes("Extract/" + fName, data); - else - { - std::unique_lock Lock(fileMutex); - files[fName] = data; - } -} - -void ImportExporters() -{ - // In this example we set up a new exporter called "EXAMPLE". - // By running ZAPD with the argument -se EXAMPLE, we tell it that we want to use this exporter for our resources. - ExporterSet* exporterSet = new ExporterSet(); - exporterSet->processFileModeFunc = ExporterProcessFileMode; - exporterSet->parseFileModeFunc = ExporterParseFileMode; - exporterSet->processCompilableFunc = ExporterProcessCompilable; - exporterSet->parseArgsFunc = ExporterParseArgs; - exporterSet->beginFileFunc = ExporterFileBegin; - exporterSet->endFileFunc = ExporterFileEnd; - exporterSet->beginXMLFunc = ExporterXMLBegin; - exporterSet->endXMLFunc = ExporterXMLEnd; - exporterSet->resSaveFunc = ExporterResourceEnd; - exporterSet->endProgramFunc = ExporterProgramEnd; - - exporterSet->exporters[ZResourceType::Background] = new OTRExporter_Background(); - exporterSet->exporters[ZResourceType::Texture] = new OTRExporter_Texture(); - exporterSet->exporters[ZResourceType::Room] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::AltHeader] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::Scene] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::CollisionHeader] = new OTRExporter_Collision(); - exporterSet->exporters[ZResourceType::DisplayList] = new OTRExporter_DisplayList(); - exporterSet->exporters[ZResourceType::PlayerAnimationData] = new OTRExporter_PlayerAnimationExporter(); - exporterSet->exporters[ZResourceType::Skeleton] = new OTRExporter_Skeleton(); - exporterSet->exporters[ZResourceType::Limb] = new OTRExporter_SkeletonLimb(); - exporterSet->exporters[ZResourceType::Animation] = new OTRExporter_Animation(); - exporterSet->exporters[ZResourceType::Cutscene] = new OTRExporter_Cutscene(); - exporterSet->exporters[ZResourceType::Vertex] = new OTRExporter_Vtx(); - exporterSet->exporters[ZResourceType::Array] = new OTRExporter_Array(); - exporterSet->exporters[ZResourceType::Path] = new OTRExporter_Path(); - exporterSet->exporters[ZResourceType::Text] = new OTRExporter_Text(); - exporterSet->exporters[ZResourceType::Blob] = new OTRExporter_Blob(); - exporterSet->exporters[ZResourceType::Mtx] = new OTRExporter_MtxExporter(); - exporterSet->exporters[ZResourceType::Audio] = new OTRExporter_Audio(); - - Globals::AddExporter("OTR", exporterSet); - - InitVersionInfo(); -} diff --git a/OTRExporter/OTRExporter/Main.h b/OTRExporter/OTRExporter/Main.h deleted file mode 100644 index 3aa68c7e1..000000000 --- a/OTRExporter/OTRExporter/Main.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include - -extern std::shared_ptr otrArchive; -extern std::map> files; - -void AddFile(std::string fName, std::vector data); \ No newline at end of file diff --git a/OTRExporter/OTRExporter/MtxExporter.cpp b/OTRExporter/OTRExporter/MtxExporter.cpp deleted file mode 100644 index 129e43aeb..000000000 --- a/OTRExporter/OTRExporter/MtxExporter.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "MtxExporter.h" - -void OTRExporter_MtxExporter::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZMtx* mtx = (ZMtx*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Matrix); - - for (size_t i = 0; i < 4; i++) - for (size_t j = 0; j < 4; j++) - //TODO possibly utilize the array class better - writer->Write(mtx->mtx[i][j]); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/MtxExporter.h b/OTRExporter/OTRExporter/MtxExporter.h deleted file mode 100644 index 895f2a40e..000000000 --- a/OTRExporter/OTRExporter/MtxExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#include "ZResource.h" -#include "ZMtx.h" -#include "Exporter.h" -#include - -class OTRExporter_MtxExporter : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; diff --git a/OTRExporter/OTRExporter/PathExporter.cpp b/OTRExporter/OTRExporter/PathExporter.cpp deleted file mode 100644 index cc507c7aa..000000000 --- a/OTRExporter/OTRExporter/PathExporter.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "PathExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Path::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZPath* path = (ZPath*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Path); - - writer->Write((uint32_t)path->pathways.size()); - - for (size_t k = 0; k < path->pathways.size(); k++) - { - writer->Write((uint32_t)path->pathways[k].points.size()); - - for (size_t i = 0; i < path->pathways[k].points.size(); i++) - { - writer->Write(path->pathways[k].points[i].scalars[0].scalarData.s16); - writer->Write(path->pathways[k].points[i].scalars[1].scalarData.s16); - writer->Write(path->pathways[k].points[i].scalars[2].scalarData.s16); - } - } -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/PathExporter.h b/OTRExporter/OTRExporter/PathExporter.h deleted file mode 100644 index 9614b84df..000000000 --- a/OTRExporter/OTRExporter/PathExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZPath.h" -#include "Exporter.h" -#include - -class OTRExporter_Path : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp b/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp deleted file mode 100644 index b735c4e42..000000000 --- a/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "PlayerAnimationExporter.h" -#include - -void OTRExporter_PlayerAnimationExporter::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZPlayerAnimationData* anim = (ZPlayerAnimationData*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_PlayerAnimation); - - auto start = std::chrono::steady_clock::now(); - - writer->Write((uint32_t)anim->limbRotData.size()); - - for (size_t i = 0; i < anim->limbRotData.size(); i++) - writer->Write(anim->limbRotData[i]); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //printf("Exported Player Anim %s in %zums\n", anim->GetName().c_str(), diff); -} diff --git a/OTRExporter/OTRExporter/PlayerAnimationExporter.h b/OTRExporter/OTRExporter/PlayerAnimationExporter.h deleted file mode 100644 index 49e5468a2..000000000 --- a/OTRExporter/OTRExporter/PlayerAnimationExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZPlayerAnimationData.h" -#include "Exporter.h" -#include - -class OTRExporter_PlayerAnimationExporter : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/RoomExporter.cpp b/OTRExporter/OTRExporter/RoomExporter.cpp deleted file mode 100644 index 3959d7639..000000000 --- a/OTRExporter/OTRExporter/RoomExporter.cpp +++ /dev/null @@ -1,521 +0,0 @@ -#include "RoomExporter.h" -#include "Utils/BinaryWriter.h" -#include "Utils/MemoryStream.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "CollisionExporter.h" -#include "DisplayListExporter.h" -#include -#include -#include -#include -#include "TextureExporter.h" -#include "Main.h" -#include -#include "CutsceneExporter.h" -#include -#include "PathExporter.h" -#undef FindResource - -void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZRoom* room = (ZRoom*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Room); - - writer->Write((uint32_t)room->commands.size()); - - for (size_t i = 0; i < room->commands.size(); i++) - { - ZRoomCommand* cmd = room->commands[i]; - - writer->Write((uint32_t)cmd->cmdID); - - switch (cmd->cmdID) - { - case RoomCommand::SetTransitionActorList: - { - SetTransitionActorList* cmdTrans = (SetTransitionActorList*)cmd; - - writer->Write((uint32_t)cmdTrans->transitionActors.size()); - - for (const TransitionActorEntry& entry : cmdTrans->transitionActors) - { - writer->Write(entry.frontObjectRoom); - writer->Write(entry.frontTransitionReaction); - writer->Write(entry.backObjectRoom); - writer->Write(entry.backTransitionReaction); - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotY); - writer->Write(entry.initVar); - } - } - break; - case RoomCommand::SetActorList: - { - SetActorList* cmdSetActorList = (SetActorList*)cmd; - - // There are instance of the amount of actors in the file differing from the size listed in the command. - // This can cause issues if we export actors with garbage data, so let's trust the command size - writer->Write((uint32_t)cmdSetActorList->numActors); - - for (const auto& entry : cmdSetActorList->actorList->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - } - break; - case RoomCommand::SetWind: - { - SetWind* cmdSetWind = (SetWind*)cmd; - - writer->Write(cmdSetWind->windWest); // 0x04 - writer->Write(cmdSetWind->windVertical); // 0x05 - writer->Write(cmdSetWind->windSouth); // 0x06 - writer->Write(cmdSetWind->clothFlappingStrength); // 0x07 - } - break; - case RoomCommand::SetTimeSettings: - { - SetTimeSettings* cmdTime = (SetTimeSettings*)cmd; - - writer->Write(cmdTime->hour); // 0x04 - writer->Write(cmdTime->min); // 0x05 - writer->Write(cmdTime->unk); // 0x06 - } - break; - case RoomCommand::SetSkyboxModifier: - { - SetSkyboxModifier* cmdSkybox = (SetSkyboxModifier*)cmd; - - writer->Write(cmdSkybox->disableSky); // 0x04 - writer->Write(cmdSkybox->disableSunMoon); // 0x05 - } - break; - case RoomCommand::SetEchoSettings: - { - SetEchoSettings* cmdEcho = (SetEchoSettings*)cmd; - - writer->Write((uint8_t)cmdEcho->echo); // 0x07 - } - break; - case RoomCommand::SetSoundSettings: - { - SetSoundSettings* cmdSound = (SetSoundSettings*)cmd; - - writer->Write((uint8_t)cmdSound->reverb); // 0x01 - - writer->Write(cmdSound->nightTimeSFX); // 0x06 - writer->Write(cmdSound->musicSequence); // 0x07 - } - break; - case RoomCommand::SetSkyboxSettings: - { - SetSkyboxSettings* cmdSkybox = (SetSkyboxSettings*)cmd; - - writer->Write((uint8_t)cmdSkybox->unk1); // 0x01 - writer->Write((uint8_t)cmdSkybox->skyboxNumber); // 0x04 - writer->Write((uint8_t)cmdSkybox->cloudsType); // 0x05 - writer->Write((uint8_t)cmdSkybox->isIndoors); // 0x06 - } - break; - case RoomCommand::SetRoomBehavior: - { - SetRoomBehavior* cmdRoom = (SetRoomBehavior*)cmd; - - writer->Write((uint8_t)cmdRoom->gameplayFlags); // 0x01 - writer->Write(cmdRoom->gameplayFlags2); // 0x04 - } - break; - case RoomCommand::SetCsCamera: - { - SetCsCamera* cmdCsCam = (SetCsCamera*)cmd; - - writer->Write((uint32_t)cmdCsCam->cameras.size()); - - for (size_t i = 0; i < cmdCsCam->cameras.size(); i++) - { - writer->Write(cmdCsCam->cameras[i].baseOffset); - writer->Write(cmdCsCam->cameras[i].type); - writer->Write(cmdCsCam->cameras[i].numPoints); - } - - writer->Write((uint32_t)cmdCsCam->points.size()); - - for (size_t i = 0; i < cmdCsCam->points.size(); i++) - { - writer->Write(cmdCsCam->points[i].scalars[0].scalarData.s16); - writer->Write(cmdCsCam->points[i].scalars[1].scalarData.s16); - writer->Write(cmdCsCam->points[i].scalars[2].scalarData.s16); - } - } - break; - case RoomCommand::SetMesh: - { - SetMesh* cmdMesh = (SetMesh*)cmd; - - writer->Write((uint8_t)cmdMesh->data); // 0x01 - writer->Write(cmdMesh->meshHeaderType); - - if (cmdMesh->meshHeaderType == 0 || cmdMesh->meshHeaderType == 2) - { - PolygonType2* poly = (PolygonType2*)cmdMesh->polyType.get(); - - writer->Write(poly->num); - - for (int i = 0; i < poly->num; i++) - WritePolyDList(writer, room, &poly->polyDLists[i]); - } - else if (cmdMesh->meshHeaderType == 1) - { - PolygonType1* poly = (PolygonType1*)cmdMesh->polyType.get(); - - writer->Write(poly->format); - - auto test = (PolygonDlist*)&poly->polyDLists[0]; - Declaration* dListDeclOpa = poly->parent->GetDeclaration(GETSEGOFFSET(test->opa)); - Declaration* dListDeclXlu = poly->parent->GetDeclaration(GETSEGOFFSET(test->xlu)); - - if (test->opa != 0) - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str())); - else - writer->Write(""); - - if (test->xlu != 0) - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclXlu->varName.c_str())); - else - writer->Write(""); - - if (poly->format == 2) - { - writer->Write((uint32_t)poly->count); - - for (int i = 0; i < poly->count; i++) - { - writer->Write(poly->multiList[i].unk_00); - writer->Write(poly->multiList[i].id); - - Declaration* bgDecl = poly->parent->GetDeclarationRanged(GETSEGOFFSET(poly->multiList[i].source)); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(poly->multiList[i].sourceBackground, bgDecl->varName)); - - writer->Write(poly->multiList[i].unk_0C); - writer->Write(poly->multiList[i].tlut); - writer->Write(poly->multiList[i].width); - writer->Write(poly->multiList[i].height); - writer->Write(poly->multiList[i].fmt); - writer->Write(poly->multiList[i].siz); - writer->Write(poly->multiList[i].mode0); - writer->Write(poly->multiList[i].tlutCount); - } - } - else - { - writer->Write((uint32_t)1); - - writer->Write(poly->single.unk_00); - writer->Write(poly->single.id); - - Declaration* bgDecl = poly->parent->GetDeclarationRanged(GETSEGOFFSET(poly->single.source)); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(poly->single.sourceBackground, bgDecl->varName)); - - writer->Write(poly->single.unk_0C); - writer->Write(poly->single.tlut); - writer->Write(poly->single.width); - writer->Write(poly->single.height); - writer->Write(poly->single.fmt); - writer->Write(poly->single.siz); - writer->Write(poly->single.mode0); - writer->Write(poly->single.tlutCount); - } - - if (poly->dlist != 0) - WritePolyDList(writer, room, &poly->polyDLists[0]); - } - } - break; - case RoomCommand::SetCameraSettings: - { - SetCameraSettings* cmdCam = (SetCameraSettings*)cmd; - - writer->Write((uint8_t)cmdCam->cameraMovement); // 0x01 - writer->Write(cmdCam->mapHighlight); // 0x04 - } - break; - case RoomCommand::SetLightList: - { - SetLightList* cmdLight = (SetLightList*)cmd; - - writer->Write((uint32_t)cmdLight->lights.size()); - - for (size_t i = 0; i < cmdLight->lights.size(); i++) - { - writer->Write(cmdLight->lights[i].type); - writer->Write(cmdLight->lights[i].x); - writer->Write(cmdLight->lights[i].y); - writer->Write(cmdLight->lights[i].z); - writer->Write(cmdLight->lights[i].r); - writer->Write(cmdLight->lights[i].g); - writer->Write(cmdLight->lights[i].b); - writer->Write(cmdLight->lights[i].drawGlow); - writer->Write(cmdLight->lights[i].radius); - } - } - break; - case RoomCommand::SetLightingSettings: - { - SetLightingSettings* cmdLight = (SetLightingSettings*)cmd; - - writer->Write((uint32_t)cmdLight->settings.size()); // 0x01 - - for (const LightingSettings& setting : cmdLight->settings) - { - writer->Write(setting.ambientClrR); - writer->Write(setting.ambientClrG); - writer->Write(setting.ambientClrB); - - writer->Write(setting.diffuseClrA_R); - writer->Write(setting.diffuseClrA_G); - writer->Write(setting.diffuseClrA_B); - - writer->Write(setting.diffuseDirA_X); - writer->Write(setting.diffuseDirA_Y); - writer->Write(setting.diffuseDirA_Z); - - writer->Write(setting.diffuseClrB_R); - writer->Write(setting.diffuseClrB_G); - writer->Write(setting.diffuseClrB_B); - - writer->Write(setting.diffuseDirB_X); - writer->Write(setting.diffuseDirB_Y); - writer->Write(setting.diffuseDirB_Z); - - writer->Write(setting.fogClrR); - writer->Write(setting.fogClrG); - writer->Write(setting.fogClrB); - - writer->Write(setting.unk); - writer->Write(setting.drawDistance); - } - } - break; - case RoomCommand::SetRoomList: - { - SetRoomList* cmdRoom = (SetRoomList*)cmd; - - writer->Write((uint32_t)cmdRoom->romfile->numRooms); // 0x01 - - for (size_t i = 0;i < cmdRoom->romfile->numRooms; i++) - { - //std::string roomName = StringHelper::Sprintf("%s/%s_room_%i", (StringHelper::Split(room->GetName(), "_")[0] + "_scene").c_str(), StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i); - std::string roomName = OTRExporter_DisplayList::GetPathToRes(room, StringHelper::Sprintf("%s_room_%i", StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i)); - writer->Write(roomName); - writer->Write(cmdRoom->romfile->rooms[i].virtualAddressStart); - writer->Write(cmdRoom->romfile->rooms[i].virtualAddressEnd); - } - } - break; - case RoomCommand::SetCollisionHeader: - { - SetCollisionHeader* cmdCollHeader = (SetCollisionHeader*)cmd; - - Declaration* colHeaderDecl = room->parent->GetDeclaration(cmdCollHeader->segmentOffset); - std::string path = OTRExporter_DisplayList::GetPathToRes(room, colHeaderDecl->varName); - writer->Write(path); - } - break; - case RoomCommand::SetEntranceList: - { - SetEntranceList* cmdEntrance = (SetEntranceList*)cmd; - - writer->Write((uint32_t)cmdEntrance->entrances.size()); - - for (EntranceEntry entry : cmdEntrance->entrances) - { - writer->Write((uint8_t)entry.startPositionIndex); - writer->Write((uint8_t)entry.roomToLoad); - } - } - break; - case RoomCommand::SetSpecialObjects: - { - SetSpecialObjects* cmdSpecObj = (SetSpecialObjects*)cmd; - - writer->Write((uint8_t)cmdSpecObj->elfMessage); // 0x01 - writer->Write((uint16_t)cmdSpecObj->globalObject); // 0x06 - } - break; - case RoomCommand::SetStartPositionList: - { - SetStartPositionList* cmdStartPos = (SetStartPositionList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint32_t)cmdStartPos->actors.size()); // 0x01 - - for (const ActorSpawnEntry& entry : cmdStartPos->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - } - break; - case RoomCommand::SetAlternateHeaders: - { - SetAlternateHeaders* cmdHeaders = (SetAlternateHeaders*)cmd; - - writer->Write((uint32_t)cmdHeaders->headers.size()); - - for (size_t i = 0; i < cmdHeaders->headers.size(); i++) - { - uint32_t seg = cmdHeaders->headers[i] & 0xFFFFFFFF; - std::string headerName = ""; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName, res->parent->workerID); - if (headerName == "NULL") - writer->Write(""); - else - { - std::string name = OTRExporter_DisplayList::GetPathToRes(room, headerName); - writer->Write(name); - } - } - } - break; - case RoomCommand::SetExitList: - { - SetExitList* cmdExit = (SetExitList*)cmd; - - writer->Write((uint32_t)cmdExit->exits.size()); - - for (size_t i = 0; i < cmdExit->exits.size(); i++) - writer->Write(cmdExit->exits[i]); - } - break; - case RoomCommand::SetObjectList: - { - SetObjectList* cmdSetObjectList = (SetObjectList*)cmd; - - writer->Write((uint32_t)cmdSetObjectList->objects.size()); - - for (size_t i = 0; i < cmdSetObjectList->objects.size(); i++) - writer->Write(cmdSetObjectList->objects[i]); - } - break; - case RoomCommand::SetCutscenes: - { - SetCutscenes* cmdSetCutscenes = (SetCutscenes*)cmd; - - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName, res->parent->workerID); - std::string fName = OTRExporter_DisplayList::GetPathToRes(room, listName); - //std::string fName = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), listName.c_str()); - writer->Write(fName); - - MemoryStream* csStream = new MemoryStream(); - BinaryWriter csWriter = BinaryWriter(csStream); - OTRExporter_Cutscene cs; - cs.Save(cmdSetCutscenes->cutscenes[0], "", &csWriter); - - AddFile(fName, csStream->ToVector()); - } - break; - case RoomCommand::SetPathways: - { - SetPathways* cmdSetPathways = (SetPathways*)cmd; - - writer->Write((uint32_t)cmdSetPathways->pathwayList.pathways.size()); - - for (size_t i = 0; i < cmdSetPathways->pathwayList.pathways.size(); i++) - { - Declaration* decl = room->parent->GetDeclaration(GETSEGOFFSET(cmdSetPathways->pathwayList.pathways[i].listSegmentAddress)); - //std::string path = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), decl->varName.c_str()); - std::string path = OTRExporter_DisplayList::GetPathToRes(room, decl->varName); - writer->Write(path); - - MemoryStream* pathStream = new MemoryStream(); - BinaryWriter pathWriter = BinaryWriter(pathStream); - OTRExporter_Path pathExp; - pathExp.Save(&cmdSetPathways->pathwayList, outPath, &pathWriter); - - AddFile(path, pathStream->ToVector()); - } - } - break; - case RoomCommand::EndMarker: - break; - default: - printf("UNIMPLEMENTED COMMAND: 0x%02X\n", (int)cmd->cmdID); - - break; - } - } -} - -void OTRExporter_Room::WritePolyDList(BinaryWriter* writer, ZRoom* room, PolygonDlist* dlist) -{ - writer->Write(dlist->polyType); - - switch (dlist->polyType) - { - case 2: - writer->Write(dlist->x); - writer->Write(dlist->y); - writer->Write(dlist->z); - writer->Write(dlist->unk_06); - [[fallthrough]]; - default: - //writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str())); - - if (dlist->opaDList != nullptr) - { - auto opaDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->opaDList->GetRawDataIndex())); - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), opaDecl->varName.c_str())); - } - else - writer->Write(""); - - if (dlist->xluDList != nullptr) - { - auto xluDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->xluDList->GetRawDataIndex())); - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), xluDecl->varName.c_str())); - } - else - writer->Write(""); - break; - } -} diff --git a/OTRExporter/OTRExporter/RoomExporter.h b/OTRExporter/OTRExporter/RoomExporter.h deleted file mode 100644 index f748658a5..000000000 --- a/OTRExporter/OTRExporter/RoomExporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "Exporter.h" -#include "ZRoom/ZRoom.h" - -class PolygonDlist; - -class OTRExporter_Room : public OTRExporter -{ -public: - void WritePolyDList(BinaryWriter* writer, ZRoom* room, PolygonDlist* dlist); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonExporter.cpp b/OTRExporter/OTRExporter/SkeletonExporter.cpp deleted file mode 100644 index fc4bba6fa..000000000 --- a/OTRExporter/OTRExporter/SkeletonExporter.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "SkeletonExporter.h" -#include -#include -#include "DisplayListExporter.h" - -void OTRExporter_Skeleton::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZSkeleton* skel = (ZSkeleton*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Skeleton); - - writer->Write((uint8_t)skel->type); - writer->Write((uint8_t)skel->limbType); - - writer->Write((uint32_t)skel->limbCount); - writer->Write((uint32_t)skel->dListCount); - - writer->Write((uint8_t)skel->limbsTable->limbType); - writer->Write((uint32_t)skel->limbsTable->count); - - for (size_t i = 0; i < skel->limbsTable->count; i++) - { - Declaration* skelDecl = skel->parent->GetDeclarationRanged(GETSEGOFFSET(skel->limbsTable->limbsAddresses[i])); - - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable->limbsAddresses[i], skel->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(res, name)); - } - else - { - writer->Write(""); - } - } -} diff --git a/OTRExporter/OTRExporter/SkeletonExporter.h b/OTRExporter/OTRExporter/SkeletonExporter.h deleted file mode 100644 index 36ffcf269..000000000 --- a/OTRExporter/OTRExporter/SkeletonExporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "ZSkeleton.h" -#include "Exporter.h" -#include - -class OTRExporter_Skeleton : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp b/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp deleted file mode 100644 index 1ee17c444..000000000 --- a/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp +++ /dev/null @@ -1,176 +0,0 @@ -#include "SkeletonLimbExporter.h" -#include "DisplayListExporter.h" -#include -#include - -void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZLimb* limb = (ZLimb*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_SkeletonLimb); - - writer->Write((uint8_t)limb->type); - writer->Write((uint8_t)limb->skinSegmentType); - - if (limb->skinSegmentType == ZLimbSkinType::SkinType_DList && limb->type == ZLimbType::Skin) - { - auto childDecl = limb->parent->GetDeclaration(GETSEGOFFSET(limb->skinSegment)); - - if (childDecl != nullptr) - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, childDecl->varName)); - else - writer->Write(""); - } - else - { - writer->Write(""); - } - - writer->Write((uint16_t)limb->segmentStruct.unk_0); - writer->Write((uint32_t)limb->segmentStruct.unk_4_arr.size()); - - for (auto item : limb->segmentStruct.unk_4_arr) - { - writer->Write(item.unk_4); - - writer->Write((uint32_t)item.unk_8_arr.size()); - - for (auto item2 : item.unk_8_arr) - { - writer->Write(item2.unk_0); - writer->Write(item2.unk_2); - writer->Write(item2.unk_4); - writer->Write(item2.unk_6); - writer->Write(item2.unk_7); - writer->Write(item2.unk_8); - writer->Write(item2.unk_9); - } - - writer->Write((uint32_t)item.unk_C_arr.size()); - - for (auto item2 : item.unk_C_arr) - { - writer->Write(item2.unk_0); - writer->Write(item2.x); - writer->Write(item2.y); - writer->Write(item2.z); - writer->Write(item2.unk_8); - } - } - - if (limb->segmentStruct.unk_8 != 0) - { - auto skinGfxDecl = limb->parent->GetDeclaration(GETSEGOFFSET(limb->segmentStruct.unk_8)); - - if (skinGfxDecl != nullptr) - { - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, skinGfxDecl->varName)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - writer->Write(limb->legTransX); - writer->Write(limb->legTransY); - writer->Write(limb->legTransZ); - writer->Write(limb->rotX); - writer->Write(limb->rotY); - writer->Write(limb->rotZ); - - if (limb->childPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->siblingPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->dListPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->dList2Ptr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - writer->Write(limb->transX); - writer->Write(limb->transY); - writer->Write(limb->transZ); - - writer->Write(limb->childIndex); - writer->Write(limb->siblingIndex); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonLimbExporter.h b/OTRExporter/OTRExporter/SkeletonLimbExporter.h deleted file mode 100644 index 000827443..000000000 --- a/OTRExporter/OTRExporter/SkeletonLimbExporter.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "ZSkeleton.h" -#include "ZLimb.h" -#include "Exporter.h" -#include - -class OTRExporter_SkeletonLimb : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextExporter.cpp b/OTRExporter/OTRExporter/TextExporter.cpp deleted file mode 100644 index 2fcfe8251..000000000 --- a/OTRExporter/OTRExporter/TextExporter.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "TextExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Text::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZText* txt = (ZText*)res; - - WriteHeader(txt, outPath, writer, LUS::ResourceType::SOH_Text); - - writer->Write((uint32_t)txt->messages.size()); - - for (size_t i = 0; i < txt->messages.size(); i++) - { - writer->Write(txt->messages[i].id); - writer->Write(txt->messages[i].textboxType); - writer->Write(txt->messages[i].textboxYPos); - writer->Write(txt->messages[i].msg); - } -} diff --git a/OTRExporter/OTRExporter/TextExporter.h b/OTRExporter/OTRExporter/TextExporter.h deleted file mode 100644 index 2eaf2ce71..000000000 --- a/OTRExporter/OTRExporter/TextExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZText.h" -#include "Exporter.h" -#include - -class OTRExporter_Text : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextureExporter.cpp b/OTRExporter/OTRExporter/TextureExporter.cpp deleted file mode 100644 index 77cc20955..000000000 --- a/OTRExporter/OTRExporter/TextureExporter.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "TextureExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Texture::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZTexture* tex = (ZTexture*)res; - - WriteHeader(tex, outPath, writer, LUS::ResourceType::Texture); - - auto start = std::chrono::steady_clock::now(); - - //printf("Exporting Texture %s\n", tex->GetName().c_str()); - - writer->Write((uint32_t)tex->GetTextureType()); - writer->Write((uint32_t)tex->GetWidth()); - writer->Write((uint32_t)tex->GetHeight()); - - writer->Write((uint32_t)tex->GetRawDataSize()); - - if (tex->parent != nullptr) { - auto data = tex->parent->GetRawData(); - writer->Write((char*)data.data() + tex->GetRawDataIndex(), tex->GetRawDataSize()); - } - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //printf("Exported Texture %s in %zums\n", tex->GetName().c_str(), diff); - - //if (diff > 2) - //printf("Export took %lms\n", diff); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextureExporter.h b/OTRExporter/OTRExporter/TextureExporter.h deleted file mode 100644 index cdf7491a8..000000000 --- a/OTRExporter/OTRExporter/TextureExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "Exporter.h" -#include - -class OTRExporter_Texture : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/VersionInfo.cpp b/OTRExporter/OTRExporter/VersionInfo.cpp deleted file mode 100644 index 50910bc31..000000000 --- a/OTRExporter/OTRExporter/VersionInfo.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "VersionInfo.h" -#include - -std::map resourceVersions; - -void InitVersionInfo() -{ - resourceVersions = std::map { - { LUS::ResourceType::SOH_Animation, 0 }, - { LUS::ResourceType::Texture, 0 }, - { LUS::ResourceType::SOH_PlayerAnimation, 0 }, - { LUS::ResourceType::DisplayList, 0 }, - { LUS::ResourceType::SOH_Room, 0 }, - { LUS::ResourceType::SOH_CollisionHeader, 0 }, - { LUS::ResourceType::SOH_Skeleton, 0 }, - { LUS::ResourceType::SOH_SkeletonLimb, 0 }, - { LUS::ResourceType::Matrix, 0 }, - { LUS::ResourceType::SOH_Path, 0 }, - { LUS::ResourceType::Vertex, 0 }, - { LUS::ResourceType::SOH_Cutscene, 0 }, - { LUS::ResourceType::Array, 0 }, - { LUS::ResourceType::SOH_Text, 0 }, - { LUS::ResourceType::Blob, 0 }, - }; -} diff --git a/OTRExporter/OTRExporter/VersionInfo.h b/OTRExporter/OTRExporter/VersionInfo.h deleted file mode 100644 index 03f8417f2..000000000 --- a/OTRExporter/OTRExporter/VersionInfo.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include -#include -#include "src/resource/Resource.h" - -extern std::map resourceVersions; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/VtxExporter.cpp b/OTRExporter/OTRExporter/VtxExporter.cpp deleted file mode 100644 index 009545d77..000000000 --- a/OTRExporter/OTRExporter/VtxExporter.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "VtxExporter.h" -#include -#include "VersionInfo.h" - - -void OTRExporter_Vtx::SaveArr(ZResource* res, const fs::path& outPath, const std::vector& vec, BinaryWriter* writer) -{ - WriteHeader(res, outPath, writer, LUS::ResourceType::Vertex); - - for (auto& res: vec) { - ZVtx* vtx = (ZVtx*)res; - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); - } - -} - -void OTRExporter_Vtx::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZVtx* vtx = (ZVtx*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Vertex); - - writer->Write((uint32_t)1); //Yes I'm hard coding it to one, it *should* be fine. - - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); -} diff --git a/OTRExporter/OTRExporter/VtxExporter.h b/OTRExporter/OTRExporter/VtxExporter.h deleted file mode 100644 index 433aadd2c..000000000 --- a/OTRExporter/OTRExporter/VtxExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZVtx.h" -#include "Exporter.h" -#include - -class OTRExporter_Vtx : public OTRExporter -{ -public: - void SaveArr(ZResource* res, const fs::path& outPath, const std::vector&, BinaryWriter* writer); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/command_macros_base.h b/OTRExporter/OTRExporter/command_macros_base.h deleted file mode 100644 index 3067d2ce1..000000000 --- a/OTRExporter/OTRExporter/command_macros_base.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef COMMAND_MACROS_BASE_H -#define COMMAND_MACROS_BASE_H - -/** - * Command Base macros intended for use in designing of more specific command macros - * Each macro packs bytes (B), halfwords (H) and words (W, for consistency) into a single word - */ - -#define _SHIFTL(v, s, w) \ - ((unsigned int) (((unsigned int)(v) & ((0x01 << (w)) - 1)) << (s))) -#define _SHIFTR(v, s, w) \ - ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1))) - -//#define CMD_BBBB(a, b, c, d) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 8, 8) | _SHIFTL(d, 0, 8)) -#define CMD_BBBB(a, b, c, d) (_SHIFTL(d, 24, 8) | _SHIFTL(c, 16, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)) - -//#define CMD_BBH(a, b, c) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 0, 16)) -#define CMD_BBH(a, b, c) (_SHIFTL(a, 0, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 16, 16)) - -//#define CMD_HBB(a, b, c) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 0, 8)) -#define CMD_HBB(a, b, c) (_SHIFTL(c, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(a, 0, 16)) - -//#define CMD_HH(a, b) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 0, 16)) -#define CMD_HH(a, b) (_SHIFTL(b, 16, 16) | _SHIFTL(a, 0, 16)) - -#define CMD_W(a) (a) - -#if defined(__GNUC__) -#define CMD_F(a) {.f = (a)} -#else -#define CMD_F(a) {(a)} -#endif - -#define CMD_PTR(a) (u32)(a) - -#endif \ No newline at end of file diff --git a/OTRExporter/OTRExporter/z64cutscene.h b/OTRExporter/OTRExporter/z64cutscene.h deleted file mode 100644 index d5eb89482..000000000 --- a/OTRExporter/OTRExporter/z64cutscene.h +++ /dev/null @@ -1,290 +0,0 @@ -#ifndef Z64CUTSCENE_H -#define Z64CUTSCENE_H - -#if 0 -#include - -typedef struct { - /* 0x00 */ u16 entrance; // entrance index upon which the cutscene should trigger - /* 0x02 */ u8 ageRestriction; // 0 for adult only, 1 for child only, 2 for both ages - /* 0x03 */ u8 flag; // eventChkInf flag bound to the entrance cutscene - /* 0x04 */ void* segAddr; // segment offset location of the cutscene -} EntranceCutscene; // size = 0x8 - -typedef struct { - /* 0x00 */ s8 continueFlag; - /* 0x01 */ s8 cameraRoll; - /* 0x02 */ u16 nextPointFrame; - /* 0x04 */ f32 viewAngle; // in degrees - /* 0x08 */ Vec3s pos; -} CutsceneCameraPoint; // size = 0x10 - -typedef struct { - /* 0x00 */ Vec3f at; - /* 0x0C */ Vec3f eye; - /* 0x18 */ s16 roll; - /* 0x1A */ s16 fov; -} CutsceneCameraAngle; // size = 0x1C - -typedef struct { - /* 0x0 */ CutsceneCameraPoint* atPoints; - /* 0x4 */ CutsceneCameraPoint* eyePoints; - /* 0x8 */ s16 relativeToPlayer; -} CutsceneCameraMove; // size = 0xC - -typedef struct { - /* 0x00 */ u16 base; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdBase; // size = 0x6 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 setting; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdEnvLighting; // size = 0x6 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 sequence; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdMusicChange; // size = 0x6 - -typedef struct { - /* 0x00 */ u16 type; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdMusicFade; // size = 0x6 - -typedef struct { - /* 0x00 */ u16 unk_00; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u8 unk_06; - /* 0x07 */ u8 unk_07; - /* 0x08 */ u8 unk_08; -} CsCmdUnknown9; // size = 0xA - -typedef struct { - /* 0x00 */ u16 unk_00; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u8 hour; - /* 0x07 */ u8 minute; -} CsCmdDayTime; // size = 0x8 - -typedef struct { - /* 0x00 */ u16 base; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u16 type; - /* 0x08 */ u16 textId1; - /* 0x0A */ u16 textId2; -} CsCmdTextbox; // size = 0xC - -typedef struct { - /* 0x00 */ u16 action; // "dousa" - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - union { - /* 0x06 */ Vec3s rot; - /* 0x06 */ Vec3us urot; - }; - /* 0x0C */ Vec3i startPos; - /* 0x18 */ Vec3i endPos; - /* 0x24 */ Vec3i normal; -} CsCmdActorAction; // size = 0x30 -#endif - -typedef enum { - CS_STATE_IDLE, - CS_STATE_SKIPPABLE_INIT, - CS_STATE_SKIPPABLE_EXEC, - CS_STATE_UNSKIPPABLE_INIT, - CS_STATE_UNSKIPPABLE_EXEC -} CutsceneState; - -typedef enum { - CS_CMD_00 = 0x0000, - CS_CMD_CAM_EYE = 0x0001, - CS_CMD_CAM_AT = 0x0002, - CS_CMD_MISC = 0x0003, - CS_CMD_SET_LIGHTING = 0x0004, - CS_CMD_CAM_EYE_REL_TO_PLAYER = 0x0005, - CS_CMD_CAM_AT_REL_TO_PLAYER = 0x0006, - CS_CMD_07 = 0x0007, - CS_CMD_08 = 0x0008, - CS_CMD_09 = 0x0009, - CS_CMD_TEXTBOX = 0x0013, - CS_CMD_SET_PLAYER_ACTION = 0x000A, - CS_CMD_SET_ACTOR_ACTION_1 = 0x000F, - CS_CMD_SET_ACTOR_ACTION_2 = 0x000E, - CS_CMD_SET_ACTOR_ACTION_3 = 0x0019, - CS_CMD_SET_ACTOR_ACTION_4 = 0x001D, - CS_CMD_SET_ACTOR_ACTION_5 = 0x001E, - CS_CMD_SET_ACTOR_ACTION_6 = 0x002C, - CS_CMD_SET_ACTOR_ACTION_7 = 0x001F, - CS_CMD_SET_ACTOR_ACTION_8 = 0x0031, - CS_CMD_SET_ACTOR_ACTION_9 = 0x003E, - CS_CMD_SET_ACTOR_ACTION_10 = 0x008F, - CS_CMD_SCENE_TRANS_FX = 0x002D, - CS_CMD_NOP = 0x000B, - CS_CMD_PLAYBGM = 0x0056, - CS_CMD_STOPBGM = 0x0057, - CS_CMD_FADEBGM = 0x007C, - CS_CMD_SETTIME = 0x008C, - CS_CMD_TERMINATOR = 0x03E8, - CS_CMD_END = 0xFFFF -} CutsceneCmd; - -/** - * Special type for blocks of cutscene data, asm-processor checks - * arrays for CutsceneData type and converts floats within the array - * to their IEEE-754 representation. The array must close with }; - * on its own line. - * - * Files that contain this type that are included in other C files - * must include an 'EARLY' qualifier to inform asm-processor that it - * must recursively process that include. - * - * Example: #include "file.c" EARLY - */ - - -typedef union CutsceneData { - int i; - float f; - short s[2]; - char b[4]; -} CutsceneData; - -#define CS_CMD_CONTINUE 0 -#define CS_CMD_STOP -1 - -// TODO confirm correctness, clarify names -typedef enum { - /* 0x00 */ INVALID_DESTINATION_0, - /* 0x01 */ CUTSCENE_MAP_GANON_HORSE, - /* 0x02 */ CUTSCENE_MAP_THREE_GODESSES_POST_DEKU_TREE, - /* 0x03 */ GERUDO_VALLEY_DIN, - /* 0x04 */ DEATH_MOUNTAIN_TRAIL_NAYRU, - /* 0x05 */ KOKIRI_FOREST_FARORE, - /* 0x06 */ CUTSCENE_MAP_TRIFORCE_CREATION, - /* 0x07 */ KOKIRI_FOREST_RECEIVE_KOKIRI_EMERALD, - /* 0x08 */ TEMPLE_OF_TIME_AFTER_USE_MS, - /* 0x09 */ GERUDO_VALLEY_DIN_2, - /* 0x0A */ LINKS_HOUSE_INTRO, - /* 0x0B */ KOKIRI_FOREST_INTRO, - /* 0x0C */ DEATH_MOUNTAIN_TRAIL_AFTER_GORON_RUBY, - /* 0x0D */ ZORAS_FOUNTAIN_AFTER_ZORAS_SAPPHIRE, - /* 0x0E */ KOKIRI_FOREST_AFTER_KOKIRI_EMERALD, - /* 0x0F */ TEMPLE_OF_TIME_KOKIRI_EMERALD, //unused - /* 0x10 */ TEMPLE_OF_TIME_GORON_RUBY, //unused - /* 0x11 */ TEMPLE_OF_TIME_ZORAS_SAPPHIRE, //unused - /* 0x12 */ TEMPLE_OF_TIME_AFTER_USE_MS_FIRST, - /* 0x13 */ DEATH_MOUNTAIN_TRAIL_AFTER_INTRO, - /* 0x14 */ INVALID_DESTINATION_14, - /* 0x15 */ LAKE_HYLIA_WATER_RISES, - /* 0x16 */ DESERT_COLOSSUS_REQUIEM, - /* 0x17 */ CUTSCENE_MAP_CURSE_YOU, - /* 0x18 */ JABU_JABU_INTRO, - /* 0x19 */ CHAMBER_OF_SAGES_LIGHT_MEDALLION, - /* 0x1A */ TEMPLE_OF_TIME_KOKIRI_EMERALD_2, //duplicate of 0x000F - /* 0x1B */ TEMPLE_OF_TIME_GORON_RUBY_2, //duplicate of 0x0010 - /* 0x1C */ TEMPLE_OF_TIME_ZORAS_SAPPHIRE_2, //duplicate of 0x0011 - /* 0x1D */ CHAMBER_OF_SAGES_FOREST_MEDALLION, - /* 0x1E */ CHAMBER_OF_SAGES_FIRE_MEDALLION, - /* 0x1F */ CHAMBER_OF_SAGES_WATER_MEDALLION, - /* 0x20 */ HYRULE_FIELD_FLASHBACK, //lacs part 4 - /* 0x21 */ HYRULE_FIELD_AFTER_LAKE_HYLIA_OWL, - /* 0x22 */ CUTSCENE_MAP_GANON_AFTER_USE_MS, - /* 0x23 */ HYRULE_FIELD_INTRO_ZELDA_ESCAPE, - /* 0x24 */ INVALID_DESTINATION_24, - /* 0x25 */ INVALID_DESTINATION_25, - /* 0x26 */ CUTSCENE_MAP_SHEIKAH_LEGEND, //lacs part 2 - /* 0x27 */ TEMPLE_OF_TIME_ZELDA_REVEAL, //lacs part 3 - /* 0x28 */ TEMPLE_OF_TIME_GET_LIGHT_ARROWS, //lacs part 5 - /* 0x29 */ LAKE_HYLIA_AFTER_BLUE_WARP, - /* 0x2A */ KAKARIKO_VILLAGE_DRAIN_WELL, - /* 0x2B */ WINDMILL_AFTER_DRAIN_WELL, - /* 0x2C */ TEMPLE_OF_TIME_AFTER_DOOR_OF_TIME_OPENS, - /* 0x2D */ INVALID_DESTINATION_2D, - /* 0x2E */ TEMPLE_OF_TIME_AFTER_USE_MS_FIRST_2, // duplicate of 0x0012 - /* 0x2F */ KAKARIKO_VILLAGE_NOCTURNE_PART_2, - /* 0x30 */ DESERT_COLOSSUS_AFTER_REQUIEM, - /* 0x31 */ TEMPLE_OF_TIME_AFTER_LIGHT_ARROWS, - /* 0x32 */ KAKARIKO_VILLAGE_AFTER_NOCTURNE, - /* 0x33 */ HYRULE_FIELD_IMPA_ESCORT_CS, - /* 0x34 */ TEMPLE_OF_TIME_SONG_OF_TIME, - /* 0x35 */ HYRULE_FIELD_AFTER_SONG_OF_TIME, - /* 0x36 */ GERUDO_VALLEY_CREDITS, - /* 0x37 */ GERUDO_FORTRESS_CREDITS, - /* 0x38 */ KAKARIKO_VILLAGE_CREDITS, - /* 0x39 */ DEATH_MOUNTAIN_TRAIL_CREDITS_1, - /* 0x3A */ GORON_CITY_CREDITS, // unused? - /* 0x3B */ LAKE_HYLIA_CREDITS, - /* 0x3C */ ZORAS_FOUNTAIN_CREDITS, // unused - /* 0x3D */ ZORAS_DOMAIN_CREDITS, - /* 0x3E */ KOKIRI_FOREST_CREDITS_1, - /* 0x3F */ KOKIRI_FOREST_CREDITS_2, - /* 0x40 */ HYRULE_FIELD_CREDITS, - /* 0x41 */ LON_LON_RANCH_CREDITS_1, - /* 0x42 */ KAKARIKO_VILLAGE_AFTER_TRAIL_OWL, - /* 0x43 */ HTRULE_FIELD_UNUSED_ENTRANCE, - /* 0x44 */ CUTSCENE_MAP_FIRE, - /* 0x45 */ KOKIRI_FOREST_POST_FOREST_MEDALLION, - /* 0x46 */ DEATH_MOUNTAIN_TRAIL_CREDITS_2, - /* 0x47 */ TEMPLE_OF_TIME_CREDITS, - /* 0x48 */ ZELDAS_COURTYARD_CREDITS, - /* 0x49 */ LON_LON_RANCH_CREDITS_1_2, // duplicate of 0x0041 - /* 0x4A */ LON_LON_RANCH_CREDITS_2, - /* 0x4B */ LON_LON_RANCH_CREDITS_3, - /* 0x4C */ LON_LON_RANCH_CREDITS_4, - /* 0x4D */ LON_LON_RANCH_CREDITS_5, - /* 0x4E */ LON_LON_RANCH_CREDITS_6, - /* 0x4F */ LON_LON_RANCH_NO_CS_1, - /* 0x50 */ LON_LON_RANCH_NO_CS_2, - /* 0x51 */ LON_LON_RANCH_NO_CS_3, - /* 0x52 */ LON_LON_RANCH_NO_CS_4, - /* 0x53 */ LON_LON_RANCH_NO_CS_5, - /* 0x54 */ LON_LON_RANCH_NO_CS_6, - /* 0x55 */ LON_LON_RANCH_NO_CS_7, - /* 0x56 */ LON_LON_RANCH_NO_CS_8, - /* 0x57 */ LON_LON_RANCH_NO_CS_9, - /* 0x58 */ LON_LON_RANCH_NO_CS_10, - /* 0x59 */ LON_LON_RANCH_NO_CS_11, - /* 0x5A */ LON_LON_RANCH_NO_CS_12, - /* 0x5B */ LON_LON_RANCH_NO_CS_13, - /* 0x5C */ LON_LON_RANCH_NO_CS_14, - /* 0x5D */ LON_LON_RANCH_NO_CS_15, - /* 0x5E */ LON_LON_RANCH_NO_CS_EPONAS_SONG, - /* 0x5F */ CONDITIONAL_DESTINATION, // TODO more descriptive name? - /* 0x60 */ DESERT_COLOSSUS_SPIRIT_BLUE_WARP, - /* 0x61 */ GRAVEYARD_AFTER_SHADOW_BLUE_WARP, - /* 0x62 */ DEATH_MOUNTAIN_CRATER_AFTER_FIRE_BLUE_WARP, - /* 0x63 */ SACRED_FOREST_MEADOW_AFTER_FOREST_BLUE_WARP, - /* 0x64 */ KOKIRI_FOREST_AFTER_FOREST_BLUE_WARP, - /* 0x65 */ DESERT_COLOSSUS_AFTER_SILVER_GAUNTLETS, - /* 0x66 */ TEMPLE_OF_TIME_FRONT_OF_PEDESTAL, - /* 0x67 */ HYRULE_FIELD_TITLE_SCREEN, - /* 0x68 */ SPIRIT_TEMPLE_BOSS_TITLE_SCREEN, - /* 0x69 */ GRAVEYARD_SUNS_SONG, - /* 0x6A */ ROYAL_FAMILYS_TOMB_SUNS_SONG, - /* 0x6B */ GANONS_CASTLE_AFTER_FOREST_TRIAL, - /* 0x6C */ GANONS_CASTLE_AFTER_WATER_TRIAL, - /* 0x6D */ GANONS_CASTLE_AFTER_SHADOW_TRIAL, - /* 0x6E */ GANONS_CASTLE_AFTER_FIRE_TRIAL, - /* 0x6F */ GANONS_CASTLE_AFTER_LIGHT_TRIAL, - /* 0x70 */ GANONS_CASTLE_AFTER_SPIRIT_TRIAL, - /* 0x71 */ GANONS_CASTLE_DISPEL_BARRIER_IF_CONDITIONS, - /* 0x72 */ HYRULE_FIELD_INTRO, - /* 0x73 */ HYRULE_FIELD_AFTER_IMPA_ESCORT, - /* 0x74 */ DESERT_COLOSSUS_SPIRIT_BLUE_WARP_2, - /* 0x75 */ HYRULE_FIELD_SKY, - /* 0x76 */ GANON_BATTLE_TOWER_COLLAPSE, - /* 0x77 */ ZELDAS_COURTYARD_RECEIVE_LETTER -} CutsceneTerminatorDestination; - -#endif \ No newline at end of file diff --git a/OTRExporter/OTRExporter/z64cutscene_commands.h b/OTRExporter/OTRExporter/z64cutscene_commands.h deleted file mode 100644 index 5d440cce9..000000000 --- a/OTRExporter/OTRExporter/z64cutscene_commands.h +++ /dev/null @@ -1,448 +0,0 @@ -#ifndef Z64CUTSCENE_COMMANDS_H -#define Z64CUTSCENE_COMMANDS_H - -#include "command_macros_base.h" -#include "z64cutscene.h" - -/** - * ARGS - * s32 totalEntries (e), s32 endFrame (n) - * FORMAT - * eeeeeeee nnnnnnnn - * size = 0x8 - */ -#define CS_BEGIN_CUTSCENE(totalEntries, endFrame) CMD_W(totalEntries), CMD_W(endFrame) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * 00000001 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_POS_LIST CS_CAM_EYE_LIST -#define CS_CAM_EYE_LIST(startFrame, endFrame) \ - CS_CMD_CAM_EYE, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_POS CS_CAM_EYE -#define CS_CAM_EYE(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * 00000002 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_FOCUS_POINT_LIST CS_CAM_AT_LIST -#define CS_CAM_AT_LIST(startFrame, endFrame) \ - CS_CMD_CAM_AT, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_FOCUS_POINT CS_CAM_AT -#define CS_CAM_AT(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000003 eeeeeeee - * size = 0x8 - */ -#define CS_MISC_LIST(entries) CS_CMD_MISC, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * uuuussss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * size = 0x30 - */ -#define CS_MISC(unk, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8, unused9, unused10) \ - CMD_HH(unk, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), CMD_W(unused8), CMD_W(unused9), CMD_W(unused10) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000004 eeeeeeee - * size = 0x8 - */ -#define CS_LIGHTING_LIST(entries) CS_CMD_SET_LIGHTING, CMD_W(entries) - - /** - * ARGS - * s16 setting (m), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * mmmmssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_LIGHTING(setting, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(setting, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , may be consistently zero - * 00000005 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_POS_PLAYER_LIST CS_CAM_EYE_REL_TO_PLAYER_LIST -#define CS_CAM_EYE_REL_TO_PLAYER_LIST(startFrame, endFrame) \ - CS_CMD_CAM_EYE_REL_TO_PLAYER, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_POS_PLAYER CS_CAM_EYE_REL_TO_PLAYER -#define CS_CAM_EYE_REL_TO_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , may be consistently zero - * 00000006 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_FOCUS_POINT_PLAYER_LIST CS_CAM_AT_REL_TO_PLAYER_LIST -#define CS_CAM_AT_REL_TO_PLAYER_LIST(startFrame, endFrame) \ - CS_CMD_CAM_AT_REL_TO_PLAYER, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_FOCUS_POINT_PLAYER CS_CAM_AT_REL_TO_PLAYER -#define CS_CAM_AT_REL_TO_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * 00000007 uuuussss eeeeUUUU - * size = 0xC - */ -#define CS_CMD_07_LIST(unk, startFrame, endFrame, unused) \ - CS_CMD_07, CMD_HH(unk, startFrame), CMD_HH(endFrame, unused) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CMD_07(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * 00000008 uuuussss eeeeUUUU - * size = 0xC - */ -#define CS_CMD_08_LIST(unk, startFrame, endFrame, unused) \ - CS_CMD_08, CMD_HH(unk, startFrame), CMD_HH(endFrame, unused) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CMD_08(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000009 eeeeeeee - * size = 0x8 - */ -#define CS_CMD_09_LIST(entries) CS_CMD_09, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e), s16 unk2 (v), s16 unk3 (w), s16 unk4 (x) - * FORMAT - * Capital U is Unused - * uuuussss eeeevvww xxUUUUUU - * size = 0xC - */ -#define CS_CMD_09(unk, startFrame, endFrame, unk2, unk3, unk4, unused0, unused1) \ - CMD_HH(unk, startFrame), CMD_HBB(endFrame, unk2, unk3), CMD_BBH(unk4, unused0, unused1) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_UNK_DATA_LIST(cmdType, entries) CMD_W(cmdType), CMD_W(entries) - - /** - * ARGS - * s32 unk1 (a), s32 unk2 (b), s32 unk3 (c), s32 unk4 (d), s32 unk5 (e), s32 unk6 (f), - * s32 unk7 (g), s32 unk8 (h), s32 unk9 (i), s32 unk10 (j), s32 unk11 (k), s32 unk12 (l) - * FORMAT - * aaaaaaaa bbbbbbbb cccccccc dddddddd eeeeeeee ffffffff gggggggg hhhhhhhh iiiiiiii jjjjjjjj kkkkkkkk llllllll - * size = 0x30 - */ -#define CS_UNK_DATA(unk1, unk2, unk3, unk4, unk5, unk6, unk7, unk8, unk9, unk10, unk11, unk12) \ - CMD_W(unk1), CMD_W(unk2), CMD_W(unk3), CMD_W(unk4), CMD_W(unk5), CMD_W(unk6), \ - CMD_W(unk7), CMD_W(unk8), CMD_W(unk9), CMD_W(unk10), CMD_W(unk11), CMD_W(unk12) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_NPC_ACTION_LIST(cmdType, entries) CMD_W(cmdType), CMD_W(entries) - - /** - * ARGS - * s16 npcAction (a), s16 startFrame (s), s16 endFrame (e), - * s16 rotX (u), s16 rotY (v), s16 rotZ (w), - * s32 startX (i), s32 startY (j), s32 startZ (k), - * s32 endX (l), s32 endY (m), s32 endZ (n), - * f32 normX (x), f32 normY (y), f32 normZ (z), - * FORMAT - * aaaassss eeeeuuuu vvvvwwww iiiiiiii jjjjjjjj kkkkkkkk llllllll mmmmmmmm nnnnnnnn xxxxxxxx yyyyyyyy zzzzzzzz - * size = 0x30 - */ -#define CS_NPC_ACTION(npcAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) \ - CMD_HH(npcAction, startFrame), CMD_HH(endFrame, rotX), CMD_HH(rotY, rotZ), \ - CMD_W(startX), CMD_W(startY), CMD_W(startZ), \ - CMD_W(endX), CMD_W(endY), CMD_W(endZ), \ - CMD_F(normX), CMD_F(normY), CMD_F(normZ) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_PLAYER_ACTION_LIST(entries) CS_CMD_SET_PLAYER_ACTION, CMD_W(entries) - - /** - * ARGS - * s16 linkAction (a), s16 startFrame (s), s16 endFrame (e), - * s16 rotX (u), s16 rotY (v), s16 rotZ (w), - * s32 startX (i), s32 startY (j), s32 startZ (k), - * s32 endX (l), s32 endY (m), s32 endZ (n), - * f32 normX (x), f32 normY (y), f32 normZ (z), - * FORMAT - * aaaassss eeeeuuuu vvvvwwww iiiiiiii jjjjjjjj kkkkkkkk llllllll mmmmmmmm nnnnnnnn xxxxxxxx yyyyyyyy zzzzzzzz - * size = 0x30 - */ -#define CS_PLAYER_ACTION(linkAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) \ - CS_NPC_ACTION(linkAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000013 eeeeeeee - * size = 0x8 - */ -#define CS_TEXT_LIST(entries) CS_CMD_TEXTBOX, CMD_W(entries) - - /** - * ARGS - * s16 messageId (i), s16 startFrame (s), s16 endFrame (e), s16 type (o), - * s16 topOptionBranch (y), s16 bottomOptionBranch (n) - * FORMAT - * iiiissss eeeeoooo yyyynnnn - * size = 0xC - */ -#define CS_TEXT_DISPLAY_TEXTBOX(messageId, startFrame, endFrame, type, topOptionBranch, bottomOptionBranch) \ - CMD_HH(messageId, startFrame), CMD_HH(endFrame, type), CMD_HH(topOptionBranch, bottomOptionBranch) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * FFFFssss eeeeFFFF FFFFFFFF - * size = 0xC - */ -#define CS_TEXT_NONE(startFrame, endFrame) \ - CS_TEXT_DISPLAY_TEXTBOX(0xFFFF, startFrame, endFrame, 0xFFFF, 0xFFFF, 0xFFFF) - - /** - * ARGS - * s16 ocarinaSongAction (o), s16 startFrame (s), s16 endFrame (e), s16 topOptionBranch (i) - * FORMAT - * oooossss eeee0002 iiiiFFFF - * size = 0xC - */ -#define CS_TEXT_LEARN_SONG(ocarinaSongAction, startFrame, endFrame, messageId) \ - CS_TEXT_DISPLAY_TEXTBOX(ocarinaSongAction, startFrame, endFrame, 0x0002, messageId, 0xFFFF) - - /** - * ARGS - * s16 transitionType (t), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , endFrame duplicate - * 0000002D 00000001 ttttssss eeeeUUUU - * size = 0x10 - */ -#define CS_SCENE_TRANS_FX(transitionType, startFrame, endFrame) \ - CS_CMD_SCENE_TRANS_FX, 0x00000001, CMD_HH(transitionType, startFrame), CMD_HH(endFrame, endFrame) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000056 eeeeeeee - * size = 0x8 - */ -#define CS_PLAY_BGM_LIST(entries) CS_CMD_PLAYBGM, CMD_W(entries) - - /** - * ARGS - * s16 sequence (q), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * qqqqssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_PLAY_BGM(sequence, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(sequence, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000057 eeeeeeee - * size = 0x8 - */ -#define CS_STOP_BGM_LIST(entries) CS_CMD_STOPBGM, CMD_W(entries) - - /** - * ARGS - * s16 sequence (q), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * uuqqssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_STOP_BGM(sequence, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(sequence, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 0000007C eeeeeeee - * size = 0x8 - */ -#define CS_FADE_BGM_LIST(entries) CS_CMD_FADEBGM, CMD_W(entries) - - /** - * ARGS - * s16 fadeType (t), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * ttttssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_FADE_BGM(fadeType, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(fadeType, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 0000008C eeeeeeee - * size = 0x8 - */ -#define CS_TIME_LIST(entries) CS_CMD_SETTIME, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e), s8 hour (h), s8 min (m) - * FORMAT - * Capital U is Unused - * uuuussss eeeehhmm UUUUUUUU - * size = 0xC - */ -#define CS_TIME(unk, startFrame, endFrame, hour, min, unused) \ - CMD_HH(unk, startFrame), \ - CMD_HBB(endFrame, hour, min), \ - CMD_W(unused) - - /** - * ARGS - * CutsceneTerminatorDestination dest (d), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , endFrame duplicate - * 000003E8 00000001 ddddssss eeeeUUUU - * size = 0x10 - */ -#define CS_TERMINATOR(dest, startFrame, endFrame) \ - CS_CMD_TERMINATOR, 0x00000001, CMD_HH(dest, startFrame), CMD_HH(endFrame, endFrame) - - /** - * Marks the end of a cutscene - */ -#define CS_END() 0xFFFFFFFF, 0x00000000 - -#endif \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/filechoose_eng.json b/OTRExporter/assets/accessibility/texts/filechoose_eng.json deleted file mode 100644 index b43719926..000000000 --- a/OTRExporter/assets/accessibility/texts/filechoose_eng.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "file1": "File 1", - "file2": "File 2", - "file3": "File 3", - "options": "Options", - "copy": "Copy", - "erase": "Erase", - "quit": "Quit", - "confirm": "Yes", - "end": "End", - "hyphen": "Hyphen", - "period": "Period", - "space": "Space", - "backspace": "Backspace", - "capital_letter": "Capital $0", - "audio_stereo": "Sound - Stereo", - "audio_mono": "Sound - Mono", - "audio_headset": "Sound - Headset", - "audio_surround": "Sound - Surround", - "target_switch": "Targeting Mode - Switch", - "target_hold": "Targeting Mode - Hold", - "language_english": "Language - English", - "language_german": "Language - German", - "language_french": "Language - French", - "quest_sel_vanilla": "Quest - Original", - "quest_sel_mq": "Quest - Master Quest", - "quest_sel_randomizer": "Quest - Randomizer", - "quest_sel_boss_rush": "Quest - Boss Rush" -} \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/filechoose_fra.json b/OTRExporter/assets/accessibility/texts/filechoose_fra.json deleted file mode 100644 index f76861f21..000000000 --- a/OTRExporter/assets/accessibility/texts/filechoose_fra.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "file1": "Fichier 1", - "file2": "Fichier 2", - "file3": "Fichier 3", - "options": "Options", - "copy": "Copier", - "erase": "Effacer", - "quit": "Retour", - "confirm": "Oui", - "end": "Fin", - "hyphen": "Trait d'union", - "period": "Point", - "space": "Espace", - "backspace": "Retour arrière", - "capital_letter": "Majuscule $0", - "audio_stereo": "Son - Stéréo", - "audio_mono": "Son - Mono", - "audio_headset": "Son - Casque", - "audio_surround": "Son - Surround", - "target_switch": "Visée - Fixe", - "target_hold": "Visée - Maintenue", - "language_english": "Langue - Anglaise", - "language_german": "Langue - Allemande", - "language_french": "Langue - Français", - "quest_sel_vanilla": "Quête - Originale", - "quest_sel_mq": "Quête - Master Quest", - "quest_sel_randomizer": "Quête - Randomizer", - "quest_sel_boss_rush": "Quête - Boss Rush" -} \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/filechoose_ger.json b/OTRExporter/assets/accessibility/texts/filechoose_ger.json deleted file mode 100644 index 2ad1322fd..000000000 --- a/OTRExporter/assets/accessibility/texts/filechoose_ger.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "file1": "Datei 1", - "file2": "Datei 2", - "file3": "Datei 3", - "options": "Optionen", - "copy": "Kopieren", - "erase": "Löschen", - "quit": "Zurück", - "confirm": "Ja", - "end": "Ende", - "hyphen": "Bindestrich", - "period": "Punkt", - "space": "Raum", - "backspace": "Rücktaste", - "capital_letter": "Großbuchstabe $0", - "audio_stereo": "Sound - Stereo", - "audio_mono": "Sound - Mono", - "audio_headset": "Sound - Kopfhörer", - "audio_surround": "Sound - Surround", - "target_switch": "Zielerfassung - Einmal drücken", - "target_hold": "Zielerfassung - Trigger halten", - "language_english": "Sprache - Englisch", - "language_german": "Sprache - Deutsch", - "language_french": "Sprache - Französisch", - "quest_sel_vanilla": "Quest - Original", - "quest_sel_mq": "Quest - Master Quest", - "quest_sel_randomizer": "Quest - Randomizer", - "quest_sel_boss_rush": "Quest - Bosse Rush" -} \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json b/OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json deleted file mode 100644 index 10b016b32..000000000 --- a/OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "health": "Health - $0 Hearts", - "magic": "Magic - $0", - "rupees": "Rupees - $0", - "floor": "Floor $0", - "basement": "Basement $0", - "item_menu": "Select Item", - "map_menu": "Map - $0", - "quest_menu": "Quest Status", - "equip_menu": "Equipment", - "overworld": "Overworld", - "equipped": "$0 - Equipped", - "save_prompt": "Would you like to save?", - "game_saved": "Game saved", - "assigned_to": "Assigned to $0", - "0": "Deku Stick - $0", - "1": "Deku Nut - $0", - "2": "Bomb - $0", - "3": "Fairy Bow - $0", - "4": "Fire Arrow", - "5": "Din's Fire", - "6": "Fairy Slingshot - $0", - "7": "Fairy Ocarina", - "8": "Ocarina of Time", - "9": "Bombchu - $0", - "10": "Hookshot", - "11": "Longshot", - "12": "Ice Arrow", - "13": "Farore's Wind", - "14": "Boomerang", - "15": "Lens of Truth", - "16": "Magic Beans - $0", - "17": "Megaton Hammer", - "18": "Light Arrow", - "19": "Nayru's Love", - "20": "Empty Bottle", - "21": "Red Potion", - "22": "Green Potion", - "23": "Blue Potion", - "24": "Fairy", - "25": "Fish", - "26": "Milk Bottle", - "27": "Ruto's Letter", - "28": "Blue Fire", - "29": "Bugs", - "30": "Big Poe", - "31": "Milk Bottle (Half)", - "32": "Poe", - "33": "Weird Egg", - "34": "Chicken", - "35": "Zelda's Letter", - "36": "Keaton Mask", - "37": "Skull Mask", - "38": "Spooky Mask", - "39": "Bunny Mask", - "40": "Goron Mask", - "41": "Zora Mask", - "42": "Gerudo Mask", - "43": "Mask of Truth", - "44": "Sold Out", - "45": "Pocket Egg", - "46": "Pocket Cucco", - "47": "Cojiro", - "48": "Odd Mushroom", - "49": "Odd Potion", - "50": "Saw", - "51": "Broken Sword", - "52": "Prescription", - "53": "Eyeball Frog", - "54": "Eyedrops", - "55": "Claim Check", - "56": "Bow Fire Arrow", - "57": "Bow Ice Arrow", - "58": "Bow Light Arrow", - "59": "Kokiri Sword", - "60": "Master Sword", - "61": "Giant's Knife", - "62": "Deku Shield", - "63": "Hylian Shield", - "64": "Mirror Shield", - "65": "Kokiri Tunic", - "66": "Goron Tunic", - "67": "Zora Tunic", - "68": "Kokiri Boots", - "69": "Iron Boots", - "70": "Hover Boots", - "71": "Bullet Bag (Holds 30)", - "72": "Bullet Bag (Holds 40)", - "73": "Bullet Bag (Holds 50)", - "74": "Quiver (Holds 30)", - "75": "Quiver (Holds 40)", - "76": "Quiver (Holds 50)", - "77": "Bomb Bag (Holds 20)", - "78": "Bomb Bag (Holds 30)", - "79": "Bomb Bag (Holds 40)", - "80": "Goron's Bracelet", - "81": "Silver Gauntlets", - "82": "Golden Gauntlets", - "83": "Silver Scale", - "84": "Golden Scale", - "85": "Giant's Knife (Broken)", - "86": "WALLET ADULT", - "87": "Giant's Wallet", - "88": "Deku Seeds", - "89": "Fishing Pole", - "90": "Minuet of Forest", - "91": "Bolero of Fire", - "92": "Serenade of Water", - "93": "Requiem of Spirit", - "94": "Nocturne of Shadow", - "95": "Prelude of Light", - "96": "Zelda's Lullaby", - "97": "Epona's Song", - "98": "Saria's Song", - "99": "Sun's Song", - "100": "Song of Time", - "101": "Song of Storms", - "102": "Forest Medallion", - "103": "Fire Medallion", - "104": "Water Medallion", - "105": "Spirit Medallion", - "106": "Shadow Medallion", - "107": "Light Medallion", - "108": "Kokiri's Emerald", - "109": "Goron's Ruby", - "110": "Zora Sapphire", - "111": "Stone of Agony", - "112": "Gerudo's Card", - "113": "Skulltula Token - $0", - "114": "Piece of Heart - $0", - "115": "Piece of Heart", - "116": "Boss Key", - "117": "Compass", - "118": "Dungeon Map", - "119": "Small Key", - "120": "MAGIC SMALL", - "121": "MAGIC LARGE", - "122": "Biggoron's Sword", - "123": "INVALID 1", - "124": "INVALID 2", - "125": "INVALID 3", - "126": "INVALID 4", - "127": "INVALID 5", - "128": "INVALID 6", - "129": "INVALID 7", - "130": "Milk", - "131": "Recovery Heart", - "132": "Green Rupee", - "133": "Blue Rupee", - "134": "Red Rupee", - "135": "Purple Rupee", - "136": "Gold Rupee", - "137": "INVALID 8", - "138": "STICKS 5", - "139": "STICKS 10", - "140": "NUTS 5", - "141": "NUTS 10", - "142": "BOMBS 5", - "143": "BOMBS 10", - "144": "BOMBS 20", - "145": "BOMBS 30", - "146": "ARROWS SMALL", - "147": "ARROWS MEDIUM", - "148": "ARROWS LARGE", - "149": "SEEDS 30", - "150": "BOMBCHUS 5", - "151": "BOMBCHUS 20", - "152": "STICK UPGRADE 20", - "153": "STICK UPGRADE 30", - "154": "NUT UPGRADE 30", - "155": "NUT UPGRADE 40", - "255": "", - "256": "Haunted Wasteland", - "257": "Gerudos Fortress", - "258": "Gerudo Valley", - "259": "Hylia Lakeside", - "260": "Lon Lon Ranch", - "261": "Market", - "262": "Hyrule Field", - "263": "Death Mountain", - "264": "Kakariko Village", - "265": "Lost Woods", - "266": "Kokiri Forest", - "267": "Zoras Domain", - "268": "", - "269": "", - "270": "", - "271": "", - "272": "", - "273": "", - "274": "", - "275": "", - "276": "", - "277": "", - "278": "", - "279": "", - "280": "", - "281": "", - "282": "", - "283": "", - "284": "", - "285": "", - "286": "", - "287": "", - "288": "", - "289": "", - "290": "", - "291": "", - "292": "Hyrule Field", - "293": "Kakariko Village", - "294": "Graveyard", - "295": "Zoras River", - "296": "Kokiri Forest", - "297": "Sacred Forest Meadow", - "298": "Lake Hylia", - "299": "Zoras Domain", - "300": "Zoras Fountain", - "301": "Gerudo Valley", - "302": "Lost Woods", - "303": "Desert Colossus", - "304": "Gerudo's Fortress", - "305": "Haunted Wasteland", - "306": "Market", - "307": "Hyrule Castle", - "308": "Death Mountain Trail", - "309": "Death Mountain Crater", - "310": "Goron City", - "311": "Lon Lon Ranch", - "312": "Question Mark", - "313": "Ganon's Castle" -} diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json b/OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json deleted file mode 100644 index 820eb4cbc..000000000 --- a/OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "health": "Vie - $0 Coeurs", - "magic": "Magie - $0", - "rupees": "Rubis - $0", - "floor": "Étage $0", - "basement": "Sous-sol $0", - "item_menu": "Inventaire", - "map_menu": "Carte - $0", - "quest_menu": "Statut de la quête", - "equip_menu": "Equipment", - "overworld": "Surmonde", - "equipped": "$0 - Équipé", - "save_prompt": "Voulez-vous sauvegarder?", - "game_saved": "Jeu sauvegardé", - "assigned_to": "Assigné au $0", - "0": "Bâton Mojo - $0", - "1": "Noix Mojo - $0", - "2": "Bombes - $0", - "3": "Arc des Fées - $0", - "4": "Flèche de Feu", - "5": "Feu de Din", - "6": "Lance-Pierre des Fées - $0", - "7": "Ocarina des Fées", - "8": "Ocarina of Temps", - "9": "Missiles Teigneux - $0", - "10": "Grappin", - "11": "Super Grappin", - "12": "Flèche de Glace", - "13": "Vent de Farore", - "14": "Boomerang", - "15": "Monocle de Vérité", - "16": "Haricot Magique - $0", - "17": "Masse des Titans", - "18": "Flèche de Lumière", - "19": "Amour de Nayru", - "20": "Bouteille Vide", - "21": "Potion Rouge", - "22": "Potion Verte", - "23": "Potion Bleue", - "24": "Fée", - "25": "Poisson", - "26": "Lait de Lon Lon", - "27": "Lettre de Ruto", - "28": "Flammme Bleue", - "29": "Insectes", - "30": "Âme", - "31": "Lait de Lon Lon (moitié)", - "32": "Esprit", - "33": "Oeuf Curieux", - "34": "Poulet", - "35": "Lettre de Zelda", - "36": "Masque du Renard", - "37": "Masque de Mort", - "38": "Masque d'Effroi", - "39": "Masque du Lapin", - "40": "Masque de Goron", - "41": "Masque de Zora", - "42": "Masque de Gerudo", - "43": "Masque de Vérité", - "44": "VENDU", - "45": "Oeuf de Poche", - "46": "Cocotte de poche", - "47": "P'tit Poulet", - "48": "Champignon suspect", - "49": "Mixture suspecte", - "50": "Scie du chasseur", - "51": "Épée de Goron (brisée)", - "52": "Ordonnance", - "53": "Crapaud-qui-louche", - "54": "Gouttes", - "55": "Certificat", - "56": "Arc et Flèche de Feu", - "57": "Arc et Flèche de Glace", - "58": "Arc et Flèche de Lumière", - "59": "Épée Kokiri", - "60": "Épée de Légende", - "61": "Lame des Géants", - "62": "Bouclier Mojo", - "63": "Bouclier Hylien", - "64": "Bouclier Miroir", - "65": "Tunique Kokiri", - "66": "Tunique Goron", - "67": "Tunique Zora", - "68": "Bottes Kokiri", - "69": "Bottes de plomb", - "70": "Bottes des airs", - "71": "Sac de graines (Contient 30)", - "72": "Sac de graines (Contient 40)", - "73": "Sac de graines (Contient 50)", - "74": "Carquois (Contient 30)", - "75": "Carquois (Contient 40)", - "76": "Carquois (Contient 50)", - "77": "Sac de bombes (Contient 20)", - "78": "Sac de bombes (Contient 30)", - "79": "Sac de bombes (Contient 40)", - "80": "Bracelet Goron", - "81": "Gantelets d'argent", - "82": "Gentelets d'or", - "83": "Écaille d'argent", - "84": "Écaille d'or", - "85": "Lame des Géants (Brisée)", - "86": "GRANDE BOURSE", - "87": "Bourse de Géant", - "88": "Deku Seeds", - "89": "Canne à pèche", - "90": "Menuet des Bois", - "91": "Boléro du Feu", - "92": "Sérénade de l'Eau", - "93": "Requiem des Esprits", - "94": "Nocturne de l'Ombre", - "95": "Prélude de la Lumière", - "96": "Berceuse de Zelda", - "97": "Chant d'Epona", - "98": "Chant de Saria", - "99": "Chant du Soleil", - "100": "Chant du Temps", - "101": "Chant des Tempêtes", - "102": "Médaillon de la Forêt", - "103": "Médaillon du Feu", - "104": "Médaillon de l'Eau", - "105": "Médaillon de l'Esprit", - "106": "Médaillon de l'Ombre", - "107": "Médaillon de la Lumière", - "108": "Émeraude Kokiri", - "109": "Rubis Goron", - "110": "Saphir Zora", - "111": "Pierre de Souffrance", - "112": "Carte Gerudo", - "113": "Skulltula d'or - $0", - "114": "Quart de Coeur - $0", - "115": "Quart de Coeur", - "116": "Clé d'or", - "117": "Boussole", - "118": "Carte du Donjon", - "119": "Petite Clé", - "120": "PETITE BOUTEILLE DE MAGIE", - "121": "GRANDE BOUTEILLE DE MAGIE", - "122": "Épée de Biggoron", - "123": "INVALIDE 1", - "124": "INVALIDE 2", - "125": "INVALIDE 3", - "126": "INVALIDE 4", - "127": "INVALIDE 5", - "128": "INVALIDE 6", - "129": "INVALIDE 7", - "130": "Lait de Lon Lon", - "131": "Coeur de Vie", - "132": "Rubis Vert", - "133": "Rubis Bleu", - "134": "Rubis Rouge", - "135": "Rubis Pourpre", - "136": "Énorme Rubis", - "137": "INVALIDE 8", - "138": "BÂTON MOJO 5", - "139": "BÂTON MOJO 10", - "140": "NOIX MOJO 5", - "141": "NOIX MOJO 10", - "142": "BOMBES 5", - "143": "BOMBES 10", - "144": "BOMBES 20", - "145": "BOMBES 30", - "146": "ARROWS SMALL", - "147": "ARROWS MEDIUM", - "148": "ARROWS LARGE", - "149": "GRAINES MOJO 30", - "150": "MISSILES TEIGNEUX 5", - "151": "MISSILES TEIGNEUX 20", - "152": "AMÉLIORATION BÂTON MOJO 20", - "153": "AMÉLIORATION BÂTON MOJO 30", - "154": "AMÉLIORATION NOIX MOJO 30", - "155": "AMÉLIORATION NOIX MOJO 40", - "255": "", - "256": "Désert Hanté", - "257": "Forteresse Gerudo", - "258": "Vallée Gerudo", - "259": "Laboratoire du Lac", - "260": "Ranch Lon Lon", - "261": "Place du Marché", - "262": "Plaine d'Hyrule", - "263": "Montagne du Péril", - "264": "Village Cocorico", - "265": "Bois Perdus", - "266": "Forêt Kokiri", - "267": "Domaine Zora", - "268": "", - "269": "", - "270": "", - "271": "", - "272": "", - "273": "", - "274": "", - "275": "", - "276": "", - "277": "", - "278": "", - "279": "", - "280": "", - "281": "", - "282": "", - "283": "", - "284": "", - "285": "", - "286": "", - "287": "", - "288": "", - "289": "", - "290": "", - "291": "", - "292": "Plaine d'Hyrule", - "293": "Village Cocorico", - "294": "Cimetière", - "295": "Rivière Zora", - "296": "Forêt Kokiri", - "297": "Bosquet Sacré", - "298": "Lac Hylia", - "299": "Domaine Zora", - "300": "Fountaine Zora", - "301": "Vallée Gerudo", - "302": "Bois Perdus", - "303": "Colosse du Désert", - "304": "Forteresse Gerudo", - "305": "Désert Hanté", - "306": "Place du Marché", - "307": "Château d'Hyrule", - "308": "Chemin du Péril", - "309": "Cratère du Péril", - "310": "Village Goron", - "311": "Ranch Lon Lon", - "312": "Point d'interrogation", - "313": "Château de Ganon" -} diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json b/OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json deleted file mode 100644 index 630d933fc..000000000 --- a/OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "health": "Energie - $0 Herzen", - "magic": "Magie - $0", - "rupees": "Rubine - $0", - "floor": "Etage $0", - "basement": "Keller $0", - "item_menu": "Gegenstände", - "map_menu": "Karte - $0", - "quest_menu": "Quest Status", - "equip_menu": "Ausrüstung", - "overworld": "Überwelt", - "equipped": "$0 - Ausgerüstet", - "save_prompt": "Spielstand sichern?", - "game_saved": "Spielstand gesichert", - "assigned_to": "$0 zugeordnet", - "0": "Deku-Stab - $0", - "1": "Deku-Nuß - $0", - "2": "Bombe - $0", - "3": "Feen-Bogen - $0", - "4": "Feuer-Pfeil", - "5": "Dins Feuerinferno", - "6": "Feen-Schleuder - $0", - "7": "Feen-Okarina", - "8": "Okarina der Zeit", - "9": "Krabbelmine - $0", - "10": "Fanghaken", - "11": "Enterhaken", - "12": "Eis-Pfeil", - "13": "Farores Donnersturm", - "14": "Bumerang", - "15": "Auge der Wahrheit", - "16": "Wundererbsen - $0", - "17": "Stahlhammer", - "18": "Licht-Pfeil", - "19": "Nayrus Umarmung", - "20": "Flasche", - "21": "Rotes Elixier", - "22": "Grünes Elixier", - "23": "Blaues Elixier", - "24": "Fee", - "25": "Fisch", - "26": "Milch", - "27": "Brief", - "28": "Blaues Feuer", - "29": "Käfer", - "30": "Nachtschwärmer", - "31": "Milch (1/2)", - "32": "Irrlicht", - "33": "Seltsames Ei", - "34": "Huhn", - "35": "Zeldas Brief", - "36": "Fuchs-Maske", - "37": "Schädel-Maske", - "38": "Geister-Maske", - "39": "Hasenohren", - "40": "Goronen-Maske", - "41": "Zora-Maske", - "42": "Gerudo-Maske", - "43": "Maske des Wissens", - "44": "Verkauft", - "45": "Ei", - "46": "Kiki", - "47": "Henni", - "48": "Schimmelpilz", - "49": "Modertrank", - "50": "Säge", - "51": "Goronen-Schwert (zerbrochen)", - "52": "Rezept", - "53": "Glotzfrosch", - "54": "Augentropfen", - "55": "Zertifikat", - "56": "Bogen Feuer-Pfeil", - "57": "Bogen Eis-Pfeil", - "58": "Bogen Licht-Pfeil", - "59": "Kokiri-Schwert", - "60": "Master-Schwert", - "61": "Langschwert", - "62": "Deku-schild", - "63": "Hylia-Schild", - "64": "Spiegel-Schild", - "65": "Kokiri-Rüstung", - "66": "Goronen-Rüstung", - "67": "Zora-Rüstung", - "68": "Lederstiefel", - "69": "Eisenstiefel", - "70": "Gleitstiefel", - "71": "Munitionstasche (30)", - "72": "Munitionstasche (40)", - "73": "Munitionstasche (50)", - "74": "Köcher (30)", - "75": "Köcher (40)", - "76": "Köcher (50)", - "77": "Bombentasche (20)", - "78": "Bombentasche (30)", - "79": "Bombentasche (40)", - "80": "Goronen-Armband", - "81": "Krafthandschuh", - "82": "Titanhandschuh", - "83": "Silberschuppe", - "84": "Goldschuppe", - "85": "Langschwert (gebrochen)", - "86": "Große Börse", - "87": "Riesenbörse", - "88": "Deku-Kerne", - "89": "Angel", - "90": "Menuett des Waldes", - "91": "Bolero des Feuers", - "92": "Serenade des Wassers", - "93": "Requiem der Geister", - "94": "Nocturne des Schattens", - "95": "Kantate des Lichts", - "96": "Zeldas Wiegenlied", - "97": "Eponas Lied", - "98": "Salias Lied", - "99": "Hymne der Sonne", - "100": "Hymne der Zeit", - "101": "Song of Storms", - "102": "Amulett des Waldes", - "103": "Amulett des Feuers", - "104": "Amulett des Wassers", - "105": "Amulett der Geister", - "106": "Amulett des Schattens", - "107": "Amulett des Lichts", - "108": "Kokiri-Smaragd", - "109": "Goronen-Opal", - "110": "Zora-Saphir", - "111": "Stein des Wissens", - "112": "Gerudo-Paß", - "113": "Skulltula-Symbol - $0", - "114": "Herzteil - $0", - "115": "Herzteil", - "116": "Master-Schlüssel", - "117": "Kompaß", - "118": "Labyrinth-Karte", - "119": "Kleiner Schlüssel", - "120": "MAGIE KLEIN", - "121": "MAGIE GROß", - "122": "Biggoron-Schwert", - "123": "UNGÜLTIG 1", - "124": "UNGÜLTIG 2", - "125": "UNGÜLTIG 3", - "126": "UNGÜLTIG 4", - "127": "UNGÜLTIG 5", - "128": "UNGÜLTIG 6", - "129": "UNGÜLTIG 7", - "130": "Milch", - "131": "Herz", - "132": "ein Rubin", - "133": "5 Rubine", - "134": "20 Rubine", - "135": "50 Rubine", - "136": "200 Rubine", - "137": "UNGÜLTIG 8", - "138": "STÄBE 5", - "139": "STÄBE 10", - "140": "NÜSSE 5", - "141": "NÜSSE 10", - "142": "BOMBEN 5", - "143": "BOMBEN 10", - "144": "BOMBEN 20", - "145": "BOMBEN 30", - "146": "PFEILE KLEIN", - "147": "PFEILE MITTEL", - "148": "PFEILE GROß", - "149": "KERNE 30", - "150": "KRABBELMINEN 5", - "151": "KRABBELMINEN 20", - "152": "STAB UPGRADE 20", - "153": "STAB UPGRADE 30", - "154": "NUß UPGRADE 30", - "155": "NUß UPGRADE 40", - "255": "", - "256": "Gespensterwüste", - "257": "Gerudo-Festung", - "258": "Gerudotal", - "259": "Hylia-See", - "260": "Lon Lon-Farm", - "261": "Marktplatz", - "262": "Hylianische Steppe", - "263": "Todesberg", - "264": "Kakariko", - "265": "Verlorene Wälder", - "266": "Kokiri-Wald", - "267": "Zoras Reich", - "268": "", - "269": "", - "270": "", - "271": "", - "272": "", - "273": "", - "274": "", - "275": "", - "276": "", - "277": "", - "278": "", - "279": "", - "280": "", - "281": "", - "282": "", - "283": "", - "284": "", - "285": "", - "286": "", - "287": "", - "288": "", - "289": "", - "290": "", - "291": "", - "292": "Hylianische Steppe", - "293": "Kakariko", - "294": "Friedhof", - "295": "Zora-Fluss", - "296": "Kokiri-Wald", - "297": "Heilige Lichtung", - "298": "Hylia-See", - "299": "Zoras Reich", - "300": "Zoras Quelle", - "301": "Gerudotal", - "302": "Verlorene Wälder", - "303": "Wüstenkoloss", - "304": "Gerudo-Festung", - "305": "Gespensterwüste", - "306": "Marktplatz", - "307": "Schloß Hyrule", - "308": "Pfad zum Todesberg", - "309": "Todeskrater", - "310": "Goronia", - "311": "Lon Lon-Farm", - "312": "Fragezeichen", - "313": "Teufelsturm" -} diff --git a/OTRExporter/assets/accessibility/texts/misc_eng.json b/OTRExporter/assets/accessibility/texts/misc_eng.json deleted file mode 100644 index 6bff3b328..000000000 --- a/OTRExporter/assets/accessibility/texts/misc_eng.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "minutes_plural" : "$0 minutes", - "minutes_singular" : "$0 minute", - "seconds_plural" : "$0 seconds", - "seconds_singular" : "$0 second", - "input_button_a": "the A button", - "input_button_b": "the B button", - "input_button_c": "the C button", - "input_button_l": "the L button", - "input_button_r": "the R button", - "input_button_z": "the Z button", - "input_button_c_up": "C Up", - "input_button_c_down": "C Down", - "input_button_c_left": "C Left", - "input_button_c_right": "C Right", - "input_analog_stick": "the Analog Stick", - "input_d_pad": "the D-Pad", - "input_d_pad_up": "D-Pad Up", - "input_d_pad_down": "D-Pad Down", - "input_d_pad_left": "D-Pad Left", - "input_d_pad_right": "D-Pad Right", - "yes": "Yes", - "no": "No" -} diff --git a/OTRExporter/assets/accessibility/texts/misc_fra.json b/OTRExporter/assets/accessibility/texts/misc_fra.json deleted file mode 100644 index 0d9073e50..000000000 --- a/OTRExporter/assets/accessibility/texts/misc_fra.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "minutes_plural" : "$0 minutes", - "minutes_singular" : "$0 minute", - "seconds_plural" : "$0 secondes", - "seconds_singular" : "$0 seconde", - "input_button_a": "le bouton A", - "input_button_b": "le bouton B", - "input_button_c": "le bouton C", - "input_button_l": "le bouton L", - "input_button_r": "le bouton R", - "input_button_z": "le bouton Z", - "input_button_c_up": "C Haut", - "input_button_c_down": "C Bas", - "input_button_c_left": "C Gauche", - "input_button_c_right": "C Droit", - "input_analog_stick": "le Stick Analogique", - "input_d_pad": "D-Pad", - "input_d_pad_up": "D-Pad Haut", - "input_d_pad_down": "D-Pad Bas", - "input_d_pad_left": "D-Pad Gauche", - "input_d_pad_right": "D-Pad Droit", - "yes": "Oui", - "no": "Non" -} diff --git a/OTRExporter/assets/accessibility/texts/misc_ger.json b/OTRExporter/assets/accessibility/texts/misc_ger.json deleted file mode 100644 index 2e07143f0..000000000 --- a/OTRExporter/assets/accessibility/texts/misc_ger.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "minutes_plural" : "$0 Minuten", - "minutes_singular" : "eine Minute", - "seconds_plural" : "$0 Sekunden", - "seconds_singular" : "eine Sekunde", - "input_button_a": "den A-Knopf", - "input_button_b": "den B-Knopf", - "input_button_c": "den C-Knopf", - "input_button_l": "den L-Knopf", - "input_button_r": "den R-Knopf", - "input_button_z": "den Z-Knopf", - "input_button_c_up": "C Oben", - "input_button_c_down": "C Unten", - "input_button_c_left": "C Links", - "input_button_c_right": "C Rechts", - "input_analog_stick": "den Analog-Stick", - "input_d_pad": "das Steuerkreuz", - "input_d_pad_up": "Steuerkreuz Oben", - "input_d_pad_down": "Steuerkreuz Unten", - "input_d_pad_left": "Steuerkreuz Links", - "input_d_pad_right": "Steuerkreuz Rechts", - "yes": "Ja", - "no": "Nein" -} diff --git a/OTRExporter/assets/accessibility/texts/scenes_eng.json b/OTRExporter/assets/accessibility/texts/scenes_eng.json deleted file mode 100644 index 7f9397bbf..000000000 --- a/OTRExporter/assets/accessibility/texts/scenes_eng.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "0": "Inside the Deku Tree", - "1": "Dodongo's Cavern", - "2": "Inside Jabu-Jabu's Belly", - "3": "Forest Temple", - "4": "Fire Temple", - "5": "Water Temple", - "6": "Spirit Temple", - "7": "Shadow Temple", - "8": "Bottom of The Well", - "9": "Ice Cavern", - "10": "", // Stairs to Ganondorf's Lair (No title card) - "11": "Gerudo Training Ground", - "12": "Thieves' Hideout", - "13": "Ganon's Castle", - "14": "", // Escape from Ganon's Castle (No title card) - "15": "", // Escape from Ganon's Castle 5 (No title card)x - "16": "Treasure Box Shop", - "17": "Parasitic Armored Arachnid - Gohma", - "18": "Infernal Dinosaur - King Dodongo", - "19": "Bio-electric Anemone - Barinade", - "20": "Evil Spirit from Beyond - Phantom Ganon", - "21": "Subterranean Lava Dragon - Volvagia", - "22": "Giant Aquatic Amoeba - Morpha", - "23": "Sorceress Sisters - Twinrova", - "24": "Phantom Shadow Beast - Bongo Bongo", - "25": "Great King of Evil - Ganondorf", - "26": "", - "27": "", // Entrance to Market (No title card) - "28": "", - "29": "", - "30": "Back Alley", - "31": "Back Alley", - "32": "Market", - "33": "Market", - "34": "Market", - "35": "", // Temple of Time Exterior (No title card) - "36": "SCENE_SHRINE_N", - "37": "SCENE_SHRINE_R", - "38": "", // House of the Know-it-All Brothers (No title card) - "39": "", // House of Twins (No title card) - "40": "", // House of the Great Mido (No title card) - "41": "", // Saria's House (No title card) - "42": "", // Kakariko House 1 (No title card) - "43": "", // Back Alley House 1 (No title card) - "44": "Bazaar", - "45": "Kokiri Shop", - "46": "Goron Shop", - "47": "Zora Shop", - "48": "", // Closed Shop (No title card) - "49": "Potion Shop", - "50": "", // Bombchu Shop (No title card) - "51": "Happy Mask Shop", - "52": "", // Link's House (No title card) - "53": "", // Dog Lady's House (No title card) - "54": "Stable", - "55": "", // Impa's House (No title card) - "56": "Lakeside Laboratory", - "57": "", // Running Man's Tent (No title card) - "58": "Gravekeepers Hut", - "59": "Great Fairy's Fountain", - "60": "Fairy's Fountain", - "61": "Great Fairy's Fountain", - "62": "", // Grottos (No title card) - "63": "", // Tomb 1 (No title card) - "64": "", // Tomb 2 (No title card) - "65": "Royal Family's Tomb", - "66": "Shooting Gallery", - "67": "Temple of Time", - "68": "Chamber of The Sages", - "69": "Castle Courtyard", - "70": "Castle Courtyard", - "71": "", // Goddesses Cutscene (No title card) - "72": "Unknown Place", - "73": "Fishing Pond", - "74": "Castle Courtyard", - "75": "Bombchu Bowling Alley", - "76": "", // Lon Lon Ranch House/Silo (No title card) - "77": "", // Guard House (No title card) - "78": "", // Potion Shop (No title card) - "79": "Ganon", - "80": "House of Skulltula", - "81": "Hyrule Field", - "82": "Kakariko Village", - "83": "Graveyard", - "84": "Zora's River", - "85": "Kokiri Forest", - "86": "Sacred Forest Meadow", - "87": "Lake Hylia", - "88": "Zoras Domain", - "89": "Zoras Fountain", - "90": "Gerudo Valley", - "91": "Lost Woods", - "92": "Desert Colossus", - "93": "Gerudo's Fortress", - "94": "Haunted Wasteland", - "95": "Hyrule Castle", - "96": "Death Mountain Trail", - "97": "Death Mountain Crater", - "98": "Goron City", - "99": "Lon Lon Ranch", - "100": "", - "101": "", // Debug: Test Map (No title card) - "102": "", // Debug: Test Room (No title card) - "103": "", // Debug: Depth Test (No title card) - "104": "", // Debug: Stalfos Miniboss Room (No title card) - "105": "", // Debug: Stalfos Boss Room (No title card) - "106": "", // Debug: Dark Link Room (No title card) - "107": "", - "108": "", // Debug: SRD Room (No title card) - "109": "" // Debug: Treasure Chest Warp (No title card) -} \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/scenes_fra.json b/OTRExporter/assets/accessibility/texts/scenes_fra.json deleted file mode 100644 index fa36c8840..000000000 --- a/OTRExporter/assets/accessibility/texts/scenes_fra.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "0": "Abre Mojo", - "1": "Caverne Dodongo", - "2": "Ventre de Jabu-Jabu", - "3": "Temple de la Forêt", - "4": "Temple du Feu", - "5": "Temple de l'Eau", - "6": "Temple de l'Esprit", - "7": "Temple de l'Ombre", - "8": "Puits", - "9": "Caverne Polaire", - "10": "", // Escaliers vers le Repaire de Ganondorf (No title card) - "11": "Gymnase Gerudo", - "12": "Repaire des Voleurs", - "13": "Tour de Ganon", - "14": "", // Fuite du Château de Ganon (No title card) - "15": "", // Fuite du Château de Ganon 5 (No title card) - "16": "Chasse aux Trésors", - "17": "Monstre Insectoide Géant - Gohma", - "18": "Dinosaure Infernal - King Dodongo", - "19": "Anémone Bio-Electrique - Barinade", - "20": "Esprit Maléfique de l'Au-Delà - Ganon Spectral", - "21": "Dragon des Profondeurs - Volcania", - "22": "Amibe Aquatique Géante - Morpha", - "23": "Sorcières Jumelles - Duo Maléfique", - "24": "Monstre de l'Ombre - Bongo Bongo", - "25": "Seigneur du Malin - Ganondorf", - "26": "", - "27": "", // Entrée vers le Marché (No title card) - "28": "", - "29": "", - "30": "Ruelle", - "31": "Ruelle", - "32": "Place du Marché", - "33": "Place du Marché", - "34": "Place du Marché", - "35": "", // Extérieur du Temple du Temps (No title card) - "36": "SCENE_SHRINE_N", - "37": "SCENE_SHRINE_R", - "38": "", // Cabane des Frères Je-Sais-Tout (No title card) - "39": "", // Cabane des Jumelles (No title card) - "40": "", // Cabane du Grand Mido (No title card) - "41": "", // Cabane de Saria (No title card) - "42": "", // Maison du Village Cocorico 1 (No title card) - "43": "", // Maison de la Ruelle 1 (No title card) - "44": "Bazar", - "45": "Boutique Kokiri", - "46": "Boutique Goron", - "47": "Boutique Zora", - "48": "", // Magasin Fermé (No title card) - "49": "Apothicaire", - "50": "", // Magasin de Missiles (No title card) - "51": "Foire aux Masques", - "52": "", // Cabane de Link (No title card) - "53": "", // Dog Lady's House (No title card) - "54": "Étable", - "55": "", // Maison d'Impa (No title card) - "56": "Laboratoire du Lac", - "57": "", // Tente du Marathonien (No title card) - "58": "Cabane du fossoyeur", - "59": "Fountaine Royale des Fées", - "60": "Fountaine des Fées", - "61": "Fountaine Royale des Fées", - "62": "", // Grottes (No title card) - "63": "", // Tombe 1 (No title card) - "64": "", // Tombe 2 (No title card) - "65": "Tombe Royale", - "66": "Jeu d'adresse", - "67": "Temple du Temps", - "68": "Sanctuaire des Sages", - "69": "Cour du Château", - "70": "Cour du Château", - "71": "", // Goddesses Cutscene (No title card) - "72": "Endroit Inconnu", - "73": "Étang", - "74": "Cour du Château", - "75": "Bowling Teigneux", - "76": "", // Lon Lon Ranch House/Silo (No title card) - "77": "", // Guard House (No title card) - "78": "", // Potion Shop (No title card) - "79": "Ganon", - "80": "Maison des Araignées", - "81": "Plaine d'Hyrule", - "82": "Village Cocorico", - "83": "Cimetière", - "84": "Fleuve Zora", - "85": "Forêt Kokiri", - "86": "Bosquet Sacré", - "87": "Lac Hylia", - "88": "Domaine Zora", - "89": "Fontaine Zora", - "90": "Vallée Gerudo", - "91": "Bois Perdu", - "92": "Colosse du Désert", - "93": "Forteresse Gerudo", - "94": "Désert Hanté", - "95": "Château d'Hyrule", - "96": "Chemin du Péril", - "97": "Cratère du Péril", - "98": "Village Goron", - "99": "Ranch Lon Lon", - "100": "", - "101": "", // Debug: Test Map (No title card) - "102": "", // Debug: Test Room (No title card) - "103": "", // Debug: Depth Test (No title card) - "104": "", // Debug: Stalfos Miniboss Room (No title card) - "105": "", // Debug: Stalfos Boss Room (No title card) - "106": "", // Debug: Dark Link Room (No title card) - "107": "", - "108": "", // Debug: SRD Room (No title card) - "109": "" // Debug: Treasure Chest Warp (No title card) -} \ No newline at end of file diff --git a/OTRExporter/assets/accessibility/texts/scenes_ger.json b/OTRExporter/assets/accessibility/texts/scenes_ger.json deleted file mode 100644 index a3f7370e0..000000000 --- a/OTRExporter/assets/accessibility/texts/scenes_ger.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "0": "Im Deku-Baum", - "1": "Dodongos Höhle", - "2": "Jabu-Jabus Bauch", - "3": "Waldtempel", - "4": "Feuertempel", - "5": "Wassertempel", - "6": "Geistertempel", - "7": "Schattentempel", - "8": "Grund des Brunnens", - "9": "Eishöhle", - "10": "", // Treppe zu Ganondorfs Verließ (Keine Title-Card) - "11": "Gerudo-Arena", - "12": "Diebesversteck", - "13": "Ganons Schloß", - "14": "", // Flucht aus Ganons Schloß (Keine Title-Card) - "15": "", // Flucht aus Ganons Schloß 5 (Keine Title-Card) - "16": "Truhenlotterie", - "17": "Gepanzerter Spinnenparasit - Gohma", - "18": "Infernosaurus - King Dodongo", - "19": "Elektroterristrisches Biotentakel - Barinade", - "20": "Reitendes Unheil - Phantom-Ganon", - "21": "Subterraner Lavadrachoid - Volvagia", - "22": "Aquamöbes Wassertentakel - Morpha", - "23": "Höllische Hexenarmada - Killa Ohmaz", - "24": "Bestialische Schattenmonstrosität - Bongo Bongo", - "25": "Großmeister des Bösen - Ganondorf", - "26": "", - "27": "", // Eingang zum Marktplatz (Keine Title-Card) - "28": "", - "29": "", - "30": "Seitenstraße", - "31": "Seitenstraße", - "32": "Marktplatz", - "33": "Marktplatz", - "34": "Marktplatz", - "35": "", // Vor der Zitadelle der Zeit (Keine Title-Card) - "36": "SCENE_SHRINE_N", - "37": "SCENE_SHRINE_R", - "38": "", // Haus der Allwissenden Brüder (Keine Title-Card) - "39": "", // Haus der Zwillinge (Keine Title-Card) - "40": "", // Midos Haus (Keine Title-Card) - "41": "", // Salias Haus (Keine Title-Card) - "42": "", // Kakariko Haus 1 (Keine Title-Card) - "43": "", // Steinstraßen Haus 1 (Keine Title-Card) - "44": "Basar", - "45": "Kokiri-Laden", - "46": "Goronen-Laden", - "47": "Zora-Laden", - "48": "", // Geschlossener Laden (Keine Title-Card) - "49": "Magie-Laden", - "50": "", // Krabbelminen-Laden (Keine Title-Card) - "51": "Maskenhändler", - "52": "", // Links Haus (Keine Title-Card) - "53": "", // Haus der Hunde-Dame (Keine Title-Card) - "54": "Stall", - "55": "", // Impas Haus (Keine Title-Card) - "56": "Hylia-See Laboratorium", - "57": "", // Zelt des Rennläufers (Keine Title-Card) - "58": "Hütte des Totengräbers", - "59": "Feen-Quelle", - "60": "Feen-Brunnen", - "61": "Feen-Quelle", - "62": "", // Grotten (Keine Title-Card) - "63": "", // Grab 1 (Keine Title-Card) - "64": "", // Grab 2 (Keine Title-Card) - "65": "Königsgrab", - "66": "Schießbude", - "67": "Zitadelle der Zeit", - "68": "Halle der Weisen", - "69": "Burghof", - "70": "Burghof", - "71": "", // Göttinnen Cutscene (Keine Title-Card) - "72": "Unbekannter Ort", - "73": "Fischweiher", - "74": "Burghof", - "75": "Minenbowlingbahn", - "76": "", // Lon Lon-Farm Haus/Silo (Keine Title-Card) - "77": "", // Wachposten (Keine Title-Card) - "78": "", // Magie-Laden (Keine Title-Card) - "79": "Ganon", - "80": "Skulltulas Haus", - "81": "Hylianische Steppe", - "82": "Kakariko", - "83": "Friedhof", - "84": "Zora-Fluß", - "85": "Kokiri-Wald", - "86": "Waldlichtung", - "87": "Hylia-See", - "88": "Zoras Reich", - "89": "Zoras Quelle", - "90": "Gerudotal", - "91": "Verlorene Wälder", - "92": "Wüstenkoloss", - "93": "Gerudo-Festung", - "94": "Geisterwüste", - "95": "Schloß Hyrule", - "96": "Pfad zum Todesberg", - "97": "Todeskrater", - "98": "Goronia", - "99": "Lon Lon-Farm", - "100": "", - "101": "", // Debug: Test Karte (Keine Title-Card) - "102": "", // Debug: Test Raum (Keine Title-Card) - "103": "", // Debug: Tiefen Test (Keine Title-Card) - "104": "", // Debug: Stalfos-Ritter Miniboss Raum (Keine Title-Card) - "105": "", // Debug: Stalfos-Ritter Boss Raum (Keine Title-Card) - "106": "", // Debug: Schwarzer Link Raum (Keine Title-Card) - "107": "", - "108": "", // Debug: SRD Raum (Keine Title-Card) - "109": "" // Debug: Schatzkisten Teleport (Keine Title-Card) -} \ No newline at end of file diff --git a/OTRExporter/assets/fonts/Fipps-Regular.otf b/OTRExporter/assets/fonts/Fipps-Regular.otf deleted file mode 100644 index 9334dad594277ba8339786217d75260e58436dc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34220 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 z 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∓eYz|5P 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 - - - - diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png deleted file mode 100644 index 03dac76dd9ad786e9ee25bd396521d206c97c6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2917 zcmV-r3!3zaP)sd^^WMI<`*yc2!+^}F8^Nv2N)TM??8KFSg8m(XD9p;eD`8fG zyIF`J2*WVL*o|}hJ}c{$S(%mR5fLupM4UKPeH$0r2NEhXE93inKfWRF{^N(9{@Gl; z#@}}wo}A#sVYe373TCEZ?8o%M8nkFFHu(%^82g|=?dT4O!fx&w=L(OR(9P%5JkDEKUzcCe8hw zoBf+K|0Zy2Jw++_{)ny}pXD65c2LB0_1KI`lPvHMDAzm!hYXMeWQqaY^@?gObk3)2 zGP5DR6wVM|N`u6zm4WXzHl&veZcs|tZymdJKv-XP?A8`jND|U^p7qrb?XI_~HUfK} zUPfhADOw>Z2?t`gCps0i&JvrjjOHH$PGsAG?iZabj@J zv%R&+saL?>) zM|VBpaO#+z?J?dI53ID6NjUt#=Y1h|z}zi5o3O-zP%uC8T-~;a^4wk?&~6L5dcmvf zDF)SzQq5;VY;P?}35Um;+f^|6^30%(q=J+WAG#3gGH4FqJHRT?2Y7C{c|T|SW{KSx zC_J}KjWLxxvVgUoa-vdK%zHsKQ=`Dlr(pm$(_y|raGl`m8Y&&!_im28EJ1lxX{pN{ zroFryrD2@!Z0k8#YLteXi;m-`1(O~;x+0&LV-f0{r<)4mpxeWGQ)6$0cVC^*T}@Fl zi<)*=t1!-Cq#RE@vArfAE9vuFM!WS?t8j#K9hsKJ!imaXY3=*wqXrZI;>`8rTFEq z-}0ZASL|OO^7a=WvE9Ds-+uO%zx$gBc3pAu@eO*?p~PXj&E2RHnj&a#vRTplAtguq zLF)(K#}T{`{^94Wn;S@dXSe)I{>@}M!k14ZKYzl$U1|FF_ z2lfuyIt-W(x1^#1XBE{{u{H4XU)}N3a>0w|o*(_eF}k{=T6#{aEvx$iqpEQb61MEo zbN#O6_-QdR`KF)wmuH5Xi{Wo^p&`}xj-Tu=;S(^|LbY=o>wC^Vzh*L5Y_A=3f|03y z)D4{_X_s>Wxyj?qpKnTOGcwS%P&?OKMfl@CIfj*GI<47nJa4`{!@3sJ-8Lg%I~!Lh z;rd7BWD@?Q5rP#|i+NfpR z6>a;!BeT-j=0nLYrwVO^?b`CU|9;8ss^hQ!ykc>vI9v+Gn$Ucl%hM^#1RwUns9hXV z;`{uG74za{h^uE`RAExmVPvajipfmz$wwtsshCa#^KIJPUUZM5JQqZipwwXU_rGaI zmRP-N)8INk)@kuMJ1kIr(=)mQjo@W4pL0Ex(tW$xmG0+27v{e_6=OM1Glm-kt3(hF zbYRN)EZ1-FdFMHLQl!Y%M$#b>JPo9MU3m6I6{c!E9&W7lp>pxsADWbj*!#Q z%(nB1J$XpQ#EIBsT8DZv%nnKo0iI);`l5M2Pzx zB$CpE{xX@VR9$mSW0vKpp^-MZAOo@mO-rut`yLh^<>G&31pZfwmk9!(ac9r z3X~24#Ik(ytUznw;_C)e2v0sMS$*B&oagvSfpebQzBw&UO`03Rycrmn9P=?--fNSF zj6%44-6oS?zHWmSWta^D2^G#*y=u^fusk<-57%$Q@4N@>P+M}$5nJB1KDFZr{?Ozx z%A;FcVpRPo^+b`#Ea!YutZO|v<|DSeYeVXklc2eGp~6LzKmY9tXFcy{%s z+45M+l@?a78lJo;Q@@Cp7`e&w#&!I(Kos1(@0iXN&IaxwE;%{o2ifwNVv#S1b3i1s zb-xLB*_4#ejgdI&p1t4{rQ& z@K}QJ!96}dJHz}STi&&P#1DKEc#AX}ca$cEBy1^2^d z6f0`ZF*-MFRXL_97KbB#AhP9GZ`%L!Yr8ZhFY-e4pcJoOHOXX;FD`j-aTypC8BJ3I z!xAaI@x>+Nm?O6Q@Bf1Ths*2c(dBiHIbzGv-_6x=jyYn>ao>#qIp+TWqA@z1pUZ>! P00000NkvXXu0mjfOx?9X diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png deleted file mode 100644 index ee03c1343a034c2477862518d38671d46b631fab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1111 zcmV-d1gQIoP)_;GNYzstwv5As3DA*pgHDy<)qc4i3VzyS%)jx47#7kPI%Xrh5` z!1TxOzZll%*WVuT>UF}^wSX94A+P|4Bcqgd45sxjas4YoAO?u)=VdlnKaMgRRQqQw z*3KqMsRyP0r#jE~;wKx&AwX6L)ZCAkkDhJSC(|IKE^^qQ=NFTcbFF69J|M zEfu_Fz0~iv;QmM^VEroDRqhvHgJgo1`Xcd2`CjG@?me-scLbM20HJ}i5Rx3Hen1Wl z-0SF+69Kn>&ou~uw;%F%)!QjQ-7M|h%65&Lw1nFh0}E;fWUUM$)G}~-=gFEHR1M`^ z>*`tirM=@F+=0#N#S^qs#7ro&!PLN++Y4UrvRIQ?11~nv93>Vrj!JXJSb!wQJajHG zwM?GUw|~}BDeuf!mzbYfOVTo5%i3ft;gY-pGgo~}uECLt;Tzl6BATxoS3Oaq;NUHK0QXC$97@1a!B02KkhufAd7rCMG2!mx zJlL%_+V#8ClJK(n@BS=vuws+31T27^FTuULT~-lX0%KS&;!V13#CfXV%(cG~gJX|k znJW19*3}g+!CfVOS!TKzR$fX~yGSTarzL#BQ0>8NbkN;;Z;i!ikGenKYnvsmEH6VU zXAN2MMX>m^x~+q13-0R4xt^muFKOR4n%VR9-hwZ)Asv1^hODeD zA*KMyH!PKV>0-UzPxk8Ve&I3)fHXfm>^7W)F3-oV?bd8-Nu~#F02T&QY}{?ue#Q() zcriMa2(|goZS(0(zll-BRCv$c^%ke@=siJLT8! z(uH>{v*GKhv|$$6Nt|so6!lg6($#>PwQJwIyscl<+3@#cy(4(v2d-pyWX76qDKCpX zDKXW$#+$A67TPtp=7elKZmj@5- diff --git a/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png deleted file mode 100644 index 0ea4b9fe2c276cf1875acea68b032c0a36f746ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3518 zcmV;v4MFmWP)!Yi?s(Ploc4v2bXICp$y9lj^K#SJET5}D=zW@>ze+Cu?9>N3% z10;mB4me5I^=3%(rFcv95=={{Tj!0%OhyvH2$mP{Dj;s^dI2(|+YhEf z+v>>u$)G|YL=`{?0yiKOL=bhv0z*IyxxQ+d5k*9(-X13R9kQ+N4hd&*3ki+aSjdv_$2EE)Xg#sMSxV=cU4v?7bF={ zgW8e+3hE%Ls0dSlRE3gof?NeP!+}Jmir^6-GqJ4}faf&^Tp-%J3P>nuaDlT|fdrCT z%HKGk%6){_Q-EY1lm^r^Bw*qNa6};_uxQvtf#rJBSvOcoMaa?eB#|IDloLP!na?`` zBn3$g+ESoM1LFX7BjtlQcmt~ngf~jRT|nB>^%2xSLnxwncHY#s(mjPsfCvs~DJK9k zv@0w0po1|1Z%D8$9DP(c{i?#blSP;!NFEFq11l70xwp&e4bgyQ;B}_Ed82qko+H#L zz%t~nm0T4V97ixRh$06)KmPd#q#xer8d!!ycq_?8B5k*KmJKRqa!^H6AQ|@Ol%G2s zs$vM|H9$Hj070J58{oCHw7>CSp)f6+pZ)wEFMs+q|MC|~%)nlrz9lC?1ad6Xoib#s zgqAxchAOr?@2K=a z1g*Yx3}c=_JCFlVekGmR}Zgw`1&5do=!P=SsAL5An>pcvo0A*MH*GM#d<4stM3DQ+(UaG_^g|v#J7f%_ z4=2mknh67-%Z+Xk&PIh;m1%(-E$6BnDL9S-1!HVInw;eBSbvn_TP z&f;iEj$GD1E{!iegfy^GVod{31vEgM@Fp&@G|@6^G+cs_8ME3-O}w=j1on?Exqi9B z-tikg_|XMTp^;#Eim3E6VlH6G=L%;x_~>cJV4-4z}LBDCC~J50qm@(Hs(Ey zZ4srfXfaA(k)mWl7!8K2j<_zoeZ9^3mjl_mH4}OSP5!m+g}B}lnV3-bK@w462>#&ScI;V){<9w zwh47(39UuNUaHp^J){lHJMDtur9iu`MOs5DSV#YjPrV zMH{GQq*LdqC(U?BflWc8QFv74=Bj{B3`64LvqN59U-0tsoZtH4LzrcJ7FkoV<+k#y zwE7N^EPPj$dYf`1RpEma1c8Y1IE>|_Tt{L{90B|)^Wy0thsWo<{QQusw4ff=1UTLfSH{aexp!S}wEIX`i}d^YgKzX?D1o%^Ik<=)W^<1%siI>_Ay6&I1F z^)XC@83Cl~cyfGBxvNtx5Hf;8HN+hy=n*PH7eNfd(|^Cne{haHGxM zbIYS;AeA62IH|319R-}0gqpMbpFPS4OKxs@-hQeqPj`r&8*=}!TN6>+IBaM9rnbDP zQLC<%uzS;qv;i^DmW}MV&8R5?4qaBL4Vaf)@?hC>`pF^VWl!C|W^2FR66*YTft=yS z5QN86-ZSL|$|G@(sXVvfxp->`BB(kPhk$3Da-zZ$RX*%8Ckl_Uu#*!1^-r(xDRKRD zkLgv%)fUv~$>ZhqnuZ)0uuVN(D0>Rp*&Fgz|`1rq2rC(Wtp= zv*L$+M$GvVDT^&3ze|=&7|&N=6JNck(Dp1t#S#P`E-%N6HLa#a27ysaI{-cg_MMxDkOvuNSz`zh$5)fnHN^JiQSeX zwSm7_ph*c2MCRZju-&y0&fBO5K6lz6bxJSNbWMfa?QL%wB*ad^%?Wdk8_zYXrLn$a^LQIu@Bc{e}6}Q=rT49kuWTsxwK5!2r z38@oG(1KS(qxJvL40}Bh2{Vv7fmghOZRhsPT4%Fw9WxIvH;72)W_VKxgy%^h&+0M@ zSU_p>;1hE+3u1H1Q{ofTHsVKZ#WK+X_lbk+u}O4;&6qjwZxE3tBsJ}?X|78Hx<)AU zWgf>G|A{8p>j-JPruyt$&CJs4%$g(QX4ggpn=$XW`R|rX@fRq#A zZ4l8sJEhx&)~}mm5-SILY{4nb6c%k<(0o;C6LmO~1)DMNxaBI93QVG;lKH}0+x@=7 zC(_RQqufgDi_ySpGqd^xI~|YRkkL3nASE7$aDqZ7>{?L6P^oOje5YG37L9yDh?HTs z0~c%vuo>w!u*Ga(3~lm}5KwJ|l+s*1>tiw%HeS8Kvpx~K9mmrI+LZEla$*u8LZK)_ zIGQF7qD^gCU>c3cZSvZT`A)aoMui#(l@P}re5ZpBWLc3;2vz>A^^)OOpI zJlKr+PPg2>5|d+FrD4GxohA?=mBfS~DAFrqbv!0io4=4nu_=h+s3`6U!pR}+a%1z} z@Lg_sj1#_9U`ydx;`}oi8q9zPPMNXKcp2vCP)C36gh@XeZbD3$WANriGjL82M zQTD?>{w&td-~aYs{?Lu@%&-O{K^ko4*yY4XEQCx5#|3^#yc>?eaJ(hF9H1mIWJa7x z049(iCYS*Z-Fm;)M*-H26XQ9BG}vWu9(dN%GNIA&OVZwhHXQYV58ycA<$?s+3=>2q zF~K`Tf)bilBQmGI{`~3QfEy{%448wbOr&4{a*+Y%jrMucy1~}a=ro(~dO`%*4Pj^| zhk*t74)I>ay+I1-j@0OO#H|5OVKLaOvB$(nJVaa}2ka&AZkVo+PyFQ|m1Ka-$eBzB z7S!_{EP)Orux;oR+KsLcUJ> zjpqdO;@g{(t)l=oV>?A}`*CYvq_BC?7fBNE-0|0>N&K)mi~$4wdYtfjAy|9^p(L{S zo&l&Jm*B_lO9;Ra$V-HIX8wi(D^@9@BPJn(&5ePtWWO9}caJi0@+ zvca>%JJsC`dMRRQKq4ek4KwhUz{lcybMSeySR|+!c`UvItX1(V-!>e$LJpjQLy)mN zIOuJ^YXIKR=-33ml*J6gH^WHybSXTqd|ygdxsNh-Q; z6pV%)!p&%VgE4TM@P0r<85oC|Tuhk2_ENdB5D0+gC>t`-pB;OEoH42qC1lbg9&GqI zXq(fT!`A4%AXg@VL36mQMnYIO;t&Q@SODX0vEc^qs??i;eHEX}9+C9%K!Fd(&H2wx z@%`yoS1b6wKY}o@5dTgqP8;>>4%Yco0K2grLLEGU^t#YeI$RFGK+x45B+whSEk%94 z)RoL{4@Q)&B372Rb?erlH<;kNXmWB0Ka+eK6+T*xe!3Kr7`W3b-xdNE@OqSteOd47 zk`T5T@h%jqRMWb7SRwV~_&dmwK7;6^j+(_cm#pHV8pxy{zsy?$_I|EYfnjiDbv;Xa z@uGXA&Wco~V6$rYZSj33F$N~#0q5JXbYsx1P(4*nj7vUDL!rJ7JJ#oO<@d4J=+L@@ zdVRiAmO7WeM~B|&5^8XKx-9oB5vK|b15)&EPqzlrmM1go@b=I^FWPZuMg#vU)uN)$ zsLVJc(Gjr5JLc}4)USL}M_3|oiyvxden`uXr6UN57WrO-AU_} zzU--SS&Z#N=i#mgKzr{^4bm7x@1P54;sLX^j35YvB_(3 zIScadtsp;V^3QmH{A#f<{%ERo&XZ`3T#$cks-5Dx0cE9Y_n`*{T8Vcv+6lO@GsrR4 z!jc>hkaL4Pzp$7Z#PeRO_i>_qeRrL_v3@)B_Tga~br`djQI9}bJK)t~$IF45G1p57 z_=;;S!6hjppEm?3i|>}j_ZNQOD!RMtK8$)A0{#~(QuQ$P9wW6|9deD-RU9>b`px3| zJgP|*-@h{>Q}hYBm8i8r|NQae!%`|*is=0|t;j6pf6aF;SQp>4WwFb$*zR9Iu2hWz zuOMRsJE7b2{ngBr@(SdKVhi2#b;a z>rcPjxoKtqR6jhhB@122Z0J?GF~aYGN+!*n)h$Qkd1c?xq^Y+jeiD$AKNoV%JG@ z&ikN1wS0cFQtj=4=M`kJieJa~SbIXOAd8ZQJvB^M+Zz7|{Y3rXZGA%a00000NkvXX Hu0mjfR4h1* diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png deleted file mode 100644 index d63811e9c8e2499857682632fb907852a7c4cdfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4727 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 FV1jt(8%O{E diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png deleted file mode 100644 index b2e914b4949ab3dfd798cea12a6aa6b7861c64f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2338 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 diff --git a/OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png deleted file mode 100644 index 8d320f250aeadcc995df6067173f071c068f054f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2184 zcmV;32zU31P)&9GPgm7`EeHGbx!s8a3)W;)wQKEft@VB1R&T%kwrH)f*6zbOcPDPv zj4>Ev&|0IE;^wKfQfsA@Le80-GbyDzakG|lrj)Y(Mgu6N_Mx@D6E|zO-?{yW$fu&# z`hTqf*xMT`rTFcyUI(QRsdyhigq#y1V64Gf%P-&j4WE2&HvRDrULlu^0u(UCh;t4^ z&_<(mL$KBgfO_Yhcf=U8huK=ouiy9u^I6By;Q={CrfFieT9I>M7)KtgFPNstTfh6m z9?I8VeVLpRi^ZJ7gB2I+hm2!HL>Q+L=K|Ima?U8F5fO~hj}Ta|*E~Ew=d({f$@hQs zGrsi9GdO4Q&VYb*7OfPiU@!E$A?fW#uzFPr%08G)*5FFRVpIvN+^gx z@DBCvyYI?ovtc|x=h@AM-=CiHh0{}xo_dNOeg75iogAUH1}fGVQc8pnxE@9>HkbVR zt>5wT3(v8f_jDnUVq|r&B7~0n_wRFjd_q6#n8uNu3o#~2$$((3ZwO2uf6TMnEyL4K z^VJVN;1AAm{JGDejY1pE#lp8Pm;2`Y*4MvA@Se-}66@ke9$@&_OA=X>{f{PD+8z;dzR)Y5P~P?La7C%G~4YpQZq3o7Rx0(_81Lt$SD(3L@7nd8E*~F?+}=so?^V`-LB({ zr>7jAp7O(2zs+j7;OyfwoOg&+taUi=&`P6}km7`M4(|faIS!T!Qi?e5nT8Q`}&h3X(A*M*mh3jFY)=El=m@-q!Xr&)b!EM6%&6_{xi=Tgr<#NV2wjair&|1-V z9mY8{aQhOSEGFO*dj*br5Y&J}jAhqH`zzl|yz9;k@B^Ln3aYQLa*L9R~3jwV) zKmX}#%=;d#C$__YwH9Lx)&~UP@_HcWOBCRItG~6D`Fy_HSkr|-6=}7X$~cZVZyBc% zjiT>bxpL0L7_ql$cDo%gN^^ZZP-{U%aL%>_m7<@`2+om9q2$bVd(AXW7^8_Pk#nI7 zo?#g1`koLvE-p40>(N@1a^dRwg2UATwN{k6RRXOwhX+gUog4v*7^nRS8+$222mok- zuJ4dqDYamX!TUhhYn-u!uE#oyRH2WFI1Q~Y0IM}u+bc>bjSFt;z zYbBS0Qs8WZuJ1Yop(;3Bt(am&D@{xh4U|%d(}=YWYYjfk$SF}uLv@-WT^I1)wG!-= zPuNSUNZnIy-N|Q)5$8Npi~!`Eu{#|pJCvGaYsPUxq@t9f)`q0_eqTC~c9=T|TwPre zoY`%jP)d<=CFP7UdfzAYwn7@qG)*|?n}UX>|4J#GGbp90Q^cCagg2!~DN}{JJ@EGr zKf*ar@RpP^&e?YIT(HLM63VR)^rP>bZAovhhjz-+`Xa>yyZwzZZF-#Dn-~%9PQjo4 z@>jm|((|kqbAX+W!!V45;4#J^B9vO8RmhrP4WD6YqWE_BUqA*2{V zDU{aK(vnQ6ojQcTG(}1&jN`aRU>pa!uBVjxX;b>@%P*oebUx5`JqpEQK1V4o2_f+B|NMv5V!=3#EEjXM(mYtN zG5Qm7{F5Jkj~p{8HusZj!DvfLiOuGcS>Mxl9m6m*OD%%$I)e9%(}Y4;Ef#z2(7Q%E zJXmpjc-Rc9RJ78J)2<}95m>L+oPOq*m?9$FA|1_>PdN^+4(t( z`HWKA{UA;gRiNtvo%ammNUens0@gbE*^F@*@A8229<41(Tci{~aeckT7)Qz(+1&wB zZobc1Llt&orr2JOh}tn`g({V+>k(@$DQBEDY_0}MsZ23ZYrb28;2a@1j5Z_$&>S5d z>=GGRt(F+w#;lgYxbuW5rDoZ3#%R-SL#Ev~wb58(Sg$wqoyS>2%7w3eGgpC0000< KMNUMnLSTY;0y@C} diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png deleted file mode 100644 index 00f0b39e44bfeb54234336642b70db3e275bb799..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4265 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 LNkvXXu0mjfHpe@` diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png b/OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png deleted file mode 100644 index 0a09e2b6f160a1971f004210f0dcd161e9e7bf4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1979 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 Jt=gUY{{wF#Q49b8 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL b/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL deleted file mode 100644 index 966bef206..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 b/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 deleted file mode 100644 index dea47708c..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 b/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 deleted file mode 100644 index 36be4333f..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 b/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 deleted file mode 100644 index 6ca96db30..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 b/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 deleted file mode 100644 index 3a653966d..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges b/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges deleted file mode 100644 index 52591dfc8..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface b/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface deleted file mode 100644 index 06193ae61..000000000 --- a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_completed/noise_tex b/OTRExporter/assets/objects/object_triforce_completed/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 deleted file mode 100644 index 09e44f1b7..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 deleted file mode 100644 index 48001e3c3..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 deleted file mode 100644 index e35e34492..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 deleted file mode 100644 index a86fa98bf..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 deleted file mode 100644 index 230fbb7f8..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 b/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 deleted file mode 100644 index 86d123825..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge b/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge deleted file mode 100644 index f62631793..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges b/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges deleted file mode 100644 index 9355e7094..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface b/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface deleted file mode 100644 index e863b31c5..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/noise_tex b/OTRExporter/assets/objects/object_triforce_piece_0/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 b/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 deleted file mode 100644 index 5f33f7347..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 b/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 deleted file mode 100644 index 43df6492b..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 b/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 deleted file mode 100644 index e078b8246..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 b/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 deleted file mode 100644 index e0460194d..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge b/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge deleted file mode 100644 index b9e61293d..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface b/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface deleted file mode 100644 index 5f8dc51f9..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/noise_tex b/OTRExporter/assets/objects/object_triforce_piece_1/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 deleted file mode 100644 index b54e182d5..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 deleted file mode 100644 index 00a32bfd8..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 deleted file mode 100644 index 0993c1c1e..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 deleted file mode 100644 index bf7dfcac6..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 deleted file mode 100644 index e3237ab21..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 b/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 deleted file mode 100644 index ec4e73700..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge b/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge deleted file mode 100644 index c222fe68d..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges b/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges deleted file mode 100644 index 5968068f5..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface b/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface deleted file mode 100644 index d903f00bb..000000000 --- a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/noise_tex b/OTRExporter/assets/objects/object_triforce_piece_2/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 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 v@qKsBw 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 a-T&@2YJoFO%U-?#^v9T38ecYa-}N5>&$}J~ diff --git a/OTRExporter/assets/textures/buttons/CUp.png b/OTRExporter/assets/textures/buttons/CUp.png deleted file mode 100644 index 6c0e29d2de653af5f5518cfd1c6a5d3b956b1e33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11219 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 diff --git a/OTRExporter/assets/textures/buttons/ZBtn.png b/OTRExporter/assets/textures/buttons/ZBtn.png deleted file mode 100644 index def8d9a6da2fcab6486b6106064d9fcd11dd47ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1241 zcmd^7;fvb@6o0p#W-OllP&8n64z!-JE+(X)vKtE{9js;Vf8EX$%O3WC7%d^Ve9S=K|x zSrm&?(;VtXPt{sVp(e={K?-@n<#>zDYBVELR4$!iNs=OZji^&AwW>iQ@@gd~4(y6= zm0csWb>C7wv*74*QIpJqpvyT;;%lK5d0J=}JX0!aIYZ%8k(G0_A6Sm77j4zB6ipWu zH76;YAY~EV`9vRg<-M41`AlqNN;2VcfRhP!yBNpl`)HadNysn=umHFNFa{U^^Z?ob z4S*P+3=jag07U=;U^c^kADc~#B6MBUG!%ryJc&S(i9o_ms0l9wumLojPjKADevEA& z>jp+52K2s5&7JhLm>!$tKqvN8=qS*V0db7jMvM?`Laox7yY_tk=gIf%qo)9#`0M?v`Zx4T z><_y)E_`?O1>!Oi7k7B}p>t2ay!`d*t>=6=f9%hd^)>U;o%pVAmmWTUJM}lvza;hA z(cv38M|?_9rj`P~oKp8a)c Yb??E?_CD!fN=}5$jjjCd`nlKt0XEX>4Tx04R}tkv&MmKpe$iQ%j3f9IPPXkfA!+MMVUcT7@E12(?114kp)6Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOiUPOWvu?>ZqU!3o%+XQcR?2KjGmYcKi~#6mnI- z$gzMLRLG7W{11M2YZfOb+@x><2)x+#$0!io1zHW;{yw(t)(PN$2ClS@zt#k1K1pwM zwCEAgzYSbmcQj=WxZDATo^;ue9m!8qC>DYDGy0|+FmMa>uDQLn_i_3FWT>mu4RCM> zjFl*R-Q(S%?%w`A)9&vFiqLYfsZ*;V0000pP)t-s006Ef7Y$Pw1wSksW-A6tIVG(x zFI-45gh38zS3R3h38z~MwPy^&cMp$`jIpz@$jZkcHAig#0004WQchC&G0sSOa5;;t1?OaI$n`0uc_7t@fqCKi>wt?=fQn;`f|DHMCO!vBaul3Pk}sJq z5th%iAQoQUf_j4%ei{I4*J%K9Zou$Q2`wEE$A4<gz4{Zfih2m+X4VSwB_Y-B;>A->{k zUP@R5gSxp-Y))!ydQM?+>%vXj>S`AsJ%8ckwu#a1MfGLAx{MNPdN!_3cFr#D(T&q) zO?L^Ick;}>$!Q)29)(T0zG{MU>RL7-p@B~3=AKEFHK}4&Jv$FB&NCKKbjc`4a?sQ@ zv$XMu&4_X~RMRnY_cUgd4egxXmTV>_Z6BW&?e6Fk9vbMMQkw0lDJ`p@C@;vuD(94v zo#>(}X&ROs7Z#hImm43HQdJhIBPuQ~%FoHlE~4WV74B`JW#k?i9i5bsnGqS1)!v=w zC?+f+$j!pY!l!EC=IiR>?BpKc=VD`K@9LY=I&F4Cu(E)d5E~N%6PJvhp|O=mSbS1i zYK)Vdkakr2?D=!*L$!qk1c34^d{VM9lDYw@IpsBN-R16z_W9FRubxrnttQ4Nz{SkO zAuK5)t7+vE7M>(#DBP}K4;^E@x5)_}76crj3S2AgCdw%=s!>3N}>I>G=Fx1yKxAP2*ODQVP zP7Lu6iOQckZ+3h4=F{g-Zs`ru(y;fkwv^HLPOfP0tSv}S&n|3TxMjoqIor=&yRdg! zl%9rDWTZKRj6-5+ePeA^ZFOzytWA4&ty{hK+TFVsSLa(;1jT0s2%^O|dU`;QZ}jwl z9^dHc0X@Fa(*t^Zqo)V-_-0|1M@bJT@h!m3#>yqGi<};i<6BgagPD<4NYxxEJ)p!l zP@aK>M_kJQkseUuTabr^k(FCSLK=}CP~)4QlZk_0SV9Jo9?;`kPC;H#9VtDa$2WR< UK#y - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 deleted file mode 100644 index 2986de72b..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 deleted file mode 100644 index 2aa9bea6d..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 deleted file mode 100644 index 2b8fe0d11..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 deleted file mode 100644 index 53edaf74f..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 deleted file mode 100644 index 2c2ee793b..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 deleted file mode 100644 index ec462b114..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 deleted file mode 100644 index cc906e23e..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 b/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 deleted file mode 100644 index 68e4babcf..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material b/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material deleted file mode 100644 index e48b335c0..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 deleted file mode 100644 index e98640319..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 deleted file mode 100644 index b2db72d79..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 deleted file mode 100644 index be60fd46b..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material b/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material deleted file mode 100644 index 3cda02a88..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 deleted file mode 100644 index 3cda02a88..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 deleted file mode 100644 index 3cda02a88..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 b/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 deleted file mode 100644 index 3cda02a88..000000000 --- a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 b/OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 deleted file mode 100644 index 2edcaacb3c9433e786162171be988e44cf246adb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6291548 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 z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N 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 Axc~qF diff --git a/OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png b/OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png deleted file mode 100644 index cdb51d79ceb47ccc3fde8107e3206157c95bfb38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17227 zcmeI4TWB0r7=R~&MWYpIOBEk<*rM?^JGY&g-C?t(W*ZZ9YfPg_P_T13lZ@S+8D}QR zCLn0r2U|t4MHChFLBtDKwLS>q4XYwzTkuk%0oPYi^53_w}!;Qp9fa$rA%Z5-j+Vj5tOwX( z5V%vm0oG5$p{(gN`XC$zt=YkF1=Tw`3TP$y*kH6lBxjP1#aJsR6N4Nt-WlU3QJBXxl;8afUKo1G;Zr zmZ|HYVCsOe^1QoS|D<_yTCkr_gqJx_Sp$6;#uGZPqDu!#hks>#Od*-($9aX!L z>O9R4K(vv2Gs#Xyxe=wl$fl7HRLzKzWXXuO2QZ85yw=ubAL455XAmd=8MOe znFP+swpZ+`p|!Y^z_r2|%?Ily;0nRn`LWmeX6^2aY;;qp+W*BwxXv{2PiHFNglq7I z4E&&E`EHFyyO<7LTJyZBZD`RPv(t{*yuG2Vk<53>$NxCiK$~9TlH*N_%L9=SWQk{V zF()y305_pzig`nj6!44%mevL#u9VpxSjGQNK_bM5z0GIPyDzvTRKij)#%9h8ES zDLgaz#RR^6IvFN)l}3VzZsgRnXUt2^sd!acyq(C-jO(Jf9++R5C6(*KN-jDBt7*{`El$w|#!_G*-K?e! zD=K<csbkI~`MGmXOMwL|Ji|m57 zl($CTSX5b8ry7;BB5?4-^3mU>X}Y`Jbo}I|>F##ZmgQ}Z9hQVlwKun04B2&19V^@LOcg|D172?0w0Cqg9AC^Z)zLJJw@vCR`?_c zK7?Y?Q>fIOp|i-pFSJJV@B2m`Nf3krMWSAsvDXp}-LcE*wfohu}gea0G%2hZ52uxDW~)f#AZS zgmeflgaSt(xNs;T9fAv?z!3;897;%s;6f;H1cD2P64D{K5DFZD;KHGVbOW8{}2g~b5>fb!S>!ypgau=4L-Syp; zJ?|erwDsZ@`Uk7`J?dQc+2^|-+p+3!{u%8DUU=9z@<F0i)2mif%Kkl< ze?4+!`FFqn`Nfs@DcgTLa`dHb*WEdA?cJ*{|K!$vgWYr23O#$jJb08I?ed|R!1PKA?eU-|UecfW$; Pp$6A)D8G8crY(O1i2dBp diff --git a/OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png b/OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png deleted file mode 100644 index 1ed3f1cdd9596322cc34c09509428082949304a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17217 zcmeI4PmI)57{H4}ql+X4Vnkv>GlT?$Zu{D4XQs{$vOB;oGRwNGVV4A?e_nSRX4;|c z?#!-62#ASBFC_kn!FUj(2Sbb=OeCV4pk9mzVq(yEkwnFV9EcLb0bi%nH{ID;cnC^J z-Xyd0?d$ia@Atj;^=l7(acFSs(yon^ux4?HYG7W4~o%G6$ zQ!@=7mSF`tfsgD!N4x5T8@T?2yFf^Mc)`FZC#4dO-SK=Ym5!nPVDl70&_vqN(jS?w zLVg(f?xbhH%~NP9t2@o!4~AhYI|QzfdPhfrZ7tv@JhC7JShp823y(x*jWrdeI**{K zeIC>T*Bf!&av@r-Lvb$HzP`rtWY_Mp9n-D(>+*cNNo(P>yuqRtz=9~CwFpE`P)0yj z6=YS+trvhQ2ni>VW}A_g%NnG?Z?D5`0oieSAUVjl_3b{}XXnp&U{c}eOf z{FsJnxn4yJ3U);shkVr;&-1OpgeG2|YM)znJ#<>IAm#Z^!wIX#l2r#BKhPWl4ipP$ zpxd@h)lxvtl!3t+Izp(Y(}2?rN#-O8Xu2hunjqyG5KE<``8?M}*O&~q9daF2DAP5N z`_^fh0+0k?iJX-M84dtwa(Xr=ah4^^8BG_htP*7l1xh%Z7ifoPqXMdx6FT8sOcc!2 zv!ZUH5I|A@r|D^n({-qE8DOPFQxOy~jYD*BGcQ!X?W5H?omj!XjBP!tDXgJU?f&bz0c6X=cw)CmDjsf5Lp> z7_|xLTx)wpt{PekJMmpBsA(SDG>%pX$i(7TaTpoDAa zf($*sV0mtZ#k-gdTvn@A%eJ9~Ip(Jvvw3;LTO-bQ!pHwOS6`dD$t4F&OUOcr6BQX1 z4=F8kS%@~FY)V-}R5D6NPRCQcp(PhrV~|m0pn_~%jc?zQYwcKLLUYEUS>WTD#RGRz z=AdMnCaRE}EGiNQL0aQbxrCf$rZb`;T8as@cz*vXbM4nrnz?47zv=pNostq(9bAIq z6yBctVnWZpkqVPIOC!d_HfrjfGv}MGsbpPQw4LbAjQXOeADG*j#hvT?PATpve{#^(<<2qf<>d>lDkq*@ilb(!otDTAYUj?nK*`4{tP8)RCj^u+b$IK%SpB zmhjd%HX3%;<;h0poDl`|;X(MfX_`FTZaQ{t)8yfH)0X8^jvW-lX0*29gjIMq9Nntz zL{ETVL6K!i&hzcV?G{6J9hOInHoB+s!+QguG;P`sbTk}W$S`rBX&7yr#Iu@4Vxm#> zBnUl(;_*|cM9%QN$gLMzGrIM@u}2yNqaYC|E)q&uhvLF0NCb+Dgc8=FxG)M5f#M>e zgmow`jDkd3f<&OW zNGM?)iVLG45hyMaN?3>D!YD`tii?C2)}gpC3KD_hBB6wJC@zeGM4-4xC}ACn3!@+r zC@vC8Scl@mC`bf~i-Z!^p|~`p3(p@elPE{uXiptwjVVI7JKqaYC|E)q&uhvLF0 zNCb+Dgc8=FxG)M5f#M>egmow`jDkeCCa$j5dmW&IUgl6kZ*7=)J3WZr_`n+d!zG59 zS;H`gjxfyMSJCeUhM5!?=J$OJqrSl~54p#l{&EY_{dAzXX{7$c@nf@HXW09TUw?S; z$=M_IwMSF+%jd7~&u#tdqixD7Q|FGK39P;EO@8z8x$kygIlJe3SUA7o$nN#bZ$}q1 zmEv;1u+JY_aXxTYK5Ly=(tBx-{lXugt-8GKU4Hq1wygZ4a`v&=(-%jVZGY+1!*QT w_2JhJ{(QE7HWIsT@LQeSvfxsRl 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 D?WQyR diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png deleted file mode 100644 index e7a7aaa88ad66b0f28c94559bfb4030518c8bf17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4004 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 R^pmb8q_UP$`4j7~{{a|frUw83 diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png deleted file mode 100644 index 8cbf6339cb3380fa37e0f7f6c2374b4bd232e7ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3942 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 diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png deleted file mode 100644 index 455390170f0ab2abc2bbb0937250548aa66ddb23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3884 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 D4SR)& diff --git a/OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png b/OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png deleted file mode 100644 index 076b9365f2c790d9e9bac24124591ca71894fe29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 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 diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png deleted file mode 100644 index 8bc17292b26f703123ee26b2ade96d2acfacaa13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3852 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 diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png b/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png deleted file mode 100644 index 25f96cc2bd9398e4e5dcbe64e8bf8a7fd46018dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3666 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 diff --git a/OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png b/OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png deleted file mode 100644 index f43114e81968d6937e6c17c9589a00b3b26c2780..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1045 zcmV+w1nT>VP)lW`cszSvotJ>Tb0--V}EYdwee>Hq%U|MM;ZpslU#kFKt+KCjoy zSG3d9Q(9VDzE4k2|0&kg)O;Hl82C#RMIIg=z9it;*;!IjQhpNz0paNA=t-l|;PH4E z85u#TR1y#nAU`jCrBW&TqA23=czAet@Ogja`(^B9?(y-Fpr9avgM$eU4n~qB1VO;* zbh5U#hX3W|C2qHynVA_B3dK)%X|Y(a+wCY63jF>35k(P=Mng(U$}eZsX0wr;oGkll zwHkxLfXn5=AK?D}{>=sl2M07ZHvTYIP*A|==qQJWhra~u)YKGKtCjirdCX?B9Cx`~ z0RIAh&n_-508pt^6c!c&;PrYj8jYAtCRSHhiI0zGWo3n(ogF+L4^dH3=xBL;Z*MOum5Rp3Mpjo>IX*td>2#t}sTdp_#B4Ux+1dFfV88zdlu9KL5fP-O zrVS`)0D}6Mbl$1nMQp49=rL?q^p`jrpNqU7vSYKa%T3lS@`udvi@bEABYaSmTmp3b< zr>B1_DJl6Iz+^Jp{kNy85}Sb4q9e0K@ViY5)KL diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py deleted file mode 100755 index c6d5282a4..000000000 --- a/OTRExporter/extract_assets.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 - -import os, sys, shutil -import shutil -from rom_info import Z64Rom -import rom_chooser -import struct -import subprocess -import argparse - -def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None): - shutil.copytree("assets", "Extract/assets") - - if not zapd_exe: - zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out" - - exec_cmd = [zapd_exe, "ed", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists", - "-o", "placeholder", "-osf", "placeholder", "-rconf", "CFG/Config.xml"] - - # generate headers, but not otrs by excluding the otr exporter - if genHeaders: - exec_cmd.extend(["-gsf", "1"]) - else: - # generate otrs, but not headers - exec_cmd.extend(["-gsf", "0", "-se", "OTR", "--otrfile", - "oot-mq.otr" if Z64Rom.isMqRom(rom) else "oot.otr"]) - - print(exec_cmd) - exitValue = subprocess.call(exec_cmd) - if exitValue != 0: - print("\n") - print("Error when building the OTR file...", file=os.sys.stderr) - print("Aborting...", file=os.sys.stderr) - print("\n") - -def BuildSohOtr(zapd_exe=None): - shutil.copytree("assets", "Extract/assets") - - if not zapd_exe: - zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out" - - exec_cmd = [zapd_exe, "botr", "-se", "OTR", "--norom"] - - print(exec_cmd) - exitValue = subprocess.call(exec_cmd) - if exitValue != 0: - print("\n") - print("Error when building soh.otr file...", file=os.sys.stderr) - print("Aborting...", file=os.sys.stderr) - print("\n") - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument("-z", "--zapd", help="Path to ZAPD executable", dest="zapd_exe", type=str) - parser.add_argument("rom", help="Path to the rom", type=str, nargs="?") - parser.add_argument("--non-interactive", help="Runs the script non-interactively for use in build scripts.", dest="non_interactive", action="store_true") - parser.add_argument("-v", "--verbose", help="Display rom's header checksums and their corresponding xml folder", dest="verbose", action="store_true") - parser.add_argument("--gen-headers", help="Generate source headers to be checked in", dest="gen_headers", action="store_true") - parser.add_argument("--norom", help="Generate only soh.otr to be bundled to the game", dest="norom", action="store_true") - - args = parser.parse_args() - - if args.norom: - if (os.path.exists("Extract")): - shutil.rmtree("Extract") - - BuildSohOtr(args.zapd_exe) - return - - roms = [ Z64Rom(args.rom) ] if args.rom else rom_chooser.chooseROM(args.verbose, args.non_interactive) - for rom in roms: - if (os.path.exists("Extract")): - shutil.rmtree("Extract") - - BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom.file_path, zapd_exe=args.zapd_exe, genHeaders=args.gen_headers) - -if __name__ == "__main__": - main() diff --git a/OTRExporter/extract_baserom.py b/OTRExporter/extract_baserom.py deleted file mode 100644 index f387df57a..000000000 --- a/OTRExporter/extract_baserom.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/python3 - -import os -import sys -import struct -from multiprocessing import Pool, cpu_count -from rom_info import Z64Rom -import rom_chooser - - -rom = None - -def initialize_worker(input_rom): - global rom - rom = input_rom - -def ExtractFunc(i): - - dma_file = rom.getDmaEntryByIndex(i) - dma_data = rom.readDmaEntry(dma_file) - - filename = '../soh/baserom/' + rom.version.file_table[i] - print('extracting ' + filename + " (0x%08X, 0x%08X)" % (dma_file.virtStart, dma_file.virtEnd)) - - try: - with open(filename, 'wb') as f: - f.write(dma_data) - except IOError: - print('failed to write file ' + filename) - - # TODO: handle this better - if dma_file.compressed: - os.system('tools/yaz0 -d ' + filename + ' ' + filename) - -##################################################################### - -def main(): - try: - os.mkdir('../soh/baserom') - except: - pass - - rom_path = rom_chooser.chooseROM() - input_rom = Z64Rom(rom_path) - - # extract files - num_cores = cpu_count() - print("Extracting baserom with " + str(num_cores) + " CPU cores.") - with Pool(num_cores, initialize_worker, (input_rom,)) as p: - p.map(ExtractFunc, range(len(input_rom.version.file_table))) - -if __name__ == "__main__": - main() diff --git a/OTRExporter/offsets.json b/OTRExporter/offsets.json deleted file mode 100644 index e03311620..000000000 --- a/OTRExporter/offsets.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "MQDebug": { - "bankdefs": [1281424, 128], - "fontdefs": [1278576, 624], - "fontmaps": [1279200, 448], - "seqdefs": [1279648, 1776] - } -} \ No newline at end of file diff --git a/OTRExporter/rom_chooser.py b/OTRExporter/rom_chooser.py deleted file mode 100644 index fa5fcc281..000000000 --- a/OTRExporter/rom_chooser.py +++ /dev/null @@ -1,54 +0,0 @@ -import os, sys, glob - -from rom_info import Z64Rom - -def chooseROM(verbose=False, non_interactive=False): - roms = [] - - for file in glob.glob("*.z64"): - rom = Z64Rom(file) - if rom.is_valid: - roms.append(rom) - - if not (roms): - print("Error: No roms located, place one in the OTRExporter directory", file=os.sys.stderr) - sys.exit(1) - - if (len(roms) == 1): - return roms - - if non_interactive: - mq_rom = None - non_mq_rom = None - for rom in roms: - if rom.isMq and mq_rom is None: - mq_rom = rom - elif not rom.isMq and non_mq_rom is None: - non_mq_rom = rom - return [rom for rom in [non_mq_rom, mq_rom] if rom is not None] - - print(f"{len(roms)} roms found, please select one by pressing 1-{len(roms)}") - print() - - for i in range(len(roms)): - print(f"[{i+1:>2d}] {roms[i].file_path}") - if verbose: - print(f" Checksum: {roms[i].checksum.value}, Version XML: {roms[i].version.xml_ver}") - print() - - while(1): - try: - selection = int(input()) - except KeyboardInterrupt: - sys.exit(1) - except: - print("Bad input. Try again with the number keys.") - continue - - if (selection < 1 or selection > len(roms)): - print("Bad input. Try again.") - continue - - else: break - - return [ roms[selection - 1] ] diff --git a/OTRExporter/rom_info.py b/OTRExporter/rom_info.py deleted file mode 100644 index 897b145af..000000000 --- a/OTRExporter/rom_info.py +++ /dev/null @@ -1,100 +0,0 @@ -from enum import Enum -from tabnanny import check -import struct - -class Checksums(Enum): - OOT_NTSC_10 = "EC7011B7" - OOT_NTSC_11 = "D43DA81F" - OOT_NTSC_12 = "693BA2AE" - OOT_PAL_10 = "B044B569" - OOT_PAL_11 = "B2055FBD" - OOT_NTSC_JP_GC_CE = "F7F52DB8" - OOT_NTSC_JP_GC = "F611F4BA" - OOT_NTSC_US_GC = "F3DD35BA" - OOT_PAL_GC = "09465AC3" - OOT_NTSC_JP_MQ = "F43B45BA" - OOT_NTSC_US_MQ = "F034001A" - OOT_PAL_MQ = "1D4136F3" - OOT_PAL_GC_DBG1 = "871E1C92" - OOT_PAL_GC_DBG2 = "87121EFE" - OOT_PAL_GC_MQ_DBG = "917D18F6" - OOT_IQUE_TW = "3D81FB3E" - OOT_IQUE_CN = "B1E1E07B" - OOT_UNKNOWN = "FFFFFFFF" - - @classmethod - def has_value(self, value): - return value in self._value2member_map_ - -class RomVersion: - def __init__(self, file_table_path, file_table_off, xml_ver): - self.file_table_off = file_table_off - self.xml_ver = xml_ver - with open(file_table_path, 'r') as f: - self.file_table = [line.strip('\n') for line in f] - -ROM_INFO_TABLE = dict() -ROM_INFO_TABLE[Checksums.OOT_PAL_GC] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_NMQ_PAL_F") -ROM_INFO_TABLE[Checksums.OOT_PAL_MQ] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_MQ_PAL_F") -ROM_INFO_TABLE[Checksums.OOT_PAL_GC_DBG1] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_NMQ_D") -ROM_INFO_TABLE[Checksums.OOT_PAL_GC_MQ_DBG] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_MQ_D") -ROM_INFO_TABLE[Checksums.OOT_PAL_10] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_10") -ROM_INFO_TABLE[Checksums.OOT_PAL_11] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_11") - -class RomDmaEntry: - def __init__(self, rom, i): - - off = rom.version.file_table_off + 16 * i - - (self.virtStart, \ - self.virtEnd, \ - self.physStart, \ - self.physEnd) = struct.unpack('>IIII', rom.rom_data[off:off+4*4]) - - self.compressed = self.physEnd != 0 - self.size = self.physEnd - self.physStart \ - if self.compressed \ - else self.virtEnd - self.virtStart - self.name = rom.version.file_table[i] - - -class Z64Rom: - def __init__(self, file_path): - self.file_path = file_path - with open(file_path, 'rb') as f: - self.rom_data = f.read() - - self.is_valid = len(self.rom_data) > 20 * 1024 * 1024 - - if not self.is_valid: - return - - # get checkum - checksum_str = self.rom_data[16:16+4].hex().upper() - self.checksum = Checksums(checksum_str) if Checksums.has_value(checksum_str) else Checksums.OOT_UNKNOWN - - if self.checksum == Checksums.OOT_UNKNOWN: - self.is_valid = False - return - - if self.checksum in [Checksums.OOT_NTSC_JP_MQ, Checksums.OOT_NTSC_US_MQ, Checksums.OOT_PAL_GC_MQ_DBG, Checksums.OOT_PAL_MQ]: - self.isMq = True - else: - self.isMq = False - - # get rom version - self.version = ROM_INFO_TABLE[self.checksum] - - def getDmaEntryByIndex(self, i): - return RomDmaEntry(self, i) - - def readDmaEntry(self, entry): - return self.rom_data[entry.physStart:entry.physStart + entry.size] - - @staticmethod - def isValidRom(rom_path): - return Z64Rom(rom_path).is_valid - - @staticmethod - def isMqRom(rom_path): - return Z64Rom(rom_path).isMq diff --git a/ZAPDTR b/ZAPDTR new file mode 160000 index 000000000..e6b076479 --- /dev/null +++ b/ZAPDTR @@ -0,0 +1 @@ +Subproject commit e6b0764799309b96c46f4c77e3ea2aa670f15e89 diff --git a/ZAPDTR/.clang-format b/ZAPDTR/.clang-format deleted file mode 100644 index 784e734e9..000000000 --- a/ZAPDTR/.clang-format +++ /dev/null @@ -1,84 +0,0 @@ ---- -AccessModifierOffset: -4 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: false -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: InlineOnly -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterCaseLabel: true - AfterClass: true - AfterControlStatement: true - AfterEnum: true - AfterFunction: true - AfterNamespace: true - AfterStruct: true - AfterUnion: true - BeforeCatch: true - BeforeElse: true - IndentBraces: false -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Custom -BreakBeforeTernaryOperators: false -BreakConstructorInitializersBeforeComma: false -ColumnLimit: 100 -CommentPragmas: '^ (IWYU pragma:|NOLINT)' -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -ForEachMacros: [ ] -IncludeCategories: - - Regex: '^<[Ww]indows\.h>$' - Priority: 1 - - Regex: '^<' - Priority: 2 - - Regex: '^"' - Priority: 3 -IndentCaseLabels: false -IndentWidth: 4 -IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Left -ReflowComments: true -SortIncludes: true -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Latest -TabWidth: 4 -UseTab: AlignWithSpaces -... - diff --git a/ZAPDTR/.gitignore b/ZAPDTR/.gitignore deleted file mode 100644 index 68c502e36..000000000 --- a/ZAPDTR/.gitignore +++ /dev/null @@ -1,341 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -*.out -*.o -*.d -lib/libgfxd/libgfxd.a -ExporterTest/ExporterTest.a -ZAPDUtils/ZAPDUtils.a -.vscode/ -build/ -ZAPDUtils/build/ -ZAPD/BuildInfo.h diff --git a/ZAPDTR/.gitrepo b/ZAPDTR/.gitrepo deleted file mode 100644 index bf9a6491f..000000000 --- a/ZAPDTR/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = https://github.com/harbourmasters/ZAPDTR - branch = master - commit = d4c35b90aed66eeed61066b4b76e488bfab52b4d - parent = 9d17e19a1dcf2b5c6cef0d3c93816f98a280eb58 - method = rebase - cmdver = 0.4.3 diff --git a/ZAPDTR/ExporterTest/CollisionExporter.cpp b/ZAPDTR/ExporterTest/CollisionExporter.cpp deleted file mode 100644 index c2167180d..000000000 --- a/ZAPDTR/ExporterTest/CollisionExporter.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "CollisionExporter.h" - -void ExporterExample_Collision::Save(ZResource* res, [[maybe_unused]] const fs::path& outPath, - BinaryWriter* writer) -{ - ZCollisionHeader* col = (ZCollisionHeader*)res; - - writer->Write(col->absMinX); - writer->Write(col->absMinY); - writer->Write(col->absMinZ); - - writer->Write(col->absMaxX); - writer->Write(col->absMaxY); - writer->Write(col->absMaxZ); - - writer->Write(col->numVerts); - writer->Write(col->vtxAddress); - - writer->Write(col->numPolygons); - writer->Write(col->polyAddress); - writer->Write(col->polyTypeDefAddress); - writer->Write(col->camDataAddress); - - writer->Write(col->numWaterBoxes); - writer->Write(col->waterBoxAddress); - - writer->Write(col->vtxSegmentOffset); - writer->Write(col->polySegmentOffset); - writer->Write(col->polyTypeDefSegmentOffset); - writer->Write(col->camDataSegmentOffset); - writer->Write(col->waterBoxSegmentOffset); - - uint32_t oldOffset = writer->GetBaseAddress(); - - writer->Seek(col->vtxSegmentOffset, SeekOffsetType::Start); - - for (uint16_t i = 0; i < col->vertices.size(); i++) - { - for (uint32_t j = 0; j < col->vertices[i].dimensions; j++) - { - writer->Write(col->vertices[i].scalars[j].scalarData.s16); - } - } - - writer->Seek(col->polySegmentOffset, SeekOffsetType::Start); - - for (uint16_t i = 0; i < col->polygons.size(); i++) - { - writer->Write(col->polygons[i].type); - writer->Write(col->polygons[i].vtxA); - writer->Write(col->polygons[i].vtxB); - writer->Write(col->polygons[i].vtxC); - writer->Write(col->polygons[i].normX); - writer->Write(col->polygons[i].normY); - writer->Write(col->polygons[i].normZ); - writer->Write(col->polygons[i].dist); - } - - writer->Seek(col->polyTypeDefSegmentOffset, SeekOffsetType::Start); - - for (const auto& poly : col->polygonTypes) - { - writer->Write(poly.data[0]); - writer->Write(poly.data[1]); - } - writer->Seek(col->camDataSegmentOffset, SeekOffsetType::Start); - - for (auto entry : col->camData->entries) - { - writer->Write(entry->cameraSType); - writer->Write(entry->numData); - writer->Write(entry->cameraPosDataSeg); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); -} diff --git a/ZAPDTR/ExporterTest/CollisionExporter.h b/ZAPDTR/ExporterTest/CollisionExporter.h deleted file mode 100644 index 1dc50634e..000000000 --- a/ZAPDTR/ExporterTest/CollisionExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "ZCollision.h" -#include "ZResource.h" - -class ExporterExample_Collision : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/ExporterTest.vcxproj b/ZAPDTR/ExporterTest/ExporterTest.vcxproj deleted file mode 100644 index 341f72ceb..000000000 --- a/ZAPDTR/ExporterTest/ExporterTest.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {65608eb0-1a47-45ad-ab66-192fb64c762c} - ExporterTest - 10.0 - ExporterExample - - - - Application - true - v142 - Unicode - - - Application - false - v143 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - $(ProjectDir)..\ZAPD\;$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath) - - - false - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters b/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters deleted file mode 100644 index 166f563a1..000000000 --- a/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/Main.cpp b/ZAPDTR/ExporterTest/Main.cpp deleted file mode 100644 index 07fdbeece..000000000 --- a/ZAPDTR/ExporterTest/Main.cpp +++ /dev/null @@ -1,79 +0,0 @@ -#include "CollisionExporter.h" -#include "Globals.h" -#include "RoomExporter.h" -#include "TextureExporter.h" - -enum class ExporterFileMode -{ - ModeExample1 = (int)ZFileMode::Custom + 1, - ModeExample2 = (int)ZFileMode::Custom + 2, - ModeExample3 = (int)ZFileMode::Custom + 3, -}; - -static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileMode) -{ - if (buildMode == "me1") - fileMode = (ZFileMode)ExporterFileMode::ModeExample1; - else if (buildMode == "me2") - fileMode = (ZFileMode)ExporterFileMode::ModeExample2; - else if (buildMode == "me3") - fileMode = (ZFileMode)ExporterFileMode::ModeExample3; -} - -static void ExporterParseArgs([[maybe_unused]] int argc, char* argv[], int& i) -{ - std::string arg = argv[i]; - - if (arg == "--do-x") - { - } - else if (arg == "--do-y") - { - } -} - -static bool ExporterProcessFileMode(ZFileMode fileMode) -{ - // Do whatever work is associated with these custom file modes... - // Return true to indicate one of our own file modes is being processed - if (fileMode == (ZFileMode)ExporterFileMode::ModeExample1) - return true; - else if (fileMode == (ZFileMode)ExporterFileMode::ModeExample2) - return true; - else if (fileMode == (ZFileMode)ExporterFileMode::ModeExample3) - return true; - - return false; -} - -static void ExporterFileBegin(ZFile* file) -{ - printf("ExporterFileBegin() called on ZFile %s.\n", file->GetName().c_str()); -} - -static void ExporterFileEnd(ZFile* file) -{ - printf("ExporterFileEnd() called on ZFile %s.\n", file->GetName().c_str()); -} - -static void ImportExporters() -{ - // In this example we set up a new exporter called "EXAMPLE". - // By running ZAPD with the argument -se EXAMPLE, we tell it that we want to use this exporter - // for our resources. - ExporterSet* exporterSet = new ExporterSet(); - exporterSet->processFileModeFunc = ExporterProcessFileMode; - exporterSet->parseFileModeFunc = ExporterParseFileMode; - exporterSet->parseArgsFunc = ExporterParseArgs; - exporterSet->beginFileFunc = ExporterFileBegin; - exporterSet->endFileFunc = ExporterFileEnd; - exporterSet->exporters[ZResourceType::Texture] = new ExporterExample_Texture(); - exporterSet->exporters[ZResourceType::Room] = new ExporterExample_Room(); - exporterSet->exporters[ZResourceType::CollisionHeader] = new ExporterExample_Collision(); - - Globals::AddExporter("EXAMPLE", exporterSet); -} - -// When ZAPD starts up, it will automatically call the below function, which in turn sets up our -// exporters. -REGISTER_EXPORTER(ImportExporters); diff --git a/ZAPDTR/ExporterTest/Makefile b/ZAPDTR/ExporterTest/Makefile deleted file mode 100644 index 42033b7c0..000000000 --- a/ZAPDTR/ExporterTest/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Only used for standalone compilation, usually inherits these from the main makefile -CXXFLAGS ?= -Wall -Wextra -O2 -g -std=c++17 - -SRC_DIRS := $(shell find . -type d -not -path "*build*") -CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) -H_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h)) - -O_FILES := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f) -LIB := ExporterTest.a - -# create build directories -$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir))) - -all: $(LIB) - -clean: - rm -rf build $(LIB) - -format: - clang-format-11 -i $(CPP_FILES) $(H_FILES) - -.PHONY: all clean format - -build/%.o: %.cpp - $(CXX) $(CXXFLAGS) $(OPTFLAGS) -I ./ -I ../ZAPD -I ../ZAPDUtils -I ../lib/tinyxml2 -c $(OUTPUT_OPTION) $< - -$(LIB): $(O_FILES) - $(AR) rcs $@ $^ diff --git a/ZAPDTR/ExporterTest/RoomExporter.cpp b/ZAPDTR/ExporterTest/RoomExporter.cpp deleted file mode 100644 index e77f26485..000000000 --- a/ZAPDTR/ExporterTest/RoomExporter.cpp +++ /dev/null @@ -1,372 +0,0 @@ -#include "RoomExporter.h" -#include "CollisionExporter.h" -#include "Utils/BinaryWriter.h" -#include -#include "Utils/MemoryStream.h" -#include "ZRoom/Commands/SetCameraSettings.h" -#include "ZRoom/Commands/SetCollisionHeader.h" -#include "ZRoom/Commands/SetCsCamera.h" -#include "ZRoom/Commands/SetEchoSettings.h" -#include "ZRoom/Commands/SetEntranceList.h" -#include "ZRoom/Commands/SetLightingSettings.h" -#include "ZRoom/Commands/SetMesh.h" -#include "ZRoom/Commands/SetRoomBehavior.h" -#include "ZRoom/Commands/SetRoomList.h" -#include "ZRoom/Commands/SetSkyboxModifier.h" -#include "ZRoom/Commands/SetSkyboxSettings.h" -#include "ZRoom/Commands/SetSoundSettings.h" -#include "ZRoom/Commands/SetSpecialObjects.h" -#include "ZRoom/Commands/SetStartPositionList.h" -#include "ZRoom/Commands/SetTimeSettings.h" -#include "ZRoom/Commands/SetWind.h" - -void ExporterExample_Room::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZRoom* room = dynamic_cast(res); - - // MemoryStream* memStream = new MemoryStream(); - // BinaryWriter* writer = new BinaryWriter(memStream); - - for (size_t i = 0; i < room->commands.size() * 8; i++) - writer->Write((uint8_t)0); - - for (size_t i = 0; i < room->commands.size(); i++) - { - ZRoomCommand* cmd = room->commands[i]; - - writer->Seek(i * 8, SeekOffsetType::Start); - - writer->Write((uint8_t)cmd->cmdID); - - switch (cmd->cmdID) - { - case RoomCommand::SetWind: - { - SetWind* cmdSetWind = (SetWind*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdSetWind->windWest); // 0x04 - writer->Write(cmdSetWind->windVertical); // 0x05 - writer->Write(cmdSetWind->windSouth); // 0x06 - writer->Write(cmdSetWind->clothFlappingStrength); // 0x07 - } - break; - case RoomCommand::SetTimeSettings: - { - SetTimeSettings* cmdTime = (SetTimeSettings*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdTime->hour); // 0x04 - writer->Write(cmdTime->min); // 0x05 - writer->Write(cmdTime->unk); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - case RoomCommand::SetSkyboxModifier: - { - SetSkyboxModifier* cmdSkybox = (SetSkyboxModifier*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdSkybox->disableSky); // 0x04 - writer->Write(cmdSkybox->disableSunMoon); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - case RoomCommand::SetEchoSettings: - { - SetEchoSettings* cmdEcho = (SetEchoSettings*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)cmdEcho->echo); // 0x07 - } - break; - case RoomCommand::SetSoundSettings: - { - SetSoundSettings* cmdSound = (SetSoundSettings*)cmd; - - writer->Write((uint8_t)cmdSound->reverb); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - - writer->Write(cmdSound->nightTimeSFX); // 0x06 - writer->Write(cmdSound->musicSequence); // 0x07 - } - break; - case RoomCommand::SetSkyboxSettings: - { - SetSkyboxSettings* cmdSkybox = (SetSkyboxSettings*)cmd; - - writer->Write((uint8_t)cmdSkybox->unk1); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)cmdSkybox->skyboxNumber); // 0x04 - writer->Write((uint8_t)cmdSkybox->cloudsType); // 0x05 - writer->Write((uint8_t)cmdSkybox->isIndoors); // 0x06 - } - break; - case RoomCommand::SetRoomBehavior: - { - SetRoomBehavior* cmdRoom = (SetRoomBehavior*)cmd; - - writer->Write((uint8_t)cmdRoom->gameplayFlags); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdRoom->gameplayFlags2); // 0x04 - } - break; - case RoomCommand::SetCsCamera: - { - SetCsCamera* cmdCsCam = (SetCsCamera*)cmd; - - writer->Write((uint8_t)cmdCsCam->cameras.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdCsCam->segmentOffset); // 0x04 - } - break; - case RoomCommand::SetMesh: - { - SetMesh* cmdMesh = (SetMesh*)cmd; - - int baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)cmdMesh->data); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - // TODO: NOT DONE - - writer->Write(cmdMesh->meshHeaderType); - - if (cmdMesh->meshHeaderType == 0) - { - // writer->Write(cmdMesh->) - } - else if (cmdMesh->meshHeaderType == 1) - { - } - else if (cmdMesh->meshHeaderType == 2) - { - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetCameraSettings: - { - SetCameraSettings* cmdCam = (SetCameraSettings*)cmd; - - writer->Write((uint8_t)cmdCam->cameraMovement); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdCam->mapHighlight); // 0x04 - } - break; - case RoomCommand::SetLightingSettings: - { - SetLightingSettings* cmdLight = (SetLightingSettings*)cmd; - - writer->Write((uint8_t)cmdLight->settings.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdLight->segmentOffset); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(cmdLight->segmentOffset, SeekOffsetType::Start); - - for (LightingSettings setting : cmdLight->settings) - { - writer->Write(setting.ambientClrR); - writer->Write(setting.ambientClrG); - writer->Write(setting.ambientClrB); - - writer->Write(setting.diffuseClrA_R); - writer->Write(setting.diffuseClrA_G); - writer->Write(setting.diffuseClrA_B); - - writer->Write(setting.diffuseDirA_X); - writer->Write(setting.diffuseDirA_Y); - writer->Write(setting.diffuseDirA_Z); - - writer->Write(setting.diffuseClrB_R); - writer->Write(setting.diffuseClrB_G); - writer->Write(setting.diffuseClrB_B); - - writer->Write(setting.diffuseDirB_X); - writer->Write(setting.diffuseDirB_Y); - writer->Write(setting.diffuseDirB_Z); - - writer->Write(setting.fogClrR); - writer->Write(setting.fogClrG); - writer->Write(setting.fogClrB); - - writer->Write(setting.unk); - writer->Write(setting.drawDistance); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetRoomList: - { - SetRoomList* cmdRoom = (SetRoomList*)cmd; - - writer->Write((uint8_t)cmdRoom->romfile->rooms.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - auto baseStreamEnd = writer->GetLength(); - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (const auto& entry : cmdRoom->romfile->rooms) - { - writer->Write(entry.virtualAddressStart); - writer->Write(entry.virtualAddressEnd); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetCollisionHeader: - { - SetCollisionHeader* cmdCollHeader = (SetCollisionHeader*)cmd; - - int streamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(streamEnd); // 0x04 - - // TODO: NOT DONE - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(streamEnd, SeekOffsetType::Start); - - ExporterExample_Collision colExp = ExporterExample_Collision(); - - colExp.Save(cmdCollHeader->collisionHeader, outPath, writer); - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetEntranceList: - { - SetEntranceList* cmdEntrance = (SetEntranceList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (EntranceEntry entry : cmdEntrance->entrances) - { - writer->Write((uint8_t)entry.startPositionIndex); - writer->Write((uint8_t)entry.roomToLoad); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetSpecialObjects: - { - SetSpecialObjects* cmdSpecObj = (SetSpecialObjects*)cmd; - - writer->Write((uint8_t)cmdSpecObj->elfMessage); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint16_t)cmdSpecObj->globalObject); // 0x06 - } - break; - case RoomCommand::SetStartPositionList: - { - SetStartPositionList* cmdStartPos = (SetStartPositionList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)cmdStartPos->actors.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (ActorSpawnEntry entry : cmdStartPos->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::EndMarker: - { - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - default: - printf("UNIMPLEMENTED COMMAND: %i\n", (int)cmd->cmdID); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - - break; - } - } - - // writer->Close(); - // DiskFile::WriteAllBytes(StringHelper::Sprintf("%s", res->GetName().c_str()), - // memStream->ToVector()); -} diff --git a/ZAPDTR/ExporterTest/RoomExporter.h b/ZAPDTR/ExporterTest/RoomExporter.h deleted file mode 100644 index d8f7eae01..000000000 --- a/ZAPDTR/ExporterTest/RoomExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZRoom/ZRoom.h" - -class ExporterExample_Room : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/TextureExporter.cpp b/ZAPDTR/ExporterTest/TextureExporter.cpp deleted file mode 100644 index 58d0964d3..000000000 --- a/ZAPDTR/ExporterTest/TextureExporter.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "TextureExporter.h" -#include "../ZAPD/ZFile.h" - -void ExporterExample_Texture::Save(ZResource* res, [[maybe_unused]] const fs::path& outPath, - BinaryWriter* writer) -{ - ZTexture* tex = (ZTexture*)res; - - auto data = tex->parent->GetRawData(); - - for (offset_t i = tex->GetRawDataIndex(); i < tex->GetRawDataIndex() + tex->GetRawDataSize(); - i++) - writer->Write(data[i]); -} diff --git a/ZAPDTR/ExporterTest/TextureExporter.h b/ZAPDTR/ExporterTest/TextureExporter.h deleted file mode 100644 index f3922cac1..000000000 --- a/ZAPDTR/ExporterTest/TextureExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "Utils/BinaryWriter.h" -#include "ZResource.h" -#include "ZTexture.h" - -class ExporterExample_Texture : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/LICENSE b/ZAPDTR/LICENSE deleted file mode 100644 index 90b734bde..000000000 --- a/ZAPDTR/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Zelda Reverse Engineering Team - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile deleted file mode 100644 index e725f94f8..000000000 --- a/ZAPDTR/Makefile +++ /dev/null @@ -1,134 +0,0 @@ -# use variables in submakes -export -OPTIMIZATION_ON ?= 1 -ASAN ?= 0 -DEPRECATION_ON ?= 1 -DEBUG ?= 0 -COPYCHECK_ARGS ?= -LLD ?= 0 -WERROR ?= 0 - -# Use clang++ if available, else use g++ -ifeq ($(shell command -v clang++ >/dev/null 2>&1; echo $$?),0) - CXX := clang++ -else - CXX := g++ -endif - -INC := -I ZAPD -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils -CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer -OPTFLAGS := - -ifneq ($(DEBUG),0) - OPTIMIZATION_ON = 0 - CXXFLAGS += -g3 -DDEVELOPMENT -D_DEBUG - COPYCHECK_ARGS += --devel - DEPRECATION_ON = 0 -endif - -ifneq ($(WERROR),0) - CXXFLAGS += -Werror -endif - -ifeq ($(OPTIMIZATION_ON),0) - OPTFLAGS := -O0 -else - OPTFLAGS := -O2 -endif - -ifneq ($(ASAN),0) - CXXFLAGS += -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined -endif -ifneq ($(DEPRECATION_ON),0) - CXXFLAGS += -DDEPRECATION_ON -endif -# CXXFLAGS += -DTEXTURE_DEBUG - -LDFLAGS := -lm -ldl -lpng - -# Use LLD if available. Set LLD=0 to not use it -ifeq ($(shell command -v ld.lld >/dev/null 2>&1; echo $$?),0) - LLD := 1 -endif - -ifneq ($(LLD),0) - LDFLAGS += -fuse-ld=lld -endif - -UNAME := $(shell uname) -UNAMEM := $(shell uname -m) -ifneq ($(UNAME), Darwin) - LDFLAGS += -Wl,-export-dynamic -lstdc++fs - EXPORTERS := -Wl,--whole-archive ExporterTest/ExporterTest.a -Wl,--no-whole-archive -else - EXPORTERS := -Wl,-force_load ExporterTest/ExporterTest.a - ifeq ($(UNAMEM),arm64) - ifeq ($(shell brew list libpng > /dev/null 2>&1; echo $$?),0) - LDFLAGS += -L $(shell brew --prefix)/lib - INC += -I $(shell brew --prefix)/include - else - $(error Please install libpng via Homebrew) - endif - endif -endif - - -ZAPD_SRC_DIRS := $(shell find ZAPD -type d) -SRC_DIRS = $(ZAPD_SRC_DIRS) lib/tinyxml2 - -ZAPD_CPP_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.cpp)) -ZAPD_H_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.h)) - -CPP_FILES += $(ZAPD_CPP_FILES) lib/tinyxml2/tinyxml2.cpp -O_FILES := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f) -O_FILES += build/ZAPD/BuildInfo.o - -# create build directories -$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir))) - - -# Main targets -all: ZAPD.out copycheck - -build/ZAPD/BuildInfo.o: - python3 ZAPD/genbuildinfo.py $(COPYCHECK_ARGS) - $(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) build/ZAPD/BuildInfo.cpp - -copycheck: ZAPD.out - python3 copycheck.py - -clean: - rm -rf build ZAPD.out - $(MAKE) -C lib/libgfxd clean - $(MAKE) -C ZAPDUtils clean - $(MAKE) -C ExporterTest clean - -rebuild: clean all - -format: - clang-format-11 -i $(ZAPD_CPP_FILES) $(ZAPD_H_FILES) - $(MAKE) -C ZAPDUtils format - $(MAKE) -C ExporterTest format - -.PHONY: all build/ZAPD/BuildInfo.o copycheck clean rebuild format - -build/%.o: %.cpp - $(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) $< - - -# Submakes -lib/libgfxd/libgfxd.a: - $(MAKE) -C lib/libgfxd - -.PHONY: ExporterTest -ExporterTest: - $(MAKE) -C ExporterTest - -.PHONY: ZAPDUtils -ZAPDUtils: - $(MAKE) -C ZAPDUtils - - -# Linking -ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils - $(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION) diff --git a/ZAPDTR/README.md b/ZAPDTR/README.md deleted file mode 100644 index bb96bab1b..000000000 --- a/ZAPDTR/README.md +++ /dev/null @@ -1,163 +0,0 @@ -# ZAPD: Zelda Asset Processor for Decomp - -## Compiling - -### Dependencies - -ZAPD needs a compiler with C++17 support. - -ZAPD has the following library dependencies: - -- `libpng` - -In a Debian/Ubuntu based environment, those could be installed with the following command: - -```bash -sudo apt install libpng-dev -``` - -On a Mac, you will need to install libpng with Homebrew or MacPorts; we currently only support Homebrew. You can run - -```bash -brew install libpng -``` - -to install it via Homebrew. - -### Building - -#### Linux / *nix - -ZAPD uses the clasic `Makefile` approach. To build just run `make` (or even better `make -j` for faster compilations). - -You can configure a bit your ZAPD build with the following options: - -- `OPTIMIZATION_ON`: If set to `0` optimizations will be disabled (compile with `-O0`). Any other value compiles with `-O2`. Defaults to `1`. -- `ASAN`: If it is set to a non-zero then ZAPD will be compiled with Address Sanitizer enabled (`-fsanitize=address`). Defaults to `0`. -- `DEPRECATION_ON`: If it is set to a zero then deprecation warnings will be disabled. Defaults to `1`. -- `DEBUG`: If non-zero, ZAPD will be compiled in _development mode_. This implies the following: - - Debugging symbols enabled (`-g3`). They are disabled by default. - - `OPTIMIZATION_ON=0`: Disables optimizations (`-O0`). - - `DEPRECATION_ON=0`: Disables deprecation warnings. -- `LLD=1`: builds with the LLVM linker `ld.lld` instead of the system default. - -As an example, if you want to build ZAPD with optimizations disabled and use the address sanitizer, you could use the following command: - -```bash -make -j OPTIMIZATION_ON=0 ASAN=1 -``` - -#### Windows - -This repository contains `vcxproj` files for compiling under Visual Studio environments. See `ZAPD/ZAPD.vcxproj`. - -## Invoking ZAPD - -ZAPD needs a _File parsing mode_ to be passed as first parameter. The options are: - -- `e`: "Extraction" mode. - - In this mode, ZAPD expects a XML file as input, a folder as ouput and a path to the baserom files. - - ZAPD will read the XML and use it as a guide to extract the contents of the specified asset file from the baserom folder. - - For more info of the format of those XMLs, see the [ZAPD extraction XML reference](docs/zapd_extraction_xml_reference.md). -- `bsf`: "Build source file" mode. - - This is an experimental mode. - - It was going to be used to let you have XMLs that aren't just for extraction. Might get used, might not. Still need to experiment on that. -- `btex`: "Build texture" mode. - - In this mode, ZAPD expects a PNG file as input, a filename as ouput and a texture type parameter (`-tt`). - - ZAPD will try to convert the given PNG into the contents of a `uint64_t` C array. -- `bren`: "Build (render) background" mode. - - In this mode, ZAPD expects a JPG file as input and a filename as ouput. - - ZAPD will try to convert the given JPG into the contents of a `uint64_t` C array. -- `blb`: "Build blob" mode. - - In this mode, ZAPD expects a BIN file as input and a filename as ouput. - - ZAPD will try to convert the given BIN into the contents of a `uint8_t` C array. - -ZAPD also accepts the following list of extra parameters: - -- `-i PATH` / `--inputpath PATH`: Set input path. -- `-o PATH` / `--outputpath PATH`: Set output path. -- `-b PATH` / `--baserompath`: Set baserom path. - - Can be used only in `e` or `bsf` modes. -- `-osf PATH`: Set source output path. This is the path where the `.c` and `.h` files will be extracted to. If omitted, it will use the value passed to `--outputpath` parameter. -- `-gsf MODE`: Generate source file during extraction. If `MODE` is `1`, C source files will be generated. - - Can be used only in `e` mode. -- `-crc` / `--output-crc`: Outputs a CRC file for each extracted texture. - - Can be used only in `e` or `bsf` modes. -- `-ulzdl MODE`: Use "Legacy ZDisplayList" instead of `libgfxd`. Set `MODE` to `1` to enable it. - - Can be used only in `e` or `bsf` modes. -- `-profile MODE`: Enable profiling. Set `MODE` to `1` to enable it. -- `-uer MODE`: Split resources into their individual components (enabled by default). Set `MODE` to non-`1` to disable it. -- `-tt TYPE`: Set texture type. - - Can be used only in mode `btex`. - - Valid values: - - `rgba32` - - `rgb5a1` - - `i4` - - `i8` - - `ia4` - - `ia8` - - `ia16` - - `ci4` - - `ci8` -- `-rconf PATH` Read Config File. -- `-eh`: Enable error handler. - - Only available in non-Windows environments. -- `-v MODE`: Enable verbosity. Currently there are 3 possible values: - - `0`: Default. Completely silent (except for warnings and errors). - - `1`: Information. - - `2` (and higher): Debug. -- `-wu` / `--warn-unaccounted`: Enable warnings for each unaccounted block of data found. - - Can be used only in `e` or `bsf` modes. -- `-vu` / `--verbose-unaccounted`: Changes how unaccounteds are outputted. Max 4 bytes per line (a word) and add a comment with the offset of each of those lines. - - Could be useful for looking at raw data or testing. - - Can be used only in `e` or `bsf` modes. -- `-tm MODE`: Test Mode (enables certain experimental features). To enable it, set `MODE` to `1`. -- `-se` / `--set-exporter` : Sets which exporter to use. -- `--gcc-compat` : Enables GCC compatibly mode. Slower. -- `-us` / `--unaccounted-static` : Mark unaccounted data as `static` -- `-s` / `--static` : Mark every asset as `static`. - - This behaviour can be overridden per asset using `Static=` in the respective XML node. -- `-W...`: warning flags, see below - -Additionally, you can pass the flag `--version` to see the current ZAPD version. If that flag is passed, ZAPD will ignore any other parameter passed. - -### Warning flags - -ZAPD contains a variety of warning types, with similar syntax to GCC or Clang's compiler warnings. Warnings can have three levels: - -- Off (does not display anything) -- Warn (print a warning but continue processing) -- Err (behave like an error, i.e. print and throw an exception to crash ZAPD when occurs) - -Each warning type uses one of these by default, but can be modified with flags, similarly to GCC or Clang: - -- `-Wfoo` enables warnings of type `foo` -- `-Wno-foo` disables warnings of type `foo` -- `-Werror=foo` escalates `foo` to behave like an error -- `-Weverything` enables all warnings (they may be turned off using `-Wno-` flags afterwards) -- `-Werror` escalates all enabled warnings to errors - -All warning types currently implemented, with their default levels: - -| Warning type | Default level | Description | -| --------------------------- | ------------- | ------------------------------------------------------------------------ | -| `-Wdeprecated` | Warn | Deprecated features | -| `-Whardcoded-pointer` | Warn | ZAPD lacks the info to make a symbol, so must output a hardcoded pointer | -| `-Wintersection` | Warn | Two assets intersect | -| `-Winvalid-attribute-value` | Err | Attribute declared in XML is wrong | -| `-Winvalid-extracted-data` | Err | Extracted data does not have correct form | -| `-Winvalid-jpeg` | Err | JPEG file does not conform to the game's format requirements | -| `-Winvalid-png` | Err | Issues arising when processing PNG data | -| `-Winvalid-xml` | Err | XML has syntax errors | -| `-Wmissing-attribute` | Warn | Required attribute missing in XML tag | -| `-Wmissing-offsets` | Warn | Offset attribute missing in XML tag | -| `-Wmissing-segment` | Warn | Segment not given in File tag in XML | -| `-Wnot-implemented` | Warn | ZAPD does not currently support this feature | -| `-Wunaccounted` | Off | Large blocks of unaccounted | -| `-Wunknown-attribute` | Warn | Unknown attribute in XML entry tag | - -There are also errors that do not have a type, and cannot be disabled. - -For example, here we have invoked ZAPD in the usual way to extract using a (rather badly-written) XML, but escalating `-Wintersection` to an error: - -![ZAPD warnings example](docs/zapd_warning_example.png?raw=true) diff --git a/ZAPDTR/ZAPD/CMakeLists.txt b/ZAPDTR/ZAPD/CMakeLists.txt deleted file mode 100644 index 96c42d00c..000000000 --- a/ZAPDTR/ZAPD/CMakeLists.txt +++ /dev/null @@ -1,497 +0,0 @@ -set(PROJECT_NAME ZAPDLib) - -set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") -#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") -set(CMAKE_C_STANDARD 11) - -################################################################################ -# Source groups -################################################################################ -set(Header_Files - "../lib/tinyxml2/tinyxml2.h" - "CRC32.h" - "Declaration.h" - "FileWorker.h" - "GameConfig.h" - "Globals.h" - "ImageBackend.h" - "OutputFormatter.h" - "WarningHandler.h" - "CrashHandler.h" -) -source_group("Header Files" FILES ${Header_Files}) - -set(Header_Files__Libraries - "../../libultraship/extern/stb/stb_image.h" - "../../libultraship/extern/stb/stb_image_write.h" - "ctpl_stl.h" -) -source_group("Header Files\\Libraries" FILES ${Header_Files__Libraries}) - -set(Header_Files__Libraries__libgfxd - "../lib/libgfxd/gbi.h" - "../lib/libgfxd/gfxd.h" - "../lib/libgfxd/priv.h" -) -source_group("Header Files\\Libraries\\libgfxd" FILES ${Header_Files__Libraries__libgfxd}) - -set(Header_Files__Yaz0 - "yaz0/readwrite.h" - "yaz0/yaz0.h" -) -source_group("Header Files\\Yaz0" FILES ${Header_Files__Yaz0}) - -set(Header_Files__Z64 - "OtherStructs/SkinLimbStructs.h" - "OtherStructs/CutsceneMM_Commands.h" - "OtherStructs/Cutscene_Commands.h" - "ZAnimation.h" - "ZActorList.h" - "ZArray.h" - "ZAudio.h" - "ZBackground.h" - "ZBlob.h" - "ZCollision.h" - "ZCollisionPoly.h" - "ZCutscene.h" - "ZDisplayList.h" - "ZFile.h" - "ZLimb.h" - "ZMtx.h" - "ZPath.h" - "ZPlayerAnimationData.h" - "ZResource.h" - "ZRom.h" - "ZScalar.h" - "ZSkeleton.h" - "ZSurfaceType.h" - "ZString.h" - "ZSymbol.h" - "ZText.h" - "ZTexture.h" - "ZTextureAnimation.h" - "ZVector.h" - "ZVtx.h" -) -source_group("Header Files\\Z64" FILES ${Header_Files__Z64}) - -set(Header_Files__Z64__ZRoom - "ZRoom/ZRoom.h" - "ZRoom/ZRoomCommand.h" -) -source_group("Header Files\\Z64\\ZRoom" FILES ${Header_Files__Z64__ZRoom}) - -set(Header_Files__Z64__ZRoom__Commands - "ZRoom/Commands/EndMarker.h" - "ZRoom/Commands/SetActorCutsceneList.h" - "ZRoom/Commands/SetActorList.h" - "ZRoom/Commands/SetAlternateHeaders.h" - "ZRoom/Commands/SetAnimatedMaterialList.h" - "ZRoom/Commands/SetCameraSettings.h" - "ZRoom/Commands/SetCollisionHeader.h" - "ZRoom/Commands/SetCsCamera.h" - "ZRoom/Commands/SetCutscenes.h" - "ZRoom/Commands/SetEchoSettings.h" - "ZRoom/Commands/SetEntranceList.h" - "ZRoom/Commands/SetExitList.h" - "ZRoom/Commands/SetLightingSettings.h" - "ZRoom/Commands/SetLightList.h" - "ZRoom/Commands/SetMesh.h" - "ZRoom/Commands/SetMinimapChests.h" - "ZRoom/Commands/SetMinimapList.h" - "ZRoom/Commands/SetObjectList.h" - "ZRoom/Commands/SetPathways.h" - "ZRoom/Commands/SetRoomBehavior.h" - "ZRoom/Commands/SetRoomList.h" - "ZRoom/Commands/SetSkyboxModifier.h" - "ZRoom/Commands/SetSkyboxSettings.h" - "ZRoom/Commands/SetSoundSettings.h" - "ZRoom/Commands/SetSpecialObjects.h" - "ZRoom/Commands/SetStartPositionList.h" - "ZRoom/Commands/SetTimeSettings.h" - "ZRoom/Commands/SetTransitionActorList.h" - "ZRoom/Commands/SetWind.h" - "ZRoom/Commands/SetWorldMapVisited.h" - "ZRoom/Commands/Unused09.h" - "ZRoom/Commands/Unused1D.h" - "ZRoom/Commands/ZRoomCommandUnk.h" -) -source_group("Header Files\\Z64\\ZRoom\\Commands" FILES ${Header_Files__Z64__ZRoom__Commands}) - -set(Resource_Files - "../../OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" -) -source_group("Resource Files" FILES ${Resource_Files}) - -set(Source_Files - "CrashHandler.cpp" - "Declaration.cpp" - "FileWorker.cpp" - "GameConfig.cpp" - "Globals.cpp" - "ImageBackend.cpp" - "Main.cpp" - "OutputFormatter.cpp" - "WarningHandler.cpp" -) -source_group("Source Files" FILES ${Source_Files}) - -set(Source_Files__Libraries__libgfxd - "../lib/libgfxd/gfxd.c" - "../lib/libgfxd/uc.c" - "../lib/libgfxd/uc_f3d.c" - "../lib/libgfxd/uc_f3db.c" - "../lib/libgfxd/uc_f3dex.c" - "../lib/libgfxd/uc_f3dex2.c" - "../lib/libgfxd/uc_f3dexb.c" -) -source_group("Source Files\\Libraries\\libgfxd" FILES ${Source_Files__Libraries__libgfxd}) - -set(Source_Files__Yaz0 - "yaz0/yaz0.cpp" -) -source_group("Source Files\\Yaz0" FILES ${Source_Files__Yaz0}) - -set(Source_Files__Z64 - "OtherStructs/SkinLimbStructs.cpp" - "OtherStructs/CutsceneMM_Commands.cpp" - "OtherStructs/Cutscene_Commands.cpp" - "ZAnimation.cpp" - "ZActorList.cpp" - "ZArray.cpp" - "ZAudio.cpp" - "ZAudioDecode.cpp" - "ZBackground.cpp" - "ZBlob.cpp" - "ZCollision.cpp" - "ZCollisionPoly.cpp" - "ZCutscene.cpp" - "ZDisplayList.cpp" - "ZFile.cpp" - "ZLimb.cpp" - "ZMtx.cpp" - "ZPath.cpp" - "ZPlayerAnimationData.cpp" - "ZResource.cpp" - "ZRom.cpp" - "ZScalar.cpp" - "ZSkeleton.cpp" - "ZSurfaceType.cpp" - "ZString.cpp" - "ZSymbol.cpp" - "ZText.cpp" - "ZTexture.cpp" - "ZTextureAnimation.cpp" - "ZVector.cpp" - "ZVtx.cpp" -) -source_group("Source Files\\Z64" FILES ${Source_Files__Z64}) - -set(Source_Files__Z64__ZRoom - "ZRoom/ZRoom.cpp" - "ZRoom/ZRoomCommand.cpp" -) -source_group("Source Files\\Z64\\ZRoom" FILES ${Source_Files__Z64__ZRoom}) - -set(Source_Files__Z64__ZRoom__Commands - "ZRoom/Commands/EndMarker.cpp" - "ZRoom/Commands/SetActorCutsceneList.cpp" - "ZRoom/Commands/SetActorList.cpp" - "ZRoom/Commands/SetAlternateHeaders.cpp" - "ZRoom/Commands/SetAnimatedMaterialList.cpp" - "ZRoom/Commands/SetCameraSettings.cpp" - "ZRoom/Commands/SetCollisionHeader.cpp" - "ZRoom/Commands/SetCsCamera.cpp" - "ZRoom/Commands/SetCutscenes.cpp" - "ZRoom/Commands/SetEchoSettings.cpp" - "ZRoom/Commands/SetEntranceList.cpp" - "ZRoom/Commands/SetExitList.cpp" - "ZRoom/Commands/SetLightingSettings.cpp" - "ZRoom/Commands/SetLightList.cpp" - "ZRoom/Commands/SetMesh.cpp" - "ZRoom/Commands/SetMinimapChests.cpp" - "ZRoom/Commands/SetMinimapList.cpp" - "ZRoom/Commands/SetObjectList.cpp" - "ZRoom/Commands/SetPathways.cpp" - "ZRoom/Commands/SetRoomBehavior.cpp" - "ZRoom/Commands/SetRoomList.cpp" - "ZRoom/Commands/SetSkyboxModifier.cpp" - "ZRoom/Commands/SetSkyboxSettings.cpp" - "ZRoom/Commands/SetSoundSettings.cpp" - "ZRoom/Commands/SetSpecialObjects.cpp" - "ZRoom/Commands/SetStartPositionList.cpp" - "ZRoom/Commands/SetTimeSettings.cpp" - "ZRoom/Commands/SetTransitionActorList.cpp" - "ZRoom/Commands/SetWind.cpp" - "ZRoom/Commands/SetWorldMapVisited.cpp" - "ZRoom/Commands/Unused09.cpp" - "ZRoom/Commands/Unused1D.cpp" - "ZRoom/Commands/ZRoomCommandUnk.cpp" -) -source_group("Source Files\\Z64\\ZRoom\\Commands" FILES ${Source_Files__Z64__ZRoom__Commands}) - -set(ALL_FILES - ${Header_Files} - ${Header_Files__Libraries} - ${Header_Files__Libraries__libgfxd} - ${Header_Files__Yaz0} - ${Header_Files__Z64} - ${Header_Files__Z64__ZRoom} - ${Header_Files__Z64__ZRoom__Commands} - ${Resource_Files} - ${Source_Files} - ${Source_Files__Libraries__libgfxd} - ${Source_Files__Yaz0} - ${Source_Files__Z64} - ${Source_Files__Z64__ZRoom} - ${Source_Files__Z64__ZRoom__Commands} - ${any__any} -) - -################################################################################ -# Target -################################################################################ - -add_library(${PROJECT_NAME} STATIC ${ALL_FILES}) - -add_executable(ZAPD ExecutableMain.cpp) -target_link_libraries(ZAPD ${PROJECT_NAME}) - - - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -use_props(ZAPD "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -endif() -################################################################################ -# Includes for CMake from *.props -################################################################################ - -set(ROOT_NAMESPACE ZAPD) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() -elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin") - set_target_properties(ZAPD PROPERTIES - OUTPUT_NAME "ZAPD.out" - ) -endif() -################################################################################ -# MSVC runtime library -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -foreach(ZTarget ${PROJECT_NAME} ZAPD) - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${ZTarget} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() - set_target_properties(${ZTarget} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) -endforeach() -endif() -################################################################################ -# Compile definitions -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "_CRT_SECURE_NO_WARNINGS;" - "_MBCS" - STORMLIB_NO_AUTO_LINK - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_CRT_SECURE_NO_WARNINGS" - ">" - "_MBCS" - STORMLIB_NO_AUTO_LINK - ) - endif() -endif() - -################################################################################ -# Compile and link options -################################################################################ - -if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(CMAKE_FIND_FRAMEWORK LAST) -endif() -find_package(PNG REQUIRED) - -target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2 - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd - ${PNG_PNG_INCLUDE_DIR}/ - . - ) - -if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Od; - /RTC1 - > - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Od - > - $<$: - /O2; - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /PROFILE - > - $<$: - /OPT:REF; - /OPT:ICF - > - /DEBUG:FULL - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /PROFILE - > - $<$: - /OPT:REF; - /OPT:ICF - > - /DEBUG:FULL - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_options(${PROJECT_NAME} PUBLIC - -Wall -Wextra -Wno-error - -Wno-unused-parameter - -Wno-unused-function - -Wno-unused-variable - -Wno-missing-field-initializers - -Wno-parentheses - -Wno-narrowing - $<$:-Wno-deprecated-enum-enum-conversion> - -pthread - ) - - if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") - target_link_options(${PROJECT_NAME} PUBLIC - -pthread - ) - else() - target_link_options(${PROJECT_NAME} PUBLIC - -pthread - -Wl,-export-dynamic - ) - endif() - -endif() - -################################################################################ -# Dependencies -################################################################################ -add_dependencies(${PROJECT_NAME} - OTRExporter - ZAPDUtils - libultraship -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - "-WHOLEARCHIVE:$/$" - "libultraship;" - storm - PNG::PNG - ) - endif() -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,-force_load $/$ - "libultraship;" - PNG::PNG - ${CMAKE_DL_LIBS} - Threads::Threads - ) -elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,--whole-archive $/$ -Wl,--no-whole-archive - "libultraship;" - PNG::PNG - Threads::Threads - ) -elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - "libultraship;" - PNG::PNG - ) -else() - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,--whole-archive $/$ -Wl,--no-whole-archive - "libultraship;" - PNG::PNG - ${CMAKE_DL_LIBS} - Threads::Threads - ) -endif() - -if(CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") -add_library(pathconf OBJECT pathconf.c) -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}" $ ) -else() -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}") -endif() diff --git a/ZAPDTR/ZAPD/CRC32.h b/ZAPDTR/ZAPD/CRC32.h deleted file mode 100644 index 1f82c75c5..000000000 --- a/ZAPDTR/ZAPD/CRC32.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -static uint32_t CRC32B(const unsigned char* message, int32_t size) -{ - int32_t byte, crc; - int32_t mask; - - crc = 0xFFFFFFFF; - - for (int32_t i = 0; i < size; i++) - { - byte = message[i]; - crc = crc ^ byte; - - for (int32_t j = 7; j >= 0; j--) - { - mask = -(crc & 1); - crc = (crc >> 1) ^ (0xEDB88320 & mask); - } - } - - return ~(uint32_t)(crc); -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/CrashHandler.cpp b/ZAPDTR/ZAPD/CrashHandler.cpp deleted file mode 100644 index 356866536..000000000 --- a/ZAPDTR/ZAPD/CrashHandler.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#include "CrashHandler.h" -#include "Utils/StringHelper.h" - -#if __has_include() -#define HAS_POSIX 1 -#else -#define HAS_POSIX 0 -#endif - -#include -#include -#include -#include - -#if HAS_POSIX == 1 -#include -#include // for __cxa_demangle -#include // for dladdr -#include -#include -#elif defined(_MSC_VER) -#include -#include - -#include - -#pragma comment(lib, "Dbghelp.lib") -#endif - -// Feel free to add more crash messages. -static std::array crashEasterEgg = { - "\tYou've met with a terrible fate, haven't you?", - "\tSEA BEARS FOAM. SLEEP BEARS DREAMS. \n\tBOTH END IN THE SAME WAY: CRASSSH!", - "\tZAPD has fallen and cannot get up.", - "\tIT'S A SECRET TO EVERYBODY. \n\tBut it shouldn't be, you'd better ask about it!", - "\tI AM ERROR.", - "\tGRUMBLE,GRUMBLE...", - "\tDODONGO DISLIKES SMOKE \n\tAnd ZAPD dislikes whatever you fed it.", - "\tMay the way of the Hero lead \n\tto the debugger.", - "\tTHE WIND FISH SLUMBERS LONG... \n\tTHE HERO'S LIFE GONE... ", - "\tSEA BEARS FOAM, SLEEP BEARS DREAMS. \n\tBOTH END IN THE SAME WAY CRASSSH!", - "\tYou've met with a terrible fate, haven't you?", - "\tMaster, I calculate a 100% probability that ZAPD has crashed. \n\tAdditionally, the " - "batteries in your Wii Remote are nearly depleted.", - "\t CONGRATURATIONS! \n" - "\tAll Pages are displayed.\n" - "\t THANK YOU! \n" - "\t You are great debugger!", - "\tRCP is HUNG UP!!\n" - "\tOh! MY GOD!!", -}; - -#if HAS_POSIX == 1 -void ErrorHandler(int sig) -{ - std::array arr; - constexpr size_t nMaxFrames = arr.size(); - size_t size = backtrace(arr.data(), nMaxFrames); - char** symbols = backtrace_symbols(arr.data(), nMaxFrames); - - fprintf(stderr, "\nZAPD crashed. (Signal: %i)\n", sig); - - srand(time(nullptr)); - auto easterIndex = rand() % crashEasterEgg.size(); - - fprintf(stderr, "\n%s\n\n", crashEasterEgg[easterIndex]); - - fprintf(stderr, "Traceback:\n"); - for (size_t i = 1; i < size; i++) - { - Dl_info info; - uint32_t gotAddress = dladdr(arr[i], &info); - std::string functionName(symbols[i]); - - if (gotAddress != 0 && info.dli_sname != nullptr) - { - int32_t status; - char* demangled = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status); - const char* nameFound = info.dli_sname; - - if (status == 0) - { - nameFound = demangled; - } - - functionName = StringHelper::Sprintf("%s (+0x%X)", nameFound, - (char*)arr[i] - (char*)info.dli_saddr); - free(demangled); - } - - fprintf(stderr, "%-3zd %s\n", i, functionName.c_str()); - } - - fprintf(stderr, "\n"); - - free(symbols); - exit(1); -} -#elif defined(_MSC_VER) - -void printStack(CONTEXT* ctx) -{ - BOOL result; - HANDLE process; - HANDLE thread; - HMODULE hModule; - ULONG frame; - DWORD64 displacement; - DWORD disp; - - srand(time(nullptr)); - auto easterIndex = rand() % crashEasterEgg.size(); - - fprintf(stderr, "\n%s\n\n", crashEasterEgg[easterIndex]); - -#if defined(_M_AMD64) - STACKFRAME64 stack; - memset(&stack, 0, sizeof(STACKFRAME64)); -#else - STACKFRAME stack; - memset(&stack, 0, sizeof(STACKFRAME)); -#endif - - char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(TCHAR)]; - char module[512]; - - PSYMBOL_INFO symbol = (PSYMBOL_INFO)buffer; - - CONTEXT ctx2; - memcpy(&ctx2, ctx, sizeof(CONTEXT)); - - process = GetCurrentProcess(); - thread = GetCurrentThread(); - SymInitialize(process, nullptr, TRUE); - - constexpr DWORD machineType = -#if defined(_M_AMD64) - IMAGE_FILE_MACHINE_AMD64; -#else - IMAGE_FILE_MACHINE_I386; -#endif - - displacement = 0; - - for (frame = 0;; frame++) - { - result = StackWalk(machineType, process, thread, &stack, &ctx2, nullptr, - SymFunctionTableAccess, SymGetModuleBase, nullptr); - if (!result) - { - break; - } - symbol->SizeOfStruct = sizeof(SYMBOL_INFO); - symbol->MaxNameLen = MAX_SYM_NAME; - SymFromAddr(process, (ULONG64)stack.AddrPC.Offset, &displacement, symbol); -#if defined(_M_AMD64) - IMAGEHLP_LINE64 line; - line.SizeOfStruct = sizeof(IMAGEHLP_LINE64); -#else - IMAGEHLP_LINE line; - line.SizeOfStruct = sizeof(IMAGEHLP_LINE); -#endif - if (SymGetLineFromAddr(process, stack.AddrPC.Offset, &disp, &line)) - { - fprintf(stderr, "%u\t %s in %s: line: %lu: \n", frame, symbol->Name, line.FileName, - line.LineNumber); - } - - else - { - fprintf(stderr, "%u\tat % s\n", frame, symbol->Name); - hModule = nullptr; - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | - GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - (LPCTSTR)(stack.AddrPC.Offset), &hModule); - - if (hModule != nullptr) - { - GetModuleFileNameA(hModule, module, 512 - 1); - } - fprintf(stderr, "%u\tIn %s\n", frame, module); - } - } -} - -LONG seh_filter(_EXCEPTION_POINTERS* ex) -{ - fprintf(stderr, "EXCEPTION 0x%x occured\n", ex->ExceptionRecord->ExceptionCode); - printStack(ex->ContextRecord); - return EXCEPTION_EXECUTE_HANDLER; -} -#endif - -void CrashHandler_Init() -{ -#if HAS_POSIX == 1 - signal(SIGSEGV, ErrorHandler); - signal(SIGABRT, ErrorHandler); -#elif defined(_MSC_VER) - SetUnhandledExceptionFilter(seh_filter); -#else - HANDLE_WARNING(WarningType::Always, - "tried to set error handler, but this ZAPD build lacks support for one", ""); -#endif -} diff --git a/ZAPDTR/ZAPD/CrashHandler.h b/ZAPDTR/ZAPD/CrashHandler.h deleted file mode 100644 index 102778bec..000000000 --- a/ZAPDTR/ZAPD/CrashHandler.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CRASH_HANDLER_H -#define CRASH_HANDLER_H - -void CrashHandler_Init(); - -#endif diff --git a/ZAPDTR/ZAPD/Declaration.cpp b/ZAPDTR/ZAPD/Declaration.cpp deleted file mode 100644 index 3f0c0ad93..000000000 --- a/ZAPDTR/ZAPD/Declaration.cpp +++ /dev/null @@ -1,236 +0,0 @@ -#include "Declaration.h" - -#include "Globals.h" -#include "ZVtx.h" -#include "Utils/StringHelper.h" - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nText) -{ - address = nAddress; - alignment = nAlignment; - size = nSize; - text = nText; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCnt = nArrayItemCnt; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nArrayItemCntStr, const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCntStr = nArrayItemCntStr; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText, bool nIsExternal) - : Declaration(nAddress, nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) -{ - isExternal = nIsExternal; -} - -Declaration::Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize, - const std::string& nVarType, const std::string& nVarName) - : Declaration(nAddress, DeclarationAlignment::Align4, nSize, "") -{ - includePath = nIncludePath; - varType = nVarType; - varName = nVarName; -} - -Declaration::~Declaration() -{ - //for (auto item : vertexHack) - //delete item; -} - -bool Declaration::IsStatic() const -{ - switch (staticConf) - { - case StaticConfig::Off: - return false; - - case StaticConfig::Global: - return Globals::Instance->forceStatic; - - case StaticConfig::On: - return true; - } - - return false; -} - -std::string Declaration::GetNormalDeclarationStr() const -{ - std::string output; - - if (preText != "") - output += preText + "\n"; - - if (IsStatic()) - { - output += "static "; - } - - if (isArray) - { - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - { - output += StringHelper::Sprintf("%s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - { - output += StringHelper::Sprintf("%s %s[%i] = {\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - else - { - output += StringHelper::Sprintf("%s %s[] = {\n", varType.c_str(), varName.c_str()); - } - - output += text + "\n"; - } - else - { - output += StringHelper::Sprintf("%s %s = { ", varType.c_str(), varName.c_str()); - output += text; - } - - if (output.back() == '\n') - output += "};"; - else - output += " };"; - - if (rightText != "") - output += " " + rightText + ""; - - output += "\n"; - - if (postText != "") - output += postText + "\n"; - - output += "\n"; - - return output; -} - -std::string Declaration::GetExternalDeclarationStr() const -{ - std::string output; - - if (preText != "") - output += preText + "\n"; - - if (IsStatic()) - { - output += "static "; - } - - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - output += StringHelper::Sprintf("%s %s[%s] = ", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - output += - StringHelper::Sprintf("%s %s[%i] = ", varType.c_str(), varName.c_str(), arrayItemCnt); - else - output += StringHelper::Sprintf("%s %s[] = ", varType.c_str(), varName.c_str()); - - output += StringHelper::Sprintf("{\n#include \"%s\"\n};", includePath.c_str()); - - if (rightText != "") - output += " " + rightText + ""; - - output += "\n"; - - if (postText != "") - output += postText + "\n"; - - output += "\n"; - - return output; -} - -std::string Declaration::GetExternStr() const -{ - if (IsStatic() || varType == "" || isUnaccounted) - { - return ""; - } - - if (Globals::Instance->otrMode) /* && (varType == "Gfx" || varType == "u64" || varType == "AnimationHeader" || varType == "LinkAnimationHeader" || - varType == "StandardLimb" || varType == "JointIndex" || varType == "Vtx" || varType == "FlexSkeletonHeader" || varType == "SkeletonHeader") || - varType == "CollisionHeader") */ - return ""; - - if (isArray) - { - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - { - return StringHelper::Sprintf("extern %s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - { - return StringHelper::Sprintf("extern %s %s[%i];\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - else - return StringHelper::Sprintf("extern %s %s[];\n", varType.c_str(), varName.c_str()); - } - - return StringHelper::Sprintf("extern %s %s;\n", varType.c_str(), varName.c_str()); -} - -std::string Declaration::GetStaticForwardDeclarationStr() const -{ - if (!IsStatic() || isUnaccounted) - return ""; - - if (isArray) - { - if (arrayItemCntStr == "" && arrayItemCnt == 0) - { - // Forward declaring static arrays without specifying the size is not allowed. - return ""; - } - - if (arrayItemCntStr != "") - { - return StringHelper::Sprintf("static %s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else - { - return StringHelper::Sprintf("static %s %s[%i];\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - } - - return StringHelper::Sprintf("static %s %s;\n", varType.c_str(), varName.c_str()); -} diff --git a/ZAPDTR/ZAPD/Declaration.h b/ZAPDTR/ZAPD/Declaration.h deleted file mode 100644 index 64712d8c3..000000000 --- a/ZAPDTR/ZAPD/Declaration.h +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once - -#include -#include -#include - -// TODO: should we drop the `_t` suffix because of UNIX compliance? -typedef uint32_t segptr_t; -typedef uint32_t offset_t; - -#define SEGMENTED_NULL ((segptr_t)0) - -enum class DeclarationAlignment -{ - Align4, - Align8 -}; - -enum class StaticConfig -{ - Off, - Global, - On -}; - -class ZVtx; - -class Declaration -{ -public: - offset_t address; - DeclarationAlignment alignment; - size_t size; - std::string preText; - std::string text; - std::string rightText; - std::string postText; - std::string preComment; - std::string postComment; - std::string varType; - std::string varName; - std::string includePath; - - std::vector vertexHack; - - bool isExternal = false; - bool isArray = false; - bool forceArrayCnt = false; - size_t arrayItemCnt = 0; - std::string arrayItemCntStr = ""; - std::vector references; - bool isUnaccounted = false; - bool isPlaceholder = false; - bool declaredInXml = false; - StaticConfig staticConf = StaticConfig::Global; - - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nArrayItemCntStr, const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText, bool nIsExternal); - - Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize, - const std::string& nVarType, const std::string& nVarName); - - ~Declaration(); - - bool IsStatic() const; - - std::string GetNormalDeclarationStr() const; - std::string GetExternalDeclarationStr() const; - - std::string GetExternStr() const; - - std::string GetStaticForwardDeclarationStr() const; - -protected: - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nText); -}; diff --git a/ZAPDTR/ZAPD/ExecutableMain.cpp b/ZAPDTR/ZAPD/ExecutableMain.cpp deleted file mode 100644 index 303ea24ad..000000000 --- a/ZAPDTR/ZAPD/ExecutableMain.cpp +++ /dev/null @@ -1,5 +0,0 @@ -extern "C" int zapd_main(int argc, char* argv[]); - -int main(int argc, char* argv[]) { - return zapd_main(argc, argv); -} diff --git a/ZAPDTR/ZAPD/FileWorker.cpp b/ZAPDTR/ZAPD/FileWorker.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/FileWorker.h b/ZAPDTR/ZAPD/FileWorker.h deleted file mode 100644 index 6ceae8076..000000000 --- a/ZAPDTR/ZAPD/FileWorker.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZFile.h" - -class FileWorker -{ -public: - std::vector files; - std::vector externalFiles; - std::vector segments; - std::map> segmentRefFiles; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/GameConfig.cpp b/ZAPDTR/ZAPD/GameConfig.cpp deleted file mode 100644 index 9a2e8898c..000000000 --- a/ZAPDTR/ZAPD/GameConfig.cpp +++ /dev/null @@ -1,207 +0,0 @@ -#include "GameConfig.h" - -#include -#include -#include - -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "ZFile.h" -#include "tinyxml2.h" - -using ConfigFunc = void (GameConfig::*)(const tinyxml2::XMLElement&); - -GameConfig::~GameConfig() -{ - for (auto& declPair : segmentRefFiles) - { - for (auto& file : declPair.second) - { - delete file; - } - } -} - -void GameConfig::ReadTexturePool(const fs::path& texturePoolXmlPath) -{ - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(texturePoolXmlPath.string().c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - fprintf(stderr, "Warning: Unable to read texture pool XML with error code %i\n", eResult); - return; - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - return; - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - if (std::string_view(child->Name()) == "Texture") - { - std::string crcStr = child->Attribute("CRC"); - fs::path texPath = child->Attribute("Path"); - std::string texName; - - uint32_t crc = strtoul(crcStr.c_str(), nullptr, 16); - - texturePool[crc].path = texPath; - } - } -} - -void GameConfig::GenSymbolMap(const fs::path& symbolMapPath) -{ - auto symbolLines = DiskFile::ReadAllLines(symbolMapPath); - - for (std::string& symbolLine : symbolLines) - { - auto split = StringHelper::Split(symbolLine, " "); - uint32_t addr = strtoul(split[0].c_str(), nullptr, 16); - std::string symbolName = split[1]; - - symbolMap[addr] = std::move(symbolName); - } -} - -void GameConfig::ConfigFunc_SymbolMap(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - GenSymbolMap(Path::GetDirectoryName(configFilePath) / fileName); -} - -void GameConfig::ConfigFunc_ActorList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - actorList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_ObjectList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - objectList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_EntranceList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - entranceList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_specialEntranceList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - specialEntranceList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_TexturePool(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - ReadTexturePool(Path::GetDirectoryName(configFilePath) / fileName); -} - -void GameConfig::ConfigFunc_BGConfig(const tinyxml2::XMLElement& element) -{ - bgScreenWidth = element.IntAttribute("ScreenWidth", 320); - bgScreenHeight = element.IntAttribute("ScreenHeight", 240); -} - -void GameConfig::ConfigFunc_ExternalXMLFolder(const tinyxml2::XMLElement& element) -{ - const char* pathValue = element.Attribute("Path"); - if (pathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'Path' attribute in `ExternalXMLFolder` element.\n")); - } - if (externalXmlFolder != "") - { - throw std::runtime_error(StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t `ExternalXMLFolder` is duplicated.\n")); - } - externalXmlFolder = pathValue; -} - -void GameConfig::ConfigFunc_ExternalFile(const tinyxml2::XMLElement& element) -{ - const char* xmlPathValue = element.Attribute("XmlPath"); - if (xmlPathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'XmlPath' attribute in `ExternalFile` element.\n")); - } - const char* outPathValue = element.Attribute("OutPath"); - if (outPathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'OutPath' attribute in `ExternalFile` element.\n")); - } - - externalFiles.push_back(ExternalFile(fs::path(xmlPathValue), fs::path(outPathValue))); -} - -void GameConfig::ReadConfigFile(const fs::path& argConfigFilePath) -{ - static const std::unordered_map ConfigFuncDictionary = { - {"SymbolMap", &GameConfig::ConfigFunc_SymbolMap}, - {"ActorList", &GameConfig::ConfigFunc_ActorList}, - {"ObjectList", &GameConfig::ConfigFunc_ObjectList}, - {"EntranceList", &GameConfig::ConfigFunc_EntranceList}, - {"SpecialEntranceList", &GameConfig::ConfigFunc_specialEntranceList}, - {"TexturePool", &GameConfig::ConfigFunc_TexturePool}, - {"BGConfig", &GameConfig::ConfigFunc_BGConfig}, - {"ExternalXMLFolder", &GameConfig::ConfigFunc_ExternalXMLFolder}, - {"ExternalFile", &GameConfig::ConfigFunc_ExternalFile}, - }; - - configFilePath = argConfigFilePath.string(); - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(configFilePath.c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - throw std::runtime_error("Error: Unable to read config file."); - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - return; - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - auto it = ConfigFuncDictionary.find(child->Name()); - if (it == ConfigFuncDictionary.end()) - { - fprintf(stderr, "Unsupported configuration variable: %s\n", child->Name()); - continue; - } - - std::invoke(it->second, *this, *child); - } -} diff --git a/ZAPDTR/ZAPD/GameConfig.h b/ZAPDTR/ZAPD/GameConfig.h deleted file mode 100644 index 2a783d10a..000000000 --- a/ZAPDTR/ZAPD/GameConfig.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "Utils/Directory.h" -#include "tinyxml2.h" - -struct TexturePoolEntry -{ - fs::path path = ""; // Path to Shared Texture -}; - -class ExternalFile -{ -public: - fs::path xmlPath, outPath; - - ExternalFile(fs::path nXmlPath, fs::path nOutPath); -}; - -class ZFile; - -class GameConfig -{ -public: - std::string configFilePath; - std::map> segmentRefFiles; - std::map symbolMap; - std::vector actorList; - std::vector objectList; - std::vector entranceList; - std::vector specialEntranceList; - std::map texturePool; // Key = CRC - - // ZBackground - uint32_t bgScreenWidth = 320, bgScreenHeight = 240; - - // ExternalFile - fs::path externalXmlFolder; - std::vector externalFiles; - - GameConfig() = default; - ~GameConfig(); - - void ReadTexturePool(const fs::path& texturePoolXmlPath); - void GenSymbolMap(const fs::path& symbolMapPath); - - void ConfigFunc_SymbolMap(const tinyxml2::XMLElement& element); - void ConfigFunc_ActorList(const tinyxml2::XMLElement& element); - void ConfigFunc_ObjectList(const tinyxml2::XMLElement& element); - void ConfigFunc_EntranceList(const tinyxml2::XMLElement& element); - void ConfigFunc_specialEntranceList(const tinyxml2::XMLElement& element); - void ConfigFunc_TexturePool(const tinyxml2::XMLElement& element); - void ConfigFunc_BGConfig(const tinyxml2::XMLElement& element); - void ConfigFunc_ExternalXMLFolder(const tinyxml2::XMLElement& element); - void ConfigFunc_ExternalFile(const tinyxml2::XMLElement& element); - - void ReadConfigFile(const fs::path& configFilePath); -}; diff --git a/ZAPDTR/ZAPD/Globals.cpp b/ZAPDTR/ZAPD/Globals.cpp deleted file mode 100644 index a6b22cfa2..000000000 --- a/ZAPDTR/ZAPD/Globals.cpp +++ /dev/null @@ -1,325 +0,0 @@ -#include "Globals.h" - -#include -#include - -#include -#include "Utils/Path.h" -#include "WarningHandler.h" -#include "tinyxml2.h" - -Globals* Globals::Instance; - -Globals::Globals() -{ - Instance = this; - - game = ZGame::OOT_RETAIL; - genSourceFile = true; - testMode = false; - profile = false; - useLegacyZDList = false; - useExternalResources = true; - singleThreaded = true; - verbosity = VerbosityLevel::VERBOSITY_SILENT; - outputPath = Directory::GetCurrentDirectory(); -} - -Globals::~Globals() -{ - for (const auto& w : workerData) - { - delete w.second; - } - - if (rom != nullptr) - { - delete rom; - } -} - -void Globals::AddSegment(int32_t segment, ZFile* file, int workerID) -{ - if (!Globals::Instance->singleThreaded) - { - auto worker = workerData[workerID]; - - if (std::find(worker->segments.begin(), worker->segments.end(), segment) == - worker->segments.end()) - worker->segments.push_back(segment); - if (worker->segmentRefFiles.find(segment) == worker->segmentRefFiles.end()) - worker->segmentRefFiles[segment] = std::vector(); - - worker->segmentRefFiles[segment].push_back(file); - } - else - { - if (std::find(segments.begin(), segments.end(), segment) == segments.end()) - segments.push_back(segment); - if (cfg.segmentRefFiles.find(segment) == cfg.segmentRefFiles.end()) - cfg.segmentRefFiles[segment] = std::vector(); - - cfg.segmentRefFiles[segment].push_back(file); - } -} - -bool Globals::HasSegment(int32_t segment, int workerID) -{ - if (!Globals::Instance->singleThreaded) - return std::find(workerData[workerID]->segments.begin(), - workerData[workerID]->segments.end(), segment) != workerData[workerID]->segments.end(); - else - return std::find(segments.begin(), segments.end(), segment) != segments.end(); -} - -ZFile* Globals::GetSegment(int32_t segment, int workerID) -{ - if (!Globals::Instance->singleThreaded) - { - if (HasSegment(segment, workerID)) - { - int idx = std::find(workerData[workerID]->segments.begin(), - workerData[workerID]->segments.end(), segment) - - workerData[workerID]->segments.begin(); - return workerData[workerID]->files[idx]; - } - else - return nullptr; - } - else - { - if (HasSegment(segment, workerID)) - { - int idx = std::find(segments.begin(), segments.end(), segment) - segments.begin(); - return files[idx]; - } - else - return nullptr; - } -} - -std::map> Globals::GetSegmentRefFiles(int workerID) -{ - if (!Globals::Instance->singleThreaded) - return workerData[workerID]->segmentRefFiles; - else - return cfg.segmentRefFiles; -} - -void Globals::AddFile(ZFile* file, int workerID) -{ - if (singleThreaded) - files.push_back(file); - else - workerData[workerID]->files.push_back(file); -} - -void Globals::AddExternalFile(ZFile* file, int workerID) -{ - if (singleThreaded) - externalFiles.push_back(file); - else - workerData[workerID]->externalFiles.push_back(file); -} - -void Globals::BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath) -{ - std::string name = outPath.stem().string(); - - ZTexture tex(nullptr); - - if (name.find("u32") != std::string::npos) - tex.dWordAligned = false; - - tex.FromPNG(pngFilePath.string(), texType); - std::string cfgPath = StringHelper::Split(pngFilePath.string(), ".")[0] + ".cfg"; - - if (DiskFile::Exists(cfgPath)) - name = DiskFile::ReadAllText(cfgPath); - - std::string src = tex.GetBodySourceCode(); - - DiskFile::WriteAllBytes(outPath.string(), src.c_str(), src.size()); -} - -std::map& Globals::GetExporterMap() -{ - static std::map exporters; - return exporters; -} - -void Globals::AddExporter(std::string exporterName, ExporterSet* exporterSet) -{ - auto& exporters = GetExporterMap(); - exporters[exporterName] = exporterSet; -} - -ZResourceExporter* Globals::GetExporter(ZResourceType resType) -{ - auto& exporters = GetExporterMap(); - - if (currentExporter != "" && exporters[currentExporter]->exporters.find(resType) != - exporters[currentExporter]->exporters.end()) - return exporters[currentExporter]->exporters[resType]; - else - return nullptr; -} - -ExporterSet* Globals::GetExporterSet() -{ - auto& exporters = GetExporterMap(); - - if (currentExporter != "") - return exporters[currentExporter]; - else - return nullptr; -} - -std::vector Globals::GetBaseromFile(std::string fileName) -{ - if (fileMode == ZFileMode::ExtractDirectory) - { - if (StringHelper::Contains(fileName, "baserom/")) - fileName = StringHelper::Split(fileName, "baserom/")[1]; - - return rom->GetFile(fileName); - - } - else - return DiskFile::ReadAllBytes(fileName); -} - -bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID) -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint8_t segment = GETSEGNUM(segAddress); - uint32_t offset = Seg2Filespace(segAddress, currentFile->baseAddress); - ZSymbol* sym; - - sym = currentFile->GetSymbolResource(offset); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - sym = currentFile->GetSymbolResource(segAddress); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - - if (currentFile->IsSegmentedInFilespaceRange(segAddress)) - { - if (currentFile->GetDeclarationPtrName(segAddress, expectedType, declName)) - return true; - } - else if (HasSegment(segment, workerID)) - { - // OTRTODO: Multithreading - auto segs = GetSegmentRefFiles(workerID); - for (auto file : segs[segment]) - { - offset = Seg2Filespace(segAddress, file->baseAddress); - - sym = file->GetSymbolResource(offset); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - sym = file->GetSymbolResource(segAddress); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - - if (file->IsSegmentedInFilespaceRange(segAddress)) - { - if (file->GetDeclarationPtrName(segAddress, expectedType, declName)) - return true; - } - } - } - - const auto& symbolFromMap = Globals::Instance->cfg.symbolMap.find(segAddress); - if (symbolFromMap != Globals::Instance->cfg.symbolMap.end()) - { - declName = "&" + symbolFromMap->second; - return true; - } - - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; -} - -bool Globals::GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize, - ZFile* currentFile, const std::string& expectedType, - std::string& declName, int workerID) -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint8_t segment = GETSEGNUM(segAddress); - - if (currentFile->IsSegmentedInFilespaceRange(segAddress)) - { - bool addressFound = currentFile->GetDeclarationArrayIndexedName(segAddress, elementSize, - expectedType, declName); - if (addressFound) - return true; - } - else if (HasSegment(segment, workerID)) - { - // OTRTODO: Multithreading - auto segs = GetSegmentRefFiles(workerID); - for (auto file : segs[segment]) - { - if (file->IsSegmentedInFilespaceRange(segAddress)) - { - bool addressFound = file->GetDeclarationArrayIndexedName(segAddress, elementSize, - expectedType, declName); - if (addressFound) - return true; - } - } - } - - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; -} - -ExternalFile::ExternalFile(fs::path nXmlPath, fs::path nOutPath) - : xmlPath{nXmlPath}, outPath{nOutPath} -{ -} - -ExporterSet::~ExporterSet() -{ - for (auto& it : exporters) - { - delete it.second; - } -} diff --git a/ZAPDTR/ZAPD/Globals.h b/ZAPDTR/ZAPD/Globals.h deleted file mode 100644 index 0fe8e0545..000000000 --- a/ZAPDTR/ZAPD/Globals.h +++ /dev/null @@ -1,113 +0,0 @@ -#pragma once - -#include -#include -#include -#include "GameConfig.h" -#include "ZFile.h" -#include -#include - -class ZRoom; - -enum class VerbosityLevel -{ - VERBOSITY_SILENT, - VERBOSITY_INFO, - VERBOSITY_DEBUG -}; - -typedef void (*ExporterSetFunc)(ZFile*); -typedef bool (*ExporterSetFuncBool)(ZFileMode fileMode); -typedef void (*ExporterSetFuncVoid)(int argc, char* argv[], int& i); -typedef void (*ExporterSetFuncVoid2)(const std::string& buildMode, ZFileMode& fileMode); -typedef void (*ExporterSetFuncVoid3)(); -typedef void (*ExporterSetFuncVoid4)(tinyxml2::XMLElement* reader); -typedef void (*ExporterSetResSave)(ZResource* res, BinaryWriter& writer); - -class ExporterSet -{ -public: - ~ExporterSet(); - - std::map exporters; - ExporterSetFuncVoid parseArgsFunc = nullptr; - ExporterSetFuncVoid2 parseFileModeFunc = nullptr; - ExporterSetFuncBool processFileModeFunc = nullptr; - ExporterSetFunc beginFileFunc = nullptr; - ExporterSetFunc endFileFunc = nullptr; - ExporterSetFuncVoid3 beginXMLFunc = nullptr; - ExporterSetFuncVoid3 endXMLFunc = nullptr; - ExporterSetResSave resSaveFunc = nullptr; - ExporterSetFuncVoid3 endProgramFunc = nullptr; - - ExporterSetFuncVoid4 processCompilableFunc = nullptr; -}; - -class Globals -{ -public: - static Globals* Instance; - - bool genSourceFile; // Used for extraction - bool useExternalResources; - bool testMode; // Enables certain experimental features - bool outputCrc = false; - bool profile; // Measure performance of certain operations - bool useLegacyZDList; - bool singleThreaded; - VerbosityLevel verbosity; // ZAPD outputs additional information - ZFileMode fileMode = ZFileMode::Invalid; - fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath, fileListPath; - TextureType texType; - ZGame game; - GameConfig cfg; - bool verboseUnaccounted = false; - bool gccCompat = false; - bool forceStatic = false; - bool forceUnaccountedStatic = false; - bool otrMode = true; - bool buildRawTexture = false; - bool onlyGenSohOtr = false; - - ZRom* rom = nullptr; - std::vector files; - std::vector externalFiles; - std::vector segments; - - std::map workerData; - - std::string currentExporter; - static std::map& GetExporterMap(); - static void AddExporter(std::string exporterName, ExporterSet* exporterSet); - - Globals(); - ~Globals(); - - void AddSegment(int32_t segment, ZFile* file, int workerID); - bool HasSegment(int32_t segment, int workerID); - ZFile* GetSegment(int32_t segment, int workerID); - std::map> GetSegmentRefFiles(int workerID); - void AddFile(ZFile* file, int workerID); - void AddExternalFile(ZFile* file, int workerID); - void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath); - - ZResourceExporter* GetExporter(ZResourceType resType); - ExporterSet* GetExporterSet(); - - std::vector GetBaseromFile(std::string fileName); - - /** - * Search in every file (and the symbol map) for the `segAddress` passed as parameter. - * If the segment of `currentFile` is the same segment of `segAddress`, then that file will be - * used only, otherwise, the search will be performed in every other file. - * The name of that variable will be stored in the `declName` parameter. - * Returns `true` if the address is found. `false` otherwise, - * in which case `declName` will be set to the address formatted as a pointer. - */ - bool GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID); - - bool GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID); -}; diff --git a/ZAPDTR/ZAPD/ImageBackend.cpp b/ZAPDTR/ZAPD/ImageBackend.cpp deleted file mode 100644 index 7ebb29121..000000000 --- a/ZAPDTR/ZAPD/ImageBackend.cpp +++ /dev/null @@ -1,506 +0,0 @@ -#include "ImageBackend.h" - -#include -#include -#include -#include - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -/* ImageBackend */ - -ImageBackend::~ImageBackend() -{ - FreeImageData(); -} - -void ImageBackend::ReadPng(const char* filename) -{ - FreeImageData(); - - FILE* fp = fopen(filename, "rb"); - if (fp == nullptr) - { - std::string errorHeader = StringHelper::Sprintf("could not open file '%s'", filename); - HANDLE_ERROR(WarningType::InvalidPNG, errorHeader, ""); - } - - png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (png == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png struct", ""); - } - - png_infop info = png_create_info_struct(png); - if (info == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png info", ""); - } - - if (setjmp(png_jmpbuf(png))) - { - // TODO: better warning explanation - HANDLE_ERROR(WarningType::InvalidPNG, "setjmp(png_jmpbuf(png))", ""); - } - - png_init_io(png, fp); - - png_read_info(png, info); - - width = png_get_image_width(png, info); - height = png_get_image_height(png, info); - colorType = png_get_color_type(png, info); - bitDepth = png_get_bit_depth(png, info); - -#ifdef TEXTURE_DEBUG - printf("Width: %u\n", width); - printf("Height: %u\n", height); - printf("ColorType: "); - switch (colorType) - { - case PNG_COLOR_TYPE_RGBA: - printf("PNG_COLOR_TYPE_RGBA\n"); - break; - - case PNG_COLOR_TYPE_RGB: - printf("PNG_COLOR_TYPE_RGB\n"); - break; - - case PNG_COLOR_TYPE_PALETTE: - printf("PNG_COLOR_TYPE_PALETTE\n"); - break; - - default: - printf("%u\n", colorType); - break; - } - printf("BitDepth: %u\n", bitDepth); - printf("\n"); -#endif - - // Read any color_type into 8bit depth, RGBA format. - // See http://www.libpng.org/pub/png/libpng-manual.txt - - if (bitDepth == 16) - png_set_strip_16(png); - - if (colorType == PNG_COLOR_TYPE_PALETTE) - { - // png_set_palette_to_rgb(png); - isColorIndexed = true; - } - - // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth. - if (colorType == PNG_COLOR_TYPE_GRAY && bitDepth < 8) - png_set_expand_gray_1_2_4_to_8(png); - - /*if (png_get_valid(png, info, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(png);*/ - - // These color_type don't have an alpha channel then fill it with 0xff. - /*if(*color_type == PNG_COLOR_TYPE_RGB || - *color_type == PNG_COLOR_TYPE_GRAY || - *color_type == PNG_COLOR_TYPE_PALETTE) - png_set_filler(png, 0xFF, PNG_FILLER_AFTER);*/ - - if (colorType == PNG_COLOR_TYPE_GRAY || colorType == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png); - - png_read_update_info(png, info); - - size_t rowBytes = png_get_rowbytes(png, info); - pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = (uint8_t*)malloc(rowBytes); - } - - png_read_image(png, pixelMatrix); - -#ifdef TEXTURE_DEBUG - printf("rowBytes: %zu\n", rowBytes); - - size_t bytePerPixel = GetBytesPerPixel(); - printf("imgData\n"); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - for (size_t z = 0; z < bytePerPixel; z++) - { - printf("%02X ", pixelMatrix[y][x * bytePerPixel + z]); - } - printf(" "); - } - printf("\n"); - } - printf("\n"); -#endif - - fclose(fp); - - png_destroy_read_struct(&png, &info, nullptr); - - hasImageData = true; -} - -void ImageBackend::ReadPng(const fs::path& filename) -{ - ReadPng(filename.string().c_str()); -} - -void ImageBackend::WritePng(const char* filename) -{ - assert(hasImageData); - - FILE* fp = fopen(filename, "wb"); - if (fp == nullptr) - { - std::string errorHeader = - StringHelper::Sprintf("could not open file '%s' in write mode", filename); - HANDLE_ERROR(WarningType::InvalidPNG, errorHeader, ""); - } - - png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (png == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png struct", ""); - } - - png_infop info = png_create_info_struct(png); - if (info == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png info", ""); - } - - if (setjmp(png_jmpbuf(png))) - { - // TODO: better warning description - HANDLE_ERROR(WarningType::InvalidPNG, "setjmp(png_jmpbuf(png))", ""); - } - - png_init_io(png, fp); - - png_set_IHDR(png, info, width, height, - bitDepth, // 8, - colorType, // PNG_COLOR_TYPE_RGBA, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - if (isColorIndexed) - { - png_set_PLTE(png, info, static_cast(colorPalette), paletteSize); - -#ifdef TEXTURE_DEBUG - printf("palette\n"); - png_color* aux = (png_color*)colorPalette; - for (size_t y = 0; y < paletteSize; y++) - { - printf("#%02X%02X%02X ", aux[y].red, aux[y].green, aux[y].blue); - if ((y + 1) % 8 == 0) - printf("\n"); - } - printf("\n"); -#endif - - png_set_tRNS(png, info, alphaPalette, paletteSize, nullptr); - } - - png_write_info(png, info); - - // To remove the alpha channel for PNG_COLOR_TYPE_RGB format, - // Use png_set_filler(). - // png_set_filler(png, 0, PNG_FILLER_AFTER); - -#ifdef TEXTURE_DEBUG - size_t bytePerPixel = GetBytesPerPixel(); - printf("imgData\n"); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width * bytePerPixel; x++) - { - printf("%02X ", pixelMatrix[y][x]); - } - printf("\n"); - } - printf("\n"); -#endif - - png_write_image(png, pixelMatrix); - png_write_end(png, nullptr); - - fclose(fp); - - png_destroy_write_struct(&png, &info); -} - -void ImageBackend::WritePng(const fs::path& filename) -{ - // Note: The .string() is necessary for MSVC, due to the implementation of std::filesystem - // differing from GCC. Do not remove! - WritePng(filename.string().c_str()); -} - -void ImageBackend::SetTextureData(const std::vector>& texData, - uint32_t nWidth, uint32_t nHeight, uint8_t nColorType, - uint8_t nBitDepth) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = nColorType; - bitDepth = nBitDepth; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(malloc(sizeof(uint8_t*) * width * bytePerPixel)); - for (size_t x = 0; x < width; x++) - { - pixelMatrix[y][x * bytePerPixel + 0] = texData.at(y).at(x).r; - pixelMatrix[y][x * bytePerPixel + 1] = texData.at(y).at(x).g; - pixelMatrix[y][x * bytePerPixel + 2] = texData.at(y).at(x).b; - - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = texData.at(y).at(x).a; - } - } - hasImageData = true; -} - -void ImageBackend::InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = PNG_COLOR_TYPE_RGB; - if (alpha) - colorType = PNG_COLOR_TYPE_RGBA; - bitDepth = 8; // nBitDepth; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); - } - - hasImageData = true; -} - -void ImageBackend::InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = PNG_COLOR_TYPE_PALETTE; - bitDepth = 8; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); - } - colorPalette = calloc(paletteSize, sizeof(png_color)); - alphaPalette = static_cast(calloc(paletteSize, sizeof(uint8_t))); - - hasImageData = true; - isColorIndexed = true; -} - -RGBAPixel ImageBackend::GetPixel(size_t y, size_t x) const -{ - assert(y < height); - assert(x < width); - assert(!isColorIndexed); - - RGBAPixel pixel; - size_t bytePerPixel = GetBytesPerPixel(); - pixel.r = pixelMatrix[y][x * bytePerPixel + 0]; - pixel.g = pixelMatrix[y][x * bytePerPixel + 1]; - pixel.b = pixelMatrix[y][x * bytePerPixel + 2]; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixel.a = pixelMatrix[y][x * bytePerPixel + 3]; - return pixel; -} - -uint8_t ImageBackend::GetIndexedPixel(size_t y, size_t x) const -{ - assert(y < height); - assert(x < width); - assert(isColorIndexed); - - return pixelMatrix[y][x]; -} - -void ImageBackend::SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = nR; - pixelMatrix[y][x * bytePerPixel + 1] = nG; - pixelMatrix[y][x * bytePerPixel + 2] = nB; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = nA; -} - -void ImageBackend::SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = grayscale; - pixelMatrix[y][x * bytePerPixel + 1] = grayscale; - pixelMatrix[y][x * bytePerPixel + 2] = grayscale; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = alpha; -} - -void ImageBackend::SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = index; - - assert(index < paletteSize); - png_color* pal = static_cast(colorPalette); - pal[index].red = grayscale; - pal[index].green = grayscale; - pal[index].blue = grayscale; - alphaPalette[index] = 255; -} - -void ImageBackend::SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - assert(isColorIndexed); - assert(index < paletteSize); - - png_color* pal = static_cast(colorPalette); - pal[index].red = nR; - pal[index].green = nG; - pal[index].blue = nB; - alphaPalette[index] = nA; -} - -void ImageBackend::SetPalette(const ImageBackend& pal, uint32_t offset) -{ - assert(isColorIndexed); - size_t bytePerPixel = pal.GetBytesPerPixel(); - - for (size_t y = 0; y < pal.height; y++) - { - for (size_t x = 0; x < pal.width; x++) - { - size_t index = y * pal.width + x; - if (index >= paletteSize) - { - /* - * Some TLUTs are bigger than 256 colors. - * For those cases, we will only take the first 256 - * to colorize this CI texture. - */ - return; - } - - uint8_t r = pal.pixelMatrix[y][x * bytePerPixel + 0]; - uint8_t g = pal.pixelMatrix[y][x * bytePerPixel + 1]; - uint8_t b = pal.pixelMatrix[y][x * bytePerPixel + 2]; - uint8_t a = pal.pixelMatrix[y][x * bytePerPixel + 3]; - SetPaletteIndex(index + offset, r, g, b, a); - } - } -} - -uint32_t ImageBackend::GetWidth() const -{ - return width; -} - -uint32_t ImageBackend::GetHeight() const -{ - return height; -} - -uint8_t ImageBackend::GetColorType() const -{ - return colorType; -} - -uint8_t ImageBackend::GetBitDepth() const -{ - return bitDepth; -} - -double ImageBackend::GetBytesPerPixel() const -{ - switch (colorType) - { - case PNG_COLOR_TYPE_RGBA: - return 4 * bitDepth / 8; - - case PNG_COLOR_TYPE_RGB: - return 3 * bitDepth / 8; - - case PNG_COLOR_TYPE_PALETTE: - return 1 * bitDepth / 8; - - default: - HANDLE_ERROR(WarningType::InvalidPNG, "invalid color type", ""); - } -} - -void ImageBackend::FreeImageData() -{ - if (hasImageData) - { - for (size_t y = 0; y < height; y++) - free(pixelMatrix[y]); - free(pixelMatrix); - pixelMatrix = nullptr; - } - - if (isColorIndexed) - { - free(colorPalette); - free(alphaPalette); - colorPalette = nullptr; - alphaPalette = nullptr; - isColorIndexed = false; - } - - hasImageData = false; -} - -/* RGBAPixel */ - -void RGBAPixel::SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - r = nR; - g = nG; - b = nB; - a = nA; -} - -void RGBAPixel::SetGrayscale(uint8_t grayscale, uint8_t alpha) -{ - r = grayscale; - g = grayscale; - b = grayscale; - a = alpha; -} diff --git a/ZAPDTR/ZAPD/ImageBackend.h b/ZAPDTR/ZAPD/ImageBackend.h deleted file mode 100644 index 0b1f4806c..000000000 --- a/ZAPDTR/ZAPD/ImageBackend.h +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once - -#include -#include - -#include "Utils/Directory.h" - -class RGBAPixel -{ -public: - RGBAPixel() = default; - - void SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); - void SetGrayscale(uint8_t grayscale, uint8_t alpha = 0); - - uint8_t r = 0; - uint8_t g = 0; - uint8_t b = 0; - uint8_t a = 0; -}; - -class ImageBackend -{ -public: - ImageBackend() = default; - ~ImageBackend(); - - void ReadPng(const char* filename); - void ReadPng(const fs::path& filename); - void WritePng(const char* filename); - void WritePng(const fs::path& filename); - - void SetTextureData(const std::vector>& texData, uint32_t nWidth, - uint32_t nHeight, uint8_t nColorType, uint8_t nBitDepth); - void InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha); - void InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight); - - RGBAPixel GetPixel(size_t y, size_t x) const; - uint8_t GetIndexedPixel(size_t y, size_t x) const; - - void SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA = 0); - void SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha = 0); - - void SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale); - void SetIndexedPixel(size_t y, size_t x, uint8_t index, RGBAPixel pixel); - void SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); - void SetPalette(const ImageBackend& pal, uint32_t offset = 0); - - uint32_t GetWidth() const; - uint32_t GetHeight() const; - uint8_t GetColorType() const; - uint8_t GetBitDepth() const; - -protected: - uint8_t** pixelMatrix = nullptr; // height * [width * bytePerPixel] - - void* colorPalette = nullptr; - uint8_t* alphaPalette = nullptr; - size_t paletteSize = 16 * 16; - - uint32_t width = 0; - uint32_t height = 0; - uint8_t colorType = 0; - uint8_t bitDepth = 0; - - bool hasImageData = false; - bool isColorIndexed = false; - - double GetBytesPerPixel() const; - - void FreeImageData(); -}; diff --git a/ZAPDTR/ZAPD/Main.cpp b/ZAPDTR/ZAPD/Main.cpp deleted file mode 100644 index a2030aaa4..000000000 --- a/ZAPDTR/ZAPD/Main.cpp +++ /dev/null @@ -1,594 +0,0 @@ -#include "Globals.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "WarningHandler.h" - -#include "ZAnimation.h" -ZNormalAnimation nAnim(nullptr); -ZCurveAnimation cAnim(nullptr); -ZLinkAnimation lAnim(nullptr); -ZLegacyAnimation lAnim2(nullptr); - -#include "ZArray.h" -ZArray arr(nullptr); - -#include "ZAudio.h" -ZAudio audio(nullptr); - -#include "ZBackground.h" -ZBackground back(nullptr); - -#include "ZBlob.h" -ZBlob blob(nullptr); - -#include "ZCollision.h" -ZCollisionHeader colHeader(nullptr); - -#include "ZCutscene.h" -ZCutscene cs(nullptr); - -#include "ZLimb.h" -ZLimb limb(nullptr); - -#include "ZMtx.h" -ZMtx mtx(nullptr); - -#include "ZPath.h" -ZPath path(nullptr); - -#include "ZPlayerAnimationData.h" -ZPlayerAnimationData pAnimData(nullptr); - -#include "ZScalar.h" -ZScalar scalar(nullptr); - -#include "ZSkeleton.h" -ZLimbTable limbTbl(nullptr); -ZSkeleton skel(nullptr); - -#include "ZString.h" -ZString str(nullptr); - -#include "ZSymbol.h" -ZSymbol sym(nullptr); - -#include "ZText.h" -ZText txt(nullptr); - -#include "ZTexture.h" -ZTexture tex(nullptr); - -#include "ZVector.h" -ZVector vec(nullptr); - -#include "ZVtx.h" -ZVtx vtx(nullptr); - -#include "ZRoom/ZRoom.h" -ZRoom room(nullptr); - -#include "ZFile.h" -#include "ZTexture.h" - -#include "CrashHandler.h" - -#include -#include -#include "tinyxml2.h" -#include - -//extern const char gBuildHash[]; -const char gBuildHash[] = ""; - -bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath, - ZFileMode fileMode, int workerID); - -void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath); -void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath); -void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath); -int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode); - -volatile int numWorkersLeft = 0; - -extern void ImportExporters(); - -extern "C" int zapd_main(int argc, char* argv[]) -{ - // Syntax: ZAPD.out [mode (btex/bovl/e)] (Arbritrary Number of Arguments) - - if (argc < 2) - { - printf("ZAPD.out (%s) [mode (btex/bovl/bsf/bblb/bmdlintr/bamnintr/e)] ...\n", gBuildHash); - return 1; - } - - Globals* g = new Globals(); - WarningHandler::Init(argc, argv); - - for (int i = 1; i < argc; i++) - { - if (!strcmp(argv[i], "--version")) - { - printf("ZAPD.out %s\n", gBuildHash); - return 0; - } - else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) - { - printf("Congratulations!\n"); - printf("You just found the (unimplemented and undocumented) ZAPD's help message.\n"); - printf("Feel free to implement it if you want :D\n"); - - WarningHandler::PrintHelp(); - return 0; - } - } - - // Parse other "commands" - for (int32_t i = 2; i < argc; i++) - { - std::string arg = argv[i]; - - if (arg == "-o" || arg == "--outputpath") // Set output path - { - Globals::Instance->outputPath = argv[++i]; - - if (Globals::Instance->sourceOutputPath == "") - Globals::Instance->sourceOutputPath = Globals::Instance->outputPath; - } - else if (arg == "-i" || arg == "--inputpath") // Set input path - { - Globals::Instance->inputPath = argv[++i]; - } - else if (arg == "-b" || arg == "--baserompath") // Set baserom path - { - Globals::Instance->baseRomPath = argv[++i]; - } - else if (arg == "-osf") // Set source output path - { - Globals::Instance->sourceOutputPath = argv[++i]; - } - else if (arg == "-gsf") // Generate source file during extraction - { - Globals::Instance->genSourceFile = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-tm") // Test Mode (enables certain experimental features) - { - Globals::Instance->testMode = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-crc" || - arg == "--output-crc") // Outputs a CRC file for each extracted texture. - { - Globals::Instance->testMode = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-ulzdl") // Use Legacy ZDisplay List - { - Globals::Instance->useLegacyZDList = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-profile") // Enable profiling - { - Globals::Instance->profile = std::string_view(argv[++i]) == "1"; - } - else if (arg == - "-uer") // Split resources into their individual components (enabled by default) - // TODO: We may wish to make this a part of the config file... - { - Globals::Instance->useExternalResources = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-tt") // Set texture type - { - Globals::Instance->texType = ZTexture::GetTextureTypeFromString(argv[++i]); - } - else if (arg == "-fl") // Set baserom filelist path - { - Globals::Instance->fileListPath = argv[++i]; - } - else if (arg == "-rconf") // Read Config File - { - Globals::Instance->cfg.ReadConfigFile(argv[++i]); - } - else if (arg == "-eh") // Enable Error Handler - { - CrashHandler_Init(); - } - else if (arg == "-v") // Verbose - { - Globals::Instance->verbosity = static_cast(strtol(argv[++i], NULL, 16)); - } - else if (arg == "-vu" || arg == "--verbose-unaccounted") // Verbose unaccounted - { - Globals::Instance->verboseUnaccounted = true; - } - else if (arg == "-se" || arg == "--set-exporter") // Set Current Exporter - { - ImportExporters(); - Globals::Instance->currentExporter = argv[++i]; - } - else if (arg == "--gcc-compat") // GCC compatibility - { - Globals::Instance->gccCompat = true; - } - else if (arg == "-s" || arg == "--static") - { - Globals::Instance->forceStatic = true; - } - else if (arg == "-us" || arg == "--unaccounted-static") - { - Globals::Instance->forceUnaccountedStatic = true; - } - else if (arg == "-brt" || arg == "--build-raw-texture") - { - Globals::Instance->buildRawTexture = true; - } - else if (arg == "--norom") - { - Globals::Instance->onlyGenSohOtr = true; - } - } - - - // Parse File Mode - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if(Globals::Instance->onlyGenSohOtr) { - exporterSet->endProgramFunc(); - - delete g; - return 0; - } - - std::string buildMode = argv[1]; - ZFileMode fileMode = ZFileMode::Invalid; - - if (buildMode == "btex") - fileMode = ZFileMode::BuildTexture; - else if (buildMode == "bren") - fileMode = ZFileMode::BuildBackground; - else if (buildMode == "bsf") - fileMode = ZFileMode::BuildSourceFile; - else if (buildMode == "bblb") - fileMode = ZFileMode::BuildBlob; - else if (buildMode == "e") - fileMode = ZFileMode::Extract; - else if (buildMode == "ed") - fileMode = ZFileMode::ExtractDirectory; - else if (exporterSet != nullptr && exporterSet->parseFileModeFunc != nullptr) - exporterSet->parseFileModeFunc(buildMode, fileMode); - - if (fileMode == ZFileMode::Invalid) - { - printf("Error: Invalid file mode '%s'\n", buildMode.c_str()); - return 1; - } - - Globals::Instance->fileMode = fileMode; - - if (fileMode == ZFileMode::ExtractDirectory) - Globals::Instance->rom = new ZRom(Globals::Instance->baseRomPath.string()); - - // We've parsed through our commands once. If an exporter exists, it's been set by now. - // Now we'll parse through them again but pass them on to our exporter if one is available. - - if (exporterSet != nullptr && exporterSet->parseArgsFunc != nullptr) - { - for (int32_t i = 2; i < argc; i++) - exporterSet->parseArgsFunc(argc, argv, i); - } - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("ZAPD: Zelda Asset Processor For Decomp: %s\n", gBuildHash); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - WarningHandler::PrintWarningsDebugInfo(); - } - - // TODO: switch - if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile || fileMode == ZFileMode::ExtractDirectory) - { - bool procFileModeSuccess = false; - - if (exporterSet != nullptr && exporterSet->processFileModeFunc != nullptr) - procFileModeSuccess = exporterSet->processFileModeFunc(fileMode); - - if (!procFileModeSuccess) - { - if (fileMode == ZFileMode::ExtractDirectory) - { - std::vector fileList = - Directory::ListFiles(Globals::Instance->inputPath.string()); - - const int num_threads = std::thread::hardware_concurrency(); - ctpl::thread_pool pool(num_threads > 1 ? num_threads / 2 : 1); - - bool parseSuccessful; - - auto start = std::chrono::steady_clock::now(); - int fileListSize = fileList.size(); - Globals::Instance->singleThreaded = false; - - for (int i = 0; i < fileListSize; i++) - Globals::Instance->workerData[i] = new FileWorker(); - - numWorkersLeft = fileListSize; - - for (int i = 0; i < fileListSize; i++) - { - if (Globals::Instance->singleThreaded) - { - ExtractFunc(i, fileList.size(), fileList[i], fileMode); - } - else - { - std::string fileListItem = fileList[i]; - pool.push([i, fileListSize, fileListItem, fileMode](int) { - ExtractFunc(i, fileListSize, fileListItem, fileMode); - }); - } - } - - if (!Globals::Instance->singleThreaded) - { - while (true) - { - if (numWorkersLeft <= 0) - break; - - std::this_thread::sleep_for(std::chrono::milliseconds(250)); - } - } - - auto end = std::chrono::steady_clock::now(); - auto diff = - std::chrono::duration_cast(end - start).count(); - - printf("Generated OTR File Data in %i seconds\n", diff); - } - else - { - bool parseSuccessful; - - for (auto& extFile : Globals::Instance->cfg.externalFiles) - { - fs::path externalXmlFilePath = - Globals::Instance->cfg.externalXmlFolder / extFile.xmlPath; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file from config: '%s'\n", - externalXmlFilePath.c_str()); - } - - parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath, - extFile.outPath, ZFileMode::ExternalFile, 0); - - if (!parseSuccessful) - return 1; - } - - parseSuccessful = - Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath, - Globals::Instance->outputPath, fileMode, 0); - if (!parseSuccessful) - return 1; - } - } - } - else if (fileMode == ZFileMode::BuildTexture) - { - TextureType texType = Globals::Instance->texType; - BuildAssetTexture(Globals::Instance->inputPath, texType, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBackground) - { - BuildAssetBackground(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBlob) - { - BuildAssetBlob(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - - if (exporterSet != nullptr && exporterSet->endProgramFunc != nullptr) - exporterSet->endProgramFunc(); - -end: - delete exporterSet; - - //Globals::Instance->GetExporterSet() = nullptr; //TODO NULL this out. Compiler complains about lvalue assignment. - - delete g; - return 0; -} - -int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode) -{ - bool parseSuccessful; - - printf("(%i / %i): %s\n", (workerID + 1), fileListSize, fileListItem.c_str()); - - for (auto& extFile : Globals::Instance->cfg.externalFiles) - { - fs::path externalXmlFilePath = Globals::Instance->cfg.externalXmlFolder / extFile.xmlPath; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file from config: '%s'\n", externalXmlFilePath.c_str()); - } - - parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath, - extFile.outPath, ZFileMode::ExternalFile, workerID); - - if (!parseSuccessful) - return 1; - } - - parseSuccessful = Parse(fileListItem, Globals::Instance->baseRomPath, - Globals::Instance->outputPath, fileMode, workerID); - - if (!parseSuccessful) - return 1; - - if (Globals::Instance->singleThreaded) - { - for (int i = 0; i < Globals::Instance->files.size(); i++) - { - delete Globals::Instance->files[i]; - Globals::Instance->files.erase(Globals::Instance->files.begin() + i); - i--; - } - - Globals::Instance->externalFiles.clear(); - Globals::Instance->segments.clear(); - Globals::Instance->cfg.segmentRefFiles.clear(); - } - else - { - for (int i = 0; i < Globals::Instance->workerData[workerID]->files.size(); i++) - { - delete Globals::Instance->workerData[workerID]->files[i]; - Globals::Instance->workerData[workerID]->files.erase( - Globals::Instance->workerData[workerID]->files.begin() + - i); - i--; - } - - Globals::Instance->workerData[workerID]->externalFiles.clear(); - Globals::Instance->workerData[workerID]->segments.clear(); - Globals::Instance->workerData[workerID]->segmentRefFiles.clear(); - - numWorkersLeft--; - } - return 0; -} - -bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath, - ZFileMode fileMode, int workerID) -{ - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(xmlFilePath.string().c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - // TODO: use XMLDocument::ErrorIDToName to get more specific error messages here - HANDLE_ERROR(WarningType::InvalidXML, - StringHelper::Sprintf("invalid XML file: '%s'", xmlFilePath.c_str()), ""); - return false; - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - { - HANDLE_WARNING( - WarningType::InvalidXML, - StringHelper::Sprintf("missing Root tag in xml file: '%s'", xmlFilePath.c_str()), ""); - return false; - } - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != NULL; - child = child->NextSiblingElement()) - { - if (std::string_view(child->Name()) == "File") - { - ZFile* file = new ZFile(fileMode, child, basePath, outPath, "", xmlFilePath, workerID); - Globals::Instance->AddFile(file, workerID); - if (fileMode == ZFileMode::ExternalFile) - { - Globals::Instance->AddExternalFile(file, workerID); - file->isExternalFile = true; - } - } - else if (std::string(child->Name()) == "ExternalFile") - { - const char* xmlPathValue = child->Attribute("XmlPath"); - if (xmlPathValue == nullptr) - { - throw std::runtime_error(StringHelper::Sprintf( - "Parse: Fatal error in '%s'.\n" - "\t Missing 'XmlPath' attribute in `ExternalFile` element.\n", - xmlFilePath.c_str())); - } - const char* outPathValue = child->Attribute("OutPath"); - if (outPathValue == nullptr) - { - throw std::runtime_error(StringHelper::Sprintf( - "Parse: Fatal error in '%s'.\n" - "\t Missing 'OutPath' attribute in `ExternalFile` element.\n", - xmlFilePath.c_str())); - } - - fs::path externalXmlFilePath = - Globals::Instance->cfg.externalXmlFolder / fs::path(xmlPathValue); - fs::path externalOutFilePath = fs::path(outPathValue); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file: '%s'\n", externalXmlFilePath.c_str()); - } - - // Recursion. What can go wrong? - Parse(externalXmlFilePath, basePath, externalOutFilePath, ZFileMode::ExternalFile, workerID); - } - else - { - std::string errorHeader = - StringHelper::Sprintf("when parsing file '%s'", xmlFilePath.c_str()); - std::string errorBody = StringHelper::Sprintf( - "Found a resource outside a File element: '%s'", child->Name()); - HANDLE_ERROR(WarningType::InvalidXML, errorHeader, errorBody); - } - } - - if (fileMode != ZFileMode::ExternalFile) - { - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if (exporterSet != nullptr && exporterSet->beginXMLFunc != nullptr) - exporterSet->beginXMLFunc(); - - std::vector files; - - if (Globals::Instance->singleThreaded) - files = Globals::Instance->files; - else - files = Globals::Instance->workerData[workerID]->files; - - for (ZFile* file : files) - { - if (fileMode == ZFileMode::BuildSourceFile) - file->BuildSourceFile(); - else - file->ExtractResources(); - } - - if (exporterSet != nullptr && exporterSet->endXMLFunc != nullptr) - exporterSet->endXMLFunc(); - } - - return true; -} - -void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath) -{ - return Globals::Instance->BuildAssetTexture(pngFilePath, texType, outPath); -} - -void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath) -{ - ZBackground background(nullptr); - background.ParseBinaryFile(imageFilePath.string(), false); - - DiskFile::WriteAllText(outPath.string(), background.GetBodySourceCode()); -} - -void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath) -{ - ZBlob* blob = ZBlob::FromFile(blobFilePath.string()); - std::string name = outPath.stem().string(); // filename without extension - - std::string src = blob->GetBodySourceCode(); - - DiskFile::WriteAllText(outPath.string(), src); - - delete blob; -} diff --git a/ZAPDTR/ZAPD/NuGet/libpng.static.txt b/ZAPDTR/ZAPD/NuGet/libpng.static.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp b/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp deleted file mode 100644 index edefbc051..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp +++ /dev/null @@ -1,213 +0,0 @@ -#include "CutsceneMM_Commands.h" - -#include -#include - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -// Specific for command lists where each entry has size 8 bytes -const std::unordered_map csCommandsDescMM = { - {CutsceneMMCommands::CS_CMD_MISC, {"CS_MISC", "(0x%02X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_SET_LIGHTING, {"CS_LIGHTING", "(0x%02X, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_SCENE_TRANS_FX, {"CS_SCENE_TRANS_FX", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_MOTIONBLUR, {"CS_MOTIONBLUR", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_GIVETATL, {"CS_GIVETATL", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_PLAYSEQ, {"CS_PLAYSEQ", "(0x%04X, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_130, {"CS_SCENE_UNK_130", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_131, {"CS_SCENE_UNK_131", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_132, {"CS_SCENE_UNK_132", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_STOPSEQ, {"CS_STOPSEQ", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_PLAYAMBIENCE, {"CS_PLAYAMBIENCE", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_FADEAMBIENCE, {"CS_FADEAMBIENCE", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_TERMINATOR, {"CS_TERMINATOR", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_CHOOSE_CREDITS_SCENES, - {"CS_CHOOSE_CREDITS_SCENES", "(%i, %i, %i)"}}, -}; - -CutsceneSubCommandEntry_GenericMMCmd::CutsceneSubCommandEntry_GenericMMCmd( - const std::vector& rawData, offset_t rawDataIndex, CutsceneMMCommands cmdId) - : CutsceneSubCommandEntry(rawData, rawDataIndex), commandId(cmdId) -{ -} - -std::string CutsceneSubCommandEntry_GenericMMCmd::GetBodySourceCode() const -{ - const auto& element = csCommandsDescMM.find(commandId); - std::string entryFmt = "CS_UNK_DATA(0x%02X, %i, %i, %i)"; - - if (element != csCommandsDescMM.end()) - { - entryFmt = element->second.cmdMacro; - entryFmt += element->second.args; - } - - return StringHelper::Sprintf(entryFmt.c_str(), base, startFrame, endFrame, pad); -} - -CutsceneMMCommand_GenericCmd::CutsceneMMCommand_GenericCmd(const std::vector& rawData, - offset_t rawDataIndex, - CutsceneMMCommands cmdId) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - commandID = static_cast(cmdId); - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_GenericMMCmd(rawData, rawDataIndex, cmdId); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_GenericCmd::GetCommandMacro() const -{ - const auto& element = csCommandsDescMM.find(static_cast(commandID)); - - if (element != csCommandsDescMM.end()) - { - return StringHelper::Sprintf("%s_LIST(%i)", element->second.cmdMacro, numEntries); - } - - return StringHelper::Sprintf("CS_UNK_DATA_LIST(0x%X, %i)", commandID, numEntries); -} - -CutsceneSubCommandEntry_Camera::CutsceneSubCommandEntry_Camera(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ -} - -std::string CutsceneSubCommandEntry_Camera::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CMD_HH(0x%04X, 0x%04X)", base, startFrame); -} - -size_t CutsceneSubCommandEntry_Camera::GetRawSize() const -{ - return 0x04; -} - -CutsceneMMCommand_Camera::CutsceneMMCommand_Camera(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries / 4; i++) - { - auto* entry = new CutsceneSubCommandEntry_Camera(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_Camera::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_CAMERA_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_FadeScreen::CutsceneSubCommandEntry_FadeScreen( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_06 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x06); - unk_07 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x07); - unk_08 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - unk_09 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); - unk_0A = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0A); - unk_0B = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0B); -} - -std::string CutsceneSubCommandEntry_FadeScreen::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_FADESCREEN(0x%02X, %i, %i, %i, %i, %i)", base, startFrame, - endFrame, unk_06, unk_07, unk_08); -} - -size_t CutsceneSubCommandEntry_FadeScreen::GetRawSize() const -{ - return 0x0C; -} - -CutsceneMMCommand_FadeScreen::CutsceneMMCommand_FadeScreen(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_FadeScreen(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_FadeScreen::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_FADESCREEN_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_FadeSeq::CutsceneSubCommandEntry_FadeSeq( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_08 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); -} - -std::string CutsceneSubCommandEntry_FadeSeq::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_FADESEQ(%i, %i, %i)", base, startFrame, endFrame); -} - -size_t CutsceneSubCommandEntry_FadeSeq::GetRawSize() const -{ - return 0x0C; -} - -CutsceneMMCommand_FadeSeq::CutsceneMMCommand_FadeSeq(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_FadeSeq(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_FadeSeq::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_FADESEQ_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_NonImplemented::CutsceneSubCommandEntry_NonImplemented( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ -} - -CutsceneMMCommand_NonImplemented::CutsceneMMCommand_NonImplemented( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_NonImplemented(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} diff --git a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h b/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h deleted file mode 100644 index c8ae4eb60..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h +++ /dev/null @@ -1,140 +0,0 @@ -#pragma once - -#include "Cutscene_Commands.h" - -enum class CutsceneMMCommands -{ - /* 0x00A */ CS_CMD_TEXTBOX = 0xA, - /* 0x05A */ CS_CMD_CAMERA = 0x5A, - /* 0x096 */ CS_CMD_MISC = 0x96, - /* 0x097 */ CS_CMD_SET_LIGHTING, - /* 0x098 */ CS_CMD_SCENE_TRANS_FX, - /* 0x099 */ CS_CMD_MOTIONBLUR, - /* 0x09A */ CS_CMD_GIVETATL, - /* 0x09B */ CS_CMD_FADESCREEN, - /* 0x09C */ CS_CMD_FADESEQ, - /* 0x09D */ CS_CMD_SETTIME, - /* 0x0C8 */ CS_CMD_SET_PLAYER_ACTION = 0xC8, - /* 0x0FA */ CS_CMD_UNK_FA = 0xFA, - /* 0x0FE */ CS_CMD_UNK_FE = 0xFE, - /* 0x0FF */ CS_CMD_UNK_FF, - /* 0x100 */ CS_CMD_UNK_100, - /* 0x101 */ CS_CMD_UNK_101, - /* 0x102 */ CS_CMD_UNK_102, - /* 0x103 */ CS_CMD_UNK_103, - /* 0x104 */ CS_CMD_UNK_104, - /* 0x105 */ CS_CMD_UNK_105, - /* 0x108 */ CS_CMD_UNK_108 = 0x108, - /* 0x109 */ CS_CMD_UNK_109, - /* 0x12C */ CS_CMD_PLAYSEQ = 0x12C, - /* 0x12D */ CS_CMD_UNK_12D, - /* 0x130 */ CS_CMD_130 = 0x130, - /* 0x131 */ CS_CMD_131 = 0x131, - /* 0x132 */ CS_CMD_132 = 0x132, - /* 0x133 */ CS_CMD_STOPSEQ, - /* 0x134 */ CS_CMD_PLAYAMBIENCE, - /* 0x135 */ CS_CMD_FADEAMBIENCE, - /* 0x15E */ CS_CMD_TERMINATOR = 0x15E, - /* 0x15F */ CS_CMD_CHOOSE_CREDITS_SCENES, - /* 0x190 */ CS_CMD_RUMBLE = 0x190, -}; - -class CutsceneSubCommandEntry_GenericMMCmd : public CutsceneSubCommandEntry -{ -public: - CutsceneMMCommands commandId; - - CutsceneSubCommandEntry_GenericMMCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneMMCommands cmdId); - - std::string GetBodySourceCode() const override; -}; - -class CutsceneMMCommand_GenericCmd : public CutsceneCommand -{ -public: - CutsceneMMCommand_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneMMCommands cmdId); - - std::string GetCommandMacro() const override; -}; - -// TODO: MM cutscene camera command is implemented as a placeholder until we better understand how -// it works -class CutsceneSubCommandEntry_Camera : public CutsceneSubCommandEntry -{ -public: - uint32_t unk_08; - - CutsceneSubCommandEntry_Camera(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_Camera : public CutsceneCommand -{ -public: - CutsceneMMCommand_Camera(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_FadeScreen : public CutsceneSubCommandEntry -{ -public: - uint8_t unk_06; - uint8_t unk_07; - uint8_t unk_08; - uint8_t unk_09; - uint8_t unk_0A; - uint8_t unk_0B; - - CutsceneSubCommandEntry_FadeScreen(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_FadeScreen : public CutsceneCommand -{ -public: - CutsceneMMCommand_FadeScreen(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_FadeSeq : public CutsceneSubCommandEntry -{ -public: - uint32_t unk_08; - - CutsceneSubCommandEntry_FadeSeq(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_FadeSeq : public CutsceneCommand -{ -public: - CutsceneMMCommand_FadeSeq(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_NonImplemented : public CutsceneSubCommandEntry -{ -public: - CutsceneSubCommandEntry_NonImplemented(const std::vector& rawData, - offset_t rawDataIndex); -}; - -class CutsceneMMCommand_NonImplemented : public CutsceneCommand -{ -public: - CutsceneMMCommand_NonImplemented(const std::vector& rawData, offset_t rawDataIndex); -}; diff --git a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp b/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp deleted file mode 100644 index 8ae4c69d7..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp +++ /dev/null @@ -1,596 +0,0 @@ -#include "Cutscene_Commands.h" - -#include -#include - -#include "CutsceneMM_Commands.h" -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -/* CutsceneSubCommandEntry */ - -CutsceneSubCommandEntry::CutsceneSubCommandEntry(const std::vector& rawData, - offset_t rawDataIndex) -{ - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - pad = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); -} - -std::string CutsceneSubCommandEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CMD_HH(0x%04X, 0x%04X), CMD_HH(0x%04X, 0x%04X)", base, startFrame, - endFrame, pad); -} - -size_t CutsceneSubCommandEntry::GetRawSize() const -{ - return 0x08; -} - -/* CutsceneCommand */ - -CutsceneCommand::CutsceneCommand(const std::vector& rawData, offset_t rawDataIndex) -{ - numEntries = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); -} - -CutsceneCommand::~CutsceneCommand() -{ - for (auto& entry : entries) - { - delete entry; - } -} - -std::string CutsceneCommand::GetCommandMacro() const -{ - return StringHelper::Sprintf("CMD_W(0x%08X), CMD_W(0x%08X)", commandID, numEntries); -} - -std::string CutsceneCommand::GenerateSourceCode() const -{ - std::string result; - - result += GetCommandMacro(); - result += ",\n"; - - for (auto& entry : entries) - { - result += " "; - result += entry->GetBodySourceCode(); - result += ",\n"; - } - - return result; -} - -size_t CutsceneCommand::GetCommandSize() const -{ - size_t size = 0; - if (entries.size() > 0) - { - size = entries.at(0)->GetRawSize() * entries.size(); - } - else - { - size = 0x08 * numEntries; - } - return 0x08 + size; -} - -void CutsceneCommand::SetCommandID(uint32_t nCommandID) -{ - commandID = nCommandID; - - for (auto& entry : entries) - { - entry->commandID = commandID; - } -} - -// Specific for command lists where each entry has size 0x30 bytes -const std::unordered_map csCommandsDesc = { - {CutsceneCommands::Misc, - {"CS_MISC", "(0x%04X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::SetLighting, - {"CS_LIGHTING", "(0x%02X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::PlayBGM, {"CS_PLAY_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::StopBGM, {"CS_STOP_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::FadeBGM, {"CS_FADE_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, -}; - -CutsceneSubCommandEntry_GenericCmd::CutsceneSubCommandEntry_GenericCmd( - const std::vector& rawData, offset_t rawDataIndex, CutsceneCommands cmdId) - : CutsceneSubCommandEntry(rawData, rawDataIndex), commandId(cmdId) -{ - word0 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0); - word1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x4); - - unused1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x8); - unused2 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0xC); - unused3 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x10); - unused4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x14); - unused5 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x18); - unused6 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x1C); - unused7 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x20); - unused8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x24); - unused9 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x28); - unused10 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x2C); -} - -std::string CutsceneSubCommandEntry_GenericCmd::GetBodySourceCode() const -{ - const auto& element = csCommandsDesc.find(commandId); - - if (element != csCommandsDesc.end()) - { - std::string entryFmt = element->second.cmdMacro; - entryFmt += element->second.args; - - return StringHelper::Sprintf(entryFmt.c_str(), base, startFrame, endFrame, pad, unused1, - unused2, unused3, unused4, unused5, unused6, unused7, unused8, - unused9, unused10); - } - - return StringHelper::Sprintf("CS_UNK_DATA(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, " - "0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)", - word0, word1, unused1, unused2, unused3, unused4, unused5, unused6, - unused7, unused8, unused9, unused10); -} - -size_t CutsceneSubCommandEntry_GenericCmd::GetRawSize() const -{ - return 0x30; -} - -CutsceneCommand_GenericCmd::CutsceneCommand_GenericCmd(const std::vector& rawData, - offset_t rawDataIndex, - CutsceneCommands cmdId) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - commandID = static_cast(cmdId); - entries.reserve(numEntries); - - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_GenericCmd(rawData, rawDataIndex, cmdId); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_GenericCmd::GetCommandMacro() const -{ - const auto& element = csCommandsDesc.find(static_cast(commandID)); - - if (element != csCommandsDesc.end()) - { - return StringHelper::Sprintf("%s_LIST(%i)", element->second.cmdMacro, numEntries); - } - - return StringHelper::Sprintf("CS_UNK_DATA_LIST(0x%X, %i)", commandID, numEntries); -} - -CutsceneCameraPoint::CutsceneCameraPoint(const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - continueFlag = BitConverter::ToInt8BE(rawData, rawDataIndex + 0); - cameraRoll = BitConverter::ToInt8BE(rawData, rawDataIndex + 1); - nextPointFrame = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - viewAngle = BitConverter::ToFloatBE(rawData, rawDataIndex + 4); - - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - - unused = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string CutsceneCameraPoint::GetBodySourceCode() const -{ - std::string result = ""; - - if (commandID == (int32_t)CutsceneCommands::SetCameraFocus) - { - result += "CS_CAM_FOCUS_POINT"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraFocusLink) - { - result += "CS_CAM_FOCUS_POINT_PLAYER"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraPosLink) - { - result += "CS_CAM_POS_PLAYER"; - } - else - { - result += "CS_CAM_POS"; - } - - std::string continueMacro = "CS_CMD_CONTINUE"; - if (continueFlag != 0) - continueMacro = "CS_CMD_STOP"; - - result += - StringHelper::Sprintf("(%s, 0x%02X, %i, %ff, %i, %i, %i, 0x%04X)", continueMacro.c_str(), - cameraRoll, nextPointFrame, viewAngle, posX, posY, posZ, unused); - return result; -} - -size_t CutsceneCameraPoint::GetRawSize() const -{ - return 0x10; -} - -CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - unused = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); - - bool shouldContinue = true; - - uint32_t currentPtr = rawDataIndex + 8; - - while (shouldContinue) - { - CutsceneCameraPoint* camPoint = new CutsceneCameraPoint(rawData, currentPtr); - entries.push_back(camPoint); - - if (camPoint->continueFlag == -1) - shouldContinue = false; - - currentPtr += camPoint->GetRawSize(); - } -} - -std::string CutsceneCommandSetCameraPos::GetCommandMacro() const -{ - std::string result; - - std::string listStr; - - if (commandID == (int32_t)CutsceneCommands::SetCameraFocus) - { - listStr = "CS_CAM_FOCUS_POINT_LIST"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraFocusLink) - { - listStr = "CS_CAM_FOCUS_POINT_PLAYER_LIST"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraPosLink) - { - listStr = "CS_CAM_POS_PLAYER_LIST"; - } - else - { - listStr = "CS_CAM_POS_LIST"; - } - - result += StringHelper::Sprintf("%s(%i, %i)", listStr.c_str(), startFrame, endFrame); - - return result; -} - -size_t CutsceneCommandSetCameraPos::GetCommandSize() const -{ - return 0x0C + entries.at(0)->GetRawSize() * entries.size(); -} - -CutsceneSubCommandEntry_Rumble::CutsceneSubCommandEntry_Rumble(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_06 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x06); - unk_07 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x07); - unk_08 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - unk_09 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); - unk_0A = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0A); - unk_0B = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0B); -} - -std::string CutsceneSubCommandEntry_Rumble::GetBodySourceCode() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - return StringHelper::Sprintf("CS_RUMBLE(%i, %i, %i, 0x%02X, 0x%02X, 0x%02X)", base, - startFrame, endFrame, unk_06, unk_07, unk_08); - } - - return StringHelper::Sprintf("CS_CMD_09(%i, %i, %i, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X)", - base, startFrame, endFrame, unk_06, unk_07, unk_08, unk_09, unk_0A, - unk_0B); -} - -size_t CutsceneSubCommandEntry_Rumble::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_Rumble::CutsceneCommand_Rumble(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_Rumble(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_Rumble::GetCommandMacro() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - return StringHelper::Sprintf("CS_RUMBLE_LIST(%i)", numEntries); - } - return StringHelper::Sprintf("CS_CMD_09_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_SetTime::CutsceneSubCommandEntry_SetTime( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - hour = BitConverter::ToUInt8BE(rawData, rawDataIndex + 6); - minute = BitConverter::ToUInt8BE(rawData, rawDataIndex + 7); - unk_08 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); -} - -std::string CutsceneSubCommandEntry_SetTime::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_TIME(%i, %i, %i, %i, %i, %i)", base, startFrame, endFrame, - hour, minute, unk_08); -} - -size_t CutsceneSubCommandEntry_SetTime::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_SetTime::CutsceneCommand_SetTime(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_SetTime(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_SetTime::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_TIME_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_TextBox::CutsceneSubCommandEntry_TextBox( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - type = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x6); - textId1 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x8); - textId2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0xA); -} - -std::string CutsceneSubCommandEntry_TextBox::GetBodySourceCode() const -{ - if (type == 0xFFFF) - { - return StringHelper::Sprintf("CS_TEXT_NONE(%i, %i)", startFrame, endFrame); - } - if (type == 2) - { - return StringHelper::Sprintf("CS_TEXT_LEARN_SONG(%i, %i, %i, 0x%X)", base, startFrame, - endFrame, textId1); - } - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - switch (type) - { - case 0: - return StringHelper::Sprintf("CS_TEXT_DEFAULT(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 1: - return StringHelper::Sprintf("CS_TEXT_TYPE_1(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 3: - return StringHelper::Sprintf("CS_TEXT_TYPE_3(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 4: - return StringHelper::Sprintf("CS_TEXT_BOSSES_REMAINS(0x%X, %i, %i, 0x%X)", base, - startFrame, endFrame, textId1); - - case 5: - return StringHelper::Sprintf("CS_TEXT_ALL_NORMAL_MASKS(0x%X, %i, %i, 0x%X)", base, - startFrame, endFrame, textId1); - } - } - - return StringHelper::Sprintf("CS_TEXT_DISPLAY_TEXTBOX(0x%X, %i, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, type, textId1, textId2); -} - -size_t CutsceneSubCommandEntry_TextBox::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_TextBox::CutsceneCommand_TextBox(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_TextBox(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_TextBox::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_TEXT_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_ActorAction::CutsceneSubCommandEntry_ActorAction( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x6); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x8); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0xA); - startPosX = BitConverter::ToInt32BE(rawData, rawDataIndex + 0xC); - startPosY = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x10); - startPosZ = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x14); - endPosX = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x18); - endPosY = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x1C); - endPosZ = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x20); - normalX = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x24); - normalY = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x28); - normalZ = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x2C); -} - -std::string CutsceneSubCommandEntry_ActorAction::GetBodySourceCode() const -{ - std::string result; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - if (static_cast(commandID) == - CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION) - { - result = "CS_PLAYER_ACTION"; - } - else - { - result = "CS_ACTOR_ACTION"; - } - } - else - { - if (static_cast(commandID) == CutsceneCommands::SetPlayerAction) - { - result = "CS_PLAYER_ACTION"; - } - else - { - result = "CS_NPC_ACTION"; - } - } - - result += - StringHelper::Sprintf("(%i, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, " - "%i, %i, %i, %i, %.11ef, %.11ef, %.11ef)", - base, startFrame, endFrame, rotX, rotY, rotZ, startPosX, startPosY, - startPosZ, endPosX, endPosY, endPosZ, normalX, normalY, normalZ); - return result; -} - -size_t CutsceneSubCommandEntry_ActorAction::GetRawSize() const -{ - return 0x30; -} - -CutsceneCommand_ActorAction::CutsceneCommand_ActorAction(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_ActorAction(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_ActorAction::GetCommandMacro() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - if (static_cast(commandID) == - CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION) - { - return StringHelper::Sprintf("CS_PLAYER_ACTION_LIST(%i)", numEntries); - } - return StringHelper::Sprintf("CS_ACTOR_ACTION_LIST(0x%03X, %i)", commandID, numEntries); - } - - if (static_cast(commandID) == CutsceneCommands::SetPlayerAction) - { - return StringHelper::Sprintf("CS_PLAYER_ACTION_LIST(%i)", entries.size()); - } - return StringHelper::Sprintf("CS_NPC_ACTION_LIST(0x%03X, %i)", commandID, entries.size()); -} - -CutsceneCommand_Terminator::CutsceneCommand_Terminator(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - unknown = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); // endFrame duplicate -} - -std::string CutsceneCommand_Terminator::GenerateSourceCode() const -{ - std::string result; - - result += StringHelper::Sprintf("CS_TERMINATOR(%i, %i, %i),\n", base, startFrame, endFrame); - - return result; -} - -size_t CutsceneCommand_Terminator::GetCommandSize() const -{ - return 0x10; -} - -CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); -} - -std::string CutsceneCommandSceneTransFX::GenerateSourceCode() const -{ - return StringHelper::Sprintf("CS_SCENE_TRANS_FX(%i, %i, %i),\n", base, startFrame, endFrame); -} - -size_t CutsceneCommandSceneTransFX::GetCommandSize() const -{ - return 0x10; -} diff --git a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h b/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h deleted file mode 100644 index c46273587..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h +++ /dev/null @@ -1,267 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "Declaration.h" - -enum class CutsceneCommands -{ - SetCameraPos = 0x0001, - SetCameraFocus = 0x0002, - Misc = 0x0003, - SetLighting = 0x0004, - SetCameraPosLink = 0x0005, - SetCameraFocusLink = 0x0006, - Cmd07 = 0x0007, - Cmd08 = 0x0008, - Cmd09 = 0x0009, // Rumble - Textbox = 0x0013, - SetPlayerAction = 0x000A, - SetActorAction1 = 0x000F, - SetActorAction2 = 0x000E, - SetActorAction3 = 0x0019, - SetActorAction4 = 0x001D, - SetActorAction5 = 0x001E, - SetActorAction6 = 0x002C, - SetActorAction7 = 0x001F, - SetActorAction8 = 0x0031, - SetActorAction9 = 0x003E, - SetActorAction10 = 0x008F, - SetSceneTransFX = 0x002D, - PlayBGM = 0x0056, - StopBGM = 0x0057, - FadeBGM = 0x007C, - SetTime = 0x008C, - Terminator = 0x03E8, -}; - -typedef struct CsCommandListDescriptor -{ - const char* cmdMacro; - const char* args; -} CsCommandListDescriptor; - -class CutsceneSubCommandEntry -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t pad; - - uint32_t commandID; - - CutsceneSubCommandEntry(const std::vector& rawData, offset_t rawDataIndex); - virtual ~CutsceneSubCommandEntry() = default; - - virtual std::string GetBodySourceCode() const; - - virtual size_t GetRawSize() const; -}; - -class CutsceneCommand -{ -public: - uint32_t commandID; - uint32_t commandIndex; - - uint32_t numEntries; - std::vector entries; - - CutsceneCommand(const std::vector& rawData, offset_t rawDataIndex); - virtual ~CutsceneCommand(); - - virtual std::string GetCommandMacro() const; - virtual std::string GenerateSourceCode() const; - virtual size_t GetCommandSize() const; - - virtual void SetCommandID(uint32_t nCommandID); -}; - -class CutsceneSubCommandEntry_GenericCmd : public CutsceneSubCommandEntry -{ -public: - CutsceneCommands commandId; - - uint32_t word0 = 0; - uint32_t word1 = 0; - - uint32_t unused1 = 0; - uint32_t unused2 = 0; - uint32_t unused3 = 0; - uint32_t unused4 = 0; - uint32_t unused5 = 0; - uint32_t unused6 = 0; - uint32_t unused7 = 0; - uint32_t unused8 = 0; - uint32_t unused9 = 0; - uint32_t unused10 = 0; - - CutsceneSubCommandEntry_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneCommands cmdId); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_GenericCmd : public CutsceneCommand -{ -public: - CutsceneCommand_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneCommands cmdId); - - std::string GetCommandMacro() const override; -}; - -class CutsceneCameraPoint : public CutsceneSubCommandEntry -{ -public: - int8_t continueFlag; - int8_t cameraRoll; - int16_t nextPointFrame; - float viewAngle; - int16_t posX, posY, posZ; - int16_t unused; - - CutsceneCameraPoint(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommandSetCameraPos : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t unused; - - CutsceneCommandSetCameraPos(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; - - size_t GetCommandSize() const override; -}; - -class CutsceneCommandSceneTransFX : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - - CutsceneCommandSceneTransFX(const std::vector& rawData, offset_t rawDataIndex); - - std::string GenerateSourceCode() const override; - size_t GetCommandSize() const override; -}; - -class CutsceneSubCommandEntry_Rumble : public CutsceneSubCommandEntry -{ -public: - uint8_t unk_06; - uint8_t unk_07; - uint8_t unk_08; - uint8_t unk_09; - uint8_t unk_0A; - uint8_t unk_0B; - - CutsceneSubCommandEntry_Rumble(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_Rumble : public CutsceneCommand -{ -public: - CutsceneCommand_Rumble(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_SetTime : public CutsceneSubCommandEntry -{ -public: - uint8_t hour; - uint8_t minute; - uint32_t unk_08; - - CutsceneSubCommandEntry_SetTime(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_SetTime : public CutsceneCommand -{ -public: - CutsceneCommand_SetTime(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_TextBox : public CutsceneSubCommandEntry -{ -public: - uint16_t type; - uint16_t textId1; - uint16_t textId2; - - CutsceneSubCommandEntry_TextBox(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_TextBox : public CutsceneCommand -{ -public: - CutsceneCommand_TextBox(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_ActorAction : public CutsceneSubCommandEntry -{ -public: - uint16_t rotX, rotY, rotZ; - int32_t startPosX, startPosY, startPosZ; - int32_t endPosX, endPosY, endPosZ; - float normalX, normalY, normalZ; - - CutsceneSubCommandEntry_ActorAction(const std::vector& rawData, offset_t rawDataIndex); - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_ActorAction : public CutsceneCommand -{ -public: - CutsceneCommand_ActorAction(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneCommand_Terminator : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t unknown; - - CutsceneCommand_Terminator(const std::vector& rawData, offset_t rawDataIndex); - - std::string GenerateSourceCode() const override; - size_t GetCommandSize() const override; -}; diff --git a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp b/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp deleted file mode 100644 index 8a0e49cf3..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp +++ /dev/null @@ -1,352 +0,0 @@ -#include "SkinLimbStructs.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZDisplayList.h" -#include "ZFile.h" - -/* Struct_800A57C0 */ - -Struct_800A57C0::Struct_800A57C0(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A57C0::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - unk_6 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x06); - unk_7 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x07); - unk_8 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x08); - unk_9 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); -} - -std::string Struct_800A57C0::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, %i, %i, %i, %i, %i, 0x%02X", unk_0, unk_2, unk_4, unk_6, - unk_7, unk_8, unk_9); -} - -std::string Struct_800A57C0::GetSourceTypeName() const -{ - return "Struct_800A57C0"; -} - -ZResourceType Struct_800A57C0::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A57C0::GetRawDataSize() const -{ - return 0x0A; -} - -/* Struct_800A598C_2 */ - -Struct_800A598C_2::Struct_800A598C_2(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A598C_2::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x00); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x06); - unk_8 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); -} - -std::string Struct_800A598C_2::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, %i, %i, %i, 0x%02X", unk_0, x, y, z, unk_8); -} - -std::string Struct_800A598C_2::GetSourceTypeName() const -{ - return "Struct_800A598C_2"; -} - -ZResourceType Struct_800A598C_2::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A598C_2::GetRawDataSize() const -{ - return 0x0A; -} - -/* Struct_800A598C */ - -Struct_800A598C::Struct_800A598C(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A598C::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x04); - unk_8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - unk_C = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); - - if (unk_8 != 0 && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - - unk_8_arr.reserve(unk_0); - for (size_t i = 0; i < unk_0; i++) - { - Struct_800A57C0 unk8_data(parent); - unk8_data.ExtractFromFile(unk_8_Offset); - unk_8_arr.push_back(unk8_data); - - unk_8_Offset += unk8_data.GetRawDataSize(); - } - } - - if (unk_C != 0 && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_C_Offset = Seg2Filespace(unk_C, parent->baseAddress); - - unk_C_arr.reserve(unk_2); - for (size_t i = 0; i < unk_2; i++) - { - Struct_800A598C_2 unkC_data(parent); - unkC_data.ExtractFromFile(unk_C_Offset); - unk_C_arr.push_back(unkC_data); - - unk_C_Offset += unkC_data.GetRawDataSize(); - } - } -} - -void Struct_800A598C::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - if (unk_8 != 0 && GETSEGNUM(unk_8) == parent->segment) - { - const auto& res = unk_8_arr.at(0); - std::string unk_8_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_8_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_8_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_8_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_8_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_8_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } - - if (unk_C != 0 && GETSEGNUM(unk_C) == parent->segment) - { - const auto& res = unk_C_arr.at(0); - std::string unk_C_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_C_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_C_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_C_Offset = Seg2Filespace(unk_C, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_C_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_C_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_C_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } -} - -std::string Struct_800A598C::GetBodySourceCode() const -{ - std::string unk_8_Str; - std::string unk_C_Str; - Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Struct_800A57C0", unk_8_Str, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(unk_C, parent, "Struct_800A598C_2", unk_C_Str, - parent->workerID); - - std::string entryStr = StringHelper::Sprintf("\n\t\tARRAY_COUNTU(%s), ARRAY_COUNTU(%s),\n", - unk_8_Str.c_str(), unk_C_Str.c_str()); - entryStr += - StringHelper::Sprintf("\t\t%i, %s, %s\n\t", unk_4, unk_8_Str.c_str(), unk_C_Str.c_str()); - - return entryStr; -} - -std::string Struct_800A598C::GetSourceTypeName() const -{ - return "Struct_800A598C"; -} - -ZResourceType Struct_800A598C::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A598C::GetRawDataSize() const -{ - return 0x10; -} - -/* Struct_800A5E28 */ - -Struct_800A5E28::Struct_800A5E28(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A5E28::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - unk_8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - if (unk_4 != 0 && GETSEGNUM(unk_4) == parent->segment) - { - uint32_t unk_4_Offset = Seg2Filespace(unk_4, parent->baseAddress); - - unk_4_arr.reserve(unk_2); - for (size_t i = 0; i < unk_2; i++) - { - Struct_800A598C unk_4_data(parent); - unk_4_data.ExtractFromFile(unk_4_Offset); - unk_4_arr.push_back(unk_4_data); - - unk_4_Offset += unk_4_data.GetRawDataSize(); - } - } -} - -void Struct_800A5E28::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - ZResource::DeclareReferences(varPrefix); - - if (unk_4 != SEGMENTED_NULL && GETSEGNUM(unk_4) == parent->segment) - { - const auto& res = unk_4_arr.at(0); - std::string unk_4_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_4_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_4_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_4_Offset = Seg2Filespace(unk_4, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_4_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_4_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_4_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } - - if (unk_8 != SEGMENTED_NULL && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), unk_8_Offset, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - unk_8_dlist = new ZDisplayList(parent); - unk_8_dlist->ExtractFromBinary(unk_8_Offset, dlistLength); - - std::string dListStr = - StringHelper::Sprintf("%sSkinLimbDL_%06X", varPrefix.c_str(), unk_8_Offset); - unk_8_dlist->SetName(dListStr); - unk_8_dlist->DeclareVar(varPrefix, ""); - unk_8_dlist->DeclareReferences(varPrefix); - parent->AddResource(unk_8_dlist); - } -} - -std::string Struct_800A5E28::GetBodySourceCode() const -{ - std::string unk_4_Str; - std::string unk_8_Str; - Globals::Instance->GetSegmentedPtrName(unk_4, parent, "Struct_800A598C", unk_4_Str, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Gfx", unk_8_Str, parent->workerID); - - std::string entryStr = "\n"; - entryStr += StringHelper::Sprintf("\t%i, ARRAY_COUNTU(%s),\n", unk_0, unk_4_Str.c_str()); - entryStr += StringHelper::Sprintf("\t%s, %s\n", unk_4_Str.c_str(), unk_8_Str.c_str()); - - return entryStr; -} - -std::string Struct_800A5E28::GetSourceTypeName() const -{ - return "Struct_800A5E28"; -} - -ZResourceType Struct_800A5E28::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A5E28::GetRawDataSize() const -{ - return 0x0C; -} diff --git a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h b/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h deleted file mode 100644 index ce842aee3..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h +++ /dev/null @@ -1,114 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZResource.h" -#include "ZDisplayList.h" - -// TODO: check if more types exists -enum class ZLimbSkinType -{ - SkinType_0, // Segment = 0 - SkinType_4 = 4, // Segment = segmented address // Struct_800A5E28 - SkinType_5 = 5, // Segment = 0 - SkinType_DList = 11, // Segment = DList address -}; - -class Struct_800A57C0 : public ZResource -{ -public: - Struct_800A57C0(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; - int16_t unk_2; - int16_t unk_4; - int8_t unk_6; - int8_t unk_7; - int8_t unk_8; - uint8_t unk_9; -}; - -class Struct_800A598C_2 : public ZResource -{ -public: - Struct_800A598C_2(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint8_t unk_0; - int16_t x; - int16_t y; - int16_t z; - uint8_t unk_8; -}; - -class Struct_800A598C : public ZResource -{ -public: - Struct_800A598C(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; // Length of unk_8 - uint16_t unk_2; // Length of unk_C - uint16_t unk_4; // 0 or 1 // Used as an index for unk_C - segptr_t unk_8; // Struct_800A57C0* - segptr_t unk_C; // Struct_800A598C_2* - - std::vector unk_8_arr; - std::vector unk_C_arr; -}; - -class Struct_800A5E28 : public ZResource -{ -public: - Struct_800A5E28(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; // Vtx count - uint16_t unk_2; // Length of unk_4 - segptr_t unk_4; // Struct_800A598C* - segptr_t unk_8; // Gfx* - - std::vector unk_4_arr; - ZDisplayList* unk_8_dlist = nullptr; -}; diff --git a/ZAPDTR/ZAPD/OutputFormatter.cpp b/ZAPDTR/ZAPD/OutputFormatter.cpp deleted file mode 100644 index 362ef98fc..000000000 --- a/ZAPDTR/ZAPD/OutputFormatter.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include "OutputFormatter.h" -#include - -void OutputFormatter::Flush() -{ - //if (!Globals::Instance->otrMode) // OTRTODO: MULTITHREADING - { - if (col > lineLimit && !Globals::Instance->otrMode) - { - str.append(1, '\n'); - str.append(currentIndent, ' '); - - uint32_t newCol = currentIndent + (wordP - word); - - for (uint32_t i = 0; i < wordNests; i++) - nestIndent[nest - i] -= col - newCol; - - col = newCol; - } - else - { - str.append(space, spaceP - space); - } - spaceP = space; - - str.append(word, wordP - word); - wordP = word; - wordNests = 0; - } -} - -int OutputFormatter::Write(const char* buf, int count) -{ - // OTRTODO - //if (!Globals::Instance->singleThreaded) - //return 0; - - for (int i = 0; i < count; i++) - { - char c = buf[i]; - - if (c == ' ' || c == '\t' || c == '\n') - { - if (wordP - word != 0) - { - Flush(); - } - - if (c == '\n') - { - col = 0; - *spaceP++ = c; - } - else if (c == '\t') - { - int n = tabSize - (col % tabSize); - col += n; - for (int j = 0; j < n; j++) - *spaceP++ = ' '; - } - else - { - col++; - *spaceP++ = c; - } - - currentIndent = nestIndent[nest]; - } - else - { - col++; - - if (c == '(') - { - nest++; - nestIndent[nest] = col; - wordNests++; - } - else if (c == ')') - { - if (nest > 0) - nest--; - if (wordNests > 0) - wordNests--; - } - - *wordP++ = c; - } - } - - return count; -} - -int OutputFormatter::Write(const std::string& buf) -{ - return Write(buf.data(), buf.size()); -} - -thread_local OutputFormatter* OutputFormatter::Instance; - -int OutputFormatter::WriteStatic(const char* buf, int count) -{ - return Instance->Write(buf, count); -} - -int (*OutputFormatter::StaticWriter())(const char* buf, int count) -{ - Instance = this; - return &WriteStatic; -} - -OutputFormatter::OutputFormatter(uint32_t tabSize, uint32_t indentation, uint32_t lineLimit) - : tabSize{tabSize}, lineLimit{lineLimit}, col{0}, nest{0}, nestIndent{indentation}, - currentIndent{indentation}, wordNests(0), wordP{word}, spaceP{space} -{ -} - -std::string OutputFormatter::GetOutput() -{ - Flush(); - - return std::move(str); -} diff --git a/ZAPDTR/ZAPD/OutputFormatter.h b/ZAPDTR/ZAPD/OutputFormatter.h deleted file mode 100644 index 391f41027..000000000 --- a/ZAPDTR/ZAPD/OutputFormatter.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -class OutputFormatter -{ -private: - const uint32_t tabSize; - const uint32_t lineLimit; - - uint32_t col; - uint32_t nest; - uint32_t nestIndent[8]; - uint32_t currentIndent; - uint32_t wordNests; - - char word[128]; - char space[128]; - char* wordP; - char* spaceP; - - std::string str; - - void Flush(); - - static thread_local OutputFormatter* Instance; - static int WriteStatic(const char* buf, int count); - -public: - OutputFormatter(uint32_t tabSize = 4, uint32_t indentation = 4, uint32_t lineLimit = 120); - - int (*StaticWriter())(const char* buf, int count); // Must be `int` due to libgfxd - - int Write(const char* buf, int count); - int Write(const std::string& buf); - - std::string GetOutput(); -}; diff --git a/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp b/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp deleted file mode 100644 index 168ed2374..000000000 --- a/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp +++ /dev/null @@ -1,354 +0,0 @@ -#if 0 -#include "ZOverlay.h" - -#include -#include -#include "Globals.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -using namespace ELFIO; - -const char* RelocationEntry::GetSectionName() const -{ - switch (sectionType) - { - case SectionType::Text: - return ".text"; - case SectionType::Data: - return ".data"; - case SectionType::RoData: - return ".rodata"; - case SectionType::Bss: - return ".bss"; - case SectionType::ERROR: - return ".ERROR"; - } - assert(!"Oh no :c"); -} - -const char* RelocationEntry::GetRelocTypeName() const -{ - switch (relocationType) - { - case RelocationType::R_MIPS_32: - return "R_MIPS_32"; - case RelocationType::R_MIPS_26: - return "R_MIPS_26"; - case RelocationType::R_MIPS_HI16: - return "R_MIPS_HI16"; - case RelocationType::R_MIPS_LO16: - return "R_MIPS_LO16"; - } - assert(!"Oh no :c"); -} - -ZOverlay::ZOverlay() -{ - name = ""; - entries = std::vector(); -} - -ZOverlay::ZOverlay(const std::string& nName) : ZOverlay() -{ - name = nName; -} - -ZOverlay::~ZOverlay() -{ - for (auto entry : entries) - if (entry) - delete entry; - entries.clear(); -} - -static const std::unordered_set sRelSections = { - ".rel.text", - ".rel.data", - ".rel.rodata", -}; -static const std::unordered_set sSections = { - ".text", ".data", ".symtab", ".rodata", ".rodata.str1.4", ".rodata.cst4", ".rodata.cst8", -}; - -ZOverlay* ZOverlay::FromBuild(fs::path buildPath, fs::path cfgFolderPath) -{ - std::string cfgText = DiskFile::ReadAllText(cfgFolderPath / "overlay.cfg"); - std::vector cfgLines = StringHelper::Split(cfgText, "\n"); - - ZOverlay* ovl = new ZOverlay(StringHelper::Strip(cfgLines[0], "\r")); - ovl->cfgLines = cfgLines; - - int32_t sectionOffs[5] = {0}; - std::vector textRelocs; - std::vector dataRelocs; - std::vector rodataRelocs; - - // get the elf files - std::vector readers; - for (size_t i = 1; i < cfgLines.size(); i++) - { - std::string elfPath = - (buildPath / (cfgLines[i].substr(0, cfgLines[i].size() - 2) + ".o")).string(); - elfio* reader = new elfio(); - - if (!reader->load(elfPath)) - { - // not all files were compiled - for (auto r : readers) - delete r; - readers.clear(); - - delete ovl; - return nullptr; - } - - readers.push_back(reader); - } - - for (size_t curReaderId = 0; curReaderId < readers.size(); curReaderId++) - { - auto& curReader = readers[curReaderId]; - - Elf_Half sec_num = curReader->sections.size(); - for (int32_t i = 0; i < sec_num; i++) - { - section* pSec = curReader->sections[i]; - - if (pSec->get_type() != SHT_REL || - sRelSections.find(pSec->get_name()) == sRelSections.end()) - { - continue; - } - - symbol_section_accessor currentSymbols(*curReader, - curReader->sections[(Elf_Half)pSec->get_link()]); - - SectionType sectionType = GetSectionTypeFromStr(pSec->get_name()); - - if (sectionType == SectionType::ERROR) - { - HANDLE_WARNING(WarningType::Always, "one of the section types returned ERROR", ""); - } - - relocation_section_accessor relocs(*curReader, pSec); - for (Elf_Xword j = 0; j < relocs.get_entries_num(); j++) - { - Elf64_Addr offset = 0; - Elf_Word symbol = 0; - Elf_Word type = 0; - { - Elf_Sxword addend = 0; - relocs.get_entry(j, offset, symbol, type, addend); - } - - std::string curSymName; - Elf_Half curSymShndx = SHN_UNDEF; - { - Elf64_Addr value; - Elf_Xword size; - unsigned char bind; - unsigned char type; - unsigned char other; - currentSymbols.get_symbol(symbol, curSymName, value, size, bind, type, - curSymShndx, other); - } - - // check symbols outside the elf but within the overlay - if (curSymShndx == SHN_UNDEF) - { - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("Symbol '%s' doesn't exist in current .o file (%s). Searching...\n", - curSymName.c_str(), cfgLines[curReaderId + 1].c_str()); - } - - for (size_t readerId = 0; readerId < readers.size(); readerId++) - { - auto& reader = readers[readerId]; - - if (curSymShndx != SHN_UNDEF) - break; - - if (reader == curReader) - continue; - - auto sectionData = reader->sections[(Elf_Half)pSec->get_link()]; - curSymShndx = - ovl->FindSymbolInSection(curSymName, sectionData, *reader, readerId); - if (curSymShndx != SHN_UNDEF) - break; - - if (Globals::Instance->gccCompat) - { - // Symbol wasn't found, try checking every section - Elf_Half sec_num = reader->sections.size(); - for (int32_t otherSectionIdx = 0; otherSectionIdx < sec_num; - otherSectionIdx++) - { - if (curSymShndx != SHN_UNDEF) - { - break; - } - - auto sectionDataIter = reader->sections[otherSectionIdx]; - - curSymShndx = ovl->FindSymbolInSection(curSymName, sectionDataIter, - *reader, readerId); - } - } - } - } - - if (curSymShndx != SHN_UNDEF) - { - RelocationType typeConverted = (RelocationType)type; - offset += sectionOffs[static_cast(sectionType)]; - - RelocationEntry* reloc = - new RelocationEntry(sectionType, typeConverted, offset); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf(".word 0x%08X # %s %s 0x%04X\n", reloc->CalcRelocationWord(), - reloc->GetSectionName(), reloc->GetRelocTypeName(), reloc->offset); - } - - // this is to keep the correct reloc entry order - if (sectionType == SectionType::Text) - textRelocs.push_back(reloc); - if (sectionType == SectionType::Data) - dataRelocs.push_back(reloc); - if (sectionType == SectionType::RoData) - rodataRelocs.push_back(reloc); - } - } - } - - // increase section offsets - for (int32_t i = 0; i < sec_num; i++) - { - section* pSec = curReader->sections[i]; - if (pSec->get_type() == SHT_PROGBITS && - sSections.find(pSec->get_name()) != sSections.end()) - { - SectionType sectionType = GetSectionTypeFromStr(pSec->get_name()); - sectionOffs[static_cast(sectionType)] += pSec->get_size(); - } - } - } - - ovl->entries.reserve(textRelocs.size() + dataRelocs.size() + rodataRelocs.size()); - ovl->entries.insert(ovl->entries.end(), textRelocs.begin(), textRelocs.end()); - ovl->entries.insert(ovl->entries.end(), dataRelocs.begin(), dataRelocs.end()); - ovl->entries.insert(ovl->entries.end(), rodataRelocs.begin(), rodataRelocs.end()); - - for (auto r : readers) - delete r; - readers.clear(); - - return ovl; -} - -std::string ZOverlay::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - std::string output; - - output += ".section .ovl\n"; - - output += StringHelper::Sprintf("# %sOverlayInfo\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentTextSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentDataSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentRoDataSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentBssSize\n", name.c_str()); - output += "\n"; - - output += StringHelper::Sprintf(".word %i # reloc_count\n", entries.size()); - - for (size_t i = 0; i < entries.size(); i++) - { - RelocationEntry* reloc = entries[i]; - output += StringHelper::Sprintf(".word 0x%08X # %s %s 0x%04X\n", - reloc->CalcRelocationWord(), reloc->GetSectionName(), - reloc->GetRelocTypeName(), reloc->offset); - } - - size_t offset = (entries.size() * 4) + 20; - - while (offset % 16 != 12) - { - output += ".word 0\n"; - offset += 4; - } - - output += "\n"; - output += - StringHelper::Sprintf(".word 0x%08X # %sOverlayInfoOffset\n", offset + 4, name.c_str()); - return output; -} - -SectionType ZOverlay::GetSectionTypeFromStr(const std::string& sectionName) -{ - if (sectionName == ".rel.text" || sectionName == ".text") - return SectionType::Text; - else if (sectionName == ".rel.data" || sectionName == ".data") - return SectionType::Data; - else if (sectionName == ".rel.rodata" || sectionName == ".rodata" || - sectionName == ".rodata.str1.4" || sectionName == ".rodata.cst4") - return SectionType::RoData; - else if (sectionName == ".rel.bss" || sectionName == ".bss") - return SectionType::Bss; - - return SectionType::ERROR; -} - -ELFIO::Elf_Half ZOverlay::FindSymbolInSection(const std::string& curSymName, - ELFIO::section* sectionData, ELFIO::elfio& reader, - size_t readerId) -{ - if (sectionData == nullptr) - return SHN_UNDEF; - - auto sectionDataName = sectionData->get_name(); - if (sSections.find(sectionDataName) == sSections.end()) - return SHN_UNDEF; - -#ifdef DEVELOPMENT - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t File '%s' section: %s \n", cfgLines[readerId + 1].c_str(), - sectionDataName.c_str()); - } -#endif - - symbol_section_accessor symbols(reader, sectionData); - - Elf_Xword symbolNum = symbols.get_symbols_num(); - for (Elf_Xword symIdx = 0; symIdx < symbolNum; symIdx++) - { - Elf_Half shndx = SHN_UNDEF; - Elf64_Addr value; - std::string name; - Elf_Xword size; - unsigned char bind; - unsigned char type; - unsigned char other; - - symbols.get_symbol(symIdx, name, value, size, bind, type, shndx, other); - - if (name == curSymName) - { - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t Symbol '%s' found in '%s' '%s' \n", curSymName.c_str(), - cfgLines[readerId + 1].c_str(), sectionDataName.c_str()); - } - return shndx; - } - } - return SHN_UNDEF; -} -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/Overlays/ZOverlay.h b/ZAPDTR/ZAPD/Overlays/ZOverlay.h deleted file mode 100644 index c1fadddca..000000000 --- a/ZAPDTR/ZAPD/Overlays/ZOverlay.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#if 0 - -#include "Utils/Directory.h" -#include "ZResource.h" -#include "elfio/elfio.hpp" -#include "tinyxml2.h" - -enum class SectionType -{ - Text = 1, - Data = 2, - RoData = 3, - Bss = 4, - ERROR = 255 -}; - -enum class RelocationType -{ - R_MIPS_32 = 2, - R_MIPS_26 = 4, - R_MIPS_HI16 = 5, - R_MIPS_LO16 = 6, -}; - -class RelocationEntry -{ -public: - SectionType sectionType; - RelocationType relocationType; - int32_t offset; - - RelocationEntry(SectionType nSecType, RelocationType nRelType, int32_t nOffset) - { - sectionType = nSecType; - relocationType = nRelType; - offset = nOffset; - } - - uint32_t CalcRelocationWord() - { - uint32_t relocationWord = 0; - - relocationWord |= static_cast(sectionType) << 30; - relocationWord |= static_cast(relocationType) << 24; - relocationWord |= offset; - - return relocationWord; - } - - const char* GetSectionName() const; - const char* GetRelocTypeName() const; -}; - -class ZOverlay -{ -public: - std::string name; - - ZOverlay(const std::string& nName); - ~ZOverlay(); - static ZOverlay* FromBuild(fs::path buildPath, fs::path cfgFolderPath); - std::string GetSourceOutputCode(const std::string& prefix); - -private: - std::vector entries; - std::vector cfgLines; - - ZOverlay(); - - static SectionType GetSectionTypeFromStr(const std::string& sectionName); - // static std::string GetOverlayNameFromElf(ELFIO::elfio& reader); - - ELFIO::Elf_Half FindSymbolInSection(const std::string& curSymName, ELFIO::section* sectionData, - ELFIO::elfio& reader, size_t readerId); -}; -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/WarningHandler.cpp b/ZAPDTR/ZAPD/WarningHandler.cpp deleted file mode 100644 index 163b028b5..000000000 --- a/ZAPDTR/ZAPD/WarningHandler.cpp +++ /dev/null @@ -1,451 +0,0 @@ -/** - * ZAPD Warning- and Error-handling system - * ======================================= - * - * This provides a common standard way to write ZAPD warnings/errors, which should be used for all - * such. It will pretty-print them in a uniform way, with styles defined in the header. - * - * Warnings/errors should be constructed using the macros given in the header; there are now plenty - * of examples in the codebase of how to do this. Their purposes are noted above each category in - * the header. Each warning has a type, one of the ones in warningStringToInitMap, or - * WarningType::Always, which is used for warnings that cannot be disabled and do not display a - * type. - * - * Currently there are three levels of alert a warning can have: - * - Off (does not display anything) - * - Warn (print a warning but continue processing) - * - Err (behave like an error, i.e. print and throw an exception to crash ZAPD when occurs) - * - * Flag use: - * - -Wfoo enables warnings of type foo - * - -Wno-foo disables warnings of type foo - * - -Werror=foo escalates foo to behave like an error - * - -Weverything enables all warnings - * - -Werror escalates all enabled warnings to errors - * - * Errors do not have types, and will always throw an exception; they cannot be disabled. - * - * Format - * === - * Each printed warning/error contains the same three sections: - * - Preamble: automatically generated; the content varies depending on category. It will print the - * file and function that the warning is from, and information about the files being processed - * or extracted. - * - Header: begins with 'warning: ' or 'error:', should contain essential information about the - * warning/error, ends with the warning type if applicable. Printed with emphasis to make it - * stand out. Does not start with a capital letter or end with a '.' - * - Body (optional): indented, should contain further diagnostic information useful for identifying - * and fixing the warning/error. Can be a sentence with captialisation and '.' on the end. - * - * Please think of what the end user will find most useful when writing the header and body, and try - * to keep it brief without sacrificing important information! Also remember that if the user is - * only looking at stderr, they will normally have no other context. - * - * Warning vs error - * === - * The principle that we have operated on so far is - * - issue a warning if ZAPD will still be able to produce a valid, compilable C file that will - * match - * - if this cannot happen, use an error. - * but at the end of the day, it is up to the programmer's discretion what it should be possible to - * disable. - * - * Documentation - * === - * Remember that all warnings also need to be documented in the README.md. The help is generated - * automatically. - */ -#include "WarningHandler.h" - -#include -#include "Globals.h" -#include "Utils/StringHelper.h" - -typedef struct -{ - WarningType type; - WarningLevel defaultLevel; - std::string description; -} WarningInfoInit; - -typedef struct -{ - WarningLevel level; - std::string name; - std::string description; -} WarningInfo; - -/** - * Master list of all default warning types and features - * - * To add a warning type, fill in a new row of this map. Think carefully about what its default - * level should be, and try and make the description both brief and informative: it is used in the - * help message, so again, think about what the end user needs to know. - */ -// clang-format off -static const std::unordered_map warningStringToInitMap = { - {"deprecated", {WarningType::Deprecated, -#ifdef DEPRECATION_ON - WarningLevel::Warn, -#else - WarningLevel::Off, -#endif - "Deprecated features"}}, - {"unaccounted", {WarningType::Unaccounted, WarningLevel::Off, "Large blocks of unaccounted"}}, - {"missing-offsets", {WarningType::MissingOffsets, WarningLevel::Warn, "Offset attribute missing in XML tag"}}, - {"intersection", {WarningType::Intersection, WarningLevel::Warn, "Two assets intersect"}}, - {"missing-attribute", {WarningType::MissingAttribute, WarningLevel::Warn, "Required attribute missing in XML tag"}}, - {"invalid-attribute-value", {WarningType::InvalidAttributeValue, WarningLevel::Err, "Attribute declared in XML is wrong"}}, - {"unknown-attribute", {WarningType::UnknownAttribute, WarningLevel::Warn, "Unknown attribute in XML entry tag"}}, - {"invalid-xml", {WarningType::InvalidXML, WarningLevel::Err, "XML has syntax errors"}}, - {"invalid-jpeg", {WarningType::InvalidJPEG, WarningLevel::Err, "JPEG file does not conform to the game's format requirements"}}, - {"invalid-png", {WarningType::InvalidPNG, WarningLevel::Err, "Issues arising when processing PNG data"}}, - {"invalid-extracted-data", {WarningType::InvalidExtractedData, WarningLevel::Err, "Extracted data does not have correct form"}}, - {"missing-segment", {WarningType::MissingSegment, WarningLevel::Warn, "Segment not given in File tag in XML"}}, - {"hardcoded-pointer", {WarningType::HardcodedPointer, WarningLevel::Warn, "ZAPD lacks the info to make a symbol, so must output a hardcoded pointer"}}, - {"not-implemented", {WarningType::NotImplemented, WarningLevel::Warn, "ZAPD does not currently support this feature"}}, -}; - -/** - * Map constructed at runtime to contain the warning features as set by the user using -W flags. - */ -static std::unordered_map warningTypeToInfoMap; - -void WarningHandler::ConstructTypeToInfoMap() { - for (auto& entry : warningStringToInitMap) { - warningTypeToInfoMap[entry.second.type] = {entry.second.defaultLevel, entry.first, entry.second.description}; - } - warningTypeToInfoMap[WarningType::Always] = {WarningLevel::Warn, "always", "you shouldn't be reading this"}; - assert(warningTypeToInfoMap.size() == static_cast(WarningType::Max)); -} - -/** - * Initialises the main warning type map and reads flags passed to set each warning type's level. - */ -void WarningHandler::Init(int argc, char* argv[]) { - ConstructTypeToInfoMap(); - - bool werror = false; - for (int i = 1; i < argc; i++) { - // If it doesn't start with "-W" skip it. - if (argv[i][0] != '-' || argv[i][1] != 'W' || argv[i][2] == '\0') { - continue; - } - - WarningLevel warningTypeOn = WarningLevel::Warn; - size_t startingIndex = 2; - - // "-Wno-" - if (argv[i][2] == 'n' && argv[i][3] == 'o' && argv[i][4] == '-' && argv[i][5] != '\0') { - warningTypeOn = WarningLevel::Off; - startingIndex = 5; - } - - // Read starting after the "-W" or "-Wno-" - std::string_view currentArgv = &argv[i][startingIndex]; - - if (currentArgv == "error") { - werror = warningTypeOn != WarningLevel::Off; - } else if (currentArgv == "everything") { - for (auto& it: warningTypeToInfoMap) { - if (it.second.level <= WarningLevel::Warn) { - it.second.level = warningTypeOn; - } - } - } else { - // "-Werror=" / "-Wno-error=" parser - if (currentArgv.rfind("error=", 0) == 0) { - // Read starting after the "error=" part - currentArgv = &argv[i][startingIndex + 6]; - warningTypeOn = warningTypeOn != WarningLevel::Off ? WarningLevel::Err : WarningLevel::Warn; - } - - auto it = warningStringToInitMap.find(std::string(currentArgv)); - if (it != warningStringToInitMap.end()) { - warningTypeToInfoMap[it->second.type].level = warningTypeOn; - } - else { - HANDLE_WARNING(WarningType::Always, StringHelper::Sprintf("unknown warning flag '%s'", argv[i]), ""); - } - } - } - - if (werror) { - for (auto& it: warningTypeToInfoMap) { - if (it.second.level >= WarningLevel::Warn) { - it.second.level = WarningLevel::Err; - } - } - } -} - -bool WarningHandler::IsWarningEnabled(WarningType warnType) { - assert(static_cast(warnType) >= 0 && warnType < WarningType::Max); - - return warningTypeToInfoMap.at(warnType).level != WarningLevel::Off; -} - -bool WarningHandler::WasElevatedToError(WarningType warnType) { - assert(static_cast(warnType) >= 0 && warnType < WarningType::Max); - - if (!IsWarningEnabled(warnType)) { - return false; - } - - return warningTypeToInfoMap.at(warnType).level >= WarningLevel::Err; -} - -/** - * Print file/line/function info for debugging - */ -void WarningHandler::FunctionPreamble(const char* filename, int32_t line, const char* function) { - bool forcePrint = false; - -#ifdef DEVELOPMENT - forcePrint = true; -#endif - - fprintf(stderr, "\n"); - - if (forcePrint || Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) { - fprintf(stderr, "%s:%i: in function <%s>:\n", filename, line, function); - } -} - -/** - * Print the information about the file(s) being processed (XML for extraction, png etc. for building) - */ -void WarningHandler::ProcessedFilePreamble() { - if (Globals::Instance->inputPath != "") { - fprintf(stderr, "When processing file %s: ", Globals::Instance->inputPath.c_str()); - } -} - -/** - * Print information about the binary file being extracted - */ -void WarningHandler::ExtractedFilePreamble(const ZFile *parent, const ZResource* res, const uint32_t offset) { - fprintf(stderr, "in input binary file %s, ", parent->GetName().c_str()); - if (res != nullptr) { - fprintf(stderr, "resource '%s' at ", res->GetName().c_str()); - } - fprintf(stderr, "offset 0x%06X: \n\t", offset); -} - -/** - * Construct the rest of the message, after warning:/error. The message is filled in one character at a time, with indents added after newlines - */ -std::string WarningHandler::ConstructMessage(std::string message, const std::string& header, const std::string& body) { - message.reserve(message.size() + header.size() + body.size() + 10 * (sizeof(HANG_INDT) - 1)); - message += StringHelper::Sprintf(HILITE("%s"), header.c_str()); - message += "\n"; - - if (body == "") { - return message; - } - - message += HANG_INDT; - for (const char* ptr = body.c_str(); *ptr != '\0'; ptr++) { - message += *ptr; - if (*ptr == '\n') { - message += HANG_INDT; - } - } - message += "\n"; - - return message; -} - -/* Error module functions */ - -void WarningHandler::PrintErrorAndThrow(const std::string& header, const std::string& body) { - std::string errorMsg = ERR_FMT("error: "); - throw std::runtime_error(ConstructMessage(errorMsg, header, body)); -} - -/* Error types, to be used via the macros */ - -void WarningHandler::ErrorType(WarningType warnType, const std::string& header, const std::string& body) { - std::string headerMsg = header; - - for (const auto& iter: warningStringToInitMap) { - if (iter.second.type == warnType) { - headerMsg += StringHelper::Sprintf(" [%s]", iter.first.c_str()); - } - } - - PrintErrorAndThrow(headerMsg, body); -} - -void WarningHandler::Error_Plain(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - FunctionPreamble(filename, line, function); - - ErrorType(warnType, header, body); -} - -void WarningHandler::Error_Process(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - - ErrorType(warnType, header, body); -} - -void WarningHandler::Error_Resource(const char* filename, int32_t line, const char* function, WarningType warnType, const ZFile *parent, const ZResource* res, const uint32_t offset, const std::string& header, const std::string& body) { - assert(parent != nullptr); - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - ExtractedFilePreamble(parent, res, offset); - - ErrorType(warnType, header, body); -} - -/* Warning module functions */ - -void WarningHandler::PrintWarningBody(const std::string& header, const std::string& body) { - std::string errorMsg = WARN_FMT("warning: "); - fprintf(stderr, "%s", ConstructMessage(errorMsg, header, body).c_str()); -} - -void WarningHandler::WarningTypeAndChooseEscalate(WarningType warnType, const std::string& header, const std::string& body) { - std::string headerMsg = header; - - for (const auto& iter: warningStringToInitMap) { - if (iter.second.type == warnType) { - headerMsg += StringHelper::Sprintf(" [-W%s]", iter.first.c_str()); - } - } - - if (WasElevatedToError(warnType)) { - PrintErrorAndThrow(headerMsg, body); - } else { - PrintWarningBody(headerMsg, body); - } -} - - -/* Warning types, to be used via the macros */ - -void WarningHandler::Warning_Plain(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - -void WarningHandler::Warning_Process(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - -void WarningHandler::Warning_Resource(const char* filename, int32_t line, const char* function, WarningType warnType, const ZFile *parent, const ZResource* res, const uint32_t offset, const std::string& header, const std::string& body) { - assert(parent != nullptr); - - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - ExtractedFilePreamble(parent, res, offset); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - - -/* Help-related functions */ - -#include - -/** - * Print each warning name, default status, and description using the init map - */ -void WarningHandler::PrintHelp() { - std::set sortedKeys; - WarningInfoInit warningInfo; - uint32_t columnWidth = 25; - std::string dt; - - // Sort keys through the magic of `set`, to print in alphabetical order - for (auto& it : warningStringToInitMap) { - sortedKeys.insert(it.first); - } - - printf("\nWarning types ( * means enabled by default)\n"); - for (auto& key : sortedKeys) { - warningInfo = warningStringToInitMap.at(key); - if (warningInfo.defaultLevel <= WarningLevel::Warn) { - dt = "-W"; - dt += key; - if (warningInfo.defaultLevel == WarningLevel::Warn) { - dt += " *"; - } - printf(HELP_DT_INDT "%-*s", columnWidth, dt.c_str()); - - if (dt.length() + 2 > columnWidth) { - printf("\n" HELP_DT_INDT "%-*s", columnWidth, ""); - } - printf("%s\n", warningInfo.description.c_str()); - } - } - - printf("\nDefault errors\n"); - for (auto& key : sortedKeys) { - if (warningInfo.defaultLevel > WarningLevel::Warn) { - dt = "-W"; - dt += key; - printf(HELP_DT_INDT "%-*s", columnWidth, dt.c_str()); - - if (dt.length() + 2 > columnWidth) { - printf("\n" HELP_DT_INDT "%*s", columnWidth, ""); - } - printf("%s\n", warningInfo.description.c_str()); - } - } - - printf("\n"); - printf("Other\n" HELP_DT_INDT "-Weverything will enable all existing warnings.\n" HELP_DT_INDT "-Werror will promote all warnings to errors.\n"); - - printf("\n"); - printf("Warnings can be disabled using -Wno-... instead of -W...; -Weverything will override any -Wno-... flags passed before it.\n"); -} - -/** - * Print which warnings are currently enabled - */ -void WarningHandler::PrintWarningsDebugInfo() -{ - std::string dt; - - printf("Warnings status:\n"); - for (auto& it: warningTypeToInfoMap) { - dt = it.second.name; - dt += ": "; - - printf(HELP_DT_INDT "%-25s", dt.c_str()); - switch (it.second.level) - { - case WarningLevel::Off: - printf(VT_FGCOL(LIGHTGRAY) "Off" VT_RST); - break; - case WarningLevel::Warn: - printf(VT_FGCOL(YELLOW) "Warn" VT_RST); - break; - case WarningLevel::Err: - printf(VT_FGCOL(RED) "Err" VT_RST); - break; - - } - printf("\n"); - } - printf("\n"); -} diff --git a/ZAPDTR/ZAPD/WarningHandler.h b/ZAPDTR/ZAPD/WarningHandler.h deleted file mode 100644 index bb0360a81..000000000 --- a/ZAPDTR/ZAPD/WarningHandler.h +++ /dev/null @@ -1,145 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "Utils/vt.h" -#include "ZFile.h" - -#ifdef _MSC_VER -#define __PRETTY_FUNCTION__ __FUNCSIG__ -#elif not defined(__GNUC__) -#define __PRETTY_FUNCTION__ __func__ -#endif - -// ======================================= -/* Formatting macros */ - -// TODO: move this somewhere else so it can be used by other help -#define HELP_DT_INDT " " - -/* Macros for formatting warnings/errors */ -#define VT_HILITE VT_BOLD_FGCOL(WHITE) -#define VT_WARN VT_BOLD_FGCOL(PURPLE) -#define VT_ERR VT_BOLD_FGCOL(RED) - -#define HILITE(string) (VT_HILITE string VT_RST) -#define WARN_FMT(string) (VT_WARN string VT_RST) -#define ERR_FMT(string) (VT_ERR string VT_RST) - -// Maybe make WARN_LF instead -// Currently 8 spaces -#define WARN_INDT " " -// Currently 16 spaces -#define HANG_INDT " " - -// ======================================= -/* Warning and error macros */ -// TODO: better names - -// General-purpose, plain style (only prints function,file,line in the preamble) -#define HANDLE_ERROR(warningType, header, body) \ - WarningHandler::Error_Plain(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, body) -#define HANDLE_WARNING(warningType, header, body) \ - WarningHandler::Warning_Plain(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) - -// For processing XMLs or textures/blobs (preamble contains function,file,line; processed file) -#define HANDLE_ERROR_PROCESS(warningType, header, body) \ - WarningHandler::Error_Process(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) -#define HANDLE_WARNING_PROCESS(warningType, header, body) \ - WarningHandler::Warning_Process(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) - -// For ZResource-related stuff (preamble contains function,file,line; processed file; extracted file -// and offset) -#define HANDLE_ERROR_RESOURCE(warningType, parent, resource, offset, header, body) \ - WarningHandler::Error_Resource(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, parent, \ - resource, offset, header, body) -#define HANDLE_WARNING_RESOURCE(warningType, parent, resource, offset, header, body) \ - WarningHandler::Warning_Resource(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, parent, \ - resource, offset, header, body) - -// ======================================= - -enum class WarningType -{ - Always, // Warnings of this type are always printed, cannot be disabled. - Deprecated, - Unaccounted, - MissingOffsets, - Intersection, - MissingAttribute, - InvalidAttributeValue, - UnknownAttribute, - InvalidXML, - InvalidJPEG, - InvalidPNG, - InvalidExtractedData, - MissingSegment, - HardcodedPointer, - NotImplemented, - Max, -}; - -enum class WarningLevel -{ - Off, - Warn, - Err, -}; - -class WarningHandler -{ -public: - static void ConstructTypeToInfoMap(); - - static void Init(int argc, char* argv[]); - - static bool IsWarningEnabled(WarningType warnType); - static bool WasElevatedToError(WarningType warnType); - - static void FunctionPreamble(const char* filename, int32_t line, const char* function); - static void ProcessedFilePreamble(); - static void ExtractedFilePreamble(const ZFile* parent, const ZResource* res, - const uint32_t offset); - static std::string ConstructMessage(std::string message, const std::string& header, - const std::string& body); - - [[noreturn]] static void PrintErrorAndThrow(const std::string& header, const std::string& body); - static void PrintWarningBody(const std::string& header, const std::string& body); - - [[noreturn]] static void ErrorType(WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Plain(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Process(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Resource(const char* filename, int32_t line, - const char* function, WarningType warnType, - const ZFile* parent, const ZResource* res, - const uint32_t offset, const std::string& header, - const std::string& body); - - static void WarningTypeAndChooseEscalate(WarningType warnType, const std::string& header, - const std::string& body); - - static void Warning_Plain(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - static void Warning_Process(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - static void Warning_Resource(const char* filename, int32_t line, const char* function, - WarningType warnType, const ZFile* parent, const ZResource* res, - const uint32_t offset, const std::string& header, - const std::string& body); - - static void PrintHelp(); - static void PrintWarningsDebugInfo(); -}; diff --git a/ZAPDTR/ZAPD/ZAPD.vcxproj b/ZAPDTR/ZAPD/ZAPD.vcxproj deleted file mode 100644 index 505e41100..000000000 --- a/ZAPDTR/ZAPD/ZAPD.vcxproj +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36} - ZAPD - 10.0 - ZAPD - - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(LibraryPath) - $(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath) - - - $(IncludePath) - - - $(SolutionDir)ZAPD\lib\tinyxml2;$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)ZAPD\lib\elfio;$(SolutionDir)ZAPD\lib\stb;$(ProjectDir);$(IncludePath) - $(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)x64\Debug;$(SolutionDir)packages\libpng.1.6.28.1\build\native\lib\x64\v140\dynamic\Debug;$(LibraryPath) - - - - Level3 - Disabled - true - true - stdcpp17 - stdc11 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - true - Console - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - Disabled - true - true - stdcpp17 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - stdc11 - MultiThreadedDebug - true - - - true - ZAPDUtils.lib;/WHOLEARCHIVE:ExporterExample.lib;%(AdditionalDependencies) - false - Console - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - MaxSpeed - true - true - true - true - true - - - true - true - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - MaxSpeed - true - true - true - true - stdcpplatest - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - true - true - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZAPD.vcxproj.filters b/ZAPDTR/ZAPD/ZAPD.vcxproj.filters deleted file mode 100644 index ce89882fe..000000000 --- a/ZAPDTR/ZAPD/ZAPD.vcxproj.filters +++ /dev/null @@ -1,572 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {02148456-5068-4613-8478-f10addc58e70} - - - {bcab3136-95ba-4839-833c-43d78ad6e335} - - - {dc06ed84-f6fe-4277-80f3-d62bd5cdbb98} - - - {6049c045-bc38-4221-b29e-ca6d4d8af4aa} - - - {490e3a08-047b-48d3-ab53-3a860a3b92aa} - - - {26c06845-8e8e-4b79-ad18-07c4f9c0f801} - - - {d45c420d-2378-47ac-92c5-80db9475c195} - - - {03cc56a2-e0e8-4167-80a0-98fb900a959a} - - - {73db0879-6df8-4f6a-8cc2-a1f836e9e796} - - - {be9a5be0-ec6a-4200-8e39-bb58c7da7aa8} - - - {7ee79d97-c6a8-4e82-93ef-37981f4d7838} - - - {85600275-99fe-491d-8189-bcc3dc1a8903} - - - {ba9990b0-1082-48bb-874c-6108534b5455} - - - {ce9d91b0-ba20-4296-bc2d-8630965bb392} - - - {730beb67-6d59-4849-9d9b-702c4a565fc0} - - - - - Source Files - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files - - - Source Files - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries - - - Header Files\Libraries - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - - - Resource Files - - - any\any - - - NuGet - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZActorList.cpp b/ZAPDTR/ZAPD/ZActorList.cpp deleted file mode 100644 index ee5cb4d44..000000000 --- a/ZAPDTR/ZAPD/ZActorList.cpp +++ /dev/null @@ -1,194 +0,0 @@ -#include "ZActorList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" - -REGISTER_ZFILENODE(ActorList, ZActorList); - -ZActorList::ZActorList(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Count"); -} - -void ZActorList::ExtractFromBinary(uint32_t nRawDataIndex, uint8_t nNumActors) -{ - rawDataIndex = nRawDataIndex; - numActors = nNumActors; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZActorList::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - numActors = StringHelper::StrToL(registeredAttributes.at("Count").value); - - if (numActors < 1) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%d' found for 'NumPaths' attribute", numActors), - "Should be at least '1'"); - } -} - -void ZActorList::ParseRawData() -{ - ZResource::ParseRawData(); - - offset_t currentPtr = rawDataIndex; - size_t largestlength = 0; - - for (size_t i = 0; i < numActors; i++) - { - ActorSpawnEntry entry(parent->GetRawData(), currentPtr); - - currentPtr += entry.GetRawDataSize(); - actors.push_back(entry); - - size_t actorNameLength = ZNames::GetActorName(entry.GetActorId()).size(); - if (actorNameLength > largestlength) - largestlength = actorNameLength; - } - - for (auto& entry : actors) - { - entry.SetLargestActorName(largestlength); - } -} - -Declaration* ZActorList::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, GetActorListArraySize(), bodyStr); - decl->staticConf = staticConf; - - return decl; -} - -std::string ZActorList::GetBodySourceCode() const -{ - std::string declaration; - - size_t index = 0; - for (auto& entry : actors) - { - declaration += StringHelper::Sprintf("\t{ %s },", entry.GetBodySourceCode().c_str()); - - if (index < actors.size() - 1) - declaration += "\n"; - - index++; - } - - return declaration; -} - -std::string ZActorList::GetSourceTypeName() const -{ - return actors.front().GetSourceTypeName(); -} - -ZResourceType ZActorList::GetResourceType() const -{ - return ZResourceType::ActorList; -} - -size_t ZActorList::GetRawDataSize() const -{ - return actors.size() * actors.front().GetRawDataSize(); -} - -size_t ZActorList::GetActorListArraySize() const -{ - size_t actorCount = 0; - - // Doing an else-if here so we only do the loop when the game is SW97. - // Actor 0x22 is removed from SW97, so we need to ensure that we don't increment the actor count - // for it. - if (Globals::Instance->game == ZGame::OOT_SW97) - { - actorCount = 0; - - for (const auto& entry : actors) - if (entry.GetActorId() != 0x22) - actorCount++; - } - else - { - actorCount = actors.size(); - } - - return actorCount; -} - -/* ActorSpawnEntry */ - -ActorSpawnEntry::ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex) -{ - actorNum = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 8); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 10); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - params = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string ActorSpawnEntry::GetBodySourceCode() const -{ - std::string body; - - std::string actorNameFmt = StringHelper::Sprintf("%%-%zus ", largestActorName + 1); - body = - StringHelper::Sprintf(actorNameFmt.c_str(), (ZNames::GetActorName(actorNum) + ",").c_str()); - - body += StringHelper::Sprintf("{ %6i, %6i, %6i }, ", posX, posY, posZ); - if (Globals::Instance->game == ZGame::MM_RETAIL) - body += StringHelper::Sprintf("{ SPAWN_ROT_FLAGS(%#5hX, 0x%04X)" - ", SPAWN_ROT_FLAGS(%#5hX, 0x%04X)" - ", SPAWN_ROT_FLAGS(%#5hX, 0x%04X) }, ", - (rotX >> 7) & 0b111111111, rotX & 0b1111111, - (rotY >> 7) & 0b111111111, rotY & 0b1111111, - (rotZ >> 7) & 0b111111111, rotZ & 0b1111111); - else - body += StringHelper::Sprintf("{ %#6hX, %#6hX, %#6hX }, ", rotX, rotY, rotZ); - body += StringHelper::Sprintf("0x%04X", params); - - return body; -} - -std::string ActorSpawnEntry::GetSourceTypeName() const -{ - return "ActorEntry"; -} - -size_t ActorSpawnEntry::GetRawDataSize() const -{ - return 16; -} - -uint16_t ActorSpawnEntry::GetActorId() const -{ - return actorNum; -} - -void ActorSpawnEntry::SetLargestActorName(size_t nameSize) -{ - largestActorName = nameSize; -} diff --git a/ZAPDTR/ZAPD/ZActorList.h b/ZAPDTR/ZAPD/ZActorList.h deleted file mode 100644 index 7cc63da2f..000000000 --- a/ZAPDTR/ZAPD/ZActorList.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -#include "ZResource.h" - -class ActorSpawnEntry -{ -public: - uint16_t actorNum; - int16_t posX; - int16_t posY; - int16_t posZ; - uint16_t rotX; - uint16_t rotY; - uint16_t rotZ; - uint16_t params; - size_t largestActorName = 16; - - ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - std::string GetSourceTypeName() const; - size_t GetRawDataSize() const; - - uint16_t GetActorId() const; - void SetLargestActorName(size_t nameSize); -}; - -class ZActorList : public ZResource -{ -public: - std::vector actors; - uint32_t numActors = 0; - - ZActorList(ZFile* nParent); - - void ExtractFromBinary(offset_t nRawDataIndex, uint8_t nNumActors); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - size_t GetActorListArraySize() const; -}; diff --git a/ZAPDTR/ZAPD/ZAnimation.cpp b/ZAPDTR/ZAPD/ZAnimation.cpp deleted file mode 100644 index 199851415..000000000 --- a/ZAPDTR/ZAPD/ZAnimation.cpp +++ /dev/null @@ -1,580 +0,0 @@ -#include "ZAnimation.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Animation, ZNormalAnimation); -REGISTER_ZFILENODE(PlayerAnimation, ZLinkAnimation); -REGISTER_ZFILENODE(CurveAnimation, ZCurveAnimation); -REGISTER_ZFILENODE(LegacyAnimation, ZLegacyAnimation); - -ZAnimation::ZAnimation(ZFile* nParent) : ZResource(nParent) -{ - frameCount = 0; - genOTRDef = true; -} - -void ZAnimation::ParseRawData() -{ - ZResource::ParseRawData(); - - frameCount = BitConverter::ToInt16BE(parent->GetRawData(), rawDataIndex + 0); -} - -/* -std::string ZAnimation::GetSourceOutputHeader(const std::string& prefix) -{ - if (Globals::Instance->otrMode) - { - std::string str = ""; - str += StringHelper::Sprintf("#define %s \"__OTR__%s/%s\"", name.c_str(), parent->GetOutName().c_str(), name.c_str()); - - return str; - } - else - return ZResource::GetSourceOutputHeader(prefix); -} -*/ - -ZResourceType ZAnimation::GetResourceType() const -{ - return ZResourceType::Animation; -} - -/* ZNormalAnimation */ - -ZNormalAnimation::ZNormalAnimation(ZFile* nParent) : ZAnimation(nParent) -{ -} - -size_t ZNormalAnimation::GetRawDataSize() const -{ - return 16; -} - -std::string ZNormalAnimation::GetSourceTypeName() const -{ - return "AnimationHeader"; -} - -void ZNormalAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - auto& data = parent->GetRawData(); - - rotationValuesSeg = BitConverter::ToInt32BE(data, rawDataIndex + 4); - rotationIndicesSeg = BitConverter::ToInt32BE(data, rawDataIndex + 8); - limit = BitConverter::ToInt16BE(data, rawDataIndex + 12); - - rotationValuesOffset = Seg2Filespace(rotationValuesSeg, parent->baseAddress); - rotationIndicesOffset = Seg2Filespace(rotationIndicesSeg, parent->baseAddress); - - uint32_t currentPtr = rotationValuesOffset; - - // Read the Rotation Values - for (uint32_t i = 0; i < ((rotationIndicesOffset - rotationValuesOffset) / 2); i++) - { - rotationValues.push_back(BitConverter::ToInt16BE(data, currentPtr)); - currentPtr += 2; - } - - currentPtr = rotationIndicesOffset; - - // Read the Rotation Indices - for (uint32_t i = 0; i < ((rawDataIndex - rotationIndicesOffset) / 6); i++) - { - rotationIndices.push_back(RotationIndex(BitConverter::ToInt16BE(data, currentPtr), - BitConverter::ToInt16BE(data, currentPtr + 2), - BitConverter::ToInt16BE(data, currentPtr + 4))); - currentPtr += 6; - } -} - -void ZNormalAnimation::DeclareReferences(const std::string& prefix) -{ - std::string defaultPrefix = prefix.c_str(); - if (name != "") - defaultPrefix = name; - - // replace g prefix with s for local variables - if (defaultPrefix.at(0) == 'g') - defaultPrefix.replace(0, 1, "s"); - - std::string indicesStr = ""; - std::string valuesStr = " "; - const uint8_t lineLength = 14; - const uint8_t offset = 0; - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < rotationValues.size(); i++) - { - valuesStr += StringHelper::Sprintf("0x%04X, ", rotationValues[i]); - - if ((i - offset + 1) % lineLength == 0) - valuesStr += "\n "; - } - } - - parent->AddDeclarationArray(rotationValuesOffset, DeclarationAlignment::Align4, - rotationValues.size() * 2, "s16", - StringHelper::Sprintf("%sFrameData", defaultPrefix.c_str()), - rotationValues.size(), valuesStr); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < rotationIndices.size(); i++) - { - indicesStr += - StringHelper::Sprintf(" { 0x%04X, 0x%04X, 0x%04X },", rotationIndices[i].x, - rotationIndices[i].y, rotationIndices[i].z); - - if (i != (rotationIndices.size() - 1)) - indicesStr += "\n"; - } - } - - parent->AddDeclarationArray(rotationIndicesOffset, DeclarationAlignment::Align4, - rotationIndices.size() * 6, "JointIndex", - StringHelper::Sprintf("%sJointIndices", defaultPrefix.c_str()), - rotationIndices.size(), indicesStr); -} - -std::string ZNormalAnimation::GetBodySourceCode() const -{ - std::string frameDataName; - Globals::Instance->GetSegmentedPtrName(rotationValuesSeg, parent, "s16", frameDataName, - parent->workerID); - std::string jointIndicesName; - Globals::Instance->GetSegmentedPtrName(rotationIndicesSeg, parent, "JointIndex", - jointIndicesName, parent->workerID); - - std::string headerStr = - StringHelper::Sprintf("\n\t{ %i }, %s,\n", frameCount, frameDataName.c_str()); - headerStr += StringHelper::Sprintf("\t%s, %i\n", jointIndicesName.c_str(), limit); - - return headerStr; -} - -/* ZLinkAnimation */ - -ZLinkAnimation::ZLinkAnimation(ZFile* nParent) : ZAnimation(nParent) -{ - segmentAddress = 0; -} - -size_t ZLinkAnimation::GetRawDataSize() const -{ - return 8; -} - -std::string ZLinkAnimation::GetSourceTypeName() const -{ - return "LinkAnimationHeader"; -} - -void ZLinkAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - segmentAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); -} - -std::string ZLinkAnimation::GetBodySourceCode() const -{ - std::string segSymbol; - Globals::Instance->GetSegmentedPtrName(segmentAddress, parent, "", segSymbol, parent->workerID); - - return StringHelper::Sprintf("\n\t{ %i }, %s\n", frameCount, segSymbol.c_str()); -} - -/* ZCurveAnimation */ - -TransformData::TransformData(ZFile* parent, const std::vector& rawData, - uint32_t fileOffset) - : parent(parent) -{ - unk_00 = BitConverter::ToUInt16BE(rawData, fileOffset + 0); - unk_02 = BitConverter::ToUInt16BE(rawData, fileOffset + 2); - unk_04 = BitConverter::ToInt16BE(rawData, fileOffset + 4); - unk_06 = BitConverter::ToInt16BE(rawData, fileOffset + 6); - unk_08 = BitConverter::ToFloatBE(rawData, fileOffset + 8); -} - -TransformData::TransformData(ZFile* parent, const std::vector& rawData, - uint32_t fileOffset, size_t index) - : TransformData(parent, rawData, fileOffset + index * GetRawDataSize()) -{ -} - -std::string TransformData::GetBody([[maybe_unused]] const std::string& prefix) const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, %i, %i, %ff", unk_00, unk_02, unk_04, unk_06, - unk_08); -} - -size_t TransformData::GetRawDataSize() const -{ - return 0x0C; -} - -std::string TransformData::GetSourceTypeName() -{ - return "TransformData"; -} - -ZCurveAnimation::ZCurveAnimation(ZFile* nParent) : ZAnimation(nParent) -{ - RegisterOptionalAttribute("SkelOffset"); -} - -void ZCurveAnimation::ParseXML(tinyxml2::XMLElement* reader) -{ - ZAnimation::ParseXML(reader); - - std::string skelOffsetXml = registeredAttributes.at("SkelOffset").value; - if (skelOffsetXml == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'SkelOffset' attribute in ", - "You need to provide the offset of the curve skeleton."); - } - skelOffset = StringHelper::StrToL(skelOffsetXml, 0); -} - -void ZCurveAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - refIndex = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); - transformData = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - copyValues = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - unk_0C = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - unk_10 = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); - - uint32_t limbCountAddress = Seg2Filespace(skelOffset, parent->baseAddress) + 4; - limbCount = BitConverter::ToUInt8BE(rawData, limbCountAddress); - - size_t transformDataSize = 0; - size_t copyValuesSize = 0; - if (refIndex != 0) - { - uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); - for (size_t i = 0; i < 3 * 3 * limbCount; i++) - { - uint8_t ref = BitConverter::ToUInt8BE(rawData, refIndexOffset + i); - if (ref == 0) - copyValuesSize++; - else - transformDataSize += ref; - - refIndexArr.emplace_back(ref); - } - } - - if (transformData != 0) - { - uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - - for (size_t i = 0; i < transformDataSize; i++) - transformDataArr.emplace_back(parent, rawData, transformDataOffset, i); - } - - if (copyValues != 0) - { - uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); - - for (size_t i = 0; i < copyValuesSize; i++) - copyValuesArr.emplace_back(BitConverter::ToInt16BE(rawData, copyValuesOffset + i * 2)); - } -} - -void ZCurveAnimation::DeclareReferences(const std::string& prefix) -{ - if (refIndex != 0) - { - uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); - std::string refIndexStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Ref", refIndexOffset); - - std::string entryStr = " "; - uint16_t arrayItemCnt = refIndexArr.size(); - - size_t i = 0; - for (auto& child : refIndexArr) - { - entryStr += StringHelper::Sprintf("0x%02X, %s", child, (i++ % 8 == 7) ? "\n " : ""); - } - - Declaration* decl = parent->GetDeclaration(refIndexOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(refIndexOffset, DeclarationAlignment::Align4, - arrayItemCnt * 1, "u8", refIndexStr, arrayItemCnt, - entryStr); - } - else - { - decl->text = entryStr; - } - } - - if (transformData != 0) - { - uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - std::string transformDataStr = StringHelper::Sprintf( - "%sCurveAnime_%s_%06X", prefix.c_str(), - transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); - - std::string entryStr; - uint16_t arrayItemCnt = transformDataArr.size(); - - size_t i = 0; - for (auto& child : transformDataArr) - { - entryStr += StringHelper::Sprintf(" { %s },%s", child.GetBody(prefix).c_str(), - (++i < arrayItemCnt) ? "\n" : ""); - } - - Declaration* decl = parent->GetDeclaration(transformDataOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(transformDataOffset, DeclarationAlignment::Align4, - arrayItemCnt * transformDataArr.at(0).GetRawDataSize(), - transformDataArr.at(0).GetSourceTypeName(), - transformDataStr, arrayItemCnt, entryStr); - } - else - { - decl->text = entryStr; - } - } - - if (copyValues != 0) - { - uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); - std::string copyValuesStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Copy", copyValuesOffset); - - std::string entryStr = " "; - uint16_t arrayItemCnt = copyValuesArr.size(); - - size_t i = 0; - for (auto& child : copyValuesArr) - { - entryStr += StringHelper::Sprintf("% 6i, %s", child, (i++ % 8 == 7) ? "\n " : ""); - } - - Declaration* decl = parent->GetDeclaration(copyValuesOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(copyValuesOffset, DeclarationAlignment::Align4, - arrayItemCnt * 2, "s16", copyValuesStr, arrayItemCnt, - entryStr); - } - else - { - decl->text = entryStr; - } - } -} - -std::string ZCurveAnimation::GetBodySourceCode() const -{ - std::string refIndexStr; - Globals::Instance->GetSegmentedPtrName(refIndex, parent, "u8", refIndexStr, parent->workerID); - std::string transformDataStr; - Globals::Instance->GetSegmentedPtrName(transformData, parent, "TransformData", - transformDataStr, parent->workerID); - std::string copyValuesStr; - Globals::Instance->GetSegmentedPtrName(copyValues, parent, "s16", copyValuesStr, - parent->workerID); - - return StringHelper::Sprintf("\n\t%s,\n\t%s,\n\t%s,\n\t%i, %i\n", refIndexStr.c_str(), - transformDataStr.c_str(), copyValuesStr.c_str(), unk_0C, unk_10); -} - -size_t ZCurveAnimation::GetRawDataSize() const -{ - return 0x10; -} - -DeclarationAlignment ZCurveAnimation::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -std::string ZCurveAnimation::GetSourceTypeName() const -{ - return "TransformUpdateIndex"; -} - -/* ZLegacyAnimation */ - -ZLegacyAnimation::ZLegacyAnimation(ZFile* nParent) : ZAnimation(nParent) -{ -} - -void ZLegacyAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - limbCount = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - frameData = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - jointKey = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - if (GETSEGNUM(frameData) == parent->segment && GETSEGNUM(jointKey) == parent->segment) - { - uint32_t frameDataOffset = Seg2Filespace(frameData, parent->baseAddress); - uint32_t jointKeyOffset = Seg2Filespace(jointKey, parent->baseAddress); - - uint32_t ptr = frameDataOffset; - for (size_t i = 0; i < (jointKeyOffset - frameDataOffset) / 2; i++) - { - frameDataArray.push_back(BitConverter::ToUInt16BE(rawData, ptr)); - ptr += 2; - } - - ptr = jointKeyOffset; - for (int32_t i = 0; i < limbCount + 1; i++) - { - JointKey key(parent); - key.ExtractFromFile(ptr); - - jointKeyArray.push_back(key); - ptr += key.GetRawDataSize(); - } - } -} - -void ZLegacyAnimation::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - ZAnimation::DeclareReferences(varPrefix); - - if (!frameDataArray.empty()) - { - uint32_t frameDataOffset = Seg2Filespace(frameData, parent->baseAddress); - if (GETSEGNUM(frameData) == parent->segment && !parent->HasDeclaration(frameDataOffset)) - { - std::string frameDataBody = "\t"; - - for (size_t i = 0; i < frameDataArray.size(); i++) - { - frameDataBody += StringHelper::Sprintf("0x%04X, ", frameDataArray[i]); - - if (i % 8 == 7 && i + 1 < frameDataArray.size()) - frameDataBody += "\n\t"; - } - - std::string frameDataName = StringHelper::Sprintf("%sFrameData", varPrefix.c_str()); - parent->AddDeclarationArray(frameDataOffset, DeclarationAlignment::Align4, - frameDataArray.size() * 2, "s16", frameDataName, - frameDataArray.size(), frameDataBody); - } - } - - if (!jointKeyArray.empty()) - { - uint32_t jointKeyOffset = Seg2Filespace(jointKey, parent->baseAddress); - if (GETSEGNUM(jointKey) == parent->segment && !parent->HasDeclaration(jointKeyOffset)) - { - const auto res = jointKeyArray.at(0); - std::string jointKeyBody; - - for (size_t i = 0; i < jointKeyArray.size(); i++) - { - jointKeyBody += StringHelper::Sprintf("\t{ %s },", - jointKeyArray[i].GetBodySourceCode().c_str()); - - if (i + 1 < jointKeyArray.size()) - jointKeyBody += "\n"; - } - - std::string jointKeyName = StringHelper::Sprintf("%sJointKey", varPrefix.c_str()); - parent->AddDeclarationArray(jointKeyOffset, DeclarationAlignment::Align4, - jointKeyArray.size() * res.GetRawDataSize(), - res.GetSourceTypeName(), jointKeyName, jointKeyArray.size(), - jointKeyBody); - } - } -} - -std::string ZLegacyAnimation::GetBodySourceCode() const -{ - std::string body = "\n"; - - std::string frameDataName; - std::string jointKeyName; - Globals::Instance->GetSegmentedPtrName(frameData, parent, "s16", frameDataName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(jointKey, parent, "JointKey", jointKeyName, - parent->workerID); - - body += StringHelper::Sprintf("\t%i, %i,\n", frameCount, limbCount); - body += StringHelper::Sprintf("\t%s,\n", frameDataName.c_str()); - body += StringHelper::Sprintf("\t%s\n", jointKeyName.c_str()); - - return body; -} - -std::string ZLegacyAnimation::GetSourceTypeName() const -{ - return "LegacyAnimationHeader"; -} - -size_t ZLegacyAnimation::GetRawDataSize() const -{ - return 0x0C; -} - -JointKey::JointKey(ZFile* nParent) : ZResource(nParent) -{ -} - -void JointKey::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - xMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x00); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - yMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x06); - zMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x08); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x0A); -} - -std::string JointKey::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%6i, %6i, %6i, %6i, %6i, %6i", xMax, x, yMax, y, zMax, z); -} - -std::string JointKey::GetSourceTypeName() const -{ - return "JointKey"; -} - -ZResourceType JointKey::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t JointKey::GetRawDataSize() const -{ - return 0x0C; -} diff --git a/ZAPDTR/ZAPD/ZAnimation.h b/ZAPDTR/ZAPD/ZAnimation.h deleted file mode 100644 index 956e7faee..000000000 --- a/ZAPDTR/ZAPD/ZAnimation.h +++ /dev/null @@ -1,180 +0,0 @@ -#pragma once - -#include -#include -#include -#include "Vec3s.h" -#include "ZResource.h" -#include "ZSkeleton.h" -#include "tinyxml2.h" - -struct RotationIndex -{ - // uint16_t transX, transY, transZ; - uint16_t x, y, z; - - RotationIndex(uint16_t nX, uint16_t nY, uint16_t nZ) : x(nX), y(nY), z(nZ) {} -}; - -class ZAnimation : public ZResource -{ -public: - int16_t frameCount; - - ZAnimation(ZFile* nParent); - - //std::string GetSourceOutputHeader(const std::string& prefix) override; - ZResourceType GetResourceType() const override; - -protected: - void ParseRawData() override; -}; - -class ZNormalAnimation : public ZAnimation -{ -public: - std::vector rotationValues; - std::vector rotationIndices; - segptr_t rotationValuesSeg = 0; - segptr_t rotationIndicesSeg = 0; - offset_t rotationValuesOffset = 0; - offset_t rotationIndicesOffset = 0; - int16_t limit = 0; - - ZNormalAnimation(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - - void ParseRawData() override; -}; - -class ZLinkAnimation : public ZAnimation -{ -public: - segptr_t segmentAddress; - - ZLinkAnimation(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - - void ParseRawData() override; -}; - -class TransformData -{ -public: - ZFile* parent; - - ///* 0x0000 */ u16 unk_00; // appears to be flags - uint16_t unk_00; - ///* 0x0002 */ s16 unk_02; - int16_t unk_02; - ///* 0x0004 */ s16 unk_04; - int16_t unk_04; - ///* 0x0006 */ s16 unk_06; - int16_t unk_06; - ///* 0x0008 */ f32 unk_08; - float unk_08; - -public: - TransformData() = default; - TransformData(ZFile* parent, const std::vector& rawData, uint32_t fileOffset); - TransformData(ZFile* parent, const std::vector& rawData, uint32_t fileOffset, - size_t index); - - [[nodiscard]] std::string GetBody(const std::string& prefix) const; - - size_t GetRawDataSize() const; - std::string GetSourceTypeName(); -}; - -class ZCurveAnimation : public ZAnimation -{ -public: - segptr_t skelOffset = 0; - - ///* 0x0000 */ u8* refIndex; - segptr_t refIndex = 0; - ///* 0x0004 */ TransformData* transformData; - segptr_t transformData = 0; - ///* 0x0008 */ s16* copyValues; - segptr_t copyValues = 0; - ///* 0x000C */ s16 unk_0C; - int16_t unk_0C; - ///* 0x000E */ s16 unk_10; - int16_t unk_10; - - uint8_t limbCount = 0; - - std::vector refIndexArr; - std::vector transformDataArr; - std::vector copyValuesArr; - -public: - ZCurveAnimation(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - std::string GetSourceTypeName() const override; -}; -// TransformUpdateIndex - -/* ZLegacyAnimation */ - -class JointKey : public ZResource -{ -public: - JointKey(ZFile* nParent); - - void ParseRawData() override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - int16_t xMax, x; - int16_t yMax, y; - int16_t zMax, z; -}; - -class ZLegacyAnimation : public ZAnimation -{ -public: - ZLegacyAnimation(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - - size_t GetRawDataSize() const override; - -protected: - int16_t limbCount; - segptr_t frameData; // s16* - segptr_t jointKey; // JointKey* - - std::vector frameDataArray; - std::vector jointKeyArray; -}; diff --git a/ZAPDTR/ZAPD/ZArray.cpp b/ZAPDTR/ZAPD/ZArray.cpp deleted file mode 100644 index 8725e28cc..000000000 --- a/ZAPDTR/ZAPD/ZArray.cpp +++ /dev/null @@ -1,153 +0,0 @@ -#include "ZArray.h" - -#include - -#include "Globals.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Array, ZArray); - -ZArray::ZArray(ZFile* nParent) : ZResource(nParent) -{ - canHaveInner = true; - genOTRDef = true; - RegisterRequiredAttribute("Count"); -} - -ZArray::~ZArray() -{ - for (auto res : resList) - delete res; -} - -void ZArray::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - arrayCnt = reader->IntAttribute("Count", 0); - if (arrayCnt <= 0) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Count' attribute", ""); - } - - tinyxml2::XMLElement* child = reader->FirstChildElement(); - if (child == nullptr) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, - " needs one sub-element", ""); - } - - childName = child->Name(); - - auto nodeMap = ZFile::GetNodeMap(); - size_t childIndex = rawDataIndex; - resList.reserve(arrayCnt); - for (size_t i = 0; i < arrayCnt; i++) - { - ZResource* res = nodeMap->at(childName)(parent); - if (!res->DoesSupportArray()) - { - std::string errorHeader = StringHelper::Sprintf( - "resource <%s> does not support being wrapped in an ", childName.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, errorHeader, - ""); - } - res->parent = parent; - res->SetInnerNode(true); - res->ExtractFromXML(child, childIndex); - - childIndex += res->GetRawDataSize(); - resList.push_back(res); - } -} - -Declaration* ZArray::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - ZResource* res = resList.at(0); - Declaration* decl; - if (res->IsExternalResource()) - { - auto filepath = Globals::Instance->outputPath / name; - std::string includePath = StringHelper::Sprintf("%s.%s.inc", filepath.c_str(), - res->GetExternalExtension().c_str()); - decl = parent->AddDeclarationIncludeArray(rawDataIndex, includePath, GetRawDataSize(), - GetSourceTypeName(), name, arrayCnt); - decl->text = bodyStr; - decl->isExternal = true; - } - else - { - decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, arrayCnt, bodyStr); - } - - decl->staticConf = staticConf; - return decl; -} - -std::string ZArray::GetBodySourceCode() const -{ - std::string output; - - for (size_t i = 0; i < arrayCnt; i++) - { - const auto& res = resList[i]; - output += "\t"; - - switch (res->GetResourceType()) - { - case ZResourceType::Pointer: - case ZResourceType::Scalar: - case ZResourceType::Vertex: - case ZResourceType::CollisionPoly: - case ZResourceType::SurfaceType: - output += resList.at(i)->GetBodySourceCode(); - break; - - default: - output += StringHelper::Sprintf("{ %s }", resList.at(i)->GetBodySourceCode().c_str()); - break; - } - - if (i < arrayCnt - 1 || res->IsExternalResource()) - output += ",\n"; - } - - return output; -} - -size_t ZArray::GetRawDataSize() const -{ - size_t size = 0; - for (const auto res : resList) - size += res->GetRawDataSize(); - return size; -} - -std::string ZArray::GetSourceTypeName() const -{ - return resList.at(0)->GetSourceTypeName(); -} - -ZResourceType ZArray::GetResourceType() const -{ - return ZResourceType::Array; -} - -DeclarationAlignment ZArray::GetDeclarationAlignment() const -{ - if (resList.size() == 0) - { - return DeclarationAlignment::Align4; - } - return resList.at(0)->GetDeclarationAlignment(); -} diff --git a/ZAPDTR/ZAPD/ZArray.h b/ZAPDTR/ZAPD/ZArray.h deleted file mode 100644 index e6594fadc..000000000 --- a/ZAPDTR/ZAPD/ZArray.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "tinyxml2.h" - -class ZArray : public ZResource -{ -public: - ZArray(ZFile* nParent); - ~ZArray(); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - DeclarationAlignment GetDeclarationAlignment() const override; - - size_t arrayCnt; - std::vector resList; -protected: - std::string childName; -}; diff --git a/ZAPDTR/ZAPD/ZAudio.cpp b/ZAPDTR/ZAPD/ZAudio.cpp deleted file mode 100644 index 9f2059271..000000000 --- a/ZAPDTR/ZAPD/ZAudio.cpp +++ /dev/null @@ -1,415 +0,0 @@ -#include "ZAudio.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Audio, ZAudio); - -ZAudio::ZAudio(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("SoundFontTableOffset"); - RegisterRequiredAttribute("SequenceTableOffset"); - RegisterRequiredAttribute("SampleBankTableOffset"); - RegisterRequiredAttribute("SequenceFontTableOffset"); -} - -void ZAudio::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - auto t = reader->Name(); - - auto child = reader->FirstChildElement(); - - while (child != nullptr) - { - if (std::string(child->Value()) == "Sequences") - { - auto seqChild = child->FirstChildElement(); - - while (seqChild != nullptr) - { - if (std::string(seqChild->Value()) == "Sequence") - { - seqNames.push_back(seqChild->Attribute("Name")); - } - - seqChild = seqChild->NextSiblingElement(); - } - } - - if (std::string(child->Value()) == "Samples") - { - int bankId = child->IntAttribute("Bank", 0); - auto sampChild = child->FirstChildElement(); - - while (sampChild != nullptr) - { - if (std::string(sampChild->Value()) == "Sample") - { - auto atStr = sampChild->FirstChildElement()->Attribute("At"); - auto loopStr = sampChild->FirstChildElement()->Attribute("LoopOffset"); - uint32_t loopOffset = 0xFFFFFFFF; - uint32_t atOffset = StringHelper::StrToL(atStr, 16); - - if (loopStr != NULL) - { - loopOffset = StringHelper::StrToL(loopStr, 16); - specialLoopSamples[loopOffset] = atOffset; - } - - sampleOffsets[bankId][loopOffset][atOffset] = sampChild->Attribute("Name"); - } - - sampChild = sampChild->NextSiblingElement(); - } - } - - if (std::string(child->Value()) == "Soundfont") - { - auto name = child->Attribute("Name"); - auto index = child->IntAttribute("Index", 0); - soundFontNames[index] = name; - } - - child = child->NextSiblingElement(); - } -} - -void ZAudio::DecodeADPCMSample(SampleEntry* sample) -{ - int16_t buffer[1024 * 128]; - - int16_t* out = &buffer[0]; -} - -std::vector ZAudio::ParseEnvelopeData(std::vector audioBank, std::vector audioTable, int envelopeOffset, int baseOffset) -{ - std::vector result; - - while (true) - { - AdsrEnvelope* env = new AdsrEnvelope(); - - env->delay = BitConverter::ToInt16BE(audioBank, envelopeOffset + 0); - env->arg = BitConverter::ToInt16BE(audioBank, envelopeOffset + 2); - - envelopeOffset += 4; - - result.push_back(env); - - if (env->delay < 0) - break; - } - - return result; -} - -SoundFontEntry* ZAudio::ParseSoundFontEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int soundFontOffset, - int baseOffset) -{ - SoundFontEntry* soundFont = new SoundFontEntry(); - soundFont->sampleEntry = ParseSampleEntry( - audioBank, audioTable, audioSampleBankEntry, bankIndex, - BitConverter::ToInt32BE(audioBank, soundFontOffset + 0) + baseOffset, baseOffset); - soundFont->tuning = BitConverter::ToFloatBE(audioBank, soundFontOffset + 4); - - return soundFont; -} - -SampleEntry* ZAudio::ParseSampleEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int sampleOffset, - int baseOffset) -{ - int sampleDataOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 4) + audioSampleBankEntry.ptr; - - if (samples.find(sampleOffset) == samples.end()) - { - SampleEntry* sample = new SampleEntry(); - - sample->bankId = bankIndex; - - int sampleSize = BitConverter::ToInt32BE(audioBank, sampleOffset + 0) & 0x00FFFFFF; - int loopOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 8) + baseOffset; - int bookOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 12) + baseOffset; - - char* sampleData = (char*)malloc(sampleSize); - memcpy(sampleData, audioTable.data() + sampleDataOffset, sampleSize); - sample->data = std::vector(sampleSize); - memcpy(sample->data.data(), sampleData, sampleSize); - - uint32_t origField = (BitConverter::ToUInt32BE(audioBank, sampleOffset + 0)); - sample->codec = (origField >> 28) & 0x0F; - sample->medium = (origField >> 24) & 0x03; - sample->unk_bit26 = (origField >> 22) & 0x01; - sample->unk_bit25 = (origField >> 21) & 0x01; - - sample->loop.start = BitConverter::ToInt32BE(audioBank, loopOffset + 0); - sample->loop.end = BitConverter::ToInt32BE(audioBank, loopOffset + 4); - sample->loop.count = BitConverter::ToInt32BE(audioBank, loopOffset + 8); - - if (sample->loop.count != 0) - { - for (int i = 0; i < 16; i++) - { - int16_t state = BitConverter::ToInt16BE(audioBank, loopOffset + 16 + (i * 2)); - sample->loop.states.push_back(state); - } - } - - sample->book.order = BitConverter::ToInt32BE(audioBank, bookOffset + 0); - sample->book.npredictors = BitConverter::ToInt32BE(audioBank, bookOffset + 4); - - for (int i = 0; i < sample->book.npredictors * sample->book.order * 8; i++) - { - sample->book.books.push_back( - BitConverter::ToInt16BE(audioBank, bookOffset + 8 + (i * 2))); - } - - sample->sampleDataOffset = sampleDataOffset; - - if (specialLoopSamples.find(loopOffset) != specialLoopSamples.end()) - sample->sampleLoopOffset = loopOffset; - - sample->fileName = StringHelper::Sprintf("audio/samples/sample_%08X", sampleOffset); - - samples[sampleOffset] = sample; - - return sample; - } - else - { - return samples[sampleOffset]; - } -} - -std::vector ZAudio::ParseAudioTable(std::vector codeData, int baseOffset) -{ - std::vector entries; - - int numEntries = BitConverter::ToInt16BE(codeData, baseOffset + 0); - int romAddr = BitConverter::ToInt16BE(codeData, baseOffset + 4); - - int currentOffset = baseOffset + 16; - - for (int i = 0; i < numEntries; i++) - { - AudioTableEntry entry; - - entry.ptr = BitConverter::ToInt32BE(codeData, currentOffset + 0); - entry.size = BitConverter::ToInt32BE(codeData, currentOffset + 4); - entry.medium = codeData[currentOffset + 8]; - entry.cachePolicy = codeData[currentOffset + 9]; - entry.data1 = BitConverter::ToInt16BE(codeData, currentOffset + 10); - entry.data2 = BitConverter::ToInt16BE(codeData, currentOffset + 12); - entry.data3 = BitConverter::ToInt16BE(codeData, currentOffset + 14); - - entries.push_back(entry); - - currentOffset += 16; - } - - return entries; -} - -void ZAudio::ParseSoundFont(std::vector codeData, std::vector audioTable, - std::vector audioSampleBank, - AudioTableEntry& entry) -{ - int ptr = entry.ptr; - int size = entry.size; - int sampleBankId1 = (entry.data1 >> 8) & 0xFF; - int sampleBankId2 = (entry.data1) & 0xFF; - int numInstruments = (entry.data2 >> 8) & 0xFF; - int numDrums = entry.data2 & 0xFF; - int numSfx = entry.data3; - - int currentOffset = BitConverter::ToInt32BE(codeData, ptr) + ptr; - for (int i = 0; i < numDrums; i++) - { - DrumEntry drum; - - int samplePtr = BitConverter::ToInt32BE(codeData, currentOffset); - - if (samplePtr != 0) - { - samplePtr += ptr; - - drum.sample = ParseSampleEntry(codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, - BitConverter::ToInt32BE(codeData, samplePtr + 4) + ptr, ptr); - - drum.releaseRate = codeData[samplePtr + 0]; - drum.pan = codeData[samplePtr + 1]; - drum.loaded = codeData[samplePtr + 2]; - drum.tuning = BitConverter::ToFloatBE(codeData, samplePtr + 8); - drum.env = ParseEnvelopeData(codeData, audioTable, BitConverter::ToInt32BE(codeData, samplePtr + 12) + ptr, ptr); - } - - entry.drums.push_back(drum); - - currentOffset += 4; - } - - currentOffset = BitConverter::ToInt32BE(codeData, ptr + 4) + ptr; - for (int i = 0; i < numSfx; i++) - { - SoundFontEntry* sfx; - sfx = ParseSoundFontEntry(codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, - currentOffset, ptr); - entry.soundEffects.push_back(sfx); - - currentOffset += 8; - } - - for (int i = 0; i < numInstruments; i++) - { - InstrumentEntry instrument; - - currentOffset = BitConverter::ToInt32BE(codeData, ptr + 8 + (i * 4)); - - instrument.isValidInstrument = currentOffset != 0; - - if (currentOffset != 0) - { - currentOffset += ptr; - - instrument.loaded = codeData[currentOffset + 0]; - instrument.normalRangeLo = codeData[currentOffset + 1]; - instrument.normalRangeHi = codeData[currentOffset + 2]; - instrument.releaseRate = codeData[currentOffset + 3]; - instrument.env = ParseEnvelopeData(codeData, audioTable, BitConverter::ToInt32BE(codeData, currentOffset + 4) + ptr, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 8) != 0) - instrument.lowNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 8, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 16) != 0) - instrument.normalNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 16, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 24) != 0 && - instrument.normalRangeHi != 0x7F) - instrument.highNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 24, ptr); - } - - entry.instruments.push_back(instrument); - } -} - -void ZAudio::ParseRawData() -{ - ZResource::ParseRawData(); - - std::vector codeData; - std::vector audioTableData; - std::vector audioBankData; - std::vector audioSeqData; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - codeData = Globals::Instance->GetBaseromFile("code"); - else - codeData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "code"); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioTableData = Globals::Instance->GetBaseromFile("Audiotable"); - else - audioTableData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "Audiotable"); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioBankData = Globals::Instance->GetBaseromFile("Audiobank"); - else - audioBankData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "Audiobank"); - - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioSeqData = Globals::Instance->GetBaseromFile("Audioseq"); - else - audioSeqData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + - "Audioseq"); - - // TABLE PARSING - - // MQ DBG ROM - //int gSoundFontTableOffset = 0x138270; - //int gSequenceTableOffset = 0x1386A0; - //int gSampleBankTableOffset = 0x138D90; - //int gSequenceFontTableOffset = 0x1384E0; - - // NTSC 1.0 - //int gSoundFontTableOffset = 0x1026A0; - //int gSequenceTableOffset = 0x102AD0; - //int gSampleBankTableOffset = 0x1031C0; - //int gSequenceFontTableOffset = 0x102910; - - int gSoundFontTableOffset = StringHelper::StrToL(registeredAttributes.at("SoundFontTableOffset").value, 16); - int gSequenceTableOffset = StringHelper::StrToL(registeredAttributes.at("SequenceTableOffset").value, 16); - int gSampleBankTableOffset = StringHelper::StrToL(registeredAttributes.at("SampleBankTableOffset").value, 16); - int gSequenceFontTableOffset = StringHelper::StrToL(registeredAttributes.at("SequenceFontTableOffset").value, 16); - - soundFontTable = ParseAudioTable(codeData, gSoundFontTableOffset); - sequenceTable = ParseAudioTable(codeData, gSequenceTableOffset); - sampleBankTable = ParseAudioTable(codeData, gSampleBankTableOffset); - - // SEQEUNCE FONT TABLE PARSING - for (int i = 0; i < sequenceTable.size(); i++) - { - uint16_t idx = BitConverter::ToUInt16BE(codeData, gSequenceFontTableOffset + (i * 2)); - uint8_t numFonts = codeData[gSequenceFontTableOffset + (idx++)]; - std::vector fontIds; - - for (int j = 0; j < numFonts; j++) - { - uint8_t fontId = codeData[gSequenceFontTableOffset + (idx++)]; - fontIds.push_back(fontId); - } - - fontIndices.push_back(fontIds); - } - - - // SAMPLE/FONT PARSING - for (int i = 0; i < soundFontTable.size(); i++) - { - ParseSoundFont(audioBankData, audioTableData, sampleBankTable, soundFontTable[i]); - } - - // SEQUENCE PARSING - for (int i = 0; i < sequenceTable.size(); i++) - { - int seqDestIdx = i; - - if (sequenceTable[i].size == 0) - seqDestIdx = sequenceTable[i].ptr; - - std::vector seqVec = std::vector(sequenceTable[seqDestIdx].size); - memcpy(seqVec.data(), audioSeqData.data() + sequenceTable[seqDestIdx].ptr, - sequenceTable[seqDestIdx].size); - - sequences.push_back(seqVec); - } -} - -std::string ZAudio::GetSourceTypeName() const -{ - return "u8"; -} - -size_t ZAudio::GetRawDataSize() const -{ - return 1; -} - -ZResourceType ZAudio::GetResourceType() const -{ - return ZResourceType::Audio; -} diff --git a/ZAPDTR/ZAPD/ZAudio.h b/ZAPDTR/ZAPD/ZAudio.h deleted file mode 100644 index 286c75c11..000000000 --- a/ZAPDTR/ZAPD/ZAudio.h +++ /dev/null @@ -1,134 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -struct AdsrEnvelope -{ - int16_t delay; - int16_t arg; -}; - -struct AdpcmBook -{ - /* 0x00 */ int32_t order; - /* 0x04 */ int32_t npredictors; - /* 0x08 */ std::vector books; // size 8 * order * npredictors. 8-byte aligned -}; - -struct AdpcmLoop -{ - /* 0x00 */ uint32_t start; - /* 0x04 */ uint32_t end; - /* 0x08 */ uint32_t count; - /* 0x10 */ std::vector states; -}; - -struct SampleEntry -{ - std::string fileName; - uint8_t bankId; - uint32_t sampleDataOffset; - uint32_t sampleLoopOffset = 0xFFFFFFFF; - uint8_t codec; - uint8_t medium; - uint8_t unk_bit26; - uint8_t unk_bit25; - - std::vector data; - AdpcmLoop loop; - AdpcmBook book; -}; - -struct SoundFontEntry -{ - SampleEntry* sampleEntry = nullptr; - float tuning; -}; - -struct DrumEntry -{ - uint8_t releaseRate; - uint8_t pan; - uint8_t loaded; - uint32_t offset; - float tuning; - std::vector env; - SampleEntry* sample = nullptr; -}; - -struct InstrumentEntry -{ - bool isValidInstrument; - uint8_t loaded; - uint8_t normalRangeLo; - uint8_t normalRangeHi; - uint8_t releaseRate; - std::vector env; - SoundFontEntry* lowNotesSound = nullptr; - SoundFontEntry* normalNotesSound = nullptr; - SoundFontEntry* highNotesSound = nullptr; -}; - -struct AudioTableEntry -{ - uint32_t ptr; - uint32_t size; - uint8_t medium; - uint8_t cachePolicy; - uint16_t data1; - uint16_t data2; - uint16_t data3; - - std::vector drums; - std::vector soundEffects; - std::vector instruments; -}; - -class ZAudio : public ZResource -{ -public: - std::vector soundFontTable; - std::vector sequenceTable; - std::vector sampleBankTable; - std::vector> sequences; - std::map samples; - std::vector> fontIndices; - std::vector seqNames; - std::map soundFontNames; - - // First Key = Bank ID, Sec Key = LoopDataOffset, Third Key = Sample Data Offset - std::map>> sampleOffsets; - - // Key = Loop Offset, Value = Sample Offset - std::map specialLoopSamples; - - ZAudio(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - void DecodeADPCMSample(SampleEntry* sample); - std::vector ParseEnvelopeData(std::vector audioBank, std::vector audioTable, - int envelopeOffset, int baseOffset); - - SoundFontEntry* ParseSoundFontEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int soundFontOffset, - int baseOffset); - - SampleEntry* ParseSampleEntry(std::vector audioBank, std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int sampleOffset, int baseOffset); - - std::vector ParseAudioTable(std::vector codeData, int baseOffset); - void ParseSoundFont(std::vector codeData, std::vector audioTable, - std::vector audioSampleBank, AudioTableEntry& entry); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZAudioDecode.cpp b/ZAPDTR/ZAPD/ZAudioDecode.cpp deleted file mode 100644 index 90ecfe35c..000000000 --- a/ZAPDTR/ZAPD/ZAudioDecode.cpp +++ /dev/null @@ -1,669 +0,0 @@ -/** - * Bruteforcing decoder for converting ADPCM-encoded AIFC into AIFF, in a way - * that roundtrips with vadpcm_enc. - */ -#include -#include -#include -#include -#include -#include -//#include - -typedef signed char s8; -typedef short s16; -typedef int s32; -typedef long long s64; -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -typedef unsigned long long u64; -typedef float f32; -typedef double f64; - -#ifdef _MSC_VER -#define __builtin_bswap16 _byteswap_ushort -#define __builtin_bswap32 _byteswap_ulong -#endif - -#define bswap16(x) __builtin_bswap16(x) -#define bswap32(x) __builtin_bswap32(x) -#define BSWAP16(x) x = __builtin_bswap16(x) -#define BSWAP32(x) x = __builtin_bswap32(x) -#define BSWAP16_MANY(x, n) \ - for (s32 _i = 0; _i < n; _i++) \ - BSWAP16((x)[_i]) - -#define NORETURN __attribute__((noreturn)) -#define UNUSED __attribute__((unused)) - -typedef struct -{ - u32 ckID; - u32 ckSize; -} ChunkHeader; - -typedef struct -{ - u32 ckID; - u32 ckSize; - u32 formType; -} Chunk; - -typedef struct -{ - s16 numChannels; - u16 numFramesH; - u16 numFramesL; - s16 sampleSize; - s16 sampleRate[5]; // 80-bit float - u16 compressionTypeH; - u16 compressionTypeL; -} CommonChunk; - -typedef struct -{ - s16 MarkerID; - u16 positionH; - u16 positionL; -} Marker; - -typedef struct -{ - s16 playMode; - s16 beginLoop; - s16 endLoop; -} Loop; - -typedef struct -{ - s8 baseNote; - s8 detune; - s8 lowNote; - s8 highNote; - s8 lowVelocity; - s8 highVelocity; - s16 gain; - Loop sustainLoop; - Loop releaseLoop; -} InstrumentChunk; - -typedef struct -{ - s32 offset; - s32 blockSize; -} SoundDataChunk; - -typedef struct -{ - s16 version; - s16 order; - s16 nEntries; -} CodeChunk; - -typedef struct -{ - u32 start; - u32 end; - u32 count; - s16 state[16]; -} ALADPCMloop; - -static char usage[] = "input.aifc output.aiff"; -static const char *progname, *infilename; -static int framesize = 9; - -void fail_parse(const char* fmt, ...) -{ - char* formatted = NULL; - va_list ap; - va_start(ap, fmt); - int size = vsnprintf(NULL, 0, fmt, ap); - va_end(ap); - if (size >= 0) - { - size++; - formatted = (char*)malloc(size); - if (formatted != NULL) - { - va_start(ap, fmt); - size = vsnprintf(formatted, size, fmt, ap); - va_end(ap); - if (size < 0) - { - free(formatted); - formatted = NULL; - } - } - } - - if (formatted != NULL) - { - fprintf(stderr, "%s: %s [%s]\n", progname, formatted, infilename); - free(formatted); - } - exit(1); -} - - -s32 myrand() -{ - static u64 state = 1619236481962341ULL; - state *= 3123692312237ULL; - state += 1; - return state >> 33; -} - -s16 qsample(f32 x, s32 scale) -{ - if (x > 0.0f) - { - return (s16)((x / scale) + 0.4999999); - } - else - { - return (s16)((x / scale) - 0.4999999); - } -} - -void clamp_to_s16(f32* in, s32* out) -{ - f32 llevel = -0x8000; - f32 ulevel = 0x7fff; - - for (s32 i = 0; i < 16; i++) - { - if (in[i] > ulevel) - in[i] = ulevel; - if (in[i] < llevel) - in[i] = llevel; - - if (in[i] > 0.0f) - { - out[i] = (s32)(in[i] + 0.5); - } - else - { - out[i] = (s32)(in[i] - 0.5); - } - } -} - -s16 clamp_bits(s32 x, s32 bits) -{ - s32 lim = 1 << (bits - 1); - if (x < -lim) - return -lim; - if (x > lim - 1) - return lim - 1; - return x; -} - -s32 readaifccodebook(FILE* fhandle, s32**** table, s16* order, s16* npredictors) -{ - BSWAP16(*order); - BSWAP16(*npredictors); - *table = (s32***)malloc(*npredictors * sizeof(s32**)); - for (s32 i = 0; i < *npredictors; i++) - { - (*table)[i] = (s32**)malloc(8 * sizeof(s32*)); - for (s32 j = 0; j < 8; j++) - { - (*table)[i][j] = (s32*)malloc((*order + 8) * sizeof(s32)); - } - } - - for (s32 i = 0; i < *npredictors; i++) - { - s32** table_entry = (*table)[i]; - for (s32 j = 0; j < *order; j++) - { - for (s32 k = 0; k < 8; k++) - { - s16 ts = 0; - BSWAP16(ts); - table_entry[k][j] = ts; - } - } - - for (s32 k = 1; k < 8; k++) - { - table_entry[k][*order] = table_entry[k - 1][*order - 1]; - } - - table_entry[0][*order] = 1 << 11; - - for (s32 k = 1; k < 8; k++) - { - s32 j = 0; - for (; j < k; j++) - { - table_entry[j][k + *order] = 0; - } - - for (; j < 8; j++) - { - table_entry[j][k + *order] = table_entry[j - k][*order]; - } - } - } - return 0; -} - -ALADPCMloop* readlooppoints(FILE* ifile, s16* nloops) -{ - BSWAP16(*nloops); - ALADPCMloop* al = (ALADPCMloop*)malloc(*nloops * sizeof(ALADPCMloop)); - for (s32 i = 0; i < *nloops; i++) - { - BSWAP32(al[i].start); - BSWAP32(al[i].end); - BSWAP32(al[i].count); - BSWAP16_MANY(al[i].state, 16); - } - return al; -} - -s32 inner_product(s32 length, s32* v1, s32* v2) -{ - s32 out = 0; - for (s32 i = 0; i < length; i++) - { - out += v1[i] * v2[i]; - } - - // Compute "out / 2^11", rounded down. - s32 dout = out / (1 << 11); - s32 fiout = dout * (1 << 11); - return dout - (out - fiout < 0); -} - -void my_decodeframe(u8* frame, s32* decompressed, s32* state, s32 order, s32*** coefTable) -{ - s32 ix[16]; - - u8 header = frame[0]; - s32 scale = 1 << (header >> 4); - s32 optimalp = header & 0xf; - - if (framesize == 5) - { - for (s32 i = 0; i < 16; i += 4) - { - u8 c = frame[1 + i / 4]; - ix[i] = c >> 6; - ix[i + 1] = (c >> 4) & 0x3; - ix[i + 2] = (c >> 2) & 0x3; - ix[i + 3] = c & 0x3; - } - } - else - { - for (s32 i = 0; i < 16; i += 2) - { - u8 c = frame[1 + i / 2]; - ix[i] = c >> 4; - ix[i + 1] = c & 0xf; - } - } - - for (s32 i = 0; i < 16; i++) - { - if (framesize == 5) - { - if (ix[i] >= 2) - ix[i] -= 4; - } - else - { - if (ix[i] >= 8) - ix[i] -= 16; - } - decompressed[i] = ix[i]; - ix[i] *= scale; - } - - for (s32 j = 0; j < 2; j++) - { - s32 in_vec[16]; - if (j == 0) - { - for (s32 i = 0; i < order; i++) - { - in_vec[i] = state[16 - order + i]; - } - } - else - { - for (s32 i = 0; i < order; i++) - { - in_vec[i] = state[8 - order + i]; - } - } - - for (s32 i = 0; i < 8; i++) - { - s32 ind = j * 8 + i; - in_vec[order + i] = ix[ind]; - state[ind] = inner_product(order + i, coefTable[optimalp][i], in_vec) + ix[ind]; - } - } -} - -void get_bounds(s32* in, s32* decompressed, s32 scale, s32* minVals, s32* maxVals) -{ - s32 minv, maxv; - if (framesize == 9) - { - minv = -8; - maxv = 7; - } - else - { - minv = -2; - maxv = 1; - } - for (s32 i = 0; i < 16; i++) - { - s32 lo = in[i] - scale / 2; - s32 hi = in[i] + scale / 2; - lo -= scale; - hi += scale; - if (decompressed[i] == minv) - lo -= scale; - else if (decompressed[i] == maxv) - hi += scale; - minVals[i] = lo; - maxVals[i] = hi; - } -} - -void write_header(FILE* ofile, const char* id, s32 size) -{ - fwrite(id, 4, 1, ofile); - BSWAP32(size); - fwrite(&size, sizeof(s32), 1, ofile); -} - -char* OldMain(char* infilename) -{ - s16 order = -1; - s16 nloops = 0; - ALADPCMloop* aloops = NULL; - s16 npredictors = -1; - s32*** coefTable = NULL; - s32 state[16]; - s32 decompressed[16]; - s32 soundPointer = -1; - s32 currPos = 0; - s32 nSamples = 0; - Chunk FormChunk = Chunk(); - ChunkHeader Header = ChunkHeader(); - CommonChunk CommChunk = CommonChunk(); - InstrumentChunk InstChunk; - SoundDataChunk SndDChunk = SoundDataChunk(); - FILE* ifile = NULL; - FILE* ofile = NULL; - - if ((ifile = fopen(infilename, "rb")) == NULL) - { - fail_parse("AIFF-C file could not be opened"); - exit(1); - } - - memset(&InstChunk, 0, sizeof(InstChunk)); - - BSWAP32(FormChunk.ckID); - BSWAP32(FormChunk.formType); - if ((FormChunk.ckID != 0x464f524d) || (FormChunk.formType != 0x41494643)) - { // FORM, AIFC - fail_parse("not an AIFF-C file"); - } - - for (;;) - { - s32 num = fread(&Header, sizeof(Header), 1, ifile); - u32 ts = 0; - - if (num <= 0) - break; - - BSWAP32(Header.ckID); - BSWAP32(Header.ckSize); - - Header.ckSize++; - Header.ckSize &= ~1; - s32 offset = ftell(ifile); - - switch (Header.ckID) - { - case 0x434f4d4d: // COMM - { - BSWAP16(CommChunk.numChannels); - BSWAP16(CommChunk.numFramesH); - BSWAP16(CommChunk.numFramesL); - BSWAP16(CommChunk.sampleSize); - BSWAP16(CommChunk.compressionTypeH); - BSWAP16(CommChunk.compressionTypeL); - s32 cType = (CommChunk.compressionTypeH << 16) + CommChunk.compressionTypeL; - if (cType == 0x56415043 || cType == 0x41445039) - { // VAPC or ADP9 - framesize = 9; - } - else if (cType == 0x41445035) - { // ADP5 - framesize = 5; - } - else if (cType == 0x4850434d) - { // HPCM - framesize = 16; - } - else - { - char comprType[5] = { - static_cast(CommChunk.compressionTypeH >> 8), static_cast(CommChunk.compressionTypeH & 0xFF), - static_cast(CommChunk.compressionTypeL >> 8), static_cast(CommChunk.compressionTypeL & 0xFF), 0}; - fail_parse("file is of the wrong compression type [got %s (%08x)]", &comprType, - cType); - } - if (CommChunk.numChannels != 1) - { - fail_parse("file contains %d channels, only 1 channel supported", - CommChunk.numChannels); - } - if (CommChunk.sampleSize != 16) - { - fail_parse("file contains %d bit samples, only 16 bit samples supported", - CommChunk.sampleSize); - } - - nSamples = (CommChunk.numFramesH << 16) + CommChunk.numFramesL; - - // Allow broken input lengths - if (nSamples % 16) - { - nSamples -= (nSamples % 16); - } - - if (nSamples % 16 != 0) - { - fail_parse("number of chunks must be a multiple of 16, found %d with remainder %d", - nSamples, nSamples % 16); - } - } - break; - - case 0x53534e44: // SSND - BSWAP32(SndDChunk.offset); - BSWAP32(SndDChunk.blockSize); - assert(SndDChunk.offset == 0); - assert(SndDChunk.blockSize == 0); - soundPointer = ftell(ifile); - break; - - case 0x4150504c: // APPL - BSWAP32(ts); - if (ts == 0x73746f63) - { // stoc - u8 len = 0; - if (len == 11) - { - char ChunkName[12]; - s16 version; - ChunkName[11] = '\0'; - if (strcmp("VADPCMCODES", ChunkName) == 0) - { - BSWAP16(version); - if (version != 1) - { - fail_parse("Unknown codebook chunk version"); - } - readaifccodebook(ifile, &coefTable, &order, &npredictors); - } - else if (strcmp("VADPCMLOOPS", ChunkName) == 0) - { - BSWAP16(version); - if (version != 1) - { - fail_parse("Unknown loop chunk version"); - } - aloops = readlooppoints(ifile, &nloops); - if (nloops != 1) - { - fail_parse("Only a single loop supported"); - } - } - } - } - break; - } - - fseek(ifile, offset + Header.ckSize, SEEK_SET); - } - - if (coefTable == NULL) - { - fail_parse("Codebook missing from bitstream"); - } - - for (s32 i = 0; i < order; i++) - { - state[15 - i] = 0; - } - - u32 outputBytes = nSamples * sizeof(s16); - u8* outputBuf = (u8*)malloc(outputBytes); - - fseek(ifile, soundPointer, SEEK_SET); - s32 fails = 0; - while (currPos < nSamples) - { - u8 input[9]; - u8 encoded[9]; - s32 lastState[16]; - s32 decoded[16]; - s16 guess[16]; - s16 origGuess[16]; - - memcpy(lastState, state, sizeof(state)); - - // Decode for real - my_decodeframe(input, decompressed, state, order, coefTable); - memcpy(decoded, state, sizeof(state)); - - // Create a guess from that, by clamping to 16 bits - for (s32 i = 0; i < 16; i++) - { - origGuess[i] = clamp_bits(state[i], 16); - } - - memcpy(state, decoded, sizeof(state)); - memcpy(outputBuf + currPos * 2, decoded, sizeof(decoded)); - currPos += 16; - } - if (fails) - { - fprintf(stderr, "%s %d\n", infilename, fails); - } - - // Write an incomplete file header. We'll fill in the size later. - fwrite("FORM\0\0\0\0AIFF", 12, 1, ofile); - - // Subtract 4 from the COMM size to skip the compression field. - write_header(ofile, "COMM", sizeof(CommonChunk) - 4); - CommChunk.numFramesH = nSamples >> 16; - CommChunk.numFramesL = nSamples & 0xffff; - BSWAP16(CommChunk.numChannels); - BSWAP16(CommChunk.numFramesH); - BSWAP16(CommChunk.numFramesL); - BSWAP16(CommChunk.sampleSize); - fwrite(&CommChunk, sizeof(CommonChunk) - 4, 1, ofile); - - if (nloops > 0) - { - s32 startPos = aloops[0].start, endPos = aloops[0].end; - const char* markerNames[2] = {"start", "end"}; - Marker markers[2] = {{1, static_cast(startPos >> 16), static_cast(startPos & 0xffff)}, - {2, static_cast(endPos >> 16), static_cast(endPos & 0xffff)}}; - write_header(ofile, "MARK", 2 + 2 * sizeof(Marker) + 1 + 5 + 1 + 3); - s16 numMarkers = bswap16(2); - fwrite(&numMarkers, sizeof(s16), 1, ofile); - for (s32 i = 0; i < 2; i++) - { - u8 len = (u8)strlen(markerNames[i]); - BSWAP16(markers[i].MarkerID); - BSWAP16(markers[i].positionH); - BSWAP16(markers[i].positionL); - fwrite(&markers[i], sizeof(Marker), 1, ofile); - fwrite(&len, 1, 1, ofile); - fwrite(markerNames[i], len, 1, ofile); - } - - write_header(ofile, "INST", sizeof(InstrumentChunk)); - InstChunk.sustainLoop.playMode = bswap16(1); - InstChunk.sustainLoop.beginLoop = bswap16(1); - InstChunk.sustainLoop.endLoop = bswap16(2); - InstChunk.releaseLoop.playMode = 0; - InstChunk.releaseLoop.beginLoop = 0; - InstChunk.releaseLoop.endLoop = 0; - fwrite(&InstChunk, sizeof(InstrumentChunk), 1, ofile); - } - - // Save the coefficient table for use when encoding. Ideally this wouldn't - // be needed and "tabledesign -s 1" would generate the right table, but in - // practice it's difficult to adjust samples to make that happen. - write_header(ofile, "APPL", 4 + 12 + sizeof(CodeChunk) + npredictors * order * 8 * 2); - fwrite("stoc", 4, 1, ofile); - CodeChunk cChunk; - cChunk.version = bswap16(1); - cChunk.order = bswap16(order); - cChunk.nEntries = bswap16(npredictors); - fwrite("\x0bVADPCMCODES", 12, 1, ofile); - fwrite(&cChunk, sizeof(CodeChunk), 1, ofile); - for (s32 i = 0; i < npredictors; i++) - { - for (s32 j = 0; j < order; j++) - { - for (s32 k = 0; k < 8; k++) - { - s16 ts = bswap16(coefTable[i][k][j]); - fwrite(&ts, sizeof(s16), 1, ofile); - } - } - } - - write_header(ofile, "SSND", outputBytes + 8); - SndDChunk.offset = 0; - SndDChunk.blockSize = 0; - fwrite(&SndDChunk, sizeof(SoundDataChunk), 1, ofile); - fwrite(outputBuf, outputBytes, 1, ofile); - - // Fix the size in the header - s32 fileSize = bswap32(ftell(ofile) - 8); - fseek(ofile, 4, SEEK_SET); - fwrite(&fileSize, 4, 1, ofile); - - fclose(ifile); - fclose(ofile); - return 0; -} diff --git a/ZAPDTR/ZAPD/ZBackground.cpp b/ZAPDTR/ZAPD/ZBackground.cpp deleted file mode 100644 index 026002da1..000000000 --- a/ZAPDTR/ZAPD/ZBackground.cpp +++ /dev/null @@ -1,195 +0,0 @@ -#include "ZBackground.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Background, ZBackground); - -#define JPEG_MARKER 0xFFD8FFE0 -#define MARKER_DQT 0xFFDB -#define MARKER_EOI 0xFFD9 - -ZBackground::ZBackground(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZBackground::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - size_t i = 0; - while (true) - { - uint8_t val = rawData.at(rawDataIndex + i); - data.push_back(val); - - if (BitConverter::ToUInt16BE(rawData, rawDataIndex + i) == MARKER_EOI) - { - data.push_back(rawData.at(rawDataIndex + i + 1)); - break; - } - - i++; - } -} - -void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutName) -{ - fs::path filepath(inFolder); - - if (appendOutName) - filepath = filepath / (outName + "." + GetExternalExtension()); - - data = DiskFile::ReadAllBytes(filepath.string()); - - // Add padding. - data.insert(data.end(), GetRawDataSize() - data.size(), 0x00); - CheckValidJpeg(filepath.generic_string()); -} - -void ZBackground::CheckValidJpeg(const std::string& filepath) -{ - std::string filename = outName; - if (filepath != "") - { - filename = filepath; - } - - uint32_t jpegMarker = BitConverter::ToUInt32BE(data, 0); - if (jpegMarker != JPEG_MARKER) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, - StringHelper::Sprintf("missing jpeg marker at beginning of file: '%s'", - filename.c_str()), - "The game will skip this jpeg."); - } - if (data.at(6) != 'J' || data.at(7) != 'F' || data.at(8) != 'I' || data.at(9) != 'F' || - data.at(10) != '\0') - { - std::string jfifIdentifier(data.begin() + 6, data.begin() + 6 + 5); - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, "missing 'JFIF' identifier", - StringHelper::Sprintf( - "This image may be corrupted, or not a jpeg. The identifier found was: '%s'", - jfifIdentifier.c_str())); - } - uint8_t majorVersion = data.at(11); - uint8_t minorVersion = data.at(12); - if (majorVersion != 0x01 || minorVersion != 0x01) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, - StringHelper::Sprintf("wrong JFIF version '%i.%02i'", majorVersion, minorVersion), - "The expected version is '1.01'. The game may be unable to decode this image " - "correctly."); - } - if (BitConverter::ToUInt16BE(data, 20) != MARKER_DQT) - { - // This may happen when creating a custom image with Exif, XMP, thumbnail, progressive, etc. - // enabled. - HANDLE_WARNING_PROCESS(WarningType::InvalidJPEG, - "there seems to be extra data before the image data in this file", - "The game may not be able to decode this image correctly."); - } - if (data.size() > GetRawDataSize()) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, "the image is bigger than the screen buffer", - StringHelper::Sprintf("Image size: %zu bytes\nScreen buffer size: %zu bytes", - data.size(), GetRawDataSize())); - } -} - -size_t ZBackground::GetRawDataSize() const -{ - // Jpgs use the whole sceen buffer, which is a u16 matrix. - return Globals::Instance->cfg.bgScreenHeight * Globals::Instance->cfg.bgScreenWidth * 2; -} - -Declaration* ZBackground::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - auto filepath = Globals::Instance->outputPath / fs::path(auxOutName).stem(); - - std::string incStr = - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str()); - - Declaration* decl = parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, 0); - decl->arrayItemCntStr = "SCREEN_WIDTH * SCREEN_HEIGHT / 4"; - decl->forceArrayCnt = true; - decl->staticConf = staticConf; - return decl; -} - -bool ZBackground::IsExternalResource() const -{ - return true; -} - -std::string ZBackground::GetExternalExtension() const -{ - return "jpg"; -} - -void ZBackground::Save(const fs::path& outFolder) -{ - if (!Globals::Instance->otrMode) - { - fs::path filepath = outFolder / (outName + "." + GetExternalExtension()); - DiskFile::WriteAllBytes(filepath.string(), data); - } -} - -std::string ZBackground::GetBodySourceCode() const -{ - std::string bodyStr = " "; - - for (size_t i = 0; i < data.size() / 8; ++i) - { - bodyStr += StringHelper::Sprintf("0x%016llX, ", BitConverter::ToUInt64BE(data, i * 8)); - - if (i % 8 == 7) - bodyStr += "\n "; - } - - bodyStr += "\n"; - - return bodyStr; -} - -std::string ZBackground::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sBackground_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZBackground::GetSourceTypeName() const -{ - return "u64"; -} - -ZResourceType ZBackground::GetResourceType() const -{ - return ZResourceType::Background; -} - -DeclarationAlignment ZBackground::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZBackground.h b/ZAPDTR/ZAPD/ZBackground.h deleted file mode 100644 index e3728bd98..000000000 --- a/ZAPDTR/ZAPD/ZBackground.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include -#include "ZResource.h" - -class ZBackground : public ZResource -{ -protected: - std::vector data; - -public: - ZBackground(ZFile* nParent); - - void ParseBinaryFile(const std::string& inFolder, bool appendOutName); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - void CheckValidJpeg(const std::string& filepath); -}; diff --git a/ZAPDTR/ZAPD/ZBlob.cpp b/ZAPDTR/ZAPD/ZBlob.cpp deleted file mode 100644 index 0965d7e4e..000000000 --- a/ZAPDTR/ZAPD/ZBlob.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "ZBlob.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Blob, ZBlob); - -ZBlob::ZBlob(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; - RegisterRequiredAttribute("Size"); -} - -ZBlob* ZBlob::FromFile(const std::string& filePath) -{ - ZBlob* blob = new ZBlob(nullptr); - blob->name = StringHelper::Split(Path::GetFileNameWithoutExtension(filePath), ".")[0]; - blob->blobData = DiskFile::ReadAllBytes(filePath); - - return blob; -} - -void ZBlob::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - blobSize = StringHelper::StrToL(registeredAttributes.at("Size").value, 16); -} - -void ZBlob::ParseRawData() -{ - blobData.assign(parent->GetRawData().begin() + rawDataIndex, - parent->GetRawData().begin() + rawDataIndex + blobSize); -} - -Declaration* ZBlob::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - std::string path = Path::GetFileNameWithoutExtension(auxOutName); - - std::string assetOutDir = - (Globals::Instance->outputPath / Path::GetFileNameWithoutExtension(GetOutName())).string(); - - std::string incStr = - StringHelper::Sprintf("%s.%s.inc.c", assetOutDir.c_str(), GetExternalExtension().c_str()); - - return parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, blobData.size()); -} - -std::string ZBlob::GetBodySourceCode() const -{ - std::string sourceOutput; - - for (size_t i = 0; i < blobData.size(); i += 1) - { - if (i % 16 == 0) - sourceOutput += "\t"; - - sourceOutput += StringHelper::Sprintf("0x%02X, ", blobData[i]); - - if (i % 16 == 15) - sourceOutput += "\n"; - } - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - sourceOutput += "\n"; - - return sourceOutput; -} - -void ZBlob::Save(const fs::path& outFolder) -{ - if (!Globals::Instance->otrMode) - DiskFile::WriteAllBytes((outFolder / (name + ".bin")).string(), blobData); -} - -bool ZBlob::IsExternalResource() const -{ - return true; -} - -std::string ZBlob::GetExternalExtension() const -{ - return "bin"; -} - -std::string ZBlob::GetSourceTypeName() const -{ - return "u8"; -} - -ZResourceType ZBlob::GetResourceType() const -{ - return ZResourceType::Blob; -} - -size_t ZBlob::GetRawDataSize() const -{ - return blobSize; -} diff --git a/ZAPDTR/ZAPD/ZBlob.h b/ZAPDTR/ZAPD/ZBlob.h deleted file mode 100644 index d7a7feff1..000000000 --- a/ZAPDTR/ZAPD/ZBlob.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZBlob : public ZResource -{ -public: - ZBlob(ZFile* nParent); - - static ZBlob* FromFile(const std::string& filePath); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - -protected: - std::vector blobData; - size_t blobSize = 0; -}; diff --git a/ZAPDTR/ZAPD/ZCollision.cpp b/ZAPDTR/ZAPD/ZCollision.cpp deleted file mode 100644 index e75cfe2aa..000000000 --- a/ZAPDTR/ZAPD/ZCollision.cpp +++ /dev/null @@ -1,400 +0,0 @@ -#include "ZCollision.h" - -#include -#include -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(Collision, ZCollisionHeader); - -ZCollisionHeader::ZCollisionHeader(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; -} - -ZCollisionHeader::~ZCollisionHeader() -{ - delete camData; -} - -void ZCollisionHeader::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - absMinX = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - absMinY = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - absMinZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - - absMaxX = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - absMaxY = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - absMaxZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - - numVerts = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - vtxAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 16); - - numPolygons = BitConverter::ToUInt16BE(rawData, rawDataIndex + 20); - polyAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 24); - polyTypeDefAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 28); - camDataAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 32); - - numWaterBoxes = BitConverter::ToUInt16BE(rawData, rawDataIndex + 36); - waterBoxAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 40); - - vtxSegmentOffset = Seg2Filespace(vtxAddress, parent->baseAddress); - polySegmentOffset = Seg2Filespace(polyAddress, parent->baseAddress); - polyTypeDefSegmentOffset = Seg2Filespace(polyTypeDefAddress, parent->baseAddress); - camDataSegmentOffset = Seg2Filespace(camDataAddress, parent->baseAddress); - waterBoxSegmentOffset = Seg2Filespace(waterBoxAddress, parent->baseAddress); - - vertices.reserve(numVerts); - polygons.reserve(numPolygons); - - offset_t currentPtr = vtxSegmentOffset; - - for (uint16_t i = 0; i < numVerts; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - vertices.push_back(vec); - } - - for (uint16_t i = 0; i < numPolygons; i++) - { - ZCollisionPoly poly(parent); - poly.SetRawDataIndex(polySegmentOffset + (i * 16)); - poly.ParseRawData(); - polygons.push_back(poly); - } - - uint16_t highestPolyType = 0; - - for (const ZCollisionPoly& poly : polygons) - { - if (poly.type > highestPolyType) - highestPolyType = poly.type; - } - - for (uint16_t i = 0; i < highestPolyType + 1; i++) - { - ZSurfaceType surfaceType(parent); - surfaceType.SetRawDataIndex(polyTypeDefSegmentOffset + (i * 8)); - surfaceType.ParseRawData(); - PolygonTypes.push_back(surfaceType); - } - // polygonTypes.push_back( - // BitConverter::ToUInt64BE(rawData, polyTypeDefSegmentOffset + (i * 8))); - - if (camDataAddress != SEGMENTED_NULL) - { - // Try to guess how many elements the CamDataList array has. - // The "guessing algorithm" is basically a "best effort" one and it - // is error-prone. - // This is based mostly on observation of how CollisionHeader data is - // usually ordered. If for some reason the data was in some other funny - // order, this would probably break. - // The most common ordering is: - // - *CamData* - // - SurfaceType - // - CollisionPoly - // - Vertices - // - WaterBoxes - // - CollisionHeader - offset_t upperCameraBoundary = polyTypeDefSegmentOffset; - if (upperCameraBoundary == 0) - { - upperCameraBoundary = polySegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = vtxSegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = waterBoxSegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = rawDataIndex; - } - - camData = - new CameraDataList(parent, name, rawData, camDataSegmentOffset, upperCameraBoundary); - } - - for (uint16_t i = 0; i < numWaterBoxes; i++) - waterBoxes.push_back(WaterBoxHeader( - rawData, - waterBoxSegmentOffset + (i * (Globals::Instance->game == ZGame::OOT_SW97 ? 12 : 16)))); -} - -void ZCollisionHeader::DeclareReferences(const std::string& prefix) -{ - std::string declaration = ""; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - if (waterBoxes.size() > 0) - { - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < waterBoxes.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", waterBoxes[i].GetBodySourceCode().c_str()); - if (i + 1 < waterBoxes.size()) - declaration += "\n"; - } - } - - parent->AddDeclarationArray( - waterBoxSegmentOffset, DeclarationAlignment::Align4, 16 * waterBoxes.size(), "WaterBox", - StringHelper::Sprintf("%sWaterBoxes", auxName.c_str()), waterBoxes.size(), declaration); - } - - if (polygons.size() > 0) - { - declaration.clear(); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < polygons.size(); i++) - { - declaration += - StringHelper::Sprintf("\t%s,", polygons[i].GetBodySourceCode().c_str()); - if (i + 1 < polygons.size()) - declaration += "\n"; - } - } - - parent->AddDeclarationArray(polySegmentOffset, DeclarationAlignment::Align4, - polygons.size() * 16, polygons[0].GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sPolygons", auxName.c_str()), - polygons.size(), declaration); - } - - declaration.clear(); - for (const auto& polyType : PolygonTypes) - { - declaration += StringHelper::Sprintf("\t%s,", polyType.GetBodySourceCode().c_str()); - } - - if (polyTypeDefAddress != SEGMENTED_NULL) - parent->AddDeclarationArray(polyTypeDefSegmentOffset, DeclarationAlignment::Align4, - PolygonTypes.size() * 8, - PolygonTypes[0].GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sSurfaceType", auxName.c_str()), - PolygonTypes.size(), declaration); - - declaration.clear(); - - if (vertices.size() > 0) - { - declaration.clear(); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < vertices.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", vertices[i].GetBodySourceCode().c_str()); - - if (i < vertices.size() - 1) - declaration += "\n"; - } - } - - const auto& first = vertices.front(); - if (vtxAddress != 0) - parent->AddDeclarationArray( - vtxSegmentOffset, first.GetDeclarationAlignment(), - vertices.size() * first.GetRawDataSize(), first.GetSourceTypeName(), - StringHelper::Sprintf("%sVertices", auxName.c_str()), vertices.size(), declaration); - } -} - -std::string ZCollisionHeader::GetBodySourceCode() const -{ - std::string declaration = ""; - - if (Globals::Instance->otrMode) - return declaration; - - declaration += "\n"; - - declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMinX, absMinY, absMinZ); - declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMaxX, absMaxY, absMaxZ); - - std::string vtxName; - Globals::Instance->GetSegmentedPtrName(vtxAddress, parent, "Vec3s", vtxName, parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numVerts, vtxName.c_str()); - - std::string polyName; - Globals::Instance->GetSegmentedPtrName(polyAddress, parent, "CollisionPoly", polyName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numPolygons, polyName.c_str()); - - std::string surfaceName; - Globals::Instance->GetSegmentedPtrName(polyTypeDefAddress, parent, "SurfaceType", surfaceName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%s,\n", surfaceName.c_str()); - - std::string camName; - Globals::Instance->GetSegmentedPtrName(camDataAddress, parent, "CamData", camName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%s,\n", camName.c_str()); - - std::string waterBoxName; - Globals::Instance->GetSegmentedPtrName(waterBoxAddress, parent, "WaterBox", waterBoxName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s\n", numWaterBoxes, waterBoxName.c_str()); - - return declaration; -} - -std::string ZCollisionHeader::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sCol_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZCollisionHeader::GetSourceTypeName() const -{ - return "CollisionHeader"; -} - -ZResourceType ZCollisionHeader::GetResourceType() const -{ - return ZResourceType::CollisionHeader; -} - -size_t ZCollisionHeader::GetRawDataSize() const -{ - return 44; -} - -WaterBoxHeader::WaterBoxHeader(const std::vector& rawData, uint32_t rawDataIndex) -{ - xMin = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - ySurface = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - zMin = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - xLength = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - zLength = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - - if (Globals::Instance->game == ZGame::OOT_SW97) - properties = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - else - properties = BitConverter::ToInt32BE(rawData, rawDataIndex + 12); -} - -std::string WaterBoxHeader::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%i, %i, %i, %i, %i, 0x%08X", xMin, ySurface, zMin, xLength, - zLength, properties); -} - -CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, - const std::vector& rawData, offset_t rawDataIndex, - offset_t upperCameraBoundary) -{ - std::string declaration; - - // Parse CameraDataEntries - size_t numElements = (upperCameraBoundary - rawDataIndex) / 8; - assert(numElements < 10000); - - offset_t cameraPosDataSeg = rawDataIndex; - for (size_t i = 0; i < numElements; i++) - { - CameraDataEntry* entry = new CameraDataEntry(); - - entry->cameraSType = - BitConverter::ToInt16BE(rawData, rawDataIndex + (entries.size() * 8) + 0); - entry->numData = BitConverter::ToInt16BE(rawData, rawDataIndex + (entries.size() * 8) + 2); - entry->cameraPosDataSeg = - BitConverter::ToInt32BE(rawData, rawDataIndex + (entries.size() * 8) + 4); - - if (entry->cameraPosDataSeg != 0 && GETSEGNUM(entry->cameraPosDataSeg) != SEGMENT_SCENE) - { - cameraPosDataSeg = rawDataIndex + (entries.size() * 8); - break; - } - - if (entry->cameraPosDataSeg != 0 && cameraPosDataSeg > (entry->cameraPosDataSeg & 0xFFFFFF)) - cameraPosDataSeg = (entry->cameraPosDataSeg & 0xFFFFFF); - - entries.push_back(entry); - } - - // Setting cameraPosDataAddr to rawDataIndex give a pos list length of 0 - uint32_t cameraPosDataOffset = cameraPosDataSeg & 0xFFFFFF; - for (size_t i = 0; i < entries.size(); i++) - { - char camSegLine[2048]; - - if (entries[i]->cameraPosDataSeg != 0) - { - int32_t index = - ((entries[i]->cameraPosDataSeg & 0x00FFFFFF) - cameraPosDataOffset) / 0x6; - sprintf(camSegLine, "&%sCamPosData[%i]", prefix.c_str(), index); - } - else - sprintf(camSegLine, "NULL"); - - declaration += - StringHelper::Sprintf(" { 0x%04X, %i, %s },", entries[i]->cameraSType, - entries[i]->numData, camSegLine, rawDataIndex + (i * 8)); - - if (i < entries.size() - 1) - declaration += "\n"; - } - - parent->AddDeclarationArray( - rawDataIndex, DeclarationAlignment::Align4, entries.size() * 8, "CamData", - StringHelper::Sprintf("%sCamDataList", prefix.c_str(), rawDataIndex), entries.size(), - declaration); - - uint32_t numDataTotal = (rawDataIndex - cameraPosDataOffset) / 0x6; - - if (numDataTotal > 0) - { - declaration.clear(); - for (uint32_t i = 0; i < numDataTotal; i++) - { - CameraPositionData* data = - new CameraPositionData(rawData, cameraPosDataOffset + (i * 6)); - cameraPositionData.push_back(data); - - declaration += StringHelper::Sprintf("\t{ %6i, %6i, %6i },", data->x, data->y, data->z); - if (i + 1 < numDataTotal) - declaration += "\n"; - } - - int32_t cameraPosDataIndex = GETSEGOFFSET(cameraPosDataSeg); - uint32_t entrySize = numDataTotal * 0x6; - parent->AddDeclarationArray(cameraPosDataIndex, DeclarationAlignment::Align4, entrySize, - "Vec3s", StringHelper::Sprintf("%sCamPosData", prefix.c_str()), - numDataTotal, declaration); - } -} - -CameraDataList::~CameraDataList() -{ - for (auto entry : entries) - delete entry; - - for (auto camPosData : cameraPositionData) - delete camPosData; -} - -CameraPositionData::CameraPositionData(const std::vector& rawData, uint32_t rawDataIndex) -{ - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); -} diff --git a/ZAPDTR/ZAPD/ZCollision.h b/ZAPDTR/ZAPD/ZCollision.h deleted file mode 100644 index 7db03bf16..000000000 --- a/ZAPDTR/ZAPD/ZCollision.h +++ /dev/null @@ -1,90 +0,0 @@ -#pragma once - -#include "ZCollisionPoly.h" -#include "ZFile.h" -#include "ZResource.h" -#include "ZRoom/ZRoom.h" -#include "ZSurfaceType.h" -#include "ZVector.h" - -class WaterBoxHeader -{ -public: - int16_t xMin; - int16_t ySurface; - int16_t zMin; - int16_t xLength; - int16_t zLength; - int16_t pad; - int32_t properties; - - WaterBoxHeader(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class CameraPositionData -{ -public: - int16_t x, y, z; - - CameraPositionData(const std::vector& rawData, uint32_t rawDataIndex); -}; - -class CameraDataEntry -{ -public: - uint16_t cameraSType; - int16_t numData; - int32_t cameraPosDataSeg; -}; - -class CameraDataList -{ -public: - std::vector entries; - std::vector cameraPositionData; - - CameraDataList(ZFile* parent, const std::string& prefix, const std::vector& rawData, - offset_t rawDataIndex, offset_t upperCameraBoundary); - ~CameraDataList(); -}; - -class ZCollisionHeader : public ZResource -{ -public: - int16_t absMinX, absMinY, absMinZ; - int16_t absMaxX, absMaxY, absMaxZ; - uint16_t numVerts; - segptr_t vtxAddress; - uint16_t numPolygons; - segptr_t polyAddress; - segptr_t polyTypeDefAddress; - segptr_t camDataAddress; - - int32_t numWaterBoxes; - segptr_t waterBoxAddress; - - uint32_t vtxSegmentOffset, polySegmentOffset, polyTypeDefSegmentOffset, camDataSegmentOffset, - waterBoxSegmentOffset; - - std::vector vertices; - std::vector polygons; - std::vector PolygonTypes; - std::vector waterBoxes; - CameraDataList* camData = nullptr; - - ZCollisionHeader(ZFile* nParent); - ~ZCollisionHeader(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZCollisionPoly.cpp b/ZAPDTR/ZAPD/ZCollisionPoly.cpp deleted file mode 100644 index c4eb2d461..000000000 --- a/ZAPDTR/ZAPD/ZCollisionPoly.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "ZCollisionPoly.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(CollisionPoly, ZCollisionPoly); - -ZCollisionPoly::ZCollisionPoly(ZFile* nParent) : ZResource(nParent) -{ -} - -ZCollisionPoly::~ZCollisionPoly() -{ -} - -void ZCollisionPoly::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - type = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - - vtxA = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - vtxB = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - vtxC = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); - - normX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 8); - normY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 10); - normZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - - dist = BitConverter::ToUInt16BE(rawData, rawDataIndex + 14); -} - -void ZCollisionPoly::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), - GetSourceTypeName(), name.c_str(), GetBodySourceCode()); -} - -std::string ZCollisionPoly::GetBodySourceCode() const -{ - std::string declaration; - - declaration += - StringHelper::Sprintf("{0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X}", - type, vtxA, vtxB, vtxC, normX, normY, normZ, dist); - return declaration; -} - -std::string ZCollisionPoly::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sCollisionPoly_%06X", prefix.c_str(), rawDataIndex); -} - -ZResourceType ZCollisionPoly::GetResourceType() const -{ - return ZResourceType::CollisionPoly; -} - -size_t ZCollisionPoly::GetRawDataSize() const -{ - return 16; -} - -std::string ZCollisionPoly::GetSourceTypeName() const -{ - return "CollisionPoly"; -} - -bool ZCollisionPoly::DoesSupportArray() const -{ - return true; -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZCollisionPoly.h b/ZAPDTR/ZAPD/ZCollisionPoly.h deleted file mode 100644 index 64b98ba1d..000000000 --- a/ZAPDTR/ZAPD/ZCollisionPoly.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "ZFile.h" -#include "ZResource.h" - -class ZCollisionPoly : public ZResource -{ -public: - uint16_t type; - uint16_t vtxA, vtxB, vtxC; - uint16_t normX, normY, normZ; - uint16_t dist; - - ZCollisionPoly(ZFile* nParent); - ~ZCollisionPoly(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - bool DoesSupportArray() const override; - - size_t GetRawDataSize() const override; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZCutscene.cpp b/ZAPDTR/ZAPD/ZCutscene.cpp deleted file mode 100644 index 605894979..000000000 --- a/ZAPDTR/ZAPD/ZCutscene.cpp +++ /dev/null @@ -1,389 +0,0 @@ -#include "ZCutscene.h" - -#include - -#include "Globals.h" -#include "OtherStructs/CutsceneMM_Commands.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZResource.h" - -REGISTER_ZFILENODE(Cutscene, ZCutscene); - -ZCutscene::ZCutscene(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; -} - -ZCutscene::~ZCutscene() -{ - for (CutsceneCommand* cmd : commands) - delete cmd; -} - -std::string ZCutscene::GetBodySourceCode() const -{ - std::string output = ""; - - output += StringHelper::Sprintf(" CS_BEGIN_CUTSCENE(%i, %i),\n", commands.size(), endFrame); - - for (size_t i = 0; i < commands.size(); i++) - { - CutsceneCommand* cmd = commands[i]; - output += " " + cmd->GenerateSourceCode(); - } - - output += StringHelper::Sprintf(" CS_END(),", commands.size(), endFrame); - - return output; -} - -size_t ZCutscene::GetRawDataSize() const -{ - size_t size = 0; - - // Beginning - size += 8; - - for (size_t i = 0; i < commands.size(); i++) - { - CutsceneCommand* cmd = commands[i]; - - size += cmd->GetCommandSize(); - } - - // End - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - size += 4; - } - else - { - size += 8; - } - - return size; -} - -void ZCutscene::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - - numCommands = BitConverter::ToInt32BE(rawData, rawDataIndex + 0); - commands = std::vector(); - - endFrame = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); - offset_t currentPtr = rawDataIndex + 8; - commands.reserve(numCommands); - for (int32_t i = 0; i < numCommands; i++) - { - uint32_t id = BitConverter::ToUInt32BE(rawData, currentPtr); - - if (id == 0xFFFFFFFF) - break; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("Cutscene Command: 0x%X (%i)\n", id, id); - } - - currentPtr += 4; - - CutsceneCommand* cmd = nullptr; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - cmd = GetCommandMM(id, currentPtr); - } - else - { - cmd = GetCommandOoT(id, currentPtr); - } - - if (cmd == nullptr) - { - HANDLE_WARNING_RESOURCE( - WarningType::NotImplemented, parent, this, rawDataIndex, - StringHelper::Sprintf("Cutscene command not implemented"), - StringHelper::Sprintf("Command ID: 0x%X\nIndex: %d\ncurrentPtr-rawDataIndex: 0x%X", - id, i, currentPtr - rawDataIndex)); - cmd = new CutsceneMMCommand_NonImplemented(rawData, currentPtr); - } - - assert(cmd != nullptr); - - cmd->commandIndex = i; - cmd->SetCommandID(id); - size_t commmandSize = cmd->GetCommandSize(); - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t Command size: 0x%zX (%zu)\n", commmandSize, commmandSize); - } - currentPtr += commmandSize - 4; - - commands.push_back(cmd); - } -} - -CutsceneCommand* ZCutscene::GetCommandOoT(uint32_t id, offset_t currentPtr) const -{ - CutsceneCommands cmdID = static_cast(id); - - const auto& rawData = parent->GetRawData(); - - switch (id) - { - case 10: // CutsceneCommands::SetPlayerAction - case 15: // CutsceneCommands::SetActorAction1 - case 17: - case 18: - case 23: - case 34: - case 39: - case 46: - case 76: - case 85: - case 93: - case 105: - case 107: - case 110: - case 119: - case 123: - case 138: - case 139: - case 144: - case 14: // CutsceneCommands::SetActorAction2 - case 16: - case 24: - case 35: - case 40: - case 48: - case 64: - case 68: - case 70: - case 78: - case 80: - case 94: - case 116: - case 118: - case 120: - case 125: - case 131: - case 141: - case 25: // CutsceneCommands::SetActorAction3 - case 36: - case 41: - case 50: - case 67: - case 69: - case 72: - case 81: - case 106: - case 117: - case 121: - case 126: - case 132: - case 29: // CutsceneCommands::SetActorAction4 - case 37: - case 42: - case 51: - case 53: - case 63: - case 65: - case 66: - case 75: - case 82: - case 108: - case 127: - case 133: - case 30: // CutsceneCommands::SetActorAction5 - case 38: - case 43: - case 47: - case 54: - case 79: - case 83: - case 128: - case 135: - case 44: // CutsceneCommands::SetActorAction6 - case 55: - case 77: - case 84: - case 90: - case 129: - case 136: - case 31: // CutsceneCommands::SetActorAction7 - case 52: - case 57: - case 58: - case 88: - case 115: - case 130: - case 137: - case 49: // CutsceneCommands::SetActorAction8 - case 60: - case 89: - case 111: - case 114: - case 134: - case 142: - case 62: // CutsceneCommands::SetActorAction9 - case 143: // CutsceneCommands::SetActorAction10 - return new CutsceneCommand_ActorAction(rawData, currentPtr); - - case 0x0B: - case 0x0D: - case 0x1A: - case 0x1B: - case 0x1C: - case 0x20: - case 0x21: - case 0x3B: - case 0x3D: - case 0x47: - case 0x49: - case 0x6D: - case 0x15: - case 0x16: - case 0x70: - case 0x71: - case 0x4A: - return new CutsceneCommand_GenericCmd(rawData, currentPtr, cmdID); - } - - switch (cmdID) - { - case CutsceneCommands::Misc: - case CutsceneCommands::SetLighting: - case CutsceneCommands::PlayBGM: - case CutsceneCommands::StopBGM: - case CutsceneCommands::FadeBGM: - return new CutsceneCommand_GenericCmd(rawData, currentPtr, cmdID); - - case CutsceneCommands::SetCameraPos: - case CutsceneCommands::SetCameraFocus: - case CutsceneCommands::SetCameraPosLink: - case CutsceneCommands::SetCameraFocusLink: - return new CutsceneCommandSetCameraPos(rawData, currentPtr); - - case CutsceneCommands::Cmd07: - break; - case CutsceneCommands::Cmd08: - break; - case CutsceneCommands::Cmd09: - return new CutsceneCommand_Rumble(rawData, currentPtr); - case CutsceneCommands::Textbox: - return new CutsceneCommand_TextBox(rawData, currentPtr); - - case CutsceneCommands::SetPlayerAction: - case CutsceneCommands::SetActorAction1: - case CutsceneCommands::SetActorAction2: - case CutsceneCommands::SetActorAction3: - case CutsceneCommands::SetActorAction4: - case CutsceneCommands::SetActorAction5: - case CutsceneCommands::SetActorAction6: - case CutsceneCommands::SetActorAction7: - case CutsceneCommands::SetActorAction8: - case CutsceneCommands::SetActorAction9: - case CutsceneCommands::SetActorAction10: - break; - - case CutsceneCommands::SetSceneTransFX: - return new CutsceneCommandSceneTransFX(rawData, currentPtr); - - case CutsceneCommands::SetTime: - return new CutsceneCommand_SetTime(rawData, currentPtr); - case CutsceneCommands::Terminator: - return new CutsceneCommand_Terminator(rawData, currentPtr); - } - - return nullptr; -} - -CutsceneCommand* ZCutscene::GetCommandMM(uint32_t id, offset_t currentPtr) const -{ - CutsceneMMCommands cmdID = static_cast(id); - - const auto& rawData = parent->GetRawData(); - - if (((id >= 100) && (id < 150)) || (id == 201) || ((id >= 450) && (id < 600))) - { - return new CutsceneCommand_ActorAction(rawData, currentPtr); - } - - switch (cmdID) - { - case CutsceneMMCommands::CS_CMD_MISC: - case CutsceneMMCommands::CS_CMD_SET_LIGHTING: - case CutsceneMMCommands::CS_CMD_SCENE_TRANS_FX: - case CutsceneMMCommands::CS_CMD_MOTIONBLUR: - case CutsceneMMCommands::CS_CMD_GIVETATL: - case CutsceneMMCommands::CS_CMD_PLAYSEQ: - case CutsceneMMCommands::CS_CMD_130: - case CutsceneMMCommands::CS_CMD_131: - case CutsceneMMCommands::CS_CMD_132: - case CutsceneMMCommands::CS_CMD_STOPSEQ: - case CutsceneMMCommands::CS_CMD_PLAYAMBIENCE: - case CutsceneMMCommands::CS_CMD_FADEAMBIENCE: - case CutsceneMMCommands::CS_CMD_TERMINATOR: - case CutsceneMMCommands::CS_CMD_CHOOSE_CREDITS_SCENES: - - case CutsceneMMCommands::CS_CMD_UNK_FA: - case CutsceneMMCommands::CS_CMD_UNK_FE: - case CutsceneMMCommands::CS_CMD_UNK_FF: - case CutsceneMMCommands::CS_CMD_UNK_100: - case CutsceneMMCommands::CS_CMD_UNK_101: - case CutsceneMMCommands::CS_CMD_UNK_102: - case CutsceneMMCommands::CS_CMD_UNK_103: - case CutsceneMMCommands::CS_CMD_UNK_104: - case CutsceneMMCommands::CS_CMD_UNK_105: - case CutsceneMMCommands::CS_CMD_UNK_108: - case CutsceneMMCommands::CS_CMD_UNK_109: - case CutsceneMMCommands::CS_CMD_UNK_12D: - return new CutsceneMMCommand_GenericCmd(rawData, currentPtr, cmdID); - - case CutsceneMMCommands::CS_CMD_TEXTBOX: - return new CutsceneCommand_TextBox(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_CAMERA: - return new CutsceneMMCommand_Camera(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_FADESCREEN: - return new CutsceneMMCommand_FadeScreen(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_FADESEQ: - return new CutsceneMMCommand_FadeSeq(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_SETTIME: - return new CutsceneCommand_SetTime(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION: - return new CutsceneCommand_ActorAction(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_RUMBLE: - return new CutsceneCommand_Rumble(rawData, currentPtr); - } - - return nullptr; -} - -Declaration* ZCutscene::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, 0, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZCutscene::GetSourceTypeName() const -{ - return "CutsceneData"; -} - -ZResourceType ZCutscene::GetResourceType() const -{ - return ZResourceType::Cutscene; -} diff --git a/ZAPDTR/ZAPD/ZCutscene.h b/ZAPDTR/ZAPD/ZCutscene.h deleted file mode 100644 index 098f3ad86..000000000 --- a/ZAPDTR/ZAPD/ZCutscene.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include -#include -#include -#include "tinyxml2.h" - -#include "OtherStructs/Cutscene_Commands.h" -#include "ZFile.h" -#include "ZResource.h" - -class ZCutscene : public ZResource -{ -public: - ZCutscene(ZFile* nParent); - ~ZCutscene(); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - int32_t numCommands; - int32_t endFrame; - std::vector commands; - -protected: - CutsceneCommand* GetCommandOoT(uint32_t id, offset_t currentPtr) const; - CutsceneCommand* GetCommandMM(uint32_t id, offset_t currentPtr) const; -}; diff --git a/ZAPDTR/ZAPD/ZDisplayList.cpp b/ZAPDTR/ZAPD/ZDisplayList.cpp deleted file mode 100644 index 9a43a2a22..000000000 --- a/ZAPDTR/ZAPD/ZDisplayList.cpp +++ /dev/null @@ -1,2257 +0,0 @@ -#include "ZDisplayList.h" - -#include -#include -#include -#include -#include - -#include "Globals.h" -#include "OutputFormatter.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "gfxd.h" - - -#define G_MDSFT_ALPHACOMPARE 0 -#define G_MDSFT_ZSRCSEL 2 -#define G_MDSFT_RENDERMODE 3 -#define G_MDSFT_BLENDER 16 - -#define G_RM_FOG_SHADE_A 0xC8000000 -#define G_RM_FOG_PRIM_A 0xC4000000 -#define G_RM_PASS 0x0C080000 -#define G_RM_AA_ZB_OPA_SURF 0x442078 -#define G_RM_AA_ZB_OPA_SURF2 0x112078 -#define G_RM_AA_ZB_XLU_SURF 0x4049D8 -#define G_RM_AA_ZB_XLU_SURF2 0x1049D8 -#define G_RM_AA_ZB_OPA_DECAL 0x442D58 -#define G_RM_AA_ZB_OPA_DECAL2 0x112D58 -#define G_RM_AA_ZB_XLU_DECAL 0x404DD8 -#define G_RM_AA_ZB_XLU_DECAL2 0x104DD8 -#define G_RM_AA_ZB_OPA_INTER 0x442478 -#define G_RM_AA_ZB_OPA_INTER2 0x112478 -#define G_RM_AA_ZB_XLU_INTER 0x4045D8 -#define G_RM_AA_ZB_XLU_INTER2 0x1045D8 -#define G_RM_AA_ZB_XLU_LINE 0x407858 -#define G_RM_AA_ZB_XLU_LINE2 0x107858 -#define G_RM_AA_ZB_DEC_LINE 0x407F58 -#define G_RM_AA_ZB_DEC_LINE2 0x107F58 -#define G_RM_AA_ZB_TEX_EDGE 0x443078 -#define G_RM_AA_ZB_TEX_EDGE2 0x113078 -#define G_RM_AA_ZB_TEX_INTER 0x443478 -#define G_RM_AA_ZB_TEX_INTER2 0x113478 -#define G_RM_AA_ZB_SUB_SURF 0x442878 -#define G_RM_AA_ZB_SUB_SURF2 0x112278 -#define G_RM_AA_ZB_PCL_SURF 0x40007B -#define G_RM_AA_ZB_PCL_SURF2 0x10007B -#define G_RM_AA_ZB_OPA_TERR 0x402078 -#define G_RM_AA_ZB_OPA_TERR2 0x102078 -#define G_RM_AA_ZB_TEX_TERR 0x403078 -#define G_RM_AA_ZB_TEX_TERR2 0x103078 -#define G_RM_AA_ZB_SUB_TERR 0x402278 -#define G_RM_AA_ZB_SUB_TERR2 0x102278 -#define G_RM_RA_ZB_OPA_SURF 0x442038 -#define G_RM_RA_ZB_OPA_SURF2 0x112038 -#define G_RM_RA_ZB_OPA_DECAL 0x442D18 -#define G_RM_RA_ZB_OPA_DECAL2 0x112D18 -#define G_RM_RA_ZB_OPA_INTER 0x442438 -#define G_RM_RA_ZB_OPA_INTER2 0x112438 -#define G_RM_AA_OPA_SURF 0x442048 -#define G_RM_AA_OPA_SURF2 0x112048 -#define G_RM_AA_XLU_SURF 0x4041C8 -#define G_RM_AA_XLU_SURF2 0x1041C8 -#define G_RM_AA_XLU_LINE 0x407048 -#define G_RM_AA_XLU_LINE2 0x107048 -#define G_RM_AA_DEC_LINE 0x407248 -#define G_RM_AA_DEC_LINE2 0x107248 -#define G_RM_AA_TEX_EDGE 0x443048 -#define G_RM_AA_TEX_EDGE2 0x113048 -#define G_RM_AA_SUB_SURF 0x442248 -#define G_RM_AA_SUB_SURF2 0x112248 -#define G_RM_AA_PCL_SURF 0x40004B -#define G_RM_AA_PCL_SURF2 0x10004B -#define G_RM_AA_OPA_TERR 0x402048 -#define G_RM_AA_OPA_TERR2 0x102048 -#define G_RM_AA_TEX_TERR 0x403048 -#define G_RM_AA_TEX_TERR2 0x103048 -#define G_RM_AA_SUB_TERR 0x402248 -#define G_RM_AA_SUB_TERR2 0x102248 -#define G_RM_RA_OPA_SURF 0x442008 -#define G_RM_RA_OPA_SURF2 0x112008 -#define G_RM_ZB_OPA_SURF 0x442230 -#define G_RM_ZB_OPA_SURF2 0x112230 -#define G_RM_ZB_XLU_SURF 0x404A50 -#define G_RM_ZB_XLU_SURF2 0x104A50 -#define G_RM_ZB_OPA_DECAL 0x442E10 -#define G_RM_ZB_OPA_DECAL2 0x112E10 -#define G_RM_ZB_XLU_DECAL 0x404E50 -#define G_RM_ZB_XLU_DECAL2 0x104E50 -#define G_RM_ZB_CLD_SURF 0x404B50 -#define G_RM_ZB_CLD_SURF2 0x104B50 -#define G_RM_ZB_OVL_SURF 0x404F50 -#define G_RM_ZB_OVL_SURF2 0x104F50 -#define G_RM_ZB_PCL_SURF 0x0C080233 -#define G_RM_ZB_PCL_SURF2 0x03020233 -#define G_RM_OPA_SURF 0x0C084000 -#define G_RM_OPA_SURF2 0x03024000 -#define G_RM_XLU_SURF 0x00404200 -#define G_RM_XLU_SURF2 0x00104240 -#define G_RM_CLD_SURF 0x00404340 -#define G_RM_CLD_SURF2 0x00104340 -#define G_RM_TEX_EDGE 0x0C087008 -#define G_RM_TEX_EDGE2 0x03027008 -#define G_RM_PCL_SURF 0x0C084203 -#define G_RM_PCL_SURF2 0x03024203 -#define G_RM_ADD 0x04484340 -#define G_RM_ADD2 0x01124340 -#define G_RM_NOOP 0x00000000 -#define G_RM_NOOP2 0x00000000 -#define G_RM_VISCVG 0x0C844040 -#define G_RM_VISCVG2 0x03214040 -#define G_RM_OPA_CI 0x0C080000 -#define G_RM_OPA_CI2 0x03020000 - -#define AA_EN 0x8 -#define Z_CMP 0x10 -#define Z_UPD 0x20 -#define IM_RD 0x40 -#define CLR_ON_CVG 0x80 -#define CVG_DST_CLAMP 0 -#define CVG_DST_WRAP 0x100 -#define CVG_DST_FULL 0x200 -#define CVG_DST_SAVE 0x300 -#define ZMODE_OPA 0 -#define ZMODE_INTER 0x400 -#define ZMODE_XLU 0x800 -#define ZMODE_DEC 0xc00 -#define CVG_X_ALPHA 0x1000 -#define ALPHA_CVG_SEL 0x2000 -#define FORCE_BL 0x4000 -#define TEX_EDGE 0x0000 - -REGISTER_ZFILENODE(DList, ZDisplayList); - -ZDisplayList::ZDisplayList(ZFile* nParent) : ZResource(nParent) -{ - lastTexWidth = 0; - lastTexHeight = 0; - lastTexAddr = 0; - lastTexFmt = F3DZEXTexFormats::G_IM_FMT_RGBA; - lastTexSiz = F3DZEXTexSizes::G_IM_SIZ_16b; - lastTexSizTest = F3DZEXTexSizes::G_IM_SIZ_16b; - lastTexLoaded = false; - lastTexIsPalette = false; - dListType = Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX; - genOTRDef = true; - RegisterOptionalAttribute("Ucode"); -} - -ZDisplayList::~ZDisplayList() -{ - for (auto o : otherDLists) - { - delete o; - } -} - -// EXTRACT MODE -void ZDisplayList::ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - ParseXML(reader); - // TODO add error handling here - bool ucodeSet = registeredAttributes.at("Ucode").wasSet; - std::string ucodeValue = registeredAttributes.at("Ucode").value; - if ((Globals::Instance->game == ZGame::OOT_SW97) || (ucodeValue == "f3dex")) - { - dListType = DListType::F3DEX; - } - else if (!ucodeSet || ucodeValue == "f3dex2") - { - dListType = DListType::F3DZEX; - } - else - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("Invalid ucode type in node: %s\n", reader->Name()), ""); - } - - // Don't parse raw data of external files - if (parent->GetMode() != ZFileMode::ExternalFile) - { - int32_t rawDataSize = - ZDisplayList::GetDListLength(parent->GetRawData(), rawDataIndex, dListType); - numInstructions = rawDataSize / 8; - ParseRawData(); - } - - Declaration* decl = DeclareVar("", ""); - decl->declaredInXml = true; -} - -void ZDisplayList::ExtractFromBinary(uint32_t nRawDataIndex, int32_t rawDataSize) -{ - rawDataIndex = nRawDataIndex; - name = GetDefaultName(parent->GetName()); - numInstructions = rawDataSize / 8; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZDisplayList::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - instructions.reserve(numInstructions); - uint32_t ptr = rawDataIndex; - - instructions.reserve(numInstructions); - for (size_t i = 0; i < numInstructions; i++) - { - instructions.push_back(BitConverter::ToUInt64BE(rawData, ptr)); - ptr += 8; - } -} - -Declaration* ZDisplayList::DeclareVar([[maybe_unused]] const std::string& prefix, - const std::string& bodyStr) -{ - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, numInstructions, bodyStr); - decl->isExternal = true; - decl->staticConf = staticConf; - return decl; -} - -std::string ZDisplayList::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sDL_%06X", prefix.c_str(), rawDataIndex); -} - -void ZDisplayList::ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, - const std::string& prefix, char* line) -{ - switch (opcode) - { - case F3DZEXOpcode::G_NOOP: - sprintf(line, "gsDPNoOpTag(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - break; - case F3DZEXOpcode::G_DL: - Opcode_G_DL(data, prefix, line); - break; - case F3DZEXOpcode::G_MODIFYVTX: - Opcode_G_MODIFYVTX(data, line); - break; - case F3DZEXOpcode::G_CULLDL: - Opcode_G_CULLDL(data, line); - break; - case F3DZEXOpcode::G_TRI1: - Opcode_G_TRI1(data, line); - break; - case F3DZEXOpcode::G_TRI2: - Opcode_G_TRI2(data, line); - break; - case F3DZEXOpcode::G_QUAD: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x000000000000FFULL)) / 2; - sprintf(line, "gsSP1Quadrangle(%i, %i, %i, %i, 0),", aa, bb, cc, dd); - } - break; - case F3DZEXOpcode::G_VTX: - Opcode_G_VTX(data, line); - break; - case F3DZEXOpcode::G_SETTIMG: // HOTSPOT - Opcode_G_SETTIMG(data, prefix, line); - break; - case F3DZEXOpcode::G_GEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - std::string geoModeStr = "G_TEXTURE_ENABLE"; - - int32_t geoModeParam = ~cccccc; - - if (ssssssss != 0) - geoModeParam = ssssssss; - - if (geoModeParam & 0x00000001) - geoModeStr += " | G_ZBUFFER"; - - if (geoModeParam & 0x00000004) - geoModeStr += " | G_SHADE"; - - if (geoModeParam & 0x00000200) - geoModeStr += " | G_CULL_FRONT"; - - if (geoModeParam & 0x00000400) - geoModeStr += " | G_CULL_BACK"; - - if (geoModeParam & 0x00010000) - geoModeStr += " | G_FOG"; - - if (geoModeParam & 0x00020000) - geoModeStr += " | G_LIGHTING"; - - if (geoModeParam & 0x00040000) - geoModeStr += " | G_TEXTURE_GEN"; - - if (geoModeParam & 0x00080000) - geoModeStr += " | G_TEXTURE_GEN_LINEAR"; - - if (geoModeParam & 0x00200000) - geoModeStr += " | G_SHADING_SMOOTH"; - - if (geoModeParam & 0x00800000) - geoModeStr += " | G_CLIPPING"; - - if (ssssssss != 0) - { - if ((~cccccc & 0xFF000000) != 0) - sprintf(line, "gsSPSetGeometryMode(%s),", geoModeStr.c_str()); - else - sprintf(line, "gsSPLoadGeometryMode(%s),", geoModeStr.c_str()); - } - else - sprintf(line, "gsSPClearGeometryMode(%s),", geoModeStr.c_str()); - } - break; - case F3DZEXOpcode::G_SETPRIMCOLOR: - Opcode_G_SETPRIMCOLOR(data, line); - break; - case F3DZEXOpcode::G_SETOTHERMODE_L: - Opcode_G_SETOTHERMODE_L(data, line); - break; - case F3DZEXOpcode::G_SETOTHERMODE_H: - Opcode_G_SETOTHERMODE_H(data, line); - break; - case F3DZEXOpcode::G_SETTILE: - Opcode_G_SETTILE(data, line); - break; - case F3DZEXOpcode::G_SETTILESIZE: - Opcode_G_SETTILESIZE(data, prefix, line); - break; - case F3DZEXOpcode::G_LOADBLOCK: - Opcode_G_LOADBLOCK(data, line); - break; - case F3DZEXOpcode::G_TEXTURE: - Opcode_G_TEXTURE(data, line); - break; - case F3DZEXOpcode::G_RDPSETOTHERMODE: - { - int32_t hhhhhh = (data & 0x00FFFFFF00000000) >> 32; - int32_t llllllll = (data & 0x00000000FFFFFFFF); - - sprintf(line, "gsDPSetOtherMode(%i, %i),", hhhhhh, llllllll); - } - break; - case F3DZEXOpcode::G_POPMTX: - { - sprintf(line, "gsSPPopMatrix(%" PRIi64 "),", data); - } - break; - case F3DZEXOpcode::G_LOADTLUT: - Opcode_G_LOADTLUT(data, prefix, line); - break; - case F3DZEXOpcode::G_SETENVCOLOR: - { - uint8_t r = (uint8_t)((data & 0xFF000000) >> 24); - uint8_t g = (uint8_t)((data & 0x00FF0000) >> 16); - uint8_t b = (uint8_t)((data & 0xFF00FF00) >> 8); - uint8_t a = (uint8_t)((data & 0x000000FF) >> 0); - - sprintf(line, "gsDPSetEnvColor(%i, %i, %i, %i),", r, g, b, a); - } - break; - case F3DZEXOpcode::G_SETCOMBINE: - { - Opcode_G_SETCOMBINE(data, line); - } - break; - case F3DZEXOpcode::G_RDPLOADSYNC: - sprintf(line, "gsDPLoadSync(),"); - break; - case F3DZEXOpcode::G_RDPPIPESYNC: - sprintf(line, "gsDPPipeSync(),"); - break; - case F3DZEXOpcode::G_RDPTILESYNC: - sprintf(line, "gsDPTileSync(),"); - break; - case F3DZEXOpcode::G_RDPFULLSYNC: - sprintf(line, "gsDPFullSync(),"); - break; - case F3DZEXOpcode::G_ENDDL: - Opcode_G_ENDDL(prefix, line); - break; - case F3DZEXOpcode::G_RDPHALF_1: - { - uint64_t data2 = instructions[i + 1]; - uint32_t h = (data & 0xFFFFFFFF); - F3DZEXOpcode opcode2 = (F3DZEXOpcode)(instructions[i + 1] >> 56); - - if (opcode2 == F3DZEXOpcode::G_BRANCH_Z) - { - uint32_t a = (data2 & 0x00FFF00000000000) >> 44; - uint32_t b = (data2 & 0x00000FFF00000000) >> 32; - uint32_t z = (data2 & 0x00000000FFFFFFFF) >> 0; - - // sprintf(line, "gsDPWord(%i, 0),", h); - sprintf(line, "gsSPBranchLessZraw(%sDlist0x%06X, 0x%02X, 0x%02X),", prefix.c_str(), - h & 0x00FFFFFF, (a / 5) | (b / 2), z); - - ZDisplayList* nList = new ZDisplayList(parent); - nList->ExtractFromBinary( - h & 0x00FFFFFF, GetDListLength(parent->GetRawData(), h & 0x00FFFFFF, dListType)); - nList->SetName(nList->GetDefaultName(prefix)); - otherDLists.push_back(nList); - - i++; - } - } - break; - case F3DZEXOpcode::G_MTX: - Opcode_G_MTX(data, line); - break; - default: - sprintf(line, "// Opcode 0x%02X unimplemented!", (uint32_t)opcode); - break; - } -} - -void ZDisplayList::ParseF3DEX(F3DEXOpcode opcode, uint64_t data, const std::string& prefix, - char* line) -{ - switch (opcode) - { - case F3DEXOpcode::G_NOOP: - sprintf(line, "gsDPNoOpTag(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - break; - case F3DEXOpcode::G_VTX: - Opcode_G_VTX(data, line); - break; - case F3DEXOpcode::G_DL: - Opcode_G_DL(data, prefix, line); - break; - case F3DEXOpcode::G_CULLDL: - Opcode_G_CULLDL(data, line); - break; - case F3DEXOpcode::G_MODIFYVTX: - Opcode_G_MODIFYVTX(data, line); - break; - case F3DEXOpcode::G_MTX: - Opcode_G_MTX(data, line); - break; - case F3DEXOpcode::G_TRI1: - Opcode_G_TRI1(data, line); - break; - case F3DEXOpcode::G_TRI2: - Opcode_G_TRI2(data, line); - break; - case F3DEXOpcode::G_ENDDL: - Opcode_G_ENDDL(prefix, line); - break; - case F3DEXOpcode::G_RDPLOADSYNC: - sprintf(line, "gsDPLoadSync(),"); - break; - case F3DEXOpcode::G_RDPPIPESYNC: - sprintf(line, "gsDPPipeSync(),"); - break; - case F3DEXOpcode::G_RDPTILESYNC: - sprintf(line, "gsDPTileSync(),"); - break; - case F3DEXOpcode::G_RDPFULLSYNC: - sprintf(line, "gsDPFullSync(),"); - break; - case F3DEXOpcode::G_TEXTURE: - Opcode_G_TEXTURE(data, line); - break; - case F3DEXOpcode::G_SETTIMG: - Opcode_G_SETTIMG(data, prefix, line); - break; - case F3DEXOpcode::G_SETTILE: - Opcode_G_SETTILE(data, line); - break; - case F3DEXOpcode::G_SETTILESIZE: - Opcode_G_SETTILESIZE(data, prefix, line); - break; - case F3DEXOpcode::G_LOADBLOCK: - Opcode_G_LOADBLOCK(data, line); - break; - case F3DEXOpcode::G_SETCOMBINE: - Opcode_G_SETCOMBINE(data, line); - break; - case F3DEXOpcode::G_SETPRIMCOLOR: - Opcode_G_SETPRIMCOLOR(data, line); - break; - case F3DEXOpcode::G_SETOTHERMODE_L: - Opcode_G_SETOTHERMODE_L(data, line); - break; - case F3DEXOpcode::G_SETOTHERMODE_H: - Opcode_G_SETOTHERMODE_H(data, line); - break; - case F3DEXOpcode::G_LOADTLUT: - Opcode_G_LOADTLUT(data, prefix, line); - break; - case F3DEXOpcode::G_CLEARGEOMETRYMODE: - case F3DEXOpcode::G_SETGEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - std::string geoModeStr = "G_TEXTURE_ENABLE"; - - int32_t geoModeParam = ~cccccc; - - if (ssssssss != 0) - geoModeParam = ssssssss; - - if (geoModeParam & 0x00000002) - geoModeStr += " | G_TEXTURE_ENABLE"; - - if (geoModeParam & 0x00000200) - geoModeStr += " | G_SHADING_SMOOTH"; - - if (geoModeParam & 0x00001000) - geoModeStr += " | G_CULL_FRONT"; - - if (geoModeParam & 0x00002000) - geoModeStr += " | G_CULL_BACK"; - - if (geoModeParam & 0x00000001) - geoModeStr += " | G_ZBUFFER"; - - if (geoModeParam & 0x00000004) - geoModeStr += " | G_SHADE"; - - if (geoModeParam & 0x00010000) - geoModeStr += " | G_FOG"; - - if (geoModeParam & 0x00020000) - geoModeStr += " | G_LIGHTING"; - - if (geoModeParam & 0x00040000) - geoModeStr += " | G_TEXTURE_GEN"; - - if (geoModeParam & 0x00080000) - geoModeStr += " | G_TEXTURE_GEN_LINEAR"; - - if (geoModeParam & 0x00800000) - geoModeStr += " | G_CLIPPING"; - - if (opcode == F3DEXOpcode::G_SETGEOMETRYMODE) - sprintf(line, "gsSPSetGeometryMode(%s),", geoModeStr.c_str()); - else - sprintf(line, "gsSPClearGeometryMode(%s),", geoModeStr.c_str()); - } - break; - default: - sprintf(line, "// Opcode 0x%02X unimplemented!", (uint32_t)opcode); - break; - } -} - -int32_t ZDisplayList::GetDListLength(const std::vector& rawData, uint32_t rawDataIndex, - DListType dListType) -{ - uint8_t endDLOpcode; - uint8_t branchListOpcode; - - if (dListType == DListType::F3DZEX) - { - endDLOpcode = static_cast(F3DZEXOpcode::G_ENDDL); - branchListOpcode = static_cast(F3DZEXOpcode::G_DL); - } - else - { - endDLOpcode = static_cast(F3DEXOpcode::G_ENDDL); - branchListOpcode = static_cast(F3DEXOpcode::G_DL); - } - - uint32_t ptr = rawDataIndex; - size_t rawDataSize = rawData.size(); - while (true) - { - if (ptr >= rawDataSize) - { - std::string errorHeader = - StringHelper::Sprintf("reached end of file when trying to find the end of the " - "DisplayList starting at offset 0x%X", - rawDataIndex); - std::string errorBody = StringHelper::Sprintf("Raw data size: 0x%zX.", rawDataSize); - HANDLE_ERROR_PROCESS(WarningType::Always, errorHeader, errorBody); - } - - uint8_t opcode = rawData.at(ptr); - bool dlNoPush = rawData.at(ptr + 1) == 1; - ptr += 8; - - if (opcode == endDLOpcode || (opcode == branchListOpcode && dlNoPush)) - { - return ptr - rawDataIndex; - } - } -} - -bool ZDisplayList::SequenceCheck(std::vector sequence, int32_t startIndex) -{ - bool success = true; - - for (size_t j = 0; j < sequence.size(); j++) - { - F3DZEXOpcode opcode = (F3DZEXOpcode)(instructions[startIndex + j] >> 56); - - if (sequence[j] != opcode) - { - success = false; - break; - } - } - - if (success) - return true; - - return false; -} - -int32_t ZDisplayList::OptimizationChecks(int32_t startIndex, std::string& output, - const std::string& prefix) -{ - int32_t result = -1; - - result = OptimizationCheck_LoadTextureBlock(startIndex, output, prefix); - - if (result != -1) - return result; - - return -1; -} - -int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, - [[maybe_unused]] const std::string& prefix) -{ - std::vector sequence = {F3DZEXOpcode::G_SETTIMG, F3DZEXOpcode::G_SETTILE, - F3DZEXOpcode::G_RDPLOADSYNC, F3DZEXOpcode::G_LOADBLOCK, - F3DZEXOpcode::G_RDPPIPESYNC, F3DZEXOpcode::G_SETTILE, - F3DZEXOpcode::G_SETTILESIZE}; - - bool seqRes = SequenceCheck(sequence, startIndex); - - if (seqRes) - { - // gsDPLoadTextureBlock(texAddr, fmt, siz, width, height, pal, cms, cmt, masks, maskt, - // shifts, shiftt) gsDPLoadMultiBlock(texAddr, tmem, rtile, fmt, siz, width, height, pal, - // cms, cmt, masks, maskt, shifts, shiftt) gsDPLoadTextureBlock_4b(texAddr, fmt, width, - // height, pal, cms, cmt, masks, maskt, shifts, shiftt) gsDPLoadMultiBlock_4b(texAddr, tmem, - // rtile, fmt, width, height, pal, cms, cmt, masks, maskt, shifts, shiftt) - - uint32_t texAddr, tmem, rtile, fmt, siz, sizB, width, height, width2, height2, pal, cms, - cmt, masks, maskt, shifts, shiftt; - std::string texStr; - - // gsDPSetTextureImage - { - uint64_t data = instructions[startIndex + 0]; - - int32_t __ = (data & 0x00FF000000000000) >> 48; - // int32_t www = (data & 0x00000FFF00000000) >> 32; - - fmt = (__ & 0xE0) >> 5; - siz = (__ & 0x18) >> 3; - texAddr = Seg2Filespace(data, parent->baseAddress); - uint32_t segmentNumber = GETSEGNUM(data); - - lastTexSeg = segmentNumber; - - Globals::Instance->GetSegmentedPtrName(data & 0xFFFFFFFF, parent, "", texStr, - parent->workerID); - } - - // gsDPSetTile - { - uint64_t data = instructions[startIndex + 1]; - - tmem = - (data & 0b0000000000000000111111111111111100000000000000000000000000000000) >> 32; - - cmt = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - maskt = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - shiftt = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - cms = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - masks = - (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - shifts = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - // sprintf(line, "gsDPSetTile(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - // fmtTbl[fff].c_str(), sizTbl[ii].c_str(), nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, - // ssss, dd, bbbb, uuuu); - } - - // gsDPLoadSync - - // gsDPLoadBlock - - // gsDPPipeSync - - // gsDPSetTile - { - uint64_t data = instructions[startIndex + 5]; - int32_t __ = (data & 0x00FF000000000000) >> 48; - pal = (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - // siz = (__ & 0x18) >> 3; - rtile = - (data & 0b0000000000000000000000000000000011111111000000000000000000000000) >> 24; - sizB = (__ & 0x18) >> 3; - } - - // gsDPSetTileSize - { - uint64_t data = instructions[startIndex + 6]; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - - int32_t shiftAmtW = 2; - int32_t shiftAmtH = 2; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_8b && - fmt == (int32_t)F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtW = 3; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_4b) - shiftAmtW = 3; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_4b && - fmt == (int32_t)F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtH = 3; - - width = (uuu >> shiftAmtW) + 1; - height = (vvv >> shiftAmtH) + 1; - - width2 = (uuu >> 2) + 1; - height2 = (vvv >> 2) + 1; - } - - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - // output += StringHelper::Sprintf("gsDPLoadTextureBlock(%s, %s, %s, %i, %i, %i, %i, %i, %i, - // %i, %i, %i),", texStr.c_str(), fmtTbl[fmt], sizTbl[siz].c_str(), width, height, - // pal, cms, cmt, masks, maskt, shifts, shiftt); - - if (siz == 2 && sizB == 0) - { - if (tmem != 0) - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock_4b(%s, %i, %i, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], width2, height2, pal, cms, cmt, masks, - maskt, shifts, shiftt); - else - output += StringHelper::Sprintf( - "gsDPLoadTextureBlock_4b(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), fmtTbl[fmt], width2, height2, pal, cms, cmt, masks, maskt, - shifts, shiftt); - } - else if (siz == 2 && sizB != 0) - { - if (tmem != 0) - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock(%s, %i, %i, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], sizTbl[sizB], width2, height2, pal, - cms, cmt, masks, maskt, shifts, shiftt); - else - output += StringHelper::Sprintf( - "gsDPLoadTextureBlock(%s, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), fmtTbl[fmt], sizTbl[sizB], width2, height2, pal, cms, cmt, - masks, maskt, shifts, shiftt); - } - else - { - if (siz != sizB) - { - lastTexAddr = texAddr; - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexWidth = width; - lastTexHeight = height; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexLoaded = true; - - TextureGenCheck(); - - return -1; - } - - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock(%s, %i, %i, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], sizTbl[siz], width, height, pal, cms, cmt, - masks, maskt, shifts, shiftt); - } - - lastTexAddr = texAddr; - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexWidth = width; - lastTexHeight = height; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexLoaded = true; - - TextureGenCheck(); - - return (int32_t)sequence.size(); - } - - return -1; -} - -void ZDisplayList::Opcode_G_DL(uint64_t data, const std::string& prefix, char* line) -{ - int32_t pp = (data & 0x00FF000000000000) >> 56; - int32_t segNum = GETSEGNUM(data); - - Declaration* dListDecl = nullptr; - - if (parent != nullptr) - dListDecl = parent->GetDeclaration(GETSEGOFFSET(data)); - - if (pp != 0) - { - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else if (dListDecl != nullptr) - sprintf(line, "gsSPBranchList(%s),", dListDecl->varName.c_str()); - else - sprintf(line, "gsSPBranchList(%sDlist0x%06" PRIX64 "),", prefix.c_str(), - GETSEGOFFSET(data)); - } - else - { - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - sprintf(line, "gsSPDisplayList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else if (dListDecl != nullptr) - sprintf(line, "gsSPDisplayList(%s),", dListDecl->varName.c_str()); - else - sprintf(line, "gsSPDisplayList(%sDlist0x%06" PRIX64 "),", prefix.c_str(), - GETSEGOFFSET(data)); - } - - // if (segNum == 8 || segNum == 9 || segNum == 10 || segNum == 11 || segNum == 12 || segNum == - // 13) // Used for runtime-generated display lists - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - { - if (pp != 0) - sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else - sprintf(line, "gsSPDisplayList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - } - else - { - ZDisplayList* nList = new ZDisplayList(parent); - nList->ExtractFromBinary(GETSEGOFFSET(data), GetDListLength(parent->GetRawData(), - GETSEGOFFSET(data), dListType)); - nList->SetName(nList->GetDefaultName(prefix)); - - otherDLists.push_back(nList); - } -} - -void ZDisplayList::Opcode_G_MODIFYVTX(uint64_t data, char* line) -{ - int32_t ww = (data & 0x00FF000000000000ULL) >> 48; - int32_t nnnn = (data & 0x0000FFFF00000000ULL) >> 32; - int32_t vvvvvvvv = (data & 0x00000000FFFFFFFFULL); - - sprintf(line, "gsSPModifyVertex(%i, %i, %i),", nnnn / 2, ww, vvvvvvvv); -} - -void ZDisplayList::Opcode_G_CULLDL(uint64_t data, char* line) -{ - int32_t vvvv = (data & 0xFFFF00000000) >> 32; - int32_t wwww = (data & 0x0000FFFF); - - sprintf(line, "gsSPCullDisplayList(%i, %i),", vvvv / 2, wwww / 2); -} - -void ZDisplayList::Opcode_G_TRI1(uint64_t data, char* line) -{ - if (dListType == DListType::F3DZEX) - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - sprintf(line, "gsSP1Triangle(%i, %i, %i, 0),", aa, bb, cc); - } - else - { - int32_t aa = ((data & 0x0000000000FF0000ULL) >> 16) / 2; - int32_t bb = ((data & 0x000000000000FF00ULL) >> 8) / 2; - int32_t cc = ((data & 0x00000000000000FFULL) >> 0) / 2; - sprintf(line, "gsSP1Triangle(%i, %i, %i, 0),", aa, bb, cc); - } -} - -void ZDisplayList::Opcode_G_TRI2(uint64_t data, char* line) -{ - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x00000000FF0000ULL) >> 16) / 2; - int32_t ee = ((data & 0x0000000000FF00ULL) >> 8) / 2; - int32_t ff = ((data & 0x000000000000FFULL) >> 0) / 2; - sprintf(line, "gsSP2Triangles(%i, %i, %i, 0, %i, %i, %i, 0),", aa, bb, cc, dd, ee, ff); -} - -void ZDisplayList::Opcode_G_MTX(uint64_t data, char* line) -{ - uint32_t pp = 0; - uint32_t mm = (data & 0x00000000FFFFFFFF); - bool push = false; - bool load = false; - bool projection = false; - - if (dListType == DListType::F3DEX) - pp = (data & 0x00FF000000000000) >> 48; - else - pp = (data & 0x000000FF00000000) >> 32; - - std::string matrixRef; - - if (Globals::Instance->cfg.symbolMap.find(mm) != Globals::Instance->cfg.symbolMap.end()) - matrixRef = StringHelper::Sprintf("&%s", Globals::Instance->cfg.symbolMap[mm].c_str()); - else - matrixRef = StringHelper::Sprintf("0x%08X", mm); - - pp ^= 0x01; - - if (pp & 0x01) - push = true; - - if (pp & 0x02) - load = true; - - if (pp & 0x04) - projection = true; - - sprintf(line, "gsSPMatrix(%s, %s | %s | %s),", matrixRef.c_str(), - projection ? "G_MTX_PROJECTION" : "G_MTX_MODELVIEW", - push ? "G_MTX_PUSH" : "G_MTX_NOPUSH", load ? "G_MTX_LOAD" : "G_MTX_MUL"); -} - -void ZDisplayList::Opcode_G_VTX(uint64_t data, char* line) -{ - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - - uint32_t vtxAddr = Seg2Filespace(data, parent->baseAddress); - - if (dListType == DListType::F3DZEX) - sprintf(line, "gsSPVertex(@r, %i, %i),", nn, ((aa >> 1) - nn)); - else - { - uint32_t hi = data >> 32; - -#define _SHIFTR(v, s, w) (((uint32_t)v >> s) & ((0x01 << w) - 1)) - - nn = _SHIFTR(hi, 10, 6); - - sprintf(line, "gsSPVertex(@r, %i, %i),", nn, _SHIFTR(hi, 17, 7)); - } - - // Hack: Don't extract vertices from a unknown segment. - if (!Globals::Instance->HasSegment(GETSEGNUM(data), parent->workerID)) - { - segptr_t segmented = data & 0xFFFFFFFF; - references.push_back(segmented); - parent->AddDeclaration(segmented, DeclarationAlignment::Align8, 16, "Vtx", - StringHelper::Sprintf("0x%08X", segmented), ""); - return; - } - references.push_back(data); - - { - uint32_t currentPtr = Seg2Filespace(data, parent->baseAddress); - Declaration* decl; - - // Check for vertex intersections from other display lists - // TODO: These two could probably be condenced to one... - decl = parent->GetDeclarationRanged(vtxAddr + (nn * 16)); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxAddr; - if (diff > 0) - nn = diff / 16; - else - nn = 0; - } - - decl = parent->GetDeclarationRanged(vtxAddr); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxAddr; - if (diff > 0) - nn = diff / 16; - else - nn = 0; - } - - if (nn > 0) - { - std::vector vtxList; - vtxList.reserve(nn); - - for (int32_t i = 0; i < nn; i++) - { - ZVtx vtx(parent); - vtx.ExtractFromFile(currentPtr); - vtxList.push_back(vtx); - - currentPtr += 16; - } - - vertices[vtxAddr] = vtxList; - } - } -} - -void ZDisplayList::Opcode_G_TEXTURE(uint64_t data, char* line) -{ - int32_t ____ = (data & 0x0000FFFF00000000) >> 32; - int32_t ssss = (data & 0x00000000FFFF0000) >> 16; - int32_t tttt = (data & 0x000000000000FFFF); - int32_t lll = (____ & 0x3800) >> 11; - int32_t ddd = (____ & 0x700) >> 8; - int32_t nnnnnnn = 0; - - if (dListType == DListType::F3DEX) - nnnnnnn = (____ & 0xFF); - else - nnnnnnn = (____ & 0xFE) >> 1; - - sprintf(line, "gsSPTexture(%i, %i, %i, %i, %s),", ssss, tttt, lll, ddd, - nnnnnnn == 1 ? "G_ON" : "G_OFF"); -} - -void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, char* line) -{ - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_SETTIMG\n"); - - TextureGenCheck(); // HOTSPOT - - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexSeg = data; - lastTexAddr = Seg2Filespace(data, parent->baseAddress); - - int32_t segmentNumber = GETSEGNUM(data); - - if (segmentNumber != 2) - { - char texStr[2048]; - int32_t texAddress = Seg2Filespace(data, parent->baseAddress); - Declaration* texDecl = nullptr; - - if (parent != nullptr) - { - if (Globals::Instance->HasSegment(segmentNumber, parent->workerID)) - texDecl = parent->GetDeclaration(texAddress); - else - texDecl = parent->GetDeclaration(data); - } - - if (texDecl != nullptr) - sprintf(texStr, "%s", texDecl->varName.c_str()); - else if (data != 0 && Globals::Instance->HasSegment(segmentNumber, parent->workerID)) - sprintf(texStr, "%sTex_%06X", prefix.c_str(), texAddress); - else - { - sprintf(texStr, "0x%08" PRIX64, data & 0xFFFFFFFF); - } - - sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt], sizTbl[siz], www + 1, - texStr); - } - else - { - std::string texName; - Globals::Instance->GetSegmentedPtrName(data, parent, "", texName, parent->workerID); - sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt], sizTbl[siz], www + 1, - texName.c_str()); - } -} - -void ZDisplayList::Opcode_G_SETTILE(uint64_t data, char* line) -{ - int32_t fff = (data & 0b0000000011100000000000000000000000000000000000000000000000000000) >> 53; - int32_t ii = (data & 0b0000000000011000000000000000000000000000000000000000000000000000) >> 51; - int32_t nnnnnnnnn = - (data & 0b0000000000000011111111100000000000000000000000000000000000000000) >> 41; - int32_t mmmmmmmmm = - (data & 0b0000000000000000000000011111111100000000000000000000000000000000) >> 32; - int32_t ttt = (data & 0b0000000000000000000000000000000000000111000000000000000000000000) >> 24; - int32_t pppp = - (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - int32_t cc = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - int32_t aaaa = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - int32_t ssss = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - int32_t dd = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - if (fff == (int32_t)F3DZEXTexFormats::G_IM_FMT_CI) - lastCISiz = (F3DZEXTexSizes)ii; - - lastTexSizTest = (F3DZEXTexSizes)ii; - - sprintf(line, "gsDPSetTile(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i),", fmtTbl[fff], - sizTbl[ii], nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu); -} - -void ZDisplayList::Opcode_G_SETTILESIZE(uint64_t data, [[maybe_unused]] const std::string& prefix, - char* line) -{ - int32_t sss = (data & 0x00FFF00000000000) >> 44; - int32_t ttt = (data & 0x00000FFF00000000) >> 32; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - int32_t i = (data & 0x000000000F000000) >> 24; - - int32_t shiftAmtW = 2; - int32_t shiftAmtH = 2; - - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_8b && - lastTexFmt == F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtW = 3; - - // if (lastTexFmt == F3DZEXTexFormats::G_IM_FMT_I || lastTexFmt == - // F3DZEXTexFormats::G_IM_FMT_CI) - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_4b) - shiftAmtW = 3; - - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_4b && - lastTexFmt == F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtH = 3; - - lastTexWidth = (uuu >> shiftAmtW) + 1; - lastTexHeight = (vvv >> shiftAmtH) + 1; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("lastTexWidth: %i lastTexHeight: %i, lastTexSizTest: 0x%x, lastTexFmt: 0x%x\n", - lastTexWidth, lastTexHeight, (uint32_t)lastTexSizTest, (uint32_t)lastTexFmt); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_SETTILESIZE\n"); - - TextureGenCheck(); - - sprintf(line, "gsDPSetTileSize(%i, %i, %i, %i, %i),", i, sss, ttt, uuu, vvv); -} - -void ZDisplayList::Opcode_G_LOADBLOCK(uint64_t data, char* line) -{ - int32_t sss = (data & 0x00FFF00000000000) >> 48; - int32_t ttt = (data & 0x00000FFF00000000) >> 36; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t xxx = (data & 0x0000000000FFF000) >> 12; - int32_t ddd = (data & 0x0000000000000FFF); - - lastTexLoaded = true; - - sprintf(line, "gsDPLoadBlock(%i, %i, %i, %i, %i),", i, sss, ttt, xxx, ddd); -} - -void ZDisplayList::Opcode_G_SETCOMBINE(uint64_t data, char* line) -{ - int32_t a0 = (data & 0b000000011110000000000000000000000000000000000000000000000000000) >> 52; - int32_t c0 = (data & 0b000000000001111100000000000000000000000000000000000000000000000) >> 47; - int32_t aa0 = (data & 0b00000000000000011100000000000000000000000000000000000000000000) >> 44; - int32_t ac0 = (data & 0b00000000000000000011100000000000000000000000000000000000000000) >> 41; - int32_t a1 = (data & 0b000000000000000000000011110000000000000000000000000000000000000) >> 37; - int32_t c1 = (data & 0b000000000000000000000000001111100000000000000000000000000000000) >> 32; - int32_t b0 = (data & 0b000000000000000000000000000000011110000000000000000000000000000) >> 28; - int32_t b1 = (data & 0b000000000000000000000000000000000001111000000000000000000000000) >> 24; - int32_t aa1 = (data & 0b00000000000000000000000000000000000000111000000000000000000000) >> 21; - int32_t ac1 = (data & 0b00000000000000000000000000000000000000000111000000000000000000) >> 18; - int32_t d0 = (data & 0b000000000000000000000000000000000000000000000111000000000000000) >> 15; - int32_t ab0 = (data & 0b00000000000000000000000000000000000000000000000111000000000000) >> 12; - int32_t ad0 = (data & 0b00000000000000000000000000000000000000000000000000111000000000) >> 9; - int32_t d1 = (data & 0b000000000000000000000000000000000000000000000000000000111000000) >> 6; - int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3; - int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0; - - const char* modesA[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "1", "NOISE", "0", "9", "10", "11", - "12", "13", "14", "0"}; - const char* modesB[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "CENTER", "K4", "8", "9", "10", "11", - "12", "13", "14", "0"}; - const char* modesC[] = {"COMBINED", - "TEXEL0", - "TEXEL1", - "PRIMITIVE", - "SHADE", - "ENVIRONMENT", - "1", - "COMBINED_ALPHA", - "TEXEL0_ALPHA", - "TEXEL1_ALPHA", - "PRIMITIVE_ALPHA", - "SHADE_ALPHA", - "ENV_ALPHA", - "LOD_FRACTION", - "PRIM_LOD_FRAC", - "K5", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24", - "25", - "26", - "27", - "28", - "29", - "30", - "0"}; - const char* modesD[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; - - const char* modes2[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; - const char* modes2C[] = {"LOD_FRACTION", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "PRIM_LOD_FRAC", "0"}; - - sprintf(line, - "gsDPSetCombineLERP(%s, %s, %s, %s, %s, %s, %s, %s,\n %s, %s, " - "%s, %s, %s, %s, %s, %s),", - modesA[a0], modesB[b0], modesC[c0], modesD[d0], modes2[aa0], modes2[ab0], modes2C[ac0], - modes2[ad0], modesA[a1], modesB[b1], modesC[c1], modesD[d1], modes2[aa1], modes2[ab1], - modes2C[ac1], modes2[ad1]); -} - -void ZDisplayList::Opcode_G_SETPRIMCOLOR(uint64_t data, char* line) -{ - int32_t mm = (data & 0x0000FF0000000000) >> 40; - int32_t ff = (data & 0x000000FF00000000) >> 32; - int32_t rr = (data & 0x00000000FF000000) >> 24; - int32_t gg = (data & 0x0000000000FF0000) >> 16; - int32_t bb = (data & 0x000000000000FF00) >> 8; - int32_t aa = (data & 0x00000000000000FF) >> 0; - sprintf(line, "gsDPSetPrimColor(%i, %i, %i, %i, %i, %i),", mm, ff, rr, gg, bb, aa); -} - -void ZDisplayList::Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, char* line) -{ - int32_t sft = (data & 0x0000FF0000000000) >> 40; - int32_t len = (data & 0x000000FF00000000) >> 32; - int32_t dat = (data & 0xFFFFFFFF); - - // TODO: Output the correct render modes in data - - sprintf(line, "gsSPSetOtherMode(0xE2, %i, %i, 0x%08X),", sft, len, dat); -} - -void ZDisplayList::Opcode_G_SETOTHERMODE_L(uint64_t data, char* line) -{ - int32_t dd = (data & 0xFFFFFFFF); - int32_t sft = 0; - int32_t len = 0; - - if (dListType == DListType::F3DEX) - { - sft = (data & 0x0000FF0000000000) >> 40; - len = (data & 0x000000FF00000000) >> 32; - } - else - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - len = ((data & 0x000000FF00000000) >> 32) + 1; - sft = 32 - (len)-ss; - } - - if (sft == G_MDSFT_RENDERMODE) - { - uint32_t mode1 = (dd & 0xCCCC0000) >> 0; - uint32_t mode2 = (dd & 0x3333FFFF); - - // TODO: Jesus Christ This is Messy - - uint32_t tblA[] = {G_RM_FOG_SHADE_A, - G_RM_FOG_PRIM_A, - G_RM_PASS, - G_RM_AA_ZB_OPA_SURF, - G_RM_AA_ZB_XLU_SURF, - G_RM_AA_ZB_OPA_DECAL, - G_RM_AA_ZB_XLU_DECAL, - G_RM_AA_ZB_OPA_INTER, - G_RM_AA_ZB_XLU_INTER, - G_RM_AA_ZB_XLU_LINE, - G_RM_AA_ZB_DEC_LINE, - G_RM_AA_ZB_TEX_EDGE, - G_RM_AA_ZB_TEX_INTER, - G_RM_AA_ZB_SUB_SURF, - G_RM_AA_ZB_PCL_SURF, - G_RM_AA_ZB_OPA_TERR, - G_RM_AA_ZB_TEX_TERR, - G_RM_AA_ZB_SUB_TERR, - G_RM_RA_ZB_OPA_SURF, - G_RM_RA_ZB_OPA_DECAL, - G_RM_RA_ZB_OPA_INTER, - G_RM_AA_OPA_SURF, - G_RM_AA_XLU_SURF, - G_RM_AA_XLU_LINE, - G_RM_AA_DEC_LINE, - G_RM_AA_TEX_EDGE, - G_RM_AA_SUB_SURF, - G_RM_AA_PCL_SURF, - G_RM_AA_OPA_TERR, - G_RM_AA_TEX_TERR, - G_RM_AA_SUB_TERR, - G_RM_RA_OPA_SURF, - G_RM_ZB_OPA_SURF, - G_RM_ZB_XLU_SURF, - G_RM_ZB_OPA_DECAL, - G_RM_ZB_XLU_DECAL, - G_RM_ZB_CLD_SURF, - G_RM_ZB_OVL_SURF, - G_RM_ZB_PCL_SURF, - G_RM_OPA_SURF, - G_RM_XLU_SURF, - G_RM_CLD_SURF, - G_RM_TEX_EDGE, - G_RM_PCL_SURF, - G_RM_ADD, - G_RM_NOOP, - G_RM_VISCVG, - G_RM_OPA_CI}; - - uint32_t tblB[] = {G_RM_AA_ZB_OPA_SURF2, - G_RM_AA_ZB_XLU_SURF2, - G_RM_AA_ZB_OPA_DECAL2, - G_RM_AA_ZB_XLU_DECAL2, - G_RM_AA_ZB_OPA_INTER2, - G_RM_AA_ZB_XLU_INTER2, - G_RM_AA_ZB_XLU_LINE2, - G_RM_AA_ZB_DEC_LINE2, - G_RM_AA_ZB_TEX_EDGE2, - G_RM_AA_ZB_TEX_INTER2, - G_RM_AA_ZB_SUB_SURF2, - G_RM_AA_ZB_PCL_SURF2, - G_RM_AA_ZB_OPA_TERR2, - G_RM_AA_ZB_TEX_TERR2, - G_RM_AA_ZB_SUB_TERR2, - G_RM_RA_ZB_OPA_SURF2, - G_RM_RA_ZB_OPA_DECAL2, - G_RM_RA_ZB_OPA_INTER2, - G_RM_AA_OPA_SURF2, - G_RM_AA_XLU_SURF2, - G_RM_AA_XLU_LINE2, - G_RM_AA_DEC_LINE2, - G_RM_AA_TEX_EDGE2, - G_RM_AA_SUB_SURF2, - G_RM_AA_PCL_SURF2, - G_RM_AA_OPA_TERR2, - G_RM_AA_TEX_TERR2, - G_RM_AA_SUB_TERR2, - G_RM_RA_OPA_SURF2, - G_RM_ZB_OPA_SURF2, - G_RM_ZB_XLU_SURF2, - G_RM_ZB_OPA_DECAL2, - G_RM_ZB_XLU_DECAL2, - G_RM_ZB_CLD_SURF2, - G_RM_ZB_OVL_SURF2, - G_RM_ZB_PCL_SURF2, - G_RM_OPA_SURF2, - G_RM_XLU_SURF2, - G_RM_CLD_SURF2, - G_RM_TEX_EDGE2, - G_RM_PCL_SURF2, - G_RM_ADD2, - G_RM_NOOP2, - G_RM_VISCVG2, - G_RM_OPA_CI2}; - - std::map str = { - {G_RM_FOG_SHADE_A, "G_RM_FOG_SHADE_A"}, - {G_RM_FOG_PRIM_A, "G_RM_FOG_PRIM_A"}, - {G_RM_PASS, "G_RM_PASS"}, - {G_RM_AA_ZB_OPA_SURF, "G_RM_AA_ZB_OPA_SURF"}, - {G_RM_AA_ZB_OPA_SURF2, "G_RM_AA_ZB_OPA_SURF2"}, - {G_RM_AA_ZB_XLU_SURF, "G_RM_AA_ZB_XLU_SURF"}, - {G_RM_AA_ZB_XLU_SURF2, "G_RM_AA_ZB_XLU_SURF2"}, - {G_RM_AA_ZB_OPA_DECAL, "G_RM_AA_ZB_OPA_DECAL"}, - {G_RM_AA_ZB_OPA_DECAL2, "G_RM_AA_ZB_OPA_DECAL2"}, - {G_RM_AA_ZB_XLU_DECAL, "G_RM_AA_ZB_XLU_DECAL"}, - {G_RM_AA_ZB_XLU_DECAL2, "G_RM_AA_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_OPA_INTER, "G_RM_AA_ZB_OPA_INTER"}, - {G_RM_AA_ZB_OPA_INTER2, "G_RM_AA_ZB_OPA_INTER2"}, - {G_RM_AA_ZB_XLU_INTER, "G_RM_AA_ZB_XLU_INTER"}, - {G_RM_AA_ZB_XLU_INTER2, "G_RM_AA_ZB_XLU_INTER2"}, - {G_RM_AA_ZB_XLU_LINE, "G_RM_AA_ZB_XLU_LINE"}, - {G_RM_AA_ZB_XLU_LINE2, "G_RM_AA_ZB_XLU_LINE2"}, - {G_RM_AA_ZB_DEC_LINE, "G_RM_AA_ZB_DEC_LINE"}, - {G_RM_AA_ZB_DEC_LINE2, "G_RM_AA_ZB_DEC_LINE2"}, - {G_RM_AA_ZB_TEX_EDGE, "G_RM_AA_ZB_TEX_EDGE"}, - {G_RM_AA_ZB_TEX_EDGE2, "G_RM_AA_ZB_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_INTER, "G_RM_AA_ZB_TEX_INTER"}, - {G_RM_AA_ZB_TEX_INTER2, "G_RM_AA_ZB_TEX_INTER2"}, - {G_RM_AA_ZB_SUB_SURF, "G_RM_AA_ZB_SUB_SURF"}, - {G_RM_AA_ZB_SUB_SURF2, "G_RM_AA_ZB_SUB_SURF2"}, - {G_RM_AA_ZB_PCL_SURF, "G_RM_AA_ZB_PCL_SURF"}, - {G_RM_AA_ZB_PCL_SURF2, "G_RM_AA_ZB_PCL_SURF2"}, - {G_RM_AA_ZB_OPA_TERR, "G_RM_AA_ZB_OPA_TERR"}, - {G_RM_AA_ZB_OPA_TERR2, "G_RM_AA_ZB_OPA_TERR2"}, - {G_RM_AA_ZB_TEX_TERR, "G_RM_AA_ZB_TEX_TERR"}, - {G_RM_AA_ZB_TEX_TERR2, "G_RM_AA_ZB_TEX_TERR2"}, - {G_RM_AA_ZB_SUB_TERR, "G_RM_AA_ZB_SUB_TERR"}, - {G_RM_AA_ZB_SUB_TERR2, "G_RM_AA_ZB_SUB_TERR2"}, - {G_RM_RA_ZB_OPA_SURF, "G_RM_RA_ZB_OPA_SURF"}, - {G_RM_RA_ZB_OPA_SURF2, "G_RM_RA_ZB_OPA_SURF2"}, - {G_RM_RA_ZB_OPA_DECAL, "G_RM_RA_ZB_OPA_DECAL"}, - {G_RM_RA_ZB_OPA_DECAL2, "G_RM_RA_ZB_OPA_DECAL2"}, - {G_RM_RA_ZB_OPA_INTER, "G_RM_RA_ZB_OPA_INTER"}, - {G_RM_RA_ZB_OPA_INTER2, "G_RM_RA_ZB_OPA_INTER2"}, - {G_RM_AA_OPA_SURF, "G_RM_AA_OPA_SURF"}, - {G_RM_AA_OPA_SURF2, "G_RM_AA_OPA_SURF2"}, - {G_RM_AA_XLU_SURF, "G_RM_AA_XLU_SURF"}, - {G_RM_AA_XLU_SURF2, "G_RM_AA_XLU_SURF2"}, - {G_RM_AA_XLU_LINE, "G_RM_AA_XLU_LINE"}, - {G_RM_AA_XLU_LINE2, "G_RM_AA_XLU_LINE2"}, - {G_RM_AA_DEC_LINE, "G_RM_AA_DEC_LINE"}, - {G_RM_AA_DEC_LINE2, "G_RM_AA_DEC_LINE2"}, - {G_RM_AA_TEX_EDGE, "G_RM_AA_TEX_EDGE"}, - {G_RM_AA_TEX_EDGE2, "G_RM_AA_TEX_EDGE2"}, - {G_RM_AA_SUB_SURF, "G_RM_AA_SUB_SURF"}, - {G_RM_AA_SUB_SURF2, "G_RM_AA_SUB_SURF2"}, - {G_RM_AA_PCL_SURF, "G_RM_AA_PCL_SURF"}, - {G_RM_AA_PCL_SURF2, "G_RM_AA_PCL_SURF2"}, - {G_RM_AA_OPA_TERR, "G_RM_AA_OPA_TERR"}, - {G_RM_AA_OPA_TERR2, "G_RM_AA_OPA_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_SUB_TERR, "G_RM_AA_SUB_TERR"}, - {G_RM_AA_SUB_TERR2, "G_RM_AA_SUB_TERR2"}, - {G_RM_RA_OPA_SURF, "G_RM_RA_OPA_SURF"}, - {G_RM_RA_OPA_SURF2, "G_RM_RA_OPA_SURF2"}, - {G_RM_ZB_OPA_SURF, "G_RM_ZB_OPA_SURF"}, - {G_RM_ZB_OPA_SURF2, "G_RM_ZB_OPA_SURF2"}, - {G_RM_ZB_XLU_SURF, "G_RM_ZB_XLU_SURF"}, - {G_RM_ZB_XLU_SURF2, "G_RM_ZB_XLU_SURF2"}, - {G_RM_ZB_OPA_DECAL, "G_RM_ZB_OPA_DECAL"}, - {G_RM_ZB_OPA_DECAL2, "G_RM_ZB_OPA_DECAL2"}, - {G_RM_ZB_XLU_DECAL, "G_RM_ZB_XLU_DECAL"}, - {G_RM_ZB_XLU_DECAL2, "G_RM_ZB_XLU_DECAL2"}, - {G_RM_ZB_CLD_SURF, "G_RM_ZB_CLD_SURF"}, - {G_RM_ZB_CLD_SURF2, "G_RM_ZB_CLD_SURF2"}, - {G_RM_ZB_OVL_SURF, "G_RM_ZB_OVL_SURF"}, - {G_RM_ZB_OVL_SURF2, "G_RM_ZB_OVL_SURF2"}, - {G_RM_ZB_PCL_SURF, "G_RM_ZB_PCL_SURF"}, - {G_RM_ZB_PCL_SURF2, "G_RM_ZB_PCL_SURF2"}, - {G_RM_OPA_SURF, "G_RM_OPA_SURF"}, - {G_RM_OPA_SURF2, "G_RM_OPA_SURF2"}, - {G_RM_XLU_SURF, "G_RM_XLU_SURF"}, - {G_RM_XLU_SURF2, "G_RM_XLU_SURF2"}, - {G_RM_CLD_SURF, "G_RM_CLD_SURF"}, - {G_RM_CLD_SURF2, "G_RM_CLD_SURF2"}, - {G_RM_TEX_EDGE, "G_RM_TEX_EDGE"}, - {G_RM_TEX_EDGE2, "G_RM_TEX_EDGE2"}, - {G_RM_PCL_SURF, "G_RM_PCL_SURF"}, - {G_RM_PCL_SURF2, "G_RM_PCL_SURF2"}, - {G_RM_ADD, "G_RM_ADD"}, - {G_RM_ADD2, "G_RM_ADD2"}, - {G_RM_NOOP, "G_RM_NOOP"}, - {G_RM_NOOP2, "G_RM_NOOP2"}, - {G_RM_VISCVG, "G_RM_VISCVG"}, - {G_RM_VISCVG2, "G_RM_VISCVG2"}, - {G_RM_OPA_CI, "G_RM_OPA_CI"}, - {G_RM_OPA_CI2, "G_RM_OPA_CI2"}, - }; - - for (uint32_t k = 0; k < sizeof(tblA) / 4; k++) - { - if ((dd & tblA[k]) == tblA[k]) - { - if (tblA[k] > mode1) - mode1 = tblA[k]; - } - } - - for (uint32_t k = 0; k < sizeof(tblB) / 4; k++) - { - if ((dd & tblB[k]) == tblB[k]) - { - if (tblB[k] > mode2) - mode2 = tblB[k]; - } - } - - std::string mode1Str = str[mode1]; - std::string mode2Str = str[mode2]; - - if (mode1Str == "") - { - mode1Str = StringHelper::Sprintf("0x%08X", mode1); - } - - if (mode2Str == "") - { - if (mode2 & AA_EN) - { - mode2Str += "AA_EN | "; - } - - if (mode2 & Z_CMP) - { - mode2Str += "Z_CMP | "; - } - - if (mode2 & Z_UPD) - { - mode2Str += "Z_UPD | "; - } - - if (mode2 & IM_RD) - { - mode2Str += "IM_RD | "; - } - - if (mode2 & CLR_ON_CVG) - { - mode2Str += "CLR_ON_CVG | "; - } - - if (mode2 & CVG_DST_CLAMP) - { - mode2Str += "CVG_DST_CLAMP | "; - } - - if (mode2 & CVG_DST_WRAP) - { - mode2Str += "CVG_DST_WRAP | "; - } - - if (mode2 & CVG_DST_FULL) - { - mode2Str += "CVG_DST_FULL | "; - } - - if (mode2 & CVG_DST_SAVE) - { - mode2Str += "CVG_DST_SAVE | "; - } - - int32_t zMode = mode2 & 0xC00; - - if (zMode == ZMODE_INTER) - { - mode2Str += "ZMODE_INTER | "; - } - else if (zMode == ZMODE_XLU) - { - mode2Str += "ZMODE_XLU | "; - } - else if (zMode == ZMODE_DEC) - { - mode2Str += "ZMODE_DEC | "; - } - - if (mode2 & CVG_X_ALPHA) - { - mode2Str += "CVG_X_ALPHA | "; - } - - if (mode2 & ALPHA_CVG_SEL) - { - mode2Str += "ALPHA_CVG_SEL | "; - } - - if (mode2 & FORCE_BL) - { - mode2Str += "FORCE_BL | "; - } - - int32_t bp = (mode2 >> 28) & 0b11; - int32_t ba = (mode2 >> 24) & 0b11; - int32_t bm = (mode2 >> 20) & 0b11; - int32_t bb = (mode2 >> 16) & 0b11; - - mode2Str += StringHelper::Sprintf("GBL_c2(%i, %i, %i, %i)", bp, ba, bm, bb); - // mode2Str = StringHelper::Sprintf("0x%08X", mode2); - } - - sprintf(line, "gsDPSetRenderMode(%s, %s),", mode1Str.c_str(), mode2Str.c_str()); - } - else - { - sprintf(line, "gsSPSetOtherMode(0xE2, %i, %i, 0x%08X),", sft, len, dd); - } -} - -void ZDisplayList::Opcode_G_SETOTHERMODE_H(uint64_t data, char* line) -{ - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t nn = (data & 0x000000FF00000000) >> 32; - int32_t dd = (data & 0xFFFFFFFF); - - int32_t sft = 32 - (nn + 1) - ss; - - if (sft == 14) // G_MDSFT_TEXTLUT - { - const char* types[] = {"G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16"}; - sprintf(line, "gsDPSetTextureLUT(%s),", types[dd >> 14]); - } - else - sprintf(line, "gsSPSetOtherMode(0xE3, %i, %i, 0x%08X),", sft, nn + 1, dd); -} - -void ZDisplayList::Opcode_G_LOADTLUT(uint64_t data, [[maybe_unused]] const std::string& prefix, - char* line) -{ - int32_t t = (data & 0x0000000007000000) >> 24; - int32_t ccc = (data & 0x00000000003FF000) >> 14; - - lastTexWidth = sqrt(ccc + 1); - lastTexHeight = sqrt(ccc + 1); - - lastTexLoaded = true; - lastTexIsPalette = true; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_LOADTLUT (lastCISiz: %i)\n", (uint32_t)lastCISiz); - - TextureGenCheck(); - - sprintf(line, "gsDPLoadTLUTCmd(%i, %i),", t, ccc); -} - -void ZDisplayList::Opcode_G_ENDDL([[maybe_unused]] const std::string& prefix, char* line) -{ - sprintf(line, "gsSPEndDisplayList(),"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_ENDDL\n"); - - TextureGenCheck(); -} - -static int32_t GfxdCallback_FormatSingleEntry() -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - gfxd_puts("\t"); - gfxd_macro_dflt(); - gfxd_puts(","); - - auto macroId = gfxd_macro_id(); - - switch (macroId) - { - case gfxd_SP1Triangle: - case gfxd_SP2Triangles: - if (self->lastTexture != nullptr && self->lastTexture->IsColorIndexed() && - !self->lastTexture->HasTlut()) - { - auto tex = self->lastTexture; - auto tlut = self->lastTlut; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - if (tlut != nullptr) - printf("CI texture '%s' (0x%X), TLUT: '%s' (0x%X)\n", tex->GetName().c_str(), - tex->GetRawDataIndex(), tlut->GetName().c_str(), - tlut->GetRawDataIndex()); - else - printf("CI texture '%s' (0x%X), TLUT: null\n", tex->GetName().c_str(), - tex->GetRawDataIndex()); - } - - if (tlut != nullptr && !tex->HasTlut()) - tex->SetTlut(tlut); - } - break; - } - - // dont print a new line after the last command - switch (macroId) - { - case gfxd_SPEndDisplayList: - case gfxd_SPBranchList: - break; - - default: - gfxd_puts("\n"); - break; - } - - return 0; -} - -static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t vtxOffset = Seg2Filespace(seg, self->parent->baseAddress); - - if (GETSEGNUM(seg) == self->parent->segment) - { - Declaration* decl; - - // Check for vertex intersections from other display lists - // TODO: These two could probably be condenced to one... - decl = self->parent->GetDeclarationRanged(vtxOffset + (count * 16)); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxOffset; - - if (diff > 0) - count = diff / 16; - else - count = 0; - } - - decl = self->parent->GetDeclarationRanged(vtxOffset); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxOffset; - - if (diff > 0) - count = diff / 16; - else - count = 0; - } - - if (count > 0) - { - std::vector vtxList; - vtxList.reserve(count); - - uint32_t currentPtr = vtxOffset; - for (int32_t i = 0; i < count; i++) - { - ZVtx vtx(self->parent); - vtx.ExtractFromFile(currentPtr); - - vtxList.push_back(vtx); - currentPtr += 16; - } - self->vertices[vtxOffset] = vtxList; - } - } - - self->references.push_back(seg); - - if (!Globals::Instance->otrMode) - gfxd_puts("@r"); - - return 1; -} - -static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int32_t width, - int32_t height, [[maybe_unused]] int32_t pal) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t texOffset = Seg2Filespace(seg, self->parent->baseAddress); - - self->lastTexWidth = width; - self->lastTexHeight = height; - self->lastTexAddr = texOffset; - self->lastTexSeg = seg; - self->lastTexFmt = static_cast(fmt); - self->lastTexSiz = static_cast(siz); - self->lastTexLoaded = true; - self->lastTexIsPalette = false; - - self->TextureGenCheck(); - - std::string texName; - Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", texName, self->parent->workerID); - - gfxd_puts(texName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_Palette(uint32_t seg, [[maybe_unused]] int32_t idx, int32_t count) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t palOffset = Seg2Filespace(seg, self->parent->baseAddress); - - self->lastTexWidth = sqrt(count); - self->lastTexHeight = sqrt(count); - self->lastTexAddr = palOffset; - self->lastTexSeg = seg; - self->lastTexSiz = F3DZEXTexSizes::G_IM_SIZ_16b; - self->lastTexFmt = F3DZEXTexFormats::G_IM_FMT_RGBA; - self->lastTexLoaded = true; - self->lastTexIsPalette = true; - - self->TextureGenCheck(); - - std::string palName; - Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", palName, self->parent->workerID); - - gfxd_puts(palName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_DisplayList(uint32_t seg) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t dListOffset = GETSEGOFFSET(seg); - uint32_t dListSegNum = GETSEGNUM(seg); - - std::string dListName = ""; - bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Gfx", dListName, - self->parent->workerID); - - if (!addressFound && self->parent->segment == dListSegNum) - { - ZDisplayList* newDList = new ZDisplayList(self->parent); - newDList->ExtractFromBinary( - dListOffset, - self->GetDListLength(self->parent->GetRawData(), dListOffset, self->dListType)); - newDList->SetName(newDList->GetDefaultName(self->parent->GetName())); - self->otherDLists.push_back(newDList); - dListName = newDList->GetName(); - } - - gfxd_puts(dListName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_Matrix(uint32_t seg) -{ - std::string mtxName; - ZDisplayList* self = static_cast(gfxd_udata_get()); - - bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Mtx", mtxName, - self->parent->workerID); - if (!addressFound && GETSEGNUM(seg) == self->parent->segment) - { - Declaration* decl = - self->parent->GetDeclaration(Seg2Filespace(seg, self->parent->baseAddress)); - if (decl == nullptr) - { - ZMtx* mtx = new ZMtx(self->parent); - mtx->SetName(mtx->GetDefaultName(self->GetName())); - mtx->ExtractFromFile(Seg2Filespace(seg, self->parent->baseAddress)); - mtx->DeclareVar(self->GetName(), ""); - - mtx->GetSourceOutputCode(self->GetName()); - self->mtxList.push_back(*mtx); - self->parent->resources.push_back(mtx); - mtxName = "&" + mtx->GetName(); - } - } - - gfxd_puts(mtxName.c_str()); - - return 1; -} - -void ZDisplayList::DeclareReferences(const std::string& prefix) -{ - std::string sourceOutput; - - if (Globals::Instance->useLegacyZDList) - sourceOutput += ProcessLegacy(prefix); - else - sourceOutput += ProcessGfxDis(prefix); - - // Iterate through our vertex lists, connect intersecting lists. - if (vertices.size() > 0) - { - std::vector>> verticesSorted(vertices.begin(), - vertices.end()); - - for (size_t i = 0; i < verticesSorted.size() - 1; i++) - { - size_t vtxSize = vertices[verticesSorted[i].first].size() * 16; - - if ((verticesSorted[i].first + vtxSize) > verticesSorted[i + 1].first) - { - int32_t intersectAmt = - (verticesSorted[i].first + vtxSize) - verticesSorted[i + 1].first; - int32_t intersectIndex = intersectAmt / 16; - - for (size_t j = intersectIndex; j < verticesSorted[i + 1].second.size(); j++) - vertices[verticesSorted[i].first].push_back(verticesSorted[i + 1].second[j]); - - vertices.erase(verticesSorted[i + 1].first); - verticesSorted.erase(verticesSorted.begin() + i + 1); - - i--; - } - } - - // Generate Vertex Declarations - for (auto& item : vertices) - { - std::string declaration = ""; - - offset_t curAddr = item.first; - auto& firstVtx = item.second.at(0); - - for (auto vtx : item.second) - declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str()); - - Declaration* decl = parent->AddDeclarationArray( - curAddr, firstVtx.GetDeclarationAlignment(), - item.second.size() * firstVtx.GetRawDataSize(), firstVtx.GetSourceTypeName(), - firstVtx.GetDefaultName(name), item.second.size(), declaration); - - /*for (auto vtx : item.second) - { - ZVtx* nVtx = new ZVtx(vtx.parent); - nVtx->x = vtx.x; - nVtx->y = vtx.y; - nVtx->z = vtx.z; - nVtx->flag = vtx.flag; - nVtx->s = vtx.s; - nVtx->t = vtx.t; - nVtx->r = vtx.r; - nVtx->g = vtx.g; - nVtx->b = vtx.b; - nVtx->a = vtx.a; - decl->vertexHack.push_back(nVtx); - }*/ - - decl->isExternal = true; - } - } - - Declaration* decl = DeclareVar("", sourceOutput); - decl->references = references; - - // Iterate through our vertex lists, connect intersecting lists. - if (vertices.size() > 0) - { - std::vector>> verticesSorted(vertices.begin(), - vertices.end()); - - for (size_t i = 0; i < verticesSorted.size() - 1; i++) - { - // int32_t vtxSize = verticesSorted[i].second.size() * 16; - size_t vtxSize = vertices[verticesSorted[i].first].size() * 16; - - if ((verticesSorted[i].first + vtxSize) > verticesSorted[i + 1].first) - { - int32_t intersectAmt = - (verticesSorted[i].first + vtxSize) - verticesSorted[i + 1].first; - int32_t intersectIndex = intersectAmt / 16; - - for (size_t j = intersectIndex; j < verticesSorted[i + 1].second.size(); j++) - vertices[verticesSorted[i].first].push_back(verticesSorted[i + 1].second[j]); - - vertices.erase(verticesSorted[i + 1].first); - verticesSorted.erase(verticesSorted.begin() + i + 1); - - i--; - } - } - - // Generate Vertex Declarations - std::vector vtxKeys; - vtxKeys.reserve(vertices.size()); - for (auto& item : vertices) - vtxKeys.push_back(item.first); - - // for (pair> item : vertices) - for (size_t i = 0; i < vtxKeys.size(); i++) - { - auto& item = vertices[vtxKeys[i]]; - - //std::string declaration; - - //for (auto& vtx : item) - //declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str()); - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - //declaration += "\n"; - - if (parent != nullptr) - { - std::string vtxName; - ZResource* vtxRes = parent->FindResource(vtxKeys[i]); - - if (vtxRes != nullptr) - vtxName = vtxRes->GetName(); - else - vtxName = StringHelper::Sprintf("%sVtx_%06X", prefix.c_str(), vtxKeys[i]); - - auto filepath = Globals::Instance->outputPath / vtxName; - std::string incStr = StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), "vtx"); - - Declaration* vtxDecl = parent->AddDeclarationIncludeArray( - vtxKeys[i], incStr, item.size() * 16, "Vtx", vtxName, item.size()); - vtxDecl->isExternal = true; - } - } - } -} - -std::string ZDisplayList::ProcessLegacy(const std::string& prefix) -{ - char line[4096]; - std::string sourceOutput; - - for (size_t i = 0; i < instructions.size(); i++) - { - uint8_t opcode = (uint8_t)(instructions[i] >> 56); - uint64_t data = instructions[i]; - sourceOutput += " "; - - auto start = std::chrono::steady_clock::now(); - - int32_t optimizationResult = OptimizationChecks(i, sourceOutput, prefix); - - if (optimizationResult != -1) - { - i += optimizationResult - 1; - line[0] = '\0'; - } - else - { - if (dListType == DListType::F3DZEX) - ParseF3DZEX((F3DZEXOpcode)opcode, data, i, prefix, line); - else - ParseF3DEX((F3DEXOpcode)opcode, data, prefix, line); - } - - auto end = std::chrono::steady_clock::now(); - int64_t diff = std::chrono::duration_cast(end - start).count(); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG && diff > 5) - printf("F3DOP: 0x%02X, TIME: %" PRIi64 "ms\n", opcode, diff); - - sourceOutput += line; - - if (i < instructions.size() - 1) - sourceOutput += "\n"; - } - - return sourceOutput; -} - -std::string ZDisplayList::ProcessGfxDis([[maybe_unused]] const std::string& prefix) -{ - std::string sourceOutput; - - OutputFormatter outputformatter; - int32_t dListSize = instructions.size() * sizeof(instructions[0]); - - gfxd_input_buffer(instructions.data(), dListSize); - gfxd_endian(gfxd_endian_little, sizeof(uint64_t)); // tell gfxdis what format the data is - - gfxd_macro_fn(GfxdCallback_FormatSingleEntry); // format for each command entry - gfxd_vtx_callback(GfxdCallback_Vtx); // handle vertices - gfxd_timg_callback(GfxdCallback_Texture); // handle textures - gfxd_tlut_callback(GfxdCallback_Palette); // handle palettes - gfxd_dl_callback(GfxdCallback_DisplayList); // handle child display lists - gfxd_mtx_callback(GfxdCallback_Matrix); // handle matrices - gfxd_output_callback( - outputformatter.StaticWriter()); // convert tabs to 4 spaces and enforce 120 line limit - - gfxd_enable(gfxd_emit_dec_color); // use decimal for colors - - // set microcode. see gfxd.h for more options. - if (dListType == DListType::F3DZEX) - gfxd_target(gfxd_f3dex2); - else - gfxd_target(gfxd_f3dex); - - gfxd_udata_set(this); - gfxd_execute(); // generate display list - sourceOutput += outputformatter.GetOutput(); // write formatted display list - - return sourceOutput; -} - -void ZDisplayList::TextureGenCheck() -{ - if (TextureGenCheck(lastTexWidth, lastTexHeight, lastTexAddr, lastTexSeg, lastTexFmt, - lastTexSiz, lastTexLoaded, lastTexIsPalette, this)) - { - lastTexAddr = 0; - lastTexLoaded = false; - lastTexIsPalette = false; - } -} - -bool ZDisplayList::TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t texAddr, - uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, - bool texLoaded, bool texIsPalette, ZDisplayList* self) -{ - uint32_t segmentNumber = GETSEGNUM(texSeg); - - if (!texIsPalette) - self->lastTexture = nullptr; - else - self->lastTlut = nullptr; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck seg=%i width=%i height=%i ispal=%i addr=0x%06X\n", segmentNumber, - texWidth, texHeight, texIsPalette, texAddr); - - if ((texSeg != 0 || texAddr != 0) && texWidth > 0 && texHeight > 0 && texLoaded && - Globals::Instance->HasSegment(segmentNumber, self->parent->workerID)) - { - ZFile* auxParent = nullptr; - if (segmentNumber == self->parent->segment) - { - auxParent = self->parent; - } - else - { - // Try to find a non-external file (i.e., one we are actually extracting) - // which has the same segment number we are looking for. - auto segs = Globals::Instance->GetSegmentRefFiles(self->parent->workerID); - for (auto& otherFile : segs[segmentNumber]) - { - if (!otherFile->isExternalFile) - { - auxParent = otherFile; - } - } - } - - if (auxParent == nullptr) - { - // We can't declare the texture in any of the files we are extracting. - return false; - } - - if (auxParent->IsOffsetInFileRange(texAddr)) - { - ZTexture* tex = auxParent->GetTextureResource(texAddr); - if (tex != nullptr) - tex->isPalette = texIsPalette; - else - { - tex = new ZTexture(auxParent); - tex->ExtractFromBinary(texAddr, texWidth, texHeight, - TexFormatToTexType(texFmt, texSiz), texIsPalette); - auxParent->AddTextureResource(texAddr, tex); - } - - if (!texIsPalette) - self->lastTexture = tex; - else - self->lastTlut = tex; - - if (auxParent->GetDeclaration(texAddr) == nullptr) - { - tex->DeclareVar(self->GetName(), ""); - } - - return true; - } - } - - return false; -} - -TextureType ZDisplayList::TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz) -{ - if (fmt == F3DZEXTexFormats::G_IM_FMT_RGBA) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::RGBA16bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_32b) - return TextureType::RGBA32bpp; - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_CI) - { - if (Globals::Instance->useLegacyZDList) - return TextureType::Palette8bpp; - else - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::Palette4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::Palette8bpp; - } - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_IA) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::GrayscaleAlpha4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::GrayscaleAlpha8bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::GrayscaleAlpha16bpp; - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_I) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::Grayscale4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::Grayscale8bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::Grayscale8bpp; - } - - return TextureType::RGBA16bpp; -} - -bool ZDisplayList::IsExternalResource() const -{ - return false; -} - -std::string ZDisplayList::GetExternalExtension() const -{ - return "dlist"; -} - -std::string ZDisplayList::GetSourceTypeName() const -{ - return "Gfx"; -} - -ZResourceType ZDisplayList::GetResourceType() const -{ - return ZResourceType::DisplayList; -} - -size_t ZDisplayList::GetRawDataSize() const -{ - return instructions.size() * 8; -} - -DeclarationAlignment ZDisplayList::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZDisplayList.h b/ZAPDTR/ZAPD/ZDisplayList.h deleted file mode 100644 index f3828cc79..000000000 --- a/ZAPDTR/ZAPD/ZDisplayList.h +++ /dev/null @@ -1,262 +0,0 @@ -#pragma once - -#include "ZMtx.h" -#include "ZResource.h" -#include "ZRoom/ZRoom.h" -#include "ZTexture.h" -#include "ZVtx.h" -#include "tinyxml2.h" - -#include -#include -#include - -enum class F3DEXOpcode -{ - G_SPNOOP = 0x00, - G_MTX = 0x01, - G_MOVEMEM = 0x03, - G_VTX = 0x04, - G_DL = 0x06, - G_LOAD_UCODE = 0xAF, - G_BRANCH_Z = 0xB0, - G_TRI2 = 0xB1, - G_MODIFYVTX = 0xB2, - G_RDPHALF_2 = 0xB3, - G_RDPHALF_1 = 0xB4, - G_QUAD = 0xB5, - G_CLEARGEOMETRYMODE = 0xB6, - G_SETGEOMETRYMODE = 0xB7, - G_ENDDL = 0xB8, - G_SETOTHERMODE_L = 0xB9, - G_SETOTHERMODE_H = 0xBA, - G_TEXTURE = 0xBB, - G_MOVEWORD = 0xBC, - G_POPMTX = 0xBD, - G_CULLDL = 0xBE, - G_TRI1 = 0xBF, - G_NOOP = 0xC0, - G_TEXRECT = 0xE4, - G_TEXRECTFLIP = 0xE5, - G_RDPLOADSYNC = 0xE6, - G_RDPPIPESYNC = 0xE7, - G_RDPTILESYNC = 0xE8, - G_RDPFULLSYNC = 0xE9, - G_SETKEYGB = 0xEA, - G_SETKEYR = 0xEB, - G_SETCONVERT = 0xEC, - G_SETSCISSOR = 0xED, - G_SETPRIMDEPTH = 0xEE, - G_RDPSETOTHERMODE = 0xEF, - G_LOADTLUT = 0xF0, - G_SETTILESIZE = 0xF2, - G_LOADBLOCK = 0xF3, - G_LOADTILE = 0xF4, - G_SETTILE = 0xF5, - G_FILLRECT = 0xF6, - G_SETFILLCOLOR = 0xF7, - G_SETFOGCOLOR = 0xF8, - G_SETBLENDCOLOR = 0xF9, - G_SETPRIMCOLOR = 0xFA, - G_SETENVCOLOR = 0xFB, - G_SETCOMBINE = 0xFC, - G_SETTIMG = 0xFD, - G_SETZIMG = 0xFE, - G_SETCIMG = 0xFF -}; - -enum class F3DZEXOpcode -{ - G_NOOP = 0x00, - G_VTX = 0x01, - G_MODIFYVTX = 0x02, - G_CULLDL = 0x03, - G_BRANCH_Z = 0x04, - G_TRI1 = 0x05, - G_TRI2 = 0x06, - G_QUAD = 0x07, - G_SPECIAL_3 = 0xD3, - G_SPECIAL_2 = 0xD4, - G_SPECIAL_1 = 0xD5, - G_DMA_IO = 0xD6, - G_TEXTURE = 0xD7, - G_POPMTX = 0xD8, - G_GEOMETRYMODE = 0xD9, - G_MTX = 0xDA, - G_MOVEWORD = 0xDB, - G_MOVEMEM = 0xDC, - G_LOAD_UCODE = 0xDD, - G_DL = 0xDE, - G_ENDDL = 0xDF, - G_SPNOOP = 0xE0, - G_RDPHALF_1 = 0xE1, - G_SETOTHERMODE_L = 0xE2, - G_SETOTHERMODE_H = 0xE3, - G_TEXRECT = 0xE4, - G_TEXRECTFLIP = 0xE5, - G_RDPLOADSYNC = 0xE6, - G_RDPPIPESYNC = 0xE7, - G_RDPTILESYNC = 0xE8, - G_RDPFULLSYNC = 0xE9, - G_SETKEYGB = 0xEA, - G_SETKEYR = 0xEB, - G_SETCONVERT = 0xEC, - G_SETSCISSOR = 0xED, - G_SETPRIMDEPTH = 0xEE, - G_RDPSETOTHERMODE = 0xEF, - G_LOADTLUT = 0xF0, - G_RDPHALF_2 = 0xF1, - G_SETTILESIZE = 0xF2, - G_LOADBLOCK = 0xF3, - G_LOADTILE = 0xF4, - G_SETTILE = 0xF5, - G_FILLRECT = 0xF6, - G_SETFILLCOLOR = 0xF7, - G_SETFOGCOLOR = 0xF8, - G_SETBLENDCOLOR = 0xF9, - G_SETPRIMCOLOR = 0xFA, - G_SETENVCOLOR = 0xFB, - G_SETCOMBINE = 0xFC, - G_SETTIMG = 0xFD, - G_SETZIMG = 0xFE, - G_SETCIMG = 0xFF, -}; - -enum class F3DZEXTexFormats -{ - G_IM_FMT_RGBA, - G_IM_FMT_YUV, - G_IM_FMT_CI, - G_IM_FMT_IA, - G_IM_FMT_I -}; - -enum class F3DZEXTexSizes -{ - G_IM_SIZ_4b, - G_IM_SIZ_8b, - G_IM_SIZ_16b, - G_IM_SIZ_32b -}; - -enum class DListType -{ - F3DZEX, - F3DEX, -}; - -enum class OoTSegments -{ - DirectReference = 0, - TitleStatic = 1, - Scene = 2, - Room = 3, - GameplayKeep = 4, - FieldDungeonKeep = 5, - Object = 6, - LinkAnimation = 7, - IconItemStatic = 8, - IconItem24Static = 9, - Unknown10 = 10, - Unknown11 = 11, - Unknown12 = 12, - IconFieldDungeonStatic = 13, - IconItemLanguageStatic = 14, - ZBuffer = 15, - FrameBuffer = 16, -}; - - -class ZDisplayList : public ZResource -{ -protected: - static TextureType TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz); - - void ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, const std::string& prefix, - char* line); - void ParseF3DEX(F3DEXOpcode opcode, uint64_t data, const std::string& prefix, char* line); - - // Various Instruction Optimizations - bool SequenceCheck(std::vector sequence, int32_t startIndex); - int32_t OptimizationChecks(int32_t startIndex, std::string& output, const std::string& prefix); - int32_t OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, - const std::string& prefix); - // int32_t OptimizationCheck_LoadMultiBlock(int32_t startIndex, std::string& output, std::string - // prefix); - - // F3DEX Specific Opcode Values - void Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, char* line); - - // Shared Opcodes between F3DZEX and F3DEX - void Opcode_G_DL(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_MODIFYVTX(uint64_t data, char* line); - void Opcode_G_CULLDL(uint64_t data, char* line); - void Opcode_G_TRI1(uint64_t data, char* line); - void Opcode_G_TRI2(uint64_t data, char* line); - void Opcode_G_MTX(uint64_t data, char* line); - void Opcode_G_VTX(uint64_t data, char* line); - void Opcode_G_TEXTURE(uint64_t data, char* line); - void Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_SETTILE(uint64_t data, char* line); - void Opcode_G_SETTILESIZE(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_LOADBLOCK(uint64_t data, char* line); - void Opcode_G_SETCOMBINE(uint64_t data, char* line); - void Opcode_G_SETPRIMCOLOR(uint64_t data, char* line); - void Opcode_G_SETOTHERMODE_L(uint64_t data, char* line); - void Opcode_G_SETOTHERMODE_H(uint64_t data, char* line); - void Opcode_G_LOADTLUT(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_ENDDL(const std::string& prefix, char* line); - -public: - std::vector instructions; - - int32_t lastTexWidth, lastTexHeight, lastTexAddr, lastTexSeg; - F3DZEXTexFormats lastTexFmt; - F3DZEXTexSizes lastTexSiz, lastTexSizTest, lastCISiz; - bool lastTexLoaded; - bool lastTexIsPalette; - - DListType dListType; - - std::map> vertices; - std::vector otherDLists; - - ZTexture* lastTexture = nullptr; - ZTexture* lastTlut = nullptr; - - std::vector references; - std::vector mtxList; - - ZDisplayList(ZFile* nParent); - ~ZDisplayList(); - - void ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) override; - void ExtractFromBinary(uint32_t nRawDataIndex, int32_t rawDataSize); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetDefaultName(const std::string& prefix) const override; - - void TextureGenCheck(); - static bool TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t texAddr, - uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, - bool texLoaded, bool texIsPalette, ZDisplayList* self); - static int32_t GetDListLength(const std::vector& rawData, uint32_t rawDataIndex, - DListType dListType); - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - void DeclareReferences(const std::string& prefix) override; - std::string ProcessLegacy(const std::string& prefix); - std::string ProcessGfxDis(const std::string& prefix); - - bool IsExternalResource() const override; - std::string GetExternalExtension() const override; - std::string GetSourceTypeName() const override; - - ZResourceType GetResourceType() const override; - -protected: - size_t numInstructions; -}; diff --git a/ZAPDTR/ZAPD/ZFile.cpp b/ZAPDTR/ZAPD/ZFile.cpp deleted file mode 100644 index 04032e575..000000000 --- a/ZAPDTR/ZAPD/ZFile.cpp +++ /dev/null @@ -1,1429 +0,0 @@ -#include "ZFile.h" - -#include -#include -#include -#include - -#include "Globals.h" -#include "OutputFormatter.h" -#include "Utils/BinaryWriter.h" -#include "Utils/BitConverter.h" -#include "Utils/Directory.h" -#include -#include "Utils/MemoryStream.h" -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZAnimation.h" -#include "ZArray.h" -#include "ZBackground.h" -#include "ZBlob.h" -#include "ZCollision.h" -#include "ZCutscene.h" -#include "ZDisplayList.h" -#include "ZLimb.h" -#include "ZMtx.h" -#include "ZRoom/ZRoom.h" -#include "ZScalar.h" -#include "ZSkeleton.h" -#include "ZSymbol.h" -#include "ZTexture.h" -#include "ZVector.h" -#include "ZVtx.h" - -ZFile::ZFile() -{ - resources = std::vector(); - basePath = ""; - declarations = std::map(); - defines = ""; - baseAddress = 0; - rangeStart = 0x000000000; - rangeEnd = 0xFFFFFFFF; - workerID = 0; -} - -ZFile::ZFile(const fs::path& nOutPath, const std::string& nName) : ZFile() -{ - name = nName; - outName = nName; - outputPath = nOutPath; -} - -ZFile::ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath, - const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID) - : ZFile() -{ - xmlFilePath = nXmlFilePath; - if (nBasePath == "") - basePath = Directory::GetCurrentDirectory(); - else - basePath = nBasePath; - - if (nOutPath == "") - outputPath = Directory::GetCurrentDirectory(); - else - outputPath = nOutPath; - - mode = nMode; - workerID = nWorkerID; - - ParseXML(reader, filename); - if (mode != ZFileMode::ExternalFile) - DeclareResourceSubReferences(); -} - -ZFile::~ZFile() -{ - for (ZResource* res : resources) - delete res; - - for (auto d : declarations) - delete d.second; - - for (auto sym : symbolResources) - delete sym.second; -} - -void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename) -{ - assert(mode != ZFileMode::Invalid); - - if (filename == "") - name = reader->Attribute("Name"); - else - name = filename; - - outName = name; - const char* outNameXml = reader->Attribute("OutName"); - if (outNameXml != nullptr) - outName = outNameXml; - - // TODO: This should be a variable on the ZFile, but it is a large change in order to force all - // ZResource types to have a parent ZFile. - const char* gameStr = reader->Attribute("Game"); - if (reader->Attribute("Game") != nullptr) - { - if (std::string_view(gameStr) == "MM") - Globals::Instance->game = ZGame::MM_RETAIL; - else if (std::string_view(gameStr) == "SW97" || std::string_view(gameStr) == "OOTSW97") - Globals::Instance->game = ZGame::OOT_SW97; - else if (std::string_view(gameStr) == "OOT") - Globals::Instance->game = ZGame::OOT_RETAIL; - else - { - std::string errorHeader = - StringHelper::Sprintf("'Game' type '%s' is not supported.", gameStr); - HANDLE_ERROR_PROCESS(WarningType::InvalidAttributeValue, errorHeader, ""); - } - } - - if (reader->Attribute("BaseAddress") != nullptr) - baseAddress = StringHelper::StrToL(reader->Attribute("BaseAddress"), 16); - - if (reader->Attribute("RangeStart") != nullptr) - rangeStart = StringHelper::StrToL(reader->Attribute("RangeStart"), 16); - - if (reader->Attribute("RangeEnd") != nullptr) - rangeEnd = StringHelper::StrToL(reader->Attribute("RangeEnd"), 16); - - if (reader->Attribute("Compilable") != nullptr) - isCompilable = true; - - if (rangeStart > rangeEnd) - HANDLE_ERROR_PROCESS( - WarningType::Always, - StringHelper::Sprintf("'RangeStart' 0x%06X must be before 'RangeEnd' 0x%06X", - rangeStart, rangeEnd), - ""); - - const char* segmentXml = reader->Attribute("Segment"); - if (segmentXml != nullptr) - { - if (!StringHelper::HasOnlyDigits(segmentXml)) - { - HANDLE_ERROR_PROCESS(WarningType::Always, - StringHelper::Sprintf("error: Invalid segment value '%s': must be " - "a decimal between 0 and 15 inclusive", - segmentXml), - ""); - } - - segment = StringHelper::StrToL(segmentXml, 10); - if (segment > 15) - { - if (segment == 128) - { -#ifdef DEPRECATION_ON - HANDLE_WARNING_PROCESS( - WarningType::Always, "warning: segment 128 is deprecated.", - "Remove 'Segment=\"128\"' from the xml to use virtual addresses\n"); -#endif - } - else - { - HANDLE_ERROR_PROCESS( - WarningType::Always, - StringHelper::Sprintf("error: invalid segment value '%s': must be a decimal " - "number between 0 and 15 inclusive", - segmentXml), - ""); - } - } - } - Globals::Instance->AddSegment(segment, this, workerID); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - if (segment == 0x80) - { - printf("File '%s' using virtual addresses.\n", GetName().c_str()); - } - else - { - printf("File '%s' using segment %X.\n", GetName().c_str(), segment); - } - } - - if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || mode == ZFileMode::ExtractDirectory) - { - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - { - if (!DiskFile::Exists((basePath / name).string())) - { - std::string errorHeader = StringHelper::Sprintf("binary file '%s' does not exist.", - (basePath / name).c_str()); - HANDLE_ERROR_PROCESS(WarningType::Always, errorHeader, ""); - } - } - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - rawData = Globals::Instance->GetBaseromFile(name); - else - rawData = Globals::Instance->GetBaseromFile((basePath / name).string()); - - if (reader->Attribute("RangeEnd") == nullptr) - rangeEnd = rawData.size(); - } - - std::unordered_set nameSet; - std::unordered_set outNameSet; - std::unordered_set offsetSet; - - auto nodeMap = *GetNodeMap(); - uint32_t rawDataIndex = 0; - - for (tinyxml2::XMLElement* child = reader->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - const char* nameXml = child->Attribute("Name"); - const char* outNameXml = child->Attribute("OutName"); - const char* offsetXml = child->Attribute("Offset"); - - // Check for repeated attributes. - if (offsetXml != nullptr) - { - if (!StringHelper::IsValidOffset(std::string_view(offsetXml))) - { - HANDLE_ERROR(WarningType::InvalidXML, - StringHelper::Sprintf("Invalid offset %s entered", offsetXml), ""); - } - rawDataIndex = strtol(offsetXml, NULL, 16); - - if (offsetSet.find(offsetXml) != offsetSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'Offset' attribute: %s", offsetXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - offsetSet.insert(offsetXml); - } - else - { - HANDLE_WARNING_RESOURCE(WarningType::MissingOffsets, this, nullptr, rawDataIndex, - StringHelper::Sprintf("no offset specified for %s.", nameXml), - ""); - } - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("%s: 0x%06X\n", nameXml, rawDataIndex); - - if (outNameXml != nullptr) - { - if (outNameSet.find(outNameXml) != outNameSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'OutName' attribute: %s", outNameXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - outNameSet.insert(outNameXml); - } - if (nameXml != nullptr) - { - if (nameSet.find(nameXml) != nameSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'Name' attribute: %s", nameXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - nameSet.insert(nameXml); - } - - std::string nodeName = std::string(child->Name()); - - if (nodeMap.find(nodeName) != nodeMap.end()) - { - ZResource* nRes = nodeMap[nodeName](this); - - if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || - mode == ZFileMode::ExtractDirectory) - { - if (!isCompilable) - nRes->ExtractFromXML(child, rawDataIndex); - } - switch (nRes->GetResourceType()) - { - case ZResourceType::Texture: - AddTextureResource(rawDataIndex, static_cast(nRes)); - break; - - case ZResourceType::Symbol: - AddSymbolResource(rawDataIndex, static_cast(nRes)); - break; - - default: - AddResource(nRes); - break; - } - - rawDataIndex += nRes->GetRawDataSize(); - } - else if (std::string_view(child->Name()) == "File") - { - std::string errorHeader = "Can't declare a inside a "; - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - else - { - std::string errorHeader = StringHelper::Sprintf( - "Unknown element found inside a element: %s", nodeName.c_str()); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - } -} - -void ZFile::DeclareResourceSubReferences() -{ - for (size_t i = 0; i < resources.size(); i++) - { - resources.at(i)->DeclareReferences(name); - } -} - -void ZFile::BuildSourceFile() -{ - if (mode == ZFileMode::ExternalFile) - return; - - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath.string()); - - GenerateSourceFiles(); -} - -std::string ZFile::GetName() const -{ - return name; -} - -std::string ZFile::GetOutName() const -{ - return outName.string(); -} - -ZFileMode ZFile::GetMode() const -{ - return mode; -} - -const fs::path& ZFile::GetXmlFilePath() const -{ - return xmlFilePath; -} - -const std::vector& ZFile::GetRawData() const -{ - return rawData; -} - -void ZFile::ExtractResources() -{ - if (mode == ZFileMode::ExternalFile) - return; - - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath.string()); - - if (!Directory::Exists(GetSourceOutputFolderPath())) - Directory::CreateDirectory(GetSourceOutputFolderPath().string()); - - for (size_t i = 0; i < resources.size(); i++) - resources[i]->ParseRawDataLate(); - for (size_t i = 0; i < resources.size(); i++) - resources[i]->DeclareReferencesLate(name); - - if (Globals::Instance->genSourceFile) - GenerateSourceFiles(); - - auto memStreamFile = std::shared_ptr(new MemoryStream()); - BinaryWriter writerFile = BinaryWriter(memStreamFile); - - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if (exporterSet != nullptr && exporterSet->beginFileFunc != nullptr) - exporterSet->beginFileFunc(this); - - int totalMs = 0; - - for (ZResource* res : resources) - { - auto start = std::chrono::steady_clock::now(); - - auto memStreamRes = std::shared_ptr(new MemoryStream()); - BinaryWriter writerRes = BinaryWriter(memStreamRes); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Saving resource %s\n", res->GetName().c_str()); - - res->Save(outputPath); - - // Check if we have an exporter "registered" for this resource type - ZResourceExporter* exporter = Globals::Instance->GetExporter(res->GetResourceType()); - if (exporter != nullptr) - { - // exporter->Save(res, Globals::Instance->outputPath.string(), &writerFile); - exporter->Save(res, Globals::Instance->outputPath.string(), &writerRes); - } - - if (exporterSet != nullptr && exporterSet->resSaveFunc != nullptr) - exporterSet->resSaveFunc(res, writerRes); - - auto end = std::chrono::steady_clock::now(); - auto diff = std::chrono::duration_cast(end - start).count(); - - totalMs += diff; - - //printf("Res %s in %lims\n", res->GetName().c_str(), diff); - } - - //printf("File %s in %lims\n", GetName().c_str(), totalMs); - - if (memStreamFile->GetLength() > 0) - { - DiskFile::WriteAllBytes(StringHelper::Sprintf("%s%s.bin", - Globals::Instance->outputPath.string().c_str(), - GetName().c_str()), - memStreamFile->ToVector()); - } - - writerFile.Close(); - - if (exporterSet != nullptr && exporterSet->endFileFunc != nullptr) - exporterSet->endFileFunc(this); -} - -void ZFile::AddResource(ZResource* res) -{ - resources.push_back(res); -} - -ZResource* ZFile::FindResource(offset_t rawDataIndex) -{ - for (ZResource* res : resources) - { - if (res->GetRawDataIndex() == rawDataIndex) - return res; - } - - return nullptr; -} - -std::vector ZFile::GetResourcesOfType(ZResourceType resType) -{ - std::vector resList; - resList.reserve(resources.size()); - - for (ZResource* res : resources) - { - if (res->GetResourceType() == resType) - resList.push_back(res); - } - - return resList; -} - -Declaration* ZFile::AddDeclaration(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, alignment, size, varType, varName, false, body); - declarations[address] = decl; - } - else - { - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - decl->text = body; - } - return decl; -} - -Declaration* ZFile::AddDeclarationArray(offset_t address, DeclarationAlignment alignment, - size_t size, const std::string& varType, - const std::string& varName, size_t arrayItemCnt, - const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = - new Declaration(address, alignment, size, varType, varName, true, arrayItemCnt, body); - declarations[address] = decl; - } - else - { - if (decl->isPlaceholder) - decl->varName = varName; - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - decl->text = body; - } - - return decl; -} - -Declaration* ZFile::AddDeclarationArray(offset_t address, DeclarationAlignment alignment, - size_t size, const std::string& varType, - const std::string& varName, - const std::string& arrayItemCntStr, const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, alignment, size, varType, varName, true, arrayItemCntStr, - body); - declarations[address] = decl; - } - else - { - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - decl->isArray = true; - decl->arrayItemCntStr = arrayItemCntStr; - decl->text = body; - } - return decl; -} - -Declaration* ZFile::AddDeclarationPlaceholder(offset_t address, const std::string& varName) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl; - if (declarations.find(address) == declarations.end()) - { - decl = new Declaration(address, DeclarationAlignment::Align4, 0, "", varName, false, ""); - decl->isPlaceholder = true; - declarations[address] = decl; - } - else - decl = declarations[address]; - - return decl; -} - -Declaration* ZFile::AddDeclarationInclude(offset_t address, const std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, includePath, size, varType, varName); - declarations[address] = decl; - } - else - { - decl->includePath = includePath; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - } - return decl; -} - -Declaration* ZFile::AddDeclarationIncludeArray(offset_t address, std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName, size_t arrayItemCnt) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - if (StringHelper::StartsWith(includePath, "assets/extracted/")) - includePath = "assets/" + StringHelper::Split(includePath, "assets/extracted/")[1]; - if (StringHelper::StartsWith(includePath, "assets/custom/")) - includePath = "assets/" + StringHelper::Split(includePath, "assets/custom/")[1]; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, includePath, size, varType, varName); - - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - - declarations[address] = decl; - } - else - { - decl->includePath = includePath; - decl->varType = varType; - decl->varName = varName; - decl->size = size; - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - } - return decl; -} - -bool ZFile::AddDeclarationChecks(uint32_t address, const std::string& varName) -{ - assert(GETSEGNUM(address) == 0); - assert(varName != ""); -#ifdef DEVELOPMENT - if (address == 0x0000) - { - [[maybe_unused]] int32_t bp = 0; - } -#endif - - if (!IsOffsetInFileRange(address)) - { - fprintf(stderr, - "%s: Warning in %s\n" - "\t Tried to declare a variable outside of this file's range. Ignoring...\n" - "\t\t Variable's name: %s\n" - "\t\t Variable's offset: 0x%06X\n", - __PRETTY_FUNCTION__, name.c_str(), varName.c_str(), address); - return false; - } - - return true; -} - -bool ZFile::GetDeclarationPtrName(segptr_t segAddress, const std::string& expectedType, - std::string& declName) const -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint32_t offset = Seg2Filespace(segAddress, baseAddress); - Declaration* decl = GetDeclaration(offset); - if (GETSEGNUM(segAddress) != segment || decl == nullptr) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - if (expectedType != "" && expectedType != "void*") - { - if (expectedType != decl->varType && "static " + expectedType != decl->varType) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - } - - if (!decl->isArray) - declName = "&" + decl->varName; - else - declName = decl->varName; - return true; -} - -bool ZFile::GetDeclarationArrayIndexedName(segptr_t segAddress, size_t elementSize, - const std::string& expectedType, - std::string& declName) const -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint32_t address = Seg2Filespace(segAddress, baseAddress); - Declaration* decl = GetDeclarationRanged(address); - if (GETSEGNUM(segAddress) != segment || decl == nullptr || !decl->isArray) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - if (expectedType != "" && expectedType != "void*") - { - if (expectedType != decl->varType && "static " + expectedType != decl->varType) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - } - - if (decl->address == address) - { - declName = decl->varName; - return true; - } - - if ((address - decl->address) % elementSize != 0 || !(address < decl->address + decl->size)) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - uint32_t index = (address - decl->address) / elementSize; - declName = StringHelper::Sprintf("&%s[%u]", decl->varName.c_str(), index); - return true; -} - -Declaration* ZFile::GetDeclaration(offset_t address) const -{ - if (declarations.find(address) != declarations.end()) - return declarations.at(address); - - return nullptr; -} - -Declaration* ZFile::GetDeclarationRanged(offset_t address) const -{ - for (const auto decl : declarations) - { - if (address >= decl.first && address < decl.first + decl.second->size) - return decl.second; - } - - return nullptr; -} - -bool ZFile::HasDeclaration(offset_t address) -{ - assert(GETSEGNUM(address) == 0); - return declarations.find(address) != declarations.end(); -} - -void ZFile::GenerateSourceFiles() -{ - std::string sourceOutput; - - sourceOutput += "#include \"ultra64.h\"\n"; - sourceOutput += "#include \"z64.h\"\n"; - sourceOutput += "#include \"macros.h\"\n"; - sourceOutput += GetHeaderInclude(); - - bool hasZRoom = false; - for (const auto& res : resources) - { - ZResourceType resType = res->GetResourceType(); - if (resType == ZResourceType::Room || resType == ZResourceType::Scene || - resType == ZResourceType::AltHeader) - { - hasZRoom = true; - break; - } - } - - if (hasZRoom) - { - sourceOutput += GetZRoomHeaderInclude(); - } - - sourceOutput += GetExternalFileHeaderInclude(); - - GeneratePlaceholderDeclarations(); - - // Generate Code - for (size_t i = 0; i < resources.size(); i++) - { - ZResource* res = resources.at(i); - res->GetSourceOutputCode(name); - } - - sourceOutput += ProcessDeclarations(); - - fs::path outPath = GetSourceOutputFolderPath() / outName.stem().concat(".c"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Writing C file: %s\n", outPath.c_str()); - - if (!Globals::Instance->otrMode) - { - OutputFormatter formatter; - formatter.Write(sourceOutput); - - DiskFile::WriteAllText(outPath, formatter.GetOutput()); - } - - GenerateSourceHeaderFiles(); -} - -void ZFile::GenerateSourceHeaderFiles() -{ - OutputFormatter formatter; - // Use parent folder and output name as guard as some headers have the same output name - std::string guard = xmlFilePath.parent_path().stem().string() + "_" + outName.stem().string(); - - std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper); - formatter.Write( - StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", guard.c_str(), guard.c_str())); - formatter.Write("#include \"align_asset_macro.h\"\n"); - - std::set nameSet; - for (ZResource* res : resources) - { - std::string resSrc = res->GetSourceOutputHeader("", &nameSet); - if (!resSrc.empty()) - { - formatter.Write(resSrc.front() == '\n' ? resSrc : "\n" + resSrc); - formatter.Write(res == resources.back() ? "" : "\n"); - } - } - - for (auto& sym : symbolResources) - { - formatter.Write("\n\n"); - formatter.Write(sym.second->GetSourceOutputHeader("", &nameSet)); - } - - formatter.Write(ProcessExterns()); - - formatter.Write(StringHelper::Sprintf("\n#endif // %s_H\n", guard.c_str())); - - fs::path headerFilename = GetSourceOutputFolderPath() / outName.stem().concat(".h"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Writing H file: %s\n", headerFilename.c_str()); - - std::string output = formatter.GetOutput(); - - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - DiskFile::WriteAllText(headerFilename, output); - else if (Globals::Instance->sourceOutputPath != "") - { - std::string xmlPath = xmlFilePath.string(); - xmlPath = StringHelper::Replace(xmlPath, "\\", "/"); - auto pathList = StringHelper::Split(xmlPath, "/"); - std::string outPath = ""; - - for (int i = 0; i < 3; i++) - outPath += pathList[i] + "/"; - - for (int i = 5; i < pathList.size(); i++) - { - if (i == pathList.size() - 1) - { - outPath += Path::GetFileNameWithoutExtension(pathList[i]) + "/"; - outPath += outName.string() + ".h"; - } - else - outPath += pathList[i]; - - if (i < pathList.size() - 1) - outPath += "/"; - } - - DiskFile::WriteAllText(outPath, output); - } -} - -std::string ZFile::GetHeaderInclude() const -{ - std::string headers = StringHelper::Sprintf("#include \"%s.h\"\n", - (outName.parent_path() / outName.stem()).string().c_str()); - - return headers; -} - -std::string ZFile::GetZRoomHeaderInclude() const -{ - std::string headers; - headers += "#include \"segment_symbols.h\"\n"; - headers += "#include \"command_macros_base.h\"\n"; - headers += "#include \"z64cutscene_commands.h\"\n"; - headers += "#include \"variables.h\"\n"; - return headers; -} - -std::string ZFile::GetExternalFileHeaderInclude() const -{ - std::string externalFilesIncludes = ""; - - for (ZFile* externalFile : Globals::Instance->files) - { - if (externalFile != this) - { - fs::path outputFolderPath = externalFile->GetSourceOutputFolderPath(); - if (outputFolderPath == this->GetSourceOutputFolderPath()) - { - outputFolderPath = externalFile->outName.stem(); - } - else - { - outputFolderPath /= externalFile->outName.stem(); - } - - externalFilesIncludes += - StringHelper::Sprintf("#include \"%s.h\"\n", outputFolderPath.string().c_str()); - } - } - - return externalFilesIncludes; -} - -void ZFile::GeneratePlaceholderDeclarations() -{ - // Generate placeholder declarations - for (ZResource* res : resources) - { - if (GetDeclaration(res->GetRawDataIndex()) != nullptr) - { - continue; - } - - Declaration* decl = res->DeclareVar(GetName(), ""); - - if (decl != nullptr) - { - decl->staticConf = res->GetStaticConf(); - if (res->GetResourceType() == ZResourceType::Symbol) - { - decl->staticConf = StaticConfig::Off; - } - } - } -} - -void ZFile::AddTextureResource(uint32_t offset, ZTexture* tex) -{ - for (auto res : resources) - assert(res->GetRawDataIndex() != offset); - - resources.push_back(tex); - texturesResources[offset] = tex; -} - -ZTexture* ZFile::GetTextureResource(uint32_t offset) const -{ - auto tex = texturesResources.find(offset); - if (tex != texturesResources.end()) - return tex->second; - - return nullptr; -} - -void ZFile::AddSymbolResource(uint32_t offset, ZSymbol* sym) -{ - symbolResources[offset] = sym; -} - -ZSymbol* ZFile::GetSymbolResource(uint32_t offset) const -{ - auto sym = symbolResources.find(offset); - if (sym != symbolResources.end()) - return sym->second; - - return nullptr; -} - -ZSymbol* ZFile::GetSymbolResourceRanged(uint32_t offset) const -{ - for (const auto decl : symbolResources) - { - if (offset >= decl.first && offset < decl.first + decl.second->GetRawDataSize()) - return decl.second; - } - - return nullptr; -} - -fs::path ZFile::GetSourceOutputFolderPath() const -{ - return outputPath / outName.parent_path(); -} - -bool ZFile::IsOffsetInFileRange(uint32_t offset) const -{ - if (!(offset < rawData.size())) - return false; - - return rangeStart <= offset && offset < rangeEnd; -} -bool ZFile::IsSegmentedInFilespaceRange(segptr_t segAddress) const -{ - uint8_t segnum = GETSEGNUM(segAddress); - uint32_t offset = Seg2Filespace(segAddress, baseAddress); - - if (segment != segnum) - return false; - - return IsOffsetInFileRange(offset); -} - -std::map* ZFile::GetNodeMap() -{ - static std::map nodeMap; - return &nodeMap; -} - -void ZFile::RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc) -{ - std::map* nodeMap = GetNodeMap(); - (*nodeMap)[nodeName] = nodeFunc; -} - -std::string ZFile::ProcessDeclarations() -{ - std::string output; - - if (declarations.size() == 0) - return output; - - defines += ProcessTextureIntersections(name); - - // printf("RANGE START: 0x%06X - RANGE END: 0x%06X\n", rangeStart, rangeEnd); - - // Optimization: See if there are any arrays side by side that can be merged... - std::vector> declarationKeys(declarations.begin(), - declarations.end()); - - std::pair lastItem = declarationKeys.at(0); - - for (size_t i = 1; i < declarationKeys.size(); i++) - { - std::pair curItem = declarationKeys[i]; - - if (curItem.second->isArray && lastItem.second->isArray) - { - if (curItem.second->varType == lastItem.second->varType) - { - if (!curItem.second->declaredInXml && !lastItem.second->declaredInXml) - { - // TEST: For now just do Vtx declarations... - if (lastItem.second->varType == "Vtx") - { - int32_t sizeDiff = curItem.first - (lastItem.first + lastItem.second->size); - - // Make sure there isn't an unaccounted inbetween these two - if (sizeDiff == 0) - { - lastItem.second->size += curItem.second->size; - lastItem.second->arrayItemCnt += curItem.second->arrayItemCnt; - lastItem.second->text += "\n" + curItem.second->text; - - for (auto vtx : curItem.second->vertexHack) - lastItem.second->vertexHack.push_back(vtx); - - declarations.erase(curItem.first); - declarationKeys.erase(declarationKeys.begin() + i); - delete curItem.second; - i--; - continue; - } - } - } - } - } - - lastItem = curItem; - } - - for (std::pair item : declarations) - ProcessDeclarationText(item.second); - - for (std::pair item : declarations) - { - while (item.second->size % 4 != 0) - item.second->size++; - } - - HandleUnaccountedData(); - - // Go through include declarations - // First, handle the prototypes (static only for now) - for (std::pair item : declarations) - { - output += item.second->GetStaticForwardDeclarationStr(); - } - - output += "\n"; - - // Next, output the actual declarations - for (const auto& item : declarations) - { - if (!IsOffsetInFileRange(item.first)) - continue; - - if (item.second->includePath != "") - { - if (item.second->isExternal) - { - if (!Globals::Instance->otrMode) - { - // HACK - std::string extType; - - if (item.second->varType == "Gfx") - extType = "dlist"; - else if (item.second->varType == "Vtx") - extType = "vtx"; - - auto filepath = outputPath / item.second->varName; - DiskFile::WriteAllText( - StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), extType.c_str()), - item.second->text); - } - } - - output += item.second->GetExternalDeclarationStr(); - } - else if (item.second->varType != "") - { - output += item.second->GetNormalDeclarationStr(); - } - } - - return output; -} - -void ZFile::ProcessDeclarationText(Declaration* decl) -{ - size_t refIndex = 0; - - if (!(decl->references.size() > 0)) - return; - - for (size_t i = 0; i < decl->text.size() - 1; i++) - { - char c = decl->text[i]; - char c2 = decl->text[i + 1]; - - if (c == '@' && c2 == 'r') - { - std::string vtxName; - Globals::Instance->GetSegmentedArrayIndexedName(decl->references[refIndex], 0x10, this, - "Vtx", vtxName, workerID); - decl->text.replace(i, 2, vtxName); - - refIndex++; - - if (refIndex >= decl->references.size()) - break; - } - } -} - -std::string ZFile::ProcessExterns() -{ - std::string output; - - for (const auto& item : declarations) - { - if (!IsOffsetInFileRange(item.first)) - { - continue; - } - - output += item.second->GetExternStr(); - } - - output += "\n"; - - output += defines; - - return output; -} - -std::string ZFile::ProcessTextureIntersections([[maybe_unused]] const std::string& prefix) -{ - if (texturesResources.empty()) - return ""; - - std::string defines; - std::vector> texturesSorted(texturesResources.begin(), - texturesResources.end()); - - for (size_t i = 0; i < texturesSorted.size() - 1; i++) - { - uint32_t currentOffset = texturesSorted[i].first; - uint32_t nextOffset = texturesSorted[i + 1].first; - auto& currentTex = texturesResources.at(currentOffset); - int texSize = currentTex->GetRawDataSize(); - - if (currentTex->WasDeclaredInXml()) - { - // We believe the user is right. - continue; - } - - if ((currentOffset + texSize) > nextOffset) - { - uint32_t offsetDiff = nextOffset - currentOffset; - if (currentTex->isPalette) - { - // Shrink palette so it doesn't overlap - currentTex->SetDimensions(offsetDiff / currentTex->GetPixelMultiplyer(), 1); - - if (declarations.find(currentOffset) != declarations.end()) - declarations.at(currentOffset)->size = currentTex->GetRawDataSize(); - - currentTex->DeclareVar(GetName(), ""); - } - else - { - std::string texName; - std::string texNextName; - GetDeclarationPtrName(currentOffset, "", texName); - - Declaration* nextDecl = GetDeclaration(nextOffset); - if (nextDecl == nullptr) - texNextName = texturesResources.at(nextOffset)->GetName(); - else - texNextName = nextDecl->varName; - -#if 0 - defines += StringHelper::Sprintf("#define %s ((u32)%s + 0x%06X)\n", - texNextName.c_str(), texName.c_str(), offsetDiff); -#endif - - delete declarations[nextOffset]; - declarations.erase(nextOffset); - texturesResources.erase(nextOffset); - texturesSorted.erase(texturesSorted.begin() + i + 1); - - i--; - } - } - } - - return defines; -} - -void ZFile::HandleUnaccountedData() -{ - uint32_t lastAddr = 0; - uint32_t lastSize = 0; - std::vector declsAddresses; - - if (Globals::Instance->otrMode) - return; - - declsAddresses.reserve(declarations.size()); - if (Globals::Instance->otrMode) - return; - - for (const auto& item : declarations) - { - declsAddresses.push_back(item.first); - } - - bool breakLoop = false; - for (offset_t currentAddress : declsAddresses) - { - if (currentAddress >= rangeEnd) - { - breakLoop = true; - break; - } - - if (currentAddress < rangeStart) - { - lastAddr = currentAddress; - continue; - } - - breakLoop = HandleUnaccountedAddress(currentAddress, lastAddr, lastSize); - if (breakLoop) - break; - - lastAddr = currentAddress; - } - - if (!breakLoop) - { - // TODO: change rawData.size() to rangeEnd - // HandleUnaccountedAddress(rangeEnd, lastAddr, lastSize); - HandleUnaccountedAddress(rawData.size(), lastAddr, lastSize); - } -} - -bool ZFile::HandleUnaccountedAddress(offset_t currentAddress, offset_t lastAddr, uint32_t& lastSize) -{ - if (currentAddress != lastAddr && declarations.find(lastAddr) != declarations.end()) - { - Declaration* lastDecl = declarations.at(lastAddr); - lastSize = lastDecl->size; - - if (lastAddr + lastSize > currentAddress) - { - Declaration* currentDecl = declarations.at(currentAddress); - - std::string intersectionInfo = StringHelper::Sprintf( - "Resource from 0x%06X:0x%06X (%s) conflicts with 0x%06X (%s).", lastAddr, - lastAddr + lastSize, lastDecl->varName.c_str(), currentAddress, - currentDecl->varName.c_str()); - HANDLE_WARNING_RESOURCE(WarningType::Intersection, this, nullptr, currentAddress, - "intersection detected", intersectionInfo); - } - } - - uint32_t unaccountedAddress = lastAddr + lastSize; - - if (unaccountedAddress != currentAddress && lastAddr >= rangeStart && - unaccountedAddress < rangeEnd) - { - int diff = currentAddress - unaccountedAddress; - bool nonZeroUnaccounted = false; - - std::string src = " "; - - if (currentAddress > rawData.size()) - { - throw std::runtime_error(StringHelper::Sprintf( - "ZFile::ProcessDeclarations(): Fatal error while processing XML '%s'.\n" - "\t Offset '0x%X' is outside of the limits of file '%s', which has a size of " - "'0x%X'.\n" - "\t Aborting...", - xmlFilePath.c_str(), currentAddress, name.c_str(), rawData.size())); - } - - // Handle Align8 - if (currentAddress % 8 == 0 && diff % 8 != 0) - { - Declaration* currentDecl = GetDeclaration(currentAddress); - - if (currentDecl != nullptr) - { - if (currentDecl->alignment == DeclarationAlignment::Align8) - { - // Check removed bytes are zeroes - if (BitConverter::ToUInt32BE(rawData, unaccountedAddress + diff - 4) == 0) - { - diff -= 4; - } - } - - if (diff == 0) - { - return false; - } - } - } - - for (int i = 0; i < diff; i++) - { - uint8_t val = rawData.at(unaccountedAddress + i); - src += StringHelper::Sprintf("0x%02X, ", val); - if (val != 0x00) - { - nonZeroUnaccounted = true; - } - - if (Globals::Instance->verboseUnaccounted) - { - if ((i % 4 == 3)) - { - src += StringHelper::Sprintf(" // 0x%06X", unaccountedAddress + i - 3); - if (i != (diff - 1)) - { - src += "\n\t"; - } - } - } - else - { - if ((i % 16 == 15) && (i != (diff - 1))) - src += "\n "; - } - } - - if (declarations.find(unaccountedAddress) == declarations.end() && diff > 0) - { - std::string unaccountedPrefix = "unaccounted"; - - if (diff < 16 && !nonZeroUnaccounted) - { - unaccountedPrefix = "possiblePadding"; - - // Strip unnecessary padding at the end of the file. - if (unaccountedAddress + diff >= rawData.size()) - return true; - } - - Declaration* decl = AddDeclarationArray( - unaccountedAddress, DeclarationAlignment::Align4, diff, "u8", - StringHelper::Sprintf("%s_%s_%06X", name.c_str(), unaccountedPrefix.c_str(), - unaccountedAddress), - diff, src); - - decl->isUnaccounted = true; - if (Globals::Instance->forceUnaccountedStatic) - decl->staticConf = StaticConfig::On; - - if (nonZeroUnaccounted) - { - HANDLE_WARNING_RESOURCE(WarningType::Unaccounted, this, nullptr, unaccountedAddress, - "a non-zero unaccounted block was found", - StringHelper::Sprintf("Block size: '0x%X'", diff)); - } - else if (diff >= 16) - { - HANDLE_WARNING_RESOURCE(WarningType::Unaccounted, this, nullptr, unaccountedAddress, - "a big (size>=0x10) zero-only unaccounted block was found", - StringHelper::Sprintf("Block size: '0x%X'", diff)); - } - } - } - - return false; -} diff --git a/ZAPDTR/ZAPD/ZFile.h b/ZAPDTR/ZAPD/ZFile.h deleted file mode 100644 index 04334547c..000000000 --- a/ZAPDTR/ZAPD/ZFile.h +++ /dev/null @@ -1,141 +0,0 @@ -#pragma once - -#include -#include - -#include "ZSymbol.h" -#include "ZTexture.h" -#include "tinyxml2.h" - -enum class ZFileMode -{ - BuildTexture, - BuildOverlay, - BuildBlob, - BuildSourceFile, - BuildBackground, - Extract, - ExternalFile, - ExtractDirectory, - Invalid, - Custom = 1000, // Used for exporter file modes -}; - -enum class ZGame -{ - OOT_RETAIL, - OOT_SW97, - MM_RETAIL -}; - -class ZFile -{ -public: - std::map declarations; - std::vector resources; - std::string defines; - - int workerID; - bool isCompilable = false; - - // Default to using virtual addresses - uint32_t segment = 0x80; - uint32_t baseAddress, rangeStart, rangeEnd; - bool isExternalFile = false; - - ZFile(const fs::path& nOutPath, const std::string& nName); - ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath, - const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID); - ~ZFile(); - - std::string GetName() const; - std::string GetOutName() const; - ZFileMode GetMode() const; - const fs::path& GetXmlFilePath() const; - const std::vector& GetRawData() const; - void ExtractResources(); - void BuildSourceFile(); - void AddResource(ZResource* res); - ZResource* FindResource(offset_t rawDataIndex); - std::vector GetResourcesOfType(ZResourceType resType); - - Declaration* AddDeclaration(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& body); - - Declaration* AddDeclarationArray(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - size_t arrayItemCnt, const std::string& body); - Declaration* AddDeclarationArray(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& arrayItemCntStr, const std::string& body); - - Declaration* AddDeclarationPlaceholder(offset_t address, const std::string& varName); - - Declaration* AddDeclarationInclude(offset_t address, const std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName); - Declaration* AddDeclarationIncludeArray(offset_t address, std::string& includePath, size_t size, - const std::string& varType, const std::string& varName, - size_t arrayItemCnt); - - bool GetDeclarationPtrName(segptr_t segAddress, const std::string& expectedType, - std::string& declName) const; - bool GetDeclarationArrayIndexedName(segptr_t segAddress, size_t elementSize, - const std::string& expectedType, - std::string& declName) const; - - Declaration* GetDeclaration(offset_t address) const; - Declaration* GetDeclarationRanged(offset_t address) const; - bool HasDeclaration(offset_t address); - - std::string GetHeaderInclude() const; - std::string GetZRoomHeaderInclude() const; - std::string GetExternalFileHeaderInclude() const; - - void GeneratePlaceholderDeclarations(); - - void AddTextureResource(uint32_t offset, ZTexture* tex); - ZTexture* GetTextureResource(uint32_t offset) const; - - void AddSymbolResource(uint32_t offset, ZSymbol* sym); - ZSymbol* GetSymbolResource(uint32_t offset) const; - ZSymbol* GetSymbolResourceRanged(uint32_t offset) const; - - fs::path GetSourceOutputFolderPath() const; - - bool IsOffsetInFileRange(uint32_t offset) const; - bool IsSegmentedInFilespaceRange(segptr_t segAddress) const; - - static std::map* GetNodeMap(); - static void RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc); - -protected: - std::string name; - fs::path outName = ""; - fs::path basePath; - fs::path outputPath; - fs::path xmlFilePath; - std::vector rawData; - - // Keep track of every texture of this ZFile. - // The pointers declared here are "borrowed" (somebody else is the owner), - // so ZFile shouldn't delete/free those textures. - std::map texturesResources; - std::map symbolResources; - ZFileMode mode = ZFileMode::Invalid; - - ZFile(); - void ParseXML(tinyxml2::XMLElement* reader, const std::string& filename); - void DeclareResourceSubReferences(); - void GenerateSourceFiles(); - void GenerateSourceHeaderFiles(); - bool AddDeclarationChecks(uint32_t address, const std::string& varName); - std::string ProcessDeclarations(); - void ProcessDeclarationText(Declaration* decl); - std::string ProcessExterns(); - - std::string ProcessTextureIntersections(const std::string& prefix); - void HandleUnaccountedData(); - bool HandleUnaccountedAddress(offset_t currentAddress, offset_t lastAddr, uint32_t& lastSize); -}; diff --git a/ZAPDTR/ZAPD/ZLimb.cpp b/ZAPDTR/ZAPD/ZLimb.cpp deleted file mode 100644 index d0c3ffe3e..000000000 --- a/ZAPDTR/ZAPD/ZLimb.cpp +++ /dev/null @@ -1,420 +0,0 @@ -#include "ZLimb.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZSkeleton.h" - -REGISTER_ZFILENODE(Limb, ZLimb); - -ZLimb::ZLimb(ZFile* nParent) : ZResource(nParent), segmentStruct(nParent) -{ - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbType"); - RegisterOptionalAttribute("Type"); -} - -void ZLimb::ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nType) -{ - rawDataIndex = nRawDataIndex; - type = nType; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZLimb::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - auto& enumNameXml = registeredAttributes.at("EnumName").value; - if (enumNameXml != "") - { - enumName = enumNameXml; - } - - // Reading from a - std::string limbType = registeredAttributes.at("LimbType").value; - if (limbType == "") // Reading from a - limbType = registeredAttributes.at("Type").value; - - if (limbType == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'LimbType' attribute in ", ""); - } - - type = GetTypeByAttributeName(limbType); - if (type == ZLimbType::Invalid) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'LimbType' attribute", ""); - } -} - -void ZLimb::ParseRawData() -{ - ZResource::ParseRawData(); - const auto& rawData = parent->GetRawData(); - - if (type == ZLimbType::Curve) - { - childIndex = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0); - siblingIndex = BitConverter::ToUInt8BE(rawData, rawDataIndex + 1); - - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - dList2Ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - return; - } - if (type == ZLimbType::Legacy) - { - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x00); - legTransX = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x04); - legTransY = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x08); - legTransZ = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x0C); - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x10); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x12); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x14); - childPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x18); - siblingPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x1C); - return; - } - - transX = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - transY = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - transZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - - childIndex = rawData.at(rawDataIndex + 6); - siblingIndex = rawData.at(rawDataIndex + 7); - - switch (type) - { - case ZLimbType::LOD: - dList2Ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - [[fallthrough]]; - case ZLimbType::Standard: - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - break; - - case ZLimbType::Skin: - skinSegmentType = - static_cast(BitConverter::ToInt32BE(rawData, rawDataIndex + 8)); - skinSegment = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - if (skinSegmentType == ZLimbSkinType::SkinType_4) - { - if (skinSegment != 0 && GETSEGNUM(skinSegment) == parent->segment) - { - uint32_t skinSegmentOffset = Seg2Filespace(skinSegment, parent->baseAddress); - segmentStruct.ExtractFromFile(skinSegmentOffset); - } - } - break; - - case ZLimbType::Curve: - case ZLimbType::Legacy: - break; - - case ZLimbType::Invalid: - assert(!"whoops"); - break; - } -} - -void ZLimb::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - - std::string suffix; - switch (type) - { - case ZLimbType::Legacy: - if (childPtr != 0 && GETSEGNUM(childPtr) == parent->segment) - { - uint32_t childOffset = Seg2Filespace(childPtr, parent->baseAddress); - if (!parent->HasDeclaration(childOffset)) - { - ZLimb* child = new ZLimb(parent); - child->ExtractFromBinary(childOffset, ZLimbType::Legacy); - child->DeclareVar(varPrefix, ""); - child->DeclareReferences(varPrefix); - parent->AddResource(child); - } - } - if (siblingPtr != 0 && GETSEGNUM(siblingPtr) == parent->segment) - { - uint32_t siblingdOffset = Seg2Filespace(siblingPtr, parent->baseAddress); - if (!parent->HasDeclaration(siblingdOffset)) - { - ZLimb* sibling = new ZLimb(parent); - sibling->ExtractFromBinary(siblingdOffset, ZLimbType::Legacy); - sibling->DeclareVar(varPrefix, ""); - sibling->DeclareReferences(varPrefix); - parent->AddResource(sibling); - } - } - break; - - case ZLimbType::Curve: - case ZLimbType::LOD: - suffix = "Far"; - if (type == ZLimbType::Curve) - suffix = "Curve2"; - DeclareDList(dList2Ptr, varPrefix, suffix); - [[fallthrough]]; - case ZLimbType::Standard: - suffix = ""; - if (type == ZLimbType::Curve) - suffix = "Curve"; - DeclareDList(dListPtr, varPrefix, suffix); - break; - - case ZLimbType::Skin: - switch (skinSegmentType) - { - case ZLimbSkinType::SkinType_4: - if (skinSegment != 0 && GETSEGNUM(skinSegment) == parent->segment) - { - segmentStruct.DeclareReferences(varPrefix); - segmentStruct.GetSourceOutputCode(varPrefix); - } - break; - - case ZLimbSkinType::SkinType_DList: - DeclareDList(skinSegment, varPrefix, ""); - break; - - default: - break; - } - break; - - case ZLimbType::Invalid: - break; - } -} - -size_t ZLimb::GetRawDataSize() const -{ - switch (type) - { - case ZLimbType::Standard: - case ZLimbType::Curve: - return 0x0C; - - case ZLimbType::LOD: - case ZLimbType::Skin: - return 0x10; - - case ZLimbType::Legacy: - return 0x20; - - case ZLimbType::Invalid: - break; - } - - return 0x0C; -} - -std::string ZLimb::GetBodySourceCode() const -{ - if (Globals::Instance->otrMode) - return ""; - - std::string dListStr; - std::string dListStr2; - Globals::Instance->GetSegmentedArrayIndexedName(dListPtr, 8, parent, "Gfx", dListStr, - parent->workerID); - Globals::Instance->GetSegmentedArrayIndexedName(dList2Ptr, 8, parent, "Gfx", dListStr2, - parent->workerID); - - std::string entryStr = "\n\t"; - if (type == ZLimbType::Legacy) - { - std::string childName; - std::string siblingName; - Globals::Instance->GetSegmentedPtrName(childPtr, parent, "LegacyLimb", childName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(siblingPtr, parent, "LegacyLimb", siblingName, - parent->workerID); - - entryStr += StringHelper::Sprintf("%s,\n", dListStr.c_str()); - entryStr += - StringHelper::Sprintf("\t{ %ff, %ff, %ff },\n", legTransX, legTransY, legTransZ); - entryStr += StringHelper::Sprintf("\t{ 0x%04X, 0x%04X, 0x%04X },\n", rotX, rotY, rotZ); - entryStr += StringHelper::Sprintf("\t%s,\n", childName.c_str()); - entryStr += StringHelper::Sprintf("\t%s\n", siblingName.c_str()); - } - else - { - std::string childStr; - std::string siblingStr; - if (limbsTable != nullptr) - { - childStr = limbsTable->GetLimbEnumName(childIndex); - siblingStr = limbsTable->GetLimbEnumName(siblingIndex); - } - else - { - childStr = StringHelper::Sprintf("0x%02X", childIndex); - siblingStr = StringHelper::Sprintf("0x%02X", siblingIndex); - } - - if (type != ZLimbType::Curve) - { - entryStr += StringHelper::Sprintf("{ %i, %i, %i }, ", transX, transY, transZ); - } - entryStr += StringHelper::Sprintf("%s, %s,\n", childStr.c_str(), siblingStr.c_str()); - - switch (type) - { - case ZLimbType::Standard: - entryStr += StringHelper::Sprintf("\t%s\n", dListStr.c_str()); - break; - - case ZLimbType::LOD: - case ZLimbType::Curve: - entryStr += - StringHelper::Sprintf("\t{ %s, %s }\n", dListStr.c_str(), dListStr2.c_str()); - break; - - case ZLimbType::Skin: - { - std::string skinSegmentStr; - Globals::Instance->GetSegmentedPtrName(skinSegment, parent, "", skinSegmentStr, - parent->workerID); - entryStr += - StringHelper::Sprintf("\t0x%02X, %s\n", skinSegmentType, skinSegmentStr.c_str()); - } - break; - - case ZLimbType::Legacy: - break; - - case ZLimbType::Invalid: - break; - } - } - - return entryStr; -} - -std::string ZLimb::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sLimb_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZLimb::GetSourceTypeName() const -{ - return GetSourceTypeName(type); -} - -ZResourceType ZLimb::GetResourceType() const -{ - return ZResourceType::Limb; -} - -ZLimbType ZLimb::GetLimbType() -{ - return type; -} - -void ZLimb::SetLimbType(ZLimbType value) -{ - type = value; -} - -const char* ZLimb::GetSourceTypeName(ZLimbType limbType) -{ - switch (limbType) - { - case ZLimbType::Standard: - return "StandardLimb"; - - case ZLimbType::LOD: - return "LodLimb"; - - case ZLimbType::Skin: - return "SkinLimb"; - - case ZLimbType::Curve: - return "SkelCurveLimb"; - - case ZLimbType::Legacy: - return "LegacyLimb"; - - default: - return "StandardLimb"; - } -} - -ZLimbType ZLimb::GetTypeByAttributeName(const std::string& attrName) -{ - if (attrName == "Standard") - { - return ZLimbType::Standard; - } - if (attrName == "LOD") - { - return ZLimbType::LOD; - } - if (attrName == "Skin") - { - return ZLimbType::Skin; - } - if (attrName == "Curve") - { - return ZLimbType::Curve; - } - if (attrName == "Legacy") - { - return ZLimbType::Legacy; - } - return ZLimbType::Invalid; -} - -void ZLimb::SetLimbIndex(uint8_t nLimbIndex) -{ - limbIndex = nLimbIndex; -} - -void ZLimb::DeclareDList(segptr_t dListSegmentedPtr, const std::string& prefix, - const std::string& limbSuffix) -{ - if (dListSegmentedPtr == 0 || GETSEGNUM(dListSegmentedPtr) != parent->segment) - return; - - uint32_t dlistOffset = Seg2Filespace(dListSegmentedPtr, parent->baseAddress); - if (parent->HasDeclaration(dlistOffset)) - return; - - if (!parent->IsOffsetInFileRange(dlistOffset) || dlistOffset >= parent->GetRawData().size()) - return; - - std::string dlistName; - bool declFound = Globals::Instance->GetSegmentedArrayIndexedName(dListSegmentedPtr, 8, parent, - "Gfx", dlistName, parent->workerID); - if (declFound) - return; - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), dlistOffset, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - ZDisplayList* dlist = new ZDisplayList(parent); - dlist->ExtractFromBinary(dlistOffset, dlistLength); - - std::string dListStr = - StringHelper::Sprintf("%s%sDL_%06X", prefix.c_str(), limbSuffix.c_str(), dlistOffset); - dlist->SetName(dListStr); - dlist->DeclareVar(prefix, ""); - parent->AddResource(dlist); -} diff --git a/ZAPDTR/ZAPD/ZLimb.h b/ZAPDTR/ZAPD/ZLimb.h deleted file mode 100644 index b75236f5e..000000000 --- a/ZAPDTR/ZAPD/ZLimb.h +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "OtherStructs/SkinLimbStructs.h" -#include "ZDisplayList.h" -#include "ZFile.h" - -enum class ZLimbType -{ - Invalid, - Standard, - LOD, - Skin, - Curve, - Legacy, -}; - -class ZLimbTable; - -class ZLimb : public ZResource -{ -public: - std::string enumName; - ZLimbTable* limbsTable = nullptr; // borrowed pointer, do not delete! - - ZLimbType type = ZLimbType::Standard; - - ZLimbSkinType skinSegmentType = ZLimbSkinType::SkinType_0; // Skin only - segptr_t skinSegment = 0; // Skin only - Struct_800A5E28 segmentStruct = {0}; // Skin only - - // Legacy only - float legTransX = 0, legTransY = 0, legTransZ = 0; // Vec3f - uint16_t rotX = 0, rotY = 0, rotZ = 0; // Vec3s - segptr_t childPtr = 0; // LegacyLimb* - segptr_t siblingPtr = 0; // LegacyLimb* - - segptr_t dListPtr = 0; - segptr_t dList2Ptr = 0; // LOD and Curve Only - - int16_t transX = 0, transY = 0, transZ = 0; - uint8_t childIndex = 0, siblingIndex = 0; - - uint8_t limbIndex = 0; - - ZLimb(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nType); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - ZLimbType GetLimbType(); - void SetLimbType(ZLimbType value); - static const char* GetSourceTypeName(ZLimbType limbType); - static ZLimbType GetTypeByAttributeName(const std::string& attrName); - - void SetLimbIndex(uint8_t nLimbIndex); - -protected: - void DeclareDList(segptr_t dListSegmentedPtr, const std::string& prefix, - const std::string& limbSuffix); -}; diff --git a/ZAPDTR/ZAPD/ZMtx.cpp b/ZAPDTR/ZAPD/ZMtx.cpp deleted file mode 100644 index b9ca3f22d..000000000 --- a/ZAPDTR/ZAPD/ZMtx.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "ZMtx.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Mtx, ZMtx); - -ZMtx::ZMtx(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZMtx::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - for (size_t i = 0; i < 4; ++i) - for (size_t j = 0; j < 4; ++j) - mtx[i][j] = BitConverter::ToInt32BE(rawData, rawDataIndex + (i * 4 + j) * 4); -} - -size_t ZMtx::GetRawDataSize() const -{ - return 64; -} - -std::string ZMtx::GetBodySourceCode() const -{ - std::string bodyStr = "\n"; - - for (const auto& row : mtx) - { - bodyStr += " "; - - for (int32_t val : row) - bodyStr += StringHelper::Sprintf("%-11i, ", val); - - bodyStr += "\n"; - } - - return bodyStr; -} - -std::string ZMtx::GetSourceTypeName() const -{ - return "Mtx"; -} - -ZResourceType ZMtx::GetResourceType() const -{ - return ZResourceType::Mtx; -} - -DeclarationAlignment ZMtx::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZMtx.h b/ZAPDTR/ZAPD/ZMtx.h deleted file mode 100644 index 1b5513cd4..000000000 --- a/ZAPDTR/ZAPD/ZMtx.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include -#include -#include "ZResource.h" - -class ZMtx : public ZResource -{ -public: - ZMtx(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - -public: - std::array, 4> mtx; -}; diff --git a/ZAPDTR/ZAPD/ZPath.cpp b/ZAPDTR/ZAPD/ZPath.cpp deleted file mode 100644 index 849b4edfc..000000000 --- a/ZAPDTR/ZAPD/ZPath.cpp +++ /dev/null @@ -1,212 +0,0 @@ -#include "ZPath.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Path, ZPath); - -ZPath::ZPath(ZFile* nParent) : ZResource(nParent) -{ - numPaths = 1; - RegisterOptionalAttribute("NumPaths", "1"); -} - -void ZPath::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - numPaths = StringHelper::StrToL(registeredAttributes.at("NumPaths").value); - - if (numPaths < 1) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%d' found for 'NumPaths' attribute", numPaths), - "Should be at least '1'"); - } -} - -void ZPath::ParseRawData() -{ - ZResource::ParseRawData(); - - uint32_t currentPtr = rawDataIndex; - - pathways.reserve(numPaths); - for (size_t pathIndex = 0; pathIndex < numPaths; pathIndex++) - { - PathwayEntry path(parent); - path.ExtractFromFile(currentPtr); - - if (path.GetListAddress() == 0) - break; - - currentPtr += path.GetRawDataSize(); - pathways.push_back(path); - } -} - -void ZPath::DeclareReferences(const std::string& prefix) -{ - ZResource::DeclareReferences(prefix); - - for (auto& entry : pathways) - entry.DeclareReferences(prefix); -} - -Declaration* ZPath::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, pathways.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZPath::GetBodySourceCode() const -{ - std::string declaration; - - size_t index = 0; - for (const auto& entry : pathways) - { - declaration += StringHelper::Sprintf("\t{ %s },", entry.GetBodySourceCode().c_str()); - - if (index < pathways.size() - 1) - declaration += "\n"; - - index++; - } - - return declaration; -} - -std::string ZPath::GetSourceTypeName() const -{ - return "Path"; -} - -ZResourceType ZPath::GetResourceType() const -{ - return ZResourceType::Path; -} - -size_t ZPath::GetRawDataSize() const -{ - return pathways.size() * pathways.at(0).GetRawDataSize(); -} - -void ZPath::SetNumPaths(uint32_t nNumPaths) -{ - numPaths = nNumPaths; -} - -/* PathwayEntry */ - -PathwayEntry::PathwayEntry(ZFile* nParent) : ZResource(nParent) -{ -} - -void PathwayEntry::ParseRawData() -{ - ZResource::ParseRawData(); - auto parentRawData = parent->GetRawData(); - numPoints = parentRawData.at(rawDataIndex + 0); - unk1 = parentRawData.at(rawDataIndex + 1); - unk2 = BitConverter::ToInt16BE(parentRawData, rawDataIndex + 2); - listSegmentAddress = BitConverter::ToInt32BE(parentRawData, rawDataIndex + 4); - - uint32_t currentPtr = GETSEGOFFSET(listSegmentAddress); - - points.reserve(numPoints); - for (int32_t i = 0; i < numPoints; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - points.push_back(vec); - } -} - -void PathwayEntry::DeclareReferences(const std::string& prefix) -{ - ZResource::DeclareReferences(prefix); - if (points.empty()) - return; - - std::string pointsName; - bool addressFound = Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", - pointsName, parent->workerID); - if (addressFound) - return; - - std::string declaration = ""; - - size_t index = 0; - for (const auto& point : points) - { - declaration += StringHelper::Sprintf("\t{ %s },", point.GetBodySourceCode().c_str()); - - if (index < points.size() - 1) - declaration += "\n"; - - index++; - } - - uint32_t pointsOffset = Seg2Filespace(listSegmentAddress, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(pointsOffset); - if (decl == nullptr) - { - pointsName = StringHelper::Sprintf("%sPathwayList_%06X", prefix.c_str(), pointsOffset); - parent->AddDeclarationArray(pointsOffset, points.at(0).GetDeclarationAlignment(), - points.size() * 6, points.at(0).GetSourceTypeName(), pointsName, - points.size(), declaration); - } - else - decl->text = declaration; -} - -std::string PathwayEntry::GetBodySourceCode() const -{ - std::string declaration; - std::string listName; - Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", listName, - parent->workerID); - - if (Globals::Instance->game == ZGame::MM_RETAIL) - declaration += - StringHelper::Sprintf("%i, %i, %i, %s", numPoints, unk1, unk2, listName.c_str()); - else - declaration += StringHelper::Sprintf("%i, %s", numPoints, listName.c_str()); - - return declaration; -} - -std::string PathwayEntry::GetSourceTypeName() const -{ - return "Path"; -} - -ZResourceType PathwayEntry::GetResourceType() const -{ - return ZResourceType::Path; -} - -size_t PathwayEntry::GetRawDataSize() const -{ - return 0x08; -} - -segptr_t PathwayEntry::GetListAddress() const -{ - return listSegmentAddress; -} diff --git a/ZAPDTR/ZAPD/ZPath.h b/ZAPDTR/ZAPD/ZPath.h deleted file mode 100644 index 722e84afe..000000000 --- a/ZAPDTR/ZAPD/ZPath.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZVector.h" - -class PathwayEntry : public ZResource -{ -public: - PathwayEntry(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - segptr_t GetListAddress() const; - -public: - int32_t numPoints; - int8_t unk1; // (MM Only) - int16_t unk2; // (MM Only) - segptr_t listSegmentAddress; - std::vector points; -}; - -class ZPath : public ZResource -{ -public: - ZPath(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - void SetNumPaths(uint32_t nNumPaths); - -public: - uint32_t numPaths; - std::vector pathways; -}; diff --git a/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp b/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp deleted file mode 100644 index ab633c129..000000000 --- a/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "ZPlayerAnimationData.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include - -REGISTER_ZFILENODE(PlayerAnimationData, ZPlayerAnimationData); - -ZPlayerAnimationData::ZPlayerAnimationData(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("FrameCount"); -} - -void ZPlayerAnimationData::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string& frameCountXml = registeredAttributes.at("FrameCount").value; - - frameCount = StringHelper::StrToL(frameCountXml); -} - -void ZPlayerAnimationData::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - - size_t totalSize = GetRawDataSize(); - // Divided by 2 because each value is an s16 - limbRotData.reserve(totalSize * frameCount / 2); - - for (size_t i = 0; i < totalSize; i += 2) - { - limbRotData.push_back(BitConverter::ToUInt16BE(rawData, rawDataIndex + i)); - } -} - -Declaration* ZPlayerAnimationData::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, limbRotData.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZPlayerAnimationData::GetBodySourceCode() const -{ - std::string declaration = ""; - - if (Globals::Instance->otrMode) - return ""; - - size_t index = 0; - for (const auto& entry : limbRotData) - { - if (index % 8 == 0) - { - declaration += "\t"; - } - - declaration += StringHelper::Sprintf("0x%04X, ", entry); - - if ((index + 1) % 8 == 0) - { - declaration += "\n"; - } - - index++; - } - - return declaration; -} - -std::string ZPlayerAnimationData::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sPlayerAnimationData_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZPlayerAnimationData::GetSourceTypeName() const -{ - return "s16"; -} - -ZResourceType ZPlayerAnimationData::GetResourceType() const -{ - return ZResourceType::PlayerAnimationData; -} - -size_t ZPlayerAnimationData::GetRawDataSize() const -{ - // (sizeof(Vec3s) * limbCount + 2) * frameCount - return (6 * 22 + 2) * frameCount; -} diff --git a/ZAPDTR/ZAPD/ZPlayerAnimationData.h b/ZAPDTR/ZAPD/ZPlayerAnimationData.h deleted file mode 100644 index 20835f236..000000000 --- a/ZAPDTR/ZAPD/ZPlayerAnimationData.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include -#include - -#include "ZResource.h" - -class ZPlayerAnimationData : public ZResource -{ -public: - int16_t frameCount = 0; - std::vector limbRotData; - - ZPlayerAnimationData(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZPointer.cpp b/ZAPDTR/ZAPD/ZPointer.cpp deleted file mode 100644 index 6e6945cad..000000000 --- a/ZAPDTR/ZAPD/ZPointer.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "ZPointer.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Pointer, ZPointer); - -ZPointer::ZPointer(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Type"); -} - -void ZPointer::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - type = registeredAttributes.at("Type").value; -} - -void ZPointer::ParseRawData() -{ - auto& rawData = parent->GetRawData(); - - ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex); -} - -std::string ZPointer::GetBodySourceCode() const -{ - std::string ptrName; - - Globals::Instance->GetSegmentedPtrName(ptr, parent, "", ptrName); - - return ptrName; -} - -bool ZPointer::DoesSupportArray() const -{ - return true; -} - -std::string ZPointer::GetSourceTypeName() const -{ - return type + "*"; -} - -ZResourceType ZPointer::GetResourceType() const -{ - return ZResourceType::Pointer; -} - -size_t ZPointer::GetRawDataSize() const -{ - return 0x04; -} diff --git a/ZAPDTR/ZAPD/ZPointer.h b/ZAPDTR/ZAPD/ZPointer.h deleted file mode 100644 index 8fb588933..000000000 --- a/ZAPDTR/ZAPD/ZPointer.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "ZResource.h" - -class ZPointer : public ZResource -{ -public: - segptr_t ptr = SEGMENTED_NULL; - std::string type; - - ZPointer(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZResource.cpp b/ZAPDTR/ZAPD/ZResource.cpp deleted file mode 100644 index aacc7afdc..000000000 --- a/ZAPDTR/ZAPD/ZResource.cpp +++ /dev/null @@ -1,439 +0,0 @@ -#include "ZResource.h" - -#include -#include - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include -#include -#include -#include - -ZResource::ZResource(ZFile* nParent) -{ - // assert(nParent != nullptr); - parent = nParent; - name = ""; - outName = ""; - sourceOutput = ""; - rawDataIndex = 0; - outputDeclaration = true; - hash = 0; - - RegisterRequiredAttribute("Name"); - RegisterOptionalAttribute("OutName"); - RegisterOptionalAttribute("Offset"); - RegisterOptionalAttribute("Custom"); - RegisterOptionalAttribute("Static", "Global"); -} - -void ZResource::ExtractFromXML(tinyxml2::XMLElement* reader, offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - declaredInXml = true; - - if (reader != nullptr) - ParseXML(reader); - - // Don't parse raw data of external files - if (parent->GetMode() != ZFileMode::ExternalFile) - { - ParseRawData(); - CalcHash(); - } - - if (!isInner) - { - Declaration* decl = DeclareVar(parent->GetName(), ""); - if (decl != nullptr) - { - decl->declaredInXml = true; - decl->staticConf = staticConf; - } - } -} - -void ZResource::ExtractFromFile(offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); - CalcHash(); -} - -void ZResource::ParseXML(tinyxml2::XMLElement* reader) -{ - if (reader != nullptr) - { - // If it is an inner node, then 'Name' isn't required - if (isInner) - { - registeredAttributes.at("Name").isRequired = false; - } - - auto attrs = reader->FirstAttribute(); - while (attrs != nullptr) - { - std::string attrName = attrs->Name(); - bool attrDeclared = false; - - if (registeredAttributes.find(attrName) != registeredAttributes.end()) - { - registeredAttributes[attrName].value = attrs->Value(); - registeredAttributes[attrName].wasSet = true; - attrDeclared = true; - } - - if (!attrDeclared) - { - HANDLE_WARNING_RESOURCE( - WarningType::UnknownAttribute, parent, this, rawDataIndex, - StringHelper::Sprintf("unexpected '%s' attribute in resource <%s>", - attrName.c_str(), reader->Name()), - ""); - } - attrs = attrs->Next(); - } - - if (!Globals::Instance->otrMode) - { - if (!canHaveInner && !reader->NoChildren()) - { - std::string errorHeader = StringHelper::Sprintf( - "resource '%s' with inner element/child detected", reader->Name()); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - } - - for (const auto& attr : registeredAttributes) - { - if (attr.second.isRequired && attr.second.value == "") - { - std::string headerMsg = - StringHelper::Sprintf("missing required attribute '%s' in resource <%s>", - attr.first.c_str(), reader->Name()); - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - headerMsg, ""); - } - } - - name = registeredAttributes.at("Name").value; - - // Disable this check for OTR file generation for now since it takes up a considerable amount of CPU time - if (!Globals::Instance->otrMode) - { - static std::regex r("[a-zA-Z_]+[a-zA-Z0-9_]*", - std::regex::icase | std::regex::optimize); - - if (!isInner || (isInner && name != "")) - { - if (!std::regex_match(name, r)) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, - rawDataIndex, "invalid value found for 'Name' attribute", - ""); - } - } - } - - outName = registeredAttributes.at("OutName").value; - if (outName == "") - outName = name; - - isCustomAsset = registeredAttributes["Custom"].wasSet; - - std::string& staticXml = registeredAttributes["Static"].value; - if (staticXml == "Global") - { - staticConf = StaticConfig::Global; - } - else if (staticXml == "On") - { - staticConf = StaticConfig::On; - } - else if (staticXml == "Off") - { - staticConf = StaticConfig::Off; - } - else - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%s' for 'Static' attribute", staticConf), ""); - } - - declaredInXml = true; - } -} - -void ZResource::ParseRawData() -{ -} - -void ZResource::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ -} - -void ZResource::ParseRawDataLate() -{ -} - -void ZResource::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ -} - -Declaration* ZResource::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclaration(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -void ZResource::Save([[maybe_unused]] const fs::path& outFolder) -{ -} - -const std::string& ZResource::GetName() const -{ - return name; -} - -const std::string& ZResource::GetOutName() const -{ - return outName; -} - -void ZResource::SetOutName(const std::string& nName) -{ - outName = nName; -} - -void ZResource::SetName(const std::string& nName) -{ - name = nName; -} - -bool ZResource::IsExternalResource() const -{ - return false; -} - -bool ZResource::DoesSupportArray() const -{ - return false; -} - -std::string ZResource::GetExternalExtension() const -{ - return ""; -} - -DeclarationAlignment ZResource::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -bool ZResource::WasDeclaredInXml() const -{ - return declaredInXml; -} - -StaticConfig ZResource::GetStaticConf() const -{ - return staticConf; -} - -offset_t ZResource::GetRawDataIndex() const -{ - return rawDataIndex; -} - -void ZResource::SetRawDataIndex(offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; -} - -std::string ZResource::GetBodySourceCode() const -{ - return "ERROR"; -} - -std::string ZResource::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), GetSourceTypeName().c_str(), - rawDataIndex); -} - -void ZResource::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - std::string bodyStr = GetBodySourceCode(); - - if (bodyStr != "ERROR") - { - Declaration* decl = parent->GetDeclaration(rawDataIndex); - - if (decl == nullptr || decl->isPlaceholder) - decl = DeclareVar(prefix, bodyStr); - else - decl->text = bodyStr; - - // OTRTODO: This is a hack and we need something more elegant in the future... - if (GetResourceType() == ZResourceType::Array) - { - ZArray* arr = (ZArray*)this; - if (arr->resList[0]->GetResourceType() == ZResourceType::Vertex) - { - for (int i = 0; i < arr->resList.size(); i++) - { - ZVtx* vtx = (ZVtx*)arr->resList[i]; - decl->vertexHack.push_back(vtx); - - } - } - } - - if (decl != nullptr) - decl->staticConf = staticConf; - } -} - -std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - if (Globals::Instance->otrMode && genOTRDef) - { - std::string str = ""; - std::string nameStr = StringHelper::Strip(StringHelper::Strip(name, "\n"), "\r"); - - std::string outName = parent->GetOutName(); - std::string prefix = ""; - - if (GetResourceType() == ZResourceType::DisplayList || GetResourceType() == ZResourceType::Texture) - { - //ZDisplayList* dList = (ZDisplayList*)this; - - if (StringHelper::Contains(outName, "_room_")) - { - outName = StringHelper::Split(outName, "_room")[0] + "_scene"; - } - } - - std::string xmlPath = StringHelper::Replace(parent->GetXmlFilePath().string(), "\\", "/"); - - if (StringHelper::Contains(outName, "_room_") || StringHelper::Contains(outName, "_scene")) - prefix = "scenes/nonmq"; - else if (StringHelper::Contains(xmlPath, "objects/")) - prefix = "objects"; - else if (StringHelper::Contains(xmlPath, "textures/")) - prefix = "textures"; - else if (StringHelper::Contains(xmlPath, "overlays/")) - prefix = "overlays"; - else if (StringHelper::Contains(xmlPath, "misc/")) - prefix = "misc"; - else if (StringHelper::Contains(xmlPath, "code/")) - prefix = "code"; - else if (StringHelper::Contains(xmlPath, "text/")) - prefix = "text"; - - if (prefix != "") { - str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s/%s\"", name.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str()); - } - else - str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str()); - - if (nameSet && nameSet->find(name) == nameSet->end()) { - str += StringHelper::Sprintf("\n"); - str += StringHelper::Sprintf(R"(static const ALIGN_ASSET(2) char %s[] = d%s;)", name.c_str(), name.c_str()); - - if (nameSet) { - nameSet->insert(name); - } - } - - if (name == "gTitleZeldaShieldLogoMQTex") - { - std::string addName = "gTitleZeldaShieldLogoTex"; - nameStr = StringHelper::Strip(StringHelper::Strip(addName, "\n"), "\r"); - str += StringHelper::Sprintf("\n\n#define d%s \"__OTR__%s/%s/%s\"", addName.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str()); - if (nameSet && nameSet->find(addName) == nameSet->end()) - { - str += StringHelper::Sprintf("\n"); - str += StringHelper::Sprintf(R"(static const ALIGN_ASSET(2) char %s[] = d%s;)", addName.c_str(), addName.c_str()); - - if (nameSet) - { - nameSet->insert(addName); - } - } - } - - return str; - } - else - return ""; -} - -ZResourceType ZResource::GetResourceType() const -{ - return ZResourceType::Error; -} - -void ZResource::CalcHash() -{ - hash = 0; -} - -void ZResource::SetInnerNode(bool inner) -{ - isInner = inner; -} - -void ZResource::RegisterRequiredAttribute(const std::string& attr) -{ - ResourceAttribute resAtrr; - resAtrr.key = attr; - resAtrr.isRequired = true; - registeredAttributes[attr] = resAtrr; -} - -void ZResource::RegisterOptionalAttribute(const std::string& attr, const std::string& defaultValue) -{ - ResourceAttribute resAtrr; - resAtrr.key = attr; - resAtrr.value = defaultValue; - registeredAttributes[attr] = resAtrr; -} - -offset_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress) -{ - offset_t currentPtr = GETSEGOFFSET(segmentedAddress); - - if (GETSEGNUM(segmentedAddress) == 0x80) // Is defined in code? - { - uint32_t parentBaseOffset = GETSEGOFFSET(parentBaseAddress); - if (parentBaseOffset > currentPtr) - { - HANDLE_ERROR(WarningType::Always, - StringHelper::Sprintf( - "resource address 0x%08X is smaller than 'BaseAddress' 0x%08X", - segmentedAddress, parentBaseAddress), - "Maybe your 'BaseAddress' is wrong?"); - } - - currentPtr -= parentBaseOffset; - } - - return currentPtr; -} diff --git a/ZAPDTR/ZAPD/ZResource.h b/ZAPDTR/ZAPD/ZResource.h deleted file mode 100644 index 05c35a26b..000000000 --- a/ZAPDTR/ZAPD/ZResource.h +++ /dev/null @@ -1,252 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include "Declaration.h" -#include -#include -#include "tinyxml2.h" - -#define SEGMENT_SCENE 2 -#define SEGMENT_ROOM 3 -#define SEGMENT_KEEP 4 -#define SEGMENT_FIELDDANGEON_KEEP 5 -#define SEGMENT_OBJECT 6 -#define SEGMENT_LINKANIMETION 7 - -#define GETSEGOFFSET(x) (x & 0x00FFFFFF) -#define GETSEGNUM(x) ((x >> 24) & 0xFF) - -class ZFile; - -enum class ZResourceType -{ - Error, - Animation, - Array, - AltHeader, - Background, - Blob, - CollisionHeader, - Cutscene, - DisplayList, - Limb, - LimbTable, - Mtx, - Path, - PlayerAnimationData, - Room, - RoomCommand, - Scalar, - Scene, - Skeleton, - String, - Symbol, - Texture, - TextureAnimation, - TextureAnimationParams, - Vector, - Vertex, - Text, - Audio, - ActorList, - CollisionPoly, - Pointer, - SurfaceType, -}; - -class ResourceAttribute -{ -public: - std::string key; - std::string value; - bool isRequired = false; - bool wasSet = false; -}; - -class ZResource -{ -public: - ZFile* parent; - bool outputDeclaration = true; - uint32_t hash = 0; - bool genOTRDef = false; - - /** - * Constructor. - * Child classes should not declare any other constructor besides this one - */ - ZResource(ZFile* nParent); - virtual ~ZResource() = default; - - // Parsing from File - virtual void ExtractFromXML(tinyxml2::XMLElement* reader, offset_t nRawDataIndex); - virtual void ExtractFromFile(offset_t nRawDataIndex); - - // Misc - /** - * Parses additional attributes of the XML node. - * Extra attritbutes have to be registered using `RegisterRequiredAttribute` or - * `RegisterOptionalAttribute` in the constructor of the ZResource - */ - virtual void ParseXML(tinyxml2::XMLElement* reader); - /** - * Extracts data from the binary file - */ - virtual void ParseRawData(); - /** - * Declares any data pointed by this resource that has not been declared already. - * For example, a Vtx referenced by a Dlist should be declared here if it wasn't - * declared previously by something else - */ - virtual void DeclareReferences(const std::string& prefix); - virtual void ParseRawDataLate(); - virtual void DeclareReferencesLate(const std::string& prefix); - - /** - * Adds this resource as a Declaration of its parent ZFile - */ - virtual Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr); - /** - * Returns the body of the variable of the extracted resource, without any side-effect - */ - [[nodiscard]] virtual std::string GetBodySourceCode() const; - /** - * Creates an automatically generated variable name for the current resource - */ - [[nodiscard]] virtual std::string GetDefaultName(const std::string& prefix) const; - - virtual void GetSourceOutputCode(const std::string& prefix); - virtual std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet); - virtual void CalcHash(); - /** - * Exports the resource to binary format - */ - virtual void Save(const fs::path& outFolder); - - // Properties - /** - * Returns true if the resource will be externalized, and included back to the C file using - * `#include`s - */ - virtual bool IsExternalResource() const; - /** - * Can this type be wrapped in an node? - */ - virtual bool DoesSupportArray() const; - /** - * The type of the resource as a C struct - */ - [[nodiscard]] virtual std::string GetSourceTypeName() const = 0; - /** - * The type in the ZResource enum - */ - [[nodiscard]] virtual ZResourceType GetResourceType() const = 0; - /** - * The filename extension for assets extracted as standalone files - */ - [[nodiscard]] virtual std::string GetExternalExtension() const; - - // Getters/Setters - [[nodiscard]] const std::string& GetName() const; - void SetName(const std::string& nName); - [[nodiscard]] const std::string& GetOutName() const; - void SetOutName(const std::string& nName); - [[nodiscard]] offset_t GetRawDataIndex() const; - void SetRawDataIndex(offset_t nRawDataIndex); - - /** - * The size of the current struct being extracted, not counting data referenced by it - */ - [[nodiscard]] virtual size_t GetRawDataSize() const = 0; - /** - * The alignment of the extracted struct - */ - [[nodiscard]] virtual DeclarationAlignment GetDeclarationAlignment() const; - void SetInnerNode(bool inner); - /** - * Returns `true` if this ZResource was declared using an XML node, - * `false` otherwise (for example, a Vtx extracted indirectly by a DList) - */ - [[nodiscard]] bool WasDeclaredInXml() const; - [[nodiscard]] StaticConfig GetStaticConf() const; - -protected: - std::string name; - std::string outName; - offset_t rawDataIndex; - std::string sourceOutput; - - // Inner is used mostly for nodes - /** - * Is this resource an inner node of another resource? - * (namely inside an ) - */ - bool isInner = false; - /** - * Can this type have an inner node? - */ - bool canHaveInner = false; - - /** - * If set to true, create a reference for the asset in the file, but don't - * actually try to extract it from the file - */ - bool isCustomAsset; - bool declaredInXml = false; - StaticConfig staticConf = StaticConfig::Global; - - // Reading from this XMLs attributes should be performed in the overrided `ParseXML` method. - std::map registeredAttributes; - - // XML attributes registers. - // Registering XML attributes should be done in constructors. - - // The resource needs this attribute. If it is not provided, then the program will throw an - // exception. - void RegisterRequiredAttribute(const std::string& attr); - // Optional attribute. The resource has to do manual checks and manual warnings. It may or may - // not have a value. - void RegisterOptionalAttribute(const std::string& attr, const std::string& defaultValue = ""); -}; - -class ZResourceExporter -{ -public: - ZResourceExporter() = default; - virtual ~ZResourceExporter() = default; - - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) = 0; -}; - -offset_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress); - -typedef ZResource*(ZResourceFactoryFunc)(ZFile* nParent); - -#define REGISTER_ZFILENODE(nodeName, zResClass) \ - static ZResource* ZResourceFactory_##zResClass_##nodeName(ZFile* nParent) \ - { \ - return static_cast(new zResClass(nParent)); \ - } \ - \ - class ZRes_##nodeName \ - { \ - public: \ - ZRes_##nodeName() \ - { \ - ZFile::RegisterNode(#nodeName, &ZResourceFactory_##zResClass_##nodeName); \ - } \ - }; \ - static ZRes_##nodeName inst_ZRes_##nodeName - -#define REGISTER_EXPORTER(expFunc) \ - class ZResExp_##expFunc \ - { \ - public: \ - ZResExp_##expFunc() { expFunc(); } \ - }; \ - static ZResExp_##expFunc inst_ZResExp_##expFunc diff --git a/ZAPDTR/ZAPD/ZRom.cpp b/ZAPDTR/ZAPD/ZRom.cpp deleted file mode 100644 index e9b583b26..000000000 --- a/ZAPDTR/ZAPD/ZRom.cpp +++ /dev/null @@ -1,234 +0,0 @@ -#include "ZRom.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Directory.h" -#include "yaz0/yaz0.h" - -#ifdef __linux__ -#include -#endif -#include - -namespace fs = std::filesystem; - -#define DMA_ENTRY_SIZE 16 - -#if defined(_MSC_VER) -#define __bswap_32 _byteswap_ulong -#define bswap_32 _byteswap_ulong -#endif -#if defined __APPLE__ -#define __bswap32 __builtin_bswap32 -#define bswap32 __builtin_bswap32 -#endif - -// ROM DMA Table Start -#define OOT_OFF_NTSC_10_RC 0x7430 -#define OOT_OFF_NTSC_10 0x7430 -#define OOT_OFF_NTSC_11 0x7430 -#define OOT_OFF_PAL_10 0x7950 -#define OOT_OFF_NTSC_12 0x7960 -#define OOT_OFF_PAL_11 0x7950 -#define OOT_OFF_JP_GC 0x7170 -#define OOT_OFF_JP_MQ 0x7170 -#define OOT_OFF_US_GC 0x7170 -#define OOT_OFF_US_MQ 0x7170 -#define OOT_OFF_PAL_GC_DBG1 0x12F70 -#define OOT_OFF_PAL_MQ_DBG 0x12F70 -#define OOT_OFF_PAL_GC_DBG2 0x12F70 -#define OOT_OFF_PAL_GC 0x7170 -#define OOT_OFF_PAL_MQ 0x7170 -#define OOT_OFF_JP_GC_CE 007170 -#define OOT_OFF_CN_IQUE 0xB7A0 -#define OOT_OFF_TW_IQUE 0xB240 - -#define MM_OFF_US_10 0x1A500 -#define MM_OFF_JP_10 0x1C110 -#define MM_OFF_JP_11 0x1C050 -#define MM_OFF_DBG 0x24F60 - -#define OOT_NTSC_10 0xEC7011B7 -#define OOT_NTSC_11 0xD43DA81F -#define OOT_NTSC_12 0x693BA2AE -#define OOT_PAL_10 0xB044B569 -#define OOT_PAL_11 0xB2055FBD -#define OOT_NTSC_JP_GC_CE 0xF7F52DB8 -#define OOT_NTSC_JP_GC 0xF611F4BA -#define OOT_NTSC_US_GC 0xF3DD35BA -#define OOT_PAL_GC 0x09465AC3 -#define OOT_NTSC_JP_MQ 0xF43B45BA -#define OOT_NTSC_US_MQ 0xF034001A -#define OOT_PAL_MQ 0x1D4136F3 -#define OOT_PAL_GC_DBG1 0x871E1C92 // 03-21-2002 build -#define OOT_PAL_GC_DBG2 0x87121EFE // 03-13-2002 build -#define OOT_PAL_GC_MQ_DBG 0x917D18F6 -#define OOT_IQUE_TW 0x3D81FB3E -#define OOT_IQUE_CN 0xB1E1E07B -#define UNKNOWN 0xFFFFFFFF - -bool ZRom::IsMQ() { - int crc = BitConverter::ToInt32BE(romData, 0x10); - switch (crc) { - case OOT_NTSC_10: - case OOT_NTSC_11: - case OOT_NTSC_12: - case OOT_PAL_10: - case OOT_PAL_11: - case OOT_NTSC_JP_GC: - case OOT_NTSC_JP_GC_CE: - case OOT_NTSC_US_GC: - case OOT_PAL_GC: - case OOT_PAL_GC_DBG1: - case OOT_PAL_GC_DBG2: - case OOT_IQUE_CN: - case OOT_IQUE_TW: - default: - return false; - case OOT_NTSC_JP_MQ: - case OOT_NTSC_US_MQ: - case OOT_PAL_MQ: - case OOT_PAL_GC_MQ_DBG: - return true; - } -} - -ZRom::ZRom(std::string romPath) -{ - RomVersion version; - romData = DiskFile::ReadAllBytes(romPath); - - BitConverter::RomToBigEndian(romData.data(), romData.size()); - - version.crc = BitConverter::ToInt32BE(romData, 0x10); - - switch (version.crc) - { - case OOT_NTSC_10: - version.version = "N64 NTSC 1.0"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_10; - break; - case OOT_NTSC_11: - version.version = "N64 NTSC 1.1"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_11; - break; - case OOT_NTSC_12: - version.version = "N64 NTSC 1.2"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_12; - break; - case OOT_PAL_10: - version.version = "N64 PAL 1.0"; - version.listPath = "pal_oot.txt"; - version.offset = OOT_OFF_PAL_10; - break; - case OOT_PAL_11: - version.version = "N64 PAL 1.1"; - version.listPath = "pal_oot.txt"; - version.offset = OOT_OFF_PAL_11; - break; - case OOT_NTSC_JP_GC: - version.version = "JP GameCube (MQ Disk)"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_GC; - break; - case OOT_NTSC_JP_GC_CE: - version.version = "GameCube (Collectors Edition Disk)"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_GC_CE; - break; - case OOT_NTSC_JP_MQ: - version.version = "JP Master Quest"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_MQ; - break; - case OOT_NTSC_US_MQ: - version.version = "NTSC Master Quest"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_MQ; - break; - case OOT_NTSC_US_GC: - version.version = "NTSC GameCube"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_US_MQ; - break; - case OOT_PAL_GC: - version.version = "PAL GameCube"; - version.listPath = "gamecube_pal.txt"; - version.offset = OOT_OFF_PAL_GC; - break; - case OOT_PAL_MQ: - version.version = "PAL Master Quest"; - version.listPath = "gamecube_pal.txt"; - version.offset = OOT_OFF_PAL_MQ; - break; - case OOT_PAL_GC_DBG1: - version.version = "GameCube Debug 1.0"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_GC_DBG1; - break; - case OOT_PAL_GC_DBG2: - version.version = "GameCube Debug 2.0"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_GC_DBG2; - break; - case OOT_PAL_GC_MQ_DBG: - version.version = "GameCube MQ-Debug"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_MQ_DBG; - break; - case OOT_IQUE_CN: - version.version = "OoT IQue"; - version.listPath = "ique.txt"; - version.offset = OOT_OFF_CN_IQUE; - break; - case OOT_IQUE_TW: - version.version = "TW IQue"; - version.listPath = "ique.txt"; - version.offset = OOT_OFF_TW_IQUE; - break; - } - - auto path = StringHelper::Sprintf("%s/%s", Globals::Instance->fileListPath.string().c_str(), version.listPath.c_str()); - auto txt = DiskFile::ReadAllText(path); - std::vector lines = StringHelper::Split(txt, "\n"); - - std::vector decompressedData(1); - - for (int i = 0; i < lines.size(); i++) - { - lines[i] = StringHelper::Strip(lines[i], "\r"); - const int romOffset = version.offset + (DMA_ENTRY_SIZE * i); - - const int virtStart = BitConverter::ToInt32BE(romData, romOffset + 0); - const int virtEnd = BitConverter::ToInt32BE(romData, romOffset + 4); - const int physStart = BitConverter::ToInt32BE(romData, romOffset + 8); - const int physEnd = BitConverter::ToInt32BE(romData, romOffset + 12); - - const bool compressed = physEnd != 0; - int size = compressed ? physEnd - physStart : virtEnd - virtStart; - - auto outData = std::vector(); - outData.resize(size); - memcpy(outData.data(), romData.data() + physStart, size); - - if (compressed) - { - int decSize = virtEnd - virtStart; - decompressedData = std::vector(); - decompressedData.resize(decSize); - yaz0_decode(outData.data(), decompressedData.data(), decSize); - files[lines[i]] = decompressedData; - } - else - files[lines[i]] = outData; - - //DiskFile::WriteAllBytes(StringHelper::Sprintf("baserom/%s", lines[i].c_str()), files[lines[i]]); - } -} - -std::vector ZRom::GetFile(std::string fileName) -{ - return files[fileName]; -} diff --git a/ZAPDTR/ZAPD/ZRom.h b/ZAPDTR/ZAPD/ZRom.h deleted file mode 100644 index 6225a1ada..000000000 --- a/ZAPDTR/ZAPD/ZRom.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -class ZRom -{ -public: - ZRom(std::string romPath); - - std::vector GetFile(std::string fileName); - bool IsMQ(); - -protected: - std::vector romData; - std::map> files; -}; - -struct RomVersion -{ - std::string version = "None"; - std::string error = "None"; - std::string listPath = "None"; - int offset; - uint32_t crc; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp deleted file mode 100644 index 3f64af168..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "EndMarker.h" - -EndMarker::EndMarker(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string EndMarker::GetBodySourceCode() const -{ - return "SCENE_CMD_END()"; -} - -std::string EndMarker::GetCommandCName() const -{ - return "SCmdEndMarker"; -} - -RoomCommand EndMarker::GetRoomCommand() const -{ - return RoomCommand::EndMarker; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h b/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h deleted file mode 100644 index daa477c94..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class EndMarker : public ZRoomCommand -{ -public: - EndMarker(ZFile* nParent); - - std::string GetBodySourceCode() const override; - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp deleted file mode 100644 index ee0183706..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "SetActorCutsceneList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetActorCutsceneList::SetActorCutsceneList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetActorCutsceneList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numCutscenes = cmdArg1; - offset_t currentPtr = segmentOffset; - - cutscenes.reserve(numCutscenes); - for (int32_t i = 0; i < numCutscenes; i++) - { - ActorCutsceneEntry entry(parent->GetRawData(), currentPtr); - cutscenes.push_back(entry); - - currentPtr += 16; - } -} - -void SetActorCutsceneList::DeclareReferences(const std::string& prefix) -{ - if (cutscenes.size() > 0) - { - std::string declaration; - - for (size_t i = 0; i < cutscenes.size(); i++) - { - const auto& entry = cutscenes.at(i); - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - - if (i + 1 < cutscenes.size()) - { - declaration += "\n"; - } - } - - std::string typeName = cutscenes.at(0).GetSourceTypeName(); - - parent->AddDeclarationArray( - segmentOffset, GetDeclarationAlignment(), cutscenes.size() * 16, typeName, - StringHelper::Sprintf("%s%sList_%06X", prefix.c_str(), typeName.c_str(), segmentOffset), - cutscenes.size(), declaration); - } -} - -std::string SetActorCutsceneList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorCutscene", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_LIST(%i, %s)", cutscenes.size(), - listName.c_str()); -} - -std::string SetActorCutsceneList::GetCommandCName() const -{ - return "SCmdCutsceneActorList"; -} - -RoomCommand SetActorCutsceneList::GetRoomCommand() const -{ - return RoomCommand::SetActorCutsceneList; -} - -ActorCutsceneEntry::ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) - : priority(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), - length(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToInt16BE(rawData, rawDataIndex + 6)), - additionalCutscene(BitConverter::ToInt16BE(rawData, rawDataIndex + 8)), - sound(rawData[rawDataIndex + 0xA]), unkB(rawData[rawDataIndex + 0xB]), - unkC(BitConverter::ToInt16BE(rawData, rawDataIndex + 0xC)), unkE(rawData[rawDataIndex + 0xE]), - letterboxSize(rawData[rawDataIndex + 0xF]) -{ -} - -std::string ActorCutsceneEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%i, %i, %i, %i, %i, %i, %i, %i, %i, %i", priority, length, unk4, - unk6, additionalCutscene, sound, unkB, unkC, unkE, letterboxSize); -} - -std::string ActorCutsceneEntry::GetSourceTypeName() const -{ - return "ActorCutscene"; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h deleted file mode 100644 index 8fd48e425..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class ActorCutsceneEntry -{ -protected: - int16_t priority; - int16_t length; - int16_t unk4; - int16_t unk6; - int16_t additionalCutscene; - uint8_t sound; - uint8_t unkB; - int16_t unkC; - uint8_t unkE; - uint8_t letterboxSize; - -public: - ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - std::string GetSourceTypeName() const; -}; - -class SetActorCutsceneList : public ZRoomCommand -{ -public: - std::vector cutscenes; - - SetActorCutsceneList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp deleted file mode 100644 index 0e667c058..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "SetActorList.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZRoom.h" - -SetActorList::SetActorList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetActorList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - numActors = cmdArg1; - - actorList = new ZActorList(parent); - actorList->ExtractFromBinary(segmentOffset, numActors); -} - -void SetActorList::DeclareReferences(const std::string& prefix) -{ - if (parent->HasDeclaration(segmentOffset)) - { - delete actorList; - actorList = static_cast(parent->FindResource(segmentOffset)); - assert(actorList != nullptr); - assert(actorList->GetResourceType() == ZResourceType::ActorList); - return; - } - - if (actorList->GetName() == "") - { - actorList->SetName(actorList->GetDefaultName(prefix)); - } - actorList->DeclareVar(prefix, ""); - parent->AddResource(actorList); -} - -std::string SetActorList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName, - parent->workerID); - - return StringHelper::Sprintf("SCENE_CMD_ACTOR_LIST(%i, %s)", numActors, listName.c_str()); -} - -std::string SetActorList::GetCommandCName() const -{ - return "SCmdActorList"; -} - -RoomCommand SetActorList::GetRoomCommand() const -{ - return RoomCommand::SetActorList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h deleted file mode 100644 index 9122c15bb..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "ZActorList.h" -#include "ZRoom/ZRoomCommand.h" - -class SetActorList : public ZRoomCommand -{ -public: - uint32_t numActors; - ZActorList* actorList = nullptr; - - SetActorList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -protected: - size_t GetActorListArraySize() const; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp deleted file mode 100644 index 9e61c6a76..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "SetAlternateHeaders.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetAlternateHeaders::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (cmdArg2 != 0) - { - std::string varName = - StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetAlternateHeaders::ParseRawDataLate() -{ - size_t numHeaders = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 4; - - headers.reserve(numHeaders); - for (uint32_t i = 0; i < numHeaders; i++) - { - int32_t address = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + (i * 4)); - headers.push_back(address); - - if (address != 0 && parent->GetDeclaration(GETSEGOFFSET(address)) == nullptr) - { - ZRoom* altheader = new ZRoom(parent); - altheader->ExtractFromBinary(GETSEGOFFSET(address), zRoom->GetResourceType()); - altheader->DeclareReferences(parent->GetName()); - - parent->resources.push_back(altheader); - } - } -} - -void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix) -{ - if (!headers.empty()) - { - std::string declaration; - - for (size_t i = 0; i < headers.size(); i++) - { - std::string altHeaderName; - Globals::Instance->GetSegmentedPtrName(headers.at(i), parent, "", altHeaderName, - parent->workerID); - - declaration += StringHelper::Sprintf("\t%s,", altHeaderName.c_str()); - - if (i + 1 < headers.size()) - declaration += "\n"; - } - - std::string varName = - StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, GetDeclarationAlignment(), headers.size() * 4, - "SceneCmd*", varName, headers.size(), declaration); - } -} - -std::string SetAlternateHeaders::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "SceneCmd*", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ALTERNATE_HEADER_LIST(%s)", listName.c_str()); -} - -std::string SetAlternateHeaders::GetCommandCName() const -{ - return "SCmdAltHeaders"; -} - -RoomCommand SetAlternateHeaders::GetRoomCommand() const -{ - return RoomCommand::SetAlternateHeaders; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h deleted file mode 100644 index e66df936d..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoom.h" -#include "ZRoom/ZRoomCommand.h" - -class SetAlternateHeaders : public ZRoomCommand -{ -public: - std::vector headers; - - SetAlternateHeaders(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp deleted file mode 100644 index 73f72136c..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/** - * File: SetAnimatedMaterialList.cpp - * Description: Defines a class SetAnimatedMaterialList to enable ZRoom to declare - * ZTextureAnimations, using that ZResource to do the work. - */ -#include "SetAnimatedMaterialList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" -#include "ZTextureAnimation.h" - -SetAnimatedMaterialList::SetAnimatedMaterialList(ZFile* nParent) - : ZRoomCommand(nParent), textureAnimation(nParent) -{ -} - -void SetAnimatedMaterialList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - textureAnimation.ExtractFromFile(segmentOffset); -} - -void SetAnimatedMaterialList::DeclareReferences(const std::string& prefix) -{ - textureAnimation.SetName(textureAnimation.GetDefaultName(prefix.c_str())); - textureAnimation.DeclareReferences(prefix); - textureAnimation.GetSourceOutputCode(prefix); -} - -std::string SetAnimatedMaterialList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "AnimatedMaterial", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ANIMATED_MATERIAL_LIST(%s)", listName.c_str()); -} - -std::string SetAnimatedMaterialList::GetCommandCName() const -{ - return "SCmdTextureAnimations"; -} - -RoomCommand SetAnimatedMaterialList::GetRoomCommand() const -{ - return RoomCommand::SetAnimatedMaterialList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h deleted file mode 100644 index 3dbbf9684..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" -#include "ZTextureAnimation.h" - -class SetAnimatedMaterialList : public ZRoomCommand -{ -public: - SetAnimatedMaterialList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - ZTextureAnimation textureAnimation; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp deleted file mode 100644 index ae2d31c81..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "SetCameraSettings.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetCameraSettings::SetCameraSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCameraSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - cameraMovement = cmdArg1; - mapHighlight = BitConverter::ToUInt32BE(parent->GetRawData(), rawDataIndex + 4); -} - -std::string SetCameraSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_MISC_SETTINGS(0x%02X, 0x%08X)", cameraMovement, - mapHighlight); -} - -std::string SetCameraSettings::GetCommandCName() const -{ - return "SCmdMiscSettings"; -} - -RoomCommand SetCameraSettings::GetRoomCommand() const -{ - return RoomCommand::SetCameraSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h deleted file mode 100644 index a8fed44ec..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetCameraSettings : public ZRoomCommand -{ -public: - uint8_t cameraMovement; - uint32_t mapHighlight; - - SetCameraSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp deleted file mode 100644 index 4aafb7c70..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "SetCollisionHeader.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCollisionHeader::SetCollisionHeader(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCollisionHeader::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - - collisionHeader = new ZCollisionHeader(parent); - collisionHeader->SetName( - StringHelper::Sprintf("%sCollisionHeader_%06X", parent->GetName().c_str(), segmentOffset)); - collisionHeader->ExtractFromFile(segmentOffset); - parent->AddResource(collisionHeader); -} - -void SetCollisionHeader::DeclareReferences(const std::string& prefix) -{ - collisionHeader->DeclareVar(prefix, ""); -} - -std::string SetCollisionHeader::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CollisionHeader", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_COL_HEADER(%s)", listName.c_str()); -} - -std::string SetCollisionHeader::GetCommandCName() const -{ - return "SCmdColHeader"; -} - -RoomCommand SetCollisionHeader::GetRoomCommand() const -{ - return RoomCommand::SetCollisionHeader; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h deleted file mode 100644 index f7d5ecf35..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZCollision.h" -#include "ZRoom/ZRoomCommand.h" - -class SetCollisionHeader : public ZRoomCommand -{ -public: - ZCollisionHeader* collisionHeader; - - SetCollisionHeader(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp deleted file mode 100644 index 5a9ae128e..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp +++ /dev/null @@ -1,155 +0,0 @@ -#include "SetCsCamera.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCsCamera::SetCsCamera(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCsCamera::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numCameras = cmdArg1; - - uint32_t currentPtr = segmentOffset; - int32_t numPoints = 0; - - cameras.reserve(numCameras); - for (int32_t i = 0; i < numCameras; i++) - { - CsCameraEntry entry(parent->GetRawData(), currentPtr); - numPoints += entry.GetNumPoints(); - - currentPtr += entry.GetRawDataSize(); - cameras.push_back(entry); - } - - if (numPoints > 0) - { - uint32_t currentPtr = cameras.at(0).GetSegmentOffset(); - - points.reserve(numPoints); - for (int32_t i = 0; i < numPoints; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - points.push_back(vec); - } - } -} - -void SetCsCamera::DeclareReferences(const std::string& prefix) -{ - if (points.size() > 0) - { - std::string declaration; - size_t index = 0; - for (auto& point : points) - { - declaration += StringHelper::Sprintf("\t{ %s },", point.GetBodySourceCode().c_str()); - - if (index < points.size() - 1) - declaration += "\n"; - - index++; - } - - uint32_t segOffset = cameras.at(0).GetSegmentOffset(); - - parent->AddDeclarationArray( - segOffset, DeclarationAlignment::Align4, points.size() * points.at(0).GetRawDataSize(), - points.at(0).GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sCsCameraPoints_%06X", prefix.c_str(), segOffset), - points.size(), declaration); - } - - if (!cameras.empty()) - { - std::string camPointsName; - Globals::Instance->GetSegmentedPtrName(cameras.at(0).GetCamAddress(), parent, "Vec3s", - camPointsName, parent->workerID); - std::string declaration; - - size_t index = 0; - size_t pointsIndex = 0; - for (const auto& entry : cameras) - { - declaration += - StringHelper::Sprintf("\t{ %i, %i, &%s[%i] },", entry.type, entry.numPoints, - camPointsName.c_str(), pointsIndex); - - if (index < cameras.size() - 1) - declaration += "\n"; - - index++; - pointsIndex += entry.GetNumPoints(); - } - - const auto& entry = cameras.front(); - std::string camTypename = entry.GetSourceTypeName(); - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, cameras.size() * entry.GetRawDataSize(), - camTypename, - StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), camTypename.c_str(), segmentOffset), - cameras.size(), declaration); - } -} - -std::string SetCsCamera::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CsCameraEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(%i, %s)", cameras.size(), - listName.c_str()); -} - -std::string SetCsCamera::GetCommandCName() const -{ - return "SCmdCsCameraList"; -} - -RoomCommand SetCsCamera::GetRoomCommand() const -{ - return RoomCommand::SetCsCamera; -} - -CsCameraEntry::CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex) - : baseOffset(rawDataIndex), type(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), - numPoints(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)) -{ - camAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); - segmentOffset = GETSEGOFFSET(camAddress); -} - -std::string CsCameraEntry::GetSourceTypeName() const -{ - return "CsCameraEntry"; -} - -int32_t CsCameraEntry::GetRawDataSize() const -{ - return 8; -} - -int16_t CsCameraEntry::GetNumPoints() const -{ - return numPoints; -} - -segptr_t CsCameraEntry::GetCamAddress() const -{ - return camAddress; -} - -uint32_t CsCameraEntry::GetSegmentOffset() const -{ - return segmentOffset; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h deleted file mode 100644 index 5e0e3c825..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" -#include "ZVector.h" - -class CsCameraEntry -{ -public: - CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetSourceTypeName() const; - int32_t GetRawDataSize() const; - - int16_t GetNumPoints() const; - segptr_t GetCamAddress() const; - uint32_t GetSegmentOffset() const; - - int baseOffset; - int16_t type; - int16_t numPoints; - segptr_t camAddress; - uint32_t segmentOffset; -}; - -class SetCsCamera : public ZRoomCommand -{ -public: - std::vector cameras; - std::vector points; - - SetCsCamera(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp deleted file mode 100644 index 68ff58c19..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "SetCutscenes.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCutscenes::SetCutscenes(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCutscenes::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - - numCutscenes = cmdArg1; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - int32_t currentPtr = segmentOffset; - - cutsceneEntries.reserve(numCutscenes); - for (uint8_t i = 0; i < numCutscenes; i++) - { - CutsceneEntry entry(parent->GetRawData(), currentPtr); - cutsceneEntries.push_back(entry); - currentPtr += 8; - } - } - else if (Globals::Instance->game == ZGame::OOT_RETAIL || Globals::Instance->game == ZGame::OOT_SW97) - { - ZCutscene* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(segmentOffset); - - auto decl = parent->GetDeclaration(segmentOffset); - if (decl == nullptr) - { - cutscene->DeclareVar(zRoom->GetName().c_str(), ""); - } - - cutscenes.push_back(cutscene); - } -} - -void SetCutscenes::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - std::string declaration; - size_t i = 0; - - for (const auto& entry : cutsceneEntries) - { - if (entry.segmentPtr != SEGMENTED_NULL && - GETSEGNUM(entry.segmentPtr) == parent->segment) - { - offset_t csOffset = Seg2Filespace(entry.segmentPtr, parent->baseAddress); - if (!parent->HasDeclaration(csOffset)) - { - auto* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(csOffset); - cutscene->SetName(cutscene->GetDefaultName(varPrefix)); - cutscene->DeclareVar(varPrefix, ""); - cutscene->DeclareReferences(varPrefix); - parent->AddResource(cutscene); - } - } - - std::string csName; - Globals::Instance->GetSegmentedPtrName(entry.segmentPtr, parent, "CutsceneData", - csName, parent->workerID); - - declaration += - StringHelper::Sprintf(" { %s, 0x%04X, 0x%02X, 0x%02X },", csName.c_str(), - entry.exit, entry.entrance, entry.flag); - - if (i + 1 < numCutscenes) - declaration += "\n"; - - i++; - } - - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, - cutsceneEntries.size() * 8, "CutsceneEntry", - StringHelper::Sprintf("%sCutsceneEntryList_%06X", - zRoom->GetName().c_str(), segmentOffset), - cutsceneEntries.size(), declaration); - } - else - { - if (cmdArg2 != SEGMENTED_NULL && GETSEGNUM(cmdArg2) == parent->segment) - { - offset_t csOffset = Seg2Filespace(cmdArg2, parent->baseAddress); - if (!parent->HasDeclaration(csOffset)) - { - auto* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(csOffset); - cutscene->SetName(cutscene->GetDefaultName(varPrefix)); - cutscene->DeclareVar(varPrefix, ""); - cutscene->DeclareReferences(varPrefix); - parent->AddResource(cutscene); - } - } - } -} - -std::string SetCutscenes::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName, - parent->workerID); - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_LIST(%i, %s)", numCutscenes, - listName.c_str()); - } - - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_DATA(%s)", listName.c_str()); -} - -std::string SetCutscenes::GetCommandCName() const -{ - return "SCmdCutsceneData"; -} - -RoomCommand SetCutscenes::GetRoomCommand() const -{ - return RoomCommand::SetCutscenes; -} - -CutsceneEntry::CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) - : segmentPtr(BitConverter::ToInt32BE(rawData, rawDataIndex + 0)), - exit(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), entrance(rawData[rawDataIndex + 6]), - flag(rawData[rawDataIndex + 7]) -{ -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h deleted file mode 100644 index b1d175fec..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "ZCutscene.h" -#include "ZRoom/ZRoomCommand.h" - -class CutsceneEntry -{ -public: - CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); - - segptr_t segmentPtr; - uint16_t exit; - uint8_t entrance; - uint8_t flag; -}; - -class SetCutscenes : public ZRoomCommand -{ -public: - std::vector cutscenes; - std::vector cutsceneEntries; // (MM Only) - uint8_t numCutscenes; // (MM Only) - - SetCutscenes(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp deleted file mode 100644 index 79a278bc6..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "SetEchoSettings.h" -#include "Utils/StringHelper.h" - -SetEchoSettings::SetEchoSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetEchoSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - echo = parent->GetRawData().at(rawDataIndex + 0x07); -} - -std::string SetEchoSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_ECHO_SETTINGS(%i)", echo); -} - -std::string SetEchoSettings::GetCommandCName() const -{ - return "SCmdEchoSettings"; -} - -RoomCommand SetEchoSettings::GetRoomCommand() const -{ - return RoomCommand::SetEchoSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h deleted file mode 100644 index 82b8c27db..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetEchoSettings : public ZRoomCommand -{ -public: - uint8_t echo; - - SetEchoSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp deleted file mode 100644 index 6749e1770..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "SetEntranceList.h" - -#include "Globals.h" -#include "SetStartPositionList.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetEntranceList::SetEntranceList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetEntranceList::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sEntranceList0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetEntranceList::ParseRawDataLate() -{ - // Parse Entrances and Generate Declaration - uint32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; - uint32_t currentPtr = segmentOffset; - - entrances.reserve(numEntrances); - for (uint32_t i = 0; i < numEntrances; i++) - { - EntranceEntry entry(parent->GetRawData(), currentPtr); - entrances.push_back(entry); - - currentPtr += 2; - } -} - -void SetEntranceList::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ - if (!entrances.empty()) - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : entrances) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < entrances.size()) - declaration += "\n"; - - index++; - } - - std::string varName = - StringHelper::Sprintf("%sEntranceList0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, - entrances.size() * 2, "EntranceEntry", varName, - entrances.size(), declaration); - } -} - -std::string SetEntranceList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "EntranceEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ENTRANCE_LIST(%s)", listName.c_str()); -} - -std::string SetEntranceList::GetCommandCName() const -{ - return "SCmdEntranceList"; -} - -RoomCommand SetEntranceList::GetRoomCommand() const -{ - return RoomCommand::SetEntranceList; -} - -EntranceEntry::EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex) -{ - startPositionIndex = rawData.at(rawDataIndex + 0); - roomToLoad = rawData.at(rawDataIndex + 1); -} - -std::string EntranceEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, 0x%02X", startPositionIndex, roomToLoad); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h deleted file mode 100644 index e13e9a8ce..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class EntranceEntry -{ -public: - uint8_t startPositionIndex; - uint8_t roomToLoad; - - EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class SetEntranceList : public ZRoomCommand -{ -public: - std::vector entrances; - - SetEntranceList(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp deleted file mode 100644 index 3b9ce2dfa..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "SetExitList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetExitList::SetExitList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetExitList::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sExitList_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetExitList::ParseRawDataLate() -{ - // Parse Entrances and Generate Declaration - uint32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; - uint32_t currentPtr = segmentOffset; - - exits.reserve(numEntrances); - for (uint32_t i = 0; i < numEntrances; i++) - { - uint16_t exit = BitConverter::ToUInt16BE(parent->GetRawData(), currentPtr); - exits.push_back(exit); - - currentPtr += 2; - } -} - -void SetExitList::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ - if (!exits.empty()) - { - std::string declaration; - - for (size_t i = 0; i < exits.size(); i++) - { - declaration += - StringHelper::Sprintf(" %s,", ZNames::GetEntranceName(exits[i]).c_str()); - if (i + 1 < exits.size()) - declaration += "\n"; - } - - std::string varName = - StringHelper::Sprintf("%sExitList_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, exits.size() * 2, - "u16", varName, exits.size(), declaration); - } -} - -std::string SetExitList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "u16", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_EXIT_LIST(%s)", listName.c_str()); -} - -std::string SetExitList::GetCommandCName() const -{ - return "SCmdExitList"; -} - -RoomCommand SetExitList::GetRoomCommand() const -{ - return RoomCommand::SetExitList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h deleted file mode 100644 index 9d2791a83..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetExitList : public ZRoomCommand -{ -public: - std::vector exits; - - SetExitList(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp deleted file mode 100644 index 4c551be13..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "SetLightList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetLightList::SetLightList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetLightList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - std::string declarations; - - numLights = cmdArg1; - int32_t currentPtr = segmentOffset; - - lights.reserve(this->numLights); - for (int i = 0; i < this->numLights; i++) - { - LightInfo light(parent->GetRawData(), currentPtr); - - currentPtr += light.GetRawDataSize(); - lights.push_back(light); - } -} - -void SetLightList::DeclareReferences(const std::string& prefix) -{ - if (!lights.empty()) - { - std::string declarations; - - for (size_t i = 0; i < lights.size(); i++) - { - declarations += - StringHelper::Sprintf("\t{ %s },", lights.at(i).GetBodySourceCode().c_str()); - - if (i < lights.size() - 1) - declarations += "\n"; - } - - const auto& light = lights.front(); - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, lights.size() * light.GetRawDataSize(), - light.GetSourceTypeName(), - StringHelper::Sprintf("%sLightInfo0x%06X", prefix.c_str(), segmentOffset), - lights.size(), declarations); - } -} - -std::string SetLightList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightInfo", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_LIGHT_LIST(%i, %s)", numLights, listName.c_str()); -} - -std::string SetLightList::GetCommandCName() const -{ - return "SCmdLightList"; -} - -RoomCommand SetLightList::GetRoomCommand() const -{ - return RoomCommand::SetLightList; -} - -LightInfo::LightInfo(const std::vector& rawData, uint32_t rawDataIndex) -{ - type = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - r = BitConverter::ToUInt8BE(rawData, rawDataIndex + 8); - g = BitConverter::ToUInt8BE(rawData, rawDataIndex + 9); - b = BitConverter::ToUInt8BE(rawData, rawDataIndex + 10); - drawGlow = BitConverter::ToUInt8BE(rawData, rawDataIndex + 11); - radius = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); -} - -std::string LightInfo::GetBodySourceCode() const -{ - return StringHelper::Sprintf( - "0x%02X, { %i, %i, %i, { 0x%02X, 0x%02X, 0x%02X }, 0x%02X, 0x%04X }", type, x, y, z, r, g, - b, drawGlow, radius); -} - -std::string LightInfo::GetSourceTypeName() const -{ - return "LightInfo"; -} - -size_t LightInfo::GetRawDataSize() const -{ - return 0x0E; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h deleted file mode 100644 index 894a21530..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include - -#include "ZFile.h" -#include "ZRoom/ZRoom.h" -#include "ZRoom/ZRoomCommand.h" - -class LightInfo -{ -public: - LightInfo(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - std::string GetSourceTypeName() const; - size_t GetRawDataSize() const; - -public: - uint8_t type; - int16_t x, y, z; - uint8_t r, g, b; - uint8_t drawGlow; - int16_t radius; -}; - -class SetLightList : public ZRoomCommand -{ -public: - uint8_t numLights; - std::vector lights; - - SetLightList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp deleted file mode 100644 index 547862a52..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include "SetLightingSettings.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetLightingSettings::SetLightingSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetLightingSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t numLights = cmdArg1; - - settings.reserve(numLights); - for (int i = 0; i < numLights; i++) - settings.push_back(LightingSettings(parent->GetRawData(), segmentOffset + (i * 22))); -} - -void SetLightingSettings::DeclareReferences(const std::string& prefix) -{ - if (settings.size() > 0) - { - std::string declaration; - - for (size_t i = 0; i < settings.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", settings.at(i).GetBodySourceCode().c_str()); - if (i + 1 < settings.size()) - declaration += "\n"; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, - settings.size() * settings.front().GetRawDataSize(), "LightSettings", - StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), - settings.size(), declaration); - } -} - -std::string SetLightingSettings::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ENV_LIGHT_SETTINGS(%i, %s)", settings.size(), - listName.c_str()); -} - -std::string SetLightingSettings::GetCommandCName() const -{ - return "SCmdLightSettingList"; -} - -RoomCommand SetLightingSettings::GetRoomCommand() const -{ - return RoomCommand::SetLightingSettings; -} - -LightingSettings::LightingSettings(const std::vector& rawData, uint32_t rawDataIndex) -{ - ambientClrR = rawData.at(rawDataIndex + 0); - ambientClrG = rawData.at(rawDataIndex + 1); - ambientClrB = rawData.at(rawDataIndex + 2); - - diffuseClrA_R = rawData.at(rawDataIndex + 3); - diffuseClrA_G = rawData.at(rawDataIndex + 4); - diffuseClrA_B = rawData.at(rawDataIndex + 5); - - diffuseDirA_X = rawData.at(rawDataIndex + 6); - diffuseDirA_Y = rawData.at(rawDataIndex + 7); - diffuseDirA_Z = rawData.at(rawDataIndex + 8); - - diffuseClrB_R = rawData.at(rawDataIndex + 9); - diffuseClrB_G = rawData.at(rawDataIndex + 10); - diffuseClrB_B = rawData.at(rawDataIndex + 11); - - diffuseDirB_X = rawData.at(rawDataIndex + 12); - diffuseDirB_Y = rawData.at(rawDataIndex + 13); - diffuseDirB_Z = rawData.at(rawDataIndex + 14); - - fogClrR = rawData.at(rawDataIndex + 15); - fogClrG = rawData.at(rawDataIndex + 16); - fogClrB = rawData.at(rawDataIndex + 17); - - unk = BitConverter::ToInt16BE(rawData, rawDataIndex + 18); - drawDistance = BitConverter::ToInt16BE(rawData, rawDataIndex + 20); -} - -std::string LightingSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf( - "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, " - "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%04X, 0x%04X", - ambientClrR, ambientClrG, ambientClrB, diffuseClrA_R, diffuseClrA_G, diffuseClrA_B, - diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z, diffuseClrB_R, diffuseClrB_G, diffuseClrB_B, - diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z, fogClrR, fogClrG, fogClrB, unk, drawDistance); -} - -size_t LightingSettings::GetRawDataSize() const -{ - return 0x16; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h deleted file mode 100644 index 29caf4aa6..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class LightingSettings -{ -public: - uint8_t ambientClrR, ambientClrG, ambientClrB; - uint8_t diffuseClrA_R, diffuseClrA_G, diffuseClrA_B; - uint8_t diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z; - uint8_t diffuseClrB_R, diffuseClrB_G, diffuseClrB_B; - uint8_t diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z; - uint8_t fogClrR, fogClrG, fogClrB; - uint16_t unk; - uint16_t drawDistance; - - LightingSettings(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - size_t GetRawDataSize() const; -}; - -class SetLightingSettings : public ZRoomCommand -{ -public: - std::vector settings; - - SetLightingSettings(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp deleted file mode 100644 index c6f2d7dca..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp +++ /dev/null @@ -1,616 +0,0 @@ -#include "SetMesh.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZBackground.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList); - -SetMesh::SetMesh(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMesh::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - auto& parentRawData = parent->GetRawData(); - meshHeaderType = parentRawData.at(segmentOffset); - - switch (meshHeaderType) - { - case 0: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - case 1: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - case 2: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - default: - HANDLE_ERROR(WarningType::InvalidExtractedData, - StringHelper::Sprintf("unknown meshHeaderType: %i", meshHeaderType), ""); - } - - polyType->ParseRawData(); -} - -void SetMesh::DeclareReferences(const std::string& prefix) -{ - polyType->SetName(polyType->GetDefaultName(prefix)); - polyType->DeclareReferences(prefix); - polyType->DeclareAndGenerateOutputCode(prefix); -} - -// TODO: is this really needed? -void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) -{ - if (dList == nullptr) - return; - - dList->DeclareReferences(zRoom->GetName()); - - for (ZDisplayList* otherDList : dList->otherDLists) - GenDListDeclarations(zRoom, parent, otherDList); -} - -std::string SetMesh::GenDListExterns(ZDisplayList* dList) -{ - std::string sourceOutput; - - sourceOutput += StringHelper::Sprintf("extern Gfx %sDL_%06X[];\n", zRoom->GetName().c_str(), - dList->GetRawDataIndex()); - - for (ZDisplayList* otherDList : dList->otherDLists) - sourceOutput += GenDListExterns(otherDList); - - return sourceOutput; -} - -std::string SetMesh::GetBodySourceCode() const -{ - std::string list; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "", list, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MESH(%s)", list.c_str()); -} - -std::string SetMesh::GetCommandCName() const -{ - return "SCmdMesh"; -} - -RoomCommand SetMesh::GetRoomCommand() const -{ - return RoomCommand::SetMesh; -} - -PolygonDlist::PolygonDlist(ZFile* nParent) : ZResource(nParent) -{ -} - -void PolygonDlist::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - switch (polyType) - { - case 2: - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - unk_06 = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - - opa = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - break; - - default: - opa = BitConverter::ToUInt32BE(rawData, rawDataIndex); - xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - break; - } -} - -void PolygonDlist::DeclareReferences(const std::string& prefix) -{ - opaDList = MakeDlist(opa, prefix); - xluDList = MakeDlist(xlu, prefix); -} - -std::string PolygonDlist::GetBodySourceCode() const -{ - std::string bodyStr; - std::string opaStr; - std::string xluStr; - Globals::Instance->GetSegmentedPtrName(opa, parent, "Gfx", opaStr, parent->workerID); - Globals::Instance->GetSegmentedPtrName(xlu, parent, "Gfx", xluStr, parent->workerID); - - if (polyType == 2) - { - bodyStr += StringHelper::Sprintf("{ %6i, %6i, %6i }, %6i, ", x, y, z, unk_06); - } - - bodyStr += StringHelper::Sprintf("%s, %s", opaStr.c_str(), xluStr.c_str()); - - return bodyStr; -} - -void PolygonDlist::GetSourceOutputCode(const std::string& prefix) -{ - std::string bodyStr = StringHelper::Sprintf("\n\t%s\n", GetBodySourceCode().c_str()); - - Declaration* decl = parent->GetDeclaration(rawDataIndex); - - if (decl == nullptr) - DeclareVar(prefix, bodyStr); - else - decl->text = bodyStr; -} - -std::string PolygonDlist::GetSourceTypeName() const -{ - switch (polyType) - { - case 2: - return "PolygonDlist2"; - - default: - return "PolygonDlist"; - } -} - -ZResourceType PolygonDlist::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t PolygonDlist::GetRawDataSize() const -{ - switch (polyType) - { - case 2: - return 0x10; - - default: - return 0x08; - } -} - -void PolygonDlist::SetPolyType(uint8_t nPolyType) -{ - polyType = nPolyType; -} - -ZDisplayList* PolygonDlist::MakeDlist(segptr_t ptr, [[maybe_unused]] const std::string& prefix) -{ - if (ptr == 0) - { - return nullptr; - } - - uint32_t dlistAddress = Seg2Filespace(ptr, parent->baseAddress); - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), dlistAddress, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - ZDisplayList* dlist = new ZDisplayList(parent); - parent->AddResource(dlist); - dlist->ExtractFromBinary(dlistAddress, dlistLength); - dlist->SetName(dlist->GetDefaultName(prefix)); - GenDListDeclarations(zRoom, parent, dlist); - - return dlist; -} - -/* BgImage */ - -BgImage::BgImage(ZFile* nParent) : ZResource(nParent) -{ -} - -BgImage::BgImage(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, - ZFile* nParent) - : BgImage(nParent) -{ - rawDataIndex = nRawDataIndex; - parent = nParent; - isSubStruct = nIsSubStruct; - - name = GetDefaultName(prefix); - - ParseRawData(); - sourceBackground = MakeBackground(source, prefix); -} - -void BgImage::ParseRawData() -{ - size_t pad = 0x00; - const auto& rawData = parent->GetRawData(); - if (!isSubStruct) - { - pad = 0x04; - - unk_00 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - id = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x02); - } - source = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x00); - unk_0C = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x04); - tlut = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x08); - width = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x0C); - height = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x0E); - fmt = BitConverter::ToUInt8BE(rawData, rawDataIndex + pad + 0x10); - siz = BitConverter::ToUInt8BE(rawData, rawDataIndex + pad + 0x11); - mode0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x12); - tlutCount = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x14); -} - -ZBackground* BgImage::MakeBackground(segptr_t ptr, const std::string& prefix) -{ - if (ptr == 0) - return nullptr; - - uint32_t backAddress = Seg2Filespace(ptr, parent->baseAddress); - - ZBackground* background = new ZBackground(parent); - background->ExtractFromFile(backAddress); - - std::string defaultName = background->GetDefaultName(prefix); - background->SetName(defaultName); - background->SetOutName(defaultName); - - background->DeclareVar(prefix, ""); - parent->resources.push_back(background); - - return background; -} - -size_t BgImage::GetRawDataSize() const -{ - return 0x1C; -} - -std::string BgImage::GetBodySourceCode() const -{ - std::string bodyStr = " "; - if (!isSubStruct) - { - bodyStr += "{ \n "; - } - - if (!isSubStruct) - { - bodyStr += StringHelper::Sprintf("0x%04X, ", unk_00); - bodyStr += StringHelper::Sprintf("%i, ", id); - bodyStr += "\n "; - bodyStr += " "; - } - - std::string backgroundName; - Globals::Instance->GetSegmentedPtrName(source, parent, "", backgroundName, parent->workerID); - bodyStr += StringHelper::Sprintf("%s, ", backgroundName.c_str()); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("0x%08X, ", unk_0C); - bodyStr += StringHelper::Sprintf("0x%08X, ", tlut); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("%i, ", width); - bodyStr += StringHelper::Sprintf("%i, ", height); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("%i, ", fmt); - bodyStr += StringHelper::Sprintf("%i, ", siz); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("0x%04X, ", mode0); - bodyStr += StringHelper::Sprintf("0x%04X, ", tlutCount); - if (!isSubStruct) - { - bodyStr += " \n }, "; - } - else - { - bodyStr += "\n"; - } - - return bodyStr; -} - -std::string BgImage::GetSourceTypeName() const -{ - return "BgImage"; -} - -ZResourceType BgImage::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -/* PolygonType section */ - -PolygonTypeBase::PolygonTypeBase(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : ZResource(nParent), zRoom{nRoom} -{ - rawDataIndex = nRawDataIndex; - type = BitConverter::ToUInt8BE(parent->GetRawData(), rawDataIndex); -} - -void PolygonTypeBase::DeclareAndGenerateOutputCode(const std::string& prefix) -{ - std::string bodyStr = GetBodySourceCode(); - - Declaration* decl = parent->GetDeclaration(rawDataIndex); - if (decl == nullptr) - { - DeclareVar(prefix, bodyStr); - } - else - { - decl->text = bodyStr; - } -} - -std::string PolygonTypeBase::GetSourceTypeName() const -{ - switch (type) - { - case 2: - return "PolygonType2"; - - case 1: - return "PolygonType1"; - - default: - return "PolygonType0"; - } -} - -ZResourceType PolygonTypeBase::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -PolygonType1::PolygonType1(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : PolygonTypeBase(nParent, nRawDataIndex, nRoom), single(nParent) -{ -} - -void PolygonType1::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - format = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); - dlist = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - - if (format == 2) - { - count = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - list = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); - } - - if (dlist != 0) - { - PolygonDlist polyGfxList(parent); - polyGfxList.zRoom = zRoom; - polyGfxList.SetPolyType(type); - polyGfxList.ExtractFromFile(Seg2Filespace(dlist, parent->baseAddress)); - polyGfxList.DeclareReferences(zRoom->GetName()); - polyDLists.push_back(polyGfxList); - } -} - -void PolygonType1::DeclareReferences(const std::string& prefix) -{ - polyDLists.at(0).GetSourceOutputCode(prefix); - - uint32_t listAddress; - std::string bgImageArrayBody; - switch (format) - { - case 1: - single = BgImage(true, prefix, rawDataIndex + 0x08, parent); - break; - - case 2: - if (list != 0) - { - listAddress = Seg2Filespace(list, parent->baseAddress); - uint32_t auxPtr = listAddress; - - multiList.reserve(count); - for (size_t i = 0; i < count; ++i) - { - BgImage bg(false, prefix, auxPtr, parent); - multiList.push_back(bg); - auxPtr += bg.GetRawDataSize(); - bgImageArrayBody += bg.GetBodySourceCode(); - if (i + 1 < count) - { - bgImageArrayBody += "\n"; - } - } - - Declaration* decl = parent->GetDeclaration(listAddress); - if (decl == nullptr) - { - parent->AddDeclarationArray( - listAddress, DeclarationAlignment::Align4, - count * multiList.at(0).GetRawDataSize(), multiList.at(0).GetSourceTypeName(), - multiList.at(0).GetName().c_str(), count, bgImageArrayBody); - } - } - break; - - default: - HANDLE_ERROR(WarningType::InvalidExtractedData, - StringHelper::Sprintf("unknown format: %i", format), ""); - break; - } -} - -size_t PolygonType1::GetRawDataSize() const -{ - switch (format) - { - case 1: - return 0x20; - - case 2: - return 0x10; - } - return 0x20; -} - -std::string PolygonType1::GetBodySourceCode() const -{ - std::string bodyStr = "\n "; - - bodyStr += "{ "; - bodyStr += StringHelper::Sprintf("%i, %i, ", type, format); - - std::string dlistStr; - Globals::Instance->GetSegmentedPtrName(dlist, parent, "", dlistStr, parent->workerID); - - bodyStr += StringHelper::Sprintf("%s, ", dlistStr.c_str()); - bodyStr += "}, \n"; - - std::string listStr = "NULL"; - switch (format) - { - case 1: - bodyStr += single.GetBodySourceCode(); - break; - case 2: - Globals::Instance->GetSegmentedPtrName(list, parent, "BgImage", listStr, parent->workerID); - bodyStr += StringHelper::Sprintf(" %i, %s, \n", count, listStr.c_str()); - break; - - default: - break; - } - - return bodyStr; -} - -std::string PolygonType1::GetSourceTypeName() const -{ - switch (format) - { - case 1: - return "MeshHeader1Single"; - - case 2: - return "MeshHeader1Multi"; - } - return "ERROR"; - // return "PolygonType1"; -} - -PolygonType2::PolygonType2(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : PolygonTypeBase(nParent, nRawDataIndex, nRoom) -{ -} - -void PolygonType2::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - num = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); - - start = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - end = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - uint32_t currentPtr = GETSEGOFFSET(start); - - polyDLists.reserve(num); - for (size_t i = 0; i < num; i++) - { - PolygonDlist entry(parent); - entry.zRoom = zRoom; - entry.SetPolyType(type); - entry.ExtractFromFile(currentPtr); - entry.DeclareReferences(zRoom->GetName()); - polyDLists.push_back(entry); - currentPtr += entry.GetRawDataSize(); - } -} - -void PolygonType2::DeclareReferences(const std::string& prefix) -{ - if (num > 0) - { - std::string declaration; - - for (size_t i = 0; i < polyDLists.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", polyDLists.at(i).GetBodySourceCode().c_str()); - if (i + 1 < polyDLists.size()) - declaration += "\n"; - } - - std::string polyDlistType = polyDLists.at(0).GetSourceTypeName(); - std::string polyDListName; - polyDListName = StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), polyDlistType.c_str(), - GETSEGOFFSET(start)); - - Declaration* decl = parent->AddDeclarationArray( - GETSEGOFFSET(start), DeclarationAlignment::Align4, - polyDLists.size() * polyDLists.at(0).GetRawDataSize(), polyDlistType, polyDListName, - polyDLists.size(), declaration); - decl->forceArrayCnt = true; - } - - parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, 4, "s32", - StringHelper::Sprintf("%s_terminatorMaybe_%06X", - parent->GetName().c_str(), GETSEGOFFSET(end)), - "0x01000000"); -} - -std::string PolygonType2::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(start, parent, "", listName, parent->workerID); - - std::string body = StringHelper::Sprintf("\n %i, %i,\n", type, polyDLists.size()); - body += StringHelper::Sprintf(" %s,\n", listName.c_str()); - body += - StringHelper::Sprintf(" %s + ARRAY_COUNTU(%s)\n", listName.c_str(), listName.c_str()); - return body; -} - -size_t PolygonType2::GetRawDataSize() const -{ - return 0x0C; -} - -DeclarationAlignment PolygonType2::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h deleted file mode 100644 index 9d9037417..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h +++ /dev/null @@ -1,159 +0,0 @@ -#pragma once - -#include -#include "ZBackground.h" -#include "ZDisplayList.h" -#include "ZRoom/ZRoomCommand.h" - -class PolygonDlist : public ZResource -{ -public: - ZRoom* zRoom; - - uint8_t polyType; - - int16_t x, y, z; // polyType == 2 - int16_t unk_06; // polyType == 2 - - segptr_t opa = 0; // Gfx* - segptr_t xlu = 0; // Gfx* - - ZDisplayList* opaDList = nullptr; // Gfx* - ZDisplayList* xluDList = nullptr; // Gfx* - - PolygonDlist(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - - void SetPolyType(uint8_t nPolyType); - -protected: - ZDisplayList* MakeDlist(segptr_t ptr, const std::string& prefix); -}; - -class BgImage : public ZResource -{ -public: - uint16_t unk_00; - uint8_t id; - segptr_t source; - uint32_t unk_0C; - uint32_t tlut; - uint16_t width; - uint16_t height; - uint8_t fmt; - uint8_t siz; - uint16_t mode0; - uint16_t tlutCount; - - ZBackground* sourceBackground; - - bool isSubStruct; - - BgImage(ZFile* nParent); - BgImage(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - ZBackground* MakeBackground(segptr_t ptr, const std::string& prefix); -}; - -class PolygonTypeBase : public ZResource -{ -public: - uint8_t type; - std::vector polyDLists; - - PolygonTypeBase(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void DeclareAndGenerateOutputCode(const std::string& prefix); - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - -protected: - ZRoom* zRoom; -}; - -class PolygonType1 : public PolygonTypeBase -{ -public: - uint8_t format; - segptr_t dlist; - - // single - BgImage single; - - // multi - uint8_t count; - segptr_t list; // BgImage* - std::vector multiList; - - PolygonType1(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - - size_t GetRawDataSize() const override; -}; - -class PolygonType2 : public PolygonTypeBase -{ -public: - uint8_t num; - segptr_t start; - segptr_t end; - - PolygonType2(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; - -class SetMesh : public ZRoomCommand -{ -public: - uint8_t data; - uint8_t meshHeaderType; - std::shared_ptr polyType; - - SetMesh(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - std::string GenDListExterns(ZDisplayList* dList); -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp deleted file mode 100644 index 25bfae703..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "SetMinimapChests.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetMinimapChests::SetMinimapChests(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMinimapChests::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numChests = cmdArg1; - - offset_t currentPtr = segmentOffset; - - chests.reserve(numChests); - for (int32_t i = 0; i < numChests; i++) - { - MinimapChest chest(parent->GetRawData(), currentPtr); - chests.push_back(chest); - - currentPtr += 10; - } -} - -void SetMinimapChests::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - - size_t index = 0; - for (const auto& chest : chests) - { - declaration += StringHelper::Sprintf(" { %s },", chest.GetBodySourceCode().c_str()); - - if (index < chests.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, chests.size() * 10, "MinimapChest", - StringHelper::Sprintf("%sMinimapChests0x%06X", prefix.c_str(), segmentOffset), - chests.size(), declaration); -} - -std::string SetMinimapChests::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapChest", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(0x%02X, %s)", chests.size(), - listName.c_str()); -} - -std::string SetMinimapChests::GetCommandCName() const -{ - return "SCmdMinimapChests"; -} - -RoomCommand SetMinimapChests::GetRoomCommand() const -{ - return RoomCommand::SetMinimapChests; -} - -MinimapChest::MinimapChest(const std::vector& rawData, uint32_t rawDataIndex) - : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), - unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) -{ -} - -std::string MinimapChest::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, - unk8); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h deleted file mode 100644 index 0db09a8a2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class MinimapChest -{ -public: - MinimapChest(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - -protected: - uint16_t unk0; - uint16_t unk2; - uint16_t unk4; - uint16_t unk6; - uint16_t unk8; -}; - -class SetMinimapChests : public ZRoomCommand -{ -public: - std::vector chests; - - SetMinimapChests(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp deleted file mode 100644 index e02e1a92b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "SetMinimapList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetMinimapList::SetMinimapList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMinimapList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - listSegmentAddr = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset); - listSegmentOffset = GETSEGOFFSET(listSegmentAddr); - unk4 = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + 4); - - uint32_t currentPtr = listSegmentOffset; - - minimaps.reserve(zRoom->roomCount); - for (int32_t i = 0; i < zRoom->roomCount; i++) - { - MinimapEntry entry(parent->GetRawData(), currentPtr); - minimaps.push_back(entry); - - currentPtr += 10; - } -} - -void SetMinimapList::DeclareReferences(const std::string& prefix) -{ - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : minimaps) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - - if (index < minimaps.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - listSegmentOffset, DeclarationAlignment::Align4, minimaps.size() * 10, "MinimapEntry", - StringHelper::Sprintf("%sMinimapEntryList0x%06X", prefix.c_str(), listSegmentOffset), - minimaps.size(), declaration); - } - - { - std::string listName; - Globals::Instance->GetSegmentedPtrName(listSegmentAddr, parent, "MinimapEntry", listName, - parent->workerID); - std::string declaration = StringHelper::Sprintf("\n\t%s, 0x%08X\n", listName.c_str(), unk4); - - parent->AddDeclaration( - segmentOffset, DeclarationAlignment::Align4, 8, "MinimapList", - StringHelper::Sprintf("%sMinimapList0x%06X", prefix.c_str(), segmentOffset), - declaration); - } -} - -std::string SetMinimapList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapList", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MINIMAP_INFO(%s)", listName.c_str()); -} - -std::string SetMinimapList::GetCommandCName() const -{ - return "SCmdMinimapSettings"; -} - -RoomCommand SetMinimapList::GetRoomCommand() const -{ - return RoomCommand::SetMinimapList; -} - -MinimapEntry::MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex) - : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), - unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) -{ -} - -std::string MinimapEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, - unk8); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h deleted file mode 100644 index 5b18b3dd7..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class MinimapEntry -{ -public: - MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - -protected: - uint16_t unk0; - uint16_t unk2; - uint16_t unk4; - uint16_t unk6; - uint16_t unk8; -}; - -class SetMinimapList : public ZRoomCommand -{ -public: - std::vector minimaps; - - SetMinimapList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - segptr_t listSegmentAddr; - uint32_t listSegmentOffset; - uint32_t unk4; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp deleted file mode 100644 index a8bb76a08..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "SetObjectList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetObjectList::SetObjectList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetObjectList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t objectCnt = parent->GetRawData().at(rawDataIndex + 1); - uint32_t currentPtr = segmentOffset; - - objects.reserve(objectCnt); - for (uint8_t i = 0; i < objectCnt; i++) - { - uint16_t objectIndex = BitConverter::ToInt16BE(parent->GetRawData(), currentPtr); - objects.push_back(objectIndex); - currentPtr += 2; - } -} - -void SetObjectList::DeclareReferences(const std::string& prefix) -{ - if (!objects.empty()) - { - std::string declaration; - - for (size_t i = 0; i < objects.size(); i++) - { - uint16_t objectIndex = objects[i]; - declaration += - StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str()); - - if (i < objects.size() - 1) - declaration += "\n"; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, objects.size() * 2, "s16", - StringHelper::Sprintf("%sObjectList_%06X", prefix.c_str(), segmentOffset), - objects.size(), declaration); - } -} - -std::string SetObjectList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str()); -} - -std::string SetObjectList::GetCommandCName() const -{ - return "SCmdObjectList"; -} - -RoomCommand SetObjectList::GetRoomCommand() const -{ - return RoomCommand::SetObjectList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h deleted file mode 100644 index 03c159483..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetObjectList : public ZRoomCommand -{ -public: - std::vector objects; - - SetObjectList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp deleted file mode 100644 index f3bdb0872..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "SetPathways.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetPathways::SetPathways(ZFile* nParent) : ZRoomCommand(nParent), pathwayList(nParent) -{ -} - -void SetPathways::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sPathway_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetPathways::ParseRawDataLate() -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - auto numPaths = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 8; - pathwayList.SetNumPaths(numPaths); - } - - if (Globals::Instance->otrMode) - { - auto zPath = (ZPath*)parent->FindResource(segmentOffset); - - if (zPath != nullptr) - pathwayList = *zPath; - } - - pathwayList.ExtractFromFile(segmentOffset); -} - -void SetPathways::DeclareReferencesLate(const std::string& prefix) -{ - std::string varName = StringHelper::Sprintf("%sPathway_%06X", prefix.c_str(), segmentOffset); - pathwayList.SetName(varName); - pathwayList.DeclareReferences(prefix); - pathwayList.GetSourceOutputCode(prefix); -} - -std::string SetPathways::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "Path", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_PATH_LIST(%s)", listName.c_str()); -} - -std::string SetPathways::GetCommandCName() const -{ - return "SCmdPathList"; -} - -RoomCommand SetPathways::GetRoomCommand() const -{ - return RoomCommand::SetPathways; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h deleted file mode 100644 index 9abc93d32..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "Vec3s.h" -#include "ZPath.h" -#include "ZResource.h" -#include "ZRoom/ZRoomCommand.h" - -class SetPathways : public ZRoomCommand -{ -public: - ZPath pathwayList; - - SetPathways(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp deleted file mode 100644 index 8c6f4bf51..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "SetRoomBehavior.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetRoomBehavior::SetRoomBehavior(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetRoomBehavior::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - gameplayFlags = cmdArg1; - gameplayFlags2 = BitConverter::ToInt32BE(parent->GetRawData(), rawDataIndex + 0x04); - - currRoomUnk2 = gameplayFlags2 & 0xFF; - - currRoomUnk5 = showInvisActors = (gameplayFlags2 >> 8) & 1; - - msgCtxUnk = (gameplayFlags2 >> 10) & 1; - - enablePosLights = (gameplayFlags2 >> 11) & 1; - kankyoContextUnkE2 = (gameplayFlags2 >> 12) & 1; -} - -std::string SetRoomBehavior::GetBodySourceCode() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - std::string enableLights = StringHelper::BoolStr(enablePosLights); - return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %i, %i, %s, %i)", - gameplayFlags, currRoomUnk2, currRoomUnk5, msgCtxUnk, - enableLights.c_str(), kankyoContextUnkE2); - } - std::string showInvisible = StringHelper::BoolStr(showInvisActors); - std::string disableWarps = StringHelper::BoolStr(msgCtxUnk); - return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %s, %s)", gameplayFlags, - currRoomUnk2, showInvisible.c_str(), disableWarps.c_str()); -} - -std::string SetRoomBehavior::GetCommandCName() const -{ - return "SCmdRoomBehavior"; -} - -RoomCommand SetRoomBehavior::GetRoomCommand() const -{ - return RoomCommand::SetRoomBehavior; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h deleted file mode 100644 index 47b772d77..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetRoomBehavior : public ZRoomCommand -{ -public: - uint8_t gameplayFlags; - uint32_t gameplayFlags2; - - uint8_t currRoomUnk2; - - uint8_t showInvisActors; - uint8_t currRoomUnk5; - - uint8_t msgCtxUnk; - - uint8_t enablePosLights; - uint8_t kankyoContextUnkE2; - - SetRoomBehavior(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp deleted file mode 100644 index abb2b003c..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp +++ /dev/null @@ -1,155 +0,0 @@ -#include "SetRoomList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetRoomList::SetRoomList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetRoomList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numRooms = cmdArg1; - - romfile = new RomFile(parent); - romfile->numRooms = numRooms; - romfile->ExtractFromFile(segmentOffset); - - parent->resources.push_back(romfile); - - zRoom->roomCount = numRooms; -} - -void SetRoomList::DeclareReferences(const std::string& prefix) -{ - ZRoomCommand::DeclareReferences(prefix); - - romfile->DeclareVar(prefix, ""); -} - -std::string SetRoomList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "RomFile", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ROOM_LIST(%i, %s)", romfile->rooms.size(), - listName.c_str()); -} - -std::string SetRoomList::GetCommandCName() const -{ - return "SCmdRoomList"; -} - -RoomCommand SetRoomList::GetRoomCommand() const -{ - return RoomCommand::SetRoomList; -} - -RomFile::RomFile(ZFile* nParent) : ZResource(nParent) -{ -} - -void RomFile::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - if (reader->Attribute("NumRooms") != nullptr) - { - numRooms = StringHelper::StrToL(std::string(reader->Attribute("NumRooms"))); - } -} - -void RomFile::ParseRawData() -{ - ZResource::ParseRawData(); - - uint32_t currentPtr = rawDataIndex; - - rooms.reserve(numRooms); - for (int32_t i = 0; i < numRooms; i++) - { - RoomEntry entry(parent->GetRawData(), currentPtr); - rooms.push_back(entry); - - currentPtr += 8; - } -} - -Declaration* RomFile::DeclareVar(const std::string& prefix, const std::string& body) -{ - std::string auxName = name; - if (name == "") - auxName = StringHelper::Sprintf("%sRoomList0x%06X", prefix.c_str(), rawDataIndex); - - return parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align4, - rooms.size() * rooms.at(0).GetRawDataSize(), - GetSourceTypeName(), auxName, rooms.size(), body); -} - -std::string RomFile::GetBodySourceCode() const -{ - std::string declaration; - bool isFirst = true; - - for (ZFile* file : Globals::Instance->files) - { - for (ZResource* res : file->resources) - { - if (res->GetResourceType() == ZResourceType::Room) - { - std::string roomName = res->GetName(); - if (!isFirst) - declaration += "\n"; - - declaration += StringHelper::Sprintf( - "\t{ (uintptr_t)_%sSegmentRomStart, (uintptr_t)_%sSegmentRomEnd },", - roomName.c_str(), roomName.c_str()); - isFirst = false; - } - } - } - - return declaration; -} - -void RomFile::GetSourceOutputCode(const std::string& prefix) -{ - DeclareVar(prefix, GetBodySourceCode()); -} - -std::string RomFile::GetSourceTypeName() const -{ - return "RomFile"; -} - -ZResourceType RomFile::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t RomFile::GetRawDataSize() const -{ - return 8 * rooms.size(); -} - -RoomEntry::RoomEntry(uint32_t nVAS, uint32_t nVAE) -{ - virtualAddressStart = nVAS; - virtualAddressEnd = nVAE; -} - -RoomEntry::RoomEntry(const std::vector& rawData, uint32_t rawDataIndex) - : RoomEntry(BitConverter::ToInt32BE(rawData, rawDataIndex + 0), - BitConverter::ToInt32BE(rawData, rawDataIndex + 4)) -{ -} - -size_t RoomEntry::GetRawDataSize() const -{ - return 0x08; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h deleted file mode 100644 index 2ae48b68d..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class RoomEntry -{ -public: - int32_t virtualAddressStart; - int32_t virtualAddressEnd; - - RoomEntry(uint32_t nVAS, uint32_t nVAE); - RoomEntry(const std::vector& rawData, uint32_t rawDataIndex); - - size_t GetRawDataSize() const; -}; - -class RomFile : public ZResource -{ -public: - RomFile(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& body) override; - std::string GetBodySourceCode() const override; - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - virtual ZResourceType GetResourceType() const override; - - virtual size_t GetRawDataSize() const override; - - uint8_t numRooms = 0; - std::vector rooms; -}; - -class SetRoomList : public ZRoomCommand -{ -public: - // Borrowed reference. Don't delete. - RomFile* romfile = nullptr; - - SetRoomList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp deleted file mode 100644 index b16f1355b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "SetSkyboxModifier.h" - -#include "Utils/StringHelper.h" - -SetSkyboxModifier::SetSkyboxModifier(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSkyboxModifier::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - disableSky = parent->GetRawData().at(rawDataIndex + 0x04); - disableSunMoon = parent->GetRawData().at(rawDataIndex + 0x05); -} - -std::string SetSkyboxModifier::GetBodySourceCode() const -{ - std::string sky = StringHelper::BoolStr(disableSky); - std::string soonMoon = StringHelper::BoolStr(disableSunMoon); - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_DISABLES(%s, %s)", sky.c_str(), - soonMoon.c_str()); -} - -std::string SetSkyboxModifier::GetCommandCName() const -{ - return "SCmdSkyboxDisables"; -} - -RoomCommand SetSkyboxModifier::GetRoomCommand() const -{ - return RoomCommand::SetSkyboxModifier; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h deleted file mode 100644 index 65935bf92..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSkyboxModifier : public ZRoomCommand -{ -public: - uint8_t disableSky; - uint8_t disableSunMoon; - - SetSkyboxModifier(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp deleted file mode 100644 index d5ae7ef76..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include "SetSkyboxSettings.h" -#include "Globals.h" -#include "Utils/StringHelper.h" - -SetSkyboxSettings::SetSkyboxSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSkyboxSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - unk1 = cmdArg1; - skyboxNumber = parent->GetRawData().at(rawDataIndex + 0x04); - cloudsType = parent->GetRawData().at(rawDataIndex + 0x05); - isIndoors = parent->GetRawData().at(rawDataIndex + 0x06); -} - -std::string SetSkyboxSettings::GetBodySourceCode() const -{ - std::string indoors = StringHelper::BoolStr(isIndoors); - if (Globals::Instance->game == ZGame::MM_RETAIL) - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(0x%02X, %i, %i, %s)", unk1, - skyboxNumber, cloudsType, indoors.c_str()); - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(%i, %i, %s)", skyboxNumber, cloudsType, - indoors.c_str()); -} - -std::string SetSkyboxSettings::GetCommandCName() const -{ - return "SCmdSkyboxSettings"; -} - -RoomCommand SetSkyboxSettings::GetRoomCommand() const -{ - return RoomCommand::SetSkyboxSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h deleted file mode 100644 index 1c7e01ad4..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSkyboxSettings : public ZRoomCommand -{ -public: - uint8_t unk1; // (MM Only) - uint8_t skyboxNumber; - uint8_t cloudsType; - uint8_t isIndoors; - - SetSkyboxSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp deleted file mode 100644 index 54b91328f..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "SetSoundSettings.h" -#include "Utils/StringHelper.h" - -SetSoundSettings::SetSoundSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSoundSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - reverb = cmdArg1; - nightTimeSFX = parent->GetRawData().at(rawDataIndex + 0x06); - musicSequence = parent->GetRawData().at(rawDataIndex + 0x07); -} - -std::string SetSoundSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_SOUND_SETTINGS(%i, %i, %i)", reverb, nightTimeSFX, - musicSequence); -} - -std::string SetSoundSettings::GetCommandCName() const -{ - return "SCmdSoundSettings"; -} - -RoomCommand SetSoundSettings::GetRoomCommand() const -{ - return RoomCommand::SetSoundSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h deleted file mode 100644 index f378e5e4e..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSoundSettings : public ZRoomCommand -{ -public: - uint8_t reverb; - uint8_t nightTimeSFX; - uint8_t musicSequence; - - SetSoundSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp deleted file mode 100644 index 696a3de01..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "SetSpecialObjects.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZNames.h" - -SetSpecialObjects::SetSpecialObjects(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSpecialObjects::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - elfMessage = cmdArg1; - globalObject = BitConverter::ToUInt16BE(parent->GetRawData(), rawDataIndex + 0x06); -} - -std::string SetSpecialObjects::GetBodySourceCode() const -{ - std::string objectName = ZNames::GetObjectName(globalObject); - - return StringHelper::Sprintf("SCENE_CMD_SPECIAL_FILES(0x%02X, %s)", elfMessage, - objectName.c_str()); -} - -std::string SetSpecialObjects::GetCommandCName() const -{ - return "SCmdSpecialFiles"; -} - -RoomCommand SetSpecialObjects::GetRoomCommand() const -{ - return RoomCommand::SetSpecialObjects; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h deleted file mode 100644 index 3327d44c3..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSpecialObjects : public ZRoomCommand -{ -public: - uint8_t elfMessage; - uint16_t globalObject; - - SetSpecialObjects(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp deleted file mode 100644 index 03856d23b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "SetStartPositionList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetStartPositionList::SetStartPositionList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetStartPositionList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t numActors = cmdArg1; - - offset_t currentPtr = segmentOffset; - - actors.reserve(numActors); - for (uint32_t i = 0; i < numActors; i++) - { - actors.push_back(ActorSpawnEntry(parent->GetRawData(), currentPtr)); - currentPtr += 16; - } -} - -void SetStartPositionList::DeclareReferences(const std::string& prefix) -{ - if (!actors.empty()) - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : actors) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < actors.size()) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, actors.size() * 16, "ActorEntry", - StringHelper::Sprintf("%sStartPositionList0x%06X", prefix.c_str(), segmentOffset), - actors.size(), declaration); - } -} - -std::string SetStartPositionList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_SPAWN_LIST(%i, %s)", actors.size(), listName.c_str()); -} - -std::string SetStartPositionList::GetCommandCName() const -{ - return "SCmdSpawnList"; -} - -RoomCommand SetStartPositionList::GetRoomCommand() const -{ - return RoomCommand::SetStartPositionList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h deleted file mode 100644 index 10075adf3..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "SetActorList.h" -#include "ZRoom/ZRoomCommand.h" - -class SetStartPositionList : public ZRoomCommand -{ -public: - std::vector actors; - - SetStartPositionList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp deleted file mode 100644 index 9d4d356df..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "SetTimeSettings.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetTimeSettings::SetTimeSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetTimeSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - hour = parent->GetRawData().at(rawDataIndex + 4); - min = parent->GetRawData().at(rawDataIndex + 5); - unk = parent->GetRawData().at(rawDataIndex + 6); -} - -std::string SetTimeSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_TIME_SETTINGS(%i, %i, %i)", hour, min, unk); -} - -std::string SetTimeSettings::GetCommandCName() const -{ - return "SCmdTimeSettings"; -} - -RoomCommand SetTimeSettings::GetRoomCommand() const -{ - return RoomCommand::SetTimeSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h deleted file mode 100644 index 7ff2711d4..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetTimeSettings : public ZRoomCommand -{ -public: - uint8_t hour; - uint8_t min; - uint8_t unk; - - SetTimeSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp deleted file mode 100644 index 051ddd875..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "SetTransitionActorList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetTransitionActorList::SetTransitionActorList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetTransitionActorList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numActors = cmdArg1; - uint32_t currentPtr = segmentOffset; - - transitionActors.reserve(numActors); - for (int32_t i = 0; i < numActors; i++) - { - TransitionActorEntry entry(parent->GetRawData(), currentPtr); - transitionActors.push_back(entry); - - currentPtr += 16; - } -} - -void SetTransitionActorList::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - - size_t index = 0; - for (const auto& entry : transitionActors) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < transitionActors.size()) - { - declaration += "\n"; - } - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, transitionActors.size() * 16, - "TransitionActorEntry", - StringHelper::Sprintf("%sTransitionActorList_%06X", prefix.c_str(), segmentOffset), - transitionActors.size(), declaration); -} - -std::string SetTransitionActorList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "TransitionActorEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_TRANSITION_ACTOR_LIST(%i, %s)", transitionActors.size(), - listName.c_str()); -} - -std::string SetTransitionActorList::GetCommandCName() const -{ - return "SCmdTransiActorList"; -} - -RoomCommand SetTransitionActorList::GetRoomCommand() const -{ - return RoomCommand::SetTransitionActorList; -} - -TransitionActorEntry::TransitionActorEntry(const std::vector& rawData, int rawDataIndex) -{ - frontObjectRoom = rawData[rawDataIndex + 0]; - frontTransitionReaction = rawData[rawDataIndex + 1]; - backObjectRoom = rawData[rawDataIndex + 2]; - backTransitionReaction = rawData[rawDataIndex + 3]; - actorNum = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - rotY = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - initVar = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string TransitionActorEntry::GetBodySourceCode() const -{ - std::string actorStr = ZNames::GetActorName(actorNum); - - return StringHelper::Sprintf("%i, %i, %i, %i, %s, %i, %i, %i, %i, 0x%04X", frontObjectRoom, - frontTransitionReaction, backObjectRoom, backTransitionReaction, - actorStr.c_str(), posX, posY, posZ, rotY, initVar); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h deleted file mode 100644 index a5ce2e66f..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class TransitionActorEntry -{ -public: - uint8_t frontObjectRoom; - uint8_t frontTransitionReaction; - uint8_t backObjectRoom; - uint8_t backTransitionReaction; - uint16_t actorNum; - int16_t posX, posY, posZ; - int16_t rotY; - uint16_t initVar; - - TransitionActorEntry(const std::vector& rawData, int rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class SetTransitionActorList : public ZRoomCommand -{ -public: - std::vector transitionActors; - - SetTransitionActorList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp deleted file mode 100644 index 1893b5601..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "SetWind.h" -#include "Utils/StringHelper.h" - -SetWind::SetWind(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetWind::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - auto& parentRawData = parent->GetRawData(); - windWest = parentRawData.at(rawDataIndex + 0x04); - windVertical = parentRawData.at(rawDataIndex + 0x05); - windSouth = parentRawData.at(rawDataIndex + 0x06); - clothFlappingStrength = parentRawData.at(rawDataIndex + 0x07); -} - -std::string SetWind::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_WIND_SETTINGS(%i, %i, %i, %i)", windWest, windVertical, - windSouth, clothFlappingStrength); -} - -std::string SetWind::GetCommandCName() const -{ - return "SCmdWindSettings"; -} - -RoomCommand SetWind::GetRoomCommand() const -{ - return RoomCommand::SetWind; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h deleted file mode 100644 index 05eaafeda..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetWind : public ZRoomCommand -{ -public: - uint8_t windWest; - uint8_t windVertical; - uint8_t windSouth; - uint8_t clothFlappingStrength; - - SetWind(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp deleted file mode 100644 index d20e4a3e2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "SetWorldMapVisited.h" - -#include "Utils/StringHelper.h" - -SetWorldMapVisited::SetWorldMapVisited(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string SetWorldMapVisited::GetBodySourceCode() const -{ - return "SCENE_CMD_MISC_SETTINGS()"; -} - -std::string SetWorldMapVisited::GetCommandCName() const -{ - return "SCmdWorldMapVisited"; -} - -RoomCommand SetWorldMapVisited::GetRoomCommand() const -{ - return RoomCommand::SetWorldMapVisited; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h deleted file mode 100644 index a7ad93154..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetWorldMapVisited : public ZRoomCommand -{ -public: - SetWorldMapVisited(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp deleted file mode 100644 index 9dfcaa5c2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Unused09.h" -#include "Utils/StringHelper.h" - -Unused09::Unused09(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string Unused09::GetBodySourceCode() const -{ - return "SCENE_CMD_UNK_09()"; -} - -std::string Unused09::GetCommandCName() const -{ - return "SceneCmd"; -} - -RoomCommand Unused09::GetRoomCommand() const -{ - return RoomCommand::Unused09; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h b/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h deleted file mode 100644 index a38985eea..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class Unused09 : public ZRoomCommand -{ -public: - Unused09(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp deleted file mode 100644 index b8ea13652..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Unused1D.h" -#include "Utils/StringHelper.h" - -Unused1D::Unused1D(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string Unused1D::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{ %s, 0x00, 0x00 }", GetCommandHex().c_str()); -} - -std::string Unused1D::GetCommandCName() const -{ - return "SceneCmd"; -} - -RoomCommand Unused1D::GetRoomCommand() const -{ - return RoomCommand::Unused1D; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h b/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h deleted file mode 100644 index dea0f98ee..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class Unused1D : public ZRoomCommand -{ -public: - Unused1D(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp deleted file mode 100644 index a892086c2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "ZRoomCommandUnk.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZRoom.h" - -ZRoomCommandUnk::ZRoomCommandUnk(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string ZRoomCommandUnk::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{ %s, 0x%02X, 0x%06X } /* WARNING: " - "UNIMPLEMENTED ROOM COMMAND */", - GetCommandHex().c_str(), cmdArg1, cmdArg2); -} - -RoomCommand ZRoomCommandUnk::GetRoomCommand() const -{ - return RoomCommand::Error; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h b/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h deleted file mode 100644 index e381fe5a5..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "ZRoom/ZRoomCommand.h" - -class ZRoomCommandUnk : public ZRoomCommand -{ -public: - ZRoomCommandUnk(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZNames.h b/ZAPDTR/ZAPD/ZRoom/ZNames.h deleted file mode 100644 index 667407c36..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZNames.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include - -#include "Globals.h" -#include "Utils/StringHelper.h" - -class ZNames -{ -public: - static std::string GetObjectName(size_t id) - { - if (id >= Globals::Instance->cfg.objectList.size()) - return StringHelper::Sprintf("0x%04X", id); - return Globals::Instance->cfg.objectList[id]; - } - - static std::string GetActorName(uint16_t id) - { - switch (Globals::Instance->game) - { - case ZGame::OOT_RETAIL: - case ZGame::OOT_SW97: - if (id < ZNames::GetNumActors()) - return Globals::Instance->cfg.actorList[id]; - else - return StringHelper::Sprintf("0x%04X", id); - case ZGame::MM_RETAIL: - { - int32_t flags = id & 0xF000; - id &= 0xFFF; - std::string name; - if (id < ZNames::GetNumActors()) - name = Globals::Instance->cfg.actorList[id]; - else - name = StringHelper::Sprintf("0x%04X", id); - - if (flags == 0) - return name; - else - return StringHelper::Sprintf("%s | 0x%04X", name.c_str(), flags); - } - } - - return ""; - } - - static std::string GetEntranceName(uint16_t id) - { - if (ZNames::GetNumEntrances() == 0 || ZNames::GetNumSpecialEntrances() == 0) - return StringHelper::Sprintf("0x%04X", id); - - if (id < ZNames::GetNumEntrances()) - return Globals::Instance->cfg.entranceList[id]; - else if ((id >= 0x7FF9 && id <= 0x7FFF) && !((id - 0x7FF9U) > GetNumSpecialEntrances())) // Special entrances - return Globals::Instance->cfg.specialEntranceList[id - 0x7FF9]; - else - return StringHelper::Sprintf("0x%04X", id); - } - - static size_t GetNumActors() { return Globals::Instance->cfg.actorList.size(); } - static size_t GetNumEntrances() { return Globals::Instance->cfg.entranceList.size(); } - static size_t GetNumSpecialEntrances() { return Globals::Instance->cfg.specialEntranceList.size(); } -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp b/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp deleted file mode 100644 index 11dd70687..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp +++ /dev/null @@ -1,427 +0,0 @@ -#include "ZRoom.h" -#include -#include -#include -#include -#include - -#include "Commands/EndMarker.h" -#include "Commands/SetActorCutsceneList.h" -#include "Commands/SetActorList.h" -#include "Commands/SetAlternateHeaders.h" -#include "Commands/SetAnimatedMaterialList.h" -#include "Commands/SetCameraSettings.h" -#include "Commands/SetCollisionHeader.h" -#include "Commands/SetCsCamera.h" -#include "Commands/SetCutscenes.h" -#include "Commands/SetEchoSettings.h" -#include "Commands/SetEntranceList.h" -#include "Commands/SetExitList.h" -#include "Commands/SetLightList.h" -#include "Commands/SetLightingSettings.h" -#include "Commands/SetMesh.h" -#include "Commands/SetMinimapChests.h" -#include "Commands/SetMinimapList.h" -#include "Commands/SetObjectList.h" -#include "Commands/SetPathways.h" -#include "Commands/SetRoomBehavior.h" -#include "Commands/SetRoomList.h" -#include "Commands/SetSkyboxModifier.h" -#include "Commands/SetSkyboxSettings.h" -#include "Commands/SetSoundSettings.h" -#include "Commands/SetSpecialObjects.h" -#include "Commands/SetStartPositionList.h" -#include "Commands/SetTimeSettings.h" -#include "Commands/SetTransitionActorList.h" -#include "Commands/SetWind.h" -#include "Commands/SetWorldMapVisited.h" -#include "Commands/Unused09.h" -#include "Commands/Unused1D.h" -#include "Commands/ZRoomCommandUnk.h" -#include "Globals.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZBlob.h" -#include "ZCutscene.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Room, ZRoom); -REGISTER_ZFILENODE(Scene, ZRoom); -REGISTER_ZFILENODE(AltHeader, ZRoom); - -ZRoom::ZRoom(ZFile* nParent) : ZResource(nParent) -{ - roomCount = -1; - canHaveInner = true; - RegisterOptionalAttribute("HackMode"); -} - -ZRoom::~ZRoom() -{ - for (ZRoomCommand* cmd : commands) - delete cmd; -} - -void ZRoom::ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) -{ - ZResource::ExtractFromXML(reader, nRawDataIndex); - - if (hackMode == "syotes_room") - { - SyotesRoomHack(); - } - else - { - DeclareVar(name, ""); - } -} - -void ZRoom::ExtractFromBinary(uint32_t nRawDataIndex, ZResourceType parentType) -{ - rawDataIndex = nRawDataIndex; - name = GetDefaultName(parent->GetName()); - - zroomType = ZResourceType::AltHeader; - switch (parentType) - { - case ZResourceType::Scene: - case ZResourceType::Room: - case ZResourceType::AltHeader: - parentZroomType = parentType; - break; - - default: - // TODO: error message or something - assert(false); - break; - } - - ParseRawData(); - DeclareVar(name, ""); -} - -void ZRoom::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - // TODO: HACK: remove this specific check when the repo uses the correct HackMode="syotes_room" - if (name == "syotes_room_0") - { - hackMode = "syotes_room"; - } - - std::string nodeName = std::string(reader->Name()); - if (nodeName == "Scene") - { - zroomType = ZResourceType::Scene; - } - else if (nodeName == "Room") - zroomType = ZResourceType::Room; - else if (nodeName == "AltHeader") - zroomType = ZResourceType::AltHeader; - - if (reader->Attribute("HackMode") != nullptr) - { - hackMode = std::string(reader->Attribute("HackMode")); - if (hackMode != "syotes_room") - { - std::string headerError = StringHelper::Sprintf( - "invalid value found for 'HackMode' attribute: '%s'", hackMode.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - headerError, ""); - } - } -} - -void ZRoom::ParseRawData() -{ - if (hackMode == "syotes_room") - return; - - bool shouldContinue = true; - uint32_t currentIndex = 0; - uint32_t currentPtr = rawDataIndex; - - const auto& rawData = parent->GetRawData(); - while (shouldContinue) - { - RoomCommand opcode = static_cast(rawData.at(currentPtr)); - - ZRoomCommand* cmd = nullptr; - - auto start = std::chrono::steady_clock::now(); - - switch (opcode) - { - case RoomCommand::SetStartPositionList: - cmd = new SetStartPositionList(parent); - break; // 0x00 - case RoomCommand::SetActorList: - cmd = new SetActorList(parent); - break; // 0x01 - case RoomCommand::SetCsCamera: - cmd = new SetCsCamera(parent); - break; // 0x02 (MM-ONLY) - case RoomCommand::SetCollisionHeader: - cmd = new SetCollisionHeader(parent); - break; // 0x03 - case RoomCommand::SetRoomList: - cmd = new SetRoomList(parent); - break; // 0x04 - case RoomCommand::SetWind: - cmd = new SetWind(parent); - break; // 0x05 - case RoomCommand::SetEntranceList: - cmd = new SetEntranceList(parent); - break; // 0x06 - case RoomCommand::SetSpecialObjects: - cmd = new SetSpecialObjects(parent); - break; // 0x07 - case RoomCommand::SetRoomBehavior: - cmd = new SetRoomBehavior(parent); - break; // 0x08 - case RoomCommand::Unused09: - cmd = new Unused09(parent); - break; // 0x09 - case RoomCommand::SetMesh: - cmd = new SetMesh(parent); - break; // 0x0A - case RoomCommand::SetObjectList: - cmd = new SetObjectList(parent); - break; // 0x0B - case RoomCommand::SetLightList: - cmd = new SetLightList(parent); - break; // 0x0C (MM-ONLY) - case RoomCommand::SetPathways: - cmd = new SetPathways(parent); - break; // 0x0D - case RoomCommand::SetTransitionActorList: - cmd = new SetTransitionActorList(parent); - break; // 0x0E - case RoomCommand::SetLightingSettings: - cmd = new SetLightingSettings(parent); - break; // 0x0F - case RoomCommand::SetTimeSettings: - cmd = new SetTimeSettings(parent); - break; // 0x10 - case RoomCommand::SetSkyboxSettings: - cmd = new SetSkyboxSettings(parent); - break; // 0x11 - case RoomCommand::SetSkyboxModifier: - cmd = new SetSkyboxModifier(parent); - break; // 0x12 - case RoomCommand::SetExitList: - cmd = new SetExitList(parent); - break; // 0x13 - case RoomCommand::EndMarker: - cmd = new EndMarker(parent); - break; // 0x14 - case RoomCommand::SetSoundSettings: - cmd = new SetSoundSettings(parent); - break; // 0x15 - case RoomCommand::SetEchoSettings: - cmd = new SetEchoSettings(parent); - break; // 0x16 - case RoomCommand::SetCutscenes: - cmd = new SetCutscenes(parent); - break; // 0x17 - case RoomCommand::SetAlternateHeaders: - cmd = new SetAlternateHeaders(parent); - break; // 0x18 - case RoomCommand::SetCameraSettings: - if (Globals::Instance->game == ZGame::MM_RETAIL) - cmd = new SetWorldMapVisited(parent); - else - cmd = new SetCameraSettings(parent); - break; // 0x19 - case RoomCommand::SetAnimatedMaterialList: - cmd = new SetAnimatedMaterialList(parent); - break; // 0x1A (MM-ONLY) - case RoomCommand::SetActorCutsceneList: - cmd = new SetActorCutsceneList(parent); - break; // 0x1B (MM-ONLY) - case RoomCommand::SetMinimapList: - cmd = new SetMinimapList(parent); - break; // 0x1C (MM-ONLY) - case RoomCommand::Unused1D: - cmd = new Unused1D(parent); - break; // 0x1D - case RoomCommand::SetMinimapChests: - cmd = new SetMinimapChests(parent); - break; // 0x1E (MM-ONLY) - default: - cmd = new ZRoomCommandUnk(parent); - } - - cmd->commandSet = rawDataIndex; - cmd->ExtractCommandFromRoom(this, currentPtr); - - if (Globals::Instance->profile) - { - auto end = std::chrono::steady_clock::now(); - int64_t diff = - std::chrono::duration_cast(end - start).count(); - if (diff > 50) - printf("OP: %s, TIME: %" PRIi64 "ms\n", cmd->GetCommandCName().c_str(), diff); - } - - cmd->cmdIndex = currentIndex; - - commands.push_back(cmd); - - if (opcode == RoomCommand::EndMarker) - shouldContinue = false; - - currentPtr += 8; - currentIndex++; - } -} - -void ZRoom::DeclareReferences(const std::string& prefix) -{ - for (auto& cmd : commands) - cmd->DeclareReferences(prefix); -} - -void ZRoom::ParseRawDataLate() -{ - for (auto& cmd : commands) - cmd->ParseRawDataLate(); -} - -void ZRoom::DeclareReferencesLate(const std::string& prefix) -{ - for (auto& cmd : commands) - cmd->DeclareReferencesLate(prefix); -} - -Declaration* ZRoom::DeclareVar(const std::string& prefix, const std::string& body) -{ - std::string auxName = name; - if (auxName == "") - auxName = GetDefaultName(prefix); - if (zroomType == ZResourceType::Scene || zroomType == ZResourceType::Room) - auxName = StringHelper::Sprintf("%sCommands", name.c_str()); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, commands.size(), body); - decl->staticConf = staticConf; - return decl; -} - -std::string ZRoom::GetBodySourceCode() const -{ - std::string declaration; - - for (size_t i = 0; i < commands.size(); i++) - { - ZRoomCommand* cmd = commands[i]; - declaration += StringHelper::Sprintf("\t%s,", cmd->GetBodySourceCode().c_str()); - - if (i + 1 < commands.size()) - declaration += "\n"; - } - - return declaration; -} - -std::string ZRoom::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sSet_%06X", prefix.c_str(), rawDataIndex); -} - -/* - * There is one room in Ocarina of Time that lacks a header. Room 120, "Syotes", dates - * back to very early in the game's development. Since this room is a special case, - * declare automatically the data its contains whitout the need of a header. - */ -void ZRoom::SyotesRoomHack() -{ - PolygonType2 poly(parent, 0, this); - - poly.ParseRawData(); - poly.DeclareReferences(GetName()); - parent->AddDeclaration(0, poly.GetDeclarationAlignment(), poly.GetRawDataSize(), - poly.GetSourceTypeName(), poly.GetDefaultName(GetName()), - poly.GetBodySourceCode()); -} - -ZRoomCommand* ZRoom::FindCommandOfType(RoomCommand cmdType) -{ - for (size_t i = 0; i < commands.size(); i++) - { - if (commands[i]->GetRoomCommand() == cmdType) - return commands[i]; - } - - return nullptr; -} - -size_t ZRoom::GetDeclarationSizeFromNeighbor(uint32_t declarationAddress) -{ - auto currentDecl = parent->declarations.find(declarationAddress); - if (currentDecl == parent->declarations.end()) - return 0; - - auto nextDecl = currentDecl; - std::advance(nextDecl, 1); - if (nextDecl == parent->declarations.end()) - return parent->GetRawData().size() - currentDecl->first; - - return nextDecl->first - currentDecl->first; -} - -size_t ZRoom::GetCommandSizeFromNeighbor(ZRoomCommand* cmd) -{ - int32_t cmdIndex = -1; - - for (size_t i = 0; i < commands.size(); i++) - { - if (commands[i] == cmd) - { - cmdIndex = i; - break; - } - } - - if (cmdIndex != -1) - { - if (cmdIndex + 1 < (int32_t)commands.size()) - return commands[cmdIndex + 1]->cmdAddress - commands[cmdIndex]->cmdAddress; - else - return parent->GetRawData().size() - commands[cmdIndex]->cmdAddress; - } - - return 0; -} - -void ZRoom::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - if (hackMode != "syotes_room") - DeclareVar(prefix, GetBodySourceCode()); -} - -size_t ZRoom::GetRawDataSize() const -{ - size_t size = 0; - - for (ZRoomCommand* cmd : commands) - size += cmd->GetRawDataSize(); - - return size; -} - -std::string ZRoom::GetSourceTypeName() const -{ - return "SceneCmd"; -} - -ZResourceType ZRoom::GetResourceType() const -{ - assert(zroomType == ZResourceType::Scene || zroomType == ZResourceType::Room || - zroomType == ZResourceType::AltHeader); - return zroomType; -} diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoom.h b/ZAPDTR/ZAPD/ZRoom/ZRoom.h deleted file mode 100644 index e837ec70a..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoom.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZResource.h" -#include "ZRoomCommand.h" -#include "tinyxml2.h" - -class ZRoom : public ZResource -{ -public: - std::vector commands; - int32_t roomCount; // Only valid for scenes - - std::string hackMode; - - ZResourceType zroomType = ZResourceType::Error; - ZResourceType parentZroomType = ZResourceType::Error; - - ZRoom(ZFile* nParent); - virtual ~ZRoom(); - - void ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) override; - void ExtractFromBinary(uint32_t nRawDataIndex, ZResourceType parentType); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& body) override; - std::string GetBodySourceCode() const override; - - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetDeclarationSizeFromNeighbor(uint32_t declarationAddress); - size_t GetCommandSizeFromNeighbor(ZRoomCommand* cmd); - ZRoomCommand* FindCommandOfType(RoomCommand cmdType); - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - -protected: - void SyotesRoomHack(); -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp b/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp deleted file mode 100644 index 711c86a40..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "ZRoomCommand.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom.h" - -ZRoomCommand::ZRoomCommand(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZRoomCommand::ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex) -{ - zRoom = nZRoom; - rawDataIndex = nRawDataIndex; - - ParseRawData(); -} - -void ZRoomCommand::ParseRawData() -{ - auto& parentRawData = parent->GetRawData(); - cmdID = static_cast(parentRawData.at(rawDataIndex)); - cmdAddress = rawDataIndex; - - cmdArg1 = parentRawData.at(rawDataIndex + 1); - cmdArg2 = BitConverter::ToUInt32BE(parentRawData, rawDataIndex + 4); - segmentOffset = Seg2Filespace(cmdArg2, parent->baseAddress); -} - -RoomCommand ZRoomCommand::GetRoomCommand() const -{ - return RoomCommand::Error; -} - -size_t ZRoomCommand::GetRawDataSize() const -{ - return 0x08; -} - -std::string ZRoomCommand::GetSourceTypeName() const -{ - return GetCommandCName(); -} - -ZResourceType ZRoomCommand::GetResourceType() const -{ - return ZResourceType::RoomCommand; -} - -std::string ZRoomCommand::GetCommandCName() const -{ - return "SceneCmd"; -} - -std::string ZRoomCommand::GetCommandHex() const -{ - return StringHelper::Sprintf("0x%02X", static_cast(cmdID)); -} diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h b/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h deleted file mode 100644 index 5e4d0bc54..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h +++ /dev/null @@ -1,84 +0,0 @@ -#pragma once - -#include "tinyxml2.h" - -#include -#include - -#include "ZFile.h" -#include "ZResource.h" - -class ZRoom; - -enum class RoomCommand : uint8_t -{ - SetStartPositionList = 0x00, - SetActorList = 0x01, - SetCsCamera = 0x02, - SetCollisionHeader = 0x03, - SetRoomList = 0x04, - SetWind = 0x05, - SetEntranceList = 0x06, - SetSpecialObjects = 0x07, - SetRoomBehavior = 0x08, - Unused09 = 0x09, - SetMesh = 0x0A, - SetObjectList = 0x0B, - SetLightList = 0x0C, - SetPathways = 0x0D, - SetTransitionActorList = 0x0E, - SetLightingSettings = 0x0F, - SetTimeSettings = 0x10, - SetSkyboxSettings = 0x11, - SetSkyboxModifier = 0x12, - SetExitList = 0x13, - EndMarker = 0x14, - SetSoundSettings = 0x15, - SetEchoSettings = 0x16, - SetCutscenes = 0x17, - SetAlternateHeaders = 0x18, - SetCameraSettings = 0x19, - - // MM Commands - SetWorldMapVisited = 0x19, - SetAnimatedMaterialList = 0x1A, - SetActorCutsceneList = 0x1B, - SetMinimapList = 0x1C, - Unused1D = 0x1D, - SetMinimapChests = 0x1E, - - Error = 0xFF -}; - -class ZRoomCommand : public ZResource -{ -public: - int32_t cmdAddress; - uint32_t cmdIndex; - uint32_t commandSet; - RoomCommand cmdID; - offset_t segmentOffset; - - ZRoomCommand(ZFile* nParent); - virtual ~ZRoomCommand() = default; - - virtual void ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - // Getters/Setters - virtual RoomCommand GetRoomCommand() const = 0; - size_t GetRawDataSize() const final override; - virtual std::string GetCommandCName() const; - - virtual std::string GetCommandHex() const; - -public: - ZRoom* zRoom; - - uint8_t cmdArg1; - segptr_t cmdArg2; -}; diff --git a/ZAPDTR/ZAPD/ZScalar.cpp b/ZAPDTR/ZAPD/ZScalar.cpp deleted file mode 100644 index 6c4cf121a..000000000 --- a/ZAPDTR/ZAPD/ZScalar.cpp +++ /dev/null @@ -1,280 +0,0 @@ -#include "ZScalar.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Scalar, ZScalar); - -ZScalar::ZScalar(ZFile* nParent) : ZResource(nParent) -{ - memset(&scalarData, 0, sizeof(ZScalarData)); - scalarType = ZScalarType::ZSCALAR_NONE; - RegisterRequiredAttribute("Type"); -} - -void ZScalar::ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType) -{ - rawDataIndex = nRawDataIndex; - scalarType = nScalarType; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZScalar::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - scalarType = ZScalar::MapOutputTypeToScalarType(registeredAttributes.at("Type").value); -} - -ZScalarType ZScalar::MapOutputTypeToScalarType(const std::string& type) -{ - if (type == "s8") - { - return ZScalarType::ZSCALAR_S8; - } - else if (type == "u8") - { - return ZScalarType::ZSCALAR_U8; - } - else if (type == "x8") - { - return ZScalarType::ZSCALAR_X8; - } - else if (type == "s16") - { - return ZScalarType::ZSCALAR_S16; - } - else if (type == "u16") - { - return ZScalarType::ZSCALAR_U16; - } - else if (type == "x16") - { - return ZScalarType::ZSCALAR_X16; - } - else if (type == "s32") - { - return ZScalarType::ZSCALAR_S32; - } - else if (type == "u32") - { - return ZScalarType::ZSCALAR_U32; - } - else if (type == "x32") - { - return ZScalarType::ZSCALAR_X32; - } - else if (type == "s64") - { - return ZScalarType::ZSCALAR_S64; - } - else if (type == "u64") - { - return ZScalarType::ZSCALAR_U64; - } - else if (type == "x64") - { - return ZScalarType::ZSCALAR_X64; - } - else if (type == "f32") - { - return ZScalarType::ZSCALAR_F32; - } - else if (type == "f64") - { - return ZScalarType::ZSCALAR_F64; - } - - return ZScalarType::ZSCALAR_NONE; -} - -std::string ZScalar::MapScalarTypeToOutputType(const ZScalarType scalarType) -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return "s8"; - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - return "u8"; - case ZScalarType::ZSCALAR_S16: - return "s16"; - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - return "u16"; - case ZScalarType::ZSCALAR_S32: - return "s32"; - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - return "u32"; - case ZScalarType::ZSCALAR_S64: - return "s64"; - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - return "u64"; - case ZScalarType::ZSCALAR_F32: - return "f32"; - case ZScalarType::ZSCALAR_F64: - return "f64"; - default: - return ""; - } -} - -size_t ZScalar::MapTypeToSize(const ZScalarType scalarType) -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return sizeof(scalarData.s8); - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - return sizeof(scalarData.u8); - case ZScalarType::ZSCALAR_S16: - return sizeof(scalarData.s16); - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - return sizeof(scalarData.u16); - case ZScalarType::ZSCALAR_S32: - return sizeof(scalarData.s32); - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - return sizeof(scalarData.u32); - case ZScalarType::ZSCALAR_S64: - return sizeof(scalarData.s64); - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - return sizeof(scalarData.u64); - case ZScalarType::ZSCALAR_F32: - return sizeof(scalarData.f32); - case ZScalarType::ZSCALAR_F64: - return sizeof(scalarData.f64); - default: - return 0; - } -} - -size_t ZScalar::GetRawDataSize() const -{ - return ZScalar::MapTypeToSize(scalarType); -} - -void ZScalar::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - scalarData.s8 = BitConverter::ToInt8BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - scalarData.u8 = BitConverter::ToUInt8BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S16: - scalarData.s16 = BitConverter::ToInt16BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - scalarData.u16 = BitConverter::ToUInt16BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S32: - scalarData.s32 = BitConverter::ToInt32BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - scalarData.u32 = BitConverter::ToUInt32BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S64: - scalarData.s64 = BitConverter::ToInt64BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - scalarData.u64 = BitConverter::ToUInt64BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_F32: - scalarData.f32 = BitConverter::ToFloatBE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_F64: - scalarData.f64 = BitConverter::ToDoubleBE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_NONE: - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Type' attribute", "Defaulting to ''"); - break; - } -} - -std::string ZScalar::GetSourceTypeName() const -{ - return ZScalar::MapScalarTypeToOutputType(scalarType); -} - -std::string ZScalar::GetBodySourceCode() const -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return StringHelper::Sprintf("%hhd", scalarData.s8); - case ZScalarType::ZSCALAR_U8: - return StringHelper::Sprintf("%hhu", scalarData.u8); - case ZScalarType::ZSCALAR_X8: - return StringHelper::Sprintf("0x%02X", scalarData.u8); - case ZScalarType::ZSCALAR_S16: - return StringHelper::Sprintf("%hd", scalarData.s16); - case ZScalarType::ZSCALAR_U16: - return StringHelper::Sprintf("%hu", scalarData.u16); - case ZScalarType::ZSCALAR_X16: - return StringHelper::Sprintf("0x%04X", scalarData.u16); - case ZScalarType::ZSCALAR_S32: - return StringHelper::Sprintf("%d", scalarData.s32); - case ZScalarType::ZSCALAR_U32: - return StringHelper::Sprintf("%u", scalarData.u32); - case ZScalarType::ZSCALAR_X32: - return StringHelper::Sprintf("0x%08X", scalarData.u32); - case ZScalarType::ZSCALAR_S64: - return StringHelper::Sprintf("%lld", scalarData.s64); - case ZScalarType::ZSCALAR_U64: - return StringHelper::Sprintf("%llu", scalarData.u64); - case ZScalarType::ZSCALAR_X64: - return StringHelper::Sprintf("0x%016X", scalarData.u64); - case ZScalarType::ZSCALAR_F32: - return StringHelper::Sprintf("%f", scalarData.f32); - case ZScalarType::ZSCALAR_F64: - return StringHelper::Sprintf("%lf", scalarData.f64); - default: - return "SCALAR_ERROR"; - } -} - -ZResourceType ZScalar::GetResourceType() const -{ - return ZResourceType::Scalar; -} - -bool ZScalar::DoesSupportArray() const -{ - return true; -} - -DeclarationAlignment ZScalar::GetDeclarationAlignment() const -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S64: - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_F64: - return DeclarationAlignment::Align8; - default: - return DeclarationAlignment::Align4; - } -} diff --git a/ZAPDTR/ZAPD/ZScalar.h b/ZAPDTR/ZAPD/ZScalar.h deleted file mode 100644 index 8f98f261d..000000000 --- a/ZAPDTR/ZAPD/ZScalar.h +++ /dev/null @@ -1,68 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "tinyxml2.h" - -enum class ZScalarType -{ - ZSCALAR_NONE, - ZSCALAR_S8, - ZSCALAR_U8, - ZSCALAR_X8, - ZSCALAR_S16, - ZSCALAR_U16, - ZSCALAR_X16, - ZSCALAR_S32, - ZSCALAR_U32, - ZSCALAR_X32, - ZSCALAR_S64, - ZSCALAR_U64, - ZSCALAR_X64, - ZSCALAR_F32, - ZSCALAR_F64 -}; - -typedef union ZScalarData -{ - uint8_t u8; - int8_t s8; - uint16_t u16; - int16_t s16; - uint32_t u32; - int32_t s32; - uint64_t u64; - int64_t s64; - float f32; - double f64; -} ZScalarData; - -class ZScalar : public ZResource -{ - friend class ZVector; - -public: - ZScalarData scalarData; - ZScalarType scalarType; - - ZScalar(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType); - - void ParseRawData() override; - void ParseXML(tinyxml2::XMLElement* reader) override; - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - static size_t MapTypeToSize(const ZScalarType scalarType); - static ZScalarType MapOutputTypeToScalarType(const std::string& type); - static std::string MapScalarTypeToOutputType(const ZScalarType scalarType); -}; diff --git a/ZAPDTR/ZAPD/ZSkeleton.cpp b/ZAPDTR/ZAPD/ZSkeleton.cpp deleted file mode 100644 index a071209bc..000000000 --- a/ZAPDTR/ZAPD/ZSkeleton.cpp +++ /dev/null @@ -1,478 +0,0 @@ -#include "ZSkeleton.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -REGISTER_ZFILENODE(Skeleton, ZSkeleton); -REGISTER_ZFILENODE(LimbTable, ZLimbTable); - -ZSkeleton::ZSkeleton(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Type"); - RegisterRequiredAttribute("LimbType"); - genOTRDef = true; - - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbNone"); - RegisterOptionalAttribute("LimbMax"); - - genOTRDef = true; -} - -void ZSkeleton::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string skelTypeXml = registeredAttributes.at("Type").value; - - if (skelTypeXml == "Flex") - type = ZSkeletonType::Flex; - else if (skelTypeXml == "Curve") - type = ZSkeletonType::Curve; - else if (skelTypeXml != "Normal") - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Type' attribute", ""); - } - - std::string limbTypeXml = registeredAttributes.at("LimbType").value; - limbType = ZLimb::GetTypeByAttributeName(limbTypeXml); - if (limbType == ZLimbType::Invalid) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%s' found for 'LimbType' attribute", - limbTypeXml.c_str()), - "Defaulting to 'Standard'."); - } - - enumName = registeredAttributes.at("EnumName").value; - limbNoneName = registeredAttributes.at("LimbNone").value; - limbMaxName = registeredAttributes.at("LimbMax").value; - - if (enumName != "") - { - if (limbNoneName == "" || limbMaxName == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "'EnumName' attribute was used but either 'LimbNone' or " - "'LimbMax' attribute is missing", - ""); - } - } - - if (limbNoneName != "") - { - if (limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbNone' attribute was used but 'LimbMax' attribute is missing", ""); - } - } - - if (limbMaxName != "") - { - if (limbNoneName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbMax' attribute was used but 'LimbNone' attribute is missing", ""); - } - } -} - -void ZSkeleton::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - limbsArrayAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex); - limbCount = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4); - - if (type == ZSkeletonType::Flex) - { - dListCount = BitConverter::ToUInt8BE(rawData, rawDataIndex + 8); - } -} - -void ZSkeleton::DeclareReferences(const std::string& prefix) -{ - std::string defaultPrefix = name; - if (defaultPrefix == "") - defaultPrefix = prefix; - - ZResource::DeclareReferences(defaultPrefix); - - if (limbsArrayAddress != SEGMENTED_NULL && GETSEGNUM(limbsArrayAddress) == parent->segment) - { - offset_t ptr = Seg2Filespace(limbsArrayAddress, parent->baseAddress); - - if (!parent->HasDeclaration(ptr)) - { - limbsTable = new ZLimbTable(parent); - limbsTable->ExtractFromBinary(ptr, limbType, limbCount); - limbsTable->SetName(StringHelper::Sprintf("%sLimbs", defaultPrefix.c_str())); - parent->AddResource(limbsTable); - } - else - { - limbsTable = static_cast(parent->FindResource(ptr)); - } - - if (limbsTable->enumName == "") - { - limbsTable->enumName = enumName; - } - if (limbsTable->limbNoneName == "") - { - limbsTable->limbNoneName = limbNoneName; - } - if (limbsTable->limbMaxName == "") - { - limbsTable->limbMaxName = limbMaxName; - } - } -} - -std::string ZSkeleton::GetBodySourceCode() const -{ - std::string limbArrayName; - Globals::Instance->GetSegmentedPtrName(limbsArrayAddress, parent, "", limbArrayName, - parent->workerID); - - std::string countStr; - assert(limbsTable != nullptr); - // There are some Skeletons with the wrong limb count on them, so this check is necessary. - if (limbsTable->count == limbCount) - { - countStr = StringHelper::Sprintf("ARRAY_COUNT(%s)", limbArrayName.c_str()); - } - else - { - countStr = StringHelper::Sprintf("%i", limbCount); - } - - switch (type) - { - case ZSkeletonType::Normal: - case ZSkeletonType::Curve: - return StringHelper::Sprintf("\n\t%s, %s\n", limbArrayName.c_str(), countStr.c_str()); - - case ZSkeletonType::Flex: - return StringHelper::Sprintf("\n\t{ %s, %s }, %i\n", limbArrayName.c_str(), - countStr.c_str(), dListCount); - } - - // TODO: Throw exception? - return "ERROR"; -} - -size_t ZSkeleton::GetRawDataSize() const -{ - switch (type) - { - case ZSkeletonType::Flex: - return 0xC; - case ZSkeletonType::Normal: - case ZSkeletonType::Curve: - default: - return 0x8; - } -} - -std::string ZSkeleton::GetSourceTypeName() const -{ - switch (type) - { - case ZSkeletonType::Normal: - return "SkeletonHeader"; - case ZSkeletonType::Flex: - return "FlexSkeletonHeader"; - case ZSkeletonType::Curve: - return "SkelCurveLimbList"; - } - - return "SkeletonHeader"; -} - -ZResourceType ZSkeleton::GetResourceType() const -{ - return ZResourceType::Skeleton; -} - -DeclarationAlignment ZSkeleton::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -uint8_t ZSkeleton::GetLimbCount() -{ - return limbCount; -} - -/* ZLimbTable */ - -ZLimbTable::ZLimbTable(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("LimbType"); - RegisterRequiredAttribute("Count"); - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbNone"); - RegisterOptionalAttribute("LimbMax"); -} - -void ZLimbTable::ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nLimbType, size_t nCount) -{ - rawDataIndex = nRawDataIndex; - limbType = nLimbType; - count = nCount; - - ParseRawData(); -} - -void ZLimbTable::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string limbTypeXml = registeredAttributes.at("LimbType").value; - limbType = ZLimb::GetTypeByAttributeName(limbTypeXml); - if (limbType == ZLimbType::Invalid) - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'LimbType' attribute.", - "Defaulting to 'Standard'."); - limbType = ZLimbType::Standard; - } - - count = StringHelper::StrToL(registeredAttributes.at("Count").value); - - enumName = registeredAttributes.at("EnumName").value; - limbNoneName = registeredAttributes.at("LimbNone").value; - limbMaxName = registeredAttributes.at("LimbMax").value; - - if (enumName != "") - { - if (limbNoneName == "" || limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'EnumName' attribute was used but 'LimbNone'/'LimbMax' attributes is missing", ""); - } - } - - if (limbNoneName != "") - { - if (limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbNone' attribute was used but 'LimbMax' attribute is missing", ""); - } - } - - if (limbMaxName != "") - { - if (limbNoneName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbMax' attribute was used but 'LimbNone' attribute is missing", ""); - } - } -} - -void ZLimbTable::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - uint32_t ptr = rawDataIndex; - - limbsAddresses.reserve(count); - for (size_t i = 0; i < count; i++) - { - limbsAddresses.push_back(BitConverter::ToUInt32BE(rawData, ptr)); - ptr += 4; - } -} - -void ZLimbTable::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - limbsReferences.reserve(count); - for (size_t i = 0; i < count; i++) - { - segptr_t limbAddress = limbsAddresses[i]; - - if (limbAddress != 0 && GETSEGNUM(limbAddress) == parent->segment) - { - uint32_t limbOffset = Seg2Filespace(limbAddress, parent->baseAddress); - ZLimb* limb; - - if (!parent->HasDeclaration(limbOffset)) - { - limb = new ZLimb(parent); - limb->ExtractFromBinary(limbOffset, limbType); - limb->SetName(limb->GetDefaultName(varPrefix)); - limb->DeclareVar(varPrefix, ""); - limb->DeclareReferences(varPrefix); - parent->AddResource(limb); - } - else - { - limb = static_cast(parent->FindResource(limbOffset)); - assert(limb != nullptr); - assert(limb->GetResourceType() == ZResourceType::Limb); - } - - limb->limbsTable = this; - limb->SetLimbIndex(i + 1); - - limbsReferences.push_back(limb); - } - } -} - -Declaration* ZLimbTable::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, limbsAddresses.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZLimbTable::GetBodySourceCode() const -{ - std::string body; - - for (size_t i = 0; i < count; i++) - { - std::string limbName; - Globals::Instance->GetSegmentedPtrName(limbsAddresses[i], parent, "", limbName, - parent->workerID); - body += StringHelper::Sprintf("\t%s,", limbName.c_str()); - - auto& limb = limbsReferences.at(i); - std::string limbEnumName = limb->enumName; - if (limbEnumName != "") - { - body += StringHelper::Sprintf(" /* %s */", limbEnumName.c_str()); - } - - if (i + 1 < count) - body += "\n"; - } - - return body; -} - -std::string ZLimbTable::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix) -{ - if (limbNoneName == "" || limbMaxName == "" || enumName == "") - { - // Don't produce a enum of any of those attributes is missing - return ""; - } - - std::string limbEnum = StringHelper::Sprintf("typedef enum %s {\n", enumName.c_str()); - - // This assumes there isn't any skeleton with more than 0x100 limbs - - limbEnum += StringHelper::Sprintf(" /* 0x00 */ %s,\n", limbNoneName.c_str()); - - size_t i = 0; - for (; i < count; i++) - { - auto& limb = limbsReferences.at(i); - std::string limbEnumName = limb->enumName; - - if (limbEnumName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "Skeleton's enum attributes were used but at least one limb is missing its " - "'LimbName' attribute", - StringHelper::Sprintf("When processing limb %02i, named '%s' at offset '0x%X'", - i + 1, limb->GetName().c_str(), limb->GetRawDataIndex())); - } - - limbEnum += StringHelper::Sprintf(" /* 0x%02X */ %s,\n", i + 1, limbEnumName.c_str()); - } - - limbEnum += StringHelper::Sprintf(" /* 0x%02X */ %s\n", i + 1, limbMaxName.c_str()); - - limbEnum += StringHelper::Sprintf("} %s;\n", enumName.c_str()); - - return limbEnum; -} - -std::string ZLimbTable::GetSourceTypeName() const -{ - switch (limbType) - { - case ZLimbType::Standard: - case ZLimbType::LOD: - case ZLimbType::Skin: - return "void*"; - - case ZLimbType::Curve: - case ZLimbType::Legacy: - return StringHelper::Sprintf("%s*", ZLimb::GetSourceTypeName(limbType)); - - case ZLimbType::Invalid: - // TODO: Proper error message or something. - assert("Invalid limb type.\n"); - } - - return "ERROR"; -} - -ZResourceType ZLimbTable::GetResourceType() const -{ - return ZResourceType::LimbTable; -} - -size_t ZLimbTable::GetRawDataSize() const -{ - return 4 * limbsAddresses.size(); -} - -std::string ZLimbTable::GetLimbEnumName(uint8_t limbIndex) const -{ - if (limbIndex == 0xFF) - { - return "LIMB_DONE"; - } - - if (limbIndex < count) - { - std::string limbEnumName = limbsReferences.at(limbIndex)->enumName; - if (limbEnumName != "") - { - return StringHelper::Sprintf("%s - 1", limbEnumName.c_str()); - } - } - else - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidExtractedData, parent, this, rawDataIndex, - StringHelper::Sprintf("Limb index '%02i' out of range", limbIndex), - ""); - } - - return StringHelper::Sprintf("0x%02X", limbIndex); -} diff --git a/ZAPDTR/ZAPD/ZSkeleton.h b/ZAPDTR/ZAPD/ZSkeleton.h deleted file mode 100644 index 892d5de35..000000000 --- a/ZAPDTR/ZAPD/ZSkeleton.h +++ /dev/null @@ -1,85 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZDisplayList.h" -#include "ZFile.h" -#include "ZLimb.h" - -enum class ZSkeletonType -{ - Normal, - Flex, - Curve, -}; - -class ZLimbTable : public ZResource -{ -public: - ZLimbType limbType = ZLimbType::Standard; - size_t count = 0; - - std::vector limbsAddresses; - std::vector limbsReferences; // borrowed pointers, do not delete! - - // XML attributes - std::string enumName; - std::string limbNoneName; - std::string limbMaxName; - - ZLimbTable(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nLimbType, size_t nCount); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceOutputHeader([[maybe_unused]] const std::string& prefix); - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - - std::string GetLimbEnumName(uint8_t limbIndex) const; -}; - -class ZSkeleton : public ZResource -{ -public: - ZSkeletonType type = ZSkeletonType::Normal; - ZLimbType limbType = ZLimbType::Standard; - std::string enumName; - std::string limbNoneName; - std::string limbMaxName; - - segptr_t limbsArrayAddress; - uint8_t limbCount = 0; - uint8_t dListCount = 0; // FLEX SKELETON ONLY - - ZSkeleton(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - uint8_t GetLimbCount(); - - ZLimbTable* limbsTable = nullptr; // borrowed pointer, do not delete! - -}; diff --git a/ZAPDTR/ZAPD/ZString.cpp b/ZAPDTR/ZAPD/ZString.cpp deleted file mode 100644 index 4a9069496..000000000 --- a/ZAPDTR/ZAPD/ZString.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include "ZString.h" - -#include -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(String, ZString); - -ZString::ZString(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZString::ParseRawData() -{ - size_t size = 0; - const auto& rawData = parent->GetRawData(); - const auto& rawDataArr = rawData.data(); - size_t rawDataSize = rawData.size(); - for (size_t i = rawDataIndex; i < rawDataSize; ++i) - { - ++size; - if (rawDataArr[i] == '\0') - { - break; - } - } - - auto dataStart = rawData.begin() + rawDataIndex; - strData.assign(dataStart, dataStart + size); -} - -Declaration* ZString::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, 0, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZString::GetBodySourceCode() const -{ - return StringHelper::Sprintf("\t\"%s\"", strData.data()); -} - -std::string ZString::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - return StringHelper::Sprintf("#define %s_macro \"%s\"", name.c_str(), strData.data()); -} - -std::string ZString::GetSourceTypeName() const -{ - return "char"; -} - -ZResourceType ZString::GetResourceType() const -{ - return ZResourceType::String; -} - -size_t ZString::GetRawDataSize() const -{ - return strData.size(); -} diff --git a/ZAPDTR/ZAPD/ZString.h b/ZAPDTR/ZAPD/ZString.h deleted file mode 100644 index 19f615a90..000000000 --- a/ZAPDTR/ZAPD/ZString.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZString : public ZResource -{ -public: - ZString(ZFile* nParent); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet) override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - std::vector strData; -}; diff --git a/ZAPDTR/ZAPD/ZSurfaceType.cpp b/ZAPDTR/ZAPD/ZSurfaceType.cpp deleted file mode 100644 index 27e73accc..000000000 --- a/ZAPDTR/ZAPD/ZSurfaceType.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "ZSurfaceType.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(SurfaceType, ZSurfaceType); - -ZSurfaceType::ZSurfaceType(ZFile* nParent) : ZResource(nParent) -{ -} - -ZSurfaceType::~ZSurfaceType() -{ -} - -void ZSurfaceType::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - data[0] = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); - data[1] = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); -} - -void ZSurfaceType::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), - GetSourceTypeName(), name.c_str(), GetBodySourceCode()); -} - -std::string ZSurfaceType::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{0x%08X, 0x%08X}", data[0], data[1]); -} - -std::string ZSurfaceType::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sSurfaceType_%06X", prefix.c_str(), rawDataIndex); -} - -ZResourceType ZSurfaceType::GetResourceType() const -{ - return ZResourceType::SurfaceType; -} - -size_t ZSurfaceType::GetRawDataSize() const -{ - return 8; -} - -std::string ZSurfaceType::GetSourceTypeName() const -{ - return "SurfaceType"; -} - -bool ZSurfaceType::DoesSupportArray() const -{ - return true; -} diff --git a/ZAPDTR/ZAPD/ZSurfaceType.h b/ZAPDTR/ZAPD/ZSurfaceType.h deleted file mode 100644 index 3bbddee8c..000000000 --- a/ZAPDTR/ZAPD/ZSurfaceType.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include -#include "ZFile.h" -#include "ZResource.h" - -class ZSurfaceType : public ZResource -{ -public: - std::array data; - - ZSurfaceType(ZFile* nParent); - ~ZSurfaceType(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - bool DoesSupportArray() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZSymbol.cpp b/ZAPDTR/ZAPD/ZSymbol.cpp deleted file mode 100644 index b5df68669..000000000 --- a/ZAPDTR/ZAPD/ZSymbol.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "ZSymbol.h" - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Symbol, ZSymbol); - -ZSymbol::ZSymbol(ZFile* nParent) : ZResource(nParent) -{ - RegisterOptionalAttribute("Type"); - RegisterOptionalAttribute("TypeSize"); - RegisterOptionalAttribute("Count"); -} - -void ZSymbol::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string typeXml = registeredAttributes.at("Type").value; - - if (typeXml == "") - { - HANDLE_WARNING_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'Type' attribute in ", "Defaulting to 'void*'."); - type = "void*"; - } - else - { - type = typeXml; - } - - std::string typeSizeXml = registeredAttributes.at("TypeSize").value; - if (typeSizeXml == "") - { - HANDLE_WARNING_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'TypeSize' attribute in ", "Defaulting to '4'."); - typeSize = 4; // Size of a word. - } - else - { - typeSize = StringHelper::StrToL(typeSizeXml, 0); - } - - if (registeredAttributes.at("Count").wasSet) - { - isArray = true; - - std::string countXml = registeredAttributes.at("Count").value; - if (countXml != "") - count = StringHelper::StrToL(countXml, 0); - } - - if (registeredAttributes.at("Static").value == "On") - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "a cannot be marked as static", - "Disabling static for this resource."); - } - staticConf = StaticConfig::Off; -} - -Declaration* ZSymbol::DeclareVar([[maybe_unused]] const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - return nullptr; -} - -size_t ZSymbol::GetRawDataSize() const -{ - if (isArray) - return count * typeSize; - - return typeSize; -} - -std::string ZSymbol::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - if (isArray) - { - if (count == 0) - return StringHelper::Sprintf("extern %s %s[];\n", type.c_str(), name.c_str()); - else - return StringHelper::Sprintf("extern %s %s[%i];\n", type.c_str(), name.c_str(), count); - } - - return StringHelper::Sprintf("extern %s %s;\n", type.c_str(), name.c_str()); -} - -std::string ZSymbol::GetSourceTypeName() const -{ - return type; -} - -ZResourceType ZSymbol::GetResourceType() const -{ - return ZResourceType::Symbol; -} diff --git a/ZAPDTR/ZAPD/ZSymbol.h b/ZAPDTR/ZAPD/ZSymbol.h deleted file mode 100644 index e00f14c6b..000000000 --- a/ZAPDTR/ZAPD/ZSymbol.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZSymbol : public ZResource -{ -protected: - std::string type; - size_t typeSize; - bool isArray = false; - uint32_t count = 0; - -public: - ZSymbol(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZText.cpp b/ZAPDTR/ZAPD/ZText.cpp deleted file mode 100644 index 95e4b5236..000000000 --- a/ZAPDTR/ZAPD/ZText.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include "ZText.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Text, ZText); - -ZText::ZText(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("CodeOffset"); - RegisterOptionalAttribute("LangOffset", "0"); -} - -void ZText::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - uint32_t currentPtr = StringHelper::StrToL(registeredAttributes.at("CodeOffset").value, 16); - uint32_t langPtr = currentPtr; - bool isPalLang = false; - - if (StringHelper::StrToL(registeredAttributes.at("LangOffset").value, 16) != 0) - { - langPtr = StringHelper::StrToL(registeredAttributes.at("LangOffset").value, 16); - - if (langPtr != currentPtr) - isPalLang = true; - } - - std::vector codeData; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - codeData = Globals::Instance->GetBaseromFile("code"); - else - codeData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "code"); - - while (true) - { - MessageEntry msgEntry; - msgEntry.id = BitConverter::ToInt16BE(codeData, currentPtr + 0); - msgEntry.textboxType = (codeData[currentPtr + 2] & 0xF0) >> 4; - msgEntry.textboxYPos = (codeData[currentPtr + 2] & 0x0F); - - if (isPalLang) - { - msgEntry.segmentId = (codeData[langPtr + 0]); - msgEntry.msgOffset = BitConverter::ToInt32BE(codeData, langPtr + 0) & 0x00FFFFFF; - } - else - { - msgEntry.segmentId = (codeData[langPtr + 4]); - msgEntry.msgOffset = BitConverter::ToInt32BE(codeData, langPtr + 4) & 0x00FFFFFF; - } - - uint32_t msgPtr = msgEntry.msgOffset; - - unsigned char c = rawData[msgPtr]; - unsigned int extra = 0; - bool stop = false; - - // Continue parsing until we are told to stop and all extra bytes are read - while ((c != '\0' && !stop) || extra > 0) - { - msgEntry.msg += c; - msgPtr++; - - // Some control codes require reading extra bytes - if (extra == 0) - { - // End marker, so stop this message and do not read anything else - if (c == 0x02) - { - stop = true; - } - else if (c == 0x05 || c == 0x13 || c == 0x0E || c == 0x0C || c == 0x1E || c == 0x06 || - c == 0x14) - { - extra = 1; - } - // "Continue to new text ID", so stop this message and read two more bytes for the text ID - else if (c == 0x07) - { - extra = 2; - stop = true; - } - else if (c == 0x12 || c == 0x11) - { - extra = 2; - } - else if (c == 0x15) - { - extra = 3; - } - } - else - { - extra--; - } - - c = rawData[msgPtr]; - } - - messages.push_back(msgEntry); - - if (msgEntry.id == 0xFFFC || msgEntry.id == 0xFFFF) - break; - - currentPtr += 8; - - if (isPalLang) - langPtr += 4; - else - langPtr += 8; - } - - int bp2 = 0; -} - -std::string ZText::GetSourceTypeName() const -{ - return "u8"; -} - -size_t ZText::GetRawDataSize() const -{ - return 1; -} - -ZResourceType ZText::GetResourceType() const -{ - return ZResourceType::Text; -} diff --git a/ZAPDTR/ZAPD/ZText.h b/ZAPDTR/ZAPD/ZText.h deleted file mode 100644 index 37b9c66a9..000000000 --- a/ZAPDTR/ZAPD/ZText.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class MessageEntry -{ -public: - uint16_t id; - uint8_t textboxType; - uint8_t textboxYPos; - uint32_t segmentId; - uint32_t msgOffset; - std::string msg; -}; - -class ZText : public ZResource -{ -public: - std::vector messages; - - ZText(ZFile* nParent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZTexture.cpp b/ZAPDTR/ZAPD/ZTexture.cpp deleted file mode 100644 index 5184b834b..000000000 --- a/ZAPDTR/ZAPD/ZTexture.cpp +++ /dev/null @@ -1,974 +0,0 @@ -#include "ZTexture.h" - -#include - -#include "CRC32.h" -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "WarningHandler.h" - -REGISTER_ZFILENODE(Texture, ZTexture); - -ZTexture::ZTexture(ZFile* nParent) : ZResource(nParent) -{ - width = 0; - height = 0; - dWordAligned = true; - genOTRDef = true; - splitTlut = false; - - RegisterRequiredAttribute("Width"); - RegisterRequiredAttribute("Height"); - RegisterRequiredAttribute("Format"); - RegisterOptionalAttribute("TlutOffset"); - RegisterOptionalAttribute("ExternalTlut"); - RegisterOptionalAttribute("ExternalTlutOffset"); - RegisterOptionalAttribute("SplitTlut"); - - // Dummy property added by https://github.com/HarbourMasters/Shipwright/pull/3161 - // Used to indicate if a resource definition was added through a script - // and to enable easy removal/re-add of the definitions when introducing new rom support - // Can be removed once we feel it is no longer useful - // This is not used in ZAPD itself, the registration is to prevent missing attribute errors - RegisterOptionalAttribute("AddedByScript"); -} - -void ZTexture::ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t nHeight, - TextureType nType, bool nIsPalette) -{ - width = nWidth; - height = nHeight; - format = nType; - rawDataIndex = nRawDataIndex; - isPalette = nIsPalette; - name = GetDefaultName(parent->GetName()); - outName = name; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); - CalcHash(); -} - -void ZTexture::FromPNG(const fs::path& pngFilePath, TextureType texType) -{ - format = texType; - name = StringHelper::Split(Path::GetFileNameWithoutExtension(pngFilePath.string()), ".")[0]; - PrepareRawDataFromFile(pngFilePath); -} - -void ZTexture::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string widthXml = registeredAttributes.at("Width").value; - std::string heightXml = registeredAttributes.at("Height").value; - std::string SplitTlutXml = registeredAttributes.at("SplitTlut").value; - - if (!StringHelper::HasOnlyDigits(widthXml)) - { - std::string errorHeader = StringHelper::Sprintf( - "value of 'Width' attribute has non-decimal digits: '%s'", widthXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - if (!StringHelper::HasOnlyDigits(heightXml)) - { - std::string errorHeader = StringHelper::Sprintf( - "value of 'Height' attribute has non-decimal digits: '%s'", heightXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - - if (!registeredAttributes.at("ExternalTlut").wasSet && - registeredAttributes.at("SplitTlut").wasSet) - { - std::string errorHeader = - StringHelper::Sprintf("SplitTlut set without using an external tlut"); - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - - if (!SplitTlutXml.empty()) - { - if (!tinyxml2::XMLUtil::ToBool(SplitTlutXml.c_str(), &splitTlut)) - { - std::string errorHeader = StringHelper::Sprintf( - "Invalid value passed to SplitTlut: '%s'. Valid values are true, false, 1, 0", - SplitTlutXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - } - - width = StringHelper::StrToL(widthXml); - height = StringHelper::StrToL(heightXml); - - std::string formatStr = registeredAttributes.at("Format").value; - format = GetTextureTypeFromString(formatStr); - - if (format == TextureType::Error) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Format' attribute", ""); - } - - const auto& tlutOffsetAttr = registeredAttributes.at("TlutOffset"); - if (tlutOffsetAttr.wasSet) - { - switch (format) - { - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - tlutOffset = StringHelper::StrToL(tlutOffsetAttr.value, 16); - break; - - default: - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, - "'TlutOffset' declared in non color-indexed (ci4 or ci8) texture", - ""); - break; - } - } -} - -void ZTexture::ParseRawData() -{ - if (rawDataIndex % 8 != 0) - dWordAligned = false; - - switch (format) - { - case TextureType::RGBA16bpp: - PrepareBitmapRGBA16(); - break; - case TextureType::RGBA32bpp: - PrepareBitmapRGBA32(); - break; - case TextureType::Grayscale4bpp: - PrepareBitmapGrayscale4(); - break; - case TextureType::Grayscale8bpp: - PrepareBitmapGrayscale8(); - break; - case TextureType::GrayscaleAlpha4bpp: - PrepareBitmapGrayscaleAlpha4(); - break; - case TextureType::GrayscaleAlpha8bpp: - PrepareBitmapGrayscaleAlpha8(); - break; - case TextureType::GrayscaleAlpha16bpp: - PrepareBitmapGrayscaleAlpha16(); - break; - case TextureType::Palette4bpp: - PrepareBitmapPalette4(); - break; - case TextureType::Palette8bpp: - PrepareBitmapPalette8(); - break; - case TextureType::Error: - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("Invalid texture format", format), ""); - assert(!"TODO"); - break; - } -} - -void ZTexture::ParseRawDataLate() -{ - if (registeredAttributes["ExternalTlut"].wasSet) - { - const std::string externPalette = registeredAttributes["ExternalTlut"].value; - for (const auto& file : Globals::Instance->files) - { - if (file->GetName() == externPalette) - { - offset_t palOffset = 0; - if (registeredAttributes["ExternalTlutOffset"].wasSet) - { - palOffset = - StringHelper::StrToL(registeredAttributes["ExternalTlutOffset"].value, 16); - } - else - { - HANDLE_WARNING_RESOURCE( - WarningType::MissingOffsets, parent, this, rawDataIndex, - StringHelper::Sprintf( - "No ExternalTlutOffset Given. Assuming offset of 0x0"), - ""); - } - for (const auto& res : file->resources) - { - if (res->GetRawDataIndex() == palOffset) - { - ZTexture* palette = (ZTexture*)res; - ZTexture tlutTemp(file); - - tlut = &tlutTemp; - tlut->ExtractFromBinary(palOffset, palette->width, palette->height, - TextureType::RGBA16bpp, true); - SetTlut(tlut); - } - } - } - } - } -} - -void ZTexture::PrepareBitmapRGBA16() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - int32_t pos = rawDataIndex + ((y * width) + x) * 2; - uint16_t data = parentRawData.at(pos + 1) | (parentRawData.at(pos) << 8); - uint8_t r = (data & 0xF800) >> 11; - uint8_t g = (data & 0x07C0) >> 6; - uint8_t b = (data & 0x003E) >> 1; - uint8_t alpha = data & 0x01; - - textureData.SetRGBPixel(y, x, r * 8, g * 8, b * 8, alpha * 255); - } - } -} - -void ZTexture::PrepareBitmapRGBA32() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 4; - uint8_t r = parentRawData.at(pos + 0); - uint8_t g = parentRawData.at(pos + 1); - uint8_t b = parentRawData.at(pos + 2); - uint8_t alpha = parentRawData.at(pos + 3); - - textureData.SetRGBPixel(y, x, r, g, b, alpha); - } - } -} - -void ZTexture::PrepareBitmapGrayscale4() -{ - textureData.InitEmptyRGBImage(width, height, false); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint8_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t grayscale = 0; - - if (i == 0) - grayscale = parentRawData.at(pos) & 0xF0; - else - grayscale = (parentRawData.at(pos) & 0x0F) << 4; - - textureData.SetGrayscalePixel(y, x + i, grayscale); - } - } - } -} - -void ZTexture::PrepareBitmapGrayscale8() -{ - textureData.InitEmptyRGBImage(width, height, false); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - - textureData.SetGrayscalePixel(y, x, parentRawData.at(pos)); - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha4() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint16_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t data = 0; - - if (i == 0) - data = (parentRawData.at(pos) & 0xF0) >> 4; - else - data = parentRawData.at(pos) & 0x0F; - - uint8_t grayscale = ((data & 0x0E) >> 1) * 32; - uint8_t alpha = (data & 0x01) * 255; - - textureData.SetGrayscalePixel(y, x + i, grayscale, alpha); - } - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha8() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - uint8_t grayscale = parentRawData.at(pos) & 0xF0; - uint8_t alpha = (parentRawData.at(pos) & 0x0F) << 4; - - textureData.SetGrayscalePixel(y, x, grayscale, alpha); - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha16() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 2; - uint8_t grayscale = parentRawData.at(pos + 0); - uint8_t alpha = parentRawData.at(pos + 1); - - textureData.SetGrayscalePixel(y, x, grayscale, alpha); - } - } -} - -void ZTexture::PrepareBitmapPalette4() -{ - textureData.InitEmptyPaletteImage(width, height); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint16_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t paletteIndex = 0; - - if (i == 0) - paletteIndex = (parentRawData.at(pos) & 0xF0) >> 4; - else - paletteIndex = (parentRawData.at(pos) & 0x0F); - - textureData.SetIndexedPixel(y, x + i, paletteIndex, paletteIndex * 16); - } - } - } -} - -void ZTexture::PrepareBitmapPalette8() -{ - textureData.InitEmptyPaletteImage(width, height); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - uint8_t grayscale = parentRawData.at(pos); - - textureData.SetIndexedPixel(y, x, grayscale, grayscale); - } - } -} - -void ZTexture::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (tlutOffset != static_cast(-1)) - { - tlut = parent->GetTextureResource(tlutOffset); - if (tlut == nullptr) - { - int32_t tlutDim = 16; - if (format == TextureType::Palette4bpp) - tlutDim = 4; - - tlut = new ZTexture(parent); - tlut->ExtractFromBinary(tlutOffset, tlutDim, tlutDim, TextureType::RGBA16bpp, true); - parent->AddTextureResource(tlutOffset, tlut); - tlut->DeclareVar(prefix, ""); - } - else - { - tlut->isPalette = true; - } - SetTlut(tlut); - } -} - -void ZTexture::PrepareRawDataFromFile(const fs::path& pngFilePath) -{ - textureData.ReadPng(pngFilePath); - - width = textureData.GetWidth(); - height = textureData.GetHeight(); - - textureDataRaw.clear(); - textureDataRaw.resize(GetRawDataSize()); - - switch (format) - { - case TextureType::RGBA16bpp: - PrepareRawDataRGBA16(); - break; - case TextureType::RGBA32bpp: - PrepareRawDataRGBA32(); - break; - case TextureType::Grayscale4bpp: - PrepareRawDataGrayscale4(); - break; - case TextureType::Grayscale8bpp: - PrepareRawDataGrayscale8(); - break; - case TextureType::GrayscaleAlpha4bpp: - PrepareRawDataGrayscaleAlpha4(); - break; - case TextureType::GrayscaleAlpha8bpp: - PrepareRawDataGrayscaleAlpha8(); - break; - case TextureType::GrayscaleAlpha16bpp: - PrepareRawDataGrayscaleAlpha16(); - break; - case TextureType::Palette4bpp: - PrepareRawDataPalette4(); - break; - case TextureType::Palette8bpp: - PrepareRawDataPalette8(); - break; - case TextureType::Error: - HANDLE_ERROR_PROCESS(WarningType::InvalidPNG, "Input PNG file has invalid format type", ""); - break; - } -} - -void ZTexture::PrepareRawDataRGBA16() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 2; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t r = pixel.r / 8; - uint8_t g = pixel.g / 8; - uint8_t b = pixel.b / 8; - - uint8_t alphaBit = pixel.a != 0; - - uint16_t data = (r << 11) + (g << 6) + (b << 1) + alphaBit; - - textureDataRaw[pos + 0] = (data & 0xFF00) >> 8; - textureDataRaw[pos + 1] = (data & 0x00FF); - } - } -} - -void ZTexture::PrepareRawDataRGBA32() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 4; - RGBAPixel pixel = textureData.GetPixel(y, x); - - textureDataRaw[pos + 0] = pixel.r; - textureDataRaw[pos + 1] = pixel.g; - textureDataRaw[pos + 2] = pixel.b; - textureDataRaw[pos + 3] = pixel.a; - } - } -} - -void ZTexture::PrepareRawDataGrayscale4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - uint8_t r1 = textureData.GetPixel(y, x).r; - uint8_t r2 = textureData.GetPixel(y, x + 1).r; - - textureDataRaw[pos] = (uint8_t)(((r1 / 16) << 4) + (r2 / 16)); - } - } -} - -void ZTexture::PrepareRawDataGrayscale8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = (y * width) + x; - RGBAPixel pixel = textureData.GetPixel(y, x); - textureDataRaw[pos] = pixel.r; - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - uint8_t data = 0; - - for (uint16_t i = 0; i < 2; i++) - { - RGBAPixel pixel = textureData.GetPixel(y, x + i); - uint8_t cR = pixel.r; - uint8_t alphaBit = pixel.a != 0; - - if (i == 0) - data |= (((cR / 32) << 1) + alphaBit) << 4; - else - data |= ((cR / 32) << 1) + alphaBit; - } - - textureDataRaw[pos] = data; - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 1; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t r = pixel.r; - uint8_t a = pixel.a; - - textureDataRaw[pos] = ((r / 16) << 4) + (a / 16); - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha16() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 2; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t cR = pixel.r; - uint8_t aR = pixel.a; - - textureDataRaw[pos + 0] = cR; - textureDataRaw[pos + 1] = aR; - } - } -} - -void ZTexture::PrepareRawDataPalette4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - - uint8_t cR1 = textureData.GetIndexedPixel(y, x); - uint8_t cR2 = textureData.GetIndexedPixel(y, x + 1); - - textureDataRaw[pos] = (cR1 << 4) | (cR2); - } - } -} - -void ZTexture::PrepareRawDataPalette8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x); - uint8_t cR = textureData.GetIndexedPixel(y, x); - - textureDataRaw[pos] = cR; - } - } -} - -float ZTexture::GetPixelMultiplyer() const -{ - switch (format) - { - case TextureType::Grayscale4bpp: - case TextureType::GrayscaleAlpha4bpp: - case TextureType::Palette4bpp: - return 0.5f; - case TextureType::Grayscale8bpp: - case TextureType::GrayscaleAlpha8bpp: - case TextureType::Palette8bpp: - return 1; - case TextureType::GrayscaleAlpha16bpp: - case TextureType::RGBA16bpp: - return 2; - case TextureType::RGBA32bpp: - return 4; - default: - return -1; - } -} - -size_t ZTexture::GetRawDataSize() const -{ - return (width * height * GetPixelMultiplyer()); -} - -std::string ZTexture::GetIMFmtFromType() -{ - switch (format) - { - case TextureType::RGBA32bpp: - case TextureType::RGBA16bpp: - return "G_IM_FMT_RGBA"; - case TextureType::Grayscale4bpp: - case TextureType::Grayscale8bpp: - return "G_IM_FMT_I"; - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - return "G_IM_FMT_CI"; - case TextureType::GrayscaleAlpha4bpp: - case TextureType::GrayscaleAlpha8bpp: - case TextureType::GrayscaleAlpha16bpp: - return "G_IM_FMT_IA"; - default: - return "ERROR"; - } -} - -std::string ZTexture::GetIMSizFromType() -{ - switch (format) - { - case TextureType::Grayscale4bpp: - case TextureType::Palette4bpp: - case TextureType::GrayscaleAlpha4bpp: - return "G_IM_SIZ_4b"; - case TextureType::Palette8bpp: - case TextureType::Grayscale8bpp: - return "G_IM_SIZ_8b"; - case TextureType::GrayscaleAlpha16bpp: - case TextureType::RGBA16bpp: - return "G_IM_SIZ_16b"; - case TextureType::RGBA32bpp: - return "G_IM_SIZ_32b"; - default: - return "ERROR"; - } -} - -std::string ZTexture::GetDefaultName(const std::string& prefix) const -{ - const char* suffix = "Tex"; - if (isPalette) - suffix = "TLUT"; - return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), suffix, rawDataIndex); -} - -uint32_t ZTexture::GetWidth() const -{ - return width; -} - -uint32_t ZTexture::GetHeight() const -{ - return height; -} - -void ZTexture::SetDimensions(uint32_t nWidth, uint32_t nHeight) -{ - width = nWidth; - height = nHeight; - ParseRawData(); -} - -TextureType ZTexture::GetTextureType() const -{ - return format; -} - - -void ZTexture::Save(const fs::path& outFolder) -{ - // Optionally generate text file containing CRC information. This is going to be a one time - // process for generating the Texture Pool XML. - if (Globals::Instance->outputCrc) - { - DiskFile::WriteAllText((Globals::Instance->outputPath / (outName + ".txt")).string(), - StringHelper::Sprintf("%08lX", hash)); - } - - // Do not save png files if we're making an OTR file. They're not needed... - if (Globals::Instance->otrMode) - return; - - auto outPath = GetPoolOutPath(outFolder); - - if (!Directory::Exists(outPath.string())) - Directory::CreateDirectory(outPath.string()); - - fs::path outFileName; - - if (!dWordAligned) - outFileName = outPath / (outName + ".u32" + "." + GetExternalExtension() + ".png"); - else - outFileName = outPath / (outName + +"." + GetExternalExtension() + ".png"); - -#ifdef TEXTURE_DEBUG - printf("Saving PNG: %s\n", outFileName.c_str()); - printf("\t Var name: %s\n", name.c_str()); - if (tlut != nullptr) - printf("\t TLUT name: %s\n", tlut->name.c_str()); -#endif - - textureData.WritePng(outFileName); - -#ifdef TEXTURE_DEBUG - printf("\n"); -#endif -} - -Declaration* ZTexture::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - std::string incStr; - - //if (Globals::Instance->otrMode) - //return nullptr; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - auto filepath = Globals::Instance->outputPath / fs::path(auxOutName).stem(); - - if (dWordAligned) - incStr = - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str()); - else - incStr = StringHelper::Sprintf("%s.u32.%s.inc.c", filepath.c_str(), - GetExternalExtension().c_str()); - - if (!Globals::Instance->cfg.texturePool.empty()) - { - CalcHash(); - - // TEXTURE POOL CHECK - const auto& poolEntry = Globals::Instance->cfg.texturePool.find(hash); - if (poolEntry != Globals::Instance->cfg.texturePool.end()) - { - if (dWordAligned) - incStr = StringHelper::Sprintf("%s.%s.inc.c", poolEntry->second.path.c_str(), - GetExternalExtension().c_str()); - else - incStr = StringHelper::Sprintf("%s.u32.%s.inc.c", poolEntry->second.path.c_str(), - GetExternalExtension().c_str()); - } - } - size_t texSizeDivisor = (dWordAligned) ? 8 : 4; - - Declaration* decl = parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, - GetRawDataSize() / texSizeDivisor); - decl->staticConf = staticConf; - return decl; -} - -std::string ZTexture::GetBodySourceCode() const -{ - std::string sourceOutput; - - if (!Globals::Instance->otrMode) - { - size_t texSizeInc = (dWordAligned) ? 8 : 4; - for (size_t i = 0; i < textureDataRaw.size(); i += texSizeInc) - { - if (i % 32 == 0) - sourceOutput += " "; - if (dWordAligned) - sourceOutput += StringHelper::Sprintf("0x%016llX, ", - BitConverter::ToUInt64BE(textureDataRaw, i)); - else - sourceOutput += StringHelper::Sprintf("0x%08llX, ", - BitConverter::ToUInt32BE(textureDataRaw, i)); - if (i % 32 == 24) - sourceOutput += - StringHelper::Sprintf(" // 0x%06X \n", rawDataIndex + ((i / 32) * 32)); - } - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - sourceOutput += "\n"; - } else if (Globals::Instance->buildRawTexture) { - sourceOutput += std::string(textureDataRaw.begin(), textureDataRaw.end()); - } - - return sourceOutput; -} - -bool ZTexture::IsExternalResource() const -{ - return true; -} - -ZResourceType ZTexture::GetResourceType() const -{ - return ZResourceType::Texture; -} - -std::string ZTexture::GetSourceTypeName() const -{ - return dWordAligned ? "u64" : "u32"; -} - -void ZTexture::CalcHash() -{ - //if (hash == 0) - { - const auto& parentRawData = parent->GetRawData(); - hash = CRC32B(parentRawData.data() + rawDataIndex, GetRawDataSize()); - } -} - -std::string ZTexture::GetExternalExtension() const -{ - switch (format) - { - case TextureType::RGBA32bpp: - return "rgba32"; - case TextureType::RGBA16bpp: - return "rgba16"; - case TextureType::Grayscale4bpp: - return "i4"; - case TextureType::Grayscale8bpp: - return "i8"; - case TextureType::GrayscaleAlpha4bpp: - return "ia4"; - case TextureType::GrayscaleAlpha8bpp: - return "ia8"; - case TextureType::GrayscaleAlpha16bpp: - return "ia16"; - case TextureType::Palette4bpp: - return "ci4"; - case TextureType::Palette8bpp: - return "ci8"; - default: - return "ERROR"; - } -} - -fs::path ZTexture::GetPoolOutPath(const fs::path& defaultValue) -{ - if (Globals::Instance->cfg.texturePool.find(hash) != Globals::Instance->cfg.texturePool.end()) - return Path::GetDirectoryName(Globals::Instance->cfg.texturePool[hash].path.string()); - - return defaultValue; -} - -TextureType ZTexture::GetTextureTypeFromString(const std::string& str) -{ - TextureType texType = TextureType::Error; - - if (str == "rgba32") - texType = TextureType::RGBA32bpp; - else if (str == "rgba16") - texType = TextureType::RGBA16bpp; - else if (str == "rgb5a1") - { - texType = TextureType::RGBA16bpp; - HANDLE_WARNING(WarningType::Deprecated, - "the texture format 'rgb5a1' is currently deprecated", - "It will be removed in a future version. Use the format 'rgba16' instead."); - } - else if (str == "i4") - texType = TextureType::Grayscale4bpp; - else if (str == "i8") - texType = TextureType::Grayscale8bpp; - else if (str == "ia4") - texType = TextureType::GrayscaleAlpha4bpp; - else if (str == "ia8") - texType = TextureType::GrayscaleAlpha8bpp; - else if (str == "ia16") - texType = TextureType::GrayscaleAlpha16bpp; - else if (str == "ci4") - texType = TextureType::Palette4bpp; - else if (str == "ci8") - texType = TextureType::Palette8bpp; - else - // TODO: handle this case in a more coherent way - HANDLE_WARNING(WarningType::InvalidAttributeValue, - "invalid value found for 'Type' attribute", "Defaulting to ''."); - return texType; -} - -bool ZTexture::IsColorIndexed() const -{ - switch (format) - { - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - return true; - - default: - return false; - } -} - -void ZTexture::SetTlut(ZTexture* nTlut) -{ - assert(IsColorIndexed()); - assert(nTlut->isPalette); - tlut = nTlut; - - textureData.SetPalette(tlut->textureData, splitTlut ? 128 : 0); -} - -bool ZTexture::HasTlut() const -{ - return tlut != nullptr; -} diff --git a/ZAPDTR/ZAPD/ZTexture.h b/ZAPDTR/ZAPD/ZTexture.h deleted file mode 100644 index 8cece3ff2..000000000 --- a/ZAPDTR/ZAPD/ZTexture.h +++ /dev/null @@ -1,93 +0,0 @@ -#pragma once - -#include "ImageBackend.h" -#include "ZResource.h" -#include "tinyxml2.h" - -enum class TextureType -{ - Error, - RGBA32bpp, - RGBA16bpp, - Palette4bpp, - Palette8bpp, - Grayscale4bpp, - Grayscale8bpp, - GrayscaleAlpha4bpp, - GrayscaleAlpha8bpp, - GrayscaleAlpha16bpp, -}; - -class ZTexture : public ZResource -{ -protected: - TextureType format = TextureType::Error; - uint32_t width, height; - - ImageBackend textureData; - std::vector textureDataRaw; // When reading from a PNG file. - uint32_t tlutOffset = static_cast(-1); - ZTexture* tlut = nullptr; - bool splitTlut; - - void PrepareBitmapRGBA16(); - void PrepareBitmapRGBA32(); - void PrepareBitmapGrayscale8(); - void PrepareBitmapGrayscaleAlpha8(); - void PrepareBitmapGrayscale4(); - void PrepareBitmapGrayscaleAlpha4(); - void PrepareBitmapGrayscaleAlpha16(); - void PrepareBitmapPalette4(); - void PrepareBitmapPalette8(); - - void PrepareRawDataFromFile(const fs::path& inFolder); - void PrepareRawDataRGBA16(); - void PrepareRawDataRGBA32(); - void PrepareRawDataGrayscale4(); - void PrepareRawDataGrayscale8(); - void PrepareRawDataGrayscaleAlpha4(); - void PrepareRawDataGrayscaleAlpha8(); - void PrepareRawDataGrayscaleAlpha16(); - void PrepareRawDataPalette4(); - void PrepareRawDataPalette8(); - -public: - ZTexture(ZFile* nParent); - - bool isPalette = false; - bool dWordAligned = true; - - void ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t nHeight, - TextureType nType, bool nIsPalette); - void FromPNG(const fs::path& pngFilePath, TextureType texType); - static TextureType GetTextureTypeFromString(const std::string& str); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - void CalcHash() override; - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - std::string GetIMFmtFromType(); - std::string GetIMSizFromType(); - std::string GetDefaultName(const std::string& prefix) const override; - uint32_t GetWidth() const; - uint32_t GetHeight() const; - void SetDimensions(uint32_t nWidth, uint32_t nHeight); - float GetPixelMultiplyer() const; - TextureType GetTextureType() const; - fs::path GetPoolOutPath(const fs::path& defaultValue); - bool IsColorIndexed() const; - void SetTlut(ZTexture* nTlut); - bool HasTlut() const; - void ParseRawDataLate() override; -}; diff --git a/ZAPDTR/ZAPD/ZTextureAnimation.cpp b/ZAPDTR/ZAPD/ZTextureAnimation.cpp deleted file mode 100644 index 233a54dbb..000000000 --- a/ZAPDTR/ZAPD/ZTextureAnimation.cpp +++ /dev/null @@ -1,670 +0,0 @@ -/** - * File: ZTextureAnimation.cpp - * ZResources defined: ZTextureAnimation, ZTextureAnimationParams (XML declaration not supported for - * the latter) - * Purpose: extracting texture animating structures from asset files - * Note: data type is exclusive to Majora's Mask - * - * Structure of data: - * A texture animation consists of a main array of data of the form - * `SS 00 00 0T PPPPPPPP`, - * where `S` is the segment that the functionality is sent to (and read by DLists), `T` is the - * "type" (see below), and `P` is a pointer to the type's subsidiary information, which is - * invariably just above this main array. Details of this subsidiary data are given below. - * - * Segment - * === - * The segment starts at 1 and is incremented in each entry; the final one is negated, which is used - * as the indication to stop reading. The actual segment the game will use to draw is S + 7. - * - * Types - * === - * There are 7 values that `T` can take: - * `0`: A single texture scroll (Implemented by Gfx_TexScroll): subsidiary params are given as - * an array with one entry, a struct `XX YY WW HH` containing xStep, yStep, width, height - * (all u8). - * - * `1`: A dual texture scroll (Implementated by Gfx_TwoTexScroll): same as type `0`, but with - * two entries in the params array. - * - * `2`: Color changing: Changes the primColor (with a LOD factor) and envColor - * `KKKK LLLL PPPPPPPP QQQQQQQQ RRRRRRRR` - * - `K` (u16) is the total length of the animation (and in this case, the total number of - * colors) - * - `L` (u16) is seemingly always 0 for this type, and not used in the code - * - `P` segmented pointer to array of augmented primColors - * - `Q` segmented pointer to array of envColors, and can be NULL - * - `R` segmented pointer to array of frameData (u8), which is also seemingly always NULL - * for this type. - * - * envColors take the form `RR GG BB AA` as usual, while primColors have an extra LODFrac - * element: RR GG BB AA LL - * - * `3`: Color changing (LERP): similar to type `2`, but uses linear interpolation. The structure - * is similar to `2`, but - * - `K` is now just the animation length, while - * - `L` is the total number of colors, and - * - the frameData is used to determine which colors to interpolate. - * - * `4`: Color changing (Lagrange interpolation): For extraction purposes identical to type 3. - * Uses a nonlinear interpolation formula to change the colours more smoothly. - * - * `5`: Texture cycle: functions like a gif. Subsidiary params: - * `FFFF 0000 PPPPPPPP QQQQQQQQ` - * where - * - `F` (u16) time between changes in frames - * - `P` pointer to array of segmented pointers to textures to cycle through - * - `Q` array of indices, indicating which texture to use next when a change frame is - * reached. The maximum indicates the number of textures in the texture array. - * - * `6`: This is used to indicate an empty/unimplemented params set. It is ignored by the game's - * function provided that the segment is 0. A generic empty one takes the form - * `00 00 00 06 00000000`, - * and has no extra data. - * - * Implementation - * === - * - ZTextureAnimation requires a declaration in the XML to extract anything. It handles the main - * array. It uses a POD struct for each entry, and declares references to the params structs. - * - * - ZTextureAnimationParams is not (currently) declarable in an XML. It is a parent class for the - * three classes that handle the various cases: - * - TextureScrollingParams for types `0` and `1` - * - TextureColorChangingParams for types `2`,`3`,`4` - * - TextureCyclingParams for type `5` - * Each of these will declare all its subsidiary arrays, using POD structs. - */ -#include "ZTextureAnimation.h" - -#include -#include -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include "ZResource.h" -#include "tinyxml2.h" - -REGISTER_ZFILENODE(TextureAnimation, ZTextureAnimation); - -/* Constructors */ -ZTextureAnimationParams::ZTextureAnimationParams(ZFile* parent) : ZResource::ZResource(parent) -{ -} -TextureScrollingParams::TextureScrollingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} -TextureColorChangingParams::TextureColorChangingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} -TextureCyclingParams::TextureCyclingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} - -/* TextureAnimationParams */ -/* This class only implements the functions common to all or most its inheritors */ - -void ZTextureAnimationParams::ExtractFromBinary(uint32_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - - ParseRawData(); -} - -// Implemented by TextureScrollingParams only -void ZTextureAnimationParams::ExtractFromBinary([[maybe_unused]] uint32_t nRawDataIndex, - [[maybe_unused]] int count) -{ -} - -std::string -ZTextureAnimationParams::GetDefaultName([[maybe_unused]] const std::string& prefix) const -{ - return "ShouldNotBeVIsible"; -} - -ZResourceType ZTextureAnimationParams::GetResourceType() const -{ - return ZResourceType::TextureAnimationParams; -} - -/* TextureScrollingParams */ - -void TextureScrollingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - for (int i = 0; i < count; i++) - { - rows[i].xStep = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i); - rows[i].yStep = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 1); - rows[i].width = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 2); - rows[i].height = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 3); - } -} - -void TextureScrollingParams::ExtractFromBinary(uint32_t nRawDataIndex, int nCount) -{ - rawDataIndex = nRawDataIndex; - count = nCount; - - ParseRawData(); -} - -std::string TextureScrollingParams::GetSourceTypeName() const -{ - return "AnimatedMatTexScrollParams"; // TODO: Better name -} - -std::string TextureScrollingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexScrollParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureScrollingParams::GetRawDataSize() const -{ - return 4 * count; -} - -/** - * Overrides the parent version to declare an array of the params rather than just one entry. - */ -Declaration* TextureScrollingParams::DeclareVar(const std::string& prefix, - const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - return parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, count, bodyStr); -} - -std::string TextureScrollingParams::GetBodySourceCode() const -{ - std::string bodyStr; - - for (int i = 0; i < count; i++) - { - bodyStr += StringHelper::Sprintf("\t{ %d, %d, 0x%02X, 0x%02X },\n", rows[i].xStep, - rows[i].yStep, rows[i].width, rows[i].height); - } - - bodyStr.pop_back(); - - return bodyStr; -} - -/* TextureColorChangingParams */ - -/** - * Also parses the color and frameData arrays - */ -void TextureColorChangingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - animLength = BitConverter::ToUInt16BE(rawData, rawDataIndex); - colorListCount = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - - // Handle type 2 separately - uint16_t listLength = - ((type == TextureAnimationParamsType::ColorChange) ? animLength : colorListCount); - - if (listLength == 0) - HANDLE_ERROR_RESOURCE(WarningType::Always, parent, this, rawDataIndex, - "color list length cannot be 0", ""); - - primColorListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - envColorListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - frameDataListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0xC); - - uint32_t primColorListOffset = Seg2Filespace(primColorListAddress, parent->baseAddress); - uint32_t envColorListOffset = Seg2Filespace(envColorListAddress, parent->baseAddress); - uint32_t frameDataListOffset = Seg2Filespace(frameDataListAddress, parent->baseAddress); - - uint32_t currentPtr; - - F3DPrimColor currentPrimColor; - - for (currentPtr = primColorListOffset; currentPtr < primColorListOffset + 5 * listLength; - currentPtr += 5) - { - currentPrimColor = {BitConverter::ToUInt8BE(rawData, currentPtr), - BitConverter::ToUInt8BE(rawData, currentPtr + 1), - BitConverter::ToUInt8BE(rawData, currentPtr + 2), - BitConverter::ToUInt8BE(rawData, currentPtr + 3), - BitConverter::ToUInt8BE(rawData, currentPtr + 4)}; - primColorList.push_back(currentPrimColor); - } - - F3DEnvColor currentEnvColor; - - for (currentPtr = envColorListOffset; currentPtr < envColorListOffset + 4 * listLength; - currentPtr += 4) - { - currentEnvColor = {BitConverter::ToUInt8BE(rawData, currentPtr), - BitConverter::ToUInt8BE(rawData, currentPtr + 1), - BitConverter::ToUInt8BE(rawData, currentPtr + 2), - BitConverter::ToUInt8BE(rawData, currentPtr + 3)}; - envColorList.push_back(currentEnvColor); - } - - uint16_t currentFrameData; - - for (currentPtr = frameDataListOffset; currentPtr < frameDataListOffset + 2 * listLength; - currentPtr += 2) - { - currentFrameData = BitConverter::ToUInt16BE(rawData, currentPtr); - frameDataList.push_back(currentFrameData); - } -} - -std::string TextureColorChangingParams::GetSourceTypeName() const -{ - return "AnimatedMatColorParams"; // TODO: Better name -} - -std::string TextureColorChangingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sColorParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureColorChangingParams::GetRawDataSize() const -{ - return 0x10; -} - -void TextureColorChangingParams::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (primColorListAddress != 0) // NULL - { - std::string primColorBodyStr; - - for (const auto& color : primColorList) - { - primColorBodyStr += StringHelper::Sprintf("\t{ %d, %d, %d, %d, %d },\n", color.r, - color.g, color.b, color.a, color.lodFrac); - } - - primColorBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(primColorListAddress, parent->baseAddress), DeclarationAlignment::Align4, - primColorList.size() * 5, "F3DPrimColor", - StringHelper::Sprintf("%sTexColorChangingPrimColors_%06X", parent->GetName().c_str(), - Seg2Filespace(primColorListAddress, parent->baseAddress)), - primColorList.size(), primColorBodyStr); - } - - if (envColorListAddress != 0) // NULL - { - std::string envColorBodyStr; - - for (const auto& color : envColorList) - { - envColorBodyStr += StringHelper::Sprintf("\t{ %d, %d, %d, %d },\n", color.r, color.g, - color.b, color.a); - } - - envColorBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(envColorListAddress, parent->baseAddress), DeclarationAlignment::Align4, - envColorList.size() * 4, "F3DEnvColor", - StringHelper::Sprintf("%sTexColorChangingEnvColors_%06X", parent->GetName().c_str(), - Seg2Filespace(envColorListAddress, parent->baseAddress)), - envColorList.size(), envColorBodyStr); - } - - if (frameDataListAddress != 0) // NULL - { - std::string frameDataBodyStr = "\t"; - - for (const auto& frame : frameDataList) - { - frameDataBodyStr += StringHelper::Sprintf("%d, ", frame); - } - - frameDataBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(frameDataListAddress, parent->baseAddress), DeclarationAlignment::Align4, - frameDataList.size() * 2, "u16", - StringHelper::Sprintf("%sTexColorChangingFrameData_%06X", parent->GetName().c_str(), - Seg2Filespace(frameDataListAddress, parent->baseAddress)), - frameDataList.size(), frameDataBodyStr); - } -} - -std::string TextureColorChangingParams::GetBodySourceCode() const -{ - std::string primColorListName; - std::string envColorListName; - std::string frameDataListName; - - Globals::Instance->GetSegmentedPtrName(primColorListAddress, parent, "", primColorListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(envColorListAddress, parent, "", envColorListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(frameDataListAddress, parent, "", frameDataListName, - parent->workerID); - - std::string bodyStr = StringHelper::Sprintf( - "\n %d, %d, %s, %s, %s,\n", animLength, colorListCount, primColorListName.c_str(), - envColorListName.c_str(), frameDataListName.c_str()); - - return bodyStr; -} - -/* TextureCyclingParams */ - -void TextureCyclingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - cycleLength = BitConverter::ToUInt16BE(rawData, rawDataIndex); - if (cycleLength == 0) - HANDLE_ERROR_RESOURCE(WarningType::Always, parent, this, rawDataIndex, - "cycle length cannot be 0", ""); - - textureListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - textureIndexListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - - uint32_t textureListOffset = Seg2Filespace(textureListAddress, parent->baseAddress); - uint32_t textureIndexListOffset = Seg2Filespace(textureIndexListAddress, parent->baseAddress); - - uint32_t currentPtr; - - uint8_t currentIndex; - uint8_t maxIndex = 0; // To find the length of the texture list - - for (currentPtr = textureIndexListOffset; currentPtr < textureIndexListOffset + cycleLength; - currentPtr++) - { - currentIndex = BitConverter::ToUInt8BE(rawData, currentPtr); - textureIndexList.push_back(currentIndex); - if (currentIndex > maxIndex) - maxIndex = currentIndex; - } - - for (currentPtr = textureListOffset; currentPtr <= textureListOffset + 4 * maxIndex; - currentPtr += 4) - { - textureList.push_back(BitConverter::ToUInt32BE(rawData, currentPtr)); - } -} - -std::string TextureCyclingParams::GetSourceTypeName() const -{ - return "AnimatedMatTexCycleParams"; // TODO: Better name -} - -std::string TextureCyclingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexCycleParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureCyclingParams::GetRawDataSize() const -{ - return 0xC; -} - -void TextureCyclingParams::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (textureListAddress != 0) // NULL - { - std::string texturesBodyStr; - std::string texName; - std::string comment; - - for (const auto& tex : textureList) - { - bool texFound = - Globals::Instance->GetSegmentedPtrName(tex, parent, "", texName, parent->workerID); - - // texName is a raw segmented pointer. This occurs if the texture is not declared - // separately since we cannot read the format. In theory we could scan DLists for the - // format on the appropriate segments. - if (!texFound) - { - comment = " // Raw pointer, declare texture in XML to use proper symbol"; - - auto msgHeader = StringHelper::Sprintf( - "TexCycle texture array declared here points to unknown texture at address %s", - texName.c_str()); - HANDLE_WARNING_RESOURCE( - WarningType::HardcodedPointer, parent, this, rawDataIndex, msgHeader, - "Please declare the texture in the XML to use the proper symbol."); - } - texturesBodyStr += StringHelper::Sprintf("\t%s,%s\n", texName.c_str(), comment.c_str()); - } - - texturesBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(textureListAddress, parent->baseAddress), DeclarationAlignment::Align4, - textureList.size() * 4, "TexturePtr", - StringHelper::Sprintf("%sTexCycleTexPtrs_%06X", parent->GetName().c_str(), - Seg2Filespace(textureListAddress, parent->baseAddress)), - textureList.size(), texturesBodyStr); - } - - if (textureIndexListAddress != 0) // NULL - { - std::string indicesBodyStr = "\t"; - - for (uint8_t index : textureIndexList) - { - indicesBodyStr += StringHelper::Sprintf("%d, ", index); - } - - indicesBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(textureIndexListAddress, parent->baseAddress), - DeclarationAlignment::Align4, textureIndexList.size(), "u8", - StringHelper::Sprintf("%sTexCycleTexIndices_%06X", parent->GetName().c_str(), - Seg2Filespace(textureIndexListAddress, parent->baseAddress)), - textureIndexList.size(), indicesBodyStr); - } -} - -std::string TextureCyclingParams::GetBodySourceCode() const -{ - std::string textureListName; - std::string textureIndexListName; - - Globals::Instance->GetSegmentedPtrName(textureListAddress, parent, "", textureListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(textureIndexListAddress, parent, "", - textureIndexListName, parent->workerID); - - std::string bodyStr = StringHelper::Sprintf( - "\n %d, %s, %s,\n", cycleLength, textureListName.c_str(), textureIndexListName.c_str()); - - return bodyStr; -} - -/* ZTextureAnimation */ - -ZTextureAnimation::ZTextureAnimation(ZFile* nParent) : ZResource(nParent) -{ -} - -/** - * Builds the array of params - */ -void ZTextureAnimation::ParseRawData() -{ - ZResource::ParseRawData(); - - TextureAnimationEntry currentEntry; - auto rawData = parent->GetRawData(); - int16_t type; - - for (uint32_t currentPtr = rawDataIndex;; currentPtr += 8) - { - type = BitConverter::ToInt16BE(rawData, currentPtr + 2); - - currentEntry.segment = BitConverter::ToInt8BE(rawData, currentPtr); - currentEntry.type = (TextureAnimationParamsType)type; - currentEntry.paramsPtr = BitConverter::ToUInt32BE(rawData, currentPtr + 4); - entries.push_back(currentEntry); - - if ((type < 0) || (type > 6)) - { - HANDLE_ERROR_RESOURCE( - WarningType::Always, parent, this, rawDataIndex, - StringHelper::Sprintf( - "unknown TextureAnimationParams type 0x%02X in TextureAnimation", type), - StringHelper::Sprintf( - "Entry reads { 0x%02X, 0x%02X, 0x%08X } , but type should be " - "between 0x00 and 0x06 inclusive.", - currentEntry.segment, type, currentEntry.paramsPtr)); - } - - if (currentEntry.segment <= 0) - break; - } -} - -#include -/** - * For each params entry, - */ -void ZTextureAnimation::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - - for (const auto& entry : entries) - { - if (entry.paramsPtr != 0 && GETSEGNUM(entry.paramsPtr) == parent->segment) - { - uint32_t paramsOffset = Seg2Filespace(entry.paramsPtr, parent->baseAddress); - if (!parent->HasDeclaration(paramsOffset)) - { - ZTextureAnimationParams* params; - int count; - switch (entry.type) - { - case TextureAnimationParamsType::SingleScroll: - if (true) - { - count = 1; - // The else now allows SingleScroll to fall through to params = ... without - // touching the code in the else block - } - else - { - // The contents of this block can only be run by jumping into it with the - // case label - [[fallthrough]]; - case TextureAnimationParamsType::DualScroll: - count = 2; - } - params = new TextureScrollingParams(parent); - params->ExtractFromBinary(paramsOffset, count); - break; - - case TextureAnimationParamsType::ColorChange: - case TextureAnimationParamsType::ColorChangeLERP: - case TextureAnimationParamsType::ColorChangeLagrange: - params = new TextureColorChangingParams(parent); - params->type = entry.type; - params->ExtractFromBinary(paramsOffset); - break; - - case TextureAnimationParamsType::TextureCycle: - params = new TextureCyclingParams(parent); - params->ExtractFromBinary(paramsOffset); - break; - - case TextureAnimationParamsType::Empty: - HANDLE_WARNING_RESOURCE( - WarningType::InvalidExtractedData, parent, this, rawDataIndex, - "TextureAnimationParams entry has empty type (6), but params pointer is " - "not NULL", - StringHelper::Sprintf("Params read { 0x%02X, 0x%02X, 0x%08X } .", - entry.segment, (int)entry.type, entry.paramsPtr)); - return; - default: - // Because GCC is worried this could happen - assert(entry.type < TextureAnimationParamsType::SingleScroll || - entry.type > TextureAnimationParamsType::Empty); - return; - } - - params->SetName(params->GetDefaultName(varPrefix)); - params->DeclareVar(varPrefix, ""); - parent->AddResource(params); - } - } - } -} - -std::string ZTextureAnimation::GetSourceTypeName() const -{ - return "AnimatedMaterial"; // TODO: Better name -} - -ZResourceType ZTextureAnimation::GetResourceType() const -{ - return ZResourceType::TextureAnimation; -} - -/** - * The size of the main array - */ -size_t ZTextureAnimation::GetRawDataSize() const -{ - return entries.size() * 8; -} - -std::string ZTextureAnimation::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexAnim_%06X", prefix.c_str(), rawDataIndex); -} - -Declaration* ZTextureAnimation::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, entries.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZTextureAnimation::GetBodySourceCode() const -{ - std::string bodyStr; - - for (const auto& entry : entries) - { - std::string paramName; - Globals::Instance->GetSegmentedPtrName(entry.paramsPtr, parent, "", paramName, - parent->workerID); - - bodyStr += StringHelper::Sprintf("\t{ %d, %d, %s },\n", entry.segment, entry.type, - paramName.c_str()); - } - - bodyStr.pop_back(); - - return bodyStr; -} diff --git a/ZAPDTR/ZAPD/ZTextureAnimation.h b/ZAPDTR/ZAPD/ZTextureAnimation.h deleted file mode 100644 index 6b03eb7cf..000000000 --- a/ZAPDTR/ZAPD/ZTextureAnimation.h +++ /dev/null @@ -1,151 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "ZResource.h" - -enum class TextureAnimationParamsType -{ - /* 0 */ SingleScroll, - /* 1 */ DualScroll, - /* 2 */ ColorChange, - /* 3 */ ColorChangeLERP, - /* 4 */ ColorChangeLagrange, - /* 5 */ TextureCycle, - /* 6 */ Empty // An empty TextureAnimation has the form 00 00 00 06 00000000 -}; - -class ZTextureAnimationParams : public ZResource -{ -public: - ZTextureAnimationParams(ZFile* parent); - - void ExtractFromBinary(uint32_t nRawDataIndex); - virtual void ExtractFromBinary(uint32_t nRawDataIndex, int count); - - virtual std::string GetDefaultName(const std::string& prefix) const; - ZResourceType GetResourceType() const; - - TextureAnimationParamsType type; -}; - -struct TextureScrollingParamsEntry -{ - int8_t xStep; - int8_t yStep; - uint8_t width; - uint8_t height; -}; - -class TextureScrollingParams : public ZTextureAnimationParams -{ -public: - TextureScrollingParams(ZFile* parent); - - void ParseRawData() override; - void ExtractFromBinary(uint32_t nRawDataIndex, int count) override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - int count; // 1 for Single, 2 for Dual - TextureScrollingParamsEntry rows[2]; // Too small to make a vector worth it -}; - -struct F3DPrimColor -{ - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; - uint8_t lodFrac; -}; - -struct F3DEnvColor -{ - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; -}; - -class TextureColorChangingParams : public ZTextureAnimationParams -{ -public: - TextureColorChangingParams(ZFile* parent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - uint16_t animLength; // size of list for type 2 - uint16_t colorListCount; - segptr_t primColorListAddress; - segptr_t envColorListAddress; - segptr_t frameDataListAddress; - std::vector primColorList; - std::vector envColorList; - std::vector frameDataList; -}; - -class TextureCyclingParams : public ZTextureAnimationParams -{ -public: - TextureCyclingParams(ZFile* parent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - uint16_t cycleLength; - segptr_t textureListAddress; - segptr_t textureIndexListAddress; - std::vector textureList; - std::vector textureIndexList; -}; - -struct TextureAnimationEntry -{ - int8_t segment; - TextureAnimationParamsType type; - segptr_t paramsPtr; -}; - -class ZTextureAnimation : public ZResource -{ -public: - ZTextureAnimation(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - size_t GetRawDataSize() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - -private: - std::vector entries; -}; diff --git a/ZAPDTR/ZAPD/ZVector.cpp b/ZAPDTR/ZAPD/ZVector.cpp deleted file mode 100644 index 092b876d2..000000000 --- a/ZAPDTR/ZAPD/ZVector.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "ZVector.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Vector, ZVector); - -ZVector::ZVector(ZFile* nParent) : ZResource(nParent) -{ - scalarType = ZScalarType::ZSCALAR_NONE; - dimensions = 0; - - RegisterRequiredAttribute("Type"); - RegisterRequiredAttribute("Dimensions"); -} - -void ZVector::ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType, - uint32_t nDimensions) -{ - rawDataIndex = nRawDataIndex; - scalarType = nScalarType; - dimensions = nDimensions; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZVector::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - this->scalarType = ZScalar::MapOutputTypeToScalarType(registeredAttributes.at("Type").value); - - this->dimensions = StringHelper::StrToL(registeredAttributes.at("Dimensions").value, 16); -} - -void ZVector::ParseRawData() -{ - int32_t currentRawDataIndex = rawDataIndex; - // TODO: this shouldn't be necessary. - scalars.clear(); - scalars.reserve(dimensions); - for (uint32_t i = 0; i < dimensions; i++) - { - ZScalar scalar(parent); - scalar.ExtractFromBinary(currentRawDataIndex, scalarType); - currentRawDataIndex += scalar.GetRawDataSize(); - - scalars.push_back(scalar); - } - - // Ensure the scalars vector has the same number of elements as the vector dimension. - assert(scalars.size() == dimensions); -} - -size_t ZVector::GetRawDataSize() const -{ - size_t size = 0; - - for (size_t i = 0; i < this->scalars.size(); i++) - size += this->scalars[i].GetRawDataSize(); - - return size; -} - -bool ZVector::DoesSupportArray() const -{ - return true; -} - -std::string ZVector::GetSourceTypeName() const -{ - if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_F32) - return "Vec3f"; - else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S16) - return "Vec3s"; - else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S32) - return "Vec3i"; - else - { - std::string msgHeader = StringHelper::Sprintf( - "encountered unsupported vector type: %d dimensions, %s type", dimensions, - ZScalar::MapScalarTypeToOutputType(scalarType).c_str()); - - HANDLE_ERROR_RESOURCE(WarningType::NotImplemented, parent, this, rawDataIndex, msgHeader, - ""); - } -} - -std::string ZVector::GetBodySourceCode() const -{ - std::string body = ""; - - for (size_t i = 0; i < scalars.size(); i++) - { - body += StringHelper::Sprintf("%6s", scalars[i].GetBodySourceCode().c_str()); - - if (i + 1 < scalars.size()) - body += ", "; - } - - return body; -} - -ZResourceType ZVector::GetResourceType() const -{ - return ZResourceType::Vector; -} - -DeclarationAlignment ZVector::GetDeclarationAlignment() const -{ - if (scalars.size() == 0) - { - return DeclarationAlignment::Align4; - } - return scalars.at(0).GetDeclarationAlignment(); -} diff --git a/ZAPDTR/ZAPD/ZVector.h b/ZAPDTR/ZAPD/ZVector.h deleted file mode 100644 index a50d3e808..000000000 --- a/ZAPDTR/ZAPD/ZVector.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "ZScalar.h" -#include "tinyxml2.h" - -class ZVector : public ZResource -{ -public: - std::vector scalars; - ZScalarType scalarType; - uint32_t dimensions; - - ZVector(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType, uint32_t nDimensions); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; diff --git a/ZAPDTR/ZAPD/ZVtx.cpp b/ZAPDTR/ZAPD/ZVtx.cpp deleted file mode 100644 index e4b3d9796..000000000 --- a/ZAPDTR/ZAPD/ZVtx.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "ZVtx.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Vtx, ZVtx); - -ZVtx::ZVtx(ZFile* nParent) : ZResource(nParent) -{ - x = 0; - y = 0; - z = 0; - flag = 0; - s = 0; - t = 0; - r = 0; - g = 0; - b = 0; - a = 0; -} - -void ZVtx::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - flag = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - s = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - t = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - r = rawData[rawDataIndex + 12]; - g = rawData[rawDataIndex + 13]; - b = rawData[rawDataIndex + 14]; - a = rawData[rawDataIndex + 15]; -} - -Declaration* ZVtx::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - Declaration* decl = ZResource::DeclareVar(prefix, bodyStr); - decl->isExternal = true; - return decl; -} - -std::string ZVtx::GetBodySourceCode() const -{ - return StringHelper::Sprintf("VTX(%i, %i, %i, %i, %i, %i, %i, %i, %i)", x, y, z, s, t, r, g, b, - a); -} - -size_t ZVtx::GetRawDataSize() const -{ - return 16; -} - -bool ZVtx::DoesSupportArray() const -{ - return true; -} - -ZResourceType ZVtx::GetResourceType() const -{ - return ZResourceType::Vertex; -} - -bool ZVtx::IsExternalResource() const -{ - return true; -} - -std::string ZVtx::GetSourceTypeName() const -{ - return "Vtx"; -} - -std::string ZVtx::GetExternalExtension() const -{ - return "vtx"; -} - -DeclarationAlignment ZVtx::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZVtx.h b/ZAPDTR/ZAPD/ZVtx.h deleted file mode 100644 index 511048791..000000000 --- a/ZAPDTR/ZAPD/ZVtx.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "ZScalar.h" -#include "tinyxml2.h" - -class ZVtx : public ZResource -{ -public: - int16_t x, y, z; - uint16_t flag; - int16_t s, t; - uint8_t r, g, b, a; - - ZVtx(ZFile* nParent); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - bool IsExternalResource() const override; - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; diff --git a/ZAPDTR/ZAPD/any/any/zlib.static.txt b/ZAPDTR/ZAPD/any/any/zlib.static.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/ctpl_stl.h b/ZAPDTR/ZAPD/ctpl_stl.h deleted file mode 100644 index 8e2d9c908..000000000 --- a/ZAPDTR/ZAPD/ctpl_stl.h +++ /dev/null @@ -1,251 +0,0 @@ -/********************************************************* -* -* Copyright (C) 2014 by Vitaliy Vitsentiy -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*********************************************************/ - - -#ifndef __ctpl_stl_thread_pool_H__ -#define __ctpl_stl_thread_pool_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -// thread pool to run user's functors with signature -// ret func(int id, other_params) -// where id is the index of the thread that runs the functor -// ret is some return type - - -namespace ctpl { - - namespace detail { - template - class Queue { - public: - bool push(T const & value) { - std::unique_lock lock(this->mutex); - this->q.push(value); - return true; - } - // deletes the retrieved element, do not use for non integral types - bool pop(T & v) { - std::unique_lock lock(this->mutex); - if (this->q.empty()) - return false; - v = this->q.front(); - this->q.pop(); - return true; - } - bool empty() { - std::unique_lock lock(this->mutex); - return this->q.empty(); - } - private: - std::queue q; - std::mutex mutex; - }; - } - - class thread_pool { - - public: - - thread_pool() { this->init(); } - thread_pool(int nThreads) { this->init(); this->resize(nThreads); } - - // the destructor waits for all the functions in the queue to be finished - ~thread_pool() { - this->stop(true); - } - - // get the number of running threads in the pool - int size() { return static_cast(this->threads.size()); } - - // number of idle threads - int n_idle() { return this->nWaiting; } - std::thread & get_thread(int i) { return *this->threads[i]; } - - // change the number of threads in the pool - // should be called from one thread, otherwise be careful to not interleave, also with this->stop() - // nThreads must be >= 0 - void resize(int nThreads) { - if (!this->isStop && !this->isDone) { - int oldNThreads = static_cast(this->threads.size()); - if (oldNThreads <= nThreads) { // if the number of threads is increased - this->threads.resize(nThreads); - this->flags.resize(nThreads); - - for (int i = oldNThreads; i < nThreads; ++i) { - this->flags[i] = std::make_shared>(false); - this->set_thread(i); - } - } - else { // the number of threads is decreased - for (int i = oldNThreads - 1; i >= nThreads; --i) { - *this->flags[i] = true; // this thread will finish - this->threads[i]->detach(); - } - { - // stop the detached threads that were waiting - std::unique_lock lock(this->mutex); - this->cv.notify_all(); - } - this->threads.resize(nThreads); // safe to delete because the threads are detached - this->flags.resize(nThreads); // safe to delete because the threads have copies of shared_ptr of the flags, not originals - } - } - } - - // empty the queue - void clear_queue() { - std::function * _f; - while (this->q.pop(_f)) - delete _f; // empty the queue - } - - // pops a functional wrapper to the original function - std::function pop() { - std::function * _f = nullptr; - this->q.pop(_f); - std::unique_ptr> func(_f); // at return, delete the function even if an exception occurred - std::function f; - if (_f) - f = *_f; - return f; - } - - // wait for all computing threads to finish and stop all threads - // may be called asynchronously to not pause the calling thread while waiting - // if isWait == true, all the functions in the queue are run, otherwise the queue is cleared without running the functions - void stop(bool isWait = false) { - if (!isWait) { - if (this->isStop) - return; - this->isStop = true; - for (int i = 0, n = this->size(); i < n; ++i) { - *this->flags[i] = true; // command the threads to stop - } - this->clear_queue(); // empty the queue - } - else { - if (this->isDone || this->isStop) - return; - this->isDone = true; // give the waiting threads a command to finish - } - { - std::unique_lock lock(this->mutex); - this->cv.notify_all(); // stop all waiting threads - } - for (int i = 0; i < static_cast(this->threads.size()); ++i) { // wait for the computing threads to finish - if (this->threads[i]->joinable()) - this->threads[i]->join(); - } - // if there were no threads in the pool but some functors in the queue, the functors are not deleted by the threads - // therefore delete them here - this->clear_queue(); - this->threads.clear(); - this->flags.clear(); - } - - template - auto push(F && f, Rest&&... rest) ->std::future { - auto pck = std::make_shared>( - std::bind(std::forward(f), std::placeholders::_1, std::forward(rest)...) - ); - auto _f = new std::function([pck](int id) { - (*pck)(id); - }); - this->q.push(_f); - std::unique_lock lock(this->mutex); - this->cv.notify_one(); - return pck->get_future(); - } - - // run the user's function that excepts argument int - id of the running thread. returned value is templatized - // operator returns std::future, where the user can get the result and rethrow the catched exceptins - template - auto push(F && f) ->std::future { - auto pck = std::make_shared>(std::forward(f)); - auto _f = new std::function([pck](int id) { - (*pck)(id); - }); - this->q.push(_f); - std::unique_lock lock(this->mutex); - this->cv.notify_one(); - return pck->get_future(); - } - - - private: - - // deleted - thread_pool(const thread_pool &);// = delete; - thread_pool(thread_pool &&);// = delete; - thread_pool & operator=(const thread_pool &);// = delete; - thread_pool & operator=(thread_pool &&);// = delete; - - void set_thread(int i) { - std::shared_ptr> flag(this->flags[i]); // a copy of the shared ptr to the flag - auto f = [this, i, flag/* a copy of the shared ptr to the flag */]() { - std::atomic & _flag = *flag; - std::function * _f; - bool isPop = this->q.pop(_f); - while (true) { - while (isPop) { // if there is anything in the queue - std::unique_ptr> func(_f); // at return, delete the function even if an exception occurred - (*_f)(i); - if (_flag) - return; // the thread is wanted to stop, return even if the queue is not empty yet - else - isPop = this->q.pop(_f); - } - // the queue is empty here, wait for the next command - std::unique_lock lock(this->mutex); - ++this->nWaiting; - this->cv.wait(lock, [this, &_f, &isPop, &_flag](){ isPop = this->q.pop(_f); return isPop || this->isDone || _flag; }); - --this->nWaiting; - if (!isPop) - return; // if the queue is empty and this->isDone == true or *flag then return - } - }; - this->threads[i].reset(new std::thread(f)); // compiler may not support std::make_unique() - } - - void init() { this->nWaiting = 0; this->isStop = false; this->isDone = false; } - - std::vector> threads; - std::vector>> flags; - detail::Queue *> q; - std::atomic isDone; - std::atomic isStop; - std::atomic nWaiting; // how many threads are waiting - - std::mutex mutex; - std::condition_variable cv; - }; - -} - -#endif // __ctpl_stl_thread_pool_H__ \ No newline at end of file diff --git a/ZAPDTR/ZAPD/genbuildinfo.py b/ZAPDTR/ZAPD/genbuildinfo.py deleted file mode 100644 index 91a567d31..000000000 --- a/ZAPDTR/ZAPD/genbuildinfo.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/python3 - -import argparse -from datetime import datetime -import getpass -import subprocess - -parser = argparse.ArgumentParser() -parser.add_argument("--devel", action="store_true") -args = parser.parse_args() - -with open("build/ZAPD/BuildInfo.cpp", "w+") as buildFile: - label = subprocess.check_output(["git", "describe", "--always"]).strip().decode("utf-8") - now = datetime.now() - if args.devel: - label += " ~ Development version" - buildFile.write("extern const char gBuildHash[] = \"" + label + "\";\n") - #buildFile.write("extern const char gBuildDate[] = \"" + now.strftime("%Y-%m-%d %H:%M:%S") + "\";\n") diff --git a/ZAPDTR/ZAPD/packages.config b/ZAPDTR/ZAPD/packages.config deleted file mode 100644 index c387aaed7..000000000 --- a/ZAPDTR/ZAPD/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/pathconf.c b/ZAPDTR/ZAPD/pathconf.c deleted file mode 100644 index 8ef448999..000000000 --- a/ZAPDTR/ZAPD/pathconf.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -long pathconf(const char *path, int name) { - return -1; -} - diff --git a/ZAPDTR/ZAPD/yaz0/readwrite.h b/ZAPDTR/ZAPD/yaz0/readwrite.h deleted file mode 100644 index af3471590..000000000 --- a/ZAPDTR/ZAPD/yaz0/readwrite.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __READWRITE_H__ -#define __READWRITE_H__ - -#include - -/* variables */ -union { - uint32_t u; - float f; -} __u32_f32_union__; - -#define U32(x) \ - ((uint32_t)((((uint8_t*)(x))[0] << 24) | (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | ((uint8_t*)(x))[3])) -#define U16(x) ((uint16_t)(((*((uint8_t*)(x))) << 8) | ((uint8_t*)(x))[1])) -#define U8(x) ((uint8_t)((uint8_t*)(x))[0]) -#define S32(x) ((int32_t)(U32(x))) -#define S16(x) ((int16_t)(U16(x))) -#define F32(x) (((__u32_f32_union__.u = U32(x)) & 0) + __u32_f32_union__.f) - -#define W32(x, v) \ - { \ - *((uint8_t*)x + 3) = ((v)&0xFF); \ - *((uint8_t*)x + 2) = (((v) >> 8) & 0xFF); \ - *((uint8_t*)x + 1) = (((v) >> 16) & 0xFF); \ - *((uint8_t*)x + 0) = (((v) >> 24) & 0xFF); \ - } - -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/yaz0/yaz0.cpp b/ZAPDTR/ZAPD/yaz0/yaz0.cpp deleted file mode 100644 index 885f41d1d..000000000 --- a/ZAPDTR/ZAPD/yaz0/yaz0.cpp +++ /dev/null @@ -1,227 +0,0 @@ -#include -#include -#include -#include -#include -#include "readwrite.h" - -#include "yaz0.h" - -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; - -/* internal declarations */ -int yaz0_encode_internal(const u8* src, int srcSize, u8* Data); - -int yaz0_get_size(u8* src) { return U32(src + 0x4); } - -u32 toDWORD(u32 d) { - u8 w1 = d & 0xFF; - u8 w2 = (d >> 8) & 0xFF; - u8 w3 = (d >> 16) & 0xFF; - u8 w4 = d >> 24; - return (w1 << 24) | (w2 << 16) | (w3 << 8) | w4; -} - -// simple and straight encoding scheme for Yaz0 -u32 longest_match_brute(const u8* src, int size, int pos, u32* pMatchPos) { - int startPos = pos - 0x1000; - int max_match_size = size - pos; - u32 best_match_size = 0; - u32 best_match_pos = 0; - - if (max_match_size < 3) return 0; - - if (startPos < 0) startPos = 0; - - if (max_match_size > 0x111) max_match_size = 0x111; - - for (int i = startPos; i < pos; i++) { - int current_size; - for (current_size = 0; current_size < max_match_size; current_size++) { - if (src[i + current_size] != src[pos + current_size]) { - break; - } - } - if (current_size > best_match_size) { - best_match_size = current_size; - best_match_pos = i; - if (best_match_size == 0x111) break; - } - } - *pMatchPos = best_match_pos; - return best_match_size; -} - -u32 longest_match_rabinkarp(const u8* src, int size, int pos, u32* match_pos) { - int startPos = pos - 0x1000; - int max_match_size = size - pos; - u32 best_match_size = 0; - u32 best_match_pos = 0; - - if (max_match_size < 3) return 0; - - if (startPos < 0) startPos = 0; - - if (max_match_size > 0x111) max_match_size = 0x111; - - int find_hash = src[pos] << 16 | src[pos + 1] << 8 | src[pos + 2]; - int current_hash = src[startPos] << 16 | src[startPos + 1] << 8 | src[startPos + 2]; - - for (int i = startPos; i < pos; i++) { - if(current_hash == find_hash) { - int current_size; - for (current_size = 3; current_size < max_match_size; current_size++) { - if (src[i + current_size] != src[pos + current_size]) { - break; - } - } - if (current_size > best_match_size) { - best_match_size = current_size; - best_match_pos = i; - if (best_match_size == 0x111) break; - } - } - current_hash = (current_hash << 8 | src[i + 3]) & 0xFFFFFF; - } - *match_pos = best_match_pos; - - return best_match_size; -} - -int yaz0_encode_internal(const u8* src, int srcSize, u8* Data) { - int srcPos = 0; - - int bitmask = 0x80; - u8 currCodeByte = 0; - int currCodeBytePos = 0; - int pos = currCodeBytePos + 1; - - while (srcPos < srcSize) { - u32 numBytes; - u32 matchPos; - - numBytes = longest_match_rabinkarp(src, srcSize, srcPos, &matchPos); - //fprintf(stderr, "pos %x len %x pos %x\n", srcPos, (int)numBytes, (int)matchPos); - if (numBytes < 3) { - //fprintf(stderr, "single byte %02x\n", src[srcPos]); - Data[pos++] = src[srcPos++]; - currCodeByte |= bitmask; - } else { - // RLE part - u32 dist = srcPos - matchPos - 1; - - if (numBytes >= 0x12) // 3 byte encoding - { - Data[pos++] = dist >> 8; // 0R - Data[pos++] = dist & 0xFF; // FF - if (numBytes > 0xFF + 0x12) numBytes = 0xFF + 0x12; - Data[pos++] = numBytes - 0x12; - } else // 2 byte encoding - { - Data[pos++] = ((numBytes - 2) << 4) | (dist >> 8); - Data[pos++] = dist & 0xFF; - } - srcPos += numBytes; - } - bitmask >>= 1; - // write eight codes - if (!bitmask) { - Data[currCodeBytePos] = currCodeByte; - currCodeBytePos = pos++; - - currCodeByte = 0; - bitmask = 0x80; - } - } - if (bitmask) { - Data[currCodeBytePos] = currCodeByte; - } - - return pos; -} - -std::vector yaz0_encode_fast(const u8* src, int src_size) { - std::vector buffer; - std::vector> lut; - lut.resize(0x1000000); - - for (int i = 0; i < src_size - 3; ++i) { - lut[src[i + 0] << 16 | src[i + 1] << 8 | src[i + 2]].push_back(i); - } - - return buffer; -} - -std::vector yaz0_encode(const u8* src, int src_size) { - std::vector buffer(src_size * 10 / 8 + 16); - u8* dst = buffer.data(); - - // write 4 bytes yaz0 header - memcpy(dst, "Yaz0", 4); - - // write 4 bytes uncompressed size - W32(dst + 4, src_size); - - // encode - int dst_size = yaz0_encode_internal(src, src_size, dst + 16); - int aligned_size = (dst_size + 31) & -16; - buffer.resize(aligned_size); - -#if 0 - std::vector decompressed(src_size); - yaz0_decode(buffer.data(), decompressed.data(), src_size); - if(memcmp(src, decompressed.data(), src_size)) { - fprintf(stderr, "Decompressed buffer is different from original\n"); - } -#endif - - return buffer; -} - -void yaz0_decode(const uint8_t* source, uint8_t* decomp, int32_t decompSize) { - uint32_t srcPlace = 0, dstPlace = 0; - uint32_t i, dist, copyPlace, numBytes; - uint8_t codeByte, byte1, byte2; - uint8_t bitCount = 0; - - source += 0x10; - while (dstPlace < decompSize) { - /* If there are no more bits to test, get a new byte */ - if (!bitCount) { - codeByte = source[srcPlace++]; - bitCount = 8; - } - - /* If bit 7 is a 1, just copy 1 byte from source to destination */ - /* Else do some decoding */ - if (codeByte & 0x80) { - decomp[dstPlace++] = source[srcPlace++]; - } else { - /* Get 2 bytes from source */ - byte1 = source[srcPlace++]; - byte2 = source[srcPlace++]; - - /* Calculate distance to move in destination */ - /* And the number of bytes to copy */ - dist = ((byte1 & 0xF) << 8) | byte2; - copyPlace = dstPlace - (dist + 1); - numBytes = byte1 >> 4; - - /* Do more calculations on the number of bytes to copy */ - if (!numBytes) - numBytes = source[srcPlace++] + 0x12; - else - numBytes += 2; - - /* Copy data from a previous point in destination */ - /* to current point in destination */ - for (i = 0; i < numBytes; i++) decomp[dstPlace++] = decomp[copyPlace++]; - } - - /* Set up for the next read cycle */ - codeByte = codeByte << 1; - bitCount--; - } -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/yaz0/yaz0.h b/ZAPDTR/ZAPD/yaz0/yaz0.h deleted file mode 100644 index 0d5cc3cfd..000000000 --- a/ZAPDTR/ZAPD/yaz0/yaz0.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include - -void yaz0_decode(const uint8_t* src, uint8_t* dest, int32_t destsize); -std::vector yaz0_encode(const uint8_t* src, int src_size); \ No newline at end of file diff --git a/ZAPDTR/copycheck.py b/ZAPDTR/copycheck.py deleted file mode 100755 index 36288f685..000000000 --- a/ZAPDTR/copycheck.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python3 - -import os -from shutil import copyfile - -if (os.environ.get('ZAPD_COPYDIR') != None): - print("Copying ZAPD.out to repo...") - #print(os.environ.get('ZAPD_COPYDIR')) - copyfile("ZAPD.out", os.environ.get('ZAPD_COPYDIR') + "/ZAPD.out") diff --git a/ZAPDTR/docs/zapd_extraction_xml_reference.md b/ZAPDTR/docs/zapd_extraction_xml_reference.md deleted file mode 100644 index 78817dc6e..000000000 --- a/ZAPDTR/docs/zapd_extraction_xml_reference.md +++ /dev/null @@ -1,680 +0,0 @@ -# ZAPD extraction XML reference - -This document aims to be a small reference of how to create a compatible xml file for ZAPD. - -## Table of contents - -- [ZAPD extraction XML reference](#zapd-extraction-xml-reference) - - [Table of contents](#table-of-contents) - - [Basic XML](#basic-xml) - - [Resources types](#resources-types) - - [File](#file) - - [ExternalFile](#externalfile) - - [Texture](#texture) - - [Background](#background) - - [Blob](#blob) - - [DList](#dlist) - - [TextureAnimation](#textureanimation) - - [Scene and Room](#scene-and-room) - - [AltHeader](#altheader) - - [Animation](#animation) - - [PlayerAnimation](#playeranimation) - - [CurveAnimation](#curveanimation) - - [LegacyAnimation](#legacyanimation) - - [Skeleton](#skeleton) - - [LimbTable](#limbtable) - - [Limb](#limb) - - [Symbol](#symbol) - - [Collision](#collision) - - [Scalar](#scalar) - - [Vector](#vector) - - [Vtx](#vtx) - - [Mtx](#mtx) - - [Cutscene](#cutscene) - - [Array](#array) - - [Path](#path) - - [PlayerAnimationData](#playeranimationdata) - - [Pointer](#pointer) - -## Basic XML - -An example of an object xml: - -```xml - - - - - - - - - - - - - - - - - - - -``` - -Every xml must have a `` tag. It must have at least one `` child. - -## Resources types - -The following is a list of the resources/tags supported by ZAPD, and the attributes needed by each one. - -For most resources inside a `` tag **you should also set an `Offset` attribute**. This is the offset (within the file) of the resource you are exporting. The `Offset` attribute is expected to be in hexadecimal, for example `Offset="0x41F0"`. - -It's worth noting that every tag expects a `Name="gNameOfTheAsset"`. This is will be the name of the extracted variable in the output C code. Every asset must be prefixed with `g` and the suffix should represent the type of the variable. - -Every tag can accept a `Static` attribute to specify if the asset should be marked as `static` or not. -There are 3 valid values (defaults to `Global`): - -- `Global`: Mark static if the flag `--static` was used. -- `On`: Override the global config and **always mark** as `static`. -- `Off`: Override the global config and **don't mark** as `static`. - -This table summarizes if the asset will be marked `static` (✅) or not (❌) -| `Static=""` attribute in XML | Without `--static` flag | With `--static` flag | -| ---------------------------- | ----------------------- | -------------------- | -| `On` | ✅ | ✅ | -| `Global` (default) | ❌ | ✅ | -| `Off` | ❌ | ❌ | - -------------------------- - -### File - -- Example of this tag: - -```xml - -``` - -- Attributes: - - - `Name`: Required. The name of the file in `baserom/` which will be extracted. - - `OutName`: Optional. The output name of the generated C source file. Defaults to the value passed to `Name`. - - `Segment`: Optional. This is the segment number of the current file. Expects a decimal number between 0 and 15 inclusive, usually 6 if it is an object. If not specified, the file will use VRAM instead of segmented addresses. - - `BaseAddress`: Optional. RAM address of the file. Expects a hex number (with `0x` prefix). Default value: `0`. - - `RangeStart`: Optional. File offset where the extraction will begin. Hex. Default value: `0x000000000`. - - `RangeEnd`: Optional. File offset where the extraction will end. Hex. Default value: `0xFFFFFFFF`. - - `Game`: Optional. Valid values: `OOT`, `MM`, `SW97` and `OOTSW97`. Default value: `OOT`. - -------------------------- - -### ExternalFile - -Allows ZAPD to map segmented addresses to variables declared in other files by using its XML. - -It is useful for objects that use variables from `gameplay_keep`, `gameplay_dangeon_keep`, `gameplay_field_keep`, etc. - -This tag can be used in the global `config.xml` file. - -- Example of this tag: - -```xml - -``` - -- Attributes: - - - `XmlPath`: Required. The path of the XML, relative to the value set by `ExternalXMLFolder` in the configuration file. - - `OutPath`: Required. The path were the header for the corresponding external file is. It is used to `#include` it in the generated `.c` file. - -------------------------- - -### Texture - -Textures are extracted as `.png` files. - -- Example: - -```xml - -``` - -Will be defined as: - -```c -u64 gCraterSmokeConeTex[] = { -#include "assets/objects/object_spot17_obj/crater_smoke_cone.ia8.inc.c" -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Tex`, unless it is a palette, in that case it is suffixed by `TLUT`. - - `OutName`: Required. The filename of the extracted `.png` file. - - `Format`: Required. The format of the image. Valid values: `rgba32`, `rgba16`, `i4`, `i8`, `ia4`, `ia8`, `ia16`, `ci4` and `ci8`. - - `Width`: Required. Width in pixels of the image. - - `Height`: Required. Height in pixels of the image. - - `TlutOffset`: Optional. Specifies the tlut's offset used by this texture. This attribute is only valid if `Format` is either `ci4` or `ci8`, otherwise an exception would be thrown. - - `ExternalTlut`: Optional. Specifies that the texture's tlut is in a different file. Takes the filename of the file that contains the tlut. - - `ExternalTlutOffset`: Optional. Specifies the offset in the `ExternalTlut` of the tlut for the given texture. - - `SplitTlut`: Optional. Specifies that the given texture should take from the upper half of the tlut. Takes a bool, i.e. one of `true`, `false`, `1`, `0`. - -The following is a list of the texture formats the Nintendo 64 supports, with their gfxdis names and ZAPD format names. - -| Format name | Typing in `gsDPLoadTextureBlock` | "Format" in xml | -| ----------------------------------------------- | -------------------------------- | --------------- | -| 4-bit intensity (I) | `G_IM_FMT_I, G_IM_SIZ_4b` | `i4` | -| 4-bit intensity with alpha (I/A) (3/1) | `G_IM_FMT_IA, G_IM_SIZ_4b` | `ia4` | -| 4-bit color index (CI) | `G_IM_FMT_CI, G_IM_SIZ_4b` | `ci4` | -| 8-bit I | `G_IM_FMT_I, G_IM_SIZ_8b` | `i8` | -| 8-bit IA (4/4) | `G_IM_FMT_IA, G_IM_SIZ_8b` | `ia8` | -| 8-bit CI | `G_IM_FMT_CI, G_IM_SIZ_8b` | `ci8` | -| 16-bit red, green, blue, alpha (RGBA) (5/5/5/1) | `G_IM_FMT_RGBA, G_IM_SIZ_16b` | `rgba16` | -| 16-bit IA (8/8) | `G_IM_FMT_IA, G_IM_SIZ_16b` | `ia16` | -| 16-bit YUV (Luminance, Blue-Y, Red-Y) | `G_IM_FMT_YUV, G_IM_SIZ_16b` | (not used) | -| 32-bit RGBA (8/8/8/8) | `G_IM_FMT_RGBA, G_IM_SIZ_32b` | `rgba32` | - -If you want to know more about this formats, you can check [`gsDPLoadTextureBlock`](http://n64devkit.square7.ch/n64man/gdp/gDPLoadTextureBlock.htm) for most formats, or [`gDPLoadTextureBlock_4b`](http://n64devkit.square7.ch/n64man/gdp/gDPLoadTextureBlock_4b.htm) for the 4-bit formats. - -------------------------- - -### Background - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Background`. - - `OutName`: Required. The filename of the extracted `.jpg` file. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. You can use this to name them if you don't like the autogenerated name. - -------------------------- - -### Blob - -Blob are binary data that will be extracted as `.bin` files. - -- Example: - -```xml - -``` - -Will be defined as: - -```c - -u8 gFireTempleBlob_00CCC0[] = { -#include "assets/objects/object_hidan_objects/gFireTempleBlob_00CCC0.bin.inc.c" -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Blob`. - - `Size`: Required. Amount of bytes to extract. Hex. - -※ We usually use blobs when we can't figure out the content's type of chunk of data. - -------------------------- - -### DList - -A.k.a. Display list, or Gfx. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `DL`. - -------------------------- - -### TextureAnimation - -A data type exclusive to Majora's Mask, that has scrolling, color changing, and texture changing capabilities. Declaring the main array will generate everything else; textures for the TextureCycle type must be declared manually in the XML to use symbols. (If it does reference any undeclared textures, ZAPD will warn and give the their offsets.) - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `TexAnim`. - -------------------------- - -### Scene and Room - -`Scene`s and `Room`s are a bit special, because `Room`s usually needs assets declared in their respective `Scene` (which is in a different file), so they need to be extracted together. - -To accomplish this, the scene and each of their rooms must be declared in the same XML. - -- Example: - -```xml - - - - - - - - - - - - - - -``` - -- Attributes: - - - `HackMode`: Optional. This is a simple non-hardcoded way to handle some edge cases. Valid values: `syotes_room`. - -------------------------- - -### AltHeader - -Like `Scene`s and `Room`s, `AltHeader`s is special too. It should always be declared in the same `File` as a `Scene` or a `Room`. - -- Example: - -```xml - - - - - - - - - - - - - - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `AltHeader`. - -------------------------- - -### Animation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### PlayerAnimation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### CurveAnimation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - - `SkelOffset`: Required. Offset of the `CurveSkeleton` (I.e. a [`Skeleton`](#skeleton) resource with `Type="Curve"`) related to this animation. - -------------------------- - -### LegacyAnimation - -Useful only for the unused `object_human`'s animation data. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### Skeleton - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Skel`. - - `Type`: Required. Valid values: `Normal`, `Flex` and `Curve`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `EnumName`: Optional. The name of `typedef`'d limb enum. - - `LimbNone`: Optional. The name of the limb with index zero in the limb enum. - - `LimbMax`: Optional. The name of the max limb index in the limb enum. - -ZAPD is able to generate a limb enum by itself only if all the required data is provided. Providing some but not all the required data would trigger an error and the execution will halt. - -The required data is providing the `EnumName`, `LimbNone` and `LimbMax` attributes in the `Skeleton` or `LimbTable` node and the `EnumName` attribute in every `Limb` of this skeleton. - -※ There are no restrictions in the `Type` and `LimbType` attributes besides the valid values, so any skeleton type can be combined with any limb type. - -------------------------- - -### LimbTable - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Skel`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `Count`: Required. Amount of limbs. Integer. - - `EnumName`: Optional. The name of `typedef`'d limb enum. - - `LimbNone`: Optional. The name of the limb with index zero in the limb enum. - - `LimbMax`: Optional. The name of the max limb index in the limb enum. - -See [Skeleton](#skeleton) for info on the limb enum generation. - -------------------------- - -### Limb - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Limb`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `EnumName`: Optional. The name used for this limb in the limbs enum. It must be either present in every limb or in none. - -See [Skeleton](#skeleton) for info on the limb enum generation. - -------------------------- - -### Symbol - -A special element that allows declaring a variable without actually extracting it from the current file. Useful when a resource references an element from another file. The symbol will be declared as `extern`. - -- Example: - -```xml - -``` - -Will be declared as: - -```c -extern u8 gJsjutanShadowTex[2048]; -``` - -- Attributes: - - - `Type`: The type of the declared variable. If missing, it will default to `void*`. - - `TypeSize`: The size in bytes of the type. If missing, it will default to `4` (the size of a word and a pointer). Integer or hex value. - - `Count`: Optional. If it is present, the variable will be declared as an array instead of a plain variable. The value of this attribute specifies the length of the array. If `Count` is present but it has no value (`Count=""`), then the length of the array will not be specified either in the declared variable. Integer or hex value. - - `Static`: This attribute can't be enabled on a Symbol node. A warning will be showed in this case. - -------------------------- - -### Collision - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Col`. - -------------------------- - -### Scalar - -Allows the extraction of a single number. - -- Example: - -```xml - -``` - -Will be extracted as: - -```c -u64 pad34F8 = { 0 }; -``` - -- Attributes: - - - `Name`: Required. Suffixed by ~~`TBD`~~. - - `Type`: Required. Valid values: `s8`, `u8`, `x8`, `s16`, `u16`, `x16`, `s32`, `u32`, `x32`, `s64`, `u64`, `x64`, `f32` and `f64`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Vector - -Extracts a vector. - -Current supported types are `Vec3s`, `Vec3i` or `Vec3f`. - -- Example: - -```xml - - - -``` - -Will be extracted as: - -```c -Vec3s gLinkPauseChildDekuShieldJointTable[24] = { - { -37, 2346, 93 }, - { 0, 11995, 0 }, - { -16385, -305, -16333 }, - { 0, 51, 12 }, - { 3761, 2263, -384 }, - { 0, 0, 3786 }, - { 1594, 1384, -18344 }, - { -2288, -2428, -1562 }, - { 0, 0, 3219 }, - { -2148, -5, -16840 }, - { 15365, -1708, 15611 }, - { 1761, 8365, 17711 }, - { 0, 0, 18859 }, - { 0, 0, 0 }, - { -9392, -9579, 28686 }, - { 0, 0, -7093 }, - { -2748, 685, -14092 }, - { 213, 6553, -32212 }, - { 0, 0, -1877 }, - { 3267, 3309, -16090 }, - { -18101, 25946, -2670 }, - { -104, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 } -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by ~~`TBD`~~. - - `Type`: Required. Specifies the vector's type (`Vec3s`, `Vec3i` and `Vec3f`). Valid values: `s16`, `s32` and `f32`. - - `Dimensions`: Required. The amount of dimensions of the vector. Valid values: `3`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Vtx - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Vtx`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Mtx - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Mtx`. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. - -------------------------- - -### Cutscene - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Cs`. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. - -------------------------- - -### Array - -The `Array` element is special, because it needs an inner element to work. It will declare an array of its inner element. - -Currently, only [`Pointer`](#pointer), [`Scalar`](#scalar), [`Vector`](#vector) and [`Vtx`](#vtx) support being wrapped in an array. - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. How the variable will be named. By our convention it should be prefixed by `g`. The sufix is mandated by the element contained. - - `Count`: Required. Amount of elements. Integer. - -------------------------- - -### Path - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Path`. - - `NumPaths`: Optional. The amount of paths contained in the array. It must be a positive integer. - -------------------------- - -### PlayerAnimationData - -Allows the extraction of the specific data of the player animations which are found in the `link_animetion` file. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `AnimData`. - - `FrameCount`: Required. The length of the animation in frames. It must be a positive integer. - -------------------------- - -### Pointer - -Allows the extraction of a variable that contains a pointer - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. - - `Type`: Required. The type of the extracted pointer. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- diff --git a/ZAPDTR/docs/zapd_warning_example.png b/ZAPDTR/docs/zapd_warning_example.png deleted file mode 100644 index a001c64d6a51428bed50d6b599e8082d8effa3ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47521 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 OFgtn5sOW_2t^Wa$9d#Z6 diff --git a/ZAPDTR/docs/zapd_xml_spec.md b/ZAPDTR/docs/zapd_xml_spec.md deleted file mode 100644 index 9fcc0d4aa..000000000 --- a/ZAPDTR/docs/zapd_xml_spec.md +++ /dev/null @@ -1,55 +0,0 @@ -# ZAPD XML specification - -ZAPD XMLs use a restrictive subset of the XML standard: any ZAPD XML must be a valid XML (All elements starting with `` ending appropriately with ``, single "empty-element" tags with `/` at the end, etc.). - -Reminder that in - -```xml - - - - - - - - - -``` - -``, ``, `` are *children* of ``, but `` is not. `` is a *descendent* of `` and a child of ``. - -- Every XML's outermost element start/end tag is a single ``. -- The children of a `` must be ``s. -- A `` has *resources* as children. A resource is almost always single empty-element tag, and has one of the types - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - -- A `` cannot descend from a ``. -- All resources must be children of a ``. -- `` is the only paired resource tag enclosing an element; the element must be a single resource tag, one of - - `` - - `` - - `` diff --git a/ZAPDTR/lib/libgfxd/.gitrepo b/ZAPDTR/lib/libgfxd/.gitrepo deleted file mode 100644 index 4c8b7fe76..000000000 --- a/ZAPDTR/lib/libgfxd/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@github.com:glankk/libgfxd.git - branch = master - commit = 008f73dca8ebc9151b205959b17773a19c5bd0da - parent = c92cfda733aa740a53129a21f69c8abb08a465c7 - method = merge - cmdver = 0.4.3 diff --git a/ZAPDTR/lib/libgfxd/LICENSE b/ZAPDTR/lib/libgfxd/LICENSE deleted file mode 100644 index a7655f829..000000000 --- a/ZAPDTR/lib/libgfxd/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016-2021 glank (glankk@github.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ZAPDTR/lib/libgfxd/Makefile b/ZAPDTR/lib/libgfxd/Makefile deleted file mode 100644 index 5c3edbef4..000000000 --- a/ZAPDTR/lib/libgfxd/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -CC ?= gcc -CFLAGS = -Wall -O2 -g -UC_OBJ = uc_f3d.o uc_f3db.o uc_f3dex.o uc_f3dexb.o uc_f3dex2.o -OBJ = gfxd.o $(UC_OBJ) -LIB = libgfxd.a - -CPPFLAGS-$(MT) += -DCONFIG_MT -CPPFLAGS += $(CPPFLAGS-y) - -.PHONY: all -all: $(LIB) - -.PHONY: clean -clean: - rm -f $(OBJ) $(LIB) - -.INTERMEDIATE: $(OBJ) - -$(OBJ): gbi.h gfxd.h priv.h -$(UC_OBJ): uc.c uc_argfn.c uc_argtbl.c uc_macrofn.c uc_macrotbl.c - -$(LIB): $(OBJ) - $(AR) rcs $@ $^ - -%.o: %.c - $(COMPILE.c) $(OUTPUT_OPTION) $< diff --git a/ZAPDTR/lib/libgfxd/README.md b/ZAPDTR/lib/libgfxd/README.md deleted file mode 100644 index 2e8258943..000000000 --- a/ZAPDTR/lib/libgfxd/README.md +++ /dev/null @@ -1,478 +0,0 @@ -## Installing -Run `make` for a single-threaded build, or `make MT=y` for a multi-threaded -build. Copy `libgfxd.a` to your lib directory, and `gfxd.h` to your include -directory. - -## Example usage -Example source code: -``` -#include -#include - -static int macro_fn(void) -{ - /* Print a tab before each macro, and a comma and newline after each - macro */ - gfxd_puts("\t"); - gfxd_macro_dflt(); /* Execute the default macro handler */ - gfxd_puts(",\n"); - - return 0; -} - -int main() -{ - /* Read from stdin and write to stdout */ - gfxd_input_fd(fileno(stdin)); - gfxd_output_fd(fileno(stdout)); - - /* Override the default macro handler to make the output prettier */ - gfxd_macro_fn(macro_fn); - - /* Select F3DEX as the target microcode */ - gfxd_target(gfxd_f3dex); - - /* Set the input endianness to big endian, and the word size to 4 */ - gfxd_endian(gfxd_endian_big, 4); - - /* Print an opening brace */ - gfxd_puts("{\n"); - - /* Execute until the end of input, or until encountering an invalid - command */ - gfxd_execute(); - - /* Print a closing brace */ - gfxd_puts("}\n"); -} -``` - -Example input (binary): -``` -0xe7000000, 0x00000000, -0xfc127e03, 0xfffffdf8, -0xb900031d, 0xc8112078, -0xb6000000, 0x000e0000, -0xb7000000, 0x00012000, -0xfa000000, 0xffffffff, -0x040030bf, 0x000002e0, -0xb1000204, 0x00020604, -0xb1080a0c, 0x000a0e0c, -0xb10a1012, 0x000a120e, -0xb1140200, 0x00140016, -0xb8000000, 0x00000000, -``` - -Example output: -``` -{ - gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, 1, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsSPClearGeometryMode(G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_CULL_BACK | G_FOG), - gsDPSetPrimColor(0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - gsSPVertex(0x000002E0, 12, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0), - gsSP1Quadrangle(5, 8, 9, 7, 0), - gsSP1Quadrangle(10, 1, 0, 11, 0), - gsSPEndDisplayList(), -} -``` - -## Input/output methods -The input consists of any number of `Gfx` packets, and the output is the -decompiled macros in plain-text. The endianness and microcode type of the input -can be set using `gfxd_endian` and `gfxd_target`. - -Several methods of doing I/O are available. No method is selected by default, -meaning there will be no input, and any output will be discarded. - ---- - -##### `void gfxd_input_buffer(const void *buf, int size)` -##### `void gfxd_output_buffer(char *buf, int size)` -Use the buffer pointed to by `buf`, of `size` bytes. - ---- - -##### `void gfxd_input_fd(int fd)` -##### `void gfxd_output_fd(int fd)` -Use `read()` / `write()` with the provided file descriptor, `fd`. - ---- - -##### `typedef int gfxd_input_fn_t(void *buf, int count)` -##### `typedef int gfxd_output_fn_t(const char *buf, int count)` -##### `void gfxd_input_callback(gfxd_input_fn_t *fn)` -##### `void gfxd_output_callback(gfxd_output_fn_t *fn)` -Use the provided callback function, `fn`. `fn` should copy at most `count` -bytes to/from `buf`, and return the number of bytes actually copied. The input -callback should return 0 to signal end of input. - -## Handlers -The macro handler function is responsible for writing the output of each -decompiled macro. The default macro handler is `gfxd_macro_dflt`, but this can -be changed with `gfxd_macro_fn`. The new handler can extend the default -function by calling `gfxd_macro_dflt` within it, or it can override it -completely. - ---- - -##### `int gfxd_macro_dflt()` -The default macro handler. Outputs the macro name, dynamic display list pointer -if one has been specified, and then each argument in order using the function -registered using `gfxd_arg_fn` (`gfxd_arg_dflt` by default), and returns zero. -Because it is designed to be extended, it only outputs the macro text, without -any whitespace or punctuation before or after. When this function is used as -the sole macro handler, it will output the entire display list on one line -without any separation between macros, which is probably not what you want. - ---- - -##### `void gfxd_macro_fn(gfxd_macro_fn_t *fn)` -Set `fn` to be the macro handler function. `fn` can be null, in which case the -handler is reset to the default. - ---- - -##### `void gfxd_arg_dflt(int arg_num)` -The default argument handler for `gfxd_macro_dflt`. For the argument with index -`arg_num`, calls `gfxd_arg_callbacks`, and prints the argument value if the -callback returns zero, or if there is no callback for the given argument. - ---- - -##### `void gfxd_arg_fn(gfxd_arg_fn_t *fn)` -Set `fn` to be the argument handler function, called by `gfxd_macro_dflt`, -for each argument in the current macro, not counting the dynamic display list -pointer if one has been specified. `fn` can be null, in which case the handler -is reset to the default. This only affects the output of `gfxd_macro_dflt`, and -has no observable effect if `gfxd_macro_dflt` is overridden (not extended). - -## Argument callbacks -Callbacks can be registered that will be executed when an argument of a certain -type is encountered. The default argument handler `gfxd_arg_dflt` will execute -callbacks as needed using `gfxd_arg_callbacks`. If a callback returns non-zero, -`gfxd_arg_dflt` will not output anything. This is to allow callbacks to -override the default argument output. Otherwise, `gfxd_arg_dflt` will output -the argument value after the callback function's output. - ---- - -##### `int gfxd_arg_callbacks(int arg_num)` -Examines the argument with index `arg_num` and executes the callback function -for that argument type, if such a callback is supported and has been -registered. This function returns the value that was returned by the callback -function. If no callback function has been registered for the argument type, -zero is returned. - -Most argument callbacks have some extra parameters containing information that -might be relevant to the argument that triggered the callback. The extra -information is extracted only from the current macro, as gfxd does not retain -any context information from previous or subsequent macros. If any of the extra -parameter values is not available in the current macro, the value for that -parameter is substituted with `-1` for signed parameters, and zero for unsigned -parameters. - ---- - -##### `typedef int gfxd_tlut_fn_t(uint32_t tlut, int32_t idx, int32_t count)` -##### `void gfxd_tlut_callback(gfxd_tlut_fn_t *fn)` -Set the callback function for palette arguments. The argument type is -`gfxd_Tlut`. The palette index is in `idx` and the number of colors in `count`. - ---- - -##### `typedef int gfxd_timg_fn_t(uint32_t timg, int32_t fmt, int32_t siz, int32_t width, int32_t height, int32_t pal)` -##### `void gfxd_timg_callback(gfxd_timg_fn_t *fn)` -Set the callback function for texture arguments. The argument type is -`gfxd_Timg`. The image format is in `fmt` and `siz`, the dimensions in `width` -and `height`, and the palette index in `pal`. - ---- - -##### `typedef int gfxd_cimg_fn_t(uint32_t cimg, int32_t fmt, int32_t siz, int32_t width)` -##### `void gfxd_cimg_callback(gfxd_cimg_fn_t *fn)` -Set the callback function for frame buffer arguments. The argument type is -`gfxd_Cimg`. The image format is in `fmt` and `siz`, and the horizontal -resolution in `width`. - ---- - -##### `typedef int gfxd_zimg_fn_t(uint32_t zimg)` -##### `void gfxd_zimg_callback(gfxd_zimg_fn_t *fn)` -Set the callback function for depth buffer arguments. The argument type is -`gfxd_Zimg`. - ---- - -##### `typedef int gfxd_dl_fn_t(uint32_t dl)` -##### `void gfxd_dl_callback(gfxd_dl_fn_t *fn)` -Set the callback function for display list arguments. The argument type is -`gfxd_Dl`. - ---- - -##### `typedef int gfxd_mtx_fn_t(uint32_t mtx)` -##### `void gfxd_mtx_callback(gfxd_mtx_fn_t *fn)` -Set the callback function for matrix arguments. The argument type is -`gfxd_Mtxptr`. - ---- - -##### `typedef int gfxd_lookat_fn_t(uint32_t lookat, int32_t count)` -##### `void gfxd_lookat_callback(gfxd_lookat_fn_t *fn)` -Set the callback function for lookat array arguments. The argument type is -`gfxd_Lookatptr`. The number of lookat structures (1 or 2) is in `count`. - ---- - -##### `typedef int gfxd_light_fn_t(uint32_t light, int32_t count)` -##### `void gfxd_light_callback(gfxd_light_fn_t *fn)` -Set the callback function for light array arguments. The argument type is -`gfxd_Lightptr`. The number of light structures is in `count`. - ---- - -##### `typedef int gfxd_seg_fn_t(uint32_t seg, int32_t num)` -##### `void gfxd_seg_callback(gfxd_seg_fn_t *fn)` -Set the callback function for segment base arguments. The argument type is -`gfxd_Segptr`. The segment number is in `num`. - ---- - -##### `typedef int gfxd_vtx_fn_t(uint32_t vtx, int32_t num)` -##### `void gfxd_vtx_callback(gfxd_vtx_fn_t *fn)` -Set the callback function for vertex array arguments. The argument type is -`gfxd_Vtxptr`. The number of vertex structures is in `num`. - ---- - -##### `typedef int gfxd_vp_fn_t(uint32_t vp)` -##### `void gfxd_vp_callback(gfxd_vp_fn_t *fn)` -Set the callback function for viewport arguments. The argument type is -`gfxd_Vp`. - ---- - -##### `typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size)` -##### `void gfxd_uctext_callback(gfxd_uctext_fn_t *fn)` -Set the callback function for microcode text arguments. The argument type is -`gfxd_Uctext`. The size of the text segment is in `size`. - ---- - -##### `typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size)` -##### `void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn)` -Set the callback function for microcode data arguments. The argument type is -`gfxd_Ucdata`. The size of the data segment is in `size`. - ---- - -##### `typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size)` -##### `void gfxd_dram_callback(gfxd_dram_fn_t *fn)` -Set the callback function for generic pointer arguments. The argument type is -`gfxd_Dram`. The size of the data is in `size`. - -## General settings -These functions control general input and output settings. - ---- - -##### `void gfxd_target(gfxd_ucode_t ucode)` -Select `ucode` as the target microcode. `ucode` can be `gfxd_f3d`, `gfxd_f3db`, -`gfxd_f3dex`, `gfxd_f3dexb`, or `gfxd_f3dex2`. The microcode must be selected -before `gfxd_execute`, as no microcode is selected by default. - ---- - -##### `void gfxd_endian(int endian, int wordsize)` -Select `endian` as the endianness of the input, and `wordsize` as the size of -each word in number of bytes. `endian` can be `gfxd_endian_big`, -`gfxd_endian_little`, or `gfxd_endian_host` (the endianness of the host -machine). `wordsize` can be 1, 2, 4, or 8. Big endian is selected by default, -with a word size of 4. - ---- - -##### `void gfxd_dynamic(const char *arg)` -Enable or disable the use of dynamic `g` macros instead of static `gs` macros, -and select the dynamic display list pointer argument to be used. `arg` will be -used by `gfxd_macro_dflt` as the first argument to dynamic macros. If `arg` is -null, dynamic macros are disabled, and `gs` macros are used. Also affects the -result of `gfxd_macro_name`, as it will return either the dynamic or static -version of the macro name as selected by this setting. - ---- - -##### `void gfxd_enable(int cap)` -##### `void gfxd_disable(int cap)` -Enable or disable the feature specified by `cap`. Can be one of the following; -- `gfxd_stop_on_invalid`: Stop execution when encountering an invalid macro. -Enabled by default. -- `gfxd_stop_on_end`: Stop execution when encountering a `SPBranchList` or -`SPEndDisplayList`. Enabled by default. -- `gfxd_emit_dec_color`: Print color components as decimal instead of -hexadecimal. Disabled by default. -- `gfxd_emit_q_macro`: Print fixed-point conversion `q` macros for fixed-point -values. Disabled by default. -- `gfxd_emit_ext_macro`: Emit non-standard macros. Some commands are valid -(though possibly meaningless), but have no macros associated with them, such as -a standalone `G_RDPHALF_1`. When this feature is enabled, such a command will -produce a non-standard `gsDPHalf1` macro instead of a raw hexadecimal command. -Also enables some non-standard multi-packet texture loading macros. Disabled by -default. - ---- - -##### `void gfxd_udata_set(void *ptr)` -##### `void *gfxd_udata_get(void)` -Set or get a generic pointer that can be used to pass user-defined data in and -out of callback functions. - -## Execution -Decompilation is started using the `gfxd_execute` function. When gfxd is -executing (i.e. after `gfxd_execute` has been entered, and before it returns), -the general settings and the I/O settings should not be changed. - ---- - -##### `int gfxd_execute()` -Start executing gfxd with the current settings. For each macro, the macro -handler registered with `gfxd_macro_fn` is called. Execution ends when the -input ends, the macro handler returns non-zero, when an invalid macro is -encountered and `gfxd_stop_on_invalid` is enabled, or when `SPBranchList` or -`SPEndDisplayList` is encountered and `gfxd_stop_on_end` is enabled. If -execution ends due to an invalid macro, `-1` is returned. If execution ends -because the macro handler returns non-zero, the return value from the macro -handler is returned. Otherwise zero is returned. - -## Macro information -The following functions can be used to obtain information about the current -macro and its arguments. They should only be used in custom handlers and -callbacks from within `gfxd_execute`. If used elsewhere, their behavior is -undefined. - ---- - -##### `int gfxd_macro_offset()` -Returns the offset in the input data of the current macro. The offset starts -at zero when `gfxd_execute` is called. - ---- - -##### `int gfxd_macro_packets()` -Returns the number of `Gfx` packets within the current macro. - ---- - -##### `const void *gfxd_macro_data()` -Returns a pointer to the input data for the current macro. The data is not -byte-swapped. The data has a length of `sizeof(Gfx) * gfxd_macro_packets()`. - ---- - -##### `int gfxd_macro_id()` -Returns a number that uniquely identifies the current macro. The number will -be one of the constants in `gfxd.h`. - ---- - -##### `const char *gfxd_macro_name()` -Returns the name of the current macro. If the macro does not have a name (i.e. -it's invalid), null is returned. If a dynamic display list pointer has been -specified, the dynamic `g` version is returned. Otherwise the static `gs` -version is returned. The returned pointer is invalidated by a subsequent call -to `gfxd_macro_name`. - ---- - -##### `int gfxd_arg_count()` -Returns the number of arguments to the current macro, not including a dynamic -display list pointer if one has been specified. - ---- - -##### `int gfxd_arg_type(int arg_num)` -Returns a number that identifies the type of the argument with index `arg_num`. -The number will be one of the constants in `gfxd.h`. - ---- - -##### `const char *gfxd_arg_name(int arg_num)` -Returns the name of the argument with index `arg_num`. Argument names are not -canonical, nor are they needed for macro disassembly, but they can be useful -for informational and diagnostic purposes. - ---- - -##### `int gfxd_arg_fmt(int arg_num)` -Returns the data format of the argument with index `arg_num`. The return value -will be `gfxd_argfmt_i` for `int32_t`, `gfxd_argfmt_u` for `uint32_t`, or -`gfxd_argfmt_f` for `float`. When accessing the value of the argument with -`gfxd_arg_value`, the member with the corresponding type should be used. - ---- - -##### `const gfxd_value_t *gfxd_arg_value(int arg_num)` -Returns a pointer to the value of the argument with index `arg_num`. The value -is a union of type `gfxd_value_t` with the following layout; -``` -typedef union -{ - int32_t i; - uint32_t u; - float f; -} gfxd_value_t -``` - ---- - -##### `const gfxd_value_t *gfxd_value_by_type(int type, int idx)` -Returns a pointer to the value of the argument that is of `type`, and has order -`idx` in all arguments of that type. An `idx` of zero returns the first -argument that has the specified type. If there is no argument with the given -type and order, null is returned. - ---- - -##### `int gfxd_arg_valid(int arg_num)` -Returns non-zero if the argument with index `arg_num` is "valid", for some -definition of valid. An invalid argument generally means that the disassembler -found inconsistencies in the input data, or that the data can not be reproduced -by the current macro type. The argument still has a value that can be printed, -though the value is not guaranteed to make any sense. - -## Custom output -When the default handlers are overridden or extended, the custom handler -functions will want to do some output of their own. The following methods are -available for inserting custom text into the gfxd output. - ---- - -##### `int gfxd_write(const void *buf, int count)` -Insert `count` bytes from the buffer at `buf` into the output. The number of -characters written is returned. - ---- - -##### `int gfxd_puts(const char *str)` -Insert the null-terminated string at `str` into the output. The number of -characters written is returned. - ---- - -##### `int gfxd_printf(const char *fmt, ...)` -Insert the printf-formatted string described by `fmt` and additional arguments -into the output. Limited to 255 characters. The number of characters written is -returned. - ---- - -##### `int gfxd_print_value(int type, const gfxd_value_t *value)` -Insert the type-formatted value into the output. The type should be one of the -constants in `gfxd.h`. The number of characters written is returned. The -macro argument with index `n` can be printed with -`gfxd_print_value(gfxd_arg_type(n), gfxd_arg_value(n))`. diff --git a/ZAPDTR/lib/libgfxd/gbi.h b/ZAPDTR/lib/libgfxd/gbi.h deleted file mode 100644 index 69fa7f12e..000000000 --- a/ZAPDTR/lib/libgfxd/gbi.h +++ /dev/null @@ -1,3838 +0,0 @@ -/** - * gbi.h version 0.3.6 - * n64 graphics microcode interface library - * compatible with fast3d, f3dex, f3dex2, s2dex, and s2dex2 - * - * select a microcode with one of these preprocessor definitions; - * #define F3D_GBI - * for fast3d (selected automatically by default), or - * #define F3DEX_GBI - * for f3dex/s2dex, or - * #define F3DEX_GBI_2 - * for f3dex2/s2dex2 - * - * for early versions of fast3d and f3dex, also define the following; - * #define F3D_BETA - * - * ido incompatibilities; - * - use of c99 variadic macros - * - use of c99 fixed-width integer types - * - use of c99 designated initializers - * - use of c99 compound literals - * - use of c11 _Alignas - * - use of gnu c compound expressions - * - use of gnu c __typeof__ - * - * libultra incompatibilities; - * - many private, undocumented, or obsolete macros not commonly used by - * programmers are missing - * - many different implementation details that will produce matching gbi, - * but not matching code -**/ - -#ifndef N64_GBI_H -#define N64_GBI_H - -#include - -/* use fast3d by default */ -#if !defined(F3D_GBI) && !defined(F3DEX_GBI) && !defined(F3DEX_GBI_2) -# define F3D_GBI -#endif - -/* commands for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_SPNOOP 0x00 -# define G_MTX 0x01 -# define G_MOVEMEM 0x03 -# define G_VTX 0x04 -# define G_DL 0x06 -# if defined(F3D_BETA) -# define G_RDPHALF_2 0xB2 -# define G_RDPHALF_1 0xB3 -# define G_PERSPNORM 0xB4 -# else -# define G_RDPHALF_2 0xB3 -# define G_RDPHALF_1 0xB4 -# endif -# define G_LINE3D 0xB5 -# define G_CLEARGEOMETRYMODE 0xB6 -# define G_SETGEOMETRYMODE 0xB7 -# define G_ENDDL 0xB8 -# define G_SETOTHERMODE_L 0xB9 -# define G_SETOTHERMODE_H 0xBA -# define G_TEXTURE 0xBB -# define G_MOVEWORD 0xBC -# define G_POPMTX 0xBD -# define G_CULLDL 0xBE -# define G_TRI1 0xBF -# define G_NOOP 0xC0 -#endif - -/* commands for f3dex */ -#if defined(F3DEX_GBI) -# define G_LOAD_UCODE 0xAF -# define G_BRANCH_Z 0xB0 -# define G_TRI2 0xB1 -# if !defined(F3D_BETA) -# define G_MODIFYVTX 0xB2 -# endif -#endif - -/* commands for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_NOOP 0x00 -# define G_VTX 0x01 -# define G_MODIFYVTX 0x02 -# define G_CULLDL 0x03 -# define G_BRANCH_Z 0x04 -# define G_TRI1 0x05 -# define G_TRI2 0x06 -# define G_QUAD 0x07 -# define G_LINE3D 0x08 -# define G_SPECIAL_3 0xD3 -# define G_SPECIAL_2 0xD4 -# define G_SPECIAL_1 0xD5 -# define G_DMA_IO 0xD6 -# define G_TEXTURE 0xD7 -# define G_POPMTX 0xD8 -# define G_GEOMETRYMODE 0xD9 -# define G_MTX 0xDA -# define G_MOVEWORD 0xDB -# define G_MOVEMEM 0xDC -# define G_LOAD_UCODE 0xDD -# define G_DL 0xDE -# define G_ENDDL 0xDF -# define G_SPNOOP 0xE0 -# define G_RDPHALF_1 0xE1 -# define G_SETOTHERMODE_L 0xE2 -# define G_SETOTHERMODE_H 0xE3 -# define G_RDPHALF_2 0xF1 -#endif - -/* rdp commands */ -#define G_TEXRECT 0xE4 -#define G_TEXRECTFLIP 0xE5 -#define G_RDPLOADSYNC 0xE6 -#define G_RDPPIPESYNC 0xE7 -#define G_RDPTILESYNC 0xE8 -#define G_RDPFULLSYNC 0xE9 -#define G_SETKEYGB 0xEA -#define G_SETKEYR 0xEB -#define G_SETCONVERT 0xEC -#define G_SETSCISSOR 0xED -#define G_SETPRIMDEPTH 0xEE -#define G_RDPSETOTHERMODE 0xEF -#define G_LOADTLUT 0xF0 -#define G_SETTILESIZE 0xF2 -#define G_LOADBLOCK 0xF3 -#define G_LOADTILE 0xF4 -#define G_SETTILE 0xF5 -#define G_FILLRECT 0xF6 -#define G_SETFILLCOLOR 0xF7 -#define G_SETFOGCOLOR 0xF8 -#define G_SETBLENDCOLOR 0xF9 -#define G_SETPRIMCOLOR 0xFA -#define G_SETENVCOLOR 0xFB -#define G_SETCOMBINE 0xFC -#define G_SETTIMG 0xFD -#define G_SETZIMG 0xFE -#define G_SETCIMG 0xFF - -/* commands for s2dex */ -#if defined(F3DEX_GBI) -# define G_BG_1CYC 0x01 -# define G_BG_COPY 0x02 -# define G_OBJ_RECTANGLE 0x03 -# define G_OBJ_SPRITE 0x04 -# define G_OBJ_MOVEMEM 0x05 -# define G_SELECT_DL 0xB0 -# define G_OBJ_RENDERMODE 0xB1 -# define G_OBJ_RECTANGLE_R 0xB2 -# define G_OBJ_LOADTXTR 0xC1 -# define G_OBJ_LDTX_SPRITE 0xC2 -# define G_OBJ_LDTX_RECT 0xC3 -# define G_OBJ_LDTX_RECT_R 0xC4 -#endif - -/* commands for s2dex2 */ -#if defined(F3DEX_GBI_2) -# define G_OBJ_RECTANGLE 0x01 -# define G_OBJ_SPRITE 0x02 -# define G_SELECT_DL 0x04 -# define G_OBJ_LOADTXTR 0x05 -# define G_OBJ_LDTX_SPRITE 0x06 -# define G_OBJ_LDTX_RECT 0x07 -# define G_OBJ_LDTX_RECT_R 0x08 -# define G_BG_1CYC 0x09 -# define G_BG_COPY 0x0A -# define G_OBJ_RENDERMODE 0x0B -# define G_OBJ_RECTANGLE_R 0xDA -# define G_OBJ_MOVEMEM 0xDC -#endif - -/* commands for s2dex and s2dex2 */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_RDPHALF_0 0xE4 -#endif - -/* image formats */ -#define G_IM_FMT_RGBA 0 -#define G_IM_FMT_YUV 1 -#define G_IM_FMT_CI 2 -#define G_IM_FMT_IA 3 -#define G_IM_FMT_I 4 -#define G_IM_SIZ_4b 0 -#define G_IM_SIZ_8b 1 -#define G_IM_SIZ_16b 2 -#define G_IM_SIZ_32b 3 - -/* texture settings */ -#define G_TX_NOMIRROR (gI_(0b0) << 0) -#define G_TX_MIRROR (gI_(0b1) << 0) -#define G_TX_WRAP (gI_(0b0) << 1) -#define G_TX_CLAMP (gI_(0b1) << 1) -#define G_TX_NOMASK gI_(0) -#define G_TX_NOLOD gI_(0) -#define G_OFF gI_(0) -#define G_ON gI_(1) - -/* tile indices */ -#define G_TX_LOADTILE 7 -#define G_TX_RENDERTILE 0 - -/* loadblock constants */ -#define G_TX_DXT_FRAC 11 -#define G_TX_LDBLK_MAX_TXL 2047 - -/* geometry mode */ -#define G_ZBUFFER (gI_(0b1) << 0) -#define G_SHADE (gI_(0b1) << 2) -#define G_CULL_BOTH (G_CULL_FRONT | G_CULL_BACK) -#define G_FOG (gI_(0b1) << 16) -#define G_LIGHTING (gI_(0b1) << 17) -#define G_TEXTURE_GEN (gI_(0b1) << 18) -#define G_TEXTURE_GEN_LINEAR (gI_(0b1) << 19) -#define G_LOD (gI_(0b1) << 20) - -/* geometry mode for fast3d */ -#if defined(F3D_GBI) -# define G_CLIPPING (gI_(0b0) << 0) -#endif - -/* geometry mode for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_TEXTURE_ENABLE (gI_(0b1) << 1) -# define G_SHADING_SMOOTH (gI_(0b1) << 9) -# define G_CULL_FRONT (gI_(0b1) << 12) -# define G_CULL_BACK (gI_(0b1) << 13) -#endif - -/* geometry mode for f3dex and f3dex2 */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_CLIPPING (gI_(0b1) << 23) -#endif - -/* geometry mode for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_TEXTURE_ENABLE (gI_(0b0) << 0) -# define G_CULL_FRONT (gI_(0b1) << 9) -# define G_CULL_BACK (gI_(0b1) << 10) -# define G_SHADING_SMOOTH (gI_(0b1) << 21) -#endif - -/* othermode lo */ -#define G_MDSFT_ALPHACOMPARE 0 -#define G_MDSFT_ZSRCSEL 2 -#define G_MDSFT_RENDERMODE 3 -#define G_MDSFT_BLENDER 16 -#define G_MDSIZ_ALPHACOMPARE 2 -#define G_MDSIZ_ZSRCSEL 1 -#define G_MDSIZ_RENDERMODE 29 -#define G_MDSIZ_BLENDER 13 - -#define G_AC_NONE (gI_(0b00) << G_MDSFT_ALPHACOMPARE) -#define G_AC_THRESHOLD (gI_(0b01) << G_MDSFT_ALPHACOMPARE) -#define G_AC_DITHER (gI_(0b11) << G_MDSFT_ALPHACOMPARE) -#define G_ZS_PIXEL (gI_(0b0) << G_MDSFT_ZSRCSEL) -#define G_ZS_PRIM (gI_(0b1) << G_MDSFT_ZSRCSEL) -#define AA_EN (gI_(0b1) << (G_MDSFT_RENDERMODE + 0)) -#define Z_CMP (gI_(0b1) << (G_MDSFT_RENDERMODE + 1)) -#define Z_UPD (gI_(0b1) << (G_MDSFT_RENDERMODE + 2)) -#define IM_RD (gI_(0b1) << (G_MDSFT_RENDERMODE + 3)) -#define CLR_ON_CVG (gI_(0b1) << (G_MDSFT_RENDERMODE + 4)) -#define CVG_DST_CLAMP (gI_(0b00) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_WRAP (gI_(0b01) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_FULL (gI_(0b10) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_SAVE (gI_(0b11) << (G_MDSFT_RENDERMODE + 5)) -#define ZMODE_OPA (gI_(0b00) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_INTER (gI_(0b01) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_XLU (gI_(0b10) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_DEC (gI_(0b11) << (G_MDSFT_RENDERMODE + 7)) -#define CVG_X_ALPHA (gI_(0b1) << (G_MDSFT_RENDERMODE + 9)) -#define ALPHA_CVG_SEL (gI_(0b1) << (G_MDSFT_RENDERMODE + 10)) -#define FORCE_BL (gI_(0b1) << (G_MDSFT_RENDERMODE + 11)) - -#define G_BL_1MA gI_(0b00) -#define G_BL_1 gI_(0b10) -#define G_BL_0 gI_(0b11) -#define G_BL_CLR_IN gI_(0b00) -#define G_BL_CLR_MEM gI_(0b01) -#define G_BL_CLR_BL gI_(0b10) -#define G_BL_CLR_FOG gI_(0b11) -#define G_BL_A_IN gI_(0b00) -#define G_BL_A_FOG gI_(0b01) -#define G_BL_A_MEM gI_(0b01) -#define G_BL_A_SHADE gI_(0b10) - -#define GBL_c1(p, a, m, b) \ - ( \ - gF_(p, 2, 30) | \ - gF_(a, 2, 26) | \ - gF_(m, 2, 22) | \ - gF_(b, 2, 18) \ - ) -#define GBL_c2(p, a, m, b) \ - ( \ - gF_(p, 2, 28) | \ - gF_(a, 2, 24) | \ - gF_(m, 2, 20) | \ - gF_(b, 2, 16) \ - ) - -/* render modes */ -#define G_RM_OPA_SURF \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_OPA_SURF2 \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_OPA_SURF \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_OPA_SURF2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_OPA_SURF \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_OPA_SURF2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_SURF \ - ( \ - Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_SURF2 \ - ( \ - Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_XLU_SURF \ - ( \ - IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_XLU_SURF2 \ - ( \ - IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_SURF \ - ( \ - AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | \ - FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_SURF2 \ - ( \ - AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | \ - FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_SURF \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_SURF2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ZB_OPA_DECAL \ - ( \ - Z_CMP | CVG_DST_FULL | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_DECAL2 \ - ( \ - Z_CMP | CVG_DST_FULL | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_DECAL \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_WRAP | ZMODE_DEC | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_DECAL2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_WRAP | ZMODE_DEC | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_DECAL \ - ( \ - AA_EN | Z_CMP | CVG_DST_WRAP | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_DECAL2 \ - ( \ - AA_EN | Z_CMP | CVG_DST_WRAP | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_ZB_XLU_DECAL \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_DECAL2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_DECAL \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_DECAL2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_ZB_OPA_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_ZB_XLU_INTER \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_INTER | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_INTER2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_INTER | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_XLU_LINE \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_LINE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_LINE \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_XLU | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_LINE2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_XLU | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_DEC_LINE \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_DEC_LINE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_DEC_LINE \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_DEC_LINE2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - - -#define G_RM_TEX_EDGE \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_TEX_EDGE2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_TEX_EDGE \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_TEX_EDGE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_EDGE \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_EDGE2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_ZB_TEX_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_SUB_SURF \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_SUB_SURF2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_SUB_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_SUB_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_PCL_SURF \ - ( \ - G_AC_DITHER | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_PCL_SURF2 \ - ( \ - G_AC_DITHER | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_PCL_SURF \ - ( \ - G_AC_DITHER | AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_PCL_SURF2 \ - ( \ - G_AC_DITHER | AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_PCL_SURF \ - ( \ - G_AC_DITHER | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_ZB_PCL_SURF2 \ - ( \ - G_AC_DITHER | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_ZB_PCL_SURF \ - ( \ - G_AC_DITHER | AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | \ - ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_PCL_SURF2 \ - ( \ - G_AC_DITHER | AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | \ - ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_OPA_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_OPA_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_OPA_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_OPA_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_TEX_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_TEX_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_TEX_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_TEX_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_SUB_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_SUB_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_SUB_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_SUB_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_CLD_SURF \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_CLD_SURF2 \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_CLD_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_CLD_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ZB_OVL_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_OVL_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ADD \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1) \ - ) -#define G_RM_ADD2 \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1) \ - ) - -#define G_RM_FOG_SHADE_A \ - GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) - -#define G_RM_FOG_PRIM_A \ - GBL_c1(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA) - -#define G_RM_PASS \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) - -#define G_RM_VISCVG \ - ( \ - IM_RD | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_BL, G_BL_A_MEM) \ - ) -#define G_RM_VISCVG2 \ - ( \ - IM_RD | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_BL, G_BL_A_MEM) \ - ) - -#define G_RM_OPA_CI \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_OPA_CI2 \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) - -#define G_RM_NOOP GBL_c1(0, 0, 0, 0) -#define G_RM_NOOP2 GBL_c2(0, 0, 0, 0) - -#define G_RM_SPRITE G_RM_OPA_SURF -#define G_RM_SPRITE2 G_RM_OPA_SURF2 -#define G_RM_RA_SPRITE \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_RA_SPRITE2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_SPRITE G_RM_AA_TEX_TERR -#define G_RM_AA_SPRITE2 G_RM_AA_TEX_TERR2 -#define G_RM_XLU_SPRITE G_RM_XLU_SURF -#define G_RM_XLU_SPRITE2 G_RM_XLU_SURF2 -#define G_RM_AA_XLU_SPRITE G_RM_AA_XLU_SURF -#define G_RM_AA_XLU_SPRITE2 G_RM_AA_XLU_SURF2 - -#define G_OBJRM_NOTXCLAMP (gI_(0b1) << 0) -#define G_OBJRM_XLU (gI_(0b1) << 1) -#define G_OBJRM_ANTIALIAS (gI_(0b1) << 2) -#define G_OBJRM_BILERP (gI_(0b1) << 3) -#define G_OBJRM_SHRINKSIZE_1 (gI_(0b1) << 4) -#define G_OBJRM_SHRINKSIZE_2 (gI_(0b1) << 5) -#define G_OBJRM_WIDEN (gI_(0b1) << 6) - -/* othermode hi */ -#define G_MDSFT_ALPHADITHER 4 -#define G_MDSFT_RGBDITHER 6 -#define G_MDSFT_COMBKEY 8 -#define G_MDSFT_TEXTCONV 9 -#define G_MDSFT_TEXTFILT 12 -#define G_MDSFT_TEXTLUT 14 -#define G_MDSFT_TEXTLOD 16 -#define G_MDSFT_TEXTDETAIL 17 -#define G_MDSFT_TEXTPERSP 19 -#define G_MDSFT_CYCLETYPE 20 -#define G_MDSFT_PIPELINE 23 -#define G_MDSIZ_ALPHADITHER 2 -#define G_MDSIZ_RGBDITHER 2 -#define G_MDSIZ_COMBKEY 1 -#define G_MDSIZ_TEXTCONV 3 -#define G_MDSIZ_TEXTFILT 2 -#define G_MDSIZ_TEXTLUT 2 -#define G_MDSIZ_TEXTLOD 1 -#define G_MDSIZ_TEXTDETAIL 2 -#define G_MDSIZ_TEXTPERSP 1 -#define G_MDSIZ_CYCLETYPE 2 -#define G_MDSIZ_PIPELINE 1 - -#define G_AD_PATTERN (gI_(0b00) << G_MDSFT_ALPHADITHER) -#define G_AD_NOTPATTERN (gI_(0b01) << G_MDSFT_ALPHADITHER) -#define G_AD_NOISE (gI_(0b10) << G_MDSFT_ALPHADITHER) -#define G_AD_DISABLE (gI_(0b11) << G_MDSFT_ALPHADITHER) -#define G_CD_MAGICSQ (gI_(0b00) << G_MDSFT_RGBDITHER) -#define G_CD_BAYER (gI_(0b01) << G_MDSFT_RGBDITHER) -#define G_CD_NOISE (gI_(0b10) << G_MDSFT_RGBDITHER) -#define G_CD_DISABLE (gI_(0b11) << G_MDSFT_RGBDITHER) -#define G_CD_ENABLE (gI_(0b10) << G_MDSFT_RGBDITHER) -#define G_CK_NONE (gI_(0b0) << G_MDSFT_COMBKEY) -#define G_CK_KEY (gI_(0b1) << G_MDSFT_COMBKEY) -#define G_TC_CONV (gI_(0b000) << G_MDSFT_TEXTCONV) -#define G_TC_FILTCONV (gI_(0b101) << G_MDSFT_TEXTCONV) -#define G_TC_FILT (gI_(0b110) << G_MDSFT_TEXTCONV) -#define G_TF_POINT (gI_(0b00) << G_MDSFT_TEXTFILT) -#define G_TF_BILERP (gI_(0b10) << G_MDSFT_TEXTFILT) -#define G_TF_AVERAGE (gI_(0b11) << G_MDSFT_TEXTFILT) -#define G_TT_NONE (gI_(0b00) << G_MDSFT_TEXTLUT) -#define G_TT_RGBA16 (gI_(0b10) << G_MDSFT_TEXTLUT) -#define G_TT_IA16 (gI_(0b11) << G_MDSFT_TEXTLUT) -#define G_TL_TILE (gI_(0b0) << G_MDSFT_TEXTLOD) -#define G_TL_LOD (gI_(0b1) << G_MDSFT_TEXTLOD) -#define G_TD_CLAMP (gI_(0b00) << G_MDSFT_TEXTDETAIL) -#define G_TD_SHARPEN (gI_(0b01) << G_MDSFT_TEXTDETAIL) -#define G_TD_DETAIL (gI_(0b10) << G_MDSFT_TEXTDETAIL) -#define G_TP_NONE (gI_(0b0) << G_MDSFT_TEXTPERSP) -#define G_TP_PERSP (gI_(0b1) << G_MDSFT_TEXTPERSP) -#define G_CYC_1CYCLE (gI_(0b00) << G_MDSFT_CYCLETYPE) -#define G_CYC_2CYCLE (gI_(0b01) << G_MDSFT_CYCLETYPE) -#define G_CYC_COPY (gI_(0b10) << G_MDSFT_CYCLETYPE) -#define G_CYC_FILL (gI_(0b11) << G_MDSFT_CYCLETYPE) -#define G_PM_NPRIMITIVE (gI_(0b0) << G_MDSFT_PIPELINE) -#define G_PM_1PRIMITIVE (gI_(0b1) << G_MDSFT_PIPELINE) - -/* color conversion constants */ -#define G_CV_K0 (175) -#define G_CV_K1 (-43) -#define G_CV_K2 (-89) -#define G_CV_K3 (222) -#define G_CV_K4 (114) -#define G_CV_K5 (42) - -/* color combiner */ -#define G_CCMUX_COMBINED 0 -#define G_CCMUX_TEXEL0 1 -#define G_CCMUX_TEXEL1 2 -#define G_CCMUX_PRIMITIVE 3 -#define G_CCMUX_SHADE 4 -#define G_CCMUX_ENVIRONMENT 5 -#define G_CCMUX_1 6 -#define G_CCMUX_NOISE 7 -#define G_CCMUX_0 31 -#define G_CCMUX_CENTER 6 -#define G_CCMUX_K4 7 -#define G_CCMUX_SCALE 6 -#define G_CCMUX_COMBINED_ALPHA 7 -#define G_CCMUX_TEXEL0_ALPHA 8 -#define G_CCMUX_TEXEL1_ALPHA 9 -#define G_CCMUX_PRIMITIVE_ALPHA 10 -#define G_CCMUX_SHADE_ALPHA 11 -#define G_CCMUX_ENV_ALPHA 12 -#define G_CCMUX_LOD_FRACTION 13 -#define G_CCMUX_PRIM_LOD_FRAC 14 -#define G_CCMUX_K5 15 -#define G_ACMUX_COMBINED 0 -#define G_ACMUX_TEXEL0 1 -#define G_ACMUX_TEXEL1 2 -#define G_ACMUX_PRIMITIVE 3 -#define G_ACMUX_SHADE 4 -#define G_ACMUX_ENVIRONMENT 5 -#define G_ACMUX_1 6 -#define G_ACMUX_0 7 -#define G_ACMUX_LOD_FRACTION 0 -#define G_ACMUX_PRIM_LOD_FRAC 6 - -/* - * combine modes - * ( A - B ) * C + D -*/ -#define G_CC_MODULATEI \ - TEXEL0, 0, SHADE, 0, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEIA \ - TEXEL0, 0, SHADE, 0, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_MODULATEIDECALA \ - TEXEL0, 0, SHADE, 0, \ - 0, 0, 0, TEXEL0 -#define G_CC_MODULATERGB \ - G_CC_MODULATEI -#define G_CC_MODULATERGBA \ - G_CC_MODULATEIA -#define G_CC_MODULATERGBDECALA \ - G_CC_MODULATEIDECALA -#define G_CC_MODULATEI_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - 0, 0, 0, PRIMITIVE -#define G_CC_MODULATEIA_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - TEXEL0, 0, PRIMITIVE, 0 -#define G_CC_MODULATEIDECALA_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - 0, 0, 0, TEXEL0 -#define G_CC_MODULATERGB_PRIM \ - G_CC_MODULATEI_PRIM -#define G_CC_MODULATERGBA_PRIM \ - G_CC_MODULATEIA_PRIM -#define G_CC_MODULATERGBDECALA_PRIM \ - G_CC_MODULATEIDECALA_PRIM -#define G_CC_DECALRGB \ - 0, 0, 0, TEXEL0, \ - 0, 0, 0, SHADE -#define G_CC_DECALRGBA \ - 0, 0, 0, TEXEL0, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDI \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDIA \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_BLENDIDECALA \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDRGBA \ - TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDRGBDECALA \ - TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_REFLECTRGB \ - ENVIRONMENT, 0, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_REFLECTRGBDECALA \ - ENVIRONMENT, 0, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_HILITERGB \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_HILITERGBA \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - PRIMITIVE, SHADE, TEXEL0, SHADE -#define G_CC_HILITERGBDECALA \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_1CYUV2RGB \ - TEXEL0, K4, K5, TEXEL0, \ - 0, 0, 0, SHADE -#define G_CC_PRIMITIVE \ - 0, 0, 0, PRIMITIVE, \ - 0, 0, 0, PRIMITIVE -#define G_CC_SHADE \ - 0, 0, 0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_ADDRGB \ - 1, 0, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_ADDRGBDECALA \ - 1, 0, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_SHADEDECALA \ - 0, 0, 0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDPE \ - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_BLENDPEDECALA \ - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, \ - 0, 0, 0, TEXEL0 -#define G_CC_TRILERP \ - TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0, \ - TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0 -#define G_CC_TEMPLERP \ - TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, \ - TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0 -#define G_CC_INTERFERENCE \ - TEXEL0, 0, TEXEL1, 0, \ - TEXEL0, 0, TEXEL1, 0 -#define _G_CC_BLENDPE \ - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, \ - TEXEL0, 0, SHADE, 0 -#define _G_CC_BLENDPEDECALA \ - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, \ - 0, 0, 0, TEXEL0 -#define _G_CC_SPARSEST \ - PRIMITIVE, TEXEL0, LOD_FRACTION, TEXEL0, \ - PRIMITIVE, TEXEL0, LOD_FRACTION, TEXEL0 -#define _G_CC_TWOCOLORTEX \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEI2 \ - COMBINED, 0, SHADE, 0, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEIA2 \ - COMBINED, 0, SHADE, 0, \ - COMBINED, 0, SHADE, 0 -#define G_CC_MODULATERGB2 \ - G_CC_MODULATEI2 -#define G_CC_MODULATERGBA2 \ - G_CC_MODULATEIA2 -#define G_CC_MODULATEI_PRIM2 \ - COMBINED, 0, PRIMITIVE, 0, \ - 0, 0, 0, PRIMITIVE -#define G_CC_MODULATEIA_PRIM2 \ - COMBINED, 0, PRIMITIVE, 0, \ - COMBINED, 0, PRIMITIVE, 0 -#define G_CC_MODULATERGB_PRIM2 \ - G_CC_MODULATEI_PRIM2 -#define G_CC_MODULATERGBA_PRIM2 \ - G_CC_MODULATEIA_PRIM2 -#define G_CC_DECALRGB2 \ - 0, 0, 0, COMBINED, \ - 0, 0, 0, SHADE -#define G_CC_BLENDI2 \ - ENVIRONMENT, SHADE, COMBINED, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDIA2 \ - ENVIRONMENT, SHADE, COMBINED, SHADE, \ - COMBINED, 0, SHADE, 0 -#define G_CC_HILITERGB2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, SHADE -#define G_CC_HILITERGBA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED -#define G_CC_HILITERGBDECALA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, TEXEL0 -#define G_CC_HILITERGBPASSA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, COMBINED -#define G_CC_CHROMA_KEY2 \ - TEXEL0, CENTER, SCALE, 0, \ - 0, 0, 0, 0 -#define G_CC_YUV2RGB \ - TEXEL1, K4, K5, TEXEL1, \ - 0, 0, 0, 0 -#define G_CC_PASS2 \ - 0, 0, 0, COMBINED, \ - 0, 0, 0, COMBINED -#define G_CC_LERP(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ - ( \ - gFL_(G_CCMUX_##a0, 4, 52) | \ - gFL_(G_CCMUX_##c0, 5, 47) | \ - gFL_(G_ACMUX_##Aa0, 3, 44) | \ - gFL_(G_ACMUX_##Ac0, 3, 41) | \ - gFL_(G_CCMUX_##a1, 4, 37) | \ - gFL_(G_CCMUX_##c1, 5, 32) | \ - gFL_(G_CCMUX_##b0, 4, 28) | \ - gFL_(G_CCMUX_##b1, 4, 24) | \ - gFL_(G_ACMUX_##Aa1, 3, 21) | \ - gFL_(G_ACMUX_##Ac1, 3, 18) | \ - gFL_(G_CCMUX_##d0, 3, 15) | \ - gFL_(G_ACMUX_##Ab0, 3, 12) | \ - gFL_(G_ACMUX_##Ad0, 3, 9) | \ - gFL_(G_CCMUX_##d1, 3, 6) | \ - gFL_(G_ACMUX_##Ab1, 3, 3) | \ - gFL_(G_ACMUX_##Ad1, 3, 0) \ - ) -#define G_CC_MODE(mode1, mode2) G_CC_LERP(mode1, mode2) - -/* scissor modes */ -#define G_SC_NON_INTERLACE gI_(0b00) -#define G_SC_EVEN_INTERLACE gI_(0b10) -#define G_SC_ODD_INTERLACE gI_(0b11) - -/* display list branch flags */ -#define G_DL_PUSH gI_(0b0) -#define G_DL_NOPUSH gI_(0b1) - -/* conditional branching flags (f3dex and f3dex2) */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_BZ_PERSP 0 -# define G_BZ_ORTHO 1 -#endif - -/* matrix params */ -#define G_MTX_MUL (gI_(0b0) << 1) -#define G_MTX_LOAD (gI_(0b1) << 1) - -/* matrix params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MTX_MODELVIEW (gI_(0b0) << 0) -# define G_MTX_PROJECTION (gI_(0b1) << 0) -# define G_MTX_NOPUSH (gI_(0b0) << 2) -# define G_MTX_PUSH (gI_(0b1) << 2) -#endif - -/* matrix params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MTX_NOPUSH (gI_(0b0) << 0) -# define G_MTX_PUSH (gI_(0b1) << 0) -# define G_MTX_MODELVIEW (gI_(0b0) << 2) -# define G_MTX_PROJECTION (gI_(0b1) << 2) -#endif - -/* moveword indices */ -#define G_MW_MATRIX 0 -#define G_MW_NUMLIGHT 2 -#define G_MW_CLIP 4 -#define G_MW_SEGMENT 6 -#define G_MW_FOG 8 -#define G_MW_GENSTAT 8 -#define G_MW_LIGHTCOL 10 -#define G_MW_PERSPNORM 14 - -/* moveword indices for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MW_POINTS 12 -#endif - -/* moveword indices for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MW_FORCEMTX 12 -#endif - -/* moveword offsets */ -#define G_MWO_NUMLIGHT gI_(0x00) -#define G_MWO_CLIP_RNX gI_(0x04) -#define G_MWO_CLIP_RNY gI_(0x0C) -#define G_MWO_CLIP_RPX gI_(0x14) -#define G_MWO_CLIP_RPY gI_(0x1C) -#define G_MWO_SEGMENT_0 gI_(0x00) -#define G_MWO_SEGMENT_1 gI_(0x04) -#define G_MWO_SEGMENT_2 gI_(0x08) -#define G_MWO_SEGMENT_3 gI_(0x0C) -#define G_MWO_SEGMENT_4 gI_(0x10) -#define G_MWO_SEGMENT_5 gI_(0x14) -#define G_MWO_SEGMENT_6 gI_(0x18) -#define G_MWO_SEGMENT_7 gI_(0x1C) -#define G_MWO_SEGMENT_8 gI_(0x20) -#define G_MWO_SEGMENT_9 gI_(0x24) -#define G_MWO_SEGMENT_A gI_(0x28) -#define G_MWO_SEGMENT_B gI_(0x2C) -#define G_MWO_SEGMENT_C gI_(0x30) -#define G_MWO_SEGMENT_D gI_(0x34) -#define G_MWO_SEGMENT_E gI_(0x38) -#define G_MWO_SEGMENT_F gI_(0x3C) -#define G_MWO_FOG gI_(0x00) -#define G_MWO_aLIGHT_1 gI_(0x00) -#define G_MWO_bLIGHT_1 gI_(0x04) -#define G_MWO_MATRIX_XX_XY_I gI_(0x00) -#define G_MWO_MATRIX_XZ_XW_I gI_(0x04) -#define G_MWO_MATRIX_YX_YY_I gI_(0x08) -#define G_MWO_MATRIX_YZ_YW_I gI_(0x0C) -#define G_MWO_MATRIX_ZX_ZY_I gI_(0x10) -#define G_MWO_MATRIX_ZZ_ZW_I gI_(0x14) -#define G_MWO_MATRIX_WX_WY_I gI_(0x18) -#define G_MWO_MATRIX_WZ_WW_I gI_(0x1C) -#define G_MWO_MATRIX_XX_XY_F gI_(0x20) -#define G_MWO_MATRIX_XZ_XW_F gI_(0x24) -#define G_MWO_MATRIX_YX_YY_F gI_(0x28) -#define G_MWO_MATRIX_YZ_YW_F gI_(0x2C) -#define G_MWO_MATRIX_ZX_ZY_F gI_(0x30) -#define G_MWO_MATRIX_ZZ_ZW_F gI_(0x34) -#define G_MWO_MATRIX_WX_WY_F gI_(0x38) -#define G_MWO_MATRIX_WZ_WW_F gI_(0x3C) -#define G_MWO_POINT_RGBA gI_(0x10) -#define G_MWO_POINT_ST gI_(0x14) -#define G_MWO_POINT_XYSCREEN gI_(0x18) -#define G_MWO_POINT_ZSCREEN gI_(0x1C) - -/* moveword offsets for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MWO_aLIGHT_2 gI_(0x20) -# define G_MWO_bLIGHT_2 gI_(0x24) -# define G_MWO_aLIGHT_3 gI_(0x40) -# define G_MWO_bLIGHT_3 gI_(0x44) -# define G_MWO_aLIGHT_4 gI_(0x60) -# define G_MWO_bLIGHT_4 gI_(0x64) -# define G_MWO_aLIGHT_5 gI_(0x80) -# define G_MWO_bLIGHT_5 gI_(0x84) -# define G_MWO_aLIGHT_6 gI_(0xA0) -# define G_MWO_bLIGHT_6 gI_(0xA4) -# define G_MWO_aLIGHT_7 gI_(0xC0) -# define G_MWO_bLIGHT_7 gI_(0xC4) -# define G_MWO_aLIGHT_8 gI_(0xE0) -# define G_MWO_bLIGHT_8 gI_(0xE4) -#endif - -/* moveword offsets for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MWO_aLIGHT_2 gI_(0x18) -# define G_MWO_bLIGHT_2 gI_(0x1C) -# define G_MWO_aLIGHT_3 gI_(0x30) -# define G_MWO_bLIGHT_3 gI_(0x34) -# define G_MWO_aLIGHT_4 gI_(0x48) -# define G_MWO_bLIGHT_4 gI_(0x4C) -# define G_MWO_aLIGHT_5 gI_(0x60) -# define G_MWO_bLIGHT_5 gI_(0x64) -# define G_MWO_aLIGHT_6 gI_(0x78) -# define G_MWO_bLIGHT_6 gI_(0x7C) -# define G_MWO_aLIGHT_7 gI_(0x90) -# define G_MWO_bLIGHT_7 gI_(0x94) -# define G_MWO_aLIGHT_8 gI_(0xA8) -# define G_MWO_bLIGHT_8 gI_(0xAC) -#endif - -/* movemem params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MV_VIEWPORT 128 -# define G_MV_LOOKATY 130 -# define G_MV_LOOKATX 132 -# define G_MV_L0 134 -# define G_MV_L1 136 -# define G_MV_L2 138 -# define G_MV_L3 140 -# define G_MV_L4 142 -# define G_MV_L5 144 -# define G_MV_L6 146 -# define G_MV_L7 148 -# define G_MV_TXTATT 150 -# define G_MV_MATRIX_2 152 -# define G_MV_MATRIX_3 154 -# define G_MV_MATRIX_4 156 -# define G_MV_MATRIX_1 158 -#endif - -/* movemem params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MV_MMTX 2 -# define G_MV_PMTX 6 -# define G_MV_VIEWPORT 8 -# define G_MV_LIGHT 10 -# define G_MV_POINT 12 -# define G_MV_MATRIX 14 -# define G_MVO_LOOKATX gI_(0 * 0x18) -# define G_MVO_LOOKATY gI_(1 * 0x18) -# define G_MVO_L0 gI_(2 * 0x18) -# define G_MVO_L1 gI_(3 * 0x18) -# define G_MVO_L2 gI_(4 * 0x18) -# define G_MVO_L3 gI_(5 * 0x18) -# define G_MVO_L4 gI_(6 * 0x18) -# define G_MVO_L5 gI_(7 * 0x18) -# define G_MVO_L6 gI_(8 * 0x18) -# define G_MVO_L7 gI_(9 * 0x18) -#endif - -/* frustum ratios */ -#define FRUSTRATIO_1 gI_(1) -#define FRUSTRATIO_2 gI_(2) -#define FRUSTRATIO_3 gI_(3) -#define FRUSTRATIO_4 gI_(4) -#define FRUSTRATIO_5 gI_(5) -#define FRUSTRATIO_6 gI_(6) - -/* light params */ -#define NUMLIGHTS_0 1 -#define NUMLIGHTS_1 1 -#define NUMLIGHTS_2 2 -#define NUMLIGHTS_3 3 -#define NUMLIGHTS_4 4 -#define NUMLIGHTS_5 5 -#define NUMLIGHTS_6 6 -#define NUMLIGHTS_7 7 -#define LIGHT_1 1 -#define LIGHT_2 2 -#define LIGHT_3 3 -#define LIGHT_4 4 -#define LIGHT_5 5 -#define LIGHT_6 6 -#define LIGHT_7 7 -#define LIGHT_8 8 - -/* light params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define NUML(n) (((n) + 1) * 32 + 0x80000000) -#endif - -/* light params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define NUML(n) ((n) * 0x18) -#endif - -/* background load types */ -#define G_BGLT_LOADBLOCK gI_(0x0033) -#define G_BGLT_LOADTILE gI_(0xFFF4) - -/* background flags */ -#define G_BG_FLAG_FLIPS (gI_(0b1) << 0) -#define G_BG_FLAG_FLIPT (gI_(0b1) << 1) - -/* object load types */ -#define G_OBJLT_TXTRBLOCK gI_(0x00001033) -#define G_OBJLT_TXTRTILE gI_(0x00FC1034) -#define G_OBJLT_TLUT gI_(0x00000030) - -/* object flags */ -#define G_OBJ_FLAG_FLIPS (gI_(0b1) << 0) -#define G_OBJ_FLAG_FLIPT (gI_(0b1) << 4) - -/* color macros */ -#define G_MAXZ 0x03FF -#define G_MAXFBZ 0x3FFF -#define GPACK_RGBA5551(r, g, b, a) \ - ( \ - gF_(r, 5, 11) | \ - gF_(g, 5, 6) | \ - gF_(b, 5, 1) | \ - gF_(a, 1, 0) \ - ) -#define GPACK_RGBA8888(r, g, b, a) \ - ( \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0) \ - ) -#define GPACK_RGB24A8(rgb, a) (gF_(rgb, 24, 8) | gF_(a, 8, 0)) -#define GPACK_ZDZ(z, dz) (gF_(z, 14, 2) | gF_(dz, 2, 0)) - -/* structure definition macros */ -#define gdSPDefMtx(xx, xy, xz, xw, \ - yx, yy, yz, yw, \ - zx, zy, zz, zw, \ - wx, wy, wz, ww) \ - ( \ - (Mtx) \ - { \ - .i = \ - { \ - (qs1616(xx) >> 16) & 0xFFFF, \ - (qs1616(xy) >> 16) & 0xFFFF, \ - (qs1616(xz) >> 16) & 0xFFFF, \ - (qs1616(xw) >> 16) & 0xFFFF, \ - (qs1616(yx) >> 16) & 0xFFFF, \ - (qs1616(yy) >> 16) & 0xFFFF, \ - (qs1616(yz) >> 16) & 0xFFFF, \ - (qs1616(yw) >> 16) & 0xFFFF, \ - (qs1616(zx) >> 16) & 0xFFFF, \ - (qs1616(zy) >> 16) & 0xFFFF, \ - (qs1616(zz) >> 16) & 0xFFFF, \ - (qs1616(zw) >> 16) & 0xFFFF, \ - (qs1616(wx) >> 16) & 0xFFFF, \ - (qs1616(wy) >> 16) & 0xFFFF, \ - (qs1616(wz) >> 16) & 0xFFFF, \ - (qs1616(ww) >> 16) & 0xFFFF, \ - }, \ - .f = \ - { \ - qs1616(xx) & 0xFFFF, \ - qs1616(xy) & 0xFFFF, \ - qs1616(xz) & 0xFFFF, \ - qs1616(xw) & 0xFFFF, \ - qs1616(yx) & 0xFFFF, \ - qs1616(yy) & 0xFFFF, \ - qs1616(yz) & 0xFFFF, \ - qs1616(yw) & 0xFFFF, \ - qs1616(zx) & 0xFFFF, \ - qs1616(zy) & 0xFFFF, \ - qs1616(zz) & 0xFFFF, \ - qs1616(zw) & 0xFFFF, \ - qs1616(wx) & 0xFFFF, \ - qs1616(wy) & 0xFFFF, \ - qs1616(wz) & 0xFFFF, \ - qs1616(ww) & 0xFFFF, \ - } \ - } \ - ) -#define gdSPDefLookAt(rx, ry, rz, ux, uy, uz) \ - ( \ - (LookAt) \ - { \ - .l[0].l = \ - { \ - .col = {0, 0, 0}, \ - .colc = {0, 0, 0}, \ - .dir = {rx, ry, rz}, \ - }, \ - .l[1].l = \ - { \ - .col = {0, 0x80, 0}, \ - .colc = {0, 0x80, 0}, \ - .dir = {ux, uy, uz}, \ - }, \ - } \ - ) -#define gdSPDefLights0(ar, ag, ab) \ - ( \ - (Lights0) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - } \ - } \ - ) -#define gdSPDefLights1(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1) \ - ( \ - (Lights1) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - } \ - ) -#define gdSPDefLights2(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2) \ - ( \ - (Lights2) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - } \ - ) -#define gdSPDefLights3(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3) \ - ( \ - (Lights3) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - } \ - ) -#define gdSPDefLights4(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4) \ - ( \ - (Lights4) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - } \ - ) -#define gdSPDefLights5(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5) \ - ( \ - (Lights5) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - } \ - ) -#define gdSPDefLights6(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5, \ - r6, g6, b6, x6, y6, z6)\ - ( \ - (Lights6) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - .l[5].l = \ - { \ - .col = {r6, g6, b6}, \ - .colc = {r6, g6, b6}, \ - .dir = {x6, y6, z6}, \ - } \ - } \ - ) -#define gdSPDefLights7(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5, \ - r6, g6, b6, x6, y6, z6, \ - r7, g7, b7, x7, y7, z7) \ - ( \ - (Lights7) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - .l[5].l = \ - { \ - .col = {r6, g6, b6}, \ - .colc = {r6, g6, b6}, \ - .dir = {x6, y6, z6}, \ - } \ - .l[6].l = \ - { \ - .col = {r7, g7, b7}, \ - .colc = {r7, g7, b7}, \ - .dir = {x7, y7, z7}, \ - } \ - } \ - ) -#define gdSPDefVtx(x, y, z, s, t) \ - ( \ - (Vtx) \ - { \ - .v = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - } \ - } \ - ) -#define gdSPDefVtxC(x, y, z, s, t, cr, cg, cb, ca) \ - ( \ - (Vtx) \ - { \ - .v = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - .cn = {cr, cg, cb, ca}, \ - } \ - } \ - ) -#define gdSPDefVtxN(x, y, z, s, t, nx, ny, nz, ca) \ - ( \ - (Vtx) \ - { \ - .n = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - .n = {nx, ny, nz}, \ - .a = ca \ - } \ - } \ - ) - -/* instruction macros */ - -#define gsDPFillRectangle(ulx, uly, lrx, lry) \ - gO_( \ - G_FILLRECT, \ - gF_(lrx, 10, 14) | \ - gF_(lry, 10, 2), \ - gF_(ulx, 10, 14) | \ - gF_(uly, 10, 2)) - -#define gsDPScisFillRectangle(ulx, uly, lrx, lry) \ - gsDPFillRectangle(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry)) - -#define gsDPFullSync() \ - gO_(G_RDPFULLSYNC, 0, 0) - -#define gsDPLoadSync() \ - gO_(G_RDPLOADSYNC, 0, 0) - -#define gsDPTileSync() \ - gO_(G_RDPTILESYNC, 0, 0) - -#define gsDPPipeSync() \ - gO_(G_RDPPIPESYNC, 0, 0) - -#define gsDPLoadTLUT_pal16(pal, dram) \ - gsDPLoadTLUT(16, 256 + (gI_(pal) & 0xF) * 16, dram) - -#define gsDPLoadTLUT_pal256(dram) \ - gsDPLoadTLUT(256, 256, dram) - -#define gLTB_(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - dxt, tmem, rt, line) \ - gsDPSetTextureImage(fmt, G_SIZ_LDSIZ(siz), 1, timg), \ - gsDPSetTile( \ - fmt, G_SIZ_LDSIZ(siz), 0, tmem, G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadBlock( \ - G_TX_LOADTILE, 0, 0, \ - G_LTB_LRS(width, height, siz), \ - dxt), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, siz, line, tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize(rt, 0, 0, qu102((width) - 1), qu102((height) - 1)) - -#define gsDPLoadTextureBlock(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), 0x0, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureBlockS(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureBlock_4b(timg, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), 0x0, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadTextureBlock_4bS(timg, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadTextureBlockYuv(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), 0x0, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define gsDPLoadTextureBlockYuvS(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define _gsDPLoadTextureBlock(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureBlockS(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureBlock_4b(timg, tmem, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), tmem, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define _gsDPLoadTextureBlock_4bS(timg, tmem, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define _gsDPLoadTextureBlockYuv(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define _gsDPLoadTextureBlockYuvS(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define gsDPLoadMultiBlock(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, rt, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiBlockS(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiBlock_4b(timg, tmem, rt, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), tmem, rt, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadMultiBlock_4bS(timg, tmem, rt, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadMultiBlockYuv(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, rt, \ - ((width) + 7) / 8) - -#define gsDPLoadMultiBlockYuvS(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) + 7) / 8) - -#define gLTT_(timg, fmt, siz, width, height, uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, line) \ - gsDPSetTextureImage(fmt, siz, width, timg), \ - gsDPSetTile( \ - fmt, siz, line, tmem, \ - G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadTile( \ - G_TX_LOADTILE, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, siz, line, \ - tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize( \ - rt, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)) - -#define gLTT4_(timg, fmt, width, height, uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt) \ - gsDPSetTextureImage(fmt, G_IM_SIZ_8b, (width) / 2, timg), \ - gsDPSetTile( \ - fmt, G_IM_SIZ_8b, \ - (((lrs) - (uls) + 1) / 2 + 7) / 8, \ - tmem, G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadTile( \ - G_TX_LOADTILE, \ - qu102(uls) / 2, qu102(ult), \ - qu102(lrs) / 2, qu102(lrt)), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, G_IM_SIZ_4b, \ - (((lrs) - (uls) + 1) / 2 + 7) / 8, \ - tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize( \ - rt, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)) - -#define gsDPLoadTextureTile(timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureTile_4b(timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE) - -#define gsDPLoadTextureTileYuv(timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define _gsDPLoadTextureTile(timg, tmem, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureTile_4b(timg, tmem, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE) - -#define _gsDPLoadTextureTileYuv(timg, tmem, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, cms, cmt, \ - masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define gsDPLoadMultiTile(timg, tmem, rt, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiTile_4b(timg, tmem, rt, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt) - -#define gsDPLoadMultiTileYuv(timg, tmem, rt, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define gsDPLoadBlock(tile, uls, ult, lrs, dxt) \ - gO_( \ - G_LOADBLOCK, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(G_LDBLK_TXL(lrs), 12, 12) | \ - gF_(dxt, 12, 0)) - -#define gsDPNoOp() \ - gsDPNoOpTag(0) - -#define gsDPNoOpTag(tag) \ - gO_(G_NOOP, 0, tag) - -#define gsDPPipelineMode(mode) \ - gsSPSetOtherModeHi(G_MDSFT_PIPELINE, G_MDSIZ_PIPELINE, mode) - -#define gsDPSetBlendColor(r, g, b, a) \ - gO_( \ - G_SETBLENDCOLOR, \ - 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetEnvColor(r, g, b, a) \ - gO_( \ - G_SETENVCOLOR, \ - 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetFillColor(c) \ - gO_(G_SETFILLCOLOR, 0, c) - -#define gsDPSetFogColor(r, g, b, a) \ - gO_( \ - G_SETFOGCOLOR, 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetPrimColor(m, l, r, g, b, a) \ - gO_( \ - G_SETPRIMCOLOR, \ - gF_(m, 8, 8) | \ - gF_(l, 8, 0), \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetColorImage(fmt, siz, width, img) \ - gO_( \ - G_SETCIMG, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_((width) - 1, 12, 0), \ - img) - -#define gsDPSetDepthImage(img) \ - gO_(G_SETZIMG, 0, img) - -#define gsDPSetTextureImage(fmt, siz, width, img) \ - gO_( \ - G_SETTIMG, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_((width) - 1, 12, 0), \ - img) - -#define gsDPSetHilite1Tile(tile, hilite, width, height) \ - gsDPSetTileSize( \ - tile, \ - ((Hilite *)(hilite))->h.x1 & 0xFFF, \ - ((Hilite *)(hilite))->h.y1 & 0xFFF, \ - (((width) - 1) * 4 + ((Hilite *)(hilite))->h.x1) & 0xFFF, \ - (((height) - 1) * 4 + ((Hilite *)(hilite))->h.y1) & 0xFFF) - -#define gsDPSetHilite2Tile(tile, hilite, width, height) \ - gsDPSetTileSize( \ - tile, \ - ((Hilite *)(hilite))->h.x2 & 0xFFF, \ - ((Hilite *)(hilite))->h.y2 & 0xFFF, \ - (((width) - 1) * 4 + ((Hilite *)(hilite))->h.x2) & 0xFFF, \ - (((height) - 1) * 4 + ((Hilite *)(hilite))->h.y2) & 0xFFF) - -#define gsDPSetAlphaCompare(mode) \ - gsSPSetOtherModeLo(G_MDSFT_ALPHACOMPARE, G_MDSIZ_ALPHACOMPARE, mode) - -#define gsDPSetAlphaDither(type) \ - gsSPSetOtherModeHi(G_MDSFT_ALPHADITHER, G_MDSIZ_ALPHADITHER, type) - -#define gsDPSetColorDither(type) \ - gsSPSetOtherModeHi(G_MDSFT_RGBDITHER, G_MDSIZ_RGBDITHER, type) - -#define gsDPSetCombineMode(mode1, mode2) \ - gsDPSetCombineLERP(mode1, mode2) - -#define gsDPSetCombineLERP(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ - gO_( \ - G_SETCOMBINE, \ - gF_(G_CCMUX_##a0, 4, 20) | \ - gF_(G_CCMUX_##c0, 5, 15) | \ - gF_(G_ACMUX_##Aa0, 3, 12) | \ - gF_(G_ACMUX_##Ac0, 3, 9) | \ - gF_(G_CCMUX_##a1, 4, 5) | \ - gF_(G_CCMUX_##c1, 5, 0), \ - gF_(G_CCMUX_##b0, 4, 28) | \ - gF_(G_CCMUX_##b1, 4, 24) | \ - gF_(G_ACMUX_##Aa1, 3, 21) | \ - gF_(G_ACMUX_##Ac1, 3, 18) | \ - gF_(G_CCMUX_##d0, 3, 15) | \ - gF_(G_ACMUX_##Ab0, 3, 12) | \ - gF_(G_ACMUX_##Ad0, 3, 9) | \ - gF_(G_CCMUX_##d1, 3, 6) | \ - gF_(G_ACMUX_##Ab1, 3, 3) | \ - gF_(G_ACMUX_##Ad1, 3, 0)) - -#define gsDPSetConvert(k0, k1, k2, k3, k4, k5) \ - gO_( \ - G_SETCONVERT, \ - gF_(k0, 9, 13) | \ - gF_(k1, 9, 4) | \ - gF_(gI_(k2) >> 5, 4, 0), \ - gF_(k2, 5, 27) | \ - gF_(k3, 9, 18) | \ - gF_(k4, 9, 9) | \ - gF_(k5, 9, 0)) - -#define gsDPSetTextureConvert(type) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTCONV, G_MDSIZ_TEXTCONV, type) - -#define gsDPSetCycleType(type) \ - gsSPSetOtherModeHi(G_MDSFT_CYCLETYPE, G_MDSIZ_CYCLETYPE, type) - -#define gsDPSetDepthSource(source) \ - gsSPSetOtherModeLo(G_MDSFT_ZSRCSEL, G_MDSIZ_ZSRCSEL, source) - -#define gsDPSetCombineKey(type) \ - gsSPSetOtherModeHi(G_MDSFT_COMBKEY, G_MDSIZ_COMBKEY, type) - -#define gsDPSetKeyGB(cG, sG, wG, cB, sB, wB) \ - gO_( \ - G_SETKEYGB, \ - gF_(wG, 12, 12) | \ - gF_(wB, 12, 0), \ - gF_(cG, 8, 24) | \ - gF_(sG, 8, 16) | \ - gF_(cB, 8, 8) | \ - gF_(sB, 8, 0)) - -#define gsDPSetKeyR(cR, sR, wR) \ - gO_( \ - G_SETKEYR, 0, \ - gF_(wR, 12, 16) | \ - gF_(cR, 8, 8) | \ - gF_(sR, 8, 0)) - -#define gsDPSetPrimDepth(z, dz) \ - gO_( \ - G_SETPRIMDEPTH, \ - 0, \ - gF_(z, 16, 16) | \ - gF_(dz, 16, 0)) - -#define gsDPSetRenderMode(mode1, mode2) \ - gsSPSetOtherModeLo( \ - G_MDSFT_RENDERMODE, \ - G_MDSIZ_RENDERMODE, \ - gI_(mode1) | \ - gI_(mode2)) - -#define gsDPSetScissor(mode, ulx, uly, lrx, lry) \ - gsDPSetScissorFrac( \ - mode, \ - qu102(gI_(ulx)), \ - qu102(gI_(uly)), \ - qu102(gI_(lrx)), \ - qu102(gI_(lry))) - -#define gsDPSetScissorFrac(mode, ulx, uly, lrx, lry) \ - gO_( \ - G_SETSCISSOR, \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0), \ - gF_(mode, 2, 24) | \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0)) - -#define gsDPSetTextureDetail(type) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTDETAIL, G_MDSIZ_TEXTDETAIL, type) - -#define gsDPSetTextureFilter(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTFILT, G_MDSIZ_TEXTFILT, mode) - -#define gsDPSetTextureLOD(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTLOD, G_MDSIZ_TEXTLOD, mode) - -#define gsDPSetTextureLUT(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTLUT, G_MDSIZ_TEXTLUT, mode) - -#define gsDPSetTexturePersp(enable) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTPERSP, G_MDSIZ_TEXTPERSP, enable) - -#define gsDPSetTile(fmt, siz, line, tmem, tile, palette, \ - cmt, maskt, shiftt, cms, masks, shifts) \ - gO_( \ - G_SETTILE, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_(line, 9, 9) | \ - gF_(tmem, 9, 0), \ - gF_(tile, 3, 24) | \ - gF_(palette, 4, 20) | \ - gF_(cmt, 2, 18) | \ - gF_(maskt, 4, 14) | \ - gF_(shiftt, 4, 10) | \ - gF_(cms, 2, 8) | \ - gF_(masks, 4, 4) | \ - gF_(shifts, 4, 0)) - -#define gsDPSetTileSize(tile, uls, ult, lrs, lrt) \ - gO_( \ - G_SETTILESIZE, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(lrs, 12, 12) | \ - gF_(lrt, 12, 0)) - -#define gsSPBranchList(dl) \ - gsDisplayList(dl, 1) - -#define gsSPClipRatio(r) \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RNX, (uint16_t)(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RNY, (uint16_t)(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RPX, (uint16_t)-(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RPY, (uint16_t)-(r)) - -#define gsSPDisplayList(dl) \ - gsDisplayList(dl, 0) - -#define gsSPEndDisplayList() \ - gO_(G_ENDDL, 0, 0) - -#define gsSPFogFactor(fm, fo) \ - gsMoveWd( \ - G_MW_FOG, \ - G_MWO_FOG, \ - gF_(fm, 16, 16) | \ - gF_(fo, 16, 0)) - -#define gsSPFogPosition(min, max) \ - gsSPFogFactor( \ - (500 * 0x100) / ((max) - (min)), \ - (500 - (min)) * 0x100 / ((max) - (min))) - -#define gsSPLine3D(v0, v1, flag) \ - gsSPLineW3D(v0, v1, 0, flag) - -#define gsSPLookAt(l) \ - gsSPLookAtX(l), \ - gsSPLookAtY(gI_(l) + 0x10) - -#define gsSPSegment(seg, base) \ - gsMoveWd(G_MW_SEGMENT, (seg) * 4, base) - -#define gsSPSetLights0(lites) \ - gsSPNumLights(NUMLIGHTS_0), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).a, 2) - -#define gsSPSetLights1(lites) \ - gsSPNumLights(NUMLIGHTS_1), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).a, 2) - -#define gsSPSetLights2(lites) \ - gsSPNumLights(NUMLIGHTS_2), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).a, 3) - -#define gsSPSetLights3(lites) \ - gsSPNumLights(NUMLIGHTS_3), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).a, 4) - -#define gsSPSetLights4(lites) \ - gsSPNumLights(NUMLIGHTS_4), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).a, 5) - -#define gsSPSetLights5(lites) \ - gsSPNumLights(NUMLIGHTS_5), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).a, 6) - -#define gsSPSetLights6(lites) \ - gsSPNumLights(NUMLIGHTS_6), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).l[5], 6), \ - gsSPLight(&(lites).a, 7) - -#define gsSPSetLights7(lites) \ - gsSPNumLights(NUMLIGHTS_7), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).l[5], 6), \ - gsSPLight(&(lites).l[6], 7), \ - gsSPLight(&(lites).a, 8) - -#define gsSPSetStatus(sid, val) \ - gsMoveWd(G_MW_GENSTAT, sid, val) - -#define gsSPNumLights(n) \ - gsMoveWd(G_MW_NUMLIGHT, G_MWO_NUMLIGHT, NUML(n)) - -#define gsSPLightColor(Lightnum, packedcolor) \ - gsMoveWd(G_MW_LIGHTCOL, G_MWO_a##Lightnum, packedcolor), \ - gsMoveWd(G_MW_LIGHTCOL, G_MWO_b##Lightnum, packedcolor) - -#define gsSPTextureRectangle(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRect(ulx, uly, lrx, lry, tile), \ - gsDPHalf1(gF_(s, 16, 16) | gF_(t, 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPScisTextureRectangle(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRect(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry), tile), \ - gsDPHalf1( \ - gF_(gScD_(s, ulx, dsdx), 16, 16) | \ - gF_(gScD_(t, uly, dtdy), 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPTextureRectangleFlip(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRectFlip(ulx, uly, lrx, lry, tile), \ - gsDPHalf1(gF_(s, 16, 16) | gF_(t, 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPScisTextureRectangleFlip( \ - ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRectFlip(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry), tile), \ - gsDPHalf1( \ - gF_(gScD_(s, ulx, dsdx), 16, 16) | \ - gF_(gScD_(t, uly, dtdy), 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPBgRectCopy(bg) \ - gO_(G_BG_COPY, 0, bg) - -#define gsSPBgRect1Cyc(bg) \ - gO_(G_BG_1CYC, 0, bg) - -#define gsSPObjRectangle(sp) \ - gO_(G_OBJ_RECTANGLE, 0, sp) - -#define gsSPObjRectangleR(sp) \ - gO_(G_OBJ_RECTANGLE_R, 0, sp) - -#define gsSPObjSprite(sp) \ - gO_(G_OBJ_SPRITE, 0, sp) - -#define gsSPObjMatrix(mtx) \ - gO_( \ - G_OBJ_MOVEMEM, \ - gF_(sizeof(uObjMtx) - 1, 8, 16), \ - mtx) - -#define gsSPObjSubMatrix(mtx) \ - gO_( \ - G_OBJ_MOVEMEM, \ - gF_(sizeof(uObjSubMtx) - 1, 8, 16) | \ - gF_(2, 16, 0), \ - mtx) - -#define gsSPObjRenderMode(mode) \ - gO_(G_OBJ_RENDERMODE, 0, mode) - -#define gsSPObjLoadTxtr(tx) \ - gO_(G_OBJ_LOADTXTR, 23, tx) - -#define gsSPObjLoadTxRect(txsp) \ - gO_(G_OBJ_LDTX_RECT, 47, txsp) - -#define gsSPObjLoadTxRectR(txsp) \ - gO_(G_OBJ_LDTX_RECT_R, 47, txsp) - -#define gsSPObjLoadTxSprite(txsp) \ - gO_(G_OBJ_LDTX_SPRITE, 47, txsp) - -#define gsSPSelectDL(ldl, sid, flag, mask) \ - gO_( \ - G_RDPHALF_0, \ - gF_(sid, 8, 16) | \ - gF_(ldl, 16, 0), \ - flag), \ - gO_( \ - G_SELECT_DL, \ - gF_(0x00, 8, 16) | \ - gF_(gI_(ldl) >> 16, 16, 0), \ - mask) - -#define gsSPSelectBranchDL(bdl, sid, flag, mask) \ - gO_( \ - G_RDPHALF_0, \ - gF_(sid, 8, 16) | \ - gF_(bdl, 16, 0), \ - flag), \ - gO_( \ - G_SELECT_DL, \ - gF_(0x01, 8, 16) | \ - gF_(gI_(bdl) >> 16, 16, 0), \ - mask) - -/* unlisted instructions */ - -#define gsDPLoadTLUTCmd(tile, count) \ - gO_( \ - G_LOADTLUT, \ - 0, \ - gF_(tile, 3, 24) | \ - gF_(count, 10, 14)) - -#define gsDPLoadTLUT(count, tmem, dram) \ - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram), \ - gsDPTileSync(), \ - gsDPSetTile(0, 0, 0, tmem, G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0), \ - gsDPLoadSync(), \ - gsDPLoadTLUTCmd(G_TX_LOADTILE, (count) - 1), \ - gsDPPipeSync() - -#define gsDisplayList(dl, branch) \ - gO_(G_DL, gF_(branch, 8, 16), dl) - -#define gsDPLoadTile(tile, uls, ult, lrs, lrt) \ - gO_( \ - G_LOADTILE, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(lrs, 12, 12) | \ - gF_(lrt, 12, 0)) - -#define gsDPSetCombine(c) \ - gO_( \ - G_SETCOMBINE, \ - (gL_(c) >> 32) & 0xFFFFFFFF, \ - (gL_(c) >> 0) & 0xFFFFFFFF) - -#define gsSPSetOtherModeLo(shift, length, data) \ - gsSPSetOtherMode(G_SETOTHERMODE_L, shift, length, data) - -#define gsSPSetOtherModeHi(shift, length, data) \ - gsSPSetOtherMode(G_SETOTHERMODE_H, shift, length, data) - -#define gsDPSetOtherMode(mode0, mode1) \ - gO_(G_RDPSETOTHERMODE, gF_(mode0, 24, 0), mode1) - -#define gsTexRect(ulx, uly, lrx, lry, tile) \ - gO_( \ - G_TEXRECT, \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0)) - -#define gsTexRectFlip(ulx, uly, lrx, lry, tile) \ - gO_( \ - G_TEXRECTFLIP, \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0)) - -#define gsSPNoOp() \ - gO_(G_SPNOOP, 0, 0) - -#define gsDPHalf1(wordhi) \ - gO_(G_RDPHALF_1, 0, wordhi) - -#define gsDPHalf2(wordlo) \ - gO_(G_RDPHALF_2, 0, wordlo) - -#define gsDPWord(wordhi, wordlo) \ - gsDPHalf1(wordhi), \ - gsDPHalf2(wordlo) - -/* instruction macros for fast3d */ - -#if defined(F3D_GBI) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - 0, \ - gF_(flag, 8, 24) | \ - gF_(gI_(v0) * 10, 8, 16) | \ - gF_(gI_(v1) * 10, 8, 8) | \ - gF_(gI_(v2) * 10, 8, 0)) - -# define gsSPCullDisplayList(v0, vn) \ - gO_( \ - G_CULLDL, \ - (gI_(v0) & 0xF) * 40, \ - gI_((vn) + 1) & 0xF) * 40) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - 0, \ - gF_(flag, 8, 24) | \ - gF_(gI_(v0) * 10, 8, 16) | \ - gF_(gI_(v1) * 10, 8, 8) | \ - gF_(wd, 8, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_((n) - 1, 4, 20) | \ - gF_(v0, 4, 16) | \ - gF_(sizeof(Vtx) * (n), 16, 0), \ - v) - -#endif - -/* instruction macros for fast3d and beta f3dex */ -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - -# define gsSPModifyVertex(vtx, where, val) \ - gsMoveWd(G_MW_POINTS, (vtx) * 40 + (where), val) - -#endif - -/* instruction macros for fast3d and f3dex */ - -#if defined(F3D_GBI) || defined(F3DEX_GBI) - -# define gsSPForceMatrix(mptr) \ - gsMoveMem(16, G_MV_MATRIX_1, (char *)(mptr)), \ - gsMoveMem(16, G_MV_MATRIX_2, (char *)(mptr) + 16), \ - gsMoveMem(16, G_MV_MATRIX_3, (char *)(mptr) + 32), \ - gsMoveMem(16, G_MV_MATRIX_4, (char *)(mptr) + 48) - -# define gsSPSetGeometryMode(mode) \ - gO_(G_SETGEOMETRYMODE, 0, gI_(mode)) - -# define gsSPClearGeometryMode(mode) \ - gO_(G_CLEARGEOMETRYMODE, 0, gI_(mode)) - -# define gsSPLoadGeometryMode(mode) \ - gsSPClearGeometryMode(~gI_(0)), \ - gsSPSetGeometryMode(mode) - -# define gsSPInsertMatrix(where, num) \ - gsMoveWd(G_MW_MATRIX, where, num) - -# define gsSPLookAtX(l) \ - gsMoveMem(sizeof(Light), G_MV_LOOKATX, l) - -# define gsSPLookAtY(l) \ - gsMoveMem(sizeof(Light), G_MV_LOOKATY, l) - -# define gsSPMatrix(matrix, param) \ - gO_( \ - G_MTX, \ - gF_(param, 8, 16) | \ - gF_(sizeof(Mtx), 16, 0), \ - matrix) - -# define gsSPPopMatrix(param) \ - gO_(G_POPMTX, 0, param) - -# define gsSPLight(l, n) \ - gsMoveMem(sizeof(Light), G_MV_L0 + ((n) - 1) * 2, l) - -# define gsSPTexture(sc, tc, level, tile, on) \ - gO_( \ - G_TEXTURE, \ - gF_(level, 3, 11) | \ - gF_(tile, 3, 8) | \ - gF_(on, 8, 0), \ - gF_(sc, 16, 16) | \ - gF_(tc, 16, 0)) - -# define gsSPViewport(v) \ - gsMoveMem(sizeof(Vp), G_MV_VIEWPORT, v) - -# define gsSPSetOtherMode(opc, shift, length, data) \ - gO_( \ - opc, \ - gF_(shift, 8, 8) | \ - gF_(length, 8, 0), \ - data) - -# define gsMoveWd(index, offset, data) \ - gO_( \ - G_MOVEWORD, \ - gF_(offset, 16, 8) | \ - gF_(index, 8, 0), \ - data) - -# define gsMoveMem(size, index, address) \ - gO_( \ - G_MOVEMEM, \ - gF_(index, 8, 16) | \ - gF_(size, 16, 0), \ - address) - -#endif - -/* instruction macros for f3dex */ - -#if defined(F3DEX_GBI) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - 0, \ - gF_(gV3_(v0, v1, v2, flag) * 2, 8, 16) | \ - gF_(gV3_(v1, v2, v0, flag) * 2, 8, 8) | \ - gF_(gV3_(v2, v0, v1, flag) * 2, 8, 0)) - -# define gsSP1Quadrangle(v0, v1, v2, v3, flag) \ - gO_( \ - G_TRI2, \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v1, v2, v3, v0, flag) * 2, 8, 8) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 0), \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 8) | \ - gF_(gV4_(v3, v0, v1, v2, flag) * 2, 8, 0)) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - 0, \ - gF_(gV2_(v0, v1, flag) * 2, 8, 16) | \ - gF_(gV2_(v1, v0, flag) * 2, 8, 8) | \ - gF_(wd, 8, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_((v0) * 2, 8, 16) | \ - gF_(n, 6, 10) | \ - gF_(sizeof(Vtx) * (n) - 1, 10, 0), \ - v) - -#endif - -/* instruction macros for f3dex and f3dex2 */ - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - -# define gsSP2Triangles(v00, v01, v02, flag0, v10, v11, v12, flag1) \ - gO_( \ - G_TRI2, \ - gF_(gV3_(v00, v01, v02, flag0) * 2, 8, 16) | \ - gF_(gV3_(v01, v02, v00, flag0) * 2, 8, 8) | \ - gF_(gV3_(v02, v00, v01, flag0) * 2, 8, 0), \ - gF_(gV3_(v10, v11, v12, flag1) * 2, 8, 16) | \ - gF_(gV3_(v11, v12, v10, flag1) * 2, 8, 8) | \ - gF_(gV3_(v12, v10, v11, flag1) * 2, 8, 0)) - -# define gsSPBranchLessZ(branchdl, vtx, zval, near, far, flag) \ - gsSPBranchLessZrg(branchdl, vtx, zval, near, far, flag, 0, G_MAXZ) - -# define gsSPBranchLessZrg(branchdl, vtx, zval, near, far, flag, zmin, zmax) \ - gsSPBranchLessZraw(branchdl, vtx, \ - G_DEPTOZSrg(zval, near, far, flag, zmin, zmax)) - -# define gsSPBranchLessZraw(branchdl, vtx, zval) \ - gsDPHalf1(branchdl), \ - gsBranchZ(vtx, zval) - -# define gsSPCullDisplayList(v0, vn) \ - gO_( \ - G_CULLDL, \ - gF_((v0) * 2, 16, 0), \ - gF_((vn) * 2, 16, 0)) - -# define gsSPLoadUcode(uc_start, uc_dstart) \ - gsSPLoadUcodeEx(uc_start, uc_dstart, 0x800) - -# define gsSPLoadUcodeL(ucode) \ - gsSPLoadUcode( \ - gI_(&ucode##TextStart) & 0x1FFFFFFF, \ - gI_(&ucode##DataStart) & 0x1FFFFFFF) - -# if !(defined(F3D_BETA) && defined(F3DEX_GBI)) -# define gsSPModifyVertex(vtx, where, val) \ - gO_( \ - G_MODIFYVTX, \ - gF_(where, 8, 16) | \ - gF_((vtx) * 2, 16, 0), \ - val) -# endif - -# define gsBranchZ(vtx, zval) \ - gO_( \ - G_BRANCH_Z, \ - gF_((vtx) * 5, 12, 12) | \ - gF_((vtx) * 2, 12, 0), \ - zval) - -# define gsLoadUcode(uc_start, uc_dsize) \ - gO_( \ - G_LOAD_UCODE, \ - gF_((uc_dsize) - 1, 16, 0), \ - uc_start) - -# define gsSPLoadUcodeEx(uc_start, uc_dstart, uc_dsize) \ - gsDPHalf1(uc_dstart), \ - gsLoadUcode(uc_start, uc_dsize) - -#endif - -/* instruction macros for f3dex2 */ - -#if defined(F3DEX_GBI_2) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - gF_(gV3_(v0, v1, v2, flag) * 2, 8, 16) | \ - gF_(gV3_(v1, v2, v0, flag) * 2, 8, 8) | \ - gF_(gV3_(v2, v0, v1, flag) * 2, 8, 0), \ - 0) - -# define gsSP1Quadrangle(v0, v1, v2, v3, flag) \ - gO_( \ - G_QUAD, \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v1, v2, v3, v0, flag) * 2, 8, 8) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 0), \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 8) | \ - gF_(gV4_(v3, v0, v1, v2, flag) * 2, 8, 0)) - -# define gsSPForceMatrix(mptr) \ - gsMoveMem(sizeof(Mtx), G_MV_MATRIX, 0, mptr), \ - gsMoveWd(G_MW_FORCEMTX, 0, 0x10000) - -# define gsSPSetGeometryMode(mode) \ - gsSPGeometryMode(0, mode) - -# define gsSPClearGeometryMode(mode) \ - gsSPGeometryMode(mode, 0) - -# define gsSPLoadGeometryMode(mode) \ - gsSPGeometryMode(~gI_(0), mode) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - gF_(gV2_(v0, v1, flag) * 2, 8, 16) | \ - gF_(gV2_(v1, v0, flag) * 2, 8, 8) | \ - gF_(wd, 8, 0), \ - 0) - -# define gsSPLookAtX(l) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, G_MVO_LOOKATX, l) - -# define gsSPLookAtY(l) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, G_MVO_LOOKATY, l) - -# define gsSPMatrix(matrix, param) \ - gO_( \ - G_MTX, \ - gF_((sizeof(Mtx) - 1) / 8, 5, 19) | \ - gF_(gI_(param) ^ G_MTX_PUSH, 8, 0), \ - matrix) - -# define gsSPPopMatrix(param) \ - gsSPPopMatrixN(param, 1) - -# define gsSPPopMatrixN(param, n) \ - gO_( \ - G_POPMTX, \ - gF_((sizeof(Mtx) - 1) / 8, 5, 19) | \ - gF_(2, 8, 0), \ - sizeof(Mtx) * (n)) - -# define gsSPLight(l, n) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, ((n) + 1) * 0x18, l) - -# define gsSPTexture(sc, tc, level, tile, on) \ - gO_( \ - G_TEXTURE, \ - gF_(level, 3, 11) | \ - gF_(tile, 3, 8) | \ - gF_(on, 7, 1), \ - gF_(sc, 16, 16) | \ - gF_(tc, 16, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_(n, 8, 12) | \ - gF_((v0) + (n), 7, 1), \ - v) - -# define gsSPViewport(v) \ - gsMoveMem(sizeof(Vp), G_MV_VIEWPORT, 0, v) - -# define gsSPGeometryMode(clearbits, setbits) \ - gO_( \ - G_GEOMETRYMODE, \ - gF_(~gI_(clearbits), 24, 0), \ - setbits) - -# define gsSPSetOtherMode(opc, shift, length, data) \ - gO_( \ - opc, \ - gF_(32 - (shift) - (length), 8, 8) | \ - gF_((length) - 1, 8, 0), \ - data) - -# define gsMoveWd(index, offset, data) \ - gO_( \ - G_MOVEWORD, \ - gF_(index, 8, 16) | \ - gF_(offset, 16, 0), \ - data) - -# define gsMoveMem(size, index, offset, address) \ - gO_( \ - G_MOVEMEM, \ - gF_((size - 1) / 8, 5, 19) | \ - gF_((offset) / 8, 8, 8) | \ - gF_(index, 8, 0), \ - address) - -# define gsSPDma_io(flag, dmem, dram, size) \ - gO_( \ - G_DMA_IO, \ - gF_(flag, 1, 23) | \ - gF_((dmem) / 8, 10, 13) | \ - gF_((size) - 1, 12, 0), \ - dram) - -# define gsSPDmaRead(dmem, dram, size) \ - gsSPDma_io(0, dmem, dram, size) - -# define gsSPDmaWrite(dmem, dram, size) \ - gsSPDma_io(1, dmem, dram, size) - -# define gsSpecial3(hi, lo) \ - gO_(G_SPECIAL_3, hi, lo) - -# define gsSpecial2(hi, lo) \ - gO_(G_SPECIAL_2, hi, lo) - -# define gsSpecial1(hi, lo) \ - gO_(G_SPECIAL_1, hi, lo) - -#endif - -/* instruction macros for beta fast3d and f3dex */ - -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - -# define gsSPPerspNormalize(scale) \ - gO_(G_PERSPNORM, 0, scale) - -#else - -# define gsSPPerspNormalize(scale) \ - gsMoveWd(G_MW_PERSPNORM, 0, scale) - -#endif - -/* dynamic instruction macros */ - -#define gDisplayListPut(gdl, ...) \ - ({ \ - Gfx Gd_[] = {__VA_ARGS__}; \ - for(size_t Gi_ = 0; Gi_ < sizeof(Gd_) / sizeof(Gfx); Gi_++) \ - { \ - *(Gfx *)(gdl) = Gd_[Gi_]; \ - } \ - (void)0; \ - }) -#define gDisplayListAppend(pgdl, ...) \ - ({ \ - Gfx Gd_[] = {__VA_ARGS__}; \ - for(size_t Gi_ = 0; Gi_ < sizeof(Gd_) / sizeof(Gfx); Gi_++) \ - { \ - *(*(Gfx **)(pgdl))++ = Gd_[Gi_]; \ - } \ - (void)0; \ - }) -#define gDisplayListData(pgdl, d) \ - ({ \ - Gfx **Gp_ = (void *)(pgdl); \ - struct \ - { \ - __typeof__(d) v; \ - } *Gd_, *Gs_; \ - *Gp_ -= (sizeof(*Gd_) + sizeof(Gfx) - 1) / sizeof(Gfx); \ - Gd_ = (void *)*Gp_; \ - Gs_ = (void *)&(d); \ - *Gd_ = *Gs_; \ - &Gd_->v; \ - }) -#define gDisplayListAlloc(pgdl, s) \ - ({ \ - Gfx **Gp_ = (void *)(pgdl); \ - *Gp_ -= ((s) + sizeof(Gfx) - 1) / sizeof(Gfx); \ - (void *)*Gp_; \ - }) - -#define gDPFillRectangle(gdl, ...) \ - gD_(gdl, gsDPFillRectangle, __VA_ARGS__) -#define gDPScisFillRectangle(gdl, ...) \ - gD_(gdl, gsDPScisFillRectangle, __VA_ARGS__) -#define gDPFullSync(gdl) \ - gDisplayListPut(gdl, gsDPFullSync()) -#define gDPLoadSync(gdl) \ - gDisplayListPut(gdl, gsDPLoadSync()) -#define gDPTileSync(gdl) \ - gDisplayListPut(gdl, gsDPTileSync()) -#define gDPPipeSync(gdl) \ - gDisplayListPut(gdl, gsDPPipeSync()) -#define gDPLoadTLUT_pal16(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT_pal16, __VA_ARGS__) -#define gDPLoadTLUT_pal256(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT_pal256, __VA_ARGS__) -#define gDPLoadTextureBlock(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock, __VA_ARGS__) -#define gDPLoadTextureBlockS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockS, __VA_ARGS__) -#define gDPLoadTextureBlock_4b(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock_4b, __VA_ARGS__) -#define gDPLoadTextureBlock_4bS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock_4bS, __VA_ARGS__) -#define gDPLoadTextureBlockYuv(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockYuv, __VA_ARGS__) -#define gDPLoadTextureBlockYuvS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockYuvS, __VA_ARGS__) -#define _gDPLoadTextureBlock(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock, __VA_ARGS__) -#define _gDPLoadTextureBlockS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockS, __VA_ARGS__) -#define _gDPLoadTextureBlock_4b(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock_4b, __VA_ARGS__) -#define _gDPLoadTextureBlock_4bS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock_4bS, __VA_ARGS__) -#define _gDPLoadTextureBlockYuv(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockYuv, __VA_ARGS__) -#define _gDPLoadTextureBlockYuvS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockYuvS, __VA_ARGS__) -#define gDPLoadMultiBlock(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock, __VA_ARGS__) -#define gDPLoadMultiBlockS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockS, __VA_ARGS__) -#define gDPLoadMultiBlock_4b(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock_4b, __VA_ARGS__) -#define gDPLoadMultiBlock_4bS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock_4bS, __VA_ARGS__) -#define gDPLoadMultiBlockYuv(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockYuv, __VA_ARGS__) -#define gDPLoadMultiBlockYuvS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockYuvS, __VA_ARGS__) -#define gDPLoadTextureTile(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTile, __VA_ARGS__) -#define gDPLoadTextureTile_4b(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTile_4b, __VA_ARGS__) -#define gDPLoadTextureTileYuv(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTileYuv, __VA_ARGS__) -#define _gDPLoadTextureTile(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTile, __VA_ARGS__) -#define _gDPLoadTextureTile_4b(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTile_4b, __VA_ARGS__) -#define _gDPLoadTextureTileYuv(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTileYuv, __VA_ARGS__) -#define gDPLoadMultiTile(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTile, __VA_ARGS__) -#define gDPLoadMultiTile_4b(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTile_4b, __VA_ARGS__) -#define gDPLoadMultiTileYuv(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTileYuv, __VA_ARGS__) -#define gDPLoadBlock(gdl, ...) \ - gD_(gdl, gsDPLoadBlock, __VA_ARGS__) -#define gDPNoOp(gdl) \ - gDisplayListPut(gdl, gsDPNoOp()) -#define gDPNoOpTag(gdl, ...) \ - gD_(gdl, gsDPNoOpTag, __VA_ARGS__) -#define gDPPipelineMode(gdl, ...) \ - gD_(gdl, gsDPPipelineMode, __VA_ARGS__) -#define gDPSetBlendColor(gdl, ...) \ - gD_(gdl, gsDPSetBlendColor, __VA_ARGS__) -#define gDPSetEnvColor(gdl, ...) \ - gD_(gdl, gsDPSetEnvColor, __VA_ARGS__) -#define gDPSetFillColor(gdl, ...) \ - gD_(gdl, gsDPSetFillColor, __VA_ARGS__) -#define gDPSetFogColor(gdl, ...) \ - gD_(gdl, gsDPSetFogColor, __VA_ARGS__) -#define gDPSetPrimColor(gdl, ...) \ - gD_(gdl, gsDPSetPrimColor, __VA_ARGS__) -#define gDPSetColorImage(gdl, ...) \ - gD_(gdl, gsDPSetColorImage, __VA_ARGS__) -#define gDPSetDepthImage(gdl, ...) \ - gD_(gdl, gsDPSetDepthImage, __VA_ARGS__) -#define gDPSetTextureImage(gdl, ...) \ - gD_(gdl, gsDPSetTextureImage, __VA_ARGS__) -#define gDPSetHilite1Tile(gdl, ...) \ - gD_(gdl, gsDPSetHilite1Tile, __VA_ARGS__) -#define gDPSetHilite2Tile(gdl, ...) \ - gD_(gdl, gsDPSetHilite2Tile, __VA_ARGS__) -#define gDPSetAlphaCompare(gdl, ...) \ - gD_(gdl, gsDPSetAlphaCompare, __VA_ARGS__) -#define gDPSetAlphaDither(gdl, ...) \ - gD_(gdl, gsDPSetAlphaDither, __VA_ARGS__) -#define gDPSetColorDither(gdl, ...) \ - gD_(gdl, gsDPSetColorDither, __VA_ARGS__) -#define gDPSetCombineMode(gdl, ...) \ - gD_(gdl, gsDPSetCombineLERP, __VA_ARGS__) -#define gDPSetCombineLERP(gdl, ...) \ - gD_(gdl, gsDPSetCombineLERP, __VA_ARGS__) -#define gDPSetConvert(gdl, ...) \ - gD_(gdl, gsDPSetConvert, __VA_ARGS__) -#define gDPSetTextureConvert(gdl, ...) \ - gD_(gdl, gsDPSetTextureConvert, __VA_ARGS__) -#define gDPSetCycleType(gdl, ...) \ - gD_(gdl, gsDPSetCycleType, __VA_ARGS__) -#define gDPSetDepthSource(gdl, ...) \ - gD_(gdl, gsDPSetDepthSource, __VA_ARGS__) -#define gDPSetCombineKey(gdl, ...) \ - gD_(gdl, gsDPSetCombineKey, __VA_ARGS__) -#define gDPSetKeyGB(gdl, ...) \ - gD_(gdl, gsDPSetKeyGB, __VA_ARGS__) -#define gDPSetKeyR(gdl, ...) \ - gD_(gdl, gsDPSetKeyR, __VA_ARGS__) -#define gDPSetPrimDepth(gdl, ...) \ - gD_(gdl, gsDPSetPrimDepth, __VA_ARGS__) -#define gDPSetRenderMode(gdl, ...) \ - gD_(gdl, gsDPSetRenderMode, __VA_ARGS__) -#define gDPSetScissor(gdl, ...) \ - gD_(gdl, gsDPSetScissor, __VA_ARGS__) -#define gDPSetScissorFrac(gdl, ...) \ - gD_(gdl, gsDPSetScissorFrac, __VA_ARGS__) -#define gDPSetTextureDetail(gdl, ...) \ - gD_(gdl, gsDPSetTextureDetail, __VA_ARGS__) -#define gDPSetTextureFilter(gdl, ...) \ - gD_(gdl, gsDPSetTextureFilter, __VA_ARGS__) -#define gDPSetTextureLOD(gdl, ...) \ - gD_(gdl, gsDPSetTextureLOD, __VA_ARGS__) -#define gDPSetTextureLUT(gdl, ...) \ - gD_(gdl, gsDPSetTextureLUT, __VA_ARGS__) -#define gDPSetTexturePersp(gdl, ...) \ - gD_(gdl, gsDPSetTexturePersp, __VA_ARGS__) -#define gDPSetTile(gdl, ...) \ - gD_(gdl, gsDPSetTile, __VA_ARGS__) -#define gDPSetTileSize(gdl, ...) \ - gD_(gdl, gsDPSetTileSize, __VA_ARGS__) -#define gSP1Triangle(gdl, ...) \ - gD_(gdl, gsSP1Triangle, __VA_ARGS__) -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gSP2Triangles(gdl, ...) \ - gD_(gdl, gsSP2Triangles, __VA_ARGS__) -# define gSP1Quadrangle(gdl, ...) \ - gD_(gdl, gsSP1Quadrangle, __VA_ARGS__) -# define gSPBranchLessZ(gdl, ...) \ - gD_(gdl, gsSPBranchLessZ, __VA_ARGS__) -# define gSPBranchLessZrg(gdl, ...) \ - gD_(gdl, gsSPBranchLessZrg, __VA_ARGS__) -# define gSPBranchLessZraw(gdl, ...) \ - gD_(gdl, gsSPBranchLessZraw, __VA_ARGS__) -#endif -#define gSPBranchList(gdl, ...) \ - gD_(gdl, gsSPBranchList, __VA_ARGS__) -#define gSPClipRatio(gdl, ...) \ - gD_(gdl, gsSPClipRatio, __VA_ARGS__) -#define gSPCullDisplayList(gdl, ...) \ - gD_(gdl, gsSPCullDisplayList, __VA_ARGS__) -#define gSPDisplayList(gdl, ...) \ - gD_(gdl, gsSPDisplayList, __VA_ARGS__) -#define gSPEndDisplayList(gdl) \ - gDisplayListPut(gdl, gsSPEndDisplayList()) -#define gSPFogFactor(gdl, ...) \ - gD_(gdl, gsSPFogFactor, __VA_ARGS__) -#define gSPFogPosition(gdl, ...) \ - gD_(gdl, gsSPFogPosition, __VA_ARGS__) -#define gSPForceMatrix(gdl, ...) \ - gD_(gdl, gsSPForceMatrix, __VA_ARGS__) -#define gSPSetGeometryMode(gdl, ...) \ - gD_(gdl, gsSPSetGeometryMode, __VA_ARGS__) -#define gSPClearGeometryMode(gdl, ...) \ - gD_(gdl, gsSPClearGeometryMode, __VA_ARGS__) -#define gSPLoadGeometryMode(gdl, ...) \ - gD_(gdl, gsSPLoadGeometryMode, __VA_ARGS__) -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define gSPInsertMatrix(gdl, ...) \ - gD_(gdl, gsSPInsertMatrix, __VA_ARGS__) -#endif -#define gSPLine3D(gdl, ...) \ - gD_(gdl, gsSPLine3D, __VA_ARGS__) -#define gSPLineW3D(gdl, ...) \ - gD_(gdl, gsSPLineW3D, __VA_ARGS__) -#define gSPLoadUcode(gdl, ...) \ - gD_(gdl, gsSPLoadUcode, __VA_ARGS__) -#define gSPLoadUcodeL(gdl, ...) \ - gD_(gdl, gsSPLoadUcodeL, __VA_ARGS__) -#define gSPLookAtX(gdl, ...) \ - gD_(gdl, gsSPLookAtX, __VA_ARGS__) -#define gSPLookAtY(gdl, ...) \ - gD_(gdl, gsSPLookAtY, __VA_ARGS__) -#define gSPLookAt(gdl, ...) \ - gD_(gdl, gsSPLookAt, __VA_ARGS__) -#define gSPMatrix(gdl, ...) \ - gD_(gdl, gsSPMatrix, __VA_ARGS__) -#define gSPModifyVertex(gdl, ...) \ - gD_(gdl, gsSPModifyVertex, __VA_ARGS__) -#define gSPPerspNormalize(gdl, ...) \ - gD_(gdl, gsSPPerspNormalize, __VA_ARGS__) -#define gSPPopMatrix(gdl, ...) \ - gD_(gdl, gsSPPopMatrix, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPPopMatrixN(gdl, ...) \ - gD_(gdl, gsSPPopMatrixN, __VA_ARGS__) -#endif -#define gSPSegment(gdl, ...) \ - gD_(gdl, gsSPSegment, __VA_ARGS__) -#define gSPSetLights0(gdl, ...) \ - gD_(gdl, gsSPSetLights0, __VA_ARGS__) -#define gSPSetLights1(gdl, ...) \ - gD_(gdl, gsSPSetLights1, __VA_ARGS__) -#define gSPSetLights2(gdl, ...) \ - gD_(gdl, gsSPSetLights2, __VA_ARGS__) -#define gSPSetLights3(gdl, ...) \ - gD_(gdl, gsSPSetLights3, __VA_ARGS__) -#define gSPSetLights4(gdl, ...) \ - gD_(gdl, gsSPSetLights4, __VA_ARGS__) -#define gSPSetLights5(gdl, ...) \ - gD_(gdl, gsSPSetLights5, __VA_ARGS__) -#define gSPSetLights6(gdl, ...) \ - gD_(gdl, gsSPSetLights6, __VA_ARGS__) -#define gSPSetLights7(gdl, ...) \ - gD_(gdl, gsSPSetLights7, __VA_ARGS__) -#define gSPSetStatus(gdl, ...) \ - gD_(gdl, gsSPSetStatus, __VA_ARGS__) -#define gSPNumLights(gdl, ...) \ - gD_(gdl, gsSPNumLights, __VA_ARGS__) -#define gSPLight(gdl, ...) \ - gD_(gdl, gsSPLight, __VA_ARGS__) -#define gSPLightColor(gdl, ...) \ - gD_(gdl, gsSPLightColor, __VA_ARGS__) -#define gSPTexture(gdl, ...) \ - gD_(gdl, gsSPTexture, __VA_ARGS__) -#define gSPTextureRectangle(gdl, ...) \ - gD_(gdl, gsSPTextureRectangle, __VA_ARGS__) -#define gSPScisTextureRectangle(gdl, ...) \ - gD_(gdl, gsSPScisTextureRectangle, __VA_ARGS__) -#define gSPTextureRectangleFlip(gdl, ...) \ - gD_(gdl, gsSPTextureRectangleFlip, __VA_ARGS__) -#define gSPScisTextureRectangleFlip(gdl, ...) \ - gD_(gdl, gsSPScisTextureRectangleFlip, __VA_ARGS__) -#define gSPVertex(gdl, ...) \ - gD_(gdl, gsSPVertex, __VA_ARGS__) -#define gSPViewport(gdl, ...) \ - gD_(gdl, gsSPViewport, __VA_ARGS__) -#define gSPBgRectCopy(gdl, ...) \ - gD_(gdl, gsSPBgRectCopy, __VA_ARGS__) -#define gSPBgRect1Cyc(gdl, ...) \ - gD_(gdl, gsSPBgRect1Cyc, __VA_ARGS__) -#define gSPObjRectangle(gdl, ...) \ - gD_(gdl, gsSPObjRectangle, __VA_ARGS__) -#define gSPObjRectangleR(gdl, ...) \ - gD_(gdl, gsSPObjRectangleR, __VA_ARGS__) -#define gSPObjSprite(gdl, ...) \ - gD_(gdl, gsSPObjSprite, __VA_ARGS__) -#define gSPObjMatrix(gdl, ...) \ - gD_(gdl, gsSPObjMatrix, __VA_ARGS__) -#define gSPObjSubMatrix(gdl, ...) \ - gD_(gdl, gsSPObjSubMatrix, __VA_ARGS__) -#define gSPObjRenderMode(gdl, ...) \ - gD_(gdl, gsSPObjRenderMode, __VA_ARGS__) -#define gSPObjLoadTxtr(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxtr, __VA_ARGS__) -#define gSPObjLoadTxRect(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxRect, __VA_ARGS__) -#define gSPObjLoadTxRectR(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxRectR, __VA_ARGS__) -#define gSPObjLoadTxSprite(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxSprite, __VA_ARGS__) -#define gSPSelectDL(gdl, ...) \ - gD_(gdl, gsSPSelectDL, __VA_ARGS__) -#define gSPSelectBranchDL(gdl, ...) \ - gD_(gdl, gsSPSelectBranchDL, __VA_ARGS__) -#define gDPLoadTLUTCmd(gdl, ...) \ - gD_(gdl, gsDPLoadTLUTCmd, __VA_ARGS__) -#define gDPLoadTLUT(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT, __VA_ARGS__) -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gBranchZ(gdl, ...) \ - gD_(gdl, gsBranchZ, __VA_ARGS__) -#endif -#define gDisplayList(gdl, ...) \ - gD_(gdl, gsDisplayList, __VA_ARGS__) -#define gDPHalf1(gdl, ...) \ - gD_(gdl, gsDPHalf1, __VA_ARGS__) -#define gDPHalf2(gdl, ...) \ - gD_(gdl, gsDPHalf2, __VA_ARGS__) -#define gDPLoadTile(gdl, ...) \ - gD_(gdl, gsDPLoadTile, __VA_ARGS__) -#define gDPSetCombine(gdl, ...) \ - gD_(gdl, gsDPSetCombine, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPGeometryMode(gdl, ...) \ - gD_(gdl, gsSPGeometryMode, __VA_ARGS__) -#endif -#define gSPSetOtherMode(gdl, ...) \ - gD_(gdl, gsSPSetOtherMode, __VA_ARGS__) -#define gSPSetOtherModeLo(gdl, ...) \ - gD_(gdl, gsSPSetOtherModeLo, __VA_ARGS__) -#define gSPSetOtherModeHi(gdl, ...) \ - gD_(gdl, gsSPSetOtherModeHi, __VA_ARGS__) -#define gDPSetOtherMode(gdl, ...) \ - gD_(gdl, gsDPSetOtherMode, __VA_ARGS__) -#define gMoveWd(gdl, ...) \ - gD_(gdl, gsMoveWd, __VA_ARGS__) -#define gMoveMem(gdl, ...) \ - gD_(gdl, gsMoveMem, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPDma_io(gdl, ...) \ - gD_(gdl, gsSPDma_io, __VA_ARGS__) -# define gSPDmaRead(gdl, ...) \ - gD_(gdl, gsSPDmaRead, __VA_ARGS__) -# define gSPDmaWrite(gdl, ...) \ - gD_(gdl, gsSPDmaWrite, __VA_ARGS__) -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gLoadUcode(gdl, ...) \ - gD_(gdl, gsLoadUcode, __VA_ARGS__) -# define gSPLoadUcodeEx(gdl, ...) \ - gD_(gdl, gsSPLoadUcodeEx, __VA_ARGS__) -#endif -#define gTexRect(gdl, ...) \ - gD_(gdl, gsTexRect, __VA_ARGS__) -#define gTexRectFlip(gdl, ...) \ - gD_(gdl, gsTexRectFlip, __VA_ARGS__) -#define gSPNoOp(gdl) \ - gDisplayListPut(gdl, gsSPNoOp()) -#define gDPWord(gdl, ...) \ - gD_(gdl, gsDPWord, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSpecial3(gdl, ...) \ - gD_(gdl, gsSpecial3, __VA_ARGS__) -# define gSpecial2(gdl, ...) \ - gD_(gdl, gsSpecial2, __VA_ARGS__) -# define gSpecial1(gdl, ...) \ - gD_(gdl, gsSpecial1, __VA_ARGS__) -#endif - -/* data types and structures */ -typedef uint8_t qu08_t; -typedef uint16_t qu016_t; -typedef int16_t qs48_t; -typedef int16_t qs510_t; -typedef uint16_t qu510_t; -typedef int16_t qs102_t; -typedef uint16_t qu102_t; -typedef int16_t qs105_t; -typedef uint16_t qu105_t; -typedef int16_t qs132_t; -typedef int16_t qs142_t; -typedef int32_t qs1516_t; -typedef int32_t qs1616_t; -typedef int32_t qs205_t; - -typedef uint16_t g_bglt_t; -typedef uint8_t g_ifmt_t; -typedef uint8_t g_isiz_t; -typedef uint16_t g_bgf_t; -typedef uint8_t g_objf_t; -typedef uint32_t g_objlt_t; - -typedef struct -{ - _Alignas(8) - uint32_t hi; - uint32_t lo; -} Gfx; - -typedef struct -{ - int32_t x1; - int32_t y1; - int32_t x2; - int32_t y2; -} Hilite_t; - -typedef union -{ - _Alignas(8) - Hilite_t h; -} Hilite; - -typedef int32_t Mtx_t[4][4]; - -typedef union -{ - _Alignas(8) - Mtx_t m; - int32_t l[16]; - struct - { - int16_t i[16]; - uint16_t f[16]; - }; -} Mtx; - -typedef struct -{ - uint8_t col[3]; - char pad1; - uint8_t colc[3]; - char pad2; - int8_t dir[3]; - char pad3; -} Light_t; - -typedef union -{ - _Alignas(8) - Light_t l; -} Light; - -typedef struct -{ - Light l[2]; -} LookAt; - -typedef struct -{ - uint8_t col[3]; - char pad1; - uint8_t colc[3]; - char pad2; -} Ambient_t; - -typedef union -{ - _Alignas(8) - Ambient_t l; -} Ambient; - -typedef struct -{ - Ambient a; - Light l[1]; -} Lights0, Lights1; - -typedef struct -{ - Ambient a; - Light l[2]; -} Lights2; - -typedef struct -{ - Ambient a; - Light l[3]; -} Lights3; - -typedef struct -{ - Ambient a; - Light l[4]; -} Lights4; - -typedef struct -{ - Ambient a; - Light l[5]; -} Lights5; - -typedef struct -{ - Ambient a; - Light l[6]; -} Lights6; - -typedef struct -{ - Ambient a; - Light l[7]; -} Lightsn, Lights7; - -typedef struct -{ - int16_t ob[3]; - uint16_t flag; - qs105_t tc[2]; - uint8_t cn[4]; -} Vtx_t; - -typedef struct -{ - int16_t ob[3]; - uint16_t flag; - qs105_t tc[2]; - int8_t n[3]; - uint8_t a; -} Vtx_tn; - -typedef union -{ - _Alignas(8) - Vtx_t v; - Vtx_tn n; -} Vtx; - -typedef struct -{ - qs142_t vscale[4]; - qs142_t vtrans[4]; -} Vp_t; - -typedef union -{ - _Alignas(8) - Vp_t vp; -} Vp; - -typedef struct -{ - qs1516_t A; - qs1516_t B; - qs1516_t C; - qs1516_t D; - qs102_t X; - qs102_t Y; - qu510_t BaseScaleX; - qu510_t BaseScaleY; -} uObjMtx_t; - -typedef union -{ - _Alignas(8) - uObjMtx_t m; -} uObjMtx; - -typedef struct -{ - qs102_t X; - qs102_t Y; - qu510_t BaseScaleX; - qu510_t BaseScaleY; -} uObjSubMtx_t; - -typedef union -{ - _Alignas(8) - uObjSubMtx_t m; -} uObjSubMtx; - -typedef struct -{ - qu105_t imageX; - qu102_t imageW; - qs102_t frameX; - qu102_t frameW; - qu105_t imageY; - qu102_t imageH; - qs102_t frameY; - qu102_t frameH; - uint64_t * imagePtr; - g_bglt_t imageLoad; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_bgf_t imageFlip; - uint16_t tmemW; - qs132_t tmemH; - uint16_t tmemLoadSH; - uint16_t tmemLoadTH; - uint16_t tmemSizeW; - uint16_t tmemSize; -} uObjBg_t; - -typedef struct -{ - qu105_t imageX; - qu102_t imageW; - qs102_t frameX; - qu102_t frameW; - qu105_t imageY; - qu102_t imageH; - qs102_t frameY; - qu102_t frameH; - uint64_t * imagePtr; - g_bglt_t imageLoad; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_bgf_t imageFlip; - qu510_t scaleW; - qu510_t scaleH; - qs205_t imageYorig; - char padding[4]; -} uObjScaleBg_t; - -typedef union -{ - _Alignas(8) - uObjBg_t b; - uObjScaleBg_t s; -} uObjBg; - -typedef struct -{ - qs102_t objX; - qu510_t scaleW; - qu105_t imageW; - uint16_t paddingX; - qs102_t objY; - qu510_t scaleH; - qu105_t imageH; - uint16_t paddingY; - uint16_t imageStride; - uint16_t imageAdrs; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_objf_t imageFlags; -} uObjSprite_t; - -typedef union -{ - _Alignas(8) - uObjSprite_t s; -} uObjSprite; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t tmem; - uint16_t tsize; - uint16_t tline; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrBlock_t; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t tmem; - uint16_t twidth; - uint16_t theight; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrTile_t; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t phead; - uint16_t pnum; - uint16_t zero; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrTLUT_t; - -typedef union -{ - _Alignas(8) - uObjTxtrBlock_t block; - uObjTxtrTile_t tile; - uObjTxtrTLUT_t tlut; -} uObjTxtr; - -typedef struct -{ - uObjTxtr txtr; - uObjSprite sprite; -} uObjTxSprite; - -/* rectangle scissoring macros */ -#define gScC_(c) ((c) < 0 ? 0 : (c)) -#define gScD_(t, c, d) \ - ( \ - (c) < 0 ? \ - ( \ - (d) < 0 ? \ - (t) + (c) * (d) / 0x80 : \ - (t) - (c) * (d) / 0x80 \ - ) : \ - (t) \ - ) - -/* texture loading helper macros */ -#define G_SIZ_LDSIZ(siz) ((siz) < G_IM_SIZ_16b ? G_IM_SIZ_16b : (siz)) -#define G_SIZ_BITS(siz) (4 << gI_(siz)) -#define G_SIZ_LDBITS(siz) ((siz) < G_IM_SIZ_16b ? G_SIZ_BITS(siz) : 16) -#define G_DXT(siz, width) \ - ( \ - (width) * G_SIZ_BITS(siz) > 64 ? \ - ((1 << 11) + (width) * G_SIZ_BITS(siz) / 64 - 1) / \ - ((width) * G_SIZ_BITS(siz) / 64) : \ - (1 << 11) \ - ) -#define G_LTB_LRS(width, height, siz) \ - ( \ - (((width) * (height) + 1) * G_SIZ_BITS(siz) - 1) / \ - G_SIZ_BITS(G_SIZ_LDSIZ(siz)) - 1 \ - ) -#define G_LDBLK_TXL(txl) \ - ( \ - (txl) > G_TX_LDBLK_MAX_TXL ? \ - G_TX_LDBLK_MAX_TXL : \ - (txl) \ - ) - -/* depth value macros */ -#define gZp_(zval, near, far) \ - ( \ - (1.f - (float)(near) / (float)(zval)) / \ - (1.f - (float)(near) / (float)(far)) \ - ) -#define gZo_(zval, near, far) \ - ( \ - ((float)(zval) - (float)(near)) / \ - ((float)(far) - (float)(near)) \ - ) -#define gZf_(zval, near, far, flag) \ - qs1616 \ - ( \ - (flag) == G_BZ_PERSP ? \ - gZp_(zval, near, far) : \ - gZo_(zval, near, far) \ - ) -#define G_DEPTOZSrg(zval, near, far, flag, zmin, zmax) \ - ( \ - gZf_(zval, near, far, flag) * \ - ((int32_t)((zmax) - (zmin)) & ~(int32_t)1) + \ - qs1616(zmin) \ - ) -#define G_DEPTOZS(zval, near, far, flag) \ - G_DEPTOZSrg(zval, near, far, flag, 0, G_MAXZ) - -/* vertex ordering macros */ -#define gV2_(v0, v1, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - gI_(v1) \ - ) -#define gV3_(v0, v1, v2, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - (flag) == 1 ? gI_(v1) : \ - gI_(v2) \ - ) -#define gV4_(v0, v1, v2, v3, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - (flag) == 1 ? gI_(v1) : \ - (flag) == 2 ? gI_(v2) : \ - gI_(v3) \ - ) - -/* sprite texture parameter macros */ -#define GS_PIX2TMEM(pix, siz) ((pix) * G_SIZ_BITS(siz) / 64) -#define GS_TB_TSIZE(pix, siz) (GS_PIX2TMEM(pix, siz) - 1) -#define GS_TB_TLINE(pix, siz) (((1 << 11) - 1) / GS_PIX2TMEM(pix, siz) + 1) -#define GS_TT_TWIDTH(pix, siz) (GS_PIX2TMEM(pix, siz) * 4 - 1) -#define GS_TT_THEIGHT(pix, siz) ((pix) * 4 - 1) -#define GS_PAL_HEAD(head) ((head) + 256) -#define GS_PAL_NUM(num) ((num) - 1) - -/* fixed-point conversion macros */ -#define qu08(n) ((qu08_t)((n) * 0x100)) -#define qu016(n) ((qu016_t)((n) * 0x10000)) -#define qs48(n) ((qs48_t)((n) * 0x0100)) -#define qs510(n) ((qs510_t)((n) * 0x0400)) -#define qu510(n) ((qu510_t)((n) * 0x0400)) -#define qs102(n) ((qs102_t)((n) * 0x0004)) -#define qu102(n) ((qu102_t)((n) * 0x0004)) -#define qs105(n) ((qs105_t)((n) * 0x0020)) -#define qu105(n) ((qu105_t)((n) * 0x0020)) -#define qs132(n) ((qs132_t)((n) * 0x0004)) -#define qs142(n) ((qs142_t)((n) * 0x0004)) -#define qs1516(n) ((qs1516_t)((n) * 0x00010000)) -#define qs1616(n) ((qs1616_t)((n) * 0x00010000)) -#define qs205(n) ((qs205_t)((n) * 0x00000020)) - -/* private helper macros */ -#define gI_(i) ((uint32_t)(i)) -#define gL_(l) ((uint64_t)(l)) -#define gF_(i, n, s) ((gI_(i) & ((gI_(1) << (n)) - 1)) << (s)) -#define gFL_(l, n, s) ((gL_(l) & ((gL_(1) << (n)) - 1)) << (s)) -#define gO_(opc, hi, lo) ((Gfx){gF_(opc, 8, 24) | gI_(hi), gI_(lo)}) -#define gD_(gdl, m, ...) gDisplayListPut(gdl, m(__VA_ARGS__)) - -#endif diff --git a/ZAPDTR/lib/libgfxd/gfxd.c b/ZAPDTR/lib/libgfxd/gfxd.c deleted file mode 100644 index 76d7ded8a..000000000 --- a/ZAPDTR/lib/libgfxd/gfxd.c +++ /dev/null @@ -1,863 +0,0 @@ -#include -#include -#include -#include -#include -#ifdef _WIN32 -# include -# define read _read -# define write _write -#else -# include -#endif -#include "gbi.h" -#include "gfxd.h" -#include "priv.h" - -static TLOCAL struct gfxd_state state; - -static int buffer_input_fn(void *buf, int count) -{ - if (count > config.input_buf_size) - count = config.input_buf_size; - memcpy(buf, config.input_buf, count); - config.input_buf += count; - config.input_buf_size -= count; - return count; -} - -static int buffer_output_fn(const char *buf, int count) -{ - if (count > config.output_buf_size) - count = config.output_buf_size; - memcpy(config.output_buf, buf, count); - config.output_buf += count; - config.output_buf_size -= count; - return count; -} - -static int fd_input_fn(void *buf, int count) -{ - return read(config.input_fd, buf, count); -} - -static int fd_output_fn(const char *buf, int count) -{ - return write(config.output_fd, buf, count); -} - -static void swap_words(Gfx *gfx) -{ - uint8_t b[8]; - uint8_t *pw = (void *) gfx; - uint8_t *pb = b; - - int endian = config.endian; - int wordsize = config.wordsize; - - for (int i = 0; i < 8 / wordsize; i++) - { - if (endian == gfxd_endian_host) - { - switch (wordsize) - { - case 1: - { - uint8_t w = *(uint8_t *) pw; - *pb++ = w >> 0; - break; - } - case 2: - { - uint16_t w = *(uint16_t *) pw; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - case 4: - { - uint32_t w = *(uint32_t *) pw; - *pb++ = w >> 24; - *pb++ = w >> 16; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - case 8: - { - uint64_t w = *(uint64_t *) pw; - *pb++ = w >> 56; - *pb++ = w >> 48; - *pb++ = w >> 40; - *pb++ = w >> 32; - *pb++ = w >> 24; - *pb++ = w >> 16; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - } - } - else - { - for (int j = 0; j < wordsize; j++) - { - if (endian == gfxd_endian_little) - *pb++ = pw[wordsize - 1 - j]; - else - *pb++ = pw[j]; - } - } - pw += wordsize; - } - - gfx->hi = ((uint32_t) b[0] << 24) - | ((uint32_t) b[1] << 16) - | ((uint32_t) b[2] << 8) - | ((uint32_t) b[3] << 0); - gfx->lo = ((uint32_t) b[4] << 24) - | ((uint32_t) b[5] << 16) - | ((uint32_t) b[6] << 8) - | ((uint32_t) b[7] << 0); -} - -static void get_more_input(void) -{ - if (state.end_input != 0) - return; - - char *recv_buf = (void *) &state.gfx[0]; - - while (state.n_gfx < sizeof(state.gfx) / sizeof(state.gfx[0])) - { - int n_read = sizeof(state.gfx) - state.n_byte; - n_read = config.input_fn(&recv_buf[state.n_byte], n_read); - if (n_read == 0) - return; - state.n_byte += n_read; - - while (state.n_gfx < state.n_byte / sizeof(Gfx)) - { - Gfx gfx = state.gfx[state.n_gfx]; - gfxd_macro_t *m = &state.macro[state.n_gfx]; - - swap_words(&gfx); - - int ret = config.ucode->disas_fn(m, gfx.hi, gfx.lo); - if (ret != 0 && config.stop_on_invalid != 0) - { - state.end_input = 1; - state.ret = ret; - return; - } - - state.n_gfx++; - } - } -} - -static int32_t typed_arg_i(int type, int idx) -{ - const gfxd_value_t *v = gfxd_value_by_type(type, idx); - if (v != NULL) - return v->i; - else - return -1; -} - -static uint32_t typed_arg_u(int type, int idx) -{ - const gfxd_value_t *v = gfxd_value_by_type(type, idx); - if (v != NULL) - return v->u; - else - return 0; -} - - -TLOCAL struct gfxd_config config = -{ - .ucode = NULL, - .endian = gfxd_endian_big, - .wordsize = 4, - .arg = NULL, - - .stop_on_invalid = 1, - .stop_on_end = 1, - .emit_dec_color = 0, - .emit_q_macro = 0, - .emit_ext_macro = 0, - - .input_buf = NULL, - .input_buf_size = 0, - .input_fn = &buffer_input_fn, - - .output_buf = NULL, - .output_buf_size = 0, - .output_fn = &buffer_output_fn, - - .macro_fn = &gfxd_macro_dflt, - .arg_fn = &gfxd_arg_dflt, - - .tlut_fn = NULL, - .timg_fn = NULL, - .cimg_fn = NULL, - .zimg_fn = NULL, - .dl_fn = NULL, - .mtx_fn = NULL, - .lookat_fn = NULL, - .light_fn = NULL, - .seg_fn = NULL, - .vtx_fn = NULL, - .vp_fn = NULL, - .uctext_fn = NULL, - .ucdata_fn = NULL, - .dram_fn = NULL, -}; - -void gfxd_input_buffer(const void *buf, int size) -{ - config.input_buf = buf; - config.input_buf_size = size; - config.input_fn = &buffer_input_fn; -} - -void gfxd_output_buffer(char *buf, int size) -{ - config.output_buf = buf; - config.output_buf_size = size; - config.output_fn = &buffer_output_fn; -} - -void gfxd_input_fd(int fd) -{ - config.input_fd = fd; - config.input_fn = &fd_input_fn; -} - -void gfxd_output_fd(int fd) -{ - config.output_fd = fd; - config.output_fn = &fd_output_fn; -} - -void gfxd_input_callback(gfxd_input_fn_t *fn) -{ - if (fn != NULL) - config.input_fn = fn; - else - gfxd_input_buffer(NULL, 0); -} - -void gfxd_output_callback(gfxd_output_fn_t *fn) -{ - if (fn != NULL) - config.output_fn = fn; - else - gfxd_output_buffer(NULL, 0); -} - -void gfxd_macro_fn(gfxd_macro_fn_t *fn) -{ - if (fn != NULL) - config.macro_fn = fn; - else - config.macro_fn = gfxd_macro_dflt; -} - -void gfxd_arg_fn(gfxd_arg_fn_t *fn) -{ - if (fn != NULL) - config.arg_fn = fn; - else - config.arg_fn = gfxd_arg_dflt; -} - -int gfxd_write(const void *buf, int count) -{ - return config.output_fn(buf, count); -} - -int gfxd_puts(const char *str) -{ - return gfxd_write(str, strlen(str)); -} - -int gfxd_printf(const char *fmt, ...) -{ - char s[256]; - - va_list arg; - va_start(arg, fmt); - int n = vsnprintf(s, sizeof(s), fmt, arg); - va_end(arg); - - if (n > sizeof(s) - 1) - n = sizeof(s) - 1; - - return gfxd_write(s, n); -} - -int gfxd_print_value(int type, const gfxd_value_t *value) -{ - return config.ucode->arg_tbl[type].fn(value); -} - -int gfxd_macro_dflt(void) -{ - gfxd_macro_t *m = &state.macro[0]; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - - const char *name = gfxd_macro_name(); - if (name == NULL) - { - if (config.arg != NULL) - { - gfxd_puts(config.arg); - gfxd_puts(" = "); - } - - gfxd_puts("(Gfx){"); - } - else - { - gfxd_puts(name); - gfxd_puts("("); - - if (config.arg != NULL) - { - gfxd_puts(config.arg); - if (t->n_arg != 0) - gfxd_puts(", "); - } - } - - for (int i = 0; i < t->n_arg; i++) - { - if (i != 0) - gfxd_puts(", "); - - config.arg_fn(i); - } - - if (name == NULL) - gfxd_puts("}"); - else - gfxd_puts(")"); - - return 0; -} - -int gfxd_arg_callbacks(int arg_num) -{ - int id = gfxd_macro_id(); - - switch (gfxd_arg_type(arg_num)) - { - case gfxd_Tlut: - { - if (config.tlut_fn != NULL) - { - int32_t num; - if (id == gfxd_DPLoadTLUT_pal16) - num = 16; - else if (id == gfxd_DPLoadTLUT_pal256) - num = 256; - else - num = typed_arg_i(gfxd_Num, 0); - return config.tlut_fn( - typed_arg_u(gfxd_Tlut, 0), - typed_arg_i(gfxd_Pal, 0), - num); - } - break; - } - case gfxd_Timg: - { - if (config.timg_fn != NULL) - { - int32_t siz = typed_arg_i(gfxd_Siz, 0); - if (siz == -1) - siz = G_IM_SIZ_4b; - return config.timg_fn( - typed_arg_u(gfxd_Timg, 0), - typed_arg_i(gfxd_Fmt, 0), - siz, - typed_arg_i(gfxd_Dim, 0), - typed_arg_i(gfxd_Dim, 1), - typed_arg_i(gfxd_Pal, 0)); - } - break; - } - case gfxd_Cimg: - { - if (config.cimg_fn != NULL) - { - return config.cimg_fn( - typed_arg_u(gfxd_Cimg, 0), - typed_arg_i(gfxd_Fmt, 0), - typed_arg_i(gfxd_Siz, 0), - typed_arg_i(gfxd_Dim, 0)); - } - break; - } - case gfxd_Zimg: - { - if (config.zimg_fn != NULL) - { - return config.zimg_fn( - typed_arg_u(gfxd_Zimg, 0)); - } - break; - } - case gfxd_Dl: - { - if (config.dl_fn != NULL) - { - return config.dl_fn( - typed_arg_u(gfxd_Dl, 0)); - } - break; - } - case gfxd_Mtxptr: - { - if (config.mtx_fn != NULL) - { - return config.mtx_fn( - typed_arg_u(gfxd_Mtxptr, 0)); - } - break; - } - case gfxd_Lookatptr: - { - if (config.lookat_fn != NULL) - { - int32_t num; - if (id == gfxd_SPLookAt) - num = 2; - else - num = 1; - return config.lookat_fn( - typed_arg_u(gfxd_Lookatptr, 0), - num); - } - break; - } - case gfxd_Lightptr: - { - if (config.light_fn != NULL) - { - int32_t num; - if (id == gfxd_SPSetLights1) - num = 1; - else if (id == gfxd_SPSetLights2) - num = 2; - else if (id == gfxd_SPSetLights3) - num = 3; - else if (id == gfxd_SPSetLights4) - num = 4; - else if (id == gfxd_SPSetLights5) - num = 5; - else if (id == gfxd_SPSetLights6) - num = 6; - else if (id == gfxd_SPSetLights7) - num = 7; - else - num = 1; - return config.light_fn( - typed_arg_u(gfxd_Lightptr, 0), - num); - } - break; - - } - case gfxd_Segptr: - { - if (config.seg_fn != NULL) - { - return config.seg_fn( - typed_arg_u(gfxd_Segptr, 0), - typed_arg_i(gfxd_Seg, 0)); - } - break; - } - case gfxd_Vtxptr: - { - if (config.vtx_fn != NULL) - { - return config.vtx_fn( - typed_arg_u(gfxd_Vtxptr, 0), - typed_arg_i(gfxd_Num, 0)); - } - break; - } - case gfxd_Vpptr: - { - if (config.vp_fn != NULL) - { - return config.vp_fn( - typed_arg_u(gfxd_Vpptr, 0)); - } - break; - } - case gfxd_Uctext: - { - if (config.uctext_fn != NULL) - { - return config.uctext_fn( - typed_arg_u(gfxd_Uctext, 0), - 0x1000); - } - break; - } - case gfxd_Ucdata: - { - if (config.ucdata_fn != NULL) - { - uint32_t size; - if (id == gfxd_SPLoadUcodeEx) - size = typed_arg_u(gfxd_Size, 0); - else - size = 0x800; - return config.ucdata_fn( - typed_arg_u(gfxd_Ucdata, 0), - size); - } - break; - } - case gfxd_Dram: - { - if (config.dram_fn != NULL) - { - return config.dram_fn( - typed_arg_u(gfxd_Dram, 0), - typed_arg_u(gfxd_Size, 0)); - } - break; - } - } - - return 0; -} - -void gfxd_arg_dflt(int arg_num) -{ - if (gfxd_arg_callbacks(arg_num) == 0) - { - gfxd_arg_t *a = &state.macro[0].arg[arg_num]; - - gfxd_print_value(a->type, &a->value); - } -} - -void gfxd_tlut_callback(gfxd_tlut_fn_t *fn) -{ - config.tlut_fn = fn; -} - -void gfxd_timg_callback(gfxd_timg_fn_t *fn) -{ - config.timg_fn = fn; -} - -void gfxd_cimg_callback(gfxd_cimg_fn_t *fn) -{ - config.cimg_fn = fn; -} - -void gfxd_zimg_callback(gfxd_zimg_fn_t *fn) -{ - config.zimg_fn = fn; -} - -void gfxd_dl_callback(gfxd_dl_fn_t *fn) -{ - config.dl_fn = fn; -} - -void gfxd_mtx_callback(gfxd_mtx_fn_t *fn) -{ - config.mtx_fn = fn; -} - -void gfxd_lookat_callback(gfxd_lookat_fn_t *fn) -{ - config.lookat_fn = fn; -} - -void gfxd_light_callback(gfxd_light_fn_t *fn) -{ - config.light_fn = fn; -} - -void gfxd_seg_callback(gfxd_seg_fn_t *fn) -{ - config.seg_fn = fn; -} - -void gfxd_vtx_callback(gfxd_vtx_fn_t *fn) -{ - config.vtx_fn = fn; -} - -void gfxd_vp_callback(gfxd_vp_fn_t *fn) -{ - config.vp_fn = fn; -} - -void gfxd_uctext_callback(gfxd_uctext_fn_t *fn) -{ - config.uctext_fn = fn; -} - -void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn) -{ - config.ucdata_fn = fn; -} - -void gfxd_dram_callback(gfxd_dram_fn_t *fn) -{ - config.dram_fn = fn; -} - -void gfxd_target(gfxd_ucode_t ucode) -{ - config.ucode = ucode; -} - -void gfxd_endian(int endian, int wordsize) -{ - config.endian = endian; - config.wordsize = wordsize; -} - -void gfxd_dynamic(const char *arg) -{ - config.arg = arg; -} - -void gfxd_enable(int cap) -{ - switch (cap) - { - case gfxd_stop_on_invalid: - config.stop_on_invalid = 1; - break; - - case gfxd_stop_on_end: - config.stop_on_end = 1; - break; - - case gfxd_emit_dec_color: - config.emit_dec_color = 1; - break; - - case gfxd_emit_q_macro: - config.emit_q_macro = 1; - break; - - case gfxd_emit_ext_macro: - config.emit_ext_macro = 1; - break; - } -} - -void gfxd_disable(int cap) -{ - switch (cap) - { - case gfxd_stop_on_invalid: - config.stop_on_invalid = 0; - return; - - case gfxd_stop_on_end: - config.stop_on_end = 0; - return; - - case gfxd_emit_dec_color: - config.emit_dec_color = 0; - break; - - case gfxd_emit_q_macro: - config.emit_q_macro = 0; - break; - - case gfxd_emit_ext_macro: - config.emit_ext_macro = 0; - break; - } -} - -void gfxd_udata_set(void *ptr) -{ - config.udata = ptr; -} - -void *gfxd_udata_get(void) -{ - return config.udata; -} - -int gfxd_execute(void) -{ - state.macro_offset = 0; - state.n_byte = 0; - state.n_gfx = 0; - state.end_input = 0; - state.ret = 0; - - for (;;) - { - get_more_input(); - if (state.n_gfx == 0) - break; - - gfxd_macro_t *m = &state.macro[0]; - config.ucode->combine_fn(m, state.n_gfx); - - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - if (t->ext != 0 && config.emit_ext_macro == 0) - { - Gfx gfx = state.gfx[0]; - swap_words(&gfx); - - t = &config.ucode->macro_tbl[gfxd_Invalid]; - t->disas_fn(m, gfx.hi, gfx.lo); - } - - int ret = config.macro_fn(); - if (ret != 0) - { - state.ret = ret; - break; - } - - if (config.stop_on_end != 0 - && (m->id == gfxd_SPBranchList - || m->id == gfxd_SPEndDisplayList)) - { - break; - } - - int n_pop = config.ucode->macro_tbl[m->id].n_gfx; - int n_rem = state.n_gfx - n_pop; - { - int n_byte = n_rem * sizeof(gfxd_macro_t); - memmove(&state.macro[0], &state.macro[n_pop], n_byte); - state.n_gfx = n_rem; - } - { - int n_byte = n_rem * sizeof(Gfx); - memmove(&state.gfx[0], &state.gfx[n_pop], n_byte); - state.n_byte = n_byte; - } - state.macro_offset += n_pop * sizeof(Gfx); - } - - return state.ret; -} - -int gfxd_macro_offset(void) -{ - return state.macro_offset; -} - -int gfxd_macro_packets(void) -{ - return config.ucode->macro_tbl[state.macro[0].id].n_gfx; -} - -const void *gfxd_macro_data(void) -{ - return state.gfx; -} - -int gfxd_macro_id(void) -{ - return state.macro[0].id; -} - -const char *gfxd_macro_name(void) -{ - int id = state.macro[0].id; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[id]; - - if (t->prefix == NULL && t->suffix == NULL) - { - return NULL; - } - else - { - static TLOCAL char buf[32]; - - char *p = buf; - if (t->prefix != NULL) - { - const char *s = t->prefix; - while (*s != '\0') - *p++ = *s++; - } - *p++ = 'g'; - if (config.arg == NULL) - *p++ = 's'; - if (t->suffix != NULL) - { - const char *s = t->suffix; - while (*s != '\0') - *p++ = *s++; - } - *p++ = '\0'; - - return buf; - } -} - -int gfxd_arg_count(void) -{ - return config.ucode->macro_tbl[state.macro[0].id].n_arg; -} - -int gfxd_arg_type(int arg_num) -{ - return state.macro[0].arg[arg_num].type; -} - -const char *gfxd_arg_name(int arg_num) -{ - return state.macro[0].arg[arg_num].name; -} - -int gfxd_arg_fmt(int arg_num) -{ - return config.ucode->arg_tbl[state.macro[0].arg[arg_num].type].fmt; -} - -const gfxd_value_t *gfxd_arg_value(int arg_num) -{ - return &state.macro[0].arg[arg_num].value; -} - -const gfxd_value_t *gfxd_value_by_type(int type, int idx) -{ - gfxd_macro_t *m = &state.macro[0]; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - - for (int i = 0; i < t->n_arg; i++) - { - gfxd_arg_t *a = &m->arg[i]; - if (a->type == type) - { - if (idx == 0) - return &a->value; - else - idx--; - } - } - - return NULL; -} - -int gfxd_arg_valid(int arg_num) -{ - return state.macro[0].arg[arg_num].bad == 0; -} diff --git a/ZAPDTR/lib/libgfxd/gfxd.h b/ZAPDTR/lib/libgfxd/gfxd.h deleted file mode 100644 index 268bbfa10..000000000 --- a/ZAPDTR/lib/libgfxd/gfxd.h +++ /dev/null @@ -1,387 +0,0 @@ -#ifndef GFXD_H -#define GFXD_H -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - -enum -{ - gfxd_Word, /* generic word */ - gfxd_Opcode, /* command opcode (G_*) */ - gfxd_Coordi, /* integer coordinate */ - gfxd_Coordq, /* fractional (q10.2) coordinate */ - gfxd_Pal, /* palette index */ - gfxd_Tlut, /* tlut pointer */ - gfxd_Timg, /* texture image pointer */ - gfxd_Tmem, /* tmem address */ - gfxd_Tile, /* tile index */ - gfxd_Fmt, /* texture format */ - gfxd_Siz, /* texture pixel size */ - gfxd_Dim, /* integer dimension (width / height) */ - gfxd_Cm, /* clamp and mirror flags */ - gfxd_Tm, /* tile mask */ - gfxd_Ts, /* tile shift */ - gfxd_Dxt, /* texture dxt */ - gfxd_Tag, /* generic tag */ - gfxd_Pm, /* pipeline mode */ - gfxd_Colorpart, /* color component */ - gfxd_Color, /* color */ - gfxd_Lodfrac, /* lod fraction (q0.8) */ - gfxd_Cimg, /* color image pointer */ - gfxd_Zimg, /* depth image pointer */ - gfxd_Ac, /* alpha compare mode */ - gfxd_Ad, /* alpha dither mode */ - gfxd_Cd, /* color dither mode */ - gfxd_Ccpre, /* color combiner preset index */ - gfxd_Ccmuxa, /* color mux operand (a) */ - gfxd_Ccmuxb, /* color mux operand (b) */ - gfxd_Ccmuxc, /* color mux operand (c) */ - gfxd_Ccmuxd, /* color mux operand (d) */ - gfxd_Acmuxabd, /* alpha mux operand (a, b, or d) */ - gfxd_Acmuxc, /* alpha mux operand (c) */ - gfxd_Cv, /* color convert operand */ - gfxd_Tc, /* texture convert mode */ - gfxd_Cyc, /* cycle type */ - gfxd_Zs, /* depth source mode */ - gfxd_Ck, /* combine key mode */ - gfxd_Keyscale, /* combine key scale */ - gfxd_Keywidth, /* combine key width */ - gfxd_Zi, /* integer depth */ - gfxd_Rm1, /* cycle 1 render mode */ - gfxd_Rm2, /* cycle 2 render mode */ - gfxd_Sc, /* scissor mode */ - gfxd_Td, /* texture detail mode */ - gfxd_Tf, /* texture filter mode */ - gfxd_Tl, /* texture LOD mode */ - gfxd_Tt, /* textuure LUT mode */ - gfxd_Tp, /* texture perspective mode */ - gfxd_Line, /* texture line size */ - gfxd_Vtx, /* vertex index */ - gfxd_Vtxflag, /* vertex flag */ - gfxd_Dl, /* display list pointer */ - gfxd_Zraw, /* raw depth value (q16.16) */ - gfxd_Dlflag, /* display list flag */ - gfxd_Cr, /* clip ratio */ - gfxd_Num, /* element count */ - gfxd_Fogz, /* fog factor */ - gfxd_Fogp, /* fog position (0 - 1000) */ - gfxd_Mtxptr, /* matrix pointer */ - gfxd_Gm, /* geometry mode */ - gfxd_Mwo_matrix, /* matrix moveword offset */ - gfxd_Linewd, /* line width (1.5 + q7.1) */ - gfxd_Uctext, /* microcode text pointer */ - gfxd_Ucdata, /* microcode data pointer */ - gfxd_Size, /* data size */ - gfxd_Lookatptr, /* lookat pointer */ - gfxd_Mtxparam, /* matrix param */ - gfxd_Mtxstack, /* matrix param (stack select only) */ - gfxd_Mwo_point, /* vertex moveword offset */ - gfxd_Wscale, /* w-component scale (perspnorm) */ - gfxd_Seg, /* segment number */ - gfxd_Segptr, /* segment pointer */ - gfxd_Lightsn, /* dereferenced Lighstn pointer */ - gfxd_Numlights, /* light count (NUMLIGHTS_*) */ - gfxd_Lightnum, /* light number (LIGHT_*) */ - gfxd_Lightptr, /* light pointer */ - gfxd_Tcscale, /* texture coordinate scale */ - gfxd_Switch, /* on-off value */ - gfxd_St, /* vertex coordinate (q10.5) */ - gfxd_Stdelta, /* vertex coordinate delta (q5.10) */ - gfxd_Vtxptr, /* vertex pointer */ - gfxd_Vpptr, /* viewport pointer */ - gfxd_Dram, /* generic dram address */ - gfxd_Sftlo, /* othermode lo shift */ - gfxd_Othermodelo, /* othermode lo value */ - gfxd_Sfthi, /* othermode hi shift */ - gfxd_Othermodehi, /* othermode hi value */ - gfxd_Mw, /* moveword index */ - gfxd_Mwo, /* moveword offset */ - gfxd_Mwo_clip, /* clip ratio moveword offset */ - gfxd_Mwo_lightcol, /* light color moveword offset */ - gfxd_Mv, /* movemem index */ - gfxd_Mvo, /* movemem offset */ - gfxd_Dmem, /* dmem address */ - gfxd_Dmaflag, /* dma io flag */ -}; - -enum -{ - gfxd_Invalid, - gfxd_DPFillRectangle, - gfxd_DPFullSync, - gfxd_DPLoadSync, - gfxd_DPTileSync, - gfxd_DPPipeSync, - gfxd_DPLoadTLUT_pal16, - gfxd_DPLoadTLUT_pal256, - gfxd_DPLoadMultiBlockYuvS, - gfxd_DPLoadMultiBlockYuv, - gfxd_DPLoadMultiBlock_4bS, - gfxd_DPLoadMultiBlock_4b, - gfxd_DPLoadMultiBlockS, - gfxd_DPLoadMultiBlock, - gfxd__DPLoadTextureBlockYuvS, - gfxd__DPLoadTextureBlockYuv, - gfxd__DPLoadTextureBlock_4bS, - gfxd__DPLoadTextureBlock_4b, - gfxd__DPLoadTextureBlockS, - gfxd__DPLoadTextureBlock, - gfxd_DPLoadTextureBlockYuvS, - gfxd_DPLoadTextureBlockYuv, - gfxd_DPLoadTextureBlock_4bS, - gfxd_DPLoadTextureBlock_4b, - gfxd_DPLoadTextureBlockS, - gfxd_DPLoadTextureBlock, - gfxd_DPLoadMultiTileYuv, - gfxd_DPLoadMultiTile_4b, - gfxd_DPLoadMultiTile, - gfxd__DPLoadTextureTileYuv, - gfxd__DPLoadTextureTile_4b, - gfxd__DPLoadTextureTile, - gfxd_DPLoadTextureTileYuv, - gfxd_DPLoadTextureTile_4b, - gfxd_DPLoadTextureTile, - gfxd_DPLoadBlock, - gfxd_DPNoOp, - gfxd_DPNoOpTag, - gfxd_DPPipelineMode, - gfxd_DPSetBlendColor, - gfxd_DPSetEnvColor, - gfxd_DPSetFillColor, - gfxd_DPSetFogColor, - gfxd_DPSetPrimColor, - gfxd_DPSetColorImage, - gfxd_DPSetDepthImage, - gfxd_DPSetTextureImage, - gfxd_DPSetAlphaCompare, - gfxd_DPSetAlphaDither, - gfxd_DPSetColorDither, - gfxd_DPSetCombineMode, - gfxd_DPSetCombineLERP, - gfxd_DPSetConvert, - gfxd_DPSetTextureConvert, - gfxd_DPSetCycleType, - gfxd_DPSetDepthSource, - gfxd_DPSetCombineKey, - gfxd_DPSetKeyGB, - gfxd_DPSetKeyR, - gfxd_DPSetPrimDepth, - gfxd_DPSetRenderMode, - gfxd_DPSetScissor, - gfxd_DPSetScissorFrac, - gfxd_DPSetTextureDetail, - gfxd_DPSetTextureFilter, - gfxd_DPSetTextureLOD, - gfxd_DPSetTextureLUT, - gfxd_DPSetTexturePersp, - gfxd_DPSetTile, - gfxd_DPSetTileSize, - gfxd_SP1Triangle, - gfxd_SP2Triangles, - gfxd_SP1Quadrangle, - gfxd_SPBranchLessZraw, - gfxd_SPBranchList, - gfxd_SPClipRatio, - gfxd_SPCullDisplayList, - gfxd_SPDisplayList, - gfxd_SPEndDisplayList, - gfxd_SPFogFactor, - gfxd_SPFogPosition, - gfxd_SPForceMatrix, - gfxd_SPSetGeometryMode, - gfxd_SPClearGeometryMode, - gfxd_SPLoadGeometryMode, - gfxd_SPInsertMatrix, - gfxd_SPLine3D, - gfxd_SPLineW3D, - gfxd_SPLoadUcode, - gfxd_SPLookAtX, - gfxd_SPLookAtY, - gfxd_SPLookAt, - gfxd_SPMatrix, - gfxd_SPModifyVertex, - gfxd_SPPerspNormalize, - gfxd_SPPopMatrix, - gfxd_SPPopMatrixN, - gfxd_SPSegment, - gfxd_SPSetLights1, - gfxd_SPSetLights2, - gfxd_SPSetLights3, - gfxd_SPSetLights4, - gfxd_SPSetLights5, - gfxd_SPSetLights6, - gfxd_SPSetLights7, - gfxd_SPNumLights, - gfxd_SPLight, - gfxd_SPLightColor, - gfxd_SPTexture, - gfxd_SPTextureRectangle, - gfxd_SPTextureRectangleFlip, - gfxd_SPVertex, - gfxd_SPViewport, - gfxd_DPLoadTLUTCmd, - gfxd_DPLoadTLUT, - gfxd_BranchZ, - gfxd_DisplayList, - gfxd_DPHalf1, - gfxd_DPHalf2, - gfxd_DPWord, - gfxd_DPLoadTile, - gfxd_SPGeometryMode, - gfxd_SPSetOtherMode, - gfxd_SPSetOtherModeLo, - gfxd_SPSetOtherModeHi, - gfxd_DPSetOtherMode, - gfxd_MoveWd, - gfxd_MoveMem, - gfxd_SPDma_io, - gfxd_SPDmaRead, - gfxd_SPDmaWrite, - gfxd_LoadUcode, - gfxd_SPLoadUcodeEx, - gfxd_TexRect, - gfxd_TexRectFlip, - gfxd_SPNoOp, - gfxd_Special3, - gfxd_Special2, - gfxd_Special1, -}; - -enum -{ - gfxd_stop_on_invalid, - gfxd_stop_on_end, - gfxd_emit_dec_color, - gfxd_emit_q_macro, - gfxd_emit_ext_macro, -}; - -enum -{ - gfxd_endian_big, - gfxd_endian_little, - gfxd_endian_host, -}; - -enum -{ - gfxd_argfmt_i, - gfxd_argfmt_u, - gfxd_argfmt_f, -}; - -typedef union -{ - int32_t i; - uint32_t u; - float f; -} gfxd_value_t; - -typedef const struct gfxd_ucode *gfxd_ucode_t; - -typedef int gfxd_input_fn_t(void *buf, int count); -void gfxd_input_buffer(const void *buf, int size); -void gfxd_input_fd(int fd); -void gfxd_input_callback(gfxd_input_fn_t *fn); - -typedef int gfxd_output_fn_t(const char *buf, int count); -void gfxd_output_buffer(char *buf, int size); -void gfxd_output_fd(int fd); -void gfxd_output_callback(gfxd_output_fn_t *fn); - -typedef int gfxd_macro_fn_t(void); -void gfxd_macro_fn(gfxd_macro_fn_t *fn); -gfxd_macro_fn_t gfxd_macro_dflt; - -typedef void gfxd_arg_fn_t(int arg_num); -void gfxd_arg_fn(gfxd_arg_fn_t *fn); -gfxd_arg_fn_t gfxd_arg_dflt; - -typedef int gfxd_tlut_fn_t(uint32_t tlut, int32_t idx, int32_t count); -void gfxd_tlut_callback(gfxd_tlut_fn_t *fn); - -typedef int gfxd_timg_fn_t(uint32_t timg, int32_t fmt, int32_t siz, - int32_t width, int32_t height, int32_t pal); -void gfxd_timg_callback(gfxd_timg_fn_t *fn); - -typedef int gfxd_cimg_fn_t(uint32_t cimg, int32_t fmt, int32_t siz, - int32_t width); -void gfxd_cimg_callback(gfxd_cimg_fn_t *fn); - -typedef int gfxd_zimg_fn_t(uint32_t zimg); -void gfxd_zimg_callback(gfxd_zimg_fn_t *fn); - -typedef int gfxd_dl_fn_t(uint32_t dl); -void gfxd_dl_callback(gfxd_dl_fn_t *fn); - -typedef int gfxd_mtx_fn_t(uint32_t mtx); -void gfxd_mtx_callback(gfxd_mtx_fn_t *fn); - -typedef int gfxd_lookat_fn_t(uint32_t lookat, int32_t count); -void gfxd_lookat_callback(gfxd_lookat_fn_t *fn); - -typedef int gfxd_light_fn_t(uint32_t light, int32_t count); -void gfxd_light_callback(gfxd_light_fn_t *fn); - -typedef int gfxd_seg_fn_t(uint32_t seg, int32_t num); -void gfxd_seg_callback(gfxd_seg_fn_t *fn); - -typedef int gfxd_vtx_fn_t(uint32_t vtx, int32_t num); -void gfxd_vtx_callback(gfxd_vtx_fn_t *fn); - -typedef int gfxd_vp_fn_t(uint32_t vp); -void gfxd_vp_callback(gfxd_vp_fn_t *fn); - -typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size); -void gfxd_uctext_callback(gfxd_uctext_fn_t *fn); - -typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size); -void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn); - -typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size); -void gfxd_dram_callback(gfxd_dram_fn_t *fn); - -int gfxd_write(const void *buf, int count); -int gfxd_puts(const char *str); -int gfxd_printf(const char *fmt, ...); -int gfxd_print_value(int type, const gfxd_value_t *value); - -void gfxd_target(gfxd_ucode_t ucode); -void gfxd_endian(int endian, int wordsize); -void gfxd_dynamic(const char *arg); -void gfxd_enable(int cap); -void gfxd_disable(int cap); -void gfxd_udata_set(void *ptr); -void *gfxd_udata_get(void); - -int gfxd_execute(void); - -int gfxd_macro_offset(void); -int gfxd_macro_packets(void); -const void *gfxd_macro_data(void); -int gfxd_macro_id(void); -const char *gfxd_macro_name(void); - -int gfxd_arg_count(void); -int gfxd_arg_type(int arg_num); -const char *gfxd_arg_name(int arg_num); -int gfxd_arg_fmt(int arg_num); -const gfxd_value_t *gfxd_arg_value(int arg_num); -const gfxd_value_t *gfxd_value_by_type(int type, int idx); -int gfxd_arg_valid(int arg_num); -int gfxd_arg_callbacks(int arg_num); - -extern const gfxd_ucode_t gfxd_f3d; -extern const gfxd_ucode_t gfxd_f3db; -extern const gfxd_ucode_t gfxd_f3dex; -extern const gfxd_ucode_t gfxd_f3dexb; -extern const gfxd_ucode_t gfxd_f3dex2; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/ZAPDTR/lib/libgfxd/priv.h b/ZAPDTR/lib/libgfxd/priv.h deleted file mode 100644 index 34d96f675..000000000 --- a/ZAPDTR/lib/libgfxd/priv.h +++ /dev/null @@ -1,125 +0,0 @@ -#ifndef GFXD_PRIV_H -#define GFXD_PRIV_H -#include "gfxd.h" - -#define CONFIG_MT - -#ifdef CONFIG_MT -# ifdef _MSC_VER -# define TLOCAL __declspec(thread) -# else -# define TLOCAL _Thread_local -# endif -#else -#define TLOCAL -#endif - -#define UCFUNC static inline - -#define config gfxd_config__ - -typedef int gfxd_argfn_t(const gfxd_value_t *v); - -typedef struct -{ - int fmt; - gfxd_argfn_t * fn; -} gfxd_arg_type_t; - -typedef struct -{ - int type; - const char * name; - gfxd_value_t value; - int bad; -} gfxd_arg_t; - -typedef struct -{ - int id; - gfxd_arg_t arg[18]; -} gfxd_macro_t; - -typedef int gfxd_disas_fn_t(gfxd_macro_t *macro, uint32_t hi, uint32_t lo); -typedef int gfxd_combine_fn_t(gfxd_macro_t *macro, int n_macro); - -typedef struct -{ - const char * prefix; - const char * suffix; - int opcode; - int n_arg; - int n_gfx; - gfxd_disas_fn_t * disas_fn; - gfxd_combine_fn_t * combine_fn; - int alias; - int ext; -} gfxd_macro_type_t; - -struct gfxd_ucode -{ - gfxd_disas_fn_t * disas_fn; - gfxd_combine_fn_t * combine_fn; - const gfxd_arg_type_t * arg_tbl; - const gfxd_macro_type_t * macro_tbl; -}; - -struct gfxd_state -{ - int macro_offset; - - Gfx gfx[9]; - int n_byte; - int n_gfx; - gfxd_macro_t macro[9]; - - int end_input; - int ret; -}; - -struct gfxd_config -{ - gfxd_ucode_t ucode; - int endian; - int wordsize; - const char * arg; - void * udata; - - int stop_on_invalid; - int stop_on_end; - int emit_dec_color; - int emit_q_macro; - int emit_ext_macro; - - const char * input_buf; - int input_buf_size; - int input_fd; - gfxd_input_fn_t * input_fn; - - char * output_buf; - int output_buf_size; - int output_fd; - gfxd_output_fn_t * output_fn; - - gfxd_macro_fn_t * macro_fn; - gfxd_arg_fn_t * arg_fn; - - gfxd_tlut_fn_t * tlut_fn; - gfxd_timg_fn_t * timg_fn; - gfxd_cimg_fn_t * cimg_fn; - gfxd_zimg_fn_t * zimg_fn; - gfxd_dl_fn_t * dl_fn; - gfxd_mtx_fn_t * mtx_fn; - gfxd_lookat_fn_t * lookat_fn; - gfxd_light_fn_t * light_fn; - gfxd_seg_fn_t * seg_fn; - gfxd_vtx_fn_t * vtx_fn; - gfxd_vp_fn_t * vp_fn; - gfxd_uctext_fn_t * uctext_fn; - gfxd_ucdata_fn_t * ucdata_fn; - gfxd_dram_fn_t * dram_fn; -}; - -extern TLOCAL struct gfxd_config gfxd_config__; - -#endif diff --git a/ZAPDTR/lib/libgfxd/uc.c b/ZAPDTR/lib/libgfxd/uc.c deleted file mode 100644 index 7efb09105..000000000 --- a/ZAPDTR/lib/libgfxd/uc.c +++ /dev/null @@ -1,54 +0,0 @@ -#include -#include -#include -#include "gbi.h" -#include "gfxd.h" -#include "priv.h" - -#include "uc_argfn.c" -#include "uc_argtbl.c" -#include "uc_macrofn.c" -#include "uc_macrotbl.c" - -UCFUNC int disas(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int opcode = (hi >> 24) & 0xFF; - - for (int i = 0; i < sizeof(macro_tbl) / sizeof(macro_tbl[0]); i++) - { - const gfxd_macro_type_t *t = ¯o_tbl[i]; - if (t->disas_fn != NULL && t->opcode == opcode) - return t->disas_fn(m, hi, lo); - } - - return d_Invalid(m, hi, lo); -} - -UCFUNC int combine(gfxd_macro_t *m, int num) -{ - int opcode = macro_tbl[m->id].opcode; - - for (int i = 0; i < sizeof(macro_tbl) / sizeof(macro_tbl[0]); i++) - { - const gfxd_macro_type_t *t = ¯o_tbl[i]; - if (t->combine_fn != NULL - && t->opcode == opcode - && (t->ext == 0 || config.emit_ext_macro != 0)) - { - if (t->combine_fn(m, num) == 0) - return 0; - } - } - - return -1; -} - -static const struct gfxd_ucode uc = -{ - .disas_fn = disas, - .combine_fn = combine, - .arg_tbl = arg_tbl, - .macro_tbl = macro_tbl, -}; - -const gfxd_ucode_t uc_name = &uc; diff --git a/ZAPDTR/lib/libgfxd/uc_argfn.c b/ZAPDTR/lib/libgfxd/uc_argfn.c deleted file mode 100644 index f65feb60f..000000000 --- a/ZAPDTR/lib/libgfxd/uc_argfn.c +++ /dev/null @@ -1,1814 +0,0 @@ -#define MDMASK(md) ((((uint32_t)1 << G_MDSIZ_##md) - 1) << G_MDSFT_##md) -#define MDMASK_RM_C1 ((uint32_t)0xCCCC0000) -#define MDMASK_RM_C2 ((uint32_t)0x33330000) -#define MDMASK_RM_LO ((uint32_t)0x0000FFF8) - -UCFUNC int argfn_i(const gfxd_value_t *v) -{ - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_u(const gfxd_value_t *v) -{ - return gfxd_printf("%" PRIu32, v->u); -} - -UCFUNC int argfn_x8(const gfxd_value_t *v) -{ - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_x16(const gfxd_value_t *v) -{ - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_x32(const gfxd_value_t *v) -{ - return gfxd_printf("0x%08" PRIX32, v->u); -} - -UCFUNC int argfn_color(const gfxd_value_t *v) -{ - if (config.emit_dec_color) - return gfxd_printf("%" PRIu32, v->u); - else - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_qu08(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu08(%.16g)", v->u / 256.f); - else - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_qu016(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu016(%.16g)", v->u / 65536.f); - else - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_qs48(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs48(%.16g)", v->i / 256.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qs510(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs510(%.16g)", v->i / 1024.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qu102(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu102(%.16g)", v->u / 4.f); - else - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_qs105(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs105(%.16g)", v->i / 32.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qs1616(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs1616(%.16g)", v->i / 65536.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%08" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%08" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_opc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_SPNOOP: - return gfxd_puts("G_SPNOOP"); - case G_MTX: - return gfxd_puts("G_MTX"); - case G_MOVEMEM: - return gfxd_puts("G_MOVEMEM"); - case G_VTX: - return gfxd_puts("G_VTX"); - case G_DL: - return gfxd_puts("G_DL"); - case G_RDPHALF_2: - return gfxd_puts("G_RDPHALF_2"); - case G_RDPHALF_1: - return gfxd_puts("G_RDPHALF_1"); -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - case G_PERSPNORM: - return gfxd_puts("G_PERSPNORM"); -#endif - case G_LINE3D: - return gfxd_puts("G_LINE3D"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_CLEARGEOMETRYMODE: - return gfxd_puts("G_CLEARGEOMETRYMODE"); - case G_SETGEOMETRYMODE: - return gfxd_puts("G_SETGEOMETRYMODE"); -#endif - case G_ENDDL: - return gfxd_puts("G_ENDDL"); - case G_SETOTHERMODE_L: - return gfxd_puts("G_SETOTHERMODE_L"); - case G_SETOTHERMODE_H: - return gfxd_puts("G_SETOTHERMODE_H"); - case G_TEXTURE: - return gfxd_puts("G_TEXTURE"); - case G_MOVEWORD: - return gfxd_puts("G_MOVEWORD"); - case G_POPMTX: - return gfxd_puts("G_POPMTX"); - case G_CULLDL: - return gfxd_puts("G_CULLDL"); - case G_TRI1: - return gfxd_puts("G_TRI1"); - case G_NOOP: - return gfxd_puts("G_NOOP"); -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - case G_LOAD_UCODE: - return gfxd_puts("G_LOAD_UCODE"); - case G_BRANCH_Z: - return gfxd_puts("G_BRANCH_Z"); - case G_TRI2: - return gfxd_puts("G_TRI2"); -# if !(defined(F3D_BETA) && defined(F3DEX_GBI)) - case G_MODIFYVTX: - return gfxd_puts("G_MODIFYVTX"); -# endif -#endif -#if defined(F3DEX_GBI_2) - case G_QUAD: - return gfxd_puts("G_QUAD"); - case G_SPECIAL_3: - return gfxd_puts("G_SPECIAL_3"); - case G_SPECIAL_2: - return gfxd_puts("G_SPECIAL_2"); - case G_SPECIAL_1: - return gfxd_puts("G_SPECIAL_1"); - case G_DMA_IO: - return gfxd_puts("G_DMA_IO"); - case G_GEOMETRYMODE: - return gfxd_puts("G_GEOMETRYMODE"); -#endif - case G_TEXRECT: - return gfxd_puts("G_TEXRECT"); - case G_TEXRECTFLIP: - return gfxd_puts("G_TEXRECTFLIP"); - case G_RDPLOADSYNC: - return gfxd_puts("G_RDPLOADSYNC"); - case G_RDPPIPESYNC: - return gfxd_puts("G_RDPPIPESYNC"); - case G_RDPTILESYNC: - return gfxd_puts("G_RDPTILESYNC"); - case G_RDPFULLSYNC: - return gfxd_puts("G_RDPFULLSYNC"); - case G_SETKEYGB: - return gfxd_puts("G_SETKEYGB"); - case G_SETKEYR: - return gfxd_puts("G_SETKEYR"); - case G_SETCONVERT: - return gfxd_puts("G_SETCONVERT"); - case G_SETSCISSOR: - return gfxd_puts("G_SETSCISSOR"); - case G_SETPRIMDEPTH: - return gfxd_puts("G_SETPRIMDEPTH"); - case G_RDPSETOTHERMODE: - return gfxd_puts("G_RDPSETOTHERMODE"); - case G_LOADTLUT: - return gfxd_puts("G_LOADTLUT"); - case G_SETTILESIZE: - return gfxd_puts("G_SETTILESIZE"); - case G_LOADBLOCK: - return gfxd_puts("G_LOADBLOCK"); - case G_LOADTILE: - return gfxd_puts("G_LOADTILE"); - case G_SETTILE: - return gfxd_puts("G_SETTILE"); - case G_FILLRECT: - return gfxd_puts("G_FILLRECT"); - case G_SETFILLCOLOR: - return gfxd_puts("G_SETFILLCOLOR"); - case G_SETFOGCOLOR: - return gfxd_puts("G_SETFOGCOLOR"); - case G_SETBLENDCOLOR: - return gfxd_puts("G_SETBLENDCOLOR"); - case G_SETPRIMCOLOR: - return gfxd_puts("G_SETPRIMCOLOR"); - case G_SETENVCOLOR: - return gfxd_puts("G_SETENVCOLOR"); - case G_SETCOMBINE: - return gfxd_puts("G_SETCOMBINE"); - case G_SETTIMG: - return gfxd_puts("G_SETTIMG"); - case G_SETZIMG: - return gfxd_puts("G_SETZIMG"); - case G_SETCIMG: - return gfxd_puts("G_SETCIMG"); - default: - return gfxd_printf("0x%02" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_fmt(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_IM_FMT_RGBA: - return gfxd_puts("G_IM_FMT_RGBA"); - case G_IM_FMT_YUV: - return gfxd_puts("G_IM_FMT_YUV"); - case G_IM_FMT_CI: - return gfxd_puts("G_IM_FMT_CI"); - case G_IM_FMT_IA: - return gfxd_puts("G_IM_FMT_IA"); - case G_IM_FMT_I: - return gfxd_puts("G_IM_FMT_I"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_siz(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_IM_SIZ_4b: - return gfxd_puts("G_IM_SIZ_4b"); - case G_IM_SIZ_8b: - return gfxd_puts("G_IM_SIZ_8b"); - case G_IM_SIZ_16b: - return gfxd_puts("G_IM_SIZ_16b"); - case G_IM_SIZ_32b: - return gfxd_puts("G_IM_SIZ_32b"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_cm(const gfxd_value_t *v) -{ - int n = 0; - if (v->u & G_TX_MIRROR) - n += gfxd_puts("G_TX_MIRROR"); - else - n += gfxd_puts("G_TX_NOMIRROR"); - if (v->u & G_TX_CLAMP) - n += gfxd_puts(" | G_TX_CLAMP"); - else - n += gfxd_puts(" | G_TX_WRAP"); - return n; -} - -UCFUNC int argfn_tm(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("G_TX_NOMASK"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_ts(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("G_TX_NOLOD"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_switch(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ON: - return gfxd_puts("G_ON"); - case G_OFF: - return gfxd_puts("G_OFF"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_tile(const gfxd_value_t *v) -{ - if (v->i == G_TX_LOADTILE) - return gfxd_puts("G_TX_LOADTILE"); - else if (v->i == G_TX_RENDERTILE) - return gfxd_puts("G_TX_RENDERTILE"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_gm(const gfxd_value_t *v) -{ - int n = 0; - uint32_t arg = v->u; - if (arg & G_ZBUFFER) - n += gfxd_puts("G_ZBUFFER"); - if (arg & G_TEXTURE_ENABLE) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_ENABLE"); - } - if (arg & G_SHADE) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_SHADE"); - } - if ((arg & G_CULL_BOTH) == G_CULL_BOTH) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_BOTH"); - } - else - { - if (arg & G_CULL_FRONT) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_FRONT"); - } - if (arg & G_CULL_BACK) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_BACK"); - } - } - if (arg & G_FOG) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_FOG"); - } - if (arg & G_LIGHTING) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_LIGHTING"); - } - if (arg & G_TEXTURE_GEN) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_GEN"); - } - if (arg & G_TEXTURE_GEN_LINEAR) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_GEN_LINEAR"); - } - if (arg & G_LOD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_LOD"); - } - if (arg & G_SHADING_SMOOTH) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_SHADING_SMOOTH"); - } - if (arg & G_CLIPPING) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CLIPPING"); - } - arg = arg & ~(G_ZBUFFER | G_TEXTURE_ENABLE | G_SHADE | G_CULL_BOTH | - G_FOG | G_LIGHTING | G_TEXTURE_GEN | - G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | - G_CLIPPING); - if (arg) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_printf("0x%08" PRIX32, arg); - } - return n; -} - -UCFUNC int argfn_sftlo(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MDSFT_ALPHACOMPARE: - return gfxd_puts("G_MDSFT_ALPHACOMPARE"); - case G_MDSFT_ZSRCSEL: - return gfxd_puts("G_MDSFT_ZSRCSEL"); - case G_MDSFT_RENDERMODE: - return gfxd_puts("G_MDSFT_RENDERMODE"); - case G_MDSFT_BLENDER: - return gfxd_puts("G_MDSFT_BLENDER"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int rm_mode_str(uint32_t arg) -{ - int n = 0; - if (arg & AA_EN) - n += gfxd_puts("AA_EN"); - if (arg & Z_CMP) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("Z_CMP"); - } - if (arg & Z_UPD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("Z_UPD"); - } - if (arg & IM_RD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("IM_RD"); - } - if (arg & CLR_ON_CVG) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("CLR_ON_CVG"); - } - if (n > 0) - n += gfxd_puts(" | "); - int cvg = arg & 0x00000300; - switch (cvg) - { - case CVG_DST_CLAMP: - n += gfxd_puts("CVG_DST_CLAMP"); - break; - case CVG_DST_WRAP: - n += gfxd_puts("CVG_DST_WRAP"); - break; - case CVG_DST_FULL: - n += gfxd_puts("CVG_DST_FULL"); - break; - case CVG_DST_SAVE: - n += gfxd_puts("CVG_DST_SAVE"); - break; - } - int zmode = arg & 0x00000C00; - switch (zmode) - { - case ZMODE_OPA: - n += gfxd_puts(" | ZMODE_OPA"); - break; - case ZMODE_INTER: - n += gfxd_puts(" | ZMODE_INTER"); - break; - case ZMODE_XLU: - n += gfxd_puts(" | ZMODE_XLU"); - break; - case ZMODE_DEC: - n += gfxd_puts(" | ZMODE_DEC"); - break; - } - if (arg & CVG_X_ALPHA) - n += gfxd_puts(" | CVG_X_ALPHA"); - if (arg & ALPHA_CVG_SEL) - n += gfxd_puts(" | ALPHA_CVG_SEL"); - if (arg & FORCE_BL) - n += gfxd_puts(" | FORCE_BL"); - return n; -} - -UCFUNC int rm_cbl_str(uint32_t arg, int c) -{ - int n = 0; - if (c == 2) - arg <<= 2; - int bp = (arg >> 30) & 0b11; - switch (bp) - { - case G_BL_CLR_IN: - n += gfxd_printf("GBL_c%i(G_BL_CLR_IN", c); - break; - case G_BL_CLR_MEM: - n += gfxd_printf("GBL_c%i(G_BL_CLR_MEM", c); - break; - case G_BL_CLR_BL: - n += gfxd_printf("GBL_c%i(G_BL_CLR_BL", c); - break; - case G_BL_CLR_FOG: - n += gfxd_printf("GBL_c%i(G_BL_CLR_FOG", c); - break; - } - int ba = (arg >> 26) & 0b11; - switch (ba) - { - case G_BL_A_IN: - n += gfxd_puts(", G_BL_A_IN"); - break; - case G_BL_A_FOG: - n += gfxd_puts(", G_BL_A_FOG"); - break; - case G_BL_A_SHADE: - n += gfxd_puts(", G_BL_A_SHADE"); - break; - case G_BL_0: - n += gfxd_puts(", G_BL_0"); - break; - } - int bm = (arg >> 22) & 0b11; - switch (bm) - { - case G_BL_CLR_IN: - n += gfxd_puts(", G_BL_CLR_IN"); - break; - case G_BL_CLR_MEM: - n += gfxd_puts(", G_BL_CLR_MEM"); - break; - case G_BL_CLR_BL: - n += gfxd_puts(", G_BL_CLR_BL"); - break; - case G_BL_CLR_FOG: - n += gfxd_puts(", G_BL_CLR_FOG"); - break; - } - int bb = (arg >> 18) & 0b11; - switch (bb) - { - case G_BL_1MA: - n += gfxd_puts(", G_BL_1MA)"); - break; - case G_BL_A_MEM: - n += gfxd_puts(", G_BL_A_MEM)"); - break; - case G_BL_1: - n += gfxd_puts(", G_BL_1)"); - break; - case G_BL_0: - n += gfxd_puts(", G_BL_0)"); - break; - } - return n; -} - -struct rm_preset -{ - uint32_t rm; - const char * name; -}; - -static const struct rm_preset rm_presets[] = -{ - {G_RM_OPA_SURF, "G_RM_OPA_SURF"}, - {G_RM_OPA_SURF2, "G_RM_OPA_SURF2"}, - {G_RM_AA_OPA_SURF, "G_RM_AA_OPA_SURF"}, - {G_RM_AA_OPA_SURF2, "G_RM_AA_OPA_SURF2"}, - {G_RM_RA_OPA_SURF, "G_RM_RA_OPA_SURF"}, - {G_RM_RA_OPA_SURF2, "G_RM_RA_OPA_SURF2"}, - {G_RM_ZB_OPA_SURF, "G_RM_ZB_OPA_SURF"}, - {G_RM_ZB_OPA_SURF2, "G_RM_ZB_OPA_SURF2"}, - {G_RM_AA_ZB_OPA_SURF, "G_RM_AA_ZB_OPA_SURF"}, - {G_RM_AA_ZB_OPA_SURF2, "G_RM_AA_ZB_OPA_SURF2"}, - {G_RM_RA_ZB_OPA_SURF, "G_RM_RA_ZB_OPA_SURF"}, - {G_RM_RA_ZB_OPA_SURF2, "G_RM_RA_ZB_OPA_SURF2"}, - {G_RM_XLU_SURF, "G_RM_XLU_SURF"}, - {G_RM_XLU_SURF2, "G_RM_XLU_SURF2"}, - {G_RM_AA_XLU_SURF, "G_RM_AA_XLU_SURF"}, - {G_RM_AA_XLU_SURF2, "G_RM_AA_XLU_SURF2"}, - {G_RM_ZB_XLU_SURF, "G_RM_ZB_XLU_SURF"}, - {G_RM_ZB_XLU_SURF2, "G_RM_ZB_XLU_SURF2"}, - {G_RM_AA_ZB_XLU_SURF, "G_RM_AA_ZB_XLU_SURF"}, - {G_RM_AA_ZB_XLU_SURF2, "G_RM_AA_ZB_XLU_SURF2"}, - {G_RM_ZB_OPA_DECAL, "G_RM_ZB_OPA_DECAL"}, - {G_RM_ZB_OPA_DECAL2, "G_RM_ZB_OPA_DECAL2"}, - {G_RM_AA_ZB_OPA_DECAL, "G_RM_AA_ZB_OPA_DECAL"}, - {G_RM_AA_ZB_OPA_DECAL2, "G_RM_AA_ZB_OPA_DECAL2"}, - {G_RM_RA_ZB_OPA_DECAL, "G_RM_RA_ZB_OPA_DECAL"}, - {G_RM_RA_ZB_OPA_DECAL2, "G_RM_RA_ZB_OPA_DECAL2"}, - {G_RM_ZB_XLU_DECAL, "G_RM_ZB_XLU_DECAL"}, - {G_RM_ZB_XLU_DECAL2, "G_RM_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_XLU_DECAL, "G_RM_AA_ZB_XLU_DECAL"}, - {G_RM_AA_ZB_XLU_DECAL2, "G_RM_AA_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_OPA_INTER, "G_RM_AA_ZB_OPA_INTER"}, - {G_RM_AA_ZB_OPA_INTER2, "G_RM_AA_ZB_OPA_INTER2"}, - {G_RM_RA_ZB_OPA_INTER, "G_RM_RA_ZB_OPA_INTER"}, - {G_RM_RA_ZB_OPA_INTER2, "G_RM_RA_ZB_OPA_INTER2"}, - {G_RM_AA_ZB_XLU_INTER, "G_RM_AA_ZB_XLU_INTER"}, - {G_RM_AA_ZB_XLU_INTER2, "G_RM_AA_ZB_XLU_INTER2"}, - {G_RM_AA_XLU_LINE, "G_RM_AA_XLU_LINE"}, - {G_RM_AA_XLU_LINE2, "G_RM_AA_XLU_LINE2"}, - {G_RM_AA_ZB_XLU_LINE, "G_RM_AA_ZB_XLU_LINE"}, - {G_RM_AA_ZB_XLU_LINE2, "G_RM_AA_ZB_XLU_LINE2"}, - {G_RM_AA_DEC_LINE, "G_RM_AA_DEC_LINE"}, - {G_RM_AA_DEC_LINE2, "G_RM_AA_DEC_LINE2"}, - {G_RM_AA_ZB_DEC_LINE, "G_RM_AA_ZB_DEC_LINE"}, - {G_RM_AA_ZB_DEC_LINE2, "G_RM_AA_ZB_DEC_LINE2"}, - {G_RM_TEX_EDGE, "G_RM_TEX_EDGE"}, - {G_RM_TEX_EDGE2, "G_RM_TEX_EDGE2"}, - {G_RM_AA_TEX_EDGE, "G_RM_AA_TEX_EDGE"}, - {G_RM_AA_TEX_EDGE2, "G_RM_AA_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_EDGE, "G_RM_AA_ZB_TEX_EDGE"}, - {G_RM_AA_ZB_TEX_EDGE2, "G_RM_AA_ZB_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_INTER, "G_RM_AA_ZB_TEX_INTER"}, - {G_RM_AA_ZB_TEX_INTER2, "G_RM_AA_ZB_TEX_INTER2"}, - {G_RM_AA_SUB_SURF, "G_RM_AA_SUB_SURF"}, - {G_RM_AA_SUB_SURF2, "G_RM_AA_SUB_SURF2"}, - {G_RM_AA_ZB_SUB_SURF, "G_RM_AA_ZB_SUB_SURF"}, - {G_RM_AA_ZB_SUB_SURF2, "G_RM_AA_ZB_SUB_SURF2"}, - {G_RM_PCL_SURF, "G_RM_PCL_SURF"}, - {G_RM_PCL_SURF2, "G_RM_PCL_SURF2"}, - {G_RM_AA_PCL_SURF, "G_RM_AA_PCL_SURF"}, - {G_RM_AA_PCL_SURF2, "G_RM_AA_PCL_SURF2"}, - {G_RM_ZB_PCL_SURF, "G_RM_ZB_PCL_SURF"}, - {G_RM_ZB_PCL_SURF2, "G_RM_ZB_PCL_SURF2"}, - {G_RM_AA_ZB_PCL_SURF, "G_RM_AA_ZB_PCL_SURF"}, - {G_RM_AA_ZB_PCL_SURF2, "G_RM_AA_ZB_PCL_SURF2"}, - {G_RM_AA_OPA_TERR, "G_RM_AA_OPA_TERR"}, - {G_RM_AA_OPA_TERR2, "G_RM_AA_OPA_TERR2"}, - {G_RM_AA_ZB_OPA_TERR, "G_RM_AA_ZB_OPA_TERR"}, - {G_RM_AA_ZB_OPA_TERR2, "G_RM_AA_ZB_OPA_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_ZB_TEX_TERR, "G_RM_AA_ZB_TEX_TERR"}, - {G_RM_AA_ZB_TEX_TERR2, "G_RM_AA_ZB_TEX_TERR2"}, - {G_RM_AA_SUB_TERR, "G_RM_AA_SUB_TERR"}, - {G_RM_AA_SUB_TERR2, "G_RM_AA_SUB_TERR2"}, - {G_RM_AA_ZB_SUB_TERR, "G_RM_AA_ZB_SUB_TERR"}, - {G_RM_AA_ZB_SUB_TERR2, "G_RM_AA_ZB_SUB_TERR2"}, - {G_RM_CLD_SURF, "G_RM_CLD_SURF"}, - {G_RM_CLD_SURF2, "G_RM_CLD_SURF2"}, - {G_RM_ZB_CLD_SURF, "G_RM_ZB_CLD_SURF"}, - {G_RM_ZB_CLD_SURF2, "G_RM_ZB_CLD_SURF2"}, - {G_RM_ZB_OVL_SURF, "G_RM_ZB_OVL_SURF"}, - {G_RM_ZB_OVL_SURF2, "G_RM_ZB_OVL_SURF2"}, - {G_RM_ADD, "G_RM_ADD"}, - {G_RM_ADD2, "G_RM_ADD2"}, - {G_RM_VISCVG, "G_RM_VISCVG"}, - {G_RM_VISCVG2, "G_RM_VISCVG2"}, - {G_RM_OPA_CI, "G_RM_OPA_CI"}, - {G_RM_OPA_CI2, "G_RM_OPA_CI2"}, - {G_RM_RA_SPRITE, "G_RM_RA_SPRITE"}, - {G_RM_RA_SPRITE2, "G_RM_RA_SPRITE2"}, -}; - -static const struct rm_preset bl1_presets[] = -{ - {G_RM_FOG_SHADE_A, "G_RM_FOG_SHADE_A"}, - {G_RM_FOG_PRIM_A, "G_RM_FOG_PRIM_A"}, - {G_RM_PASS, "G_RM_PASS"}, - {G_RM_NOOP, "G_RM_NOOP"}, -}; - -static const struct rm_preset bl2_presets[] = -{ - {G_RM_NOOP2, "G_RM_NOOP2"}, -}; - -UCFUNC int othermodelo_str(uint32_t arg, uint32_t which) -{ - int n = 0; - uint32_t rm_c1_mask = MDMASK_RM_C1; - uint32_t rm_c2_mask = MDMASK_RM_C2; - uint32_t rm_mode_lo = MDMASK_RM_LO; - uint32_t rm_mask = rm_c1_mask | rm_c2_mask | rm_mode_lo; - const struct rm_preset *pre_c1 = NULL; - const struct rm_preset *pre_c2 = NULL; - int n_rm_presets = sizeof(rm_presets) / sizeof(*rm_presets); - for (int i = 0; i < n_rm_presets; i++) - { - const struct rm_preset *pre = &rm_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c1 = arg & (rm_c1_mask | rm_mode_lo | pre_extra); - if (!pre_c1 && rm_c1 == pre->rm) - pre_c1 = pre; - uint32_t rm_c2 = arg & (rm_c2_mask | rm_mode_lo | pre_extra); - if (!pre_c2 && rm_c2 == pre->rm) - pre_c2 = pre; - } - if (!pre_c1 || !pre_c2 || pre_c1 + 1 != pre_c2) - { - int n_bl1_presets = sizeof(bl1_presets) / sizeof(*bl1_presets); - for (int i = 0; i < n_bl1_presets; i++) - { - const struct rm_preset *pre = &bl1_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c1 = arg & (rm_c1_mask | pre_extra); - if (rm_c1 == pre->rm) - { - pre_c1 = pre; - break; - } - } - int n_bl2_presets = sizeof(bl2_presets) / sizeof(*bl2_presets); - for (int i = 0; i < n_bl2_presets; i++) - { - const struct rm_preset *pre = &bl2_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c2 = arg & (rm_c2_mask | pre_extra); - if (rm_c2 == pre->rm) - { - pre_c2 = pre; - break; - } - } - } - uint32_t pre_rm = 0; - if (pre_c1) - pre_rm |= pre_c1->rm; - if (pre_c2) - pre_rm |= pre_c2->rm; - uint32_t ac_mask = MDMASK(ALPHACOMPARE); - if (((arg & ~pre_rm) | which) & ac_mask) - { - uint32_t ac = arg & ac_mask; - switch (ac) - { - case G_AC_NONE: - n += gfxd_puts("G_AC_NONE"); - break; - case G_AC_THRESHOLD: - n += gfxd_puts("G_AC_THRESHOLD"); - break; - case G_AC_DITHER: - n += gfxd_puts("G_AC_DITHER"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ac); - break; - } - } - uint32_t zs_mask = MDMASK(ZSRCSEL); - if (((arg & ~pre_rm) | which) & zs_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t zs = arg & zs_mask; - switch (zs) - { - case G_ZS_PIXEL: - n += gfxd_puts("G_ZS_PIXEL"); - break; - case G_ZS_PRIM: - n += gfxd_puts("G_ZS_PRIM"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, zs); - break; - } - } - uint32_t rm = arg & (rm_mask | pre_rm); - if (((arg & ~pre_rm) | which) & rm_mode_lo) - { - if (n > 0) - n += gfxd_puts(" | "); - n += rm_mode_str(rm); - } - int c = 0; - if (which & rm_c1_mask) - c |= 1; - if (which & rm_c2_mask) - c |= 2; - if (c & 1 || (c == 0 && arg & rm_c1_mask)) - { - if (n > 0) - n += gfxd_puts(" | "); - if (pre_c1) - n += gfxd_printf("%s", pre_c1->name); - else - n += rm_cbl_str(rm, 1); - } - if (c & 2 || (c == 0 && arg & rm_c2_mask)) - { - if (n > 0) - n += gfxd_puts(" | "); - if (pre_c2) - n += gfxd_printf("%s", pre_c2->name); - else - n += rm_cbl_str(rm, 2); - } - uint32_t unk_mask = ~(rm_mask | ac_mask | zs_mask); - if (arg & unk_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t unk = arg & unk_mask; - n += gfxd_printf("0x%08" PRIX32, unk); - } - return n; -} - -UCFUNC int argfn_ac(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK(ALPHACOMPARE)); -} - -UCFUNC int argfn_zs(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK(ZSRCSEL)); -} - -UCFUNC int argfn_rm1(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK_RM_C1); -} - -UCFUNC int argfn_rm2(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK_RM_C2); -} - -UCFUNC int argfn_othermodelo(const gfxd_value_t *v) -{ - uint32_t mask = MDMASK(ALPHACOMPARE) | MDMASK(ZSRCSEL) | MDMASK_RM_C1 | - MDMASK_RM_C2; - return othermodelo_str(v->u, mask); -} - -UCFUNC int argfn_sfthi(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MDSFT_ALPHADITHER: - return gfxd_puts("G_MDSFT_ALPHADITHER"); - case G_MDSFT_RGBDITHER: - return gfxd_puts("G_MDSFT_RGBDITHER"); - case G_MDSFT_COMBKEY: - return gfxd_puts("G_MDSFT_COMBKEY"); - case G_MDSFT_TEXTCONV: - return gfxd_puts("G_MDSFT_TEXTCONV"); - case G_MDSFT_TEXTFILT: - return gfxd_puts("G_MDSFT_TEXTFILT"); - case G_MDSFT_TEXTLUT: - return gfxd_puts("G_MDSFT_TEXTLUT"); - case G_MDSFT_TEXTLOD: - return gfxd_puts("G_MDSFT_TEXTLOD"); - case G_MDSFT_TEXTDETAIL: - return gfxd_puts("G_MDSFT_TEXTDETAIL"); - case G_MDSFT_TEXTPERSP: - return gfxd_puts("G_MDSFT_TEXTPERSP"); - case G_MDSFT_CYCLETYPE: - return gfxd_puts("G_MDSFT_CYCLETYPE"); - case G_MDSFT_PIPELINE: - return gfxd_puts("G_MDSFT_PIPELINE"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int othermodehi_str(uint32_t arg, uint32_t which) -{ - int n = 0; - uint32_t ad_mask = MDMASK(ALPHADITHER); - if ((arg | which) & ad_mask) - { - uint32_t ad = arg & ad_mask; - switch (ad) - { - case G_AD_PATTERN: - n += gfxd_puts("G_AD_PATTERN"); - break; - case G_AD_NOTPATTERN: - n += gfxd_puts("G_AD_NOTPATTERN"); - break; - case G_AD_NOISE: - n += gfxd_puts("G_AD_NOISE"); - break; - case G_AD_DISABLE: - n += gfxd_puts("G_AD_DISABLE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ad); - break; - } - } - uint32_t cd_mask = MDMASK(RGBDITHER); - if ((arg | which) & cd_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t cd = arg & cd_mask; - switch (cd) - { - case G_CD_MAGICSQ: - n += gfxd_puts("G_CD_MAGICSQ"); - break; - case G_CD_BAYER: - n += gfxd_puts("G_CD_BAYER"); - break; - case G_CD_NOISE: - n += gfxd_puts("G_CD_NOISE"); - break; - case G_CD_DISABLE: - n += gfxd_puts("G_CD_DISABLE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, cd); - break; - } - } - uint32_t ck_mask = MDMASK(COMBKEY); - if ((arg | which) & ck_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t ck = arg & ck_mask; - switch (ck) - { - case G_CK_NONE: - n += gfxd_puts("G_CK_NONE"); - break; - case G_CK_KEY: - n += gfxd_puts("G_CK_KEY"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ck); - break; - } - } - uint32_t tc_mask = MDMASK(TEXTCONV); - if ((arg | which) & tc_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tc = arg & tc_mask; - switch (tc) - { - case G_TC_CONV: - n += gfxd_puts("G_TC_CONV"); - break; - case G_TC_FILTCONV: - n += gfxd_puts("G_TC_FILTCONV"); - break; - case G_TC_FILT: - n += gfxd_puts("G_TC_FILT"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tc); - break; - } - } - uint32_t tf_mask = MDMASK(TEXTFILT); - if ((arg | which) & tf_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tf = arg & tf_mask; - switch (tf) - { - case G_TF_POINT: - n += gfxd_puts("G_TF_POINT"); - break; - case G_TF_BILERP: - n += gfxd_puts("G_TF_BILERP"); - break; - case G_TF_AVERAGE: - n += gfxd_puts("G_TF_AVERAGE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tf); - break; - } - } - uint32_t tt_mask = MDMASK(TEXTLUT); - if ((arg | which) & tt_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tt = arg & tt_mask; - switch (tt) - { - case G_TT_NONE: - n += gfxd_puts("G_TT_NONE"); - break; - case G_TT_RGBA16: - n += gfxd_puts("G_TT_RGBA16"); - break; - case G_TT_IA16: - n += gfxd_puts("G_TT_IA16"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tt); - break; - } - } - uint32_t tl_mask = MDMASK(TEXTLOD); - if ((arg | which) & tl_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tl = arg & tl_mask; - switch (tl) - { - case G_TL_TILE: - n += gfxd_puts("G_TL_TILE"); - break; - case G_TL_LOD: - n += gfxd_puts("G_TL_LOD"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tl); - break; - } - } - uint32_t td_mask = MDMASK(TEXTDETAIL); - if ((arg | which) & td_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t td = arg & td_mask; - switch (td) - { - case G_TD_CLAMP: - n += gfxd_puts("G_TD_CLAMP"); - break; - case G_TD_SHARPEN: - n += gfxd_puts("G_TD_SHARPEN"); - break; - case G_TD_DETAIL: - n += gfxd_puts("G_TD_DETAIL"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, td); - break; - } - } - uint32_t tp_mask = MDMASK(TEXTPERSP); - if ((arg | which) & tp_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tp = arg & tp_mask; - switch (tp) - { - case G_TP_NONE: - n += gfxd_puts("G_TP_NONE"); - break; - case G_TP_PERSP: - n += gfxd_puts("G_TP_PERSP"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tp); - break; - } - } - uint32_t cyc_mask = MDMASK(CYCLETYPE); - if ((arg | which) & cyc_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t cyc = arg & cyc_mask; - switch (cyc) - { - case G_CYC_1CYCLE: - n += gfxd_puts("G_CYC_1CYCLE"); - break; - case G_CYC_2CYCLE: - n += gfxd_puts("G_CYC_2CYCLE"); - break; - case G_CYC_COPY: - n += gfxd_puts("G_CYC_COPY"); - break; - case G_CYC_FILL: - n += gfxd_puts("G_CYC_FILL"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, cyc); - break; - } - } - uint32_t pm_mask = MDMASK(PIPELINE); - if ((arg | which) & pm_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t pm = arg & pm_mask; - switch (pm) - { - case G_PM_NPRIMITIVE: - n += gfxd_puts("G_PM_NPRIMITIVE"); - break; - case G_PM_1PRIMITIVE: - n += gfxd_puts("G_PM_1PRIMITIVE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, pm); - break; - } - } - uint32_t unk_mask = ~(ad_mask | cd_mask | ck_mask | tc_mask | tf_mask | - tt_mask | tl_mask | td_mask | tp_mask | - cyc_mask | pm_mask); - if (arg & unk_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t unk = arg & unk_mask; - n += gfxd_printf("0x%08" PRIX32, unk); - } - return n; -} - -UCFUNC int argfn_ad(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(ALPHADITHER)); -} - -UCFUNC int argfn_cd(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(RGBDITHER)); -} - -UCFUNC int argfn_ck(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(COMBKEY)); -} - -UCFUNC int argfn_tc(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTCONV)); -} - -UCFUNC int argfn_tf(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTFILT)); -} - -UCFUNC int argfn_tt(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTLUT)); -} - -UCFUNC int argfn_tl(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTLOD)); -} - -UCFUNC int argfn_td(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTDETAIL)); -} - -UCFUNC int argfn_tp(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTPERSP)); -} - -UCFUNC int argfn_cyc(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(CYCLETYPE)); -} - -UCFUNC int argfn_pm(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(PIPELINE)); -} - -UCFUNC int argfn_othermodehi(const gfxd_value_t *v) -{ - uint32_t mask = MDMASK(ALPHADITHER) | - MDMASK(RGBDITHER) | - MDMASK(COMBKEY) | - MDMASK(TEXTCONV) | - MDMASK(TEXTFILT) | - MDMASK(TEXTLUT) | - MDMASK(TEXTLOD) | - MDMASK(TEXTDETAIL) | - MDMASK(TEXTPERSP) | - MDMASK(CYCLETYPE) | - MDMASK(PIPELINE); - return othermodehi_str(v->u, mask); -} - -UCFUNC int argfn_cv(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CV_K0: - return gfxd_puts("G_CV_K0"); - case G_CV_K1: - return gfxd_puts("G_CV_K1"); - case G_CV_K2: - return gfxd_puts("G_CV_K2"); - case G_CV_K3: - return gfxd_puts("G_CV_K3"); - case G_CV_K4: - return gfxd_puts("G_CV_K4"); - case G_CV_K5: - return gfxd_puts("G_CV_K5"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_ccmuxa(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_1: - return gfxd_puts("1"); - case G_CCMUX_NOISE: - return gfxd_puts("NOISE"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxb(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_CENTER: - return gfxd_puts("CENTER"); - case G_CCMUX_K4: - return gfxd_puts("K4"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_SCALE: - return gfxd_puts("SCALE"); - case G_CCMUX_COMBINED_ALPHA: - return gfxd_puts("COMBINED_ALPHA"); - case G_CCMUX_TEXEL0_ALPHA: - return gfxd_puts("TEXEL0_ALPHA"); - case G_CCMUX_TEXEL1_ALPHA: - return gfxd_puts("TEXEL1_ALPHA"); - case G_CCMUX_PRIMITIVE_ALPHA: - return gfxd_puts("PRIMITIVE_ALPHA"); - case G_CCMUX_SHADE_ALPHA: - return gfxd_puts("SHADE_ALPHA"); - case G_CCMUX_ENV_ALPHA: - return gfxd_puts("ENV_ALPHA"); - case G_CCMUX_LOD_FRACTION: - return gfxd_puts("LOD_FRACTION"); - case G_CCMUX_PRIM_LOD_FRAC: - return gfxd_puts("PRIM_LOD_FRAC"); - case G_CCMUX_K5: - return gfxd_puts("K5"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxd(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_1: - return gfxd_puts("1"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_acmuxabd(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ACMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_ACMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_ACMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_ACMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_ACMUX_SHADE: - return gfxd_puts("SHADE"); - case G_ACMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_ACMUX_1: - return gfxd_puts("1"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_acmuxc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ACMUX_LOD_FRACTION: - return gfxd_puts("LOD_FRACTION"); - case G_ACMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_ACMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_ACMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_ACMUX_SHADE: - return gfxd_puts("SHADE"); - case G_ACMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_ACMUX_PRIM_LOD_FRAC: - return gfxd_puts("PRIM_LOD_FRAC"); - default: - return gfxd_puts("0"); - } -} - -struct cc_mode -{ - int a; - int b; - int c; - int d; - int Aa; - int Ab; - int Ac; - int Ad; -}; - -struct cc_preset -{ - struct cc_mode mode; - const char * name; -}; - -#define CC_(a,b,c,d,Aa,Ab,Ac,Ad) \ - { \ - G_CCMUX_##a, G_CCMUX_##b, \ - G_CCMUX_##c, G_CCMUX_##d, \ - G_ACMUX_##Aa, G_ACMUX_##Ab, \ - G_ACMUX_##Ac, G_ACMUX_##Ad \ - } -#define CC(m) CC_(m) -static const struct cc_preset cc_presets[] = -{ - {CC(G_CC_MODULATEI), "G_CC_MODULATEI"}, - {CC(G_CC_MODULATEIA), "G_CC_MODULATEIA"}, - {CC(G_CC_MODULATEIDECALA), "G_CC_MODULATEIDECALA"}, - {CC(G_CC_MODULATERGB), "G_CC_MODULATERGB"}, - {CC(G_CC_MODULATERGBA), "G_CC_MODULATERGBA"}, - {CC(G_CC_MODULATERGBDECALA), "G_CC_MODULATERGBDECALA"}, - {CC(G_CC_MODULATEI_PRIM), "G_CC_MODULATEI_PRIM"}, - {CC(G_CC_MODULATEIA_PRIM), "G_CC_MODULATEIA_PRIM"}, - {CC(G_CC_MODULATEIDECALA_PRIM), "G_CC_MODULATEIDECALA_PRIM"}, - {CC(G_CC_MODULATERGB_PRIM), "G_CC_MODULATERGB_PRIM"}, - {CC(G_CC_MODULATERGBA_PRIM), "G_CC_MODULATERGBA_PRIM"}, - {CC(G_CC_MODULATERGBDECALA_PRIM), "G_CC_MODULATERGBDECALA_PRIM"}, - {CC(G_CC_DECALRGB), "G_CC_DECALRGB"}, - {CC(G_CC_DECALRGBA), "G_CC_DECALRGBA"}, - {CC(G_CC_BLENDI), "G_CC_BLENDI"}, - {CC(G_CC_BLENDIA), "G_CC_BLENDIA"}, - {CC(G_CC_BLENDIDECALA), "G_CC_BLENDIDECALA"}, - {CC(G_CC_BLENDRGBA), "G_CC_BLENDRGBA"}, - {CC(G_CC_BLENDRGBDECALA), "G_CC_BLENDRGBDECALA"}, - {CC(G_CC_REFLECTRGB), "G_CC_REFLECTRGB"}, - {CC(G_CC_REFLECTRGBDECALA), "G_CC_REFLECTRGBDECALA"}, - {CC(G_CC_HILITERGB), "G_CC_HILITERGB"}, - {CC(G_CC_HILITERGBA), "G_CC_HILITERGBA"}, - {CC(G_CC_HILITERGBDECALA), "G_CC_HILITERGBDECALA"}, - {CC(G_CC_1CYUV2RGB), "G_CC_1CYUV2RGB"}, - {CC(G_CC_PRIMITIVE), "G_CC_PRIMITIVE"}, - {CC(G_CC_SHADE), "G_CC_SHADE"}, - {CC(G_CC_ADDRGB), "G_CC_ADDRGB"}, - {CC(G_CC_ADDRGBDECALA), "G_CC_ADDRGBDECALA"}, - {CC(G_CC_SHADEDECALA), "G_CC_SHADEDECALA"}, - {CC(G_CC_BLENDPE), "G_CC_BLENDPE"}, - {CC(G_CC_BLENDPEDECALA), "G_CC_BLENDPEDECALA"}, - {CC(G_CC_TRILERP), "G_CC_TRILERP"}, - {CC(G_CC_TEMPLERP), "G_CC_TEMPLERP"}, - {CC(G_CC_INTERFERENCE), "G_CC_INTERFERENCE"}, - {CC(_G_CC_BLENDPE), "_G_CC_BLENDPE"}, - {CC(_G_CC_BLENDPEDECALA), "_G_CC_BLENDPEDECALA"}, - {CC(_G_CC_SPARSEST), "_G_CC_SPARSEST"}, - {CC(_G_CC_TWOCOLORTEX), "_G_CC_TWOCOLORTEX"}, - {CC(G_CC_MODULATEI2), "G_CC_MODULATEI2"}, - {CC(G_CC_MODULATEIA2), "G_CC_MODULATEIA2"}, - {CC(G_CC_MODULATERGB2), "G_CC_MODULATERGB2"}, - {CC(G_CC_MODULATERGBA2), "G_CC_MODULATERGBA2"}, - {CC(G_CC_MODULATEI_PRIM2), "G_CC_MODULATEI_PRIM2"}, - {CC(G_CC_MODULATEIA_PRIM2), "G_CC_MODULATEIA_PRIM2"}, - {CC(G_CC_MODULATERGB_PRIM2), "G_CC_MODULATERGB_PRIM2"}, - {CC(G_CC_MODULATERGBA_PRIM2), "G_CC_MODULATERGBA_PRIM2"}, - {CC(G_CC_DECALRGB2), "G_CC_DECALRGB2"}, - {CC(G_CC_BLENDI2), "G_CC_BLENDI2"}, - {CC(G_CC_BLENDIA2), "G_CC_BLENDIA2"}, - {CC(G_CC_HILITERGB2), "G_CC_HILITERGB2"}, - {CC(G_CC_HILITERGBA2), "G_CC_HILITERGBA2"}, - {CC(G_CC_HILITERGBDECALA2), "G_CC_HILITERGBDECALA2"}, - {CC(G_CC_HILITERGBPASSA2), "G_CC_HILITERGBPASSA2"}, - {CC(G_CC_CHROMA_KEY2), "G_CC_CHROMA_KEY2"}, - {CC(G_CC_YUV2RGB), "G_CC_YUV2RGB"}, - {CC(G_CC_PASS2), "G_CC_PASS2"}, -}; -#undef CC_ -#undef CC - -UCFUNC int argfn_ccpre(const gfxd_value_t *v) -{ - return gfxd_printf("%s", cc_presets[v->i].name); -} - -UCFUNC int argfn_sc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_SC_NON_INTERLACE: - return gfxd_puts("G_SC_NON_INTERLACE"); - case G_SC_EVEN_INTERLACE: - return gfxd_puts("G_SC_EVEN_INTERLACE"); - case G_SC_ODD_INTERLACE: - return gfxd_puts("G_SC_ODD_INTERLACE"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int argfn_bz(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_BZ_PERSP: - return gfxd_puts("G_BZ_PERSP"); - default: - return gfxd_puts("G_BZ_ORTHO"); - } -} -#endif - -UCFUNC int argfn_dlf(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_DL_PUSH: - return gfxd_puts("G_DL_PUSH"); - case G_DL_NOPUSH: - return gfxd_puts("G_DL_NOPUSH"); - default: - return gfxd_printf("%" PRIi32, v->i);; - } -} - -UCFUNC int argfn_mp(const gfxd_value_t *v) -{ - int n = 0; - if (v->u & G_MTX_PUSH) - n += gfxd_puts("G_MTX_PUSH"); - else - n += gfxd_puts("G_MTX_NOPUSH"); - if (v->u & G_MTX_LOAD) - n += gfxd_puts(" | G_MTX_LOAD"); - else - n += gfxd_puts(" | G_MTX_MUL"); - if (v->u & G_MTX_PROJECTION) - n += gfxd_puts(" | G_MTX_PROJECTION"); - else - n += gfxd_puts(" | G_MTX_MODELVIEW"); - for (int i = 3; i < 8; i++) - if (v->u & (1 << i)) - n += gfxd_printf(" | 0x%02x", 1 << i); - return n; -} - -UCFUNC int argfn_ms(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MTX_MODELVIEW: - return gfxd_puts("G_MTX_MODELVIEW"); - case G_MTX_PROJECTION: - return gfxd_puts("G_MTX_PROJECTION"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_mw(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MW_MATRIX: - return gfxd_puts("G_MW_MATRIX"); - case G_MW_NUMLIGHT: - return gfxd_puts("G_MW_NUMLIGHT"); - case G_MW_CLIP: - return gfxd_puts("G_MW_CLIP"); - case G_MW_SEGMENT: - return gfxd_puts("G_MW_SEGMENT"); - case G_MW_FOG: - return gfxd_puts("G_MW_FOG"); - case G_MW_LIGHTCOL: - return gfxd_puts("G_MW_LIGHTCOL"); - case G_MW_PERSPNORM: - return gfxd_puts("G_MW_PERSPNORM"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_MW_POINTS: - return gfxd_puts("G_MW_POINTS"); -#endif -#if defined(F3DEX_GBI_2) - case G_MW_FORCEMTX: - return gfxd_puts("G_MW_FORCEMTX"); -#endif - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_mwo_clip(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_CLIP_RNX: - return gfxd_puts("G_MWO_CLIP_RNX"); - case G_MWO_CLIP_RNY: - return gfxd_puts("G_MWO_CLIP_RNY"); - case G_MWO_CLIP_RPX: - return gfxd_puts("G_MWO_CLIP_RPX"); - case G_MWO_CLIP_RPY: - return gfxd_puts("G_MWO_CLIP_RPY"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mwo_lightcol(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_aLIGHT_1: - return gfxd_puts("G_MWO_aLIGHT_1"); - case G_MWO_bLIGHT_1: - return gfxd_puts("G_MWO_bLIGHT_1"); - case G_MWO_aLIGHT_2: - return gfxd_puts("G_MWO_aLIGHT_2"); - case G_MWO_bLIGHT_2: - return gfxd_puts("G_MWO_bLIGHT_2"); - case G_MWO_aLIGHT_3: - return gfxd_puts("G_MWO_aLIGHT_3"); - case G_MWO_bLIGHT_3: - return gfxd_puts("G_MWO_bLIGHT_3"); - case G_MWO_aLIGHT_4: - return gfxd_puts("G_MWO_aLIGHT_4"); - case G_MWO_bLIGHT_4: - return gfxd_puts("G_MWO_bLIGHT_4"); - case G_MWO_aLIGHT_5: - return gfxd_puts("G_MWO_aLIGHT_5"); - case G_MWO_bLIGHT_5: - return gfxd_puts("G_MWO_bLIGHT_5"); - case G_MWO_aLIGHT_6: - return gfxd_puts("G_MWO_aLIGHT_6"); - case G_MWO_bLIGHT_6: - return gfxd_puts("G_MWO_bLIGHT_6"); - case G_MWO_aLIGHT_7: - return gfxd_puts("G_MWO_aLIGHT_7"); - case G_MWO_bLIGHT_7: - return gfxd_puts("G_MWO_bLIGHT_7"); - case G_MWO_aLIGHT_8: - return gfxd_puts("G_MWO_aLIGHT_8"); - case G_MWO_bLIGHT_8: - return gfxd_puts("G_MWO_bLIGHT_8"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_lightnum(const gfxd_value_t *v) -{ - return gfxd_printf("LIGHT_%" PRIi32, v->i); -} - -UCFUNC int argfn_lightsn(const gfxd_value_t *v) -{ - return gfxd_printf("*(Lightsn *)0x%08" PRIX32, v->u); -} - -UCFUNC int argfn_mwo_matrix(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_MATRIX_XX_XY_I: - return gfxd_puts("G_MWO_MATRIX_XX_XY_I"); - case G_MWO_MATRIX_XZ_XW_I: - return gfxd_puts("G_MWO_MATRIX_XZ_XW_I"); - case G_MWO_MATRIX_YX_YY_I: - return gfxd_puts("G_MWO_MATRIX_YX_YY_I"); - case G_MWO_MATRIX_YZ_YW_I: - return gfxd_puts("G_MWO_MATRIX_YZ_YW_I"); - case G_MWO_MATRIX_ZX_ZY_I: - return gfxd_puts("G_MWO_MATRIX_ZX_ZY_I"); - case G_MWO_MATRIX_ZZ_ZW_I: - return gfxd_puts("G_MWO_MATRIX_ZZ_ZW_I"); - case G_MWO_MATRIX_WX_WY_I: - return gfxd_puts("G_MWO_MATRIX_WX_WY_I"); - case G_MWO_MATRIX_WZ_WW_I: - return gfxd_puts("G_MWO_MATRIX_WZ_WW_I"); - case G_MWO_MATRIX_XX_XY_F: - return gfxd_puts("G_MWO_MATRIX_XX_XY_F"); - case G_MWO_MATRIX_XZ_XW_F: - return gfxd_puts("G_MWO_MATRIX_XZ_XW_F"); - case G_MWO_MATRIX_YX_YY_F: - return gfxd_puts("G_MWO_MATRIX_YX_YY_F"); - case G_MWO_MATRIX_YZ_YW_F: - return gfxd_puts("G_MWO_MATRIX_YZ_YW_F"); - case G_MWO_MATRIX_ZX_ZY_F: - return gfxd_puts("G_MWO_MATRIX_ZX_ZY_F"); - case G_MWO_MATRIX_ZZ_ZW_F: - return gfxd_puts("G_MWO_MATRIX_ZZ_ZW_F"); - case G_MWO_MATRIX_WX_WY_F: - return gfxd_puts("G_MWO_MATRIX_WX_WY_F"); - case G_MWO_MATRIX_WZ_WW_F: - return gfxd_puts("G_MWO_MATRIX_WZ_WW_F"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mwo_point(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_POINT_RGBA: - return gfxd_puts("G_MWO_POINT_RGBA"); - case G_MWO_POINT_ST: - return gfxd_puts("G_MWO_POINT_ST"); - case G_MWO_POINT_XYSCREEN: - return gfxd_puts("G_MWO_POINT_XYSCREEN"); - case G_MWO_POINT_ZSCREEN: - return gfxd_puts("G_MWO_POINT_ZSCREEN"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mv(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MV_VIEWPORT: - return gfxd_puts("G_MV_VIEWPORT"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_MV_LOOKATY: - return gfxd_puts("G_MV_LOOKATY"); - case G_MV_LOOKATX: - return gfxd_puts("G_MV_LOOKATX"); - case G_MV_L0: - return gfxd_puts("G_MV_L0"); - case G_MV_L1: - return gfxd_puts("G_MV_L1"); - case G_MV_L2: - return gfxd_puts("G_MV_L2"); - case G_MV_L3: - return gfxd_puts("G_MV_L3"); - case G_MV_L4: - return gfxd_puts("G_MV_L4"); - case G_MV_L5: - return gfxd_puts("G_MV_L5"); - case G_MV_L6: - return gfxd_puts("G_MV_L6"); - case G_MV_L7: - return gfxd_puts("G_MV_L7"); - case G_MV_TXTATT: - return gfxd_puts("G_MV_TXTATT"); - case G_MV_MATRIX_2: - return gfxd_puts("G_MV_MATRIX_2"); - case G_MV_MATRIX_3: - return gfxd_puts("G_MV_MATRIX_3"); - case G_MV_MATRIX_4: - return gfxd_puts("G_MV_MATRIX_4"); - case G_MV_MATRIX_1: - return gfxd_puts("G_MV_MATRIX_1"); -#elif defined(F3DEX_GBI_2) - case G_MV_MMTX: - return gfxd_puts("G_MV_MMTX"); - case G_MV_PMTX: - return gfxd_puts("G_MV_PMTX"); - case G_MV_LIGHT: - return gfxd_puts("G_MV_LIGHT"); - case G_MV_POINT: - return gfxd_puts("G_MV_POINT"); - case G_MV_MATRIX: - return gfxd_puts("G_MV_MATRIX"); -#endif - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_cr(const gfxd_value_t *v) -{ - switch (v->u) - { - case FRUSTRATIO_1: - return gfxd_puts("FRUSTRATIO_1"); - case FRUSTRATIO_2: - return gfxd_puts("FRUSTRATIO_2"); - case FRUSTRATIO_3: - return gfxd_puts("FRUSTRATIO_3"); - case FRUSTRATIO_4: - return gfxd_puts("FRUSTRATIO_4"); - case FRUSTRATIO_5: - return gfxd_puts("FRUSTRATIO_5"); - case FRUSTRATIO_6: - return gfxd_puts("FRUSTRATIO_6"); - default: - return gfxd_printf("%" PRIu32, v->u); - } -} diff --git a/ZAPDTR/lib/libgfxd/uc_argtbl.c b/ZAPDTR/lib/libgfxd/uc_argtbl.c deleted file mode 100644 index 22a0b6500..000000000 --- a/ZAPDTR/lib/libgfxd/uc_argtbl.c +++ /dev/null @@ -1,485 +0,0 @@ -static const gfxd_arg_type_t arg_tbl[] = -{ - [gfxd_Word] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Opcode] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_opc, - }, - [gfxd_Coordi] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_u, - }, - [gfxd_Coordq] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu102, - }, - [gfxd_Pal] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Tlut] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Timg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Tmem] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Tile] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_tile, - }, - [gfxd_Fmt] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_fmt, - }, - [gfxd_Siz] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_siz, - }, - [gfxd_Dim] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Cm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cm, - }, - [gfxd_Tm] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_tm, - }, - [gfxd_Ts] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ts, - }, - [gfxd_Dxt] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_u, - }, - [gfxd_Tag] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Pm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_pm, - }, - [gfxd_Colorpart] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_color, - }, - [gfxd_Color] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Lodfrac] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu08, - }, - [gfxd_Cimg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Zimg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Ac] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ac, - }, - [gfxd_Ad] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ad, - }, - [gfxd_Cd] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cd, - }, - [gfxd_Ccpre] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ccpre, - }, - [gfxd_Ccmuxa] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxa, - }, - [gfxd_Ccmuxb] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxb, - }, - [gfxd_Ccmuxc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxc, - }, - [gfxd_Ccmuxd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxd, - }, - [gfxd_Acmuxabd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_acmuxabd, - }, - [gfxd_Acmuxc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_acmuxc, - }, - [gfxd_Cv] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_cv, - }, - [gfxd_Tc] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tc, - }, - [gfxd_Cyc] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cyc, - }, - [gfxd_Zs] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_zs, - }, - [gfxd_Ck] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ck, - }, - [gfxd_Keyscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_color, - }, - [gfxd_Keywidth] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs48, - }, - [gfxd_Zi] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Rm1] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_rm1, - }, - [gfxd_Rm2] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_rm2, - }, - [gfxd_Sc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sc, - }, - [gfxd_Td] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_td, - }, - [gfxd_Tf] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tf, - }, - [gfxd_Tl] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tl, - }, - [gfxd_Tt] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tt, - }, - [gfxd_Tp] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tp, - }, - [gfxd_Line] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Vtx] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Vtxflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Dl] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_Zraw] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs1616, - }, -#endif - [gfxd_Dlflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_dlf, - }, - [gfxd_Cr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cr, - }, - [gfxd_Num] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Fogz] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Fogp] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Mtxptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Gm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_gm, - }, - [gfxd_Mwo_matrix] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_matrix, - }, - [gfxd_Linewd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Uctext] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Ucdata] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Size] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Lookatptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Mtxparam] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mp, - }, - [gfxd_Mtxstack] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ms, - }, - [gfxd_Mwo_point] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_point, - }, - [gfxd_Wscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu016, - }, - [gfxd_Seg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x8, - }, - [gfxd_Segptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Lightsn] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_lightsn, - }, - [gfxd_Numlights] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Lightnum] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_lightnum, - }, - [gfxd_Lightptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Tcscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu016, - }, - [gfxd_Switch] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_switch, - }, - [gfxd_St] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs105, - }, - [gfxd_Stdelta] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs510, - }, - [gfxd_Vtxptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Vpptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Dram] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Sftlo] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sftlo, - }, - [gfxd_Othermodelo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_othermodelo, - }, - [gfxd_Sfthi] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sfthi, - }, - [gfxd_Othermodehi] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_othermodehi, - }, - [gfxd_Mw] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mw, - }, - [gfxd_Mwo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Mwo_clip] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_clip, - }, - [gfxd_Mwo_lightcol] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_lightcol, - }, - [gfxd_Mv] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mv, - }, - [gfxd_Mvo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Dmem] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Dmaflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, -}; diff --git a/ZAPDTR/lib/libgfxd/uc_f3d.c b/ZAPDTR/lib/libgfxd/uc_f3d.c deleted file mode 100644 index 946551510..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3d.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3d -#define F3D_GBI - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3db.c b/ZAPDTR/lib/libgfxd/uc_f3db.c deleted file mode 100644 index cd4990412..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3db.c +++ /dev/null @@ -1,5 +0,0 @@ -#define uc_name gfxd_f3db -#define F3D_GBI -#define F3D_BETA - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dex.c b/ZAPDTR/lib/libgfxd/uc_f3dex.c deleted file mode 100644 index 2ec70d8ab..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dex.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3dex -#define F3DEX_GBI - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dex2.c b/ZAPDTR/lib/libgfxd/uc_f3dex2.c deleted file mode 100644 index 9a19c9903..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dex2.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3dex2 -#define F3DEX_GBI_2 - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dexb.c b/ZAPDTR/lib/libgfxd/uc_f3dexb.c deleted file mode 100644 index 2b5c30a4a..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dexb.c +++ /dev/null @@ -1,5 +0,0 @@ -#define uc_name gfxd_f3dexb -#define F3DEX_GBI -#define F3D_BETA - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_macrofn.c b/ZAPDTR/lib/libgfxd/uc_macrofn.c deleted file mode 100644 index 46d4b4ee8..000000000 --- a/ZAPDTR/lib/libgfxd/uc_macrofn.c +++ /dev/null @@ -1,2507 +0,0 @@ -static inline uint32_t getfield(uint32_t w, int n, int s) -{ - return (w >> s) & (((uint32_t)1 << n) - 1); -} - -static inline int32_t argvi(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.i; -} - -static inline uint32_t argvu(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.u; -} - -static inline float argvf(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.f; -} - -static inline void argi(gfxd_macro_t *m, int idx, const char *name, - int32_t value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.i = value; - m->arg[idx].bad = 0; -} - -static inline void argu(gfxd_macro_t *m, int idx, const char *name, - uint32_t value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.u = value; - m->arg[idx].bad = 0; -} - -static inline void argf(gfxd_macro_t *m, int idx, const char *name, - float value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.f = value; - m->arg[idx].bad = 0; -} - -static inline void badarg(gfxd_macro_t *m, int idx) -{ - m->arg[idx].bad = 1; -} - -UCFUNC int32_t sx(uint32_t n, int bits) -{ - int32_t smin = (int32_t)1 << (bits - 1); - int32_t smax = (int32_t)1 << bits; - int32_t i = n; - if (i < smin) - return i; - else - return i - smax; -} - -UCFUNC int d_Invalid(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Invalid; - argu(m, 0, "hi", hi, gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return -1; -} - -UCFUNC int d_DPFillRectangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPFillRectangle; - argu(m, 0, "ulx", getfield(lo, 10, 14), gfxd_Coordi); - argu(m, 1, "uly", getfield(lo, 10, 2), gfxd_Coordi); - argu(m, 2, "lrx", getfield(hi, 10, 14), gfxd_Coordi); - argu(m, 3, "lry", getfield(hi, 10, 2), gfxd_Coordi); - return 0; -} - -UCFUNC int d_DPFullSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPFullSync; - return 0; -} - -UCFUNC int d_DPLoadSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadSync; - return 0; -} - -UCFUNC int d_DPTileSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPTileSync; - return 0; -} - -UCFUNC int d_DPPipeSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPPipeSync; - return 0; -} - -UCFUNC int c_DPLoadTLUT_pal16(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvu(&m[2], 3) < 0x100 - || argvu(&m[2], 3) % 0x10 != 0 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - int pal = (argvu(&m[2], 3) - 0x100) / 0x10; - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd - || argvi(&m[4], 0) != G_TX_LOADTILE - || argvi(&m[4], 1) != 15) - { - return -1; - } - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT_pal16; - argi(m, 0, "pal", pal, gfxd_Pal); - argu(m, 1, "dram", dram, gfxd_Tlut); - return 0; -} - -UCFUNC int c_DPLoadTLUT_pal256(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvu(&m[2], 3) != 0x100 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd - || argvi(&m[4], 0) != G_TX_LOADTILE - || argvi(&m[4], 1) != 255) - { - return -1; - } - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT_pal256; - argu(m, 0, "dram", dram, gfxd_Tlut); - return 0; -} - -UCFUNC int c_ltb(gfxd_macro_t *m, int n_macro, int id, int mdxt, int mtmem, - int mrt, int myuv, int m4b) -{ - if (n_macro < 7) - return -1; - if (m[0].id != gfxd_DPSetTextureImage || argvi(&m[0], 2) != 1) - return -1; - g_ifmt_t fmt = argvi(&m[0], 0); - g_isiz_t ldsiz = argvi(&m[0], 1); - uint32_t timg = argvu(&m[0], 3); - if (myuv && fmt != G_IM_FMT_YUV) - return -1; - if (m[1].id != gfxd_DPSetTile - || argvi(&m[1], 0) != fmt - || argvi(&m[1], 1) != ldsiz - || argvi(&m[1], 2) != 0 - || argvi(&m[1], 4) != G_TX_LOADTILE - || argvi(&m[1], 5) != 0) - { - return -1; - } - uint32_t tmem = argvu(&m[1], 3); - unsigned cms = argvu(&m[1], 9); - unsigned cmt = argvu(&m[1], 6); - int masks = argvi(&m[1], 10); - int maskt = argvi(&m[1], 7); - int shifts = argvi(&m[1], 11); - int shiftt = argvi(&m[1], 8); - if (m[2].id != gfxd_DPLoadSync) - return -1; - if (m[3].id != gfxd_DPLoadBlock - || argvi(&m[3], 0) != G_TX_LOADTILE - || argvu(&m[3], 1) != 0 - || argvu(&m[3], 2) != 0) - { - return -1; - } - qu102_t ldlrs = argvu(&m[3], 3); - unsigned lddxt = argvu(&m[3], 4); - if (m[4].id != gfxd_DPPipeSync) - return -1; - if (m[5].id != gfxd_DPSetTile - || argvi(&m[5], 0) != fmt - || G_SIZ_LDSIZ(argvi(&m[5], 1)) != ldsiz - || argvu(&m[5], 3) != tmem - || argvu(&m[5], 6) != cmt - || argvi(&m[5], 7) != maskt - || argvi(&m[5], 8) != shiftt - || argvu(&m[5], 9) != cms - || argvi(&m[5], 10) != masks - || argvi(&m[5], 11) != shifts) - { - return -1; - } - int siz = argvi(&m[5], 1); - int rdline = argvi(&m[5], 2); - int rt = argvi(&m[5], 4); - int pal = argvi(&m[5], 5); - if (m4b && siz != G_IM_SIZ_4b) - return -1; - if (!(mrt && rt != G_TX_RENDERTILE && tmem == 0) - && (tmem != 0) != mtmem) - { - return -1; - } - if ((rt != G_TX_RENDERTILE) != mrt) - return -1; - if (m[6].id != gfxd_DPSetTileSize - || argvi(&m[6], 0) != rt - || argvu(&m[6], 1) != 0 - || argvu(&m[6], 2) != 0 - || (argvu(&m[6], 3) & 3) - || (argvu(&m[6], 4) & 3)) - { - return -1; - } - int width = (argvu(&m[6], 3) >> 2) + 1; - int height = (argvu(&m[6], 4) >> 2) + 1; - unsigned lrs = G_LDBLK_TXL(G_LTB_LRS(width, height, siz)); - unsigned dxt = 0; - if (!mdxt) - dxt = G_DXT(siz, width); - int line; - if (myuv) - line = (width + 7) / 8; - else - line = (width * G_SIZ_LDBITS(siz) + 63) / 64; - if (ldlrs != lrs || lddxt != dxt || rdline != line) - return -1; - m->id = id; - int i = 0; - argu(m, i++, "timg", timg, gfxd_Timg); - if (mtmem) - argu(m, i++, "tmem", tmem, gfxd_Tmem); - if (mrt) - argi(m, i++, "rtile", rt, gfxd_Tile); - argi(m, i++, "fmt", fmt, gfxd_Fmt); - if (!m4b) - argi(m, i++, "siz", siz, gfxd_Siz); - argi(m, i++, "width", width, gfxd_Dim); - argi(m, i++, "height", height, gfxd_Dim); - argi(m, i++, "pal", pal, gfxd_Pal); - argu(m, i++, "cms", cms, gfxd_Cm); - argu(m, i++, "cmt", cmt, gfxd_Cm); - argi(m, i++, "masks", masks, gfxd_Tm); - argi(m, i++, "maskt", maskt, gfxd_Tm); - argi(m, i++, "shifts", shifts, gfxd_Ts); - argi(m, i++, "shiftt", shiftt, gfxd_Ts); - return 0; -} - -UCFUNC int c_DPLoadMultiBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockYuvS, 1, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockYuv, 0, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock_4bS, 1, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock_4b, 0, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockS, 1, 1, 1, 0, 0); -} - -UCFUNC int c_DPLoadMultiBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock, 0, 1, 1, 0, 0); -} - -UCFUNC int c__DPLoadTextureBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockYuvS, 1, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockYuv, 0, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock_4bS, 1, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock_4b, 0, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockS, 1, 1, 0, 0, 0); -} - -UCFUNC int c__DPLoadTextureBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock, 0, 1, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockYuvS, 1, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockYuv, 0, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock_4bS, 1, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock_4b, 0, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockS, 1, 0, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock, 0, 0, 0, 0, 0); -} - -UCFUNC int c_ltt(gfxd_macro_t *m, int n_macro, int id, int mtmem, int mrt, - int myuv, int m4b) -{ - if (n_macro < 7) - return -1; - if (m[0].id != gfxd_DPSetTextureImage) - return -1; - g_ifmt_t fmt = argvi(&m[0], 0); - g_isiz_t ldsiz = argvi(&m[0], 1); - int width = argvi(&m[0], 2); - if (m4b) - { - if (ldsiz != G_IM_SIZ_8b) - return -1; - width *= 2; - } - uint32_t timg = argvu(&m[0], 3); - if (myuv && fmt != G_IM_FMT_YUV) - return -1; - if (m[1].id != gfxd_DPSetTile - || argvi(&m[1], 0) != fmt - || argvi(&m[1], 1) != ldsiz - || argvi(&m[1], 4) != G_TX_LOADTILE - || argvi(&m[1], 5) != 0) - { - return -1; - } - int ldline = argvi(&m[1], 2); - uint32_t tmem = argvu(&m[1], 3); - unsigned cms = argvu(&m[1], 9); - unsigned cmt = argvu(&m[1], 6); - int masks = argvi(&m[1], 10); - int maskt = argvi(&m[1], 7); - int shifts = argvi(&m[1], 11); - int shiftt = argvi(&m[1], 8); - if (m[2].id != gfxd_DPLoadSync) - return -1; - if (m[3].id != gfxd_DPLoadTile - || argvi(&m[3], 0) != G_TX_LOADTILE - || (argvu(&m[3], 1) & 1) - || (argvu(&m[3], 2) & 3) - || (argvu(&m[3], 3) & 1) - || (argvu(&m[3], 4) & 3)) - { - return -1; - } - qu102_t lduls = argvu(&m[3], 1); - qu102_t ldult = argvu(&m[3], 2); - qu102_t ldlrs = argvu(&m[3], 3); - qu102_t ldlrt = argvu(&m[3], 4); - if (m[4].id != gfxd_DPPipeSync) - return -1; - if (m[5].id != gfxd_DPSetTile - || argvi(&m[5], 0) != fmt - || argvi(&m[5], 2) != ldline - || argvu(&m[5], 3) != tmem - || argvu(&m[5], 6) != cmt - || argvi(&m[5], 7) != maskt - || argvi(&m[5], 8) != shiftt - || argvu(&m[5], 9) != cms - || argvi(&m[5], 10) != masks - || argvi(&m[5], 11) != shifts) - { - return -1; - } - int siz = argvi(&m[5], 1); - int rt = argvi(&m[5], 4); - int pal = argvi(&m[5], 5); - if (m4b) - { - if (siz != G_IM_SIZ_4b) - return -1; - } - else if (siz != ldsiz) - return -1; - if (!(mrt && rt != G_TX_RENDERTILE && tmem == 0) - && (tmem != 0) != mtmem) - { - return -1; - } - if ((rt != G_TX_RENDERTILE) != mrt) - return -1; - if (m[6].id != gfxd_DPSetTileSize - || argvi(&m[6], 0) != rt - || (argvu(&m[6], 1) & 3) - || (argvu(&m[6], 2) & 3) - || (argvu(&m[6], 3) & 3) - || (argvu(&m[6], 4) & 3)) - { - return -1; - } - unsigned uls = argvu(&m[6], 1) >> 2; - unsigned ult = argvu(&m[6], 2) >> 2; - unsigned lrs = argvu(&m[6], 3) >> 2; - unsigned lrt = argvu(&m[6], 4) >> 2; - int line; - if (myuv) - line = ((lrs - uls + 1) + 7) / 8; - else if (m4b) - line = ((lrs - uls + 1) / 2 + 7) / 8; - else - line = ((lrs - uls + 1) * G_SIZ_LDBITS(siz) + 63) / 64; - if (m4b) - { - if (lduls != qu102(uls) / 2 || ldlrs != qu102(lrs) / 2) - return -1; - } - else if (lduls != qu102(uls) || ldlrs != qu102(lrs)) - return -1; - if (ldult != qu102(ult) || ldlrt != qu102(lrt) || ldline != line) - return -1; - m->id = id; - int i = 0; - argu(m, i++, "timg", timg, gfxd_Timg); - if (mtmem) - argu(m, i++, "tmem", tmem, gfxd_Tmem); - if (mrt) - argi(m, i++, "rtile", rt, gfxd_Tile); - argi(m, i++, "fmt", fmt, gfxd_Fmt); - if (!m4b) - argi(m, i++, "siz", siz, gfxd_Siz); - argi(m, i++, "width", width, gfxd_Dim); - argi(m, i++, "height", 0, gfxd_Dim); - argu(m, i++, "uls", uls, gfxd_Coordi); - argu(m, i++, "ult", ult, gfxd_Coordi); - argu(m, i++, "lrs", lrs, gfxd_Coordi); - argu(m, i++, "lrt", lrt, gfxd_Coordi); - argi(m, i++, "pal", pal, gfxd_Pal); - argu(m, i++, "cms", cms, gfxd_Cm); - argu(m, i++, "cmt", cmt, gfxd_Cm); - argi(m, i++, "masks", masks, gfxd_Tm); - argi(m, i++, "maskt", maskt, gfxd_Tm); - argi(m, i++, "shifts", shifts, gfxd_Ts); - argi(m, i++, "shiftt", shiftt, gfxd_Ts); - return 0; -} - -UCFUNC int c_DPLoadMultiTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTileYuv, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTile_4b, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTile, 1, 1, 0, 0); -} - -UCFUNC int c__DPLoadTextureTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTileYuv, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTile_4b, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTile, 1, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTileYuv, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTile_4b, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTile, 0, 0, 0, 0); -} - -UCFUNC int d_DPLoadBlock(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadBlock; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordi); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordi); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordi); - argu(m, 4, "dxt", getfield(lo, 12, 0), gfxd_Dxt); - if (argvu(m, 3) > G_TX_LDBLK_MAX_TXL) { - badarg(m, 3); - return -1; - } - else { - return 0; - } -} - -UCFUNC int d_DPNoOp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPNoOp; - return 0; -} - -UCFUNC int d_DPNoOpTag(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - if (lo == 0) - return d_DPNoOp(m, hi, lo); - else - { - m->id = gfxd_DPNoOpTag; - argu(m, 0, "tag", lo, gfxd_Tag); - return 0; - } -} - -UCFUNC int d_DPPipelineMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPPipelineMode; - argu(m, 0, "mode", lo, gfxd_Pm); - return 0; -} - -UCFUNC int d_DPSetBlendColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetBlendColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetEnvColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetEnvColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetFillColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetFillColor; - argu(m, 0, "c", lo, gfxd_Color); - return 0; -} - -UCFUNC int d_DPSetFogColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetFogColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetPrimColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetPrimColor; - argu(m, 0, "m", getfield(hi, 8, 8), gfxd_Lodfrac); - argu(m, 1, "l", getfield(hi, 8, 0), gfxd_Lodfrac); - argu(m, 2, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 3, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 4, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 5, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetColorImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetColorImage; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "width", getfield(hi, 12, 0) + 1, gfxd_Dim); - argu(m, 3, "cimg", lo, gfxd_Cimg); - return 0; -} - -UCFUNC int d_DPSetDepthImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetDepthImage; - argu(m, 0, "zimg", lo, gfxd_Zimg); - return 0; -} - -UCFUNC int d_DPSetTextureImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureImage; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "width", getfield(hi, 12, 0) + 1, gfxd_Dim); - argu(m, 3, "timg", lo, gfxd_Timg); - return 0; -} - -UCFUNC int d_DPSetAlphaCompare(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetAlphaCompare; - argu(m, 0, "mode", lo, gfxd_Ac); - return 0; -} - -UCFUNC int d_DPSetAlphaDither(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetAlphaDither; - argu(m, 0, "mode", lo, gfxd_Ad); - return 0; -} - -UCFUNC int d_DPSetColorDither(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetColorDither; - argu(m, 0, "mode", lo, gfxd_Cd); - return 0; -} - -UCFUNC void cc_unpack(struct cc_mode *m0, struct cc_mode *m1, uint32_t hi, - uint32_t lo) -{ - m0->a = getfield(hi, 4, 20); - m0->b = getfield(lo, 4, 28); - m0->c = getfield(hi, 5, 15); - m0->d = getfield(lo, 3, 15); - m0->Aa = getfield(hi, 3, 12); - m0->Ab = getfield(lo, 3, 12); - m0->Ac = getfield(hi, 3, 9); - m0->Ad = getfield(lo, 3, 9); - m1->a = getfield(hi, 4, 5); - m1->b = getfield(lo, 4, 24); - m1->c = getfield(hi, 5, 0); - m1->d = getfield(lo, 3, 6); - m1->Aa = getfield(lo, 3, 21); - m1->Ab = getfield(lo, 3, 3); - m1->Ac = getfield(lo, 3, 18); - m1->Ad = getfield(lo, 3, 0); -} - -UCFUNC int cc_lookup(const struct cc_mode *m) -{ - struct cc_mode m_norm = *m; - if (m_norm.a > 0x7) m_norm.a = G_CCMUX_0; - if (m_norm.b > 0x7) m_norm.b = G_CCMUX_0; - if (m_norm.c > 0xF) m_norm.c = G_CCMUX_0; - if (m_norm.d > 0x6) m_norm.d = G_CCMUX_0; - m = &m_norm; - int n_presets = sizeof(cc_presets) / sizeof(*cc_presets); - for (int i = 0; i < n_presets; i++) - { - const struct cc_mode *p = &cc_presets[i].mode; - if (m->a == p->a - && m->b == p->b - && m->c == p->c - && m->d == p->d - && m->Aa == p->Aa - && m->Ab == p->Ab - && m->Ac == p->Ac - && m->Ad == p->Ad) - { - return i; - } - } - return -1; -} - -UCFUNC int d_DPSetCombineMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCombineMode; - struct cc_mode m0; - struct cc_mode m1; - cc_unpack(&m0, &m1, hi, lo); - int p0 = cc_lookup(&m0); - int p1 = cc_lookup(&m1); - argi(m, 0, "mode1", p0, gfxd_Ccpre); - argi(m, 1, "mode2", p1, gfxd_Ccpre); - int ret = 0; - if (p0 == -1) - { - badarg(m, 0); - ret = -1; - } - if (p1 == -1) - { - badarg(m, 1); - ret = -1; - } - return ret; -} - -UCFUNC int d_DPSetCombineLERP(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - struct cc_mode m0; - struct cc_mode m1; - cc_unpack(&m0, &m1, hi, lo); - int p0 = cc_lookup(&m0); - int p1 = cc_lookup(&m1); - if (p0 != -1 && p1 != -1) - return d_DPSetCombineMode(m, hi, lo); - else - { - m->id = gfxd_DPSetCombineLERP; - argi(m, 0, "a0", m0.a, gfxd_Ccmuxa); - argi(m, 1, "b0", m0.b, gfxd_Ccmuxb); - argi(m, 2, "c0", m0.c, gfxd_Ccmuxc); - argi(m, 3, "d0", m0.d, gfxd_Ccmuxd); - argi(m, 4, "Aa0", m0.Aa, gfxd_Acmuxabd); - argi(m, 5, "Ab0", m0.Ab, gfxd_Acmuxabd); - argi(m, 6, "Ac0", m0.Ac, gfxd_Acmuxc); - argi(m, 7, "Ad0", m0.Ad, gfxd_Acmuxabd); - argi(m, 8, "a1", m1.a, gfxd_Ccmuxa); - argi(m, 9, "b1", m1.b, gfxd_Ccmuxb); - argi(m, 10, "c1", m1.c, gfxd_Ccmuxc); - argi(m, 11, "d1", m1.d, gfxd_Ccmuxd); - argi(m, 12, "Aa1", m1.Aa, gfxd_Acmuxabd); - argi(m, 13, "Ab1", m1.Ab, gfxd_Acmuxabd); - argi(m, 14, "Ac1", m1.Ac, gfxd_Acmuxc); - argi(m, 15, "Ad1", m1.Ad, gfxd_Acmuxabd); - return 0; - } -} - -UCFUNC int d_DPSetConvert(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetConvert; - argi(m, 0, "k0", sx(getfield(hi, 9, 13), 9), gfxd_Cv); - argi(m, 1, "k1", sx(getfield(hi, 9, 4), 9), gfxd_Cv); - argi(m, 2, "k2", sx((getfield(hi, 4, 0) << 5) | getfield(lo, 5, 27), 9), - gfxd_Cv); - argi(m, 3, "k3", sx(getfield(lo, 9, 18), 9), gfxd_Cv); - argi(m, 4, "k4", sx(getfield(lo, 9, 9), 9), gfxd_Cv); - argi(m, 5, "k5", sx(getfield(lo, 9, 0), 9), gfxd_Cv); - return 0; -} - -UCFUNC int d_DPSetTextureConvert(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureConvert; - argu(m, 0, "mode", lo, gfxd_Tc); - return 0; -} - -UCFUNC int d_DPSetCycleType(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCycleType; - argu(m, 0, "mode", lo, gfxd_Cyc); - return 0; -} - -UCFUNC int d_DPSetDepthSource(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetDepthSource; - argu(m, 0, "mode", lo, gfxd_Zs); - return 0; -} - -UCFUNC int d_DPSetCombineKey(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCombineKey; - argu(m, 0, "mode", lo, gfxd_Ck); - return 0; -} - -UCFUNC int d_DPSetKeyGB(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetKeyGB; - argu(m, 0, "cG", getfield(lo, 8, 24), gfxd_Color); - argu(m, 1, "sG", getfield(lo, 8, 16), gfxd_Keyscale); - argi(m, 2, "wG", sx(getfield(hi, 12, 12), 12), gfxd_Keywidth); - argu(m, 3, "cB", getfield(lo, 8, 8), gfxd_Color); - argu(m, 4, "sB", getfield(lo, 8, 0), gfxd_Keyscale); - argi(m, 5, "wB", sx(getfield(hi, 12, 0), 12), gfxd_Keywidth); - return 0; -} - -UCFUNC int d_DPSetKeyR(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetKeyR; - argu(m, 0, "cR", getfield(lo, 8, 8), gfxd_Color); - argu(m, 1, "sR", getfield(lo, 8, 0), gfxd_Keyscale); - argi(m, 2, "wR", sx(getfield(lo, 12, 16), 12), gfxd_Keywidth); - return 0; -} - -UCFUNC int d_DPSetPrimDepth(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetPrimDepth; - argi(m, 0, "z", sx(getfield(lo, 16, 16), 16), gfxd_Zi); - argi(m, 1, "dz", sx(getfield(lo, 16, 0), 16), gfxd_Zi); - return 0; -} - -UCFUNC int d_DPSetRenderMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetRenderMode; - argu(m, 0, "mode1", lo, gfxd_Rm1); - argu(m, 1, "mode2", lo, gfxd_Rm2); - return 0; -} - -UCFUNC int d_DPSetScissor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetScissor; - argi(m, 0, "mode", getfield(lo, 2, 24), gfxd_Sc); - argu(m, 1, "ulx", getfield(hi, 10, 14), gfxd_Coordi); - argu(m, 2, "uly", getfield(hi, 10, 2), gfxd_Coordi); - argu(m, 3, "lrx", getfield(lo, 10, 14), gfxd_Coordi); - argu(m, 4, "lry", getfield(lo, 10, 2), gfxd_Coordi); - return 0; -} - -UCFUNC int d_DPSetScissorFrac(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - qu102_t ulx = getfield(hi, 12, 12); - qu102_t uly = getfield(hi, 12, 0); - qu102_t lrx = getfield(lo, 12, 12); - qu102_t lry = getfield(lo, 12, 0); - if ((ulx & 3) || (uly & 3) || (lrx & 3) || (lry & 3)) - { - m->id = gfxd_DPSetScissorFrac; - argi(m, 0, "mode", getfield(lo, 2, 24), gfxd_Sc); - argu(m, 1, "ulx", ulx, gfxd_Coordq); - argu(m, 2, "uly", uly, gfxd_Coordq); - argu(m, 3, "lrx", lrx, gfxd_Coordq); - argu(m, 4, "lry", lry, gfxd_Coordq); - return 0; - } - else - return d_DPSetScissor(m, hi, lo); -} - -UCFUNC int d_DPSetTextureDetail(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureDetail; - argu(m, 0, "mode", lo, gfxd_Td); - return 0; -} - -UCFUNC int d_DPSetTextureFilter(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureFilter; - argu(m, 0, "mode", lo, gfxd_Tf); - return 0; -} - -UCFUNC int d_DPSetTextureLOD(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureLOD; - argu(m, 0, "mode", lo, gfxd_Tl); - return 0; -} - -UCFUNC int d_DPSetTextureLUT(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureLUT; - argu(m, 0, "mode", lo, gfxd_Tt); - return 0; -} - -UCFUNC int d_DPSetTexturePersp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTexturePersp; - argu(m, 0, "mode", lo, gfxd_Tp); - return 0; -} - -UCFUNC int d_DPSetTile(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTile; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "line", getfield(hi, 9, 9), gfxd_Line); - argu(m, 3, "tmem", getfield(hi, 9, 0), gfxd_Tmem); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - argi(m, 5, "pal", getfield(lo, 4, 20), gfxd_Pal); - argu(m, 6, "cmt", getfield(lo, 2, 18), gfxd_Cm); - argi(m, 7, "maskt", getfield(lo, 4, 14), gfxd_Tm); - argi(m, 8, "shiftt", getfield(lo, 4, 10), gfxd_Ts); - argu(m, 9, "cms", getfield(lo, 2, 8), gfxd_Cm); - argi(m, 10, "masks", getfield(lo, 4, 4), gfxd_Tm); - argi(m, 11, "shifts", getfield(lo, 4, 0), gfxd_Ts); - return 0; -} - -UCFUNC int d_DPSetTileSize(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTileSize; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordq); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 4, "lrt", getfield(lo, 12, 0), gfxd_Coordq); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - int n2 = getfield(lo, 8, 0); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "v2", n2 / 10, gfxd_Vtx); - argi(m, 3, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 10 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - int n2 = getfield(lo, 8, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "v2", n2 / 2, gfxd_Vtx); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - int n2 = getfield(hi, 8, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "v2", n2 / 2, gfxd_Vtx); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SP1Quadrangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SP2Triangles(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n00 = getfield(hi, 8, 16); - int n01 = getfield(hi, 8, 8); - int n02 = getfield(hi, 8, 0); - int n10 = getfield(lo, 8, 16); - int n11 = getfield(lo, 8, 8); - int n12 = getfield(lo, 8, 0); -#if defined(F3DEX_GBI) - if (n00 == n10 && n02 == n11) - return d_SP1Quadrangle(m, hi, lo); -#endif - m->id = gfxd_SP2Triangles; - argi(m, 0, "v00", n00 / 2, gfxd_Vtx); - argi(m, 1, "v01", n01 / 2, gfxd_Vtx); - argi(m, 2, "v02", n02 / 2, gfxd_Vtx); - argi(m, 3, "flag0", 0, gfxd_Vtxflag); - argi(m, 4, "v10", n10 / 2, gfxd_Vtx); - argi(m, 5, "v11", n11 / 2, gfxd_Vtx); - argi(m, 6, "v12", n12 / 2, gfxd_Vtx); - argi(m, 7, "flag1", 0, gfxd_Vtxflag); - int ret = 0; - if (n00 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n01 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n02 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - if (n10 % 2 != 0) - { - badarg(m, 4); - ret = -1; - } - if (n11 % 2 != 0) - { - badarg(m, 5); - ret = -1; - } - if (n12 % 2 != 0) - { - badarg(m, 6); - ret = -1; - } - return ret; -} - -UCFUNC int d_SP1Quadrangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Quadrangle; - int n00 = getfield(hi, 8, 16); - int n01 = getfield(hi, 8, 8); - int n02 = getfield(hi, 8, 0); - int n10 = getfield(lo, 8, 16); - int n11 = getfield(lo, 8, 8); - int n12 = getfield(lo, 8, 0); - int v00 = n00 / 2; - int v01 = n01 / 2; - int v02 = n02 / 2; - int v10 = n10 / 2; - int v11 = n11 / 2; - int v12 = n12 / 2; - argi(m, 0, "v0", v00, gfxd_Vtx); - argi(m, 1, "v1", v01, gfxd_Vtx); - argi(m, 2, "v2", v11, gfxd_Vtx); - argi(m, 3, "v3", v12, gfxd_Vtx); - argi(m, 4, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (v00 != v10 || n00 % 2 != 0 || n10 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n01 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (v02 != v11 || n02 % 2 != 0 || n11 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - if (n12 % 2 != 0) - { - badarg(m, 3); - ret = -1; - } - return ret; -} - -UCFUNC int c_SPBranchLessZraw(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t branchdl = argvu(&m[0], 0); - if (m[1].id != gfxd_BranchZ) - return -1; - int32_t vtx = argvi(&m[1], 0); - int32_t zval = argvi(&m[1], 1); - m->id = gfxd_SPBranchLessZraw; - argu(m, 0, "dl", branchdl, gfxd_Dl); - argi(m, 1, "vtx", vtx, gfxd_Vtx); - argi(m, 2, "zval", zval, gfxd_Zraw); - return 0; -} -#endif - -UCFUNC int d_SPBranchList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPBranchList; - argu(m, 0, "dl", lo, gfxd_Dl); - return 0; -} - -UCFUNC int c_SPClipRatio(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 4) - return -1; - if (m[0].id != gfxd_MoveWd - || argvi(&m[0], 0) != G_MW_CLIP - || argvu(&m[0], 1) != G_MWO_CLIP_RNX) - { - return -1; - } - uint32_t r = argvu(&m[0], 2); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_CLIP - || argvu(&m[1], 1) != G_MWO_CLIP_RNY - || argvu(&m[1], 2) != r) - { - return -1; - } - if (m[2].id != gfxd_MoveWd - || argvi(&m[2], 0) != G_MW_CLIP - || argvu(&m[2], 1) != G_MWO_CLIP_RPX - || ((uint32_t)1 << 16) - argvu(&m[2], 2) != r) - { - return -1; - } - if (m[3].id != gfxd_MoveWd - || argvi(&m[3], 0) != G_MW_CLIP - || argvu(&m[3], 1) != G_MWO_CLIP_RPY - || ((uint32_t)1 << 16) - argvu(&m[3], 2) != r) - { - return -1; - } - m->id = gfxd_SPClipRatio; - argi(m, 0, "r", r, gfxd_Cr); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SPCullDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPCullDisplayList; - int n0 = getfield(hi, 24, 0); - int nn = getfield(lo, 16, 0); - argi(m, 0, "v0", n0 / 40, gfxd_Vtx); - argi(m, 1, "vn", nn / 40 - 1, gfxd_Num); - int ret = 0; - if (n0 % 40 != 0) - { - badarg(m, 0); - ret = -1; - } - if (nn % 40 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPCullDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPCullDisplayList; - int n0 = getfield(hi, 16, 0); - int nn = getfield(lo, 16, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "vn", nn / 2, gfxd_Num); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (nn % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_SPDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDisplayList; - argu(m, 0, "dl", lo, gfxd_Dl); - return 0; -} - -UCFUNC int d_SPEndDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPEndDisplayList; - return 0; -} - -UCFUNC int d_SPFogFactor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPFogFactor; - argi(m, 0, "fm", sx(getfield(lo, 16, 16), 16), gfxd_Fogz); - argi(m, 1, "fo", sx(getfield(lo, 16, 0), 16), gfxd_Fogz); - return 0; -} - -UCFUNC int d_SPFogPosition(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int x = sx(getfield(lo, 16, 16), 16); - int y = sx(getfield(lo, 16, 0), 16); - if (x == 0) - return d_SPFogFactor(m, hi, lo); - else - { - int d = 128000 / x; - int yd = y * d; - if (yd > 0) - yd += 255; - else if (yd < 0) - yd -= 255; - int min = 500 - yd / 256; - int max = d + min; - - if (min >= 0 && min <= 1000 && max >= 0 && max <= 1000) - { - m->id = gfxd_SPFogPosition; - argi(m, 0, "min", min, gfxd_Fogp); - argi(m, 1, "max", max, gfxd_Fogp); - return 0; - } - else - return d_SPFogFactor(m, hi, lo); - } -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int c_SPForceMatrix(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 4) - return -1; - for (int i = 0; i < 4; i++) - if (m[i].id != gfxd_MoveMem - || argvu(&m[i], 0) != 16 - || argvu(&m[i], 2) != argvu(&m[0], 2) + i * 16) - { - return -1; - } - if (argvi(&m[0], 1) != G_MV_MATRIX_1 - || argvi(&m[1], 1) != G_MV_MATRIX_2 - || argvi(&m[2], 1) != G_MV_MATRIX_3 - || argvi(&m[3], 1) != G_MV_MATRIX_4) - { - return -1; - } - uint32_t mptr = argvu(&m[0], 2); - m->id = gfxd_SPForceMatrix; - argu(m, 0, "mptr", mptr, gfxd_Mtxptr); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int c_SPForceMatrix(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_MoveMem - || argvu(&m[0], 0) != sizeof(Mtx) - || argvi(&m[0], 1) != G_MV_MATRIX - || argvu(&m[0], 2) != 0) - { - return -1; - } - uint32_t mptr = argvu(&m[0], 3); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_FORCEMTX - || argvu(&m[1], 1) != 0 - || argvu(&m[1], 2) != 0x10000) - { - return -1; - } - m->id = gfxd_SPForceMatrix; - argu(m, 0, "mptr", mptr, gfxd_Mtxptr); - return 0; -} -#endif - -UCFUNC int d_SPSetGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSetGeometryMode; - argu(m, 0, "mode", lo, gfxd_Gm); - return 0; -} - -UCFUNC int d_SPClearGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPClearGeometryMode; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argu(m, 0, "mode", lo, gfxd_Gm); -#elif defined(F3DEX_GBI_2) - argu(m, 0, "mode", getfield(~hi, 24, 0), gfxd_Gm); -#endif - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int c_SPLoadGeometryMode(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_SPClearGeometryMode - || argvu(&m[0], 0) != 0xFFFFFFFF - || m[1].id != gfxd_SPSetGeometryMode) - { - return -1; - } - uint32_t mode = argvu(&m[1], 0); - m->id = gfxd_SPLoadGeometryMode; - argu(m, 0, "mode", mode, gfxd_Gm); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLoadGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLoadGeometryMode; - argu(m, 0, "mode", lo, gfxd_Gm); - return 0; -} -#endif - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPInsertMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPInsertMatrix; - argu(m, 0, "where", getfield(hi, 16, 8), gfxd_Mwo_matrix); - argu(m, 1, "val", lo, gfxd_Word); - return 0; -} -#endif - -#if defined(F3D_GBI) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3D_GBI) -UCFUNC int d_SPLineW3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int wd = getfield(lo, 8, 0); - if (wd == 0) - return d_SPLine3D(m, hi, lo); - else - { - m->id = gfxd_SPLineW3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "wd", wd, gfxd_Linewd); - argi(m, 3, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; - } -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPLineW3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int wd = getfield(hi, 8, 0); - if (wd == 0) - return d_SPLine3D(m, hi, lo); - else - { - m->id = gfxd_SPLineW3D; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "wd", wd, gfxd_Linewd); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; - } -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int c_SPLoadUcode(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t uc_dstart = argvu(&m[0], 0); - if (m[1].id != gfxd_LoadUcode) - return -1; - uint32_t uc_start = argvu(&m[1], 0); - uint32_t uc_dsize = argvu(&m[1], 1); - if (uc_dsize != 0x800) - return -1; - m->id = gfxd_SPLoadUcode; - argu(m, 0, "uc_start", uc_start, gfxd_Uctext); - argu(m, 1, "uc_dstart", uc_dstart, gfxd_Ucdata); - return 0; -} -#endif - -UCFUNC int d_SPLookAtX(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLookAtX; - argu(m, 0, "l", lo, gfxd_Lookatptr); - return 0; -} - -UCFUNC int d_SPLookAtY(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLookAtY; - argu(m, 0, "l", lo, gfxd_Lookatptr); - return 0; -} - -UCFUNC int c_SPLookAt(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_SPLookAtX) - return -1; - uint32_t l = argvu(&m[0], 0); - if (m[1].id != gfxd_SPLookAtY || argvu(&m[1], 0) != l + 0x10) - return -1; - m->id = gfxd_SPLookAt; - argu(m, 0, "l", l, gfxd_Lookatptr); - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPMatrix; - int x = getfield(hi, 16, 0); - argu(m, 0, "matrix", lo, gfxd_Mtxptr); - argi(m, 1, "param", getfield(hi, 8, 16), gfxd_Mtxparam); - if (x != sizeof(Mtx)) - return -1; - else - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPMatrix; - int x = getfield(hi, 5, 19); - argu(m, 0, "matrix", lo, gfxd_Mtxptr); - argi(m, 1, "param", getfield(hi, 8, 0) ^ G_MTX_PUSH, gfxd_Mtxparam); - if (x != (sizeof(Mtx) - 1) / 8) - return -1; - else - return 0; -} -#endif - -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) -UCFUNC int d_SPModifyVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPModifyVertex; - int offset = getfield(hi, 16, 8); - argi(m, 0, "vtx", offset / 40, gfxd_Vtx); - argu(m, 1, "where", offset % 40, gfxd_Mwo_point); - argu(m, 2, "val", lo, gfxd_Word); - return 0; -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPModifyVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPModifyVertex; - int vtx = getfield(hi, 16, 0); - argi(m, 0, "vtx", vtx / 2, gfxd_Vtx); - argu(m, 1, "where", getfield(hi, 8, 16), gfxd_Mwo_point); - argu(m, 2, "val", lo, gfxd_Word); - int ret = 0; - if (vtx % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_SPPerspNormalize(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPPerspNormalize; - argu(m, 0, "scale", getfield(lo, 16, 0), gfxd_Wscale); - return 0; -} - -UCFUNC int d_SPPopMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPPopMatrix; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argi(m, 0, "param", lo, gfxd_Mtxstack); -#elif defined(F3DEX_GBI_2) - argi(m, 0, "param", G_MTX_MODELVIEW, gfxd_Mtxstack); -#endif - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPPopMatrixN(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int len = (getfield(hi, 5, 19) + 1) * 8; - int ofs = getfield(hi, 8, 8) * 8; - int idx = getfield(hi, 8, 0); - int n = lo / sizeof(Mtx); - if (lo % sizeof(Mtx) == 0 - && len == sizeof(Mtx) - && ofs == 0 - && idx == 2 - && n == 1) - { - return d_SPPopMatrix(m, hi, lo); - } - m->id = gfxd_SPPopMatrixN; - argi(m, 0, "param", G_MTX_MODELVIEW, gfxd_Mtxstack); - argi(m, 1, "num", n, gfxd_Num); - int ret = 0; - if (lo % sizeof(Mtx) != 0) - { - badarg(m, 1); - ret = -1; - } - if (len != sizeof(Mtx) || ofs != 0 || idx != 2) - ret = -1; - return ret; -} -#endif - -UCFUNC int d_SPSegment(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSegment; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int offset = getfield(hi, 16, 8); -#elif defined(F3DEX_GBI_2) - int offset = getfield(hi, 16, 0); -#endif - argu(m, 0, "seg", offset / 4, gfxd_Seg); - argu(m, 1, "base", lo, gfxd_Segptr); - int ret = 0; - if (offset % 4 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} - -UCFUNC int c_SPSetLightsN(gfxd_macro_t *m, int n_macro, int id, int numlights) -{ - if (n_macro < 2 + numlights) - return -1; - if (m[0].id != gfxd_SPNumLights || argvi(&m[0], 0) != numlights) - return -1; - int a = 1 + numlights; - if (m[a].id != gfxd_SPLight || argvi(&m[a], 1) != a) - return -1; - uint32_t l = argvu(&m[a], 0); - for (int i = 1; i <= numlights; i++) - { - int offset = sizeof(Ambient) + sizeof(Light) * (i - 1); - if (m[i].id != gfxd_SPLight - || argvu(&m[i], 0) != l + offset - || argvi(&m[i], 1) != i) - { - return -1; - } - } - m->id = id; - argu(m, 0, "l", l, gfxd_Lightsn); - return 0; -} - -UCFUNC int c_SPSetLights1(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights1, NUMLIGHTS_1); -} - -UCFUNC int c_SPSetLights2(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights2, NUMLIGHTS_2); -} - -UCFUNC int c_SPSetLights3(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights3, NUMLIGHTS_3); -} - -UCFUNC int c_SPSetLights4(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights4, NUMLIGHTS_4); -} - -UCFUNC int c_SPSetLights5(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights5, NUMLIGHTS_5); -} - -UCFUNC int c_SPSetLights6(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights6, NUMLIGHTS_6); -} - -UCFUNC int c_SPSetLights7(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights7, NUMLIGHTS_7); -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPNumLights(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNumLights; - argi(m, 0, "n", (lo - 0x80000000) / 32 - 1, gfxd_Numlights); - int ret = 0; - if (lo < 0x80000040 || lo % 32 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPNumLights(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNumLights; - argi(m, 0, "n", lo / 24, gfxd_Numlights); - int ret = 0; - if (lo < 24 || lo % 24 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPLight(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n = (getfield(hi, 8, 16) - G_MV_L0) / 2 + 1; - m->id = gfxd_SPLight; - argu(m, 0, "l", lo, gfxd_Lightptr); - argi(m, 1, "n", n, gfxd_Num); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLight(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n = (getfield(hi, 8, 8) * 8 / 24) - 1; - m->id = gfxd_SPLight; - argu(m, 0, "l", lo, gfxd_Lightptr); - argi(m, 1, "n", n, gfxd_Num); - return 0; -} -#endif - -UCFUNC int c_SPLightColor(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_MoveWd - || argvi(&m[0], 0) != G_MW_LIGHTCOL - || argvu(&m[0], 1) % 0x18 != 0 - || argvu(&m[0], 1) > G_MWO_aLIGHT_8) - { - return -1; - } - uint32_t offset = argvu(&m[0], 1); - uint32_t packedcolor = argvu(&m[0], 2); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_LIGHTCOL - || argvu(&m[1], 1) != offset + 4 - || argvu(&m[1], 2) != packedcolor) - { - return -1; - } - m->id = gfxd_SPLightColor; - argi(m, 0, "n", offset / 0x18 + 1, gfxd_Lightnum); - argu(m, 1, "c", packedcolor, gfxd_Color); - return 0; -} - -UCFUNC int d_SPTexture(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPTexture; - argu(m, 0, "sc", getfield(lo, 16, 16), gfxd_Tcscale); - argu(m, 1, "tc", getfield(lo, 16, 0), gfxd_Tcscale); - argi(m, 2, "level", getfield(hi, 3, 11), gfxd_Num); - argi(m, 3, "tile", getfield(hi, 3, 8), gfxd_Tile); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argi(m, 4, "on", getfield(hi, 8, 0), gfxd_Switch); -#elif defined(F3DEX_GBI_2) - argi(m, 4, "on", getfield(hi, 7, 1), gfxd_Switch); -#endif - return 0; -} - -UCFUNC int c_SPTextureRectangle(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 3) - return -1; - if (m[0].id != gfxd_TexRect) - return -1; - qu102_t ulx = argvu(&m[0], 0); - qu102_t uly = argvu(&m[0], 1); - qu102_t lrx = argvu(&m[0], 2); - qu102_t lry = argvu(&m[0], 3); - int tile = argvi(&m[0], 4); - if (m[1].id != gfxd_DPHalf1) - return -1; - qs105_t s = sx(getfield(argvu(&m[1], 0), 16, 16), 16); - qs105_t t = sx(getfield(argvu(&m[1], 0), 16, 0), 16); - if (m[2].id != gfxd_DPHalf2) - return -1; - qs510_t dsdx = sx(getfield(argvu(&m[2], 0), 16, 16), 16); - qs510_t dtdy = sx(getfield(argvu(&m[2], 0), 16, 0), 16); - m->id = gfxd_SPTextureRectangle; - argu(m, 0, "ulx", ulx, gfxd_Coordq); - argu(m, 1, "uly", uly, gfxd_Coordq); - argu(m, 2, "lrx", lrx, gfxd_Coordq); - argu(m, 3, "lry", lry, gfxd_Coordq); - argi(m, 4, "tile", tile, gfxd_Tile); - argi(m, 5, "s", s, gfxd_St); - argi(m, 6, "t", t, gfxd_St); - argi(m, 7, "dsdx", dsdx, gfxd_Stdelta); - argi(m, 8, "dtdy", dtdy, gfxd_Stdelta); - return 0; -} - -UCFUNC int c_SPTextureRectangleFlip(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 3) - return -1; - if (m[0].id != gfxd_TexRectFlip) - return -1; - qu102_t ulx = argvu(&m[0], 0); - qu102_t uly = argvu(&m[0], 1); - qu102_t lrx = argvu(&m[0], 2); - qu102_t lry = argvu(&m[0], 3); - int tile = argvi(&m[0], 4); - if (m[1].id != gfxd_DPHalf1) - return -1; - qs105_t s = sx(getfield(argvu(&m[1], 0), 16, 16), 16); - qs105_t t = sx(getfield(argvu(&m[1], 0), 16, 0), 16); - if (m[2].id != gfxd_DPHalf2) - return -1; - qs510_t dsdx = sx(getfield(argvu(&m[2], 0), 16, 16), 16); - qs510_t dtdy = sx(getfield(argvu(&m[2], 0), 16, 0), 16); - m->id = gfxd_SPTextureRectangleFlip; - argu(m, 0, "ulx", ulx, gfxd_Coordq); - argu(m, 1, "uly", uly, gfxd_Coordq); - argu(m, 2, "lrx", lrx, gfxd_Coordq); - argu(m, 3, "lry", lry, gfxd_Coordq); - argi(m, 4, "tile", tile, gfxd_Tile); - argi(m, 5, "s", s, gfxd_St); - argi(m, 6, "t", t, gfxd_St); - argi(m, 7, "dsdx", dsdx, gfxd_Stdelta); - argi(m, 8, "dtdy", dtdy, gfxd_Stdelta); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 4, 20) + 1; - int v0 = getfield(hi, 4, 16); - int size = getfield(hi, 16, 0); - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0, gfxd_Vtx); - int ret = 0; - if (size != sizeof(Vtx) * n) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 6, 10); - int v0 = getfield(hi, 8, 16); - int size = getfield(hi, 10, 0); - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0 / 2, gfxd_Vtx); - int ret = 0; - if (size != sizeof(Vtx) * n - 1) - { - badarg(m, 1); - ret = -1; - } - if (v0 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 8, 12); - int v0 = getfield(hi, 7, 1) - n; - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0, gfxd_Vtx); - return 0; -} -#endif - -UCFUNC int d_SPViewport(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPViewport; - argu(m, 0, "v", lo, gfxd_Vpptr); - return 0; -} - -UCFUNC int d_DPLoadTLUTCmd(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadTLUTCmd; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argi(m, 1, "count", getfield(lo, 10, 14), gfxd_Num); - return 0; -} - -UCFUNC int c_DPLoadTLUT(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - uint32_t tmem = argvu(&m[2], 3); - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd || argvi(&m[4], 0) != G_TX_LOADTILE) - return -1; - int count = argvi(&m[4], 1) + 1; - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT; - argi(m, 0, "count", count, gfxd_Num); - argu(m, 1, "tmem", tmem, gfxd_Tmem); - argu(m, 2, "dram", dram, gfxd_Tlut); - return 0; -} - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_BranchZ(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_BranchZ; - int na = getfield(hi, 12, 12); - int nb = getfield(hi, 12, 0); - int32_t zval; - if (lo > 0x7FFFFFFF) - zval = INT32_MIN + (int32_t)(lo & 0x7FFFFFFF); - else - zval = lo; - argi(m, 0, "vtx", nb / 2, gfxd_Vtx); - argi(m, 1, "zval", zval, gfxd_Zraw); - int ret = 0; - if (nb % 2 != 0 || na / 5 != nb / 2 || na % 5 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_DisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int flag = getfield(hi, 8, 16); - if (flag == 0) - return d_SPDisplayList(m, hi, lo); - else if (flag == 1) - return d_SPBranchList(m, hi, lo); - else - { - m->id = gfxd_DisplayList; - argu(m, 0, "dl", lo, gfxd_Dl); - argi(m, 1, "flag", flag, gfxd_Dlflag); - return 0; - } -} - -UCFUNC int d_DPHalf1(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPHalf1; - argu(m, 0, "hi", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_DPHalf2(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPHalf2; - argu(m, 0, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int c_DPWord(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1 || m[1].id != gfxd_DPHalf2) - return -1; - uint32_t wordhi = argvu(&m[0], 0); - uint32_t wordlo = argvu(&m[1], 0); - m->id = gfxd_DPWord; - argu(m, 0, "wordhi", wordhi, gfxd_Word); - argu(m, 1, "wordlo", wordlo, gfxd_Word); - return 0; -} - -UCFUNC int d_DPLoadTile(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadTile; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordq); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 4, "lrt", getfield(lo, 12, 0), gfxd_Coordq); - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - uint32_t clearbits = getfield(~hi, 24, 0); - uint32_t setbits = lo; - if (clearbits == 0 && setbits != 0) - return d_SPSetGeometryMode(m, hi, lo); - else if (clearbits != 0 && setbits == 0) - return d_SPClearGeometryMode(m, hi, lo); - else if (clearbits == 0x00FFFFFF) - return d_SPLoadGeometryMode(m, hi, lo); - else - { - m->id = gfxd_SPGeometryMode; - argu(m, 0, "c", clearbits, gfxd_Gm); - argu(m, 1, "s", setbits, gfxd_Gm); - return 0; - } -} -#endif - -UCFUNC int d_SPSetOtherMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSetOtherMode; - int opc = getfield(hi, 8, 24); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - argi(m, 0, "opc", opc, gfxd_Opcode); - argi(m, 1, "sft", shift, gfxd_Sftlo); - argi(m, 2, "len", length, gfxd_Num); - if (opc == G_SETOTHERMODE_H) - argu(m, 3, "mode", lo, gfxd_Othermodehi); - else if (opc == G_SETOTHERMODE_L) - argu(m, 3, "mode", lo, gfxd_Othermodelo); - else - argu(m, 3, "mode", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_SPSetOtherModeLo(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - if (shift == G_MDSFT_ALPHACOMPARE && length == G_MDSIZ_ALPHACOMPARE) - return d_DPSetAlphaCompare(m, hi, lo); - else if (shift == G_MDSFT_ZSRCSEL && length == G_MDSIZ_ZSRCSEL) - return d_DPSetDepthSource(m, hi, lo); - else if (shift == G_MDSFT_RENDERMODE && length == G_MDSIZ_RENDERMODE) - return d_DPSetRenderMode(m, hi, lo); - else if (config.emit_ext_macro) - { - m->id = gfxd_SPSetOtherModeLo; - argi(m, 0, "sft", shift, gfxd_Sftlo); - argi(m, 1, "len", length, gfxd_Num); - argu(m, 2, "mode", lo, gfxd_Othermodelo); - return 0; - } - else - return d_SPSetOtherMode(m, hi, lo); -} - -UCFUNC int d_SPSetOtherModeHi(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - if (shift == G_MDSFT_ALPHADITHER && length == G_MDSIZ_ALPHADITHER) - return d_DPSetAlphaDither(m, hi, lo); - else if (shift == G_MDSFT_RGBDITHER && length == G_MDSIZ_RGBDITHER) - return d_DPSetColorDither(m, hi, lo); - else if (shift == G_MDSFT_COMBKEY && length == G_MDSIZ_COMBKEY) - return d_DPSetCombineKey(m, hi, lo); - else if (shift == G_MDSFT_TEXTCONV && length == G_MDSIZ_TEXTCONV) - return d_DPSetTextureConvert(m, hi, lo); - else if (shift == G_MDSFT_TEXTFILT && length == G_MDSIZ_TEXTFILT) - return d_DPSetTextureFilter(m, hi, lo); - else if (shift == G_MDSFT_TEXTLUT && length == G_MDSIZ_TEXTLUT) - return d_DPSetTextureLUT(m, hi, lo); - else if (shift == G_MDSFT_TEXTLOD && length == G_MDSIZ_TEXTLOD) - return d_DPSetTextureLOD(m, hi, lo); - else if (shift == G_MDSFT_TEXTDETAIL && length == G_MDSIZ_TEXTDETAIL) - return d_DPSetTextureDetail(m, hi, lo); - else if (shift == G_MDSFT_TEXTPERSP && length == G_MDSIZ_TEXTPERSP) - return d_DPSetTexturePersp(m, hi, lo); - else if (shift == G_MDSFT_CYCLETYPE && length == G_MDSIZ_CYCLETYPE) - return d_DPSetCycleType(m, hi, lo); - else if (shift == G_MDSFT_PIPELINE && length == G_MDSIZ_PIPELINE) - return d_DPPipelineMode(m, hi, lo); - else if (config.emit_ext_macro) - { - m->id = gfxd_SPSetOtherModeHi; - argi(m, 0, "sft", shift, gfxd_Sfthi); - argi(m, 1, "len", length, gfxd_Num); - argu(m, 2, "mode", lo, gfxd_Othermodehi); - return 0; - } - else - return d_SPSetOtherMode(m, hi, lo); -} - -UCFUNC int d_DPSetOtherMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetOtherMode; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Othermodehi); - argu(m, 1, "lo", lo, gfxd_Othermodelo); - return 0; -} - -UCFUNC int d_MoveWd(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int index = getfield(hi, 8, 0); - int offset = getfield(hi, 16, 8); -#elif defined(F3DEX_GBI_2) - int index = getfield(hi, 8, 16); - int offset = getfield(hi, 16, 0); -#endif - if (index == G_MW_FOG && offset == G_MWO_FOG) - return d_SPFogPosition(m, hi, lo); -#if !(defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI))) - else if (index == G_MW_PERSPNORM && offset == 0) - return d_SPPerspNormalize(m, hi, lo); -#endif - else if (index == G_MW_SEGMENT) - return d_SPSegment(m, hi, lo); - else if (index == G_MW_NUMLIGHT && offset == G_MWO_NUMLIGHT) - return d_SPNumLights(m, hi, lo); -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - else if (index == G_MW_POINTS) - return d_SPModifyVertex(m, hi, lo); -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - else if (index == G_MW_MATRIX) - return d_SPInsertMatrix(m, hi, lo); -#endif - else - { - m->id = gfxd_MoveWd; - argi(m, 0, "index", index, gfxd_Mw); - if (index == G_MW_MATRIX) - argu(m, 1, "offset", offset, gfxd_Mwo_matrix); - else if (index == G_MW_CLIP) - argu(m, 1, "offset", offset, gfxd_Mwo_clip); - else if (index == G_MW_LIGHTCOL) - argu(m, 1, "offset", offset, gfxd_Mwo_lightcol); - else - argu(m, 1, "offset", offset, gfxd_Mwo); - argu(m, 2, "value", lo, gfxd_Word); - } - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_MoveMem(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int size = getfield(hi, 16, 0); - int index = getfield(hi, 8, 16); - if (size == sizeof(Light) - && index >= G_MV_L0 - && index <= G_MV_L7 - && index % 2 == 0) - { - return d_SPLight(m, hi, lo); - } - else if (size == sizeof(Light) && index == G_MV_LOOKATX) - return d_SPLookAtX(m, hi, lo); - else if (size == sizeof(Light) && index == G_MV_LOOKATY) - return d_SPLookAtY(m, hi, lo); - else if (size == sizeof(Vp) && index == G_MV_VIEWPORT) - return d_SPViewport(m, hi, lo); - else - { - m->id = gfxd_MoveMem; - argu(m, 0, "size", size, gfxd_Size); - argi(m, 1, "index", index, gfxd_Mv); - argu(m, 2, "dram", lo, gfxd_Dram); - return 0; - } -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_MoveMem(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int size = (getfield(hi, 5, 19) + 1) * 8; - int index = getfield(hi, 8, 0); - int offset = getfield(hi, 8, 8) * 8; - if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset >= G_MVO_L0 - && offset <= G_MVO_L7 - && offset % 0x18 == 0) - { - return d_SPLight(m, hi, lo); - } - else if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset == G_MVO_LOOKATX) - { - return d_SPLookAtX(m, hi, lo); - } - else if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset == G_MVO_LOOKATY) - { - return d_SPLookAtY(m, hi, lo); - } - else if (size == sizeof(Vp) - && index == G_MV_VIEWPORT - && offset == 0) - { - return d_SPViewport(m, hi, lo); - } - else - { - m->id = gfxd_MoveMem; - argu(m, 0, "size", size, gfxd_Size); - argi(m, 1, "index", index, gfxd_Mv); - argu(m, 2, "offset", offset, gfxd_Size); - argu(m, 3, "dram", lo, gfxd_Dram); - return 0; - } -} -#endif - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPDmaRead(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SPDmaWrite(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SPDma_io(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int flag = getfield(hi, 1, 23); - if (flag == 0) - return d_SPDmaRead(m, hi, lo); - else if (flag == 1) - return d_SPDmaWrite(m, hi, lo); - else - { - m->id = gfxd_SPDma_io; - argi(m, 0, "flag", flag, gfxd_Dmaflag); - argu(m, 1, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 2, "dram", lo, gfxd_Dram); - argu(m, 3, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; - } -} - -UCFUNC int d_SPDmaRead(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDmaRead; - argu(m, 0, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 1, "dram", lo, gfxd_Dram); - argu(m, 2, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; -} - -UCFUNC int d_SPDmaWrite(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDmaWrite; - argu(m, 0, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 1, "dram", lo, gfxd_Dram); - argu(m, 2, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_LoadUcode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_LoadUcode; - argu(m, 0, "uc_start", lo, gfxd_Uctext); - argu(m, 1, "uc_dsize", getfield(hi, 16, 0) + 1, gfxd_Size); - return 0; -} - -UCFUNC int c_SPLoadUcodeEx(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t uc_dstart = argvu(&m[0], 0); - if (m[1].id != gfxd_LoadUcode) - return -1; - uint32_t uc_start = argvu(&m[1], 0); - uint32_t uc_dsize = argvu(&m[1], 1); - m->id = gfxd_SPLoadUcodeEx; - argu(m, 0, "uc_start", uc_start, gfxd_Uctext); - argu(m, 1, "uc_dstart", uc_dstart, gfxd_Ucdata); - argu(m, 2, "uc_dsize", uc_dsize, gfxd_Size); - return 0; -} -#endif - -UCFUNC int d_TexRect(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_TexRect; - argu(m, 0, "ulx", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 1, "uly", getfield(lo, 12, 0), gfxd_Coordq); - argu(m, 2, "lrx", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 3, "lry", getfield(hi, 12, 0), gfxd_Coordq); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - return 0; -} - -UCFUNC int d_TexRectFlip(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_TexRectFlip; - argu(m, 0, "ulx", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 1, "uly", getfield(lo, 12, 0), gfxd_Coordq); - argu(m, 2, "lrx", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 3, "lry", getfield(hi, 12, 0), gfxd_Coordq); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - return 0; -} - -UCFUNC int d_SPNoOp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNoOp; - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_Special3(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special3; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_Special2(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special2; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_Special1(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special1; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} -#endif diff --git a/ZAPDTR/lib/libgfxd/uc_macrotbl.c b/ZAPDTR/lib/libgfxd/uc_macrotbl.c deleted file mode 100644 index a8939cede..000000000 --- a/ZAPDTR/lib/libgfxd/uc_macrotbl.c +++ /dev/null @@ -1,1397 +0,0 @@ -static const gfxd_macro_type_t macro_tbl[] = -{ - [gfxd_Invalid] = - { - .prefix = NULL, - .suffix = NULL, - .opcode = -1, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Invalid, - }, - [gfxd_DPFillRectangle] = - { - .prefix = NULL, - .suffix = "DPFillRectangle", - .opcode = G_FILLRECT, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPFillRectangle, - }, - [gfxd_DPFullSync] = - { - .prefix = NULL, - .suffix = "DPFullSync", - .opcode = G_RDPFULLSYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPFullSync, - }, - [gfxd_DPLoadSync] = - { - .prefix = NULL, - .suffix = "DPLoadSync", - .opcode = G_RDPLOADSYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPLoadSync, - }, - [gfxd_DPTileSync] = - { - .prefix = NULL, - .suffix = "DPTileSync", - .opcode = G_RDPTILESYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPTileSync, - }, - [gfxd_DPPipeSync] = - { - .prefix = NULL, - .suffix = "DPPipeSync", - .opcode = G_RDPPIPESYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPPipeSync, - }, - [gfxd_DPLoadTLUT_pal16] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT_pal16", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 2, - .combine_fn = c_DPLoadTLUT_pal16, - }, - [gfxd_DPLoadTLUT_pal256] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT_pal256", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 1, - .combine_fn = c_DPLoadTLUT_pal256, - }, - [gfxd_DPLoadMultiBlockYuvS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockYuvS, - .ext = 1, - }, - [gfxd_DPLoadMultiBlockYuv] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockYuv, - .ext = 1, - }, - [gfxd_DPLoadMultiBlock_4bS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c_DPLoadMultiBlock_4bS, - }, - [gfxd_DPLoadMultiBlock_4b] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c_DPLoadMultiBlock_4b, - }, - [gfxd_DPLoadMultiBlockS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockS, - }, - [gfxd_DPLoadMultiBlock] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlock, - }, - [gfxd__DPLoadTextureBlockYuvS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockYuvS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlockYuv] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockYuv, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock_4bS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c__DPLoadTextureBlock_4bS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock_4b] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c__DPLoadTextureBlock_4b, - }, - [gfxd__DPLoadTextureBlockS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlock, - }, - [gfxd_DPLoadTextureBlockYuvS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockYuvS, - .ext = 1, - }, - [gfxd_DPLoadTextureBlockYuv] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockYuv, - .ext = 1, - }, - [gfxd_DPLoadTextureBlock_4bS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 11, - .combine_fn = c_DPLoadTextureBlock_4bS, - }, - [gfxd_DPLoadTextureBlock_4b] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 11, - .combine_fn = c_DPLoadTextureBlock_4b, - }, - [gfxd_DPLoadTextureBlockS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockS, - }, - [gfxd_DPLoadTextureBlock] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlock, - }, - [gfxd_DPLoadMultiTileYuv] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 18, - .combine_fn = c_DPLoadMultiTileYuv, - .ext = 1, - }, - [gfxd_DPLoadMultiTile_4b] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c_DPLoadMultiTile_4b, - }, - [gfxd_DPLoadMultiTile] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 18, - .combine_fn = c_DPLoadMultiTile, - }, - [gfxd__DPLoadTextureTileYuv] = - { - .prefix = "_", - .suffix = "DPLoadTextureTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c__DPLoadTextureTileYuv, - .ext = 1, - }, - [gfxd__DPLoadTextureTile_4b] = - { - .prefix = "_", - .suffix = "DPLoadTextureTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c__DPLoadTextureTile_4b, - .ext = 1, - }, - [gfxd__DPLoadTextureTile] = - { - .prefix = "_", - .suffix = "DPLoadTextureTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c__DPLoadTextureTile, - .ext = 1, - }, - [gfxd_DPLoadTextureTileYuv] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c_DPLoadTextureTileYuv, - .ext = 1, - }, - [gfxd_DPLoadTextureTile_4b] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 15, - .combine_fn = c_DPLoadTextureTile_4b, - }, - [gfxd_DPLoadTextureTile] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c_DPLoadTextureTile, - }, - [gfxd_DPLoadBlock] = - { - .prefix = NULL, - .suffix = "DPLoadBlock", - .opcode = G_LOADBLOCK, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPLoadBlock, - }, - [gfxd_DPNoOp] = - { - .prefix = NULL, - .suffix = "DPNoOp", - .opcode = G_NOOP, - .n_gfx = 1, - .n_arg = 0, - .alias = gfxd_DPNoOpTag, - }, - [gfxd_DPNoOpTag] = - { - .prefix = NULL, - .suffix = "DPNoOpTag", - .opcode = G_NOOP, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPNoOpTag, - }, - [gfxd_DPPipelineMode] = - { - .prefix = NULL, - .suffix = "DPPipelineMode", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetBlendColor] = - { - .prefix = NULL, - .suffix = "DPSetBlendColor", - .opcode = G_SETBLENDCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetBlendColor, - }, - [gfxd_DPSetEnvColor] = - { - .prefix = NULL, - .suffix = "DPSetEnvColor", - .opcode = G_SETENVCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetEnvColor, - }, - [gfxd_DPSetFillColor] = - { - .prefix = NULL, - .suffix = "DPSetFillColor", - .opcode = G_SETFILLCOLOR, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPSetFillColor, - }, - [gfxd_DPSetFogColor] = - { - .prefix = NULL, - .suffix = "DPSetFogColor", - .opcode = G_SETFOGCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetFogColor, - }, - [gfxd_DPSetPrimColor] = - { - .prefix = NULL, - .suffix = "DPSetPrimColor", - .opcode = G_SETPRIMCOLOR, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetPrimColor, - }, - [gfxd_DPSetColorImage] = - { - .prefix = NULL, - .suffix = "DPSetColorImage", - .opcode = G_SETCIMG, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetColorImage, - }, - [gfxd_DPSetDepthImage] = - { - .prefix = NULL, - .suffix = "DPSetDepthImage", - .opcode = G_SETZIMG, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPSetDepthImage, - }, - [gfxd_DPSetTextureImage] = - { - .prefix = NULL, - .suffix = "DPSetTextureImage", - .opcode = G_SETTIMG, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetTextureImage, - }, - [gfxd_DPSetAlphaCompare] = - { - .prefix = NULL, - .suffix = "DPSetAlphaCompare", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetAlphaDither] = - { - .prefix = NULL, - .suffix = "DPSetAlphaDither", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetColorDither] = - { - .prefix = NULL, - .suffix = "DPSetColorDither", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetCombineMode] = - { - .prefix = NULL, - .suffix = "DPSetCombineMode", - .opcode = G_SETCOMBINE, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_DPSetCombineLERP, - }, - [gfxd_DPSetCombineLERP] = - { - .prefix = NULL, - .suffix = "DPSetCombineLERP", - .opcode = G_SETCOMBINE, - .n_gfx = 1, - .n_arg = 16, - .disas_fn = d_DPSetCombineLERP, - }, - [gfxd_DPSetConvert] = - { - .prefix = NULL, - .suffix = "DPSetConvert", - .opcode = G_SETCONVERT, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetConvert, - }, - [gfxd_DPSetTextureConvert] = - { - .prefix = NULL, - .suffix = "DPSetTextureConvert", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetCycleType] = - { - .prefix = NULL, - .suffix = "DPSetCycleType", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetDepthSource] = - { - .prefix = NULL, - .suffix = "DPSetDepthSource", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetCombineKey] = - { - .prefix = NULL, - .suffix = "DPSetCombineKey", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetKeyGB] = - { - .prefix = NULL, - .suffix = "DPSetKeyGB", - .opcode = G_SETKEYGB, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetKeyGB, - }, - [gfxd_DPSetKeyR] = - { - .prefix = NULL, - .suffix = "DPSetKeyR", - .opcode = G_SETKEYR, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_DPSetKeyR, - }, - [gfxd_DPSetPrimDepth] = - { - .prefix = NULL, - .suffix = "DPSetPrimDepth", - .opcode = G_SETPRIMDEPTH, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPSetPrimDepth, - }, - [gfxd_DPSetRenderMode] = - { - .prefix = NULL, - .suffix = "DPSetRenderMode", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetScissor] = - { - .prefix = NULL, - .suffix = "DPSetScissor", - .opcode = G_SETSCISSOR, - .n_gfx = 1, - .n_arg = 5, - .alias = gfxd_DPSetScissorFrac, - }, - [gfxd_DPSetScissorFrac] = - { - .prefix = NULL, - .suffix = "DPSetScissorFrac", - .opcode = G_SETSCISSOR, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPSetScissorFrac, - }, - [gfxd_DPSetTextureDetail] = - { - .prefix = NULL, - .suffix = "DPSetTextureDetail", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureFilter] = - { - .prefix = NULL, - .suffix = "DPSetTextureFilter", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureLOD] = - { - .prefix = NULL, - .suffix = "DPSetTextureLOD", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureLUT] = - { - .prefix = NULL, - .suffix = "DPSetTextureLUT", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTexturePersp] = - { - .prefix = NULL, - .suffix = "DPSetTexturePersp", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTile] = - { - .prefix = NULL, - .suffix = "DPSetTile", - .opcode = G_SETTILE, - .n_gfx = 1, - .n_arg = 12, - .disas_fn = d_DPSetTile, - }, - [gfxd_DPSetTileSize] = - { - .prefix = NULL, - .suffix = "DPSetTileSize", - .opcode = G_SETTILESIZE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPSetTileSize, - }, - [gfxd_SP1Triangle] = - { - .prefix = NULL, - .suffix = "SP1Triangle", - .opcode = G_TRI1, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SP1Triangle, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SP2Triangles] = - { - .prefix = NULL, - .suffix = "SP2Triangles", - .opcode = G_TRI2, - .n_gfx = 1, - .n_arg = 8, - .disas_fn = d_SP2Triangles, - }, -#endif -#if defined(F3DEX_GBI) - [gfxd_SP1Quadrangle] = - { - .prefix = NULL, - .suffix = "SP1Quadrangle", - .opcode = G_TRI2, - .n_gfx = 1, - .n_arg = 5, - .alias = gfxd_SP2Triangles, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SP1Quadrangle] = - { - .prefix = NULL, - .suffix = "SP1Quadrangle", - .opcode = G_QUAD, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_SP1Quadrangle, - }, -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPBranchLessZraw] = - { - .prefix = NULL, - .suffix = "SPBranchLessZraw", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 3, - .combine_fn = c_SPBranchLessZraw, - }, -#endif - [gfxd_SPBranchList] = - { - .prefix = NULL, - .suffix = "SPBranchList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_DisplayList, - }, - [gfxd_SPClipRatio] = - { - .prefix = NULL, - .suffix = "SPClipRatio", - .opcode = G_MOVEWORD, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPClipRatio, - }, - [gfxd_SPCullDisplayList] = - { - .prefix = NULL, - .suffix = "SPCullDisplayList", - .opcode = G_CULLDL, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPCullDisplayList, - }, - [gfxd_SPDisplayList] = - { - .prefix = NULL, - .suffix = "SPDisplayList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_DisplayList, - }, - [gfxd_SPEndDisplayList] = - { - .prefix = NULL, - .suffix = "SPEndDisplayList", - .opcode = G_ENDDL, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_SPEndDisplayList, - }, - [gfxd_SPFogFactor] = - { - .prefix = NULL, - .suffix = "SPFogFactor", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_SPFogPosition, - }, - [gfxd_SPFogPosition] = - { - .prefix = NULL, - .suffix = "SPFogPosition", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPForceMatrix] = - { - .prefix = NULL, - .suffix = "SPForceMatrix", - .opcode = G_MOVEMEM, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPForceMatrix, - }, - [gfxd_SPSetGeometryMode] = - { - .prefix = NULL, - .suffix = "SPSetGeometryMode", - .opcode = G_SETGEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPSetGeometryMode, - }, - [gfxd_SPClearGeometryMode] = - { - .prefix = NULL, - .suffix = "SPClearGeometryMode", - .opcode = G_CLEARGEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPClearGeometryMode, - }, - [gfxd_SPLoadGeometryMode] = - { - .prefix = NULL, - .suffix = "SPLoadGeometryMode", - .opcode = G_CLEARGEOMETRYMODE, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPLoadGeometryMode, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SPForceMatrix] = - { - .prefix = NULL, - .suffix = "SPForceMatrix", - .opcode = G_MOVEMEM, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPForceMatrix, - }, - [gfxd_SPSetGeometryMode] = - { - .prefix = NULL, - .suffix = "SPSetGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, - [gfxd_SPClearGeometryMode] = - { - .prefix = NULL, - .suffix = "SPClearGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, - [gfxd_SPLoadGeometryMode] = - { - .prefix = NULL, - .suffix = "SPLoadGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPInsertMatrix] = - { - .prefix = NULL, - .suffix = "SPInsertMatrix", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, -#endif - [gfxd_SPLine3D] = - { - .prefix = NULL, - .suffix = "SPLine3D", - .opcode = G_LINE3D, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPLineW3D, - }, - [gfxd_SPLineW3D] = - { - .prefix = NULL, - .suffix = "SPLineW3D", - .opcode = G_LINE3D, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPLineW3D, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPLoadUcode] = - { - .prefix = NULL, - .suffix = "SPLoadUcode", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_SPLoadUcode, - }, -#endif - [gfxd_SPLookAtX] = - { - .prefix = NULL, - .suffix = "SPLookAtX", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLookAtY] = - { - .prefix = NULL, - .suffix = "SPLookAtY", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLookAt] = - { - .prefix = NULL, - .suffix = "SPLookAt", - .opcode = G_MOVEMEM, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPLookAt, - }, - [gfxd_SPMatrix] = - { - .prefix = NULL, - .suffix = "SPMatrix", - .opcode = G_MTX, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPMatrix, - }, -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - [gfxd_SPModifyVertex] = - { - .prefix = NULL, - .suffix = "SPModifyVertex", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_MoveWd, - }, -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPModifyVertex] = - { - .prefix = NULL, - .suffix = "SPModifyVertex", - .opcode = G_MODIFYVTX, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPModifyVertex, - }, -#endif -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - [gfxd_SPPerspNormalize] = - { - .prefix = NULL, - .suffix = "SPPerspNormalize", - .opcode = G_PERSPNORM, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPPerspNormalize, - }, -#else - [gfxd_SPPerspNormalize] = - { - .prefix = NULL, - .suffix = "SPPerspNormalize", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveWd, - }, -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPPopMatrix] = - { - .prefix = NULL, - .suffix = "SPPopMatrix", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPPopMatrix, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SPPopMatrix] = - { - .prefix = NULL, - .suffix = "SPPopMatrix", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPPopMatrixN, - }, - [gfxd_SPPopMatrixN] = - { - .prefix = NULL, - .suffix = "SPPopMatrixN", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPPopMatrixN, - }, -#endif - [gfxd_SPSegment] = - { - .prefix = NULL, - .suffix = "SPSegment", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, - [gfxd_SPSetLights1] = - { - .prefix = NULL, - .suffix = "SPSetLights1", - .opcode = G_MOVEWORD, - .n_gfx = 3, - .n_arg = 1, - .combine_fn = c_SPSetLights1, - }, - [gfxd_SPSetLights2] = - { - .prefix = NULL, - .suffix = "SPSetLights2", - .opcode = G_MOVEWORD, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPSetLights2, - }, - [gfxd_SPSetLights3] = - { - .prefix = NULL, - .suffix = "SPSetLights3", - .opcode = G_MOVEWORD, - .n_gfx = 5, - .n_arg = 1, - .combine_fn = c_SPSetLights3, - }, - [gfxd_SPSetLights4] = - { - .prefix = NULL, - .suffix = "SPSetLights4", - .opcode = G_MOVEWORD, - .n_gfx = 6, - .n_arg = 1, - .combine_fn = c_SPSetLights4, - }, - [gfxd_SPSetLights5] = - { - .prefix = NULL, - .suffix = "SPSetLights5", - .opcode = G_MOVEWORD, - .n_gfx = 7, - .n_arg = 1, - .combine_fn = c_SPSetLights5, - }, - [gfxd_SPSetLights6] = - { - .prefix = NULL, - .suffix = "SPSetLights6", - .opcode = G_MOVEWORD, - .n_gfx = 8, - .n_arg = 1, - .combine_fn = c_SPSetLights6, - }, - [gfxd_SPSetLights7] = - { - .prefix = NULL, - .suffix = "SPSetLights7", - .opcode = G_MOVEWORD, - .n_gfx = 9, - .n_arg = 1, - .combine_fn = c_SPSetLights7, - }, - [gfxd_SPNumLights] = - { - .prefix = NULL, - .suffix = "SPNumLights", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveWd, - }, - [gfxd_SPLight] = - { - .prefix = NULL, - .suffix = "SPLight", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLightColor] = - { - .prefix = NULL, - .suffix = "SPLightColor", - .opcode = G_MOVEWORD, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_SPLightColor, - }, - [gfxd_SPTexture] = - { - .prefix = NULL, - .suffix = "SPTexture", - .opcode = G_TEXTURE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_SPTexture, - }, - [gfxd_SPTextureRectangle] = - { - .prefix = NULL, - .suffix = "SPTextureRectangle", - .opcode = G_TEXRECT, - .n_gfx = 3, - .n_arg = 9, - .combine_fn = c_SPTextureRectangle, - }, - [gfxd_SPTextureRectangleFlip] = - { - .prefix = NULL, - .suffix = "SPTextureRectangleFlip", - .opcode = G_TEXRECTFLIP, - .n_gfx = 3, - .n_arg = 9, - .combine_fn = c_SPTextureRectangleFlip, - }, - [gfxd_SPVertex] = - { - .prefix = NULL, - .suffix = "SPVertex", - .opcode = G_VTX, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPVertex, - }, - [gfxd_SPViewport] = - { - .prefix = NULL, - .suffix = "SPViewport", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_DPLoadTLUTCmd] = - { - .prefix = NULL, - .suffix = "DPLoadTLUTCmd", - .opcode = G_LOADTLUT, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPLoadTLUTCmd, - }, - [gfxd_DPLoadTLUT] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 3, - .combine_fn = c_DPLoadTLUT, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_BranchZ] = - { - .prefix = NULL, - .suffix = "BranchZ", - .opcode = G_BRANCH_Z, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_BranchZ, - .ext = 1, - }, -#endif - [gfxd_DisplayList] = - { - .prefix = NULL, - .suffix = "DisplayList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DisplayList, - .ext = 1, - }, - [gfxd_DPHalf1] = - { - .prefix = NULL, - .suffix = "DPHalf1", - .opcode = G_RDPHALF_1, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPHalf1, - .ext = 1, - }, - [gfxd_DPHalf2] = - { - .prefix = NULL, - .suffix = "DPHalf2", - .opcode = G_RDPHALF_2, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPHalf2, - .ext = 1, - }, - [gfxd_DPWord] = - { - .prefix = NULL, - .suffix = "DPWord", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_DPWord, - }, - [gfxd_DPLoadTile] = - { - .prefix = NULL, - .suffix = "DPLoadTile", - .opcode = G_LOADTILE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPLoadTile, - }, -#if defined(F3DEX_GBI_2) - [gfxd_SPGeometryMode] = - { - .prefix = NULL, - .suffix = "SPGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPGeometryMode, - }, -#endif - [gfxd_SPSetOtherMode] = - { - .prefix = NULL, - .suffix = "SPSetOtherMode", - .opcode = -1, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPSetOtherMode, - }, - [gfxd_SPSetOtherModeLo] = - { - .prefix = NULL, - .suffix = "SPSetOtherModeLo", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPSetOtherModeLo, - .ext = 1, - }, - [gfxd_SPSetOtherModeHi] = - { - .prefix = NULL, - .suffix = "SPSetOtherModeHi", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPSetOtherModeHi, - .ext = 1, - }, - [gfxd_DPSetOtherMode] = - { - .prefix = NULL, - .suffix = "DPSetOtherMode", - .opcode = G_RDPSETOTHERMODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPSetOtherMode, - }, - [gfxd_MoveWd] = - { - .prefix = NULL, - .suffix = "MoveWd", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_MoveWd, - }, -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_MoveMem] = - { - .prefix = NULL, - .suffix = "MoveMem", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_MoveMem, - .ext = 1, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_MoveMem] = - { - .prefix = NULL, - .suffix = "MoveMem", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_MoveMem, - .ext = 1, - }, -#endif -#if defined(F3DEX_GBI_2) - [gfxd_SPDma_io] = - { - .prefix = NULL, - .suffix = "SPDma_io", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPDma_io, - }, - [gfxd_SPDmaRead] = - { - .prefix = NULL, - .suffix = "SPDmaRead", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPDma_io, - }, - [gfxd_SPDmaWrite] = - { - .prefix = NULL, - .suffix = "SPDmaWrite", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPDma_io, - }, -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_LoadUcode] = - { - .prefix = NULL, - .suffix = "LoadUcode", - .opcode = G_LOAD_UCODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_LoadUcode, - }, - [gfxd_SPLoadUcodeEx] = - { - .prefix = NULL, - .suffix = "SPLoadUcodeEx", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 3, - .combine_fn = c_SPLoadUcodeEx, - }, -#endif - [gfxd_TexRect] = - { - .prefix = NULL, - .suffix = "TexRect", - .opcode = G_TEXRECT, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_TexRect, - .ext = 1, - }, - [gfxd_TexRectFlip] = - { - .prefix = NULL, - .suffix = "TexRectFlip", - .opcode = G_TEXRECTFLIP, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_TexRectFlip, - .ext = 1, - }, - [gfxd_SPNoOp] = - { - .prefix = NULL, - .suffix = "SPNoOp", - .opcode = G_SPNOOP, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_SPNoOp, - }, -#if defined(F3DEX_GBI_2) - [gfxd_Special3] = - { - .prefix = NULL, - .suffix = "Special3", - .opcode = G_SPECIAL_3, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special3, - .ext = 1, - }, - [gfxd_Special2] = - { - .prefix = NULL, - .suffix = "Special2", - .opcode = G_SPECIAL_2, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special2, - .ext = 1, - }, - [gfxd_Special1] = - { - .prefix = NULL, - .suffix = "Special1", - .opcode = G_SPECIAL_1, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special1, - .ext = 1, - }, -#endif -}; diff --git a/ZAPDTR/lib/tinyxml2/tinyxml2.cpp b/ZAPDTR/lib/tinyxml2/tinyxml2.cpp deleted file mode 100644 index 23a3a6ce4..000000000 --- a/ZAPDTR/lib/tinyxml2/tinyxml2.cpp +++ /dev/null @@ -1,2837 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#include "tinyxml2.h" - -#include // yes, this one new style header, is in the Android SDK. -#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) -# include -# include -#else -# include -# include -#endif - -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) - // Microsoft Visual Studio, version 2005 and higher. Not WinCE. - /*int _snprintf_s( - char *buffer, - size_t sizeOfBuffer, - size_t count, - const char *format [, - argument] ... - );*/ - static inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) - { - va_list va; - va_start( va, format ); - int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); - va_end( va ); - return result; - } - - static inline int TIXML_VSNPRINTF( char* buffer, size_t size, const char* format, va_list va ) - { - int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); - return result; - } - - #define TIXML_VSCPRINTF _vscprintf - #define TIXML_SSCANF sscanf_s -#elif defined _MSC_VER - // Microsoft Visual Studio 2003 and earlier or WinCE - #define TIXML_SNPRINTF _snprintf - #define TIXML_VSNPRINTF _vsnprintf - #define TIXML_SSCANF sscanf - #if (_MSC_VER < 1400 ) && (!defined WINCE) - // Microsoft Visual Studio 2003 and not WinCE. - #define TIXML_VSCPRINTF _vscprintf // VS2003's C runtime has this, but VC6 C runtime or WinCE SDK doesn't have. - #else - // Microsoft Visual Studio 2003 and earlier or WinCE. - static inline int TIXML_VSCPRINTF( const char* format, va_list va ) - { - int len = 512; - for (;;) { - len = len*2; - char* str = new char[len](); - const int required = _vsnprintf(str, len, format, va); - delete[] str; - if ( required != -1 ) { - TIXMLASSERT( required >= 0 ); - len = required; - break; - } - } - TIXMLASSERT( len >= 0 ); - return len; - } - #endif -#else - // GCC version 3 and higher - //#warning( "Using sn* functions." ) - #define TIXML_SNPRINTF snprintf - #define TIXML_VSNPRINTF vsnprintf - static inline int TIXML_VSCPRINTF( const char* format, va_list va ) - { - int len = vsnprintf( 0, 0, format, va ); - TIXMLASSERT( len >= 0 ); - return len; - } - #define TIXML_SSCANF sscanf -#endif - - -static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF -static const char LF = LINE_FEED; -static const char CARRIAGE_RETURN = (char)0x0d; // CR gets filtered out -static const char CR = CARRIAGE_RETURN; -static const char SINGLE_QUOTE = '\''; -static const char DOUBLE_QUOTE = '\"'; - -// Bunch of unicode info at: -// http://www.unicode.org/faq/utf_bom.html -// ef bb bf (Microsoft "lead bytes") - designates UTF-8 - -static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; -static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; -static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; - -namespace tinyxml2 -{ - -struct Entity { - const char* pattern; - int length; - char value; -}; - -static const int NUM_ENTITIES = 5; -static const Entity entities[NUM_ENTITIES] = { - { "quot", 4, DOUBLE_QUOTE }, - { "amp", 3, '&' }, - { "apos", 4, SINGLE_QUOTE }, - { "lt", 2, '<' }, - { "gt", 2, '>' } -}; - - -StrPair::~StrPair() -{ - Reset(); -} - - -void StrPair::TransferTo( StrPair* other ) -{ - if ( this == other ) { - return; - } - // This in effect implements the assignment operator by "moving" - // ownership (as in auto_ptr). - - TIXMLASSERT( other != 0 ); - TIXMLASSERT( other->_flags == 0 ); - TIXMLASSERT( other->_start == 0 ); - TIXMLASSERT( other->_end == 0 ); - - other->Reset(); - - other->_flags = _flags; - other->_start = _start; - other->_end = _end; - - _flags = 0; - _start = 0; - _end = 0; -} - - -void StrPair::Reset() -{ - if ( _flags & NEEDS_DELETE ) { - delete [] _start; - } - _flags = 0; - _start = 0; - _end = 0; -} - - -void StrPair::SetStr( const char* str, int flags ) -{ - TIXMLASSERT( str ); - Reset(); - size_t len = strlen( str ); - TIXMLASSERT( _start == 0 ); - _start = new char[ len+1 ]; - memcpy( _start, str, len+1 ); - _end = _start + len; - _flags = flags | NEEDS_DELETE; -} - - -char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLineNumPtr ) -{ - TIXMLASSERT( p ); - TIXMLASSERT( endTag && *endTag ); - TIXMLASSERT(curLineNumPtr); - - char* start = p; - char endChar = *endTag; - size_t length = strlen( endTag ); - - // Inner loop of text parsing. - while ( *p ) { - if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) { - Set( start, p, strFlags ); - return p + length; - } else if (*p == '\n') { - ++(*curLineNumPtr); - } - ++p; - TIXMLASSERT( p ); - } - return 0; -} - - -char* StrPair::ParseName( char* p ) -{ - if ( !p || !(*p) ) { - return 0; - } - if ( !XMLUtil::IsNameStartChar( *p ) ) { - return 0; - } - - char* const start = p; - ++p; - while ( *p && XMLUtil::IsNameChar( *p ) ) { - ++p; - } - - Set( start, p, 0 ); - return p; -} - - -void StrPair::CollapseWhitespace() -{ - // Adjusting _start would cause undefined behavior on delete[] - TIXMLASSERT( ( _flags & NEEDS_DELETE ) == 0 ); - // Trim leading space. - _start = XMLUtil::SkipWhiteSpace( _start, 0 ); - - if ( *_start ) { - const char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( *p ) { - if ( XMLUtil::IsWhiteSpace( *p )) { - p = XMLUtil::SkipWhiteSpace( p, 0 ); - if ( *p == 0 ) { - break; // don't write to q; this trims the trailing space. - } - *q = ' '; - ++q; - } - *q = *p; - ++q; - ++p; - } - *q = 0; - } -} - - -const char* StrPair::GetStr() -{ - TIXMLASSERT( _start ); - TIXMLASSERT( _end ); - if ( _flags & NEEDS_FLUSH ) { - *_end = 0; - _flags ^= NEEDS_FLUSH; - - if ( _flags ) { - const char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( p < _end ) { - if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) { - // CR-LF pair becomes LF - // CR alone becomes LF - // LF-CR becomes LF - if ( *(p+1) == LF ) { - p += 2; - } - else { - ++p; - } - *q = LF; - ++q; - } - else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) { - if ( *(p+1) == CR ) { - p += 2; - } - else { - ++p; - } - *q = LF; - ++q; - } - else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) { - // Entities handled by tinyXML2: - // - special entities in the entity table [in/out] - // - numeric character reference [in] - // 中 or 中 - - if ( *(p+1) == '#' ) { - const int buflen = 10; - char buf[buflen] = { 0 }; - int len = 0; - char* adjusted = const_cast( XMLUtil::GetCharacterRef( p, buf, &len ) ); - if ( adjusted == 0 ) { - *q = *p; - ++p; - ++q; - } - else { - TIXMLASSERT( 0 <= len && len <= buflen ); - TIXMLASSERT( q + len <= adjusted ); - p = adjusted; - memcpy( q, buf, len ); - q += len; - } - } - else { - bool entityFound = false; - for( int i = 0; i < NUM_ENTITIES; ++i ) { - const Entity& entity = entities[i]; - if ( strncmp( p + 1, entity.pattern, entity.length ) == 0 - && *( p + entity.length + 1 ) == ';' ) { - // Found an entity - convert. - *q = entity.value; - ++q; - p += entity.length + 2; - entityFound = true; - break; - } - } - if ( !entityFound ) { - // fixme: treat as error? - ++p; - ++q; - } - } - } - else { - *q = *p; - ++p; - ++q; - } - } - *q = 0; - } - // The loop below has plenty going on, and this - // is a less useful mode. Break it out. - if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) { - CollapseWhitespace(); - } - _flags = (_flags & NEEDS_DELETE); - } - TIXMLASSERT( _start ); - return _start; -} - - - - -// --------- XMLUtil ----------- // - -const char* XMLUtil::writeBoolTrue = "true"; -const char* XMLUtil::writeBoolFalse = "false"; - -void XMLUtil::SetBoolSerialization(const char* writeTrue, const char* writeFalse) -{ - static const char* defTrue = "true"; - static const char* defFalse = "false"; - - writeBoolTrue = (writeTrue) ? writeTrue : defTrue; - writeBoolFalse = (writeFalse) ? writeFalse : defFalse; -} - - -const char* XMLUtil::ReadBOM( const char* p, bool* bom ) -{ - TIXMLASSERT( p ); - TIXMLASSERT( bom ); - *bom = false; - const unsigned char* pu = reinterpret_cast(p); - // Check for BOM: - if ( *(pu+0) == TIXML_UTF_LEAD_0 - && *(pu+1) == TIXML_UTF_LEAD_1 - && *(pu+2) == TIXML_UTF_LEAD_2 ) { - *bom = true; - p += 3; - } - TIXMLASSERT( p ); - return p; -} - - -void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ) -{ - const unsigned long BYTE_MASK = 0xBF; - const unsigned long BYTE_MARK = 0x80; - const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; - - if (input < 0x80) { - *length = 1; - } - else if ( input < 0x800 ) { - *length = 2; - } - else if ( input < 0x10000 ) { - *length = 3; - } - else if ( input < 0x200000 ) { - *length = 4; - } - else { - *length = 0; // This code won't convert this correctly anyway. - return; - } - - output += *length; - - // Scary scary fall throughs are annotated with carefully designed comments - // to suppress compiler warnings such as -Wimplicit-fallthrough in gcc - switch (*length) { - case 4: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 3: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 2: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 1: - --output; - *output = (char)(input | FIRST_BYTE_MARK[*length]); - break; - default: - TIXMLASSERT( false ); - } -} - - -const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length ) -{ - // Presume an entity, and pull it out. - *length = 0; - - if ( *(p+1) == '#' && *(p+2) ) { - unsigned long ucs = 0; - TIXMLASSERT( sizeof( ucs ) >= 4 ); - ptrdiff_t delta = 0; - unsigned mult = 1; - static const char SEMICOLON = ';'; - - if ( *(p+2) == 'x' ) { - // Hexadecimal. - const char* q = p+3; - if ( !(*q) ) { - return 0; - } - - q = strchr( q, SEMICOLON ); - - if ( !q ) { - return 0; - } - TIXMLASSERT( *q == SEMICOLON ); - - delta = q-p; - --q; - - while ( *q != 'x' ) { - unsigned int digit = 0; - - if ( *q >= '0' && *q <= '9' ) { - digit = *q - '0'; - } - else if ( *q >= 'a' && *q <= 'f' ) { - digit = *q - 'a' + 10; - } - else if ( *q >= 'A' && *q <= 'F' ) { - digit = *q - 'A' + 10; - } - else { - return 0; - } - TIXMLASSERT( digit < 16 ); - TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); - const unsigned int digitScaled = mult * digit; - TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); - ucs += digitScaled; - TIXMLASSERT( mult <= UINT_MAX / 16 ); - mult *= 16; - --q; - } - } - else { - // Decimal. - const char* q = p+2; - if ( !(*q) ) { - return 0; - } - - q = strchr( q, SEMICOLON ); - - if ( !q ) { - return 0; - } - TIXMLASSERT( *q == SEMICOLON ); - - delta = q-p; - --q; - - while ( *q != '#' ) { - if ( *q >= '0' && *q <= '9' ) { - const unsigned int digit = *q - '0'; - TIXMLASSERT( digit < 10 ); - TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); - const unsigned int digitScaled = mult * digit; - TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); - ucs += digitScaled; - } - else { - return 0; - } - TIXMLASSERT( mult <= UINT_MAX / 10 ); - mult *= 10; - --q; - } - } - // convert the UCS to UTF-8 - ConvertUTF32ToUTF8( ucs, value, length ); - return p + delta + 1; - } - return p+1; -} - - -void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%d", v ); -} - - -void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%u", v ); -} - - -void XMLUtil::ToStr( bool v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%s", v ? writeBoolTrue : writeBoolFalse); -} - -/* - ToStr() of a number is a very tricky topic. - https://github.com/leethomason/tinyxml2/issues/106 -*/ -void XMLUtil::ToStr( float v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.8g", v ); -} - - -void XMLUtil::ToStr( double v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.17g", v ); -} - - -void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize) -{ - // horrible syntax trick to make the compiler happy about %lld - TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v); -} - - -bool XMLUtil::ToInt( const char* str, int* value ) -{ - if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) -{ - if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToBool( const char* str, bool* value ) -{ - int ival = 0; - if ( ToInt( str, &ival )) { - *value = (ival==0) ? false : true; - return true; - } - if ( StringEqual( str, "true" ) ) { - *value = true; - return true; - } - else if ( StringEqual( str, "false" ) ) { - *value = false; - return true; - } - return false; -} - - -bool XMLUtil::ToFloat( const char* str, float* value ) -{ - if ( TIXML_SSCANF( str, "%f", value ) == 1 ) { - return true; - } - return false; -} - - -bool XMLUtil::ToDouble( const char* str, double* value ) -{ - if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) { - return true; - } - return false; -} - - -bool XMLUtil::ToInt64(const char* str, int64_t* value) -{ - long long v = 0; // horrible syntax trick to make the compiler happy about %lld - if (TIXML_SSCANF(str, "%lld", &v) == 1) { - *value = (int64_t)v; - return true; - } - return false; -} - - -char* XMLDocument::Identify( char* p, XMLNode** node ) -{ - TIXMLASSERT( node ); - TIXMLASSERT( p ); - char* const start = p; - int const startLine = _parseCurLineNum; - p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); - if( !*p ) { - *node = 0; - TIXMLASSERT( p ); - return p; - } - - // These strings define the matching patterns: - static const char* xmlHeader = { "( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += xmlHeaderLen; - } - else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += commentHeaderLen; - } - else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) { - XMLText* text = CreateUnlinkedNode( _textPool ); - returnNode = text; - returnNode->_parseLineNum = _parseCurLineNum; - p += cdataHeaderLen; - text->SetCData( true ); - } - else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += dtdHeaderLen; - } - else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _elementPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += elementHeaderLen; - } - else { - returnNode = CreateUnlinkedNode( _textPool ); - returnNode->_parseLineNum = _parseCurLineNum; // Report line of first non-whitespace character - p = start; // Back it up, all the text counts. - _parseCurLineNum = startLine; - } - - TIXMLASSERT( returnNode ); - TIXMLASSERT( p ); - *node = returnNode; - return p; -} - - -bool XMLDocument::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - if ( visitor->VisitEnter( *this ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLNode ----------- // - -XMLNode::XMLNode( XMLDocument* doc ) : - _document( doc ), - _parent( 0 ), - _value(), - _parseLineNum( 0 ), - _firstChild( 0 ), _lastChild( 0 ), - _prev( 0 ), _next( 0 ), - _userData( 0 ), - _memPool( 0 ) -{ -} - - -XMLNode::~XMLNode() -{ - DeleteChildren(); - if ( _parent ) { - _parent->Unlink( this ); - } -} - -const char* XMLNode::Value() const -{ - // Edge case: XMLDocuments don't have a Value. Return null. - if ( this->ToDocument() ) - return 0; - return _value.GetStr(); -} - -void XMLNode::SetValue( const char* str, bool staticMem ) -{ - if ( staticMem ) { - _value.SetInternedStr( str ); - } - else { - _value.SetStr( str ); - } -} - -XMLNode* XMLNode::DeepClone(XMLDocument* target) const -{ - XMLNode* clone = this->ShallowClone(target); - if (!clone) return 0; - - for (const XMLNode* child = this->FirstChild(); child; child = child->NextSibling()) { - XMLNode* childClone = child->DeepClone(target); - TIXMLASSERT(childClone); - clone->InsertEndChild(childClone); - } - return clone; -} - -void XMLNode::DeleteChildren() -{ - while( _firstChild ) { - TIXMLASSERT( _lastChild ); - DeleteChild( _firstChild ); - } - _firstChild = _lastChild = 0; -} - - -void XMLNode::Unlink( XMLNode* child ) -{ - TIXMLASSERT( child ); - TIXMLASSERT( child->_document == _document ); - TIXMLASSERT( child->_parent == this ); - if ( child == _firstChild ) { - _firstChild = _firstChild->_next; - } - if ( child == _lastChild ) { - _lastChild = _lastChild->_prev; - } - - if ( child->_prev ) { - child->_prev->_next = child->_next; - } - if ( child->_next ) { - child->_next->_prev = child->_prev; - } - child->_next = 0; - child->_prev = 0; - child->_parent = 0; -} - - -void XMLNode::DeleteChild( XMLNode* node ) -{ - TIXMLASSERT( node ); - TIXMLASSERT( node->_document == _document ); - TIXMLASSERT( node->_parent == this ); - Unlink( node ); - TIXMLASSERT(node->_prev == 0); - TIXMLASSERT(node->_next == 0); - TIXMLASSERT(node->_parent == 0); - DeleteNode( node ); -} - - -XMLNode* XMLNode::InsertEndChild( XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - InsertChildPreamble( addThis ); - - if ( _lastChild ) { - TIXMLASSERT( _firstChild ); - TIXMLASSERT( _lastChild->_next == 0 ); - _lastChild->_next = addThis; - addThis->_prev = _lastChild; - _lastChild = addThis; - - addThis->_next = 0; - } - else { - TIXMLASSERT( _firstChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - InsertChildPreamble( addThis ); - - if ( _firstChild ) { - TIXMLASSERT( _lastChild ); - TIXMLASSERT( _firstChild->_prev == 0 ); - - _firstChild->_prev = addThis; - addThis->_next = _firstChild; - _firstChild = addThis; - - addThis->_prev = 0; - } - else { - TIXMLASSERT( _lastChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - - TIXMLASSERT( afterThis ); - - if ( afterThis->_parent != this ) { - TIXMLASSERT( false ); - return 0; - } - if ( afterThis == addThis ) { - // Current state: BeforeThis -> AddThis -> OneAfterAddThis - // Now AddThis must disappear from it's location and then - // reappear between BeforeThis and OneAfterAddThis. - // So just leave it where it is. - return addThis; - } - - if ( afterThis->_next == 0 ) { - // The last node or the only node. - return InsertEndChild( addThis ); - } - InsertChildPreamble( addThis ); - addThis->_prev = afterThis; - addThis->_next = afterThis->_next; - afterThis->_next->_prev = addThis; - afterThis->_next = addThis; - addThis->_parent = this; - return addThis; -} - - - - -const XMLElement* XMLNode::FirstChildElement( const char* name ) const -{ - for( const XMLNode* node = _firstChild; node; node = node->_next ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::LastChildElement( const char* name ) const -{ - for( const XMLNode* node = _lastChild; node; node = node->_prev ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::NextSiblingElement( const char* name ) const -{ - for( const XMLNode* node = _next; node; node = node->_next ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::PreviousSiblingElement( const char* name ) const -{ - for( const XMLNode* node = _prev; node; node = node->_prev ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) -{ - // This is a recursive method, but thinking about it "at the current level" - // it is a pretty simple flat list: - // - // - // - // With a special case: - // - // - // - // - // Where the closing element (/foo) *must* be the next thing after the opening - // element, and the names must match. BUT the tricky bit is that the closing - // element will be read by the child. - // - // 'endTag' is the end tag for this node, it is returned by a call to a child. - // 'parentEnd' is the end tag for the parent, which is filled in and returned. - - XMLDocument::DepthTracker tracker(_document); - if (_document->Error()) - return 0; - - while( p && *p ) { - XMLNode* node = 0; - - p = _document->Identify( p, &node ); - TIXMLASSERT( p ); - if ( node == 0 ) { - break; - } - - int initialLineNum = node->_parseLineNum; - - StrPair endTag; - p = node->ParseDeep( p, &endTag, curLineNumPtr ); - if ( !p ) { - DeleteNode( node ); - if ( !_document->Error() ) { - _document->SetError( XML_ERROR_PARSING, initialLineNum, 0); - } - break; - } - - XMLDeclaration* decl = node->ToDeclaration(); - if ( decl ) { - // Declarations are only allowed at document level - // - // Multiple declarations are allowed but all declarations - // must occur before anything else. - // - // Optimized due to a security test case. If the first node is - // a declaration, and the last node is a declaration, then only - // declarations have so far been addded. - bool wellLocated = false; - - if (ToDocument()) { - if (FirstChild()) { - wellLocated = - FirstChild() && - FirstChild()->ToDeclaration() && - LastChild() && - LastChild()->ToDeclaration(); - } - else { - wellLocated = true; - } - } - if ( !wellLocated ) { - _document->SetError( XML_ERROR_PARSING_DECLARATION, initialLineNum, "XMLDeclaration value=%s", decl->Value()); - DeleteNode( node ); - break; - } - } - - XMLElement* ele = node->ToElement(); - if ( ele ) { - // We read the end tag. Return it to the parent. - if ( ele->ClosingType() == XMLElement::CLOSING ) { - if ( parentEndTag ) { - ele->_value.TransferTo( parentEndTag ); - } - node->_memPool->SetTracked(); // created and then immediately deleted. - DeleteNode( node ); - return p; - } - - // Handle an end tag returned to this level. - // And handle a bunch of annoying errors. - bool mismatch = false; - if ( endTag.Empty() ) { - if ( ele->ClosingType() == XMLElement::OPEN ) { - mismatch = true; - } - } - else { - if ( ele->ClosingType() != XMLElement::OPEN ) { - mismatch = true; - } - else if ( !XMLUtil::StringEqual( endTag.GetStr(), ele->Name() ) ) { - mismatch = true; - } - } - if ( mismatch ) { - _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, initialLineNum, "XMLElement name=%s", ele->Name()); - DeleteNode( node ); - break; - } - } - InsertEndChild( node ); - } - return 0; -} - -/*static*/ void XMLNode::DeleteNode( XMLNode* node ) -{ - if ( node == 0 ) { - return; - } - TIXMLASSERT(node->_document); - if (!node->ToDocument()) { - node->_document->MarkInUse(node); - } - - MemPool* pool = node->_memPool; - node->~XMLNode(); - pool->Free( node ); -} - -void XMLNode::InsertChildPreamble( XMLNode* insertThis ) const -{ - TIXMLASSERT( insertThis ); - TIXMLASSERT( insertThis->_document == _document ); - - if (insertThis->_parent) { - insertThis->_parent->Unlink( insertThis ); - } - else { - insertThis->_document->MarkInUse(insertThis); - insertThis->_memPool->SetTracked(); - } -} - -const XMLElement* XMLNode::ToElementWithName( const char* name ) const -{ - const XMLElement* element = this->ToElement(); - if ( element == 0 ) { - return 0; - } - if ( name == 0 ) { - return element; - } - if ( XMLUtil::StringEqual( element->Name(), name ) ) { - return element; - } - return 0; -} - -// --------- XMLText ---------- // -char* XMLText::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - if ( this->CData() ) { - p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_CDATA, _parseLineNum, 0 ); - } - return p; - } - else { - int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; - if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { - flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING; - } - - p = _value.ParseText( p, "<", flags, curLineNumPtr ); - if ( p && *p ) { - return p-1; - } - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_TEXT, _parseLineNum, 0 ); - } - } - return 0; -} - - -XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLText* text = doc->NewText( Value() ); // fixme: this will always allocate memory. Intern? - text->SetCData( this->CData() ); - return text; -} - - -bool XMLText::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLText* text = compare->ToText(); - return ( text && XMLUtil::StringEqual( text->Value(), Value() ) ); -} - - -bool XMLText::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - - -// --------- XMLComment ---------- // - -XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLComment::~XMLComment() -{ -} - - -char* XMLComment::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Comment parses as text. - p = _value.ParseText( p, "-->", StrPair::COMMENT, curLineNumPtr ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_COMMENT, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLComment* comment = doc->NewComment( Value() ); // fixme: this will always allocate memory. Intern? - return comment; -} - - -bool XMLComment::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLComment* comment = compare->ToComment(); - return ( comment && XMLUtil::StringEqual( comment->Value(), Value() )); -} - - -bool XMLComment::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - - -// --------- XMLDeclaration ---------- // - -XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLDeclaration::~XMLDeclaration() -{ - //printf( "~XMLDeclaration\n" ); -} - - -char* XMLDeclaration::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Declaration parses as text. - p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_DECLARATION, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLDeclaration* dec = doc->NewDeclaration( Value() ); // fixme: this will always allocate memory. Intern? - return dec; -} - - -bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLDeclaration* declaration = compare->ToDeclaration(); - return ( declaration && XMLUtil::StringEqual( declaration->Value(), Value() )); -} - - - -bool XMLDeclaration::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - -// --------- XMLUnknown ---------- // - -XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLUnknown::~XMLUnknown() -{ -} - - -char* XMLUnknown::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Unknown parses as text. - p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_UNKNOWN, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLUnknown* text = doc->NewUnknown( Value() ); // fixme: this will always allocate memory. Intern? - return text; -} - - -bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLUnknown* unknown = compare->ToUnknown(); - return ( unknown && XMLUtil::StringEqual( unknown->Value(), Value() )); -} - - -bool XMLUnknown::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - -// --------- XMLAttribute ---------- // - -const char* XMLAttribute::Name() const -{ - return _name.GetStr(); -} - -const char* XMLAttribute::Value() const -{ - return _value.GetStr(); -} - -char* XMLAttribute::ParseDeep( char* p, bool processEntities, int* curLineNumPtr ) -{ - // Parse using the name rules: bug fix, was using ParseText before - p = _name.ParseName( p ); - if ( !p || !*p ) { - return 0; - } - - // Skip white space before = - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( *p != '=' ) { - return 0; - } - - ++p; // move up to opening quote - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( *p != '\"' && *p != '\'' ) { - return 0; - } - - char endTag[2] = { *p, 0 }; - ++p; // move past opening quote - - p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES, curLineNumPtr ); - return p; -} - - -void XMLAttribute::SetName( const char* n ) -{ - _name.SetStr( n ); -} - - -XMLError XMLAttribute::QueryIntValue( int* value ) const -{ - if ( XMLUtil::ToInt( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const -{ - if ( XMLUtil::ToUnsigned( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryInt64Value(int64_t* value) const -{ - if (XMLUtil::ToInt64(Value(), value)) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryBoolValue( bool* value ) const -{ - if ( XMLUtil::ToBool( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryFloatValue( float* value ) const -{ - if ( XMLUtil::ToFloat( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryDoubleValue( double* value ) const -{ - if ( XMLUtil::ToDouble( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -void XMLAttribute::SetAttribute( const char* v ) -{ - _value.SetStr( v ); -} - - -void XMLAttribute::SetAttribute( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute(int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - _value.SetStr(buf); -} - - - -void XMLAttribute::SetAttribute( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -// --------- XMLElement ---------- // -XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ), - _closingType( OPEN ), - _rootAttribute( 0 ) -{ -} - - -XMLElement::~XMLElement() -{ - while( _rootAttribute ) { - XMLAttribute* next = _rootAttribute->_next; - DeleteAttribute( _rootAttribute ); - _rootAttribute = next; - } -} - - -const XMLAttribute* XMLElement::FindAttribute( const char* name ) const -{ - for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) { - if ( XMLUtil::StringEqual( a->Name(), name ) ) { - return a; - } - } - return 0; -} - - -const char* XMLElement::Attribute( const char* name, const char* value ) const -{ - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return 0; - } - if ( !value || XMLUtil::StringEqual( a->Value(), value )) { - return a->Value(); - } - return 0; -} - -int XMLElement::IntAttribute(const char* name, int defaultValue) const -{ - int i = defaultValue; - QueryIntAttribute(name, &i); - return i; -} - -unsigned XMLElement::UnsignedAttribute(const char* name, unsigned defaultValue) const -{ - unsigned i = defaultValue; - QueryUnsignedAttribute(name, &i); - return i; -} - -int64_t XMLElement::Int64Attribute(const char* name, int64_t defaultValue) const -{ - int64_t i = defaultValue; - QueryInt64Attribute(name, &i); - return i; -} - -bool XMLElement::BoolAttribute(const char* name, bool defaultValue) const -{ - bool b = defaultValue; - QueryBoolAttribute(name, &b); - return b; -} - -double XMLElement::DoubleAttribute(const char* name, double defaultValue) const -{ - double d = defaultValue; - QueryDoubleAttribute(name, &d); - return d; -} - -float XMLElement::FloatAttribute(const char* name, float defaultValue) const -{ - float f = defaultValue; - QueryFloatAttribute(name, &f); - return f; -} - -const char* XMLElement::GetText() const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - return FirstChild()->Value(); - } - return 0; -} - - -void XMLElement::SetText( const char* inText ) -{ - if ( FirstChild() && FirstChild()->ToText() ) - FirstChild()->SetValue( inText ); - else { - XMLText* theText = GetDocument()->NewText( inText ); - InsertFirstChild( theText ); - } -} - - -void XMLElement::SetText( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText(int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - SetText(buf); -} - - -void XMLElement::SetText( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -XMLError XMLElement::QueryIntText( int* ival ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToInt( t, ival ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToUnsigned( t, uval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryInt64Text(int64_t* ival) const -{ - if (FirstChild() && FirstChild()->ToText()) { - const char* t = FirstChild()->Value(); - if (XMLUtil::ToInt64(t, ival)) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryBoolText( bool* bval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToBool( t, bval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryDoubleText( double* dval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToDouble( t, dval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryFloatText( float* fval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToFloat( t, fval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - -int XMLElement::IntText(int defaultValue) const -{ - int i = defaultValue; - QueryIntText(&i); - return i; -} - -unsigned XMLElement::UnsignedText(unsigned defaultValue) const -{ - unsigned i = defaultValue; - QueryUnsignedText(&i); - return i; -} - -int64_t XMLElement::Int64Text(int64_t defaultValue) const -{ - int64_t i = defaultValue; - QueryInt64Text(&i); - return i; -} - -bool XMLElement::BoolText(bool defaultValue) const -{ - bool b = defaultValue; - QueryBoolText(&b); - return b; -} - -double XMLElement::DoubleText(double defaultValue) const -{ - double d = defaultValue; - QueryDoubleText(&d); - return d; -} - -float XMLElement::FloatText(float defaultValue) const -{ - float f = defaultValue; - QueryFloatText(&f); - return f; -} - - -XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name ) -{ - XMLAttribute* last = 0; - XMLAttribute* attrib = 0; - for( attrib = _rootAttribute; - attrib; - last = attrib, attrib = attrib->_next ) { - if ( XMLUtil::StringEqual( attrib->Name(), name ) ) { - break; - } - } - if ( !attrib ) { - attrib = CreateAttribute(); - TIXMLASSERT( attrib ); - if ( last ) { - TIXMLASSERT( last->_next == 0 ); - last->_next = attrib; - } - else { - TIXMLASSERT( _rootAttribute == 0 ); - _rootAttribute = attrib; - } - attrib->SetName( name ); - } - return attrib; -} - - -void XMLElement::DeleteAttribute( const char* name ) -{ - XMLAttribute* prev = 0; - for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) { - if ( XMLUtil::StringEqual( name, a->Name() ) ) { - if ( prev ) { - prev->_next = a->_next; - } - else { - _rootAttribute = a->_next; - } - DeleteAttribute( a ); - break; - } - prev = a; - } -} - - -char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr ) -{ - XMLAttribute* prevAttribute = 0; - - // Read the attributes. - while( p ) { - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( !(*p) ) { - _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, "XMLElement name=%s", Name() ); - return 0; - } - - // attribute. - if (XMLUtil::IsNameStartChar( *p ) ) { - XMLAttribute* attrib = CreateAttribute(); - TIXMLASSERT( attrib ); - attrib->_parseLineNum = _document->_parseCurLineNum; - - int attrLineNum = attrib->_parseLineNum; - - p = attrib->ParseDeep( p, _document->ProcessEntities(), curLineNumPtr ); - if ( !p || Attribute( attrib->Name() ) ) { - DeleteAttribute( attrib ); - _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, attrLineNum, "XMLElement name=%s", Name() ); - return 0; - } - // There is a minor bug here: if the attribute in the source xml - // document is duplicated, it will not be detected and the - // attribute will be doubly added. However, tracking the 'prevAttribute' - // avoids re-scanning the attribute list. Preferring performance for - // now, may reconsider in the future. - if ( prevAttribute ) { - TIXMLASSERT( prevAttribute->_next == 0 ); - prevAttribute->_next = attrib; - } - else { - TIXMLASSERT( _rootAttribute == 0 ); - _rootAttribute = attrib; - } - prevAttribute = attrib; - } - // end of the tag - else if ( *p == '>' ) { - ++p; - break; - } - // end of the tag - else if ( *p == '/' && *(p+1) == '>' ) { - _closingType = CLOSED; - return p+2; // done; sealed element. - } - else { - _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, 0 ); - return 0; - } - } - return p; -} - -void XMLElement::DeleteAttribute( XMLAttribute* attribute ) -{ - if ( attribute == 0 ) { - return; - } - MemPool* pool = attribute->_memPool; - attribute->~XMLAttribute(); - pool->Free( attribute ); -} - -XMLAttribute* XMLElement::CreateAttribute() -{ - TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() ); - XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); - TIXMLASSERT( attrib ); - attrib->_memPool = &_document->_attributePool; - attrib->_memPool->SetTracked(); - return attrib; -} - -// -// -// foobar -// -char* XMLElement::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) -{ - // Read the element name. - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - - // The closing element is the form. It is - // parsed just like a regular element then deleted from - // the DOM. - if ( *p == '/' ) { - _closingType = CLOSING; - ++p; - } - - p = _value.ParseName( p ); - if ( _value.Empty() ) { - return 0; - } - - p = ParseAttributes( p, curLineNumPtr ); - if ( !p || !*p || _closingType != OPEN ) { - return p; - } - - p = XMLNode::ParseDeep( p, parentEndTag, curLineNumPtr ); - return p; -} - - - -XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLElement* element = doc->NewElement( Value() ); // fixme: this will always allocate memory. Intern? - for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) { - element->SetAttribute( a->Name(), a->Value() ); // fixme: this will always allocate memory. Intern? - } - return element; -} - - -bool XMLElement::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLElement* other = compare->ToElement(); - if ( other && XMLUtil::StringEqual( other->Name(), Name() )) { - - const XMLAttribute* a=FirstAttribute(); - const XMLAttribute* b=other->FirstAttribute(); - - while ( a && b ) { - if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) { - return false; - } - a = a->Next(); - b = b->Next(); - } - if ( a || b ) { - // different count - return false; - } - return true; - } - return false; -} - - -bool XMLElement::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - if ( visitor->VisitEnter( *this, _rootAttribute ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLDocument ----------- // - -// Warning: List must match 'enum XMLError' -const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = { - "XML_SUCCESS", - "XML_NO_ATTRIBUTE", - "XML_WRONG_ATTRIBUTE_TYPE", - "XML_ERROR_FILE_NOT_FOUND", - "XML_ERROR_FILE_COULD_NOT_BE_OPENED", - "XML_ERROR_FILE_READ_ERROR", - "XML_ERROR_PARSING_ELEMENT", - "XML_ERROR_PARSING_ATTRIBUTE", - "XML_ERROR_PARSING_TEXT", - "XML_ERROR_PARSING_CDATA", - "XML_ERROR_PARSING_COMMENT", - "XML_ERROR_PARSING_DECLARATION", - "XML_ERROR_PARSING_UNKNOWN", - "XML_ERROR_EMPTY_DOCUMENT", - "XML_ERROR_MISMATCHED_ELEMENT", - "XML_ERROR_PARSING", - "XML_CAN_NOT_CONVERT_TEXT", - "XML_NO_TEXT_NODE", - "XML_ELEMENT_DEPTH_EXCEEDED" -}; - - -XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) : - XMLNode( 0 ), - _writeBOM( false ), - _processEntities( processEntities ), - _errorID(XML_SUCCESS), - _whitespaceMode( whitespaceMode ), - _errorStr(), - _errorLineNum( 0 ), - _charBuffer( 0 ), - _parseCurLineNum( 0 ), - _parsingDepth(0), - _unlinked(), - _elementPool(), - _attributePool(), - _textPool(), - _commentPool() -{ - // avoid VC++ C4355 warning about 'this' in initializer list (C4355 is off by default in VS2012+) - _document = this; -} - - -XMLDocument::~XMLDocument() -{ - Clear(); -} - - -void XMLDocument::MarkInUse(XMLNode* node) -{ - TIXMLASSERT(node); - TIXMLASSERT(node->_parent == 0); - - for (int i = 0; i < _unlinked.Size(); ++i) { - if (node == _unlinked[i]) { - _unlinked.SwapRemove(i); - break; - } - } -} - -void XMLDocument::Clear() -{ - DeleteChildren(); - while( _unlinked.Size()) { - DeleteNode(_unlinked[0]); // Will remove from _unlinked as part of delete. - } - -#ifdef TINYXML2_DEBUG - const bool hadError = Error(); -#endif - ClearError(); - - delete [] _charBuffer; - _charBuffer = 0; - _parsingDepth = 0; - -#if 0 - _textPool.Trace( "text" ); - _elementPool.Trace( "element" ); - _commentPool.Trace( "comment" ); - _attributePool.Trace( "attribute" ); -#endif - -#ifdef TINYXML2_DEBUG - if ( !hadError ) { - TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); - TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); - TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); - TIXMLASSERT( _commentPool.CurrentAllocs() == _commentPool.Untracked() ); - } -#endif -} - - -void XMLDocument::DeepCopy(XMLDocument* target) const -{ - TIXMLASSERT(target); - if (target == this) { - return; // technically success - a no-op. - } - - target->Clear(); - for (const XMLNode* node = this->FirstChild(); node; node = node->NextSibling()) { - target->InsertEndChild(node->DeepClone(target)); - } -} - -XMLElement* XMLDocument::NewElement( const char* name ) -{ - XMLElement* ele = CreateUnlinkedNode( _elementPool ); - ele->SetName( name ); - return ele; -} - - -XMLComment* XMLDocument::NewComment( const char* str ) -{ - XMLComment* comment = CreateUnlinkedNode( _commentPool ); - comment->SetValue( str ); - return comment; -} - - -XMLText* XMLDocument::NewText( const char* str ) -{ - XMLText* text = CreateUnlinkedNode( _textPool ); - text->SetValue( str ); - return text; -} - - -XMLDeclaration* XMLDocument::NewDeclaration( const char* str ) -{ - XMLDeclaration* dec = CreateUnlinkedNode( _commentPool ); - dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" ); - return dec; -} - - -XMLUnknown* XMLDocument::NewUnknown( const char* str ) -{ - XMLUnknown* unk = CreateUnlinkedNode( _commentPool ); - unk->SetValue( str ); - return unk; -} - -static FILE* callfopen( const char* filepath, const char* mode ) -{ - TIXMLASSERT( filepath ); - TIXMLASSERT( mode ); -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) - FILE* fp = 0; - errno_t err = fopen_s( &fp, filepath, mode ); - if ( err ) { - return 0; - } -#else - FILE* fp = fopen( filepath, mode ); -#endif - return fp; -} - -void XMLDocument::DeleteNode( XMLNode* node ) { - TIXMLASSERT( node ); - TIXMLASSERT(node->_document == this ); - if (node->_parent) { - node->_parent->DeleteChild( node ); - } - else { - // Isn't in the tree. - // Use the parent delete. - // Also, we need to mark it tracked: we 'know' - // it was never used. - node->_memPool->SetTracked(); - // Call the static XMLNode version: - XMLNode::DeleteNode(node); - } -} - - -XMLError XMLDocument::LoadFile( const char* filename ) -{ - if ( !filename ) { - TIXMLASSERT( false ); - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=" ); - return _errorID; - } - - Clear(); - FILE* fp = callfopen( filename, "rb" ); - if ( !fp ) { - SetError( XML_ERROR_FILE_NOT_FOUND, 0, "filename=%s", filename ); - return _errorID; - } - LoadFile( fp ); - fclose( fp ); - return _errorID; -} - -// This is likely overengineered template art to have a check that unsigned long value incremented -// by one still fits into size_t. If size_t type is larger than unsigned long type -// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit -// -Wtype-limits warning. This piece makes the compiler select code with a check when a check -// is useful and code with no check when a check is redundant depending on how size_t and unsigned long -// types sizes relate to each other. -template -= sizeof(size_t))> -struct LongFitsIntoSizeTMinusOne { - static bool Fits( unsigned long value ) - { - return value < (size_t)-1; - } -}; - -template <> -struct LongFitsIntoSizeTMinusOne { - static bool Fits( unsigned long ) - { - return true; - } -}; - -XMLError XMLDocument::LoadFile( FILE* fp ) -{ - Clear(); - - fseek( fp, 0, SEEK_SET ); - if ( fgetc( fp ) == EOF && ferror( fp ) != 0 ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - fseek( fp, 0, SEEK_END ); - const long filelength = ftell( fp ); - fseek( fp, 0, SEEK_SET ); - if ( filelength == -1L ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - TIXMLASSERT( filelength >= 0 ); - - if ( !LongFitsIntoSizeTMinusOne<>::Fits( filelength ) ) { - // Cannot handle files which won't fit in buffer together with null terminator - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - if ( filelength == 0 ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - - const size_t size = filelength; - TIXMLASSERT( _charBuffer == 0 ); - _charBuffer = new char[size+1]; - size_t read = fread( _charBuffer, 1, size, fp ); - if ( read != size ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - _charBuffer[size] = 0; - - Parse(); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( const char* filename, bool compact ) -{ - if ( !filename ) { - TIXMLASSERT( false ); - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=" ); - return _errorID; - } - - FILE* fp = callfopen( filename, "w" ); - if ( !fp ) { - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=%s", filename ); - return _errorID; - } - SaveFile(fp, compact); - fclose( fp ); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) -{ - // Clear any error from the last save, otherwise it will get reported - // for *this* call. - ClearError(); - XMLPrinter stream( fp, compact ); - Print( &stream ); - return _errorID; -} - - -XMLError XMLDocument::Parse( const char* p, size_t len ) -{ - Clear(); - - if ( len == 0 || !p || !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - if ( len == (size_t)(-1) ) { - len = strlen( p ); - } - TIXMLASSERT( _charBuffer == 0 ); - _charBuffer = new char[ len+1 ]; - memcpy( _charBuffer, p, len ); - _charBuffer[len] = 0; - - Parse(); - if ( Error() ) { - // clean up now essentially dangling memory. - // and the parse fail can put objects in the - // pools that are dead and inaccessible. - DeleteChildren(); - _elementPool.Clear(); - _attributePool.Clear(); - _textPool.Clear(); - _commentPool.Clear(); - } - return _errorID; -} - - -void XMLDocument::Print( XMLPrinter* streamer ) const -{ - if ( streamer ) { - Accept( streamer ); - } - else { - XMLPrinter stdoutStreamer( stdout ); - Accept( &stdoutStreamer ); - } -} - - -void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... ) -{ - TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT ); - _errorID = error; - _errorLineNum = lineNum; - _errorStr.Reset(); - - size_t BUFFER_SIZE = 1000; - char* buffer = new char[BUFFER_SIZE]; - - TIXMLASSERT(sizeof(error) <= sizeof(int)); - TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum); - - if (format) { - size_t len = strlen(buffer); - TIXML_SNPRINTF(buffer + len, BUFFER_SIZE - len, ": "); - len = strlen(buffer); - - va_list va; - va_start(va, format); - TIXML_VSNPRINTF(buffer + len, BUFFER_SIZE - len, format, va); - va_end(va); - } - _errorStr.SetStr(buffer); - delete[] buffer; -} - - -/*static*/ const char* XMLDocument::ErrorIDToName(XMLError errorID) -{ - TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT ); - const char* errorName = _errorNames[errorID]; - TIXMLASSERT( errorName && errorName[0] ); - return errorName; -} - -const char* XMLDocument::ErrorStr() const -{ - return _errorStr.Empty() ? "" : _errorStr.GetStr(); -} - - -void XMLDocument::PrintError() const -{ - printf("%s\n", ErrorStr()); -} - -const char* XMLDocument::ErrorName() const -{ - return ErrorIDToName(_errorID); -} - -void XMLDocument::Parse() -{ - TIXMLASSERT( NoChildren() ); // Clear() must have been called previously - TIXMLASSERT( _charBuffer ); - _parseCurLineNum = 1; - _parseLineNum = 1; - char* p = _charBuffer; - p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); - p = const_cast( XMLUtil::ReadBOM( p, &_writeBOM ) ); - if ( !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return; - } - ParseDeep(p, 0, &_parseCurLineNum ); -} - -void XMLDocument::PushDepth() -{ - _parsingDepth++; - if (_parsingDepth == TINYXML2_MAX_ELEMENT_DEPTH) { - SetError(XML_ELEMENT_DEPTH_EXCEEDED, _parseCurLineNum, "Element nesting is too deep." ); - } -} - -void XMLDocument::PopDepth() -{ - TIXMLASSERT(_parsingDepth > 0); - --_parsingDepth; -} - -XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) : - _elementJustOpened( false ), - _stack(), - _firstElement( true ), - _fp( file ), - _depth( depth ), - _textDepth( -1 ), - _processEntities( true ), - _compactMode( compact ), - _buffer() -{ - for( int i=0; i'] = true; // not required, but consistency is nice - _buffer.Push( 0 ); -} - - -void XMLPrinter::Print( const char* format, ... ) -{ - va_list va; - va_start( va, format ); - - if ( _fp ) { - vfprintf( _fp, format, va ); - } - else { - const int len = TIXML_VSCPRINTF( format, va ); - // Close out and re-start the va-args - va_end( va ); - TIXMLASSERT( len >= 0 ); - va_start( va, format ); - TIXMLASSERT( _buffer.Size() > 0 && _buffer[_buffer.Size() - 1] == 0 ); - char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator. - TIXML_VSNPRINTF( p, len+1, format, va ); - } - va_end( va ); -} - - -void XMLPrinter::Write( const char* data, size_t size ) -{ - if ( _fp ) { - fwrite ( data , sizeof(char), size, _fp); - } - else { - char* p = _buffer.PushArr( static_cast(size) ) - 1; // back up over the null terminator. - memcpy( p, data, size ); - p[size] = 0; - } -} - - -void XMLPrinter::Putc( char ch ) -{ - if ( _fp ) { - fputc ( ch, _fp); - } - else { - char* p = _buffer.PushArr( sizeof(char) ) - 1; // back up over the null terminator. - p[0] = ch; - p[1] = 0; - } -} - - -void XMLPrinter::PrintSpace( int depth ) -{ - for( int i=0; i 0 && *q < ENTITY_RANGE ) { - // Check for entities. If one is found, flush - // the stream up until the entity, write the - // entity, and keep looking. - if ( flag[(unsigned char)(*q)] ) { - while ( p < q ) { - const size_t delta = q - p; - const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta; - Write( p, toPrint ); - p += toPrint; - } - bool entityPatternPrinted = false; - for( int i=0; i( bom ) ); - } - if ( writeDec ) { - PushDeclaration( "xml version=\"1.0\"" ); - } -} - - -void XMLPrinter::OpenElement( const char* name, bool compactMode ) -{ - SealElementIfJustOpened(); - _stack.Push( name ); - - if ( _textDepth < 0 && !_firstElement && !compactMode ) { - Putc( '\n' ); - } - if ( !compactMode ) { - PrintSpace( _depth ); - } - - Write ( "<" ); - Write ( name ); - - _elementJustOpened = true; - _firstElement = false; - ++_depth; -} - - -void XMLPrinter::PushAttribute( const char* name, const char* value ) -{ - TIXMLASSERT( _elementJustOpened ); - Putc ( ' ' ); - Write( name ); - Write( "=\"" ); - PrintString( value, false ); - Putc ( '\"' ); -} - - -void XMLPrinter::PushAttribute( const char* name, int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute(const char* name, int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - PushAttribute(name, buf); -} - - -void XMLPrinter::PushAttribute( const char* name, bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::CloseElement( bool compactMode ) -{ - --_depth; - const char* name = _stack.Pop(); - - if ( _elementJustOpened ) { - Write( "/>" ); - } - else { - if ( _textDepth < 0 && !compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - Write ( "" ); - } - - if ( _textDepth == _depth ) { - _textDepth = -1; - } - if ( _depth == 0 && !compactMode) { - Putc( '\n' ); - } - _elementJustOpened = false; -} - - -void XMLPrinter::SealElementIfJustOpened() -{ - if ( !_elementJustOpened ) { - return; - } - _elementJustOpened = false; - Putc( '>' ); -} - - -void XMLPrinter::PushText( const char* text, bool cdata ) -{ - _textDepth = _depth-1; - - SealElementIfJustOpened(); - if ( cdata ) { - Write( "" ); - } - else { - PrintString( text, true ); - } -} - -void XMLPrinter::PushText( int64_t value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - -void XMLPrinter::PushText( int value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( unsigned value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( bool value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( float value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( double value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushComment( const char* comment ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "" ); -} - - -void XMLPrinter::PushDeclaration( const char* value ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "" ); -} - - -void XMLPrinter::PushUnknown( const char* value ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "' ); -} - - -bool XMLPrinter::VisitEnter( const XMLDocument& doc ) -{ - _processEntities = doc.ProcessEntities(); - if ( doc.HasBOM() ) { - PushHeader( true, false ); - } - return true; -} - - -bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) -{ - const XMLElement* parentElem = 0; - if ( element.Parent() ) { - parentElem = element.Parent()->ToElement(); - } - const bool compactMode = parentElem ? CompactMode( *parentElem ) : _compactMode; - OpenElement( element.Name(), compactMode ); - while ( attribute ) { - PushAttribute( attribute->Name(), attribute->Value() ); - attribute = attribute->Next(); - } - return true; -} - - -bool XMLPrinter::VisitExit( const XMLElement& element ) -{ - CloseElement( CompactMode(element) ); - return true; -} - - -bool XMLPrinter::Visit( const XMLText& text ) -{ - PushText( text.Value(), text.CData() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLComment& comment ) -{ - PushComment( comment.Value() ); - return true; -} - -bool XMLPrinter::Visit( const XMLDeclaration& declaration ) -{ - PushDeclaration( declaration.Value() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLUnknown& unknown ) -{ - PushUnknown( unknown.Value() ); - return true; -} - -} // namespace tinyxml2 diff --git a/ZAPDTR/lib/tinyxml2/tinyxml2.h b/ZAPDTR/lib/tinyxml2/tinyxml2.h deleted file mode 100644 index 7cd312736..000000000 --- a/ZAPDTR/lib/tinyxml2/tinyxml2.h +++ /dev/null @@ -1,2309 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#ifndef TINYXML2_INCLUDED -#define TINYXML2_INCLUDED - -#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) -# include -# include -# include -# include -# include -# if defined(__PS3__) -# include -# endif -#else -# include -# include -# include -# include -# include -#endif -#include - -/* - TODO: intern strings instead of allocation. -*/ -/* - gcc: - g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe - - Formatting, Artistic Style: - AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h -*/ - -#if defined( _DEBUG ) || defined (__DEBUG__) -# ifndef TINYXML2_DEBUG -# define TINYXML2_DEBUG -# endif -#endif - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4251) -#endif - -#ifdef _WIN32 -# ifdef TINYXML2_EXPORT -# define TINYXML2_LIB __declspec(dllexport) -# elif defined(TINYXML2_IMPORT) -# define TINYXML2_LIB __declspec(dllimport) -# else -# define TINYXML2_LIB -# endif -#elif __GNUC__ >= 4 -# define TINYXML2_LIB __attribute__((visibility("default"))) -#else -# define TINYXML2_LIB -#endif - - -#if defined(TINYXML2_DEBUG) -# if defined(_MSC_VER) -# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like -# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } -# elif defined (ANDROID_NDK) -# include -# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } -# else -# include -# define TIXMLASSERT assert -# endif -#else -# define TIXMLASSERT( x ) {} -#endif - - -/* Versioning, past 1.0.14: - http://semver.org/ -*/ -static const int TIXML2_MAJOR_VERSION = 7; -static const int TIXML2_MINOR_VERSION = 0; -static const int TIXML2_PATCH_VERSION = 1; - -#define TINYXML2_MAJOR_VERSION 7 -#define TINYXML2_MINOR_VERSION 0 -#define TINYXML2_PATCH_VERSION 1 - -// A fixed element depth limit is problematic. There needs to be a -// limit to avoid a stack overflow. However, that limit varies per -// system, and the capacity of the stack. On the other hand, it's a trivial -// attack that can result from ill, malicious, or even correctly formed XML, -// so there needs to be a limit in place. -static const int TINYXML2_MAX_ELEMENT_DEPTH = 100; - -namespace tinyxml2 -{ -class XMLDocument; -class XMLElement; -class XMLAttribute; -class XMLComment; -class XMLText; -class XMLDeclaration; -class XMLUnknown; -class XMLPrinter; - -/* - A class that wraps strings. Normally stores the start and end - pointers into the XML file itself, and will apply normalization - and entity translation if actually read. Can also store (and memory - manage) a traditional char[] - - Isn't clear why TINYXML2_LIB is needed; but seems to fix #719 -*/ -class TINYXML2_LIB StrPair -{ -public: - enum { - NEEDS_ENTITY_PROCESSING = 0x01, - NEEDS_NEWLINE_NORMALIZATION = 0x02, - NEEDS_WHITESPACE_COLLAPSING = 0x04, - - TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_NAME = 0, - ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - COMMENT = NEEDS_NEWLINE_NORMALIZATION - }; - - StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {} - ~StrPair(); - - void Set( char* start, char* end, int flags ) { - TIXMLASSERT( start ); - TIXMLASSERT( end ); - Reset(); - _start = start; - _end = end; - _flags = flags | NEEDS_FLUSH; - } - - const char* GetStr(); - - bool Empty() const { - return _start == _end; - } - - void SetInternedStr( const char* str ) { - Reset(); - _start = const_cast(str); - } - - void SetStr( const char* str, int flags=0 ); - - char* ParseText( char* in, const char* endTag, int strFlags, int* curLineNumPtr ); - char* ParseName( char* in ); - - void TransferTo( StrPair* other ); - void Reset(); - -private: - void CollapseWhitespace(); - - enum { - NEEDS_FLUSH = 0x100, - NEEDS_DELETE = 0x200 - }; - - int _flags; - char* _start; - char* _end; - - StrPair( const StrPair& other ); // not supported - void operator=( const StrPair& other ); // not supported, use TransferTo() -}; - - -/* - A dynamic array of Plain Old Data. Doesn't support constructors, etc. - Has a small initial memory pool, so that low or no usage will not - cause a call to new/delete -*/ -template -class DynArray -{ -public: - DynArray() : - _mem( _pool ), - _allocated( INITIAL_SIZE ), - _size( 0 ) - { - } - - ~DynArray() { - if ( _mem != _pool ) { - delete [] _mem; - } - } - - void Clear() { - _size = 0; - } - - void Push( T t ) { - TIXMLASSERT( _size < INT_MAX ); - EnsureCapacity( _size+1 ); - _mem[_size] = t; - ++_size; - } - - T* PushArr( int count ) { - TIXMLASSERT( count >= 0 ); - TIXMLASSERT( _size <= INT_MAX - count ); - EnsureCapacity( _size+count ); - T* ret = &_mem[_size]; - _size += count; - return ret; - } - - T Pop() { - TIXMLASSERT( _size > 0 ); - --_size; - return _mem[_size]; - } - - void PopArr( int count ) { - TIXMLASSERT( _size >= count ); - _size -= count; - } - - bool Empty() const { - return _size == 0; - } - - T& operator[](int i) { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& operator[](int i) const { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& PeekTop() const { - TIXMLASSERT( _size > 0 ); - return _mem[ _size - 1]; - } - - int Size() const { - TIXMLASSERT( _size >= 0 ); - return _size; - } - - int Capacity() const { - TIXMLASSERT( _allocated >= INITIAL_SIZE ); - return _allocated; - } - - void SwapRemove(int i) { - TIXMLASSERT(i >= 0 && i < _size); - TIXMLASSERT(_size > 0); - _mem[i] = _mem[_size - 1]; - --_size; - } - - const T* Mem() const { - TIXMLASSERT( _mem ); - return _mem; - } - - T* Mem() { - TIXMLASSERT( _mem ); - return _mem; - } - -private: - DynArray( const DynArray& ); // not supported - void operator=( const DynArray& ); // not supported - - void EnsureCapacity( int cap ) { - TIXMLASSERT( cap > 0 ); - if ( cap > _allocated ) { - TIXMLASSERT( cap <= INT_MAX / 2 ); - int newAllocated = cap * 2; - T* newMem = new T[newAllocated]; - TIXMLASSERT( newAllocated >= _size ); - memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs - if ( _mem != _pool ) { - delete [] _mem; - } - _mem = newMem; - _allocated = newAllocated; - } - } - - T* _mem; - T _pool[INITIAL_SIZE]; - int _allocated; // objects allocated - int _size; // number objects in use -}; - - -/* - Parent virtual class of a pool for fast allocation - and deallocation of objects. -*/ -class MemPool -{ -public: - MemPool() {} - virtual ~MemPool() {} - - virtual int ItemSize() const = 0; - virtual void* Alloc() = 0; - virtual void Free( void* ) = 0; - virtual void SetTracked() = 0; -}; - - -/* - Template child class to create pools of the correct type. -*/ -template< int ITEM_SIZE > -class MemPoolT : public MemPool -{ -public: - MemPoolT() : _blockPtrs(), _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} - ~MemPoolT() { - MemPoolT< ITEM_SIZE >::Clear(); - } - - void Clear() { - // Delete the blocks. - while( !_blockPtrs.Empty()) { - Block* lastBlock = _blockPtrs.Pop(); - delete lastBlock; - } - _root = 0; - _currentAllocs = 0; - _nAllocs = 0; - _maxAllocs = 0; - _nUntracked = 0; - } - - virtual int ItemSize() const { - return ITEM_SIZE; - } - int CurrentAllocs() const { - return _currentAllocs; - } - - virtual void* Alloc() { - if ( !_root ) { - // Need a new block. - Block* block = new Block(); - _blockPtrs.Push( block ); - - Item* blockItems = block->items; - for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) { - blockItems[i].next = &(blockItems[i + 1]); - } - blockItems[ITEMS_PER_BLOCK - 1].next = 0; - _root = blockItems; - } - Item* const result = _root; - TIXMLASSERT( result != 0 ); - _root = _root->next; - - ++_currentAllocs; - if ( _currentAllocs > _maxAllocs ) { - _maxAllocs = _currentAllocs; - } - ++_nAllocs; - ++_nUntracked; - return result; - } - - virtual void Free( void* mem ) { - if ( !mem ) { - return; - } - --_currentAllocs; - Item* item = static_cast( mem ); -#ifdef TINYXML2_DEBUG - memset( item, 0xfe, sizeof( *item ) ); -#endif - item->next = _root; - _root = item; - } - void Trace( const char* name ) { - printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n", - name, _maxAllocs, _maxAllocs * ITEM_SIZE / 1024, _currentAllocs, - ITEM_SIZE, _nAllocs, _blockPtrs.Size() ); - } - - void SetTracked() { - --_nUntracked; - } - - int Untracked() const { - return _nUntracked; - } - - // This number is perf sensitive. 4k seems like a good tradeoff on my machine. - // The test file is large, 170k. - // Release: VS2010 gcc(no opt) - // 1k: 4000 - // 2k: 4000 - // 4k: 3900 21000 - // 16k: 5200 - // 32k: 4300 - // 64k: 4000 21000 - // Declared public because some compilers do not accept to use ITEMS_PER_BLOCK - // in private part if ITEMS_PER_BLOCK is private - enum { ITEMS_PER_BLOCK = (4 * 1024) / ITEM_SIZE }; - -private: - MemPoolT( const MemPoolT& ); // not supported - void operator=( const MemPoolT& ); // not supported - - union Item { - Item* next; - char itemData[ITEM_SIZE]; - }; - struct Block { - Item items[ITEMS_PER_BLOCK]; - }; - DynArray< Block*, 10 > _blockPtrs; - Item* _root; - - int _currentAllocs; - int _nAllocs; - int _maxAllocs; - int _nUntracked; -}; - - - -/** - Implements the interface to the "Visitor pattern" (see the Accept() method.) - If you call the Accept() method, it requires being passed a XMLVisitor - class to handle callbacks. For nodes that contain other nodes (Document, Element) - you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs - are simply called with Visit(). - - If you return 'true' from a Visit method, recursive parsing will continue. If you return - false, no children of this node or its siblings will be visited. - - All flavors of Visit methods have a default implementation that returns 'true' (continue - visiting). You need to only override methods that are interesting to you. - - Generally Accept() is called on the XMLDocument, although all nodes support visiting. - - You should never change the document from a callback. - - @sa XMLNode::Accept() -*/ -class TINYXML2_LIB XMLVisitor -{ -public: - virtual ~XMLVisitor() {} - - /// Visit a document. - virtual bool VisitEnter( const XMLDocument& /*doc*/ ) { - return true; - } - /// Visit a document. - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - /// Visit an element. - virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ ) { - return true; - } - /// Visit an element. - virtual bool VisitExit( const XMLElement& /*element*/ ) { - return true; - } - - /// Visit a declaration. - virtual bool Visit( const XMLDeclaration& /*declaration*/ ) { - return true; - } - /// Visit a text node. - virtual bool Visit( const XMLText& /*text*/ ) { - return true; - } - /// Visit a comment node. - virtual bool Visit( const XMLComment& /*comment*/ ) { - return true; - } - /// Visit an unknown node. - virtual bool Visit( const XMLUnknown& /*unknown*/ ) { - return true; - } -}; - -// WARNING: must match XMLDocument::_errorNames[] -enum XMLError { - XML_SUCCESS = 0, - XML_NO_ATTRIBUTE, - XML_WRONG_ATTRIBUTE_TYPE, - XML_ERROR_FILE_NOT_FOUND, - XML_ERROR_FILE_COULD_NOT_BE_OPENED, - XML_ERROR_FILE_READ_ERROR, - XML_ERROR_PARSING_ELEMENT, - XML_ERROR_PARSING_ATTRIBUTE, - XML_ERROR_PARSING_TEXT, - XML_ERROR_PARSING_CDATA, - XML_ERROR_PARSING_COMMENT, - XML_ERROR_PARSING_DECLARATION, - XML_ERROR_PARSING_UNKNOWN, - XML_ERROR_EMPTY_DOCUMENT, - XML_ERROR_MISMATCHED_ELEMENT, - XML_ERROR_PARSING, - XML_CAN_NOT_CONVERT_TEXT, - XML_NO_TEXT_NODE, - XML_ELEMENT_DEPTH_EXCEEDED, - - XML_ERROR_COUNT -}; - - -/* - Utility functionality. -*/ -class TINYXML2_LIB XMLUtil -{ -public: - static const char* SkipWhiteSpace( const char* p, int* curLineNumPtr ) { - TIXMLASSERT( p ); - - while( IsWhiteSpace(*p) ) { - if (curLineNumPtr && *p == '\n') { - ++(*curLineNumPtr); - } - ++p; - } - TIXMLASSERT( p ); - return p; - } - static char* SkipWhiteSpace( char* p, int* curLineNumPtr ) { - return const_cast( SkipWhiteSpace( const_cast(p), curLineNumPtr ) ); - } - - // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't - // correct, but simple, and usually works. - static bool IsWhiteSpace( char p ) { - return !IsUTF8Continuation(p) && isspace( static_cast(p) ); - } - - inline static bool IsNameStartChar( unsigned char ch ) { - if ( ch >= 128 ) { - // This is a heuristic guess in attempt to not implement Unicode-aware isalpha() - return true; - } - if ( isalpha( ch ) ) { - return true; - } - return ch == ':' || ch == '_'; - } - - inline static bool IsNameChar( unsigned char ch ) { - return IsNameStartChar( ch ) - || isdigit( ch ) - || ch == '.' - || ch == '-'; - } - - inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { - if ( p == q ) { - return true; - } - TIXMLASSERT( p ); - TIXMLASSERT( q ); - TIXMLASSERT( nChar >= 0 ); - return strncmp( p, q, nChar ) == 0; - } - - inline static bool IsUTF8Continuation( char p ) { - return ( p & 0x80 ) != 0; - } - - static const char* ReadBOM( const char* p, bool* hasBOM ); - // p is the starting location, - // the UTF-8 value of the entity will be placed in value, and length filled in. - static const char* GetCharacterRef( const char* p, char* value, int* length ); - static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ); - - // converts primitive types to strings - static void ToStr( int v, char* buffer, int bufferSize ); - static void ToStr( unsigned v, char* buffer, int bufferSize ); - static void ToStr( bool v, char* buffer, int bufferSize ); - static void ToStr( float v, char* buffer, int bufferSize ); - static void ToStr( double v, char* buffer, int bufferSize ); - static void ToStr(int64_t v, char* buffer, int bufferSize); - - // converts strings to primitive types - static bool ToInt( const char* str, int* value ); - static bool ToUnsigned( const char* str, unsigned* value ); - static bool ToBool( const char* str, bool* value ); - static bool ToFloat( const char* str, float* value ); - static bool ToDouble( const char* str, double* value ); - static bool ToInt64(const char* str, int64_t* value); - - // Changes what is serialized for a boolean value. - // Default to "true" and "false". Shouldn't be changed - // unless you have a special testing or compatibility need. - // Be careful: static, global, & not thread safe. - // Be sure to set static const memory as parameters. - static void SetBoolSerialization(const char* writeTrue, const char* writeFalse); - -private: - static const char* writeBoolTrue; - static const char* writeBoolFalse; -}; - - -/** XMLNode is a base class for every object that is in the - XML Document Object Model (DOM), except XMLAttributes. - Nodes have siblings, a parent, and children which can - be navigated. A node is always in a XMLDocument. - The type of a XMLNode can be queried, and it can - be cast to its more defined type. - - A XMLDocument allocates memory for all its Nodes. - When the XMLDocument gets deleted, all its Nodes - will also be deleted. - - @verbatim - A Document can contain: Element (container or leaf) - Comment (leaf) - Unknown (leaf) - Declaration( leaf ) - - An Element can contain: Element (container or leaf) - Text (leaf) - Attributes (not on tree) - Comment (leaf) - Unknown (leaf) - - @endverbatim -*/ -class TINYXML2_LIB XMLNode -{ - friend class XMLDocument; - friend class XMLElement; -public: - - /// Get the XMLDocument that owns this XMLNode. - const XMLDocument* GetDocument() const { - TIXMLASSERT( _document ); - return _document; - } - /// Get the XMLDocument that owns this XMLNode. - XMLDocument* GetDocument() { - TIXMLASSERT( _document ); - return _document; - } - - /// Safely cast to an Element, or null. - virtual XMLElement* ToElement() { - return 0; - } - /// Safely cast to Text, or null. - virtual XMLText* ToText() { - return 0; - } - /// Safely cast to a Comment, or null. - virtual XMLComment* ToComment() { - return 0; - } - /// Safely cast to a Document, or null. - virtual XMLDocument* ToDocument() { - return 0; - } - /// Safely cast to a Declaration, or null. - virtual XMLDeclaration* ToDeclaration() { - return 0; - } - /// Safely cast to an Unknown, or null. - virtual XMLUnknown* ToUnknown() { - return 0; - } - - virtual const XMLElement* ToElement() const { - return 0; - } - virtual const XMLText* ToText() const { - return 0; - } - virtual const XMLComment* ToComment() const { - return 0; - } - virtual const XMLDocument* ToDocument() const { - return 0; - } - virtual const XMLDeclaration* ToDeclaration() const { - return 0; - } - virtual const XMLUnknown* ToUnknown() const { - return 0; - } - - /** The meaning of 'value' changes for the specific type. - @verbatim - Document: empty (NULL is returned, not an empty string) - Element: name of the element - Comment: the comment text - Unknown: the tag contents - Text: the text string - @endverbatim - */ - const char* Value() const; - - /** Set the Value of an XML node. - @sa Value() - */ - void SetValue( const char* val, bool staticMem=false ); - - /// Gets the line number the node is in, if the document was parsed from a file. - int GetLineNum() const { return _parseLineNum; } - - /// Get the parent of this node on the DOM. - const XMLNode* Parent() const { - return _parent; - } - - XMLNode* Parent() { - return _parent; - } - - /// Returns true if this node has no children. - bool NoChildren() const { - return !_firstChild; - } - - /// Get the first child node, or null if none exists. - const XMLNode* FirstChild() const { - return _firstChild; - } - - XMLNode* FirstChild() { - return _firstChild; - } - - /** Get the first child element, or optionally the first child - element with the specified name. - */ - const XMLElement* FirstChildElement( const char* name = 0 ) const; - - XMLElement* FirstChildElement( const char* name = 0 ) { - return const_cast(const_cast(this)->FirstChildElement( name )); - } - - /// Get the last child node, or null if none exists. - const XMLNode* LastChild() const { - return _lastChild; - } - - XMLNode* LastChild() { - return _lastChild; - } - - /** Get the last child element or optionally the last child - element with the specified name. - */ - const XMLElement* LastChildElement( const char* name = 0 ) const; - - XMLElement* LastChildElement( const char* name = 0 ) { - return const_cast(const_cast(this)->LastChildElement(name) ); - } - - /// Get the previous (left) sibling node of this node. - const XMLNode* PreviousSibling() const { - return _prev; - } - - XMLNode* PreviousSibling() { - return _prev; - } - - /// Get the previous (left) sibling element of this node, with an optionally supplied name. - const XMLElement* PreviousSiblingElement( const char* name = 0 ) const ; - - XMLElement* PreviousSiblingElement( const char* name = 0 ) { - return const_cast(const_cast(this)->PreviousSiblingElement( name ) ); - } - - /// Get the next (right) sibling node of this node. - const XMLNode* NextSibling() const { - return _next; - } - - XMLNode* NextSibling() { - return _next; - } - - /// Get the next (right) sibling element of this node, with an optionally supplied name. - const XMLElement* NextSiblingElement( const char* name = 0 ) const; - - XMLElement* NextSiblingElement( const char* name = 0 ) { - return const_cast(const_cast(this)->NextSiblingElement( name ) ); - } - - /** - Add a child node as the last (right) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertEndChild( XMLNode* addThis ); - - XMLNode* LinkEndChild( XMLNode* addThis ) { - return InsertEndChild( addThis ); - } - /** - Add a child node as the first (left) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertFirstChild( XMLNode* addThis ); - /** - Add a node after the specified child node. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the afterThis node - is not a child of this node, or if the node does not - belong to the same document. - */ - XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ); - - /** - Delete all the children of this node. - */ - void DeleteChildren(); - - /** - Delete a child of this node. - */ - void DeleteChild( XMLNode* node ); - - /** - Make a copy of this node, but not its children. - You may pass in a Document pointer that will be - the owner of the new Node. If the 'document' is - null, then the node returned will be allocated - from the current Document. (this->GetDocument()) - - Note: if called on a XMLDocument, this will return null. - */ - virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0; - - /** - Make a copy of this node and all its children. - - If the 'target' is null, then the nodes will - be allocated in the current document. If 'target' - is specified, the memory will be allocated is the - specified XMLDocument. - - NOTE: This is probably not the correct tool to - copy a document, since XMLDocuments can have multiple - top level XMLNodes. You probably want to use - XMLDocument::DeepCopy() - */ - XMLNode* DeepClone( XMLDocument* target ) const; - - /** - Test if 2 nodes are the same, but don't test children. - The 2 nodes do not need to be in the same Document. - - Note: if called on a XMLDocument, this will return false. - */ - virtual bool ShallowEqual( const XMLNode* compare ) const = 0; - - /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the - XML tree will be conditionally visited and the host will be called back - via the XMLVisitor interface. - - This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse - the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this - interface versus any other.) - - The interface has been based on ideas from: - - - http://www.saxproject.org/ - - http://c2.com/cgi/wiki?HierarchicalVisitorPattern - - Which are both good references for "visiting". - - An example of using Accept(): - @verbatim - XMLPrinter printer; - tinyxmlDoc.Accept( &printer ); - const char* xmlcstr = printer.CStr(); - @endverbatim - */ - virtual bool Accept( XMLVisitor* visitor ) const = 0; - - /** - Set user data into the XMLNode. TinyXML-2 in - no way processes or interprets user data. - It is initially 0. - */ - void SetUserData(void* userData) { _userData = userData; } - - /** - Get user data set into the XMLNode. TinyXML-2 in - no way processes or interprets user data. - It is initially 0. - */ - void* GetUserData() const { return _userData; } - -protected: - explicit XMLNode( XMLDocument* ); - virtual ~XMLNode(); - - virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); - - XMLDocument* _document; - XMLNode* _parent; - mutable StrPair _value; - int _parseLineNum; - - XMLNode* _firstChild; - XMLNode* _lastChild; - - XMLNode* _prev; - XMLNode* _next; - - void* _userData; - -private: - MemPool* _memPool; - void Unlink( XMLNode* child ); - static void DeleteNode( XMLNode* node ); - void InsertChildPreamble( XMLNode* insertThis ) const; - const XMLElement* ToElementWithName( const char* name ) const; - - XMLNode( const XMLNode& ); // not supported - XMLNode& operator=( const XMLNode& ); // not supported -}; - - -/** XML text. - - Note that a text node can have child element nodes, for example: - @verbatim - This is bold - @endverbatim - - A text node can have 2 ways to output the next. "normal" output - and CDATA. It will default to the mode it was parsed from the XML file and - you generally want to leave it alone, but you can change the output mode with - SetCData() and query it with CData(). -*/ -class TINYXML2_LIB XMLText : public XMLNode -{ - friend class XMLDocument; -public: - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLText* ToText() { - return this; - } - virtual const XMLText* ToText() const { - return this; - } - - /// Declare whether this should be CDATA or standard text. - void SetCData( bool isCData ) { - _isCData = isCData; - } - /// Returns true if this is a CDATA text element. - bool CData() const { - return _isCData; - } - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} - virtual ~XMLText() {} - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - bool _isCData; - - XMLText( const XMLText& ); // not supported - XMLText& operator=( const XMLText& ); // not supported -}; - - -/** An XML Comment. */ -class TINYXML2_LIB XMLComment : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLComment* ToComment() { - return this; - } - virtual const XMLComment* ToComment() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLComment( XMLDocument* doc ); - virtual ~XMLComment(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); - -private: - XMLComment( const XMLComment& ); // not supported - XMLComment& operator=( const XMLComment& ); // not supported -}; - - -/** In correct XML the declaration is the first entry in the file. - @verbatim - - @endverbatim - - TinyXML-2 will happily read or write files without a declaration, - however. - - The text of the declaration isn't interpreted. It is parsed - and written as a string. -*/ -class TINYXML2_LIB XMLDeclaration : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLDeclaration* ToDeclaration() { - return this; - } - virtual const XMLDeclaration* ToDeclaration() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLDeclaration( XMLDocument* doc ); - virtual ~XMLDeclaration(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLDeclaration( const XMLDeclaration& ); // not supported - XMLDeclaration& operator=( const XMLDeclaration& ); // not supported -}; - - -/** Any tag that TinyXML-2 doesn't recognize is saved as an - unknown. It is a tag of text, but should not be modified. - It will be written back to the XML, unchanged, when the file - is saved. - - DTD tags get thrown into XMLUnknowns. -*/ -class TINYXML2_LIB XMLUnknown : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLUnknown* ToUnknown() { - return this; - } - virtual const XMLUnknown* ToUnknown() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLUnknown( XMLDocument* doc ); - virtual ~XMLUnknown(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLUnknown( const XMLUnknown& ); // not supported - XMLUnknown& operator=( const XMLUnknown& ); // not supported -}; - - - -/** An attribute is a name-value pair. Elements have an arbitrary - number of attributes, each with a unique name. - - @note The attributes are not XMLNodes. You may only query the - Next() attribute in a list. -*/ -class TINYXML2_LIB XMLAttribute -{ - friend class XMLElement; -public: - /// The name of the attribute. - const char* Name() const; - - /// The value of the attribute. - const char* Value() const; - - /// Gets the line number the attribute is in, if the document was parsed from a file. - int GetLineNum() const { return _parseLineNum; } - - /// The next attribute in the list. - const XMLAttribute* Next() const { - return _next; - } - - /** IntValue interprets the attribute as an integer, and returns the value. - If the value isn't an integer, 0 will be returned. There is no error checking; - use QueryIntValue() if you need error checking. - */ - int IntValue() const { - int i = 0; - QueryIntValue(&i); - return i; - } - - int64_t Int64Value() const { - int64_t i = 0; - QueryInt64Value(&i); - return i; - } - - /// Query as an unsigned integer. See IntValue() - unsigned UnsignedValue() const { - unsigned i=0; - QueryUnsignedValue( &i ); - return i; - } - /// Query as a boolean. See IntValue() - bool BoolValue() const { - bool b=false; - QueryBoolValue( &b ); - return b; - } - /// Query as a double. See IntValue() - double DoubleValue() const { - double d=0; - QueryDoubleValue( &d ); - return d; - } - /// Query as a float. See IntValue() - float FloatValue() const { - float f=0; - QueryFloatValue( &f ); - return f; - } - - /** QueryIntValue interprets the attribute as an integer, and returns the value - in the provided parameter. The function will return XML_SUCCESS on success, - and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful. - */ - XMLError QueryIntValue( int* value ) const; - /// See QueryIntValue - XMLError QueryUnsignedValue( unsigned int* value ) const; - /// See QueryIntValue - XMLError QueryInt64Value(int64_t* value) const; - /// See QueryIntValue - XMLError QueryBoolValue( bool* value ) const; - /// See QueryIntValue - XMLError QueryDoubleValue( double* value ) const; - /// See QueryIntValue - XMLError QueryFloatValue( float* value ) const; - - /// Set the attribute to a string value. - void SetAttribute( const char* value ); - /// Set the attribute to value. - void SetAttribute( int value ); - /// Set the attribute to value. - void SetAttribute( unsigned value ); - /// Set the attribute to value. - void SetAttribute(int64_t value); - /// Set the attribute to value. - void SetAttribute( bool value ); - /// Set the attribute to value. - void SetAttribute( double value ); - /// Set the attribute to value. - void SetAttribute( float value ); - -private: - enum { BUF_SIZE = 200 }; - - XMLAttribute() : _name(), _value(),_parseLineNum( 0 ), _next( 0 ), _memPool( 0 ) {} - virtual ~XMLAttribute() {} - - XMLAttribute( const XMLAttribute& ); // not supported - void operator=( const XMLAttribute& ); // not supported - void SetName( const char* name ); - - char* ParseDeep( char* p, bool processEntities, int* curLineNumPtr ); - - mutable StrPair _name; - mutable StrPair _value; - int _parseLineNum; - XMLAttribute* _next; - MemPool* _memPool; -}; - - -/** The element is a container class. It has a value, the element name, - and can contain other elements, text, comments, and unknowns. - Elements also contain an arbitrary number of attributes. -*/ -class TINYXML2_LIB XMLElement : public XMLNode -{ - friend class XMLDocument; -public: - /// Get the name of an element (which is the Value() of the node.) - const char* Name() const { - return Value(); - } - /// Set the name of the element. - void SetName( const char* str, bool staticMem=false ) { - SetValue( str, staticMem ); - } - - virtual XMLElement* ToElement() { - return this; - } - virtual const XMLElement* ToElement() const { - return this; - } - virtual bool Accept( XMLVisitor* visitor ) const; - - /** Given an attribute name, Attribute() returns the value - for the attribute of that name, or null if none - exists. For example: - - @verbatim - const char* value = ele->Attribute( "foo" ); - @endverbatim - - The 'value' parameter is normally null. However, if specified, - the attribute will only be returned if the 'name' and 'value' - match. This allow you to write code: - - @verbatim - if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar(); - @endverbatim - - rather than: - @verbatim - if ( ele->Attribute( "foo" ) ) { - if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar(); - } - @endverbatim - */ - const char* Attribute( const char* name, const char* value=0 ) const; - - /** Given an attribute name, IntAttribute() returns the value - of the attribute interpreted as an integer. The default - value will be returned if the attribute isn't present, - or if there is an error. (For a method with error - checking, see QueryIntAttribute()). - */ - int IntAttribute(const char* name, int defaultValue = 0) const; - /// See IntAttribute() - unsigned UnsignedAttribute(const char* name, unsigned defaultValue = 0) const; - /// See IntAttribute() - int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const; - /// See IntAttribute() - bool BoolAttribute(const char* name, bool defaultValue = false) const; - /// See IntAttribute() - double DoubleAttribute(const char* name, double defaultValue = 0) const; - /// See IntAttribute() - float FloatAttribute(const char* name, float defaultValue = 0) const; - - /** Given an attribute name, QueryIntAttribute() returns - XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryIntAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - XMLError QueryIntAttribute( const char* name, int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryIntValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryUnsignedValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryInt64Attribute(const char* name, int64_t* value) const { - const XMLAttribute* a = FindAttribute(name); - if (!a) { - return XML_NO_ATTRIBUTE; - } - return a->QueryInt64Value(value); - } - - /// See QueryIntAttribute() - XMLError QueryBoolAttribute( const char* name, bool* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryBoolValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryDoubleAttribute( const char* name, double* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryDoubleValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryFloatAttribute( const char* name, float* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryFloatValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryStringAttribute(const char* name, const char** value) const { - const XMLAttribute* a = FindAttribute(name); - if (!a) { - return XML_NO_ATTRIBUTE; - } - *value = a->Value(); - return XML_SUCCESS; - } - - - - /** Given an attribute name, QueryAttribute() returns - XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. It is overloaded for the primitive types, - and is a generally more convenient replacement of - QueryIntAttribute() and related functions. - - If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - XMLError QueryAttribute( const char* name, int* value ) const { - return QueryIntAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, unsigned int* value ) const { - return QueryUnsignedAttribute( name, value ); - } - - XMLError QueryAttribute(const char* name, int64_t* value) const { - return QueryInt64Attribute(name, value); - } - - XMLError QueryAttribute( const char* name, bool* value ) const { - return QueryBoolAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, double* value ) const { - return QueryDoubleAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, float* value ) const { - return QueryFloatAttribute( name, value ); - } - - /// Sets the named attribute to value. - void SetAttribute( const char* name, const char* value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, int value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, unsigned value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - - /// Sets the named attribute to value. - void SetAttribute(const char* name, int64_t value) { - XMLAttribute* a = FindOrCreateAttribute(name); - a->SetAttribute(value); - } - - /// Sets the named attribute to value. - void SetAttribute( const char* name, bool value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, double value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, float value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - - /** - Delete an attribute. - */ - void DeleteAttribute( const char* name ); - - /// Return the first attribute in the list. - const XMLAttribute* FirstAttribute() const { - return _rootAttribute; - } - /// Query a specific attribute in the list. - const XMLAttribute* FindAttribute( const char* name ) const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, GetText() is limited compared to getting the XMLText child - and accessing it directly. - - If the first child of 'this' is a XMLText, the GetText() - returns the character string of the Text node, else null is returned. - - This is a convenient method for getting the text of simple contained text: - @verbatim - This is text - const char* str = fooElement->GetText(); - @endverbatim - - 'str' will be a pointer to "This is text". - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - This is text - @endverbatim - - then the value of str would be null. The first child node isn't a text node, it is - another element. From this XML: - @verbatim - This is text - @endverbatim - GetText() will return "This is ". - */ - const char* GetText() const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, SetText() is limited compared to creating an XMLText child - and mutating it directly. - - If the first child of 'this' is a XMLText, SetText() sets its value to - the given string, otherwise it will create a first child that is an XMLText. - - This is a convenient method for setting the text of simple contained text: - @verbatim - This is text - fooElement->SetText( "Hullaballoo!" ); - Hullaballoo! - @endverbatim - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - This is text - @endverbatim - - then it will not change "This is text", but rather prefix it with a text element: - @verbatim - Hullaballoo!This is text - @endverbatim - - For this XML: - @verbatim - - @endverbatim - SetText() will generate - @verbatim - Hullaballoo! - @endverbatim - */ - void SetText( const char* inText ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( int value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( unsigned value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText(int64_t value); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( bool value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( double value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( float value ); - - /** - Convenience method to query the value of a child text node. This is probably best - shown by example. Given you have a document is this form: - @verbatim - - 1 - 1.4 - - @endverbatim - - The QueryIntText() and similar functions provide a safe and easier way to get to the - "value" of x and y. - - @verbatim - int x = 0; - float y = 0; // types of x and y are contrived for example - const XMLElement* xElement = pointElement->FirstChildElement( "x" ); - const XMLElement* yElement = pointElement->FirstChildElement( "y" ); - xElement->QueryIntText( &x ); - yElement->QueryFloatText( &y ); - @endverbatim - - @returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted - to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. - - */ - XMLError QueryIntText( int* ival ) const; - /// See QueryIntText() - XMLError QueryUnsignedText( unsigned* uval ) const; - /// See QueryIntText() - XMLError QueryInt64Text(int64_t* uval) const; - /// See QueryIntText() - XMLError QueryBoolText( bool* bval ) const; - /// See QueryIntText() - XMLError QueryDoubleText( double* dval ) const; - /// See QueryIntText() - XMLError QueryFloatText( float* fval ) const; - - int IntText(int defaultValue = 0) const; - - /// See QueryIntText() - unsigned UnsignedText(unsigned defaultValue = 0) const; - /// See QueryIntText() - int64_t Int64Text(int64_t defaultValue = 0) const; - /// See QueryIntText() - bool BoolText(bool defaultValue = false) const; - /// See QueryIntText() - double DoubleText(double defaultValue = 0) const; - /// See QueryIntText() - float FloatText(float defaultValue = 0) const; - - // internal: - enum ElementClosingType { - OPEN, // - CLOSED, // - CLOSING // - }; - ElementClosingType ClosingType() const { - return _closingType; - } - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLElement( XMLDocument* doc ); - virtual ~XMLElement(); - XMLElement( const XMLElement& ); // not supported - void operator=( const XMLElement& ); // not supported - - XMLAttribute* FindOrCreateAttribute( const char* name ); - char* ParseAttributes( char* p, int* curLineNumPtr ); - static void DeleteAttribute( XMLAttribute* attribute ); - XMLAttribute* CreateAttribute(); - - enum { BUF_SIZE = 200 }; - ElementClosingType _closingType; - // The attribute list is ordered; there is no 'lastAttribute' - // because the list needs to be scanned for dupes before adding - // a new attribute. - XMLAttribute* _rootAttribute; -}; - - -enum Whitespace { - PRESERVE_WHITESPACE, - COLLAPSE_WHITESPACE -}; - - -/** A Document binds together all the functionality. - It can be saved, loaded, and printed to the screen. - All Nodes are connected and allocated to a Document. - If the Document is deleted, all its Nodes are also deleted. -*/ -class TINYXML2_LIB XMLDocument : public XMLNode -{ - friend class XMLElement; - // Gives access to SetError and Push/PopDepth, but over-access for everything else. - // Wishing C++ had "internal" scope. - friend class XMLNode; - friend class XMLText; - friend class XMLComment; - friend class XMLDeclaration; - friend class XMLUnknown; -public: - /// constructor - XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE ); - ~XMLDocument(); - - virtual XMLDocument* ToDocument() { - TIXMLASSERT( this == _document ); - return this; - } - virtual const XMLDocument* ToDocument() const { - TIXMLASSERT( this == _document ); - return this; - } - - /** - Parse an XML file from a character string. - Returns XML_SUCCESS (0) on success, or - an errorID. - - You may optionally pass in the 'nBytes', which is - the number of bytes which will be parsed. If not - specified, TinyXML-2 will assume 'xml' points to a - null terminated string. - */ - XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) ); - - /** - Load an XML file from disk. - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError LoadFile( const char* filename ); - - /** - Load an XML file from disk. You are responsible - for providing and closing the FILE*. - - NOTE: The file should be opened as binary ("rb") - not text in order for TinyXML-2 to correctly - do newline normalization. - - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError LoadFile( FILE* ); - - /** - Save the XML file to disk. - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError SaveFile( const char* filename, bool compact = false ); - - /** - Save the XML file to disk. You are responsible - for providing and closing the FILE*. - - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError SaveFile( FILE* fp, bool compact = false ); - - bool ProcessEntities() const { - return _processEntities; - } - Whitespace WhitespaceMode() const { - return _whitespaceMode; - } - - /** - Returns true if this document has a leading Byte Order Mark of UTF8. - */ - bool HasBOM() const { - return _writeBOM; - } - /** Sets whether to write the BOM when writing the file. - */ - void SetBOM( bool useBOM ) { - _writeBOM = useBOM; - } - - /** Return the root element of DOM. Equivalent to FirstChildElement(). - To get the first node, use FirstChild(). - */ - XMLElement* RootElement() { - return FirstChildElement(); - } - const XMLElement* RootElement() const { - return FirstChildElement(); - } - - /** Print the Document. If the Printer is not provided, it will - print to stdout. If you provide Printer, this can print to a file: - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Or you can use a printer to print to memory: - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - // printer.CStr() has a const char* to the XML - @endverbatim - */ - void Print( XMLPrinter* streamer=0 ) const; - virtual bool Accept( XMLVisitor* visitor ) const; - - /** - Create a new Element associated with - this Document. The memory for the Element - is managed by the Document. - */ - XMLElement* NewElement( const char* name ); - /** - Create a new Comment associated with - this Document. The memory for the Comment - is managed by the Document. - */ - XMLComment* NewComment( const char* comment ); - /** - Create a new Text associated with - this Document. The memory for the Text - is managed by the Document. - */ - XMLText* NewText( const char* text ); - /** - Create a new Declaration associated with - this Document. The memory for the object - is managed by the Document. - - If the 'text' param is null, the standard - declaration is used.: - @verbatim - - @endverbatim - */ - XMLDeclaration* NewDeclaration( const char* text=0 ); - /** - Create a new Unknown associated with - this Document. The memory for the object - is managed by the Document. - */ - XMLUnknown* NewUnknown( const char* text ); - - /** - Delete a node associated with this document. - It will be unlinked from the DOM. - */ - void DeleteNode( XMLNode* node ); - - void ClearError() { - SetError(XML_SUCCESS, 0, 0); - } - - /// Return true if there was an error parsing the document. - bool Error() const { - return _errorID != XML_SUCCESS; - } - /// Return the errorID. - XMLError ErrorID() const { - return _errorID; - } - const char* ErrorName() const; - static const char* ErrorIDToName(XMLError errorID); - - /** Returns a "long form" error description. A hopefully helpful - diagnostic with location, line number, and/or additional info. - */ - const char* ErrorStr() const; - - /// A (trivial) utility function that prints the ErrorStr() to stdout. - void PrintError() const; - - /// Return the line where the error occurred, or zero if unknown. - int ErrorLineNum() const - { - return _errorLineNum; - } - - /// Clear the document, resetting it to the initial state. - void Clear(); - - /** - Copies this document to a target document. - The target will be completely cleared before the copy. - If you want to copy a sub-tree, see XMLNode::DeepClone(). - - NOTE: that the 'target' must be non-null. - */ - void DeepCopy(XMLDocument* target) const; - - // internal - char* Identify( char* p, XMLNode** node ); - - // internal - void MarkInUse(XMLNode*); - - virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { - return 0; - } - virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const { - return false; - } - -private: - XMLDocument( const XMLDocument& ); // not supported - void operator=( const XMLDocument& ); // not supported - - bool _writeBOM; - bool _processEntities; - XMLError _errorID; - Whitespace _whitespaceMode; - mutable StrPair _errorStr; - int _errorLineNum; - char* _charBuffer; - int _parseCurLineNum; - int _parsingDepth; - // Memory tracking does add some overhead. - // However, the code assumes that you don't - // have a bunch of unlinked nodes around. - // Therefore it takes less memory to track - // in the document vs. a linked list in the XMLNode, - // and the performance is the same. - DynArray _unlinked; - - MemPoolT< sizeof(XMLElement) > _elementPool; - MemPoolT< sizeof(XMLAttribute) > _attributePool; - MemPoolT< sizeof(XMLText) > _textPool; - MemPoolT< sizeof(XMLComment) > _commentPool; - - static const char* _errorNames[XML_ERROR_COUNT]; - - void Parse(); - - void SetError( XMLError error, int lineNum, const char* format, ... ); - - // Something of an obvious security hole, once it was discovered. - // Either an ill-formed XML or an excessively deep one can overflow - // the stack. Track stack depth, and error out if needed. - class DepthTracker { - public: - explicit DepthTracker(XMLDocument * document) { - this->_document = document; - document->PushDepth(); - } - ~DepthTracker() { - _document->PopDepth(); - } - private: - XMLDocument * _document; - }; - void PushDepth(); - void PopDepth(); - - template - NodeType* CreateUnlinkedNode( MemPoolT& pool ); -}; - -template -inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT& pool ) -{ - TIXMLASSERT( sizeof( NodeType ) == PoolElementSize ); - TIXMLASSERT( sizeof( NodeType ) == pool.ItemSize() ); - NodeType* returnNode = new (pool.Alloc()) NodeType( this ); - TIXMLASSERT( returnNode ); - returnNode->_memPool = &pool; - - _unlinked.Push(returnNode); - return returnNode; -} - -/** - A XMLHandle is a class that wraps a node pointer with null checks; this is - an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2 - DOM structure. It is a separate utility class. - - Take an example: - @verbatim - - - - - - - @endverbatim - - Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very - easy to write a *lot* of code that looks like: - - @verbatim - XMLElement* root = document.FirstChildElement( "Document" ); - if ( root ) - { - XMLElement* element = root->FirstChildElement( "Element" ); - if ( element ) - { - XMLElement* child = element->FirstChildElement( "Child" ); - if ( child ) - { - XMLElement* child2 = child->NextSiblingElement( "Child" ); - if ( child2 ) - { - // Finally do something useful. - @endverbatim - - And that doesn't even cover "else" cases. XMLHandle addresses the verbosity - of such code. A XMLHandle checks for null pointers so it is perfectly safe - and correct to use: - - @verbatim - XMLHandle docHandle( &document ); - XMLElement* child2 = docHandle.FirstChildElement( "Document" ).FirstChildElement( "Element" ).FirstChildElement().NextSiblingElement(); - if ( child2 ) - { - // do something useful - @endverbatim - - Which is MUCH more concise and useful. - - It is also safe to copy handles - internally they are nothing more than node pointers. - @verbatim - XMLHandle handleCopy = handle; - @endverbatim - - See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects. -*/ -class TINYXML2_LIB XMLHandle -{ -public: - /// Create a handle from any node (at any depth of the tree.) This can be a null pointer. - explicit XMLHandle( XMLNode* node ) : _node( node ) { - } - /// Create a handle from a node. - explicit XMLHandle( XMLNode& node ) : _node( &node ) { - } - /// Copy constructor - XMLHandle( const XMLHandle& ref ) : _node( ref._node ) { - } - /// Assignment - XMLHandle& operator=( const XMLHandle& ref ) { - _node = ref._node; - return *this; - } - - /// Get the first child of this handle. - XMLHandle FirstChild() { - return XMLHandle( _node ? _node->FirstChild() : 0 ); - } - /// Get the first child element of this handle. - XMLHandle FirstChildElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->FirstChildElement( name ) : 0 ); - } - /// Get the last child of this handle. - XMLHandle LastChild() { - return XMLHandle( _node ? _node->LastChild() : 0 ); - } - /// Get the last child element of this handle. - XMLHandle LastChildElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->LastChildElement( name ) : 0 ); - } - /// Get the previous sibling of this handle. - XMLHandle PreviousSibling() { - return XMLHandle( _node ? _node->PreviousSibling() : 0 ); - } - /// Get the previous sibling element of this handle. - XMLHandle PreviousSiblingElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); - } - /// Get the next sibling of this handle. - XMLHandle NextSibling() { - return XMLHandle( _node ? _node->NextSibling() : 0 ); - } - /// Get the next sibling element of this handle. - XMLHandle NextSiblingElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->NextSiblingElement( name ) : 0 ); - } - - /// Safe cast to XMLNode. This can return null. - XMLNode* ToNode() { - return _node; - } - /// Safe cast to XMLElement. This can return null. - XMLElement* ToElement() { - return ( _node ? _node->ToElement() : 0 ); - } - /// Safe cast to XMLText. This can return null. - XMLText* ToText() { - return ( _node ? _node->ToText() : 0 ); - } - /// Safe cast to XMLUnknown. This can return null. - XMLUnknown* ToUnknown() { - return ( _node ? _node->ToUnknown() : 0 ); - } - /// Safe cast to XMLDeclaration. This can return null. - XMLDeclaration* ToDeclaration() { - return ( _node ? _node->ToDeclaration() : 0 ); - } - -private: - XMLNode* _node; -}; - - -/** - A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the - same in all regards, except for the 'const' qualifiers. See XMLHandle for API. -*/ -class TINYXML2_LIB XMLConstHandle -{ -public: - explicit XMLConstHandle( const XMLNode* node ) : _node( node ) { - } - explicit XMLConstHandle( const XMLNode& node ) : _node( &node ) { - } - XMLConstHandle( const XMLConstHandle& ref ) : _node( ref._node ) { - } - - XMLConstHandle& operator=( const XMLConstHandle& ref ) { - _node = ref._node; - return *this; - } - - const XMLConstHandle FirstChild() const { - return XMLConstHandle( _node ? _node->FirstChild() : 0 ); - } - const XMLConstHandle FirstChildElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->FirstChildElement( name ) : 0 ); - } - const XMLConstHandle LastChild() const { - return XMLConstHandle( _node ? _node->LastChild() : 0 ); - } - const XMLConstHandle LastChildElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->LastChildElement( name ) : 0 ); - } - const XMLConstHandle PreviousSibling() const { - return XMLConstHandle( _node ? _node->PreviousSibling() : 0 ); - } - const XMLConstHandle PreviousSiblingElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); - } - const XMLConstHandle NextSibling() const { - return XMLConstHandle( _node ? _node->NextSibling() : 0 ); - } - const XMLConstHandle NextSiblingElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->NextSiblingElement( name ) : 0 ); - } - - - const XMLNode* ToNode() const { - return _node; - } - const XMLElement* ToElement() const { - return ( _node ? _node->ToElement() : 0 ); - } - const XMLText* ToText() const { - return ( _node ? _node->ToText() : 0 ); - } - const XMLUnknown* ToUnknown() const { - return ( _node ? _node->ToUnknown() : 0 ); - } - const XMLDeclaration* ToDeclaration() const { - return ( _node ? _node->ToDeclaration() : 0 ); - } - -private: - const XMLNode* _node; -}; - - -/** - Printing functionality. The XMLPrinter gives you more - options than the XMLDocument::Print() method. - - It can: - -# Print to memory. - -# Print to a file you provide. - -# Print XML without a XMLDocument. - - Print to Memory - - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - SomeFunction( printer.CStr() ); - @endverbatim - - Print to a File - - You provide the file pointer. - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Print without a XMLDocument - - When loading, an XML parser is very useful. However, sometimes - when saving, it just gets in the way. The code is often set up - for streaming, and constructing the DOM is just overhead. - - The Printer supports the streaming case. The following code - prints out a trivially simple XML file without ever creating - an XML document. - - @verbatim - XMLPrinter printer( fp ); - printer.OpenElement( "foo" ); - printer.PushAttribute( "foo", "bar" ); - printer.CloseElement(); - @endverbatim -*/ -class TINYXML2_LIB XMLPrinter : public XMLVisitor -{ -public: - /** Construct the printer. If the FILE* is specified, - this will print to the FILE. Else it will print - to memory, and the result is available in CStr(). - If 'compact' is set to true, then output is created - with only required whitespace and newlines. - */ - XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 ); - virtual ~XMLPrinter() {} - - /** If streaming, write the BOM and declaration. */ - void PushHeader( bool writeBOM, bool writeDeclaration ); - /** If streaming, start writing an element. - The element must be closed with CloseElement() - */ - void OpenElement( const char* name, bool compactMode=false ); - /// If streaming, add an attribute to an open element. - void PushAttribute( const char* name, const char* value ); - void PushAttribute( const char* name, int value ); - void PushAttribute( const char* name, unsigned value ); - void PushAttribute(const char* name, int64_t value); - void PushAttribute( const char* name, bool value ); - void PushAttribute( const char* name, double value ); - /// If streaming, close the Element. - virtual void CloseElement( bool compactMode=false ); - - /// Add a text node. - void PushText( const char* text, bool cdata=false ); - /// Add a text node from an integer. - void PushText( int value ); - /// Add a text node from an unsigned. - void PushText( unsigned value ); - /// Add a text node from an unsigned. - void PushText(int64_t value); - /// Add a text node from a bool. - void PushText( bool value ); - /// Add a text node from a float. - void PushText( float value ); - /// Add a text node from a double. - void PushText( double value ); - - /// Add a comment - void PushComment( const char* comment ); - - void PushDeclaration( const char* value ); - void PushUnknown( const char* value ); - - virtual bool VisitEnter( const XMLDocument& /*doc*/ ); - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ); - virtual bool VisitExit( const XMLElement& element ); - - virtual bool Visit( const XMLText& text ); - virtual bool Visit( const XMLComment& comment ); - virtual bool Visit( const XMLDeclaration& declaration ); - virtual bool Visit( const XMLUnknown& unknown ); - - /** - If in print to memory mode, return a pointer to - the XML file in memory. - */ - const char* CStr() const { - return _buffer.Mem(); - } - /** - If in print to memory mode, return the size - of the XML file in memory. (Note the size returned - includes the terminating null.) - */ - int CStrSize() const { - return _buffer.Size(); - } - /** - If in print to memory mode, reset the buffer to the - beginning. - */ - void ClearBuffer() { - _buffer.Clear(); - _buffer.Push(0); - _firstElement = true; - } - -protected: - virtual bool CompactMode( const XMLElement& ) { return _compactMode; } - - /** Prints out the space before an element. You may override to change - the space and tabs used. A PrintSpace() override should call Print(). - */ - virtual void PrintSpace( int depth ); - void Print( const char* format, ... ); - void Write( const char* data, size_t size ); - inline void Write( const char* data ) { Write( data, strlen( data ) ); } - void Putc( char ch ); - - void SealElementIfJustOpened(); - bool _elementJustOpened; - DynArray< const char*, 10 > _stack; - -private: - void PrintString( const char*, bool restrictedEntitySet ); // prints out, after detecting entities. - - bool _firstElement; - FILE* _fp; - int _depth; - int _textDepth; - bool _processEntities; - bool _compactMode; - - enum { - ENTITY_RANGE = 64, - BUF_SIZE = 200 - }; - bool _entityFlag[ENTITY_RANGE]; - bool _restrictedEntityFlag[ENTITY_RANGE]; - - DynArray< char, 20 > _buffer; - - // Prohibit cloning, intentionally not implemented - XMLPrinter( const XMLPrinter& ); - XMLPrinter& operator=( const XMLPrinter& ); -}; - - -} // tinyxml2 - -#if defined(_MSC_VER) -# pragma warning(pop) -#endif - -#endif // TINYXML2_INCLUDED From da92ac6a376be2b706808be95cb98da0fced8728 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 17 Oct 2023 15:29:13 +0200 Subject: [PATCH 28/77] Audio Editor clean-up (#3256) * Progress on SFX cleanup/sorting * Fix crash after dev merge * Rename vars --- .../Enhancements/audio/AudioCollection.cpp | 612 +++++++++--------- soh/soh/Enhancements/audio/AudioCollection.h | 2 + soh/soh/Enhancements/audio/AudioEditor.cpp | 10 +- 3 files changed, 324 insertions(+), 300 deletions(-) diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp index 960627b34..0d23b6584 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.cpp +++ b/soh/soh/Enhancements/audio/AudioCollection.cpp @@ -8,301 +8,323 @@ #include #include -#define SEQUENCE_MAP_ENTRY(sequenceId, label, sfxKey, category) \ - { sequenceId, { sequenceId, label, sfxKey, category } } +#define SEQUENCE_MAP_ENTRY(sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement) \ + { sequenceId, { sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement } } AudioCollection::AudioCollection() { - // (originalSequenceId, label, sfxKey, category), + // (originalSequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement), sequenceMap = { - SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_LOGIC, "Hyrule Field", "NA_BGM_FIELD_LOGIC", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_DUNGEON, "Dodongo's Cavern", "NA_BGM_DUNGEON", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_ADULT, "Kakariko Village (Adult)", "NA_BGM_KAKARIKO_ADULT", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_ENEMY, "Battle", "NA_BGM_ENEMY", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_BOSS, "Boss Battle", "NA_BGM_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_INSIDE_DEKU_TREE, "Inside the Deku Tree", "NA_BGM_INSIDE_DEKU_TREE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_MARKET, "Market", "NA_BGM_MARKET", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_TITLE, "Title Theme", "NA_BGM_TITLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_LINK_HOUSE, "House", "NA_BGM_LINK_HOUSE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GAME_OVER, "Game Over", "NA_BGM_GAME_OVER", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_BOSS_CLEAR, "Boss Clear", "NA_BGM_BOSS_CLEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_ITEM_GET, "Obtain Item", "NA_BGM_ITEM_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OPENING_GANON, "Enter Ganondorf", "NA_BGM_OPENING_GANON", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_HEART_GET, "Obtain Heart Container", "NA_BGM_HEART_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_LIGHT, "Prelude of Light", "NA_BGM_OCA_LIGHT", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_JABU_JABU, "Inside Jabu-Jabu's Belly", "NA_BGM_JABU_JABU", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_KID, "Kakariko Village (Child)", "NA_BGM_KAKARIKO_KID", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GREAT_FAIRY, "Great Fairy's Fountain", "NA_BGM_GREAT_FAIRY", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ZELDA_THEME, "Zelda's Theme", "NA_BGM_ZELDA_THEME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_TEMPLE, "Fire Temple", "NA_BGM_FIRE_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_OPEN_TRE_BOX, "Open Treasure Chest", "NA_BGM_OPEN_TRE_BOX", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_FOREST_TEMPLE, "Forest Temple", "NA_BGM_FOREST_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_COURTYARD, "Hyrule Castle Courtyard", "NA_BGM_COURTYARD", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GANON_TOWER, "Ganondorf's Theme", "NA_BGM_GANON_TOWER", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_LONLON, "Lon Lon Ranch", "NA_BGM_LONLON", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GORON_CITY, "Goron City", "NA_BGM_GORON_CITY", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_MORNING, "Hyrule Field Morning Theme", "NA_BGM_FIELD_MORNING", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_SPIRITUAL_STONE, "Spiritual Stone Get", "NA_BGM_SPIRITUAL_STONE", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_BOLERO, "Bolero of Fire", "NA_BGM_OCA_BOLERO", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_MINUET, "Minuet of Forest", "NA_BGM_OCA_MINUET", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SERENADE, "Serenade of Water", "NA_BGM_OCA_SERENADE", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_REQUIEM, "Requiem of Spirit", "NA_BGM_OCA_REQUIEM", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_NOCTURNE, "Nocturne of Shadow", "NA_BGM_OCA_NOCTURNE", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_MINI_BOSS, "Mini-Boss Battle", "NA_BGM_MINI_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_SMALL_ITEM_GET, "Obtain Small Item", "NA_BGM_SMALL_ITEM_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_TEMPLE_OF_TIME, "Temple of Time", "NA_BGM_TEMPLE_OF_TIME", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_EVENT_CLEAR, "Escape from Lon Lon Ranch", "NA_BGM_EVENT_CLEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_KOKIRI, "Kokiri Forest", "NA_BGM_KOKIRI", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_FAIRY_GET, "Obtain Fairy Ocarina", "NA_BGM_OCA_FAIRY_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_SARIA_THEME, "Lost Woods", "NA_BGM_SARIA_THEME", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_SPIRIT_TEMPLE, "Spirit Temple", "NA_BGM_SPIRIT_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_HORSE, "Horse Race", "NA_BGM_HORSE", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_HORSE_GOAL, "Horse Race Goal", "NA_BGM_HORSE_GOAL", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_INGO, "Ingo's Theme", "NA_BGM_INGO", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_MEDALLION_GET, "Obtain Medallion", "NA_BGM_MEDALLION_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SARIA, "Ocarina Saria's Song", "NA_BGM_OCA_SARIA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_EPONA, "Ocarina Epona's Song", "NA_BGM_OCA_EPONA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_ZELDA, "Ocarina Zelda's Lullaby", "NA_BGM_OCA_ZELDA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SUNS, "Ocarina Sun's Song", "NA_BGM_OCA_SUNS", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_TIME, "Ocarina Song of Time", "NA_BGM_OCA_TIME", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_STORM, "Ocarina Song of Storms", "NA_BGM_OCA_STORM", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_NAVI_OPENING, "Fairy Flying", "NA_BGM_NAVI_OPENING", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_DEKU_TREE_CS, "Deku Tree", "NA_BGM_DEKU_TREE_CS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_WINDMILL, "Windmill Hut", "NA_BGM_WINDMILL", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_HYRULE_CS, "Legend of Hyrule", "NA_BGM_HYRULE_CS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_MINI_GAME, "Shooting Gallery", "NA_BGM_MINI_GAME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHEIK, "Sheik's Theme", "NA_BGM_SHEIK", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ZORA_DOMAIN, "Zora's Domain", "NA_BGM_ZORA_DOMAIN", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_APPEAR, "Enter Zelda", "NA_BGM_APPEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_ADULT_LINK, "Goodbye to Zelda", "NA_BGM_ADULT_LINK", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_MASTER_SWORD, "Master Sword", "NA_BGM_MASTER_SWORD", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_INTRO_GANON, "Ganon Intro", "NA_BGM_INTRO_GANON", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHOP, "Shop", "NA_BGM_SHOP", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_CHAMBER_OF_SAGES, "Chamber of the Sages", "NA_BGM_CHAMBER_OF_SAGES", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_FILE_SELECT, "File Select", "NA_BGM_FILE_SELECT", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_ICE_CAVERN, "Ice Cavern", "NA_BGM_ICE_CAVERN", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_DOOR_OF_TIME, "Open Door of Temple of Time", "NA_BGM_DOOR_OF_TIME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_OWL, "Kaepora Gaebora's Theme", "NA_BGM_OWL", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHADOW_TEMPLE, "Shadow Temple", "NA_BGM_SHADOW_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_WATER_TEMPLE, "Water Temple", "NA_BGM_WATER_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_BRIDGE_TO_GANONS, "Ganon's Castle Bridge", "NA_BGM_BRIDGE_TO_GANONS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_OCARINA_OF_TIME, "Ocarina of Time", "NA_BGM_OCARINA_OF_TIME", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_GERUDO_VALLEY, "Gerudo Valley", "NA_BGM_GERUDO_VALLEY", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_POTION_SHOP, "Potion Shop", "NA_BGM_POTION_SHOP", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KOTAKE_KOUME, "Kotake & Koume's Theme", "NA_BGM_KOTAKE_KOUME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ESCAPE, "Escape from Ganon's Castle", "NA_BGM_ESCAPE", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_UNDERGROUND, "Ganon's Castle Under Ground", "NA_BGM_UNDERGROUND", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GANONDORF_BOSS, "Ganondorf Battle", "NA_BGM_GANONDORF_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_GANON_BOSS, "Ganon Battle", "NA_BGM_GANON_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_END_DEMO, "Seal of Six Sages", "NA_BGM_END_DEMO", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_1, "End Credits I", "NA_BGM_STAFF_1", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_BOSS, "King Dodongo & Volvagia Boss Battle", "NA_BGM_FIRE_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_TIMED_MINI_GAME, "Mini-Game", "NA_BGM_TIMED_MINI_GAME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3, "Whistle", "OCARINA_INSTRUMENT_WHISTLE", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4, "Harp", "OCARINA_INSTRUMENT_HARP", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5, "Organ", "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6, "Flute", "OCARINA_INSTRUMENT_FLUTE", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(NA_SE_EV_SMALL_DOG_BARK, "Bark", "NA_SE_EV_SMALL_DOG_BARK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Bomb Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_LOW, "Bongo Bongo Low", "NA_SE_EN_SHADEST_TAIKO_LOW", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_FAINT, "Business Scrub", "NA_SE_EN_NUTS_FAINT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_CARROT_RECOVER, "Carrot Refill", "NA_SE_SY_CARROT_RECOVER", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_N, "Cluck", "NA_SE_EV_CHICKEN_CRY_N", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_BRIDGE_OPEN_STOP, "Drawbridge Set", "NA_SE_EV_BRIDGE_OPEN_STOP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_KAICHO_CRY, "Guay", "NA_SE_EN_KAICHO_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_HITPOINT_ALARM, "Low HP Beep", "NA_SE_SY_HITPOINT_ALARM", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_HP_RECOVER, "HP Recover", "NA_SE_SY_HP_RECOVER", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_HORSE_RUN, "Horse Trot", "NA_SE_EV_HORSE_RUN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_PL_WALK_HEAVYBOOTS, "Iron Boots", "NA_SE_PL_WALK_HEAVYBOOTS", SEQ_SFX), - //SEQUENCE_MAP_ENTRY(NA_SE_PL_HOBBERBOOTS_LV, "Hover Boots", "NA_SE_PL_HOBBERBOOTS_LV", SEQ_SFX), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_EV_COW_CRY, "Moo", "NA_SE_EV_COW_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_POT_BROKEN, "Pot Shattering", "NA_SE_EV_POT_BROKEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FROG_CRY_0, "Ribbit", "NA_SE_EV_FROG_CRY_0", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FIVE_COUNT_LUPY, "Rupee (Silver)", "NA_SE_EV_FIVE_COUNT_LUPY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FOOT_SWITCH, "Switch", "NA_SE_EV_FOOT_SWITCH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_WALL_HIT_SOFT, "Sword Bonk", "NA_SE_IT_WALL_HIT_SOFT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_METRONOME, "Tambourine", "NA_SE_SY_METRONOME", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AMOS_VOICE, "Armos", "NA_SE_EN_AMOS_VOICE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_AIM, "Redead Scream", "NA_SE_EN_REDEAD_AIM", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_STALKID_ATTACK, "Stalchild Attack", "NA_SE_EN_STALKID_ATTACK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_M, "Cockadoodiedoo", "NA_SE_EV_CHICKEN_CRY_M", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_KINSTA_MARK_APPEAR, "Gold Skulltula Token", "NA_SE_SY_KINSTA_MARK_APPEAR", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_CRY, "Redead Moan", "NA_SE_EN_REDEAD_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_LIGHTNING, "Thunder", "NA_SE_EV_LIGHTNING", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_OC_ABYSS, "Cartoon Fall", "NA_SE_OC_ABYSS", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_LAUGH, "Flare Dancer Laugh", "NA_SE_EN_FLAME_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BREAK, "Shabom Pop", "NA_SE_EN_AWA_BREAK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_HIGH, "Bongo Bongo High", "NA_SE_EN_SHADEST_TAIKO_HIGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_BOTTLE_CAP_OPEN, "Bottle Cork", "NA_SE_EV_BOTTLE_CAP_OPEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_BOW_FLICK, "Bow Twang", "NA_SE_IT_BOW_FLICK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_BUBLE_LAUGH, "Bubble Laugh", "NA_SE_EN_BUBLE_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_DEKU_JR_MOUTH, "Deku Baba", "NA_SE_EN_DEKU_JR_MOUTH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_DOG_CRY_EVENING, "Dusk Howl", "NA_SE_EV_DOG_CRY_EVENING", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_DAMAGE, "Flare Dancer Startled", "NA_SE_EN_FLAME_DAMAGE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GANON_AT_RETURN, "Ganondorf Teh!", "NA_SE_EN_GANON_AT_RETURN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GOMA_JR_CRY, "Gohma Larva Croak", "NA_SE_EN_GOMA_JR_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GOLON_WAKE_UP, "Goron Wake", "NA_SE_EN_GOLON_WAKE_UP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_START_SHOT, "Gunshot", "NA_SE_SY_START_SHOT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_HAMMER_HIT, "Hammer Bonk", "NA_SE_IT_HAMMER_HIT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_IRONNACK_SWING_AXE, "Iron Knuckle", "NA_SE_EN_IRONNACK_SWING_AXE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FANTOM_ST_LAUGH, "Phantom Ganon Laugh", "NA_SE_EN_FANTOM_ST_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_PLANT_BROKEN, "Plant Explode", "NA_SE_EV_PLANT_BROKEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_GET_RUPY, "Rupee", "NA_SE_SY_GET_RUPY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_UP, "Scrub Emerge", "NA_SE_EN_NUTS_UP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Shabom Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHELL_MOUTH, "Shellblade", "NA_SE_EN_SHELL_MOUTH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_STALTU_DAMAGE, "Skulltula Damage", "NA_SE_EN_STALTU_DAMAGE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_THROW, "Spit Nut", "NA_SE_EN_NUTS_THROW", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON, "Target Enemy", "NA_SE_SY_LOCK_ON", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON_HUMAN, "Target Neutral", "NA_SE_SY_LOCK_ON_HUMAN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CURSOR, "File Select Cursor", "NA_SE_SY_FSEL_CURSOR", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_DECIDE_L, "File Select Choose", "NA_SE_SY_FSEL_DECIDE_L", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CLOSE, "File Select Back", "NA_SE_SY_FSEL_CLOSE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_BOMB_EXPLOSION, "Bomb Explosion", "NA_SE_IT_BOMB_EXPLOSION", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_A, "Chicken Cry", "NA_SE_EV_CHICKEN_CRY_A", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N, "Adult Link - Slash", "NA_SE_VO_LI_SWORD_N", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_L, "Adult Link - Big Slash", "NA_SE_VO_LI_SWORD_L", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH, "Adult Link - Hookshot Latch Yell", "NA_SE_VO_LI_LASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG, "Adult Link - Dangling Gasp", "NA_SE_VO_LI_HANG", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END, "Adult Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S, "Adult Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE, "Adult Link - Freeze", "NA_SE_VO_LI_FREEZE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S, "Adult Link - Fall Gasp", "NA_SE_VO_LI_FALL_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L, "Adult Link - Fall Scream", "NA_SE_VO_LI_FALL_L", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST, "Adult Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK, "Adult Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN, "Adult Link - Death", "NA_SE_VO_LI_DOWN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY, "Adult Link - Taken away by Wallmaster","NA_SE_VO_LI_TAKEN_AWAY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD, "Adult Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE, "Adult Link - Sneeze", "NA_SE_VO_LI_SNEEZE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT, "Adult Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX, "Adult Link - Yawn", "NA_SE_VO_LI_RELAX", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY, "Adult Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN, "Adult Link - Groan (Unused)", "NA_SE_VO_LI_GROAN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP, "Adult Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTOd_JUMP", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE, "Adult Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE, "Adult Link - Suprised Gasp", "NA_SE_VO_LI_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL, "Adult Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH, "Adult Link - Push", "NA_SE_VO_LI_PUSH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG, "Adult Link - Hookshot hang", "NA_SE_VO_LI_HOOKSHOT_HANG", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S, "Adult Link - Fall damage", "NA_SE_VO_LI_LAND_DAMAGE_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b, "Adult Link - Small grunt (unused?)", "NA_SE_VO_LI_NULL_0x1b", SEQ_VOICE), // Unused? But unique so keeping it - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK, "Adult Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN, "Adult Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE, "Adult Link - Pained Land (Nocturne?)","NA_SE_VO_LI_DEMO_DAMAGE", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N_KID, "Child Link - Slash", "NA_SE_VO_LI_SWORD_N_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ROLLING_CUT_KID, "Child Link - Big Slash", "NA_SE_VO_LI_ROLLING_CUT_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH_KID, "Child Link - Hootshot Latch", "NA_SE_VO_LI_LASH_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG_KID, "Child Link - Dangling Gasp", "NA_SE_VO_LI_HANG_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END_KID, "Child Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S_KID, "Child Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE_KID, "Child Link - Freeze", "NA_SE_VO_LI_FREEZE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S_KID, "Child Link - Fall Gasp", "NA_SE_VO_LI_FALL_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L_KID, "Child Link - Fall Scream", "NA_SE_VO_LI_FALL_L_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST_KID, "Child Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK_KID, "Child Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN_KID, "Child Link - Death", "NA_SE_VO_LI_DOWN_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY_KID, "Child Link - Taken away by Wallmaster","NA_SE_VO_LI_TAKEN_AWAY_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD_KID, "Child Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE_KID, "Child Link - Sneeze", "NA_SE_VO_LI_SNEEZE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT_KID, "Child Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT_KID", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK_KID, "Child Link - Drinking", "NA_SE_VO_LI_DRINK_KID", SEQ_VOICE), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX_KID, "Child Link - Yawn", "NA_SE_VO_LI_RELAX_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY_KID,"Child Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY_KID", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_KID, "Child Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTO_JUMP_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE_KID, "Child Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE_KID, "Child Link - Surprised Gasp", "NA_SE_VO_LI_SURPRISE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL_KID, "Child Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH_KID, "Child Link - Push", "NA_SE_VO_LI_PUSH_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG_KID,"Child Link - Hookshot Hang", "NA_SE_VO_LI_HOOKSHOT_HANG_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S_KID,"Child Link - Fall Damage", "NA_SE_VO_LI_LAND_DAMAGE_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b_KID, "Child Link - Small Gasp (unused?)", "NA_SE_VO_LI_NULL_0x1b_KID", SEQ_VOICE), // Unused? But unique so keeping it - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK_KID, "Child Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN_KID, "Child Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN_KID", SEQ_VOICE), // ... - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE_KID, "Child Link - Scream 2 (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE_KID", SEQ_VOICE), // Unused, matches with adult nocturne stuff - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_ENEMY, "Navi - Unused Enemy Target", "NA_SE_VO_NAVY_ENEMY", SEQ_VOICE), // Has no sound but is played when targetting enemies, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HELLO, "Navi - Unused NPC Hello", "NA_SE_VO_NAVY_HELLO", SEQ_VOICE), // Has no sound but is played when targetting npcs, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HEAR, "Navi - Unused Other Target", "NA_SE_VO_NAVY_HEAR", SEQ_VOICE), // Has no sound but is played when targetting npcs, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_CALL, "Navi - Look/Hey/Watchout (Target Enemy)","NA_SE_VO_NAVY_CALL", SEQ_VOICE), // Has no sound but is played when targetting signs and other things, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_3, "Navi - Hello", "NA_SE_VO_NA_HELLO_3", SEQ_VOICE), + + // SEQ_BGM_WORLD + SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_LOGIC, "Hyrule Field", "NA_BGM_FIELD_LOGIC", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DUNGEON, "Dodongo's Cavern", "NA_BGM_DUNGEON", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_ADULT, "Kakariko Village (Adult)", "NA_BGM_KAKARIKO_ADULT", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INSIDE_DEKU_TREE, "Inside the Deku Tree", "NA_BGM_INSIDE_DEKU_TREE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MARKET, "Market", "NA_BGM_MARKET", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TITLE, "Title Theme", "NA_BGM_TITLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_LINK_HOUSE, "House", "NA_BGM_LINK_HOUSE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_JABU_JABU, "Inside Jabu-Jabu's Belly", "NA_BGM_JABU_JABU", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_KID, "Kakariko Village (Child)", "NA_BGM_KAKARIKO_KID", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_TEMPLE, "Fire Temple", "NA_BGM_FIRE_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FOREST_TEMPLE, "Forest Temple", "NA_BGM_FOREST_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_COURTYARD, "Hyrule Castle Courtyard", "NA_BGM_COURTYARD", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANON_TOWER, "Ganondorf's Theme", "NA_BGM_GANON_TOWER", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_LONLON, "Lon Lon Ranch", "NA_BGM_LONLON", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GORON_CITY, "Goron City", "NA_BGM_GORON_CITY", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SARIA_THEME, "Lost Woods", "NA_BGM_SARIA_THEME", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SPIRIT_TEMPLE, "Spirit Temple", "NA_BGM_SPIRIT_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INGO, "Ingo's Theme", "NA_BGM_INGO", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KOKIRI, "Kokiri Forest", "NA_BGM_KOKIRI", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TEMPLE_OF_TIME, "Temple of Time", "NA_BGM_TEMPLE_OF_TIME", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_WINDMILL, "Windmill Hut", "NA_BGM_WINDMILL", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FILE_SELECT, "File Select", "NA_BGM_FILE_SELECT", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ICE_CAVERN, "Ice Cavern", "NA_BGM_ICE_CAVERN", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ZORA_DOMAIN, "Zora's Domain", "NA_BGM_ZORA_DOMAIN", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHOP, "Shop", "NA_BGM_SHOP", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHADOW_TEMPLE, "Shadow Temple", "NA_BGM_SHADOW_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_WATER_TEMPLE, "Water Temple", "NA_BGM_WATER_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_UNDERGROUND, "Ganon's Castle Under Ground", "NA_BGM_UNDERGROUND", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GERUDO_VALLEY, "Gerudo Valley", "NA_BGM_GERUDO_VALLEY", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_POTION_SHOP, "Potion Shop", "NA_BGM_POTION_SHOP", SEQ_BGM_WORLD, true, true), + + // SEQ_BGM_BATTLE + SEQUENCE_MAP_ENTRY(NA_BGM_ENEMY, "Battle", "NA_BGM_ENEMY", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BOSS, "Boss Battle", "NA_BGM_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MINI_BOSS, "Mini-Boss Battle", "NA_BGM_MINI_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANONDORF_BOSS, "Ganondorf Battle", "NA_BGM_GANONDORF_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANON_BOSS, "Ganon Battle", "NA_BGM_GANON_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_BOSS, "King Dodongo & Volvagia Boss Battle", "NA_BGM_FIRE_BOSS", SEQ_BGM_BATTLE, true, true), + + // SEQ_BGM_FANFARE + SEQUENCE_MAP_ENTRY(NA_BGM_GAME_OVER, "Game Over", "NA_BGM_GAME_OVER", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BOSS_CLEAR, "Boss Clear", "NA_BGM_BOSS_CLEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ITEM_GET, "Obtain Item", "NA_BGM_ITEM_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OPENING_GANON, "Enter Ganondorf", "NA_BGM_OPENING_GANON", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HEART_GET, "Obtain Heart Container", "NA_BGM_HEART_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OPEN_TRE_BOX, "Open Treasure Chest", "NA_BGM_OPEN_TRE_BOX", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SPIRITUAL_STONE, "Spiritual Stone Get", "NA_BGM_SPIRITUAL_STONE", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SMALL_ITEM_GET, "Obtain Small Item", "NA_BGM_SMALL_ITEM_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_EVENT_CLEAR, "Escape from Lon Lon Ranch", "NA_BGM_EVENT_CLEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_FAIRY_GET, "Obtain Fairy Ocarina", "NA_BGM_OCA_FAIRY_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HORSE_GOAL, "Horse Race Goal", "NA_BGM_HORSE_GOAL", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MEDALLION_GET, "Obtain Medallion", "NA_BGM_MEDALLION_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_APPEAR, "Enter Zelda", "NA_BGM_APPEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MASTER_SWORD, "Master Sword", "NA_BGM_MASTER_SWORD", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCARINA_OF_TIME, "Ocarina of Time", "NA_BGM_OCARINA_OF_TIME", SEQ_FANFARE, true, true), + + // SEQ_OCARINA + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_LIGHT, "Prelude of Light", "NA_BGM_OCA_LIGHT", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_BOLERO, "Bolero of Fire", "NA_BGM_OCA_BOLERO", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_MINUET, "Minuet of Forest", "NA_BGM_OCA_MINUET", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SERENADE, "Serenade of Water", "NA_BGM_OCA_SERENADE", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_REQUIEM, "Requiem of Spirit", "NA_BGM_OCA_REQUIEM", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_NOCTURNE, "Nocturne of Shadow", "NA_BGM_OCA_NOCTURNE", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SARIA, "Ocarina Saria's Song", "NA_BGM_OCA_SARIA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_EPONA, "Ocarina Epona's Song", "NA_BGM_OCA_EPONA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_ZELDA, "Ocarina Zelda's Lullaby", "NA_BGM_OCA_ZELDA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SUNS, "Ocarina Sun's Song", "NA_BGM_OCA_SUNS", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_TIME, "Ocarina Song of Time", "NA_BGM_OCA_TIME", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_STORM, "Ocarina Song of Storms", "NA_BGM_OCA_STORM", SEQ_OCARINA, true, true), + + // SEQ_BGM_EVENT + SEQUENCE_MAP_ENTRY(NA_BGM_GREAT_FAIRY, "Great Fairy's Fountain", "NA_BGM_GREAT_FAIRY", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ZELDA_THEME, "Zelda's Theme", "NA_BGM_ZELDA_THEME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HORSE, "Horse Race", "NA_BGM_HORSE", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_NAVI_OPENING, "Fairy Flying", "NA_BGM_NAVI_OPENING", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DEKU_TREE_CS, "Deku Tree", "NA_BGM_DEKU_TREE_CS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HYRULE_CS, "Legend of Hyrule", "NA_BGM_HYRULE_CS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MINI_GAME, "Shooting Gallery", "NA_BGM_MINI_GAME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHEIK, "Sheik's Theme", "NA_BGM_SHEIK", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ADULT_LINK, "Goodbye to Zelda", "NA_BGM_ADULT_LINK", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INTRO_GANON, "Ganon Intro", "NA_BGM_INTRO_GANON", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_CHAMBER_OF_SAGES, "Chamber of the Sages", "NA_BGM_CHAMBER_OF_SAGES", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DOOR_OF_TIME, "Open Door of Temple of Time", "NA_BGM_DOOR_OF_TIME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OWL, "Kaepora Gaebora's Theme", "NA_BGM_OWL", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BRIDGE_TO_GANONS, "Ganon's Castle Bridge", "NA_BGM_BRIDGE_TO_GANONS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KOTAKE_KOUME, "Kotake & Koume's Theme", "NA_BGM_KOTAKE_KOUME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ESCAPE, "Escape from Ganon's Castle", "NA_BGM_ESCAPE", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TIMED_MINI_GAME, "Mini-Game", "NA_BGM_TIMED_MINI_GAME", SEQ_BGM_EVENT, true, true), + + // Previously SEQ_NOSHUFFLE + SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_MORNING, "Hyrule Field Morning Theme", "NA_BGM_FIELD_MORNING", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_END_DEMO, "Seal of Six Sages", "NA_BGM_END_DEMO", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_1, "End Credits I", "NA_BGM_STAFF_1", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + + // SEQ_INSTRUMENT + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3, "Whistle", "OCARINA_INSTRUMENT_WHISTLE", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4, "Harp", "OCARINA_INSTRUMENT_HARP", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5, "Organ", "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6, "Flute", "OCARINA_INSTRUMENT_FLUTE", SEQ_INSTRUMENT, true, false), + + // SEQ_SFX + SEQUENCE_MAP_ENTRY(NA_SE_EV_SMALL_DOG_BARK, "Bark", "NA_SE_EV_SMALL_DOG_BARK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Bomb Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_LOW, "Bongo Bongo Low", "NA_SE_EN_SHADEST_TAIKO_LOW", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_FAINT, "Business Scrub", "NA_SE_EN_NUTS_FAINT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_CARROT_RECOVER, "Carrot Refill", "NA_SE_SY_CARROT_RECOVER", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_N, "Cluck", "NA_SE_EV_CHICKEN_CRY_N", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_BRIDGE_OPEN_STOP, "Drawbridge Set", "NA_SE_EV_BRIDGE_OPEN_STOP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_KAICHO_CRY, "Guay", "NA_SE_EN_KAICHO_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_HITPOINT_ALARM, "Low HP Beep", "NA_SE_SY_HITPOINT_ALARM", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_HP_RECOVER, "HP Recover", "NA_SE_SY_HP_RECOVER", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_HORSE_RUN, "Horse Trot", "NA_SE_EV_HORSE_RUN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_PL_WALK_HEAVYBOOTS, "Iron Boots", "NA_SE_PL_WALK_HEAVYBOOTS", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG, "Hover Boots", "NA_SE_PL_HOBBERBOOTS_LV", SEQ_SFX, true, false), + SEQUENCE_MAP_ENTRY(NA_SE_EV_COW_CRY, "Moo", "NA_SE_EV_COW_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_POT_BROKEN, "Pot Shattering", "NA_SE_EV_POT_BROKEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FROG_CRY_0, "Ribbit", "NA_SE_EV_FROG_CRY_0", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FIVE_COUNT_LUPY, "Rupee (Silver)", "NA_SE_EV_FIVE_COUNT_LUPY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FOOT_SWITCH, "Switch", "NA_SE_EV_FOOT_SWITCH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_WALL_HIT_SOFT, "Sword Bonk", "NA_SE_IT_WALL_HIT_SOFT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_METRONOME, "Tambourine", "NA_SE_SY_METRONOME", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AMOS_VOICE, "Armos", "NA_SE_EN_AMOS_VOICE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_AIM, "Redead Scream", "NA_SE_EN_REDEAD_AIM", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_STALKID_ATTACK, "Stalchild Attack", "NA_SE_EN_STALKID_ATTACK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_M, "Cockadoodiedoo", "NA_SE_EV_CHICKEN_CRY_M", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_KINSTA_MARK_APPEAR, "Gold Skulltula Token", "NA_SE_SY_KINSTA_MARK_APPEAR", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_CRY, "Redead Moan", "NA_SE_EN_REDEAD_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_LIGHTNING, "Thunder", "NA_SE_EV_LIGHTNING", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_OC_ABYSS, "Cartoon Fall", "NA_SE_OC_ABYSS", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_LAUGH, "Flare Dancer Laugh", "NA_SE_EN_FLAME_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BREAK, "Shabom Pop", "NA_SE_EN_AWA_BREAK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_HIGH, "Bongo Bongo High", "NA_SE_EN_SHADEST_TAIKO_HIGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_BOTTLE_CAP_OPEN, "Bottle Cork", "NA_SE_EV_BOTTLE_CAP_OPEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_BOW_FLICK, "Bow Twang", "NA_SE_IT_BOW_FLICK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_BUBLE_LAUGH, "Bubble Laugh", "NA_SE_EN_BUBLE_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_DEKU_JR_MOUTH, "Deku Baba", "NA_SE_EN_DEKU_JR_MOUTH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_DOG_CRY_EVENING, "Dusk Howl", "NA_SE_EV_DOG_CRY_EVENING", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_DAMAGE, "Flare Dancer Startled", "NA_SE_EN_FLAME_DAMAGE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GANON_AT_RETURN, "Ganondorf Teh!", "NA_SE_EN_GANON_AT_RETURN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GOMA_JR_CRY, "Gohma Larva Croak", "NA_SE_EN_GOMA_JR_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GOLON_WAKE_UP, "Goron Wake", "NA_SE_EN_GOLON_WAKE_UP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_START_SHOT, "Gunshot", "NA_SE_SY_START_SHOT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_HAMMER_HIT, "Hammer Bonk", "NA_SE_IT_HAMMER_HIT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_IRONNACK_SWING_AXE, "Iron Knuckle", "NA_SE_EN_IRONNACK_SWING_AXE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FANTOM_ST_LAUGH, "Phantom Ganon Laugh", "NA_SE_EN_FANTOM_ST_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_PLANT_BROKEN, "Plant Explode", "NA_SE_EV_PLANT_BROKEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_GET_RUPY, "Rupee", "NA_SE_SY_GET_RUPY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_UP, "Scrub Emerge", "NA_SE_EN_NUTS_UP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Shabom Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHELL_MOUTH, "Shellblade", "NA_SE_EN_SHELL_MOUTH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_STALTU_DAMAGE, "Skulltula Damage", "NA_SE_EN_STALTU_DAMAGE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_THROW, "Spit Nut", "NA_SE_EN_NUTS_THROW", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON, "Target Enemy", "NA_SE_SY_LOCK_ON", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON_HUMAN, "Target Neutral", "NA_SE_SY_LOCK_ON_HUMAN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CURSOR, "File Select Cursor", "NA_SE_SY_FSEL_CURSOR", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_DECIDE_L, "File Select Choose", "NA_SE_SY_FSEL_DECIDE_L", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CLOSE, "File Select Back", "NA_SE_SY_FSEL_CLOSE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_BOMB_EXPLOSION, "Bomb Explosion", "NA_SE_IT_BOMB_EXPLOSION", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_A, "Chicken Cry", "NA_SE_EV_CHICKEN_CRY_A", SEQ_SFX, true, true), + + // SEQ_VOICE + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N, "Adult Link - Slash", "NA_SE_VO_LI_SWORD_N", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_L, "Adult Link - Big Slash", "NA_SE_VO_LI_SWORD_L", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH, "Adult Link - Hookshot Latch Yell", "NA_SE_VO_LI_LASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG, "Adult Link - Dangling Gasp", "NA_SE_VO_LI_HANG", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END, "Adult Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S, "Adult Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE, "Adult Link - Freeze", "NA_SE_VO_LI_FREEZE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S, "Adult Link - Fall Gasp", "NA_SE_VO_LI_FALL_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L, "Adult Link - Fall Scream", "NA_SE_VO_LI_FALL_L", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST, "Adult Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK, "Adult Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN, "Adult Link - Death", "NA_SE_VO_LI_DOWN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY, "Adult Link - Taken away by Wallmaster", "NA_SE_VO_LI_TAKEN_AWAY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD, "Adult Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE, "Adult Link - Sneeze", "NA_SE_VO_LI_SNEEZE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT, "Adult Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX, "Adult Link - Yawn", "NA_SE_VO_LI_RELAX", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY, "Adult Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP, "Adult Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTOd_JUMP", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE, "Adult Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE, "Adult Link - Suprised Gasp", "NA_SE_VO_LI_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL, "Adult Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH, "Adult Link - Push", "NA_SE_VO_LI_PUSH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG, "Adult Link - Hookshot hang", "NA_SE_VO_LI_HOOKSHOT_HANG", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S, "Adult Link - Fall damage", "NA_SE_VO_LI_LAND_DAMAGE_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b, "Adult Link - Small grunt (unused?)", "NA_SE_VO_LI_NULL_0x1b", SEQ_VOICE, true, true), // Unused? But unique so keeping it + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK, "Adult Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN, "Adult Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE, "Adult Link - Pained Land (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N_KID, "Child Link - Slash", "NA_SE_VO_LI_SWORD_N_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ROLLING_CUT_KID, "Child Link - Big Slash", "NA_SE_VO_LI_ROLLING_CUT_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH_KID, "Child Link - Hootshot Latch", "NA_SE_VO_LI_LASH_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG_KID, "Child Link - Dangling Gasp", "NA_SE_VO_LI_HANG_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END_KID, "Child Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S_KID, "Child Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE_KID, "Child Link - Freeze", "NA_SE_VO_LI_FREEZE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S_KID, "Child Link - Fall Gasp", "NA_SE_VO_LI_FALL_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L_KID, "Child Link - Fall Scream", "NA_SE_VO_LI_FALL_L_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST_KID, "Child Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK_KID, "Child Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN_KID, "Child Link - Death", "NA_SE_VO_LI_DOWN_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY_KID, "Child Link - Taken away by Wallmaster", "NA_SE_VO_LI_TAKEN_AWAY_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD_KID, "Child Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE_KID, "Child Link - Sneeze", "NA_SE_VO_LI_SNEEZE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT_KID, "Child Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX_KID, "Child Link - Yawn", "NA_SE_VO_LI_RELAX_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY_KID, "Child Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_KID, "Child Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTO_JUMP_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE_KID, "Child Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE_KID, "Child Link - Surprised Gasp", "NA_SE_VO_LI_SURPRISE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL_KID, "Child Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH_KID, "Child Link - Push", "NA_SE_VO_LI_PUSH_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG_KID, "Child Link - Hookshot Hang", "NA_SE_VO_LI_HOOKSHOT_HANG_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S_KID, "Child Link - Fall Damage", "NA_SE_VO_LI_LAND_DAMAGE_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b_KID, "Child Link - Small Gasp (unused?)", "NA_SE_VO_LI_NULL_0x1b_KID", SEQ_VOICE, true, true), // Unused? But unique so keeping it + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK_KID, "Child Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN_KID, "Child Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN_KID", SEQ_VOICE, true, true), // ... + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE_KID, "Child Link - Scream 2 (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE_KID", SEQ_VOICE, true, true), // Unused, matches with adult nocturne stuff + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_ENEMY, "Navi - Unused Enemy Target", "NA_SE_VO_NAVY_ENEMY", SEQ_VOICE, true, true), // Has no sound but is played when targetting enemies, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HELLO, "Navi - Unused NPC Hello", "NA_SE_VO_NAVY_HELLO", SEQ_VOICE, true, true), // Has no sound but is played when targetting npcs, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HEAR, "Navi - Unused Other Target", "NA_SE_VO_NAVY_HEAR", SEQ_VOICE, true, true), // Has no sound but is played when targetting npcs, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_CALL, "Navi - Look/Hey/Watchout (Target Enemy)", "NA_SE_VO_NAVY_CALL", SEQ_VOICE, true, true), // Has no sound but is played when targetting signs and other things, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_3, "Navi - Hello", "NA_SE_VO_NA_HELLO_3", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SLEEP, "Talon - Snore", "NA_SE_VO_TA_SLEEP", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SURPRISE, "Talon - Surprised", "NA_SE_VO_TA_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_0, "Talon - Hmm", "NA_SE_VO_TA_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_1, "Talon - Scream", "NA_SE_VO_TA_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_CRY_0, "Ingo - WAAAH!", "NA_SE_VO_IN_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LOST, "Ingo - KAAAAH! (Lost)", "NA_SE_VO_IN_LOST", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_0, "Ingo - Heyeah (Horse 1)", "NA_SE_VO_IN_LASH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_1, "Ingo - Ha (Horse 2)", "NA_SE_VO_IN_LASH_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_LAUGH_0, "Great Fairy - Big Laugh", "NA_SE_VO_FR_LAUGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_SMILE_0, "Great Fairy - Small Laugh", "NA_SE_VO_FR_SMILE_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_AGONY, "Nabooru - Pained Gasp", "NA_SE_VO_NB_AGONY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_CRY_0, "Nabooru - Scream", "NA_SE_VO_NB_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_NOTICE, "Nabooru - Hmm?", "NA_SE_VO_NB_NOTICE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_0, "Navi - Watchout!", "NA_SE_VO_NA_HELLO_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_1, "Navi - Look!", "NA_SE_VO_NA_HELLO_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_2, "Navi - Hey! (C-up Sound)", "NA_SE_VO_NA_HELLO_2", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_CRASH, "Ruto - Crash", "NA_SE_VO_RT_CRASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_DISCOVER, "Ruto - Found", "NA_SE_VO_RT_DISCOVER", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_FALL, "Ruto - Fall", "NA_SE_VO_RT_FALL", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LAUGH_0, "Ruto - Giggle", "NA_SE_VO_RT_LAUGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LIFT, "Ruto - Lifted/Navi - Intro Bonk", "NA_SE_VO_RT_LIFT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_THROW, "Ruto - Thrown", "NA_SE_VO_RT_THROW", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_UNBALLANCE, "Ruto - Held Tantrum", "NA_SE_VO_RT_UNBALLANCE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_DAMAGE, "Cursed Man - Scream", "NA_SE_VO_ST_DAMAGE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_ATTACK, "Cursed Man - Gasp", "NA_SE_VO_ST_ATTACK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_HURRY, "Child Zelda - Hurry", "NA_SE_VO_Z0_HURRY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_MEET, "Child Zelda - Meeting Link Gasp", "NA_SE_VO_Z0_MEET", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_QUESTION, "Child Zelda - Question", "NA_SE_VO_Z0_QUESTION", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SIGH_0, "Child Zelda - Sigh", "NA_SE_VO_Z0_SIGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SMILE_0, "Child Zelda - Laugh", "NA_SE_VO_Z0_SMILE_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SURPRISE, "Child Zelda - Sees Ganon Gasp", "NA_SE_VO_Z0_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_THROW, "Child Zelda - Throws Ocarina", "NA_SE_VO_Z0_THROW", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_0, "Sheik - Pained Gasp (Nocturne)", "NA_SE_VO_SK_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_1, "Sheik - Pained Scream (Nocturne)", "NA_SE_VO_SK_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRASH, "Sheik - Pained Landing (Nocturne)", "NA_SE_VO_SK_CRASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_LAUGH, "Navi - Listen!", "NA_SE_VO_SK_LAUGH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_SHOUT, "Sheik - Shout (Throwing Deku Nut)", "NA_SE_VO_SK_SHOUT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_0, "Adult Zelda - Scream 1", "NA_SE_VO_Z1_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_1, "Adult Zelda - Scream 2", "NA_SE_VO_Z1_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_OPENDOOR, "Adult Zelda - Open Seseme Magic Gasp", "NA_SE_VO_Z1_OPENDOOR", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_SURPRISE, "Adult Zelda - Gasp", "NA_SE_VO_Z1_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_PAIN, "Adult Zelda - Pained Gasp", "NA_SE_VO_Z1_PAIN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_KZ_MOVE, "King Zora - Mweep!", "NA_SE_VO_KZ_MOVE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_LAUGH, "Navi - Hello!", "NA_SE_VO_NB_LAUGH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK - SFX_FLAG, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE, true, false), + + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE, true, false), // Doesn't work due to SFX_FLAG + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK_KID, "Child Link - Drinking", "NA_SE_VO_LI_DRINK_KID", SEQ_VOICE, true, false), // Doesn't work due to SFX_FLAG + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN, "Adult Link - Groan (Unused)", "NA_SE_VO_LI_GROAN", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE, true, false), + // Following group of Dummies are all duplicate entries for Navi saying Look/Hey/Watchout - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x47, "NA_SE_VO_DUMMY_0x47", "NA_SE_VO_DUMMY_0x47", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x48, "NA_SE_VO_DUMMY_0x48", "NA_SE_VO_DUMMY_0x48", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x49, "NA_SE_VO_DUMMY_0x49", "NA_SE_VO_DUMMY_0x49", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4a "NA_SE_VO_DUMMY_0x4a", "NA_SE_VO_DUMMY_0x4a", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4b, "NA_SE_VO_DUMMY_0x4b", "NA_SE_VO_DUMMY_0x4b", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4c, "NA_SE_VO_DUMMY_0x4c", "NA_SE_VO_DUMMY_0x4c", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4d, "NA_SE_VO_DUMMY_0x4d", "NA_SE_VO_DUMMY_0x4d", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4e, "NA_SE_VO_DUMMY_0x4e", "NA_SE_VO_DUMMY_0x4e", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4f, "NA_SE_VO_DUMMY_0x4f", "NA_SE_VO_DUMMY_0x4f", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SLEEP, "Talon - Snore", "NA_SE_VO_TA_SLEEP", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SURPRISE, "Talon - Surprised", "NA_SE_VO_TA_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_0, "Talon - Hmm", "NA_SE_VO_TA_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_1, "Talon - Scream", "NA_SE_VO_TA_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_CRY_0, "Ingo - WAAAH!", "NA_SE_VO_IN_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LOST, "Ingo - KAAAAH! (Lost)", "NA_SE_VO_IN_LOST", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_0, "Ingo - Heyeah (Horse 1)", "NA_SE_VO_IN_LASH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_1, "Ingo - Ha (Horse 2)", "NA_SE_VO_IN_LASH_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_LAUGH_0, "Great Fairy - Big Laugh", "NA_SE_VO_FR_LAUGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_SMILE_0, "Great Fairy - Small Laugh", "NA_SE_VO_FR_SMILE_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_AGONY, "Nabooru - Pained Gasp", "NA_SE_VO_NB_AGONY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_CRY_0, "Nabooru - Scream", "NA_SE_VO_NB_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_NOTICE, "Nabooru - Hmm?", "NA_SE_VO_NB_NOTICE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_0, "Navi - Watchout!", "NA_SE_VO_NA_HELLO_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_1, "Navi - Look!", "NA_SE_VO_NA_HELLO_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_2, "Navi - Hey! (C-up Sound)", "NA_SE_VO_NA_HELLO_2", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_CRASH, "Ruto - Crash", "NA_SE_VO_RT_CRASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_DISCOVER, "Ruto - Found", "NA_SE_VO_RT_DISCOVER", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_FALL, "Ruto - Fall", "NA_SE_VO_RT_FALL", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LAUGH_0, "Ruto - Giggle", "NA_SE_VO_RT_LAUGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LIFT, "Ruto - Lifted/Navi - Intro Bonk", "NA_SE_VO_RT_LIFT", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_THROW, "Ruto - Thrown", "NA_SE_VO_RT_THROW", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_UNBALLANCE, "Ruto - Held Tantrum", "NA_SE_VO_RT_UNBALLANCE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_DAMAGE, "Cursed Man - Scream", "NA_SE_VO_ST_DAMAGE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_ATTACK, "Cursed Man - Gasp", "NA_SE_VO_ST_ATTACK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_HURRY, "Child Zelda - Hurry", "NA_SE_VO_Z0_HURRY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_MEET, "Child Zelda - Meeting Link Gasp", "NA_SE_VO_Z0_MEET", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_QUESTION, "Child Zelda - Question", "NA_SE_VO_Z0_QUESTION", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SIGH_0, "Child Zelda - Sigh", "NA_SE_VO_Z0_SIGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SMILE_0, "Child Zelda - Laugh", "NA_SE_VO_Z0_SMILE_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SURPRISE, "Child Zelda - Sees Ganon Gasp", "NA_SE_VO_Z0_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_THROW, "Child Zelda - Throws Ocarina", "NA_SE_VO_Z0_THROW", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_0, "Sheik - Pained Gasp (Nocturne)", "NA_SE_VO_SK_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_1, "Sheik - Pained Scream (Nocturne)", "NA_SE_VO_SK_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRASH, "Sheik - Pained Landing (Nocturne)", "NA_SE_VO_SK_CRASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_LAUGH, "Navi - Listen!", "NA_SE_VO_SK_LAUGH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_SHOUT, "Sheik - Shout (Throwing Deku Nut)", "NA_SE_VO_SK_SHOUT", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_0, "Adult Zelda - Scream 1", "NA_SE_VO_Z1_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_1, "Adult Zelda - Scream 2", "NA_SE_VO_Z1_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_OPENDOOR, "Adult Zelda - Open Seseme Magic Gasp","NA_SE_VO_Z1_OPENDOOR", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_SURPRISE, "Adult Zelda - Gasp", "NA_SE_VO_Z1_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_PAIN, "Adult Zelda - Pained Gasp", "NA_SE_VO_Z1_PAIN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_KZ_MOVE, "King Zora - Mweep!", "NA_SE_VO_KZ_MOVE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_LAUGH, "Navi - Hello!", "NA_SE_VO_NB_LAUGH", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LAUGH, "NA_SE_VO_IN_LAUGH", "NA_SE_VO_IN_LAUGH", SEQ_VOICE), // Crashes - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7d, "NA_SE_VO_DUMMY_0x7d", "NA_SE_VO_DUMMY_0x7d", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7e, "NA_SE_VO_DUMMY_0x7e", "NA_SE_VO_DUMMY_0x7e", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7f, "NA_SE_VO_DUMMY_0x7f", "NA_SE_VO_DUMMY_0x7f", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x80, "NA_SE_VO_DUMMY_0x80", "NA_SE_VO_DUMMY_0x80", SEQ_VOICE), // Unused and empty - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_DARKLINK,"NA_SE_VO_LI_AUTO_JUMP_DARKLINK", "NA_SE_VO_LI_AUTO_JUMP_DARKLINK", SEQ_VOICE), // Implies Dark Link but isn't used in anything - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x82_YOBI, "NA_SE_VO_DUMMY_0x82_YOBI", "NA_SE_VO_DUMMY_0x82_YOBI", SEQ_VOICE), // Rest are unused and empty - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x83_YOBI, "NA_SE_VO_DUMMY_0x83_YOBI", "NA_SE_VO_DUMMY_0x83_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x84_YOBI, "NA_SE_VO_DUMMY_0x84_YOBI", "NA_SE_VO_DUMMY_0x84_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x85_YOBI, "NA_SE_VO_DUMMY_0x85_YOBI", "NA_SE_VO_DUMMY_0x85_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x86_YOBI, "NA_SE_VO_DUMMY_0x86_YOBI", "NA_SE_VO_DUMMY_0x86_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x87_YOBI, "NA_SE_VO_DUMMY_0x87_YOBI", "NA_SE_VO_DUMMY_0x87_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x88_YOBI, "NA_SE_VO_DUMMY_0x88_YOBI", "NA_SE_VO_DUMMY_0x88_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x89_YOBI, "NA_SE_VO_DUMMY_0x89_YOBI", "NA_SE_VO_DUMMY_0x89_YOBI", SEQ_VOICE), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x47, "NA_SE_VO_DUMMY_0x47", "NA_SE_VO_DUMMY_0x47", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x48, "NA_SE_VO_DUMMY_0x48", "NA_SE_VO_DUMMY_0x48", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x49, "NA_SE_VO_DUMMY_0x49", "NA_SE_VO_DUMMY_0x49", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4a "NA_SE_VO_DUMMY_0x4a", "NA_SE_VO_DUMMY_0x4a", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4b, "NA_SE_VO_DUMMY_0x4b", "NA_SE_VO_DUMMY_0x4b", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4c, "NA_SE_VO_DUMMY_0x4c", "NA_SE_VO_DUMMY_0x4c", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4d, "NA_SE_VO_DUMMY_0x4d", "NA_SE_VO_DUMMY_0x4d", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4e, "NA_SE_VO_DUMMY_0x4e", "NA_SE_VO_DUMMY_0x4e", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4f, "NA_SE_VO_DUMMY_0x4f", "NA_SE_VO_DUMMY_0x4f", SEQ_VOICE, true, false), + + //SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LAUGH, "NA_SE_VO_IN_LAUGH", "NA_SE_VO_IN_LAUGH", SEQ_VOICE, true, false), // Crashes + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7d, "NA_SE_VO_DUMMY_0x7d", "NA_SE_VO_DUMMY_0x7d", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7e, "NA_SE_VO_DUMMY_0x7e", "NA_SE_VO_DUMMY_0x7e", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7f, "NA_SE_VO_DUMMY_0x7f", "NA_SE_VO_DUMMY_0x7f", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x80, "NA_SE_VO_DUMMY_0x80", "NA_SE_VO_DUMMY_0x80", SEQ_VOICE, true, false), // Unused and empty + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_DARKLINK,"NA_SE_VO_LI_AUTO_JUMP_DARKLINK", "NA_SE_VO_LI_AUTO_JUMP_DARKLINK", SEQ_VOICE, true, false), // Implies Dark Link but isn't used in anything + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x82_YOBI, "NA_SE_VO_DUMMY_0x82_YOBI", "NA_SE_VO_DUMMY_0x82_YOBI", SEQ_VOICE, true, false), // Rest are unused and empty + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x83_YOBI, "NA_SE_VO_DUMMY_0x83_YOBI", "NA_SE_VO_DUMMY_0x83_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x84_YOBI, "NA_SE_VO_DUMMY_0x84_YOBI", "NA_SE_VO_DUMMY_0x84_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x85_YOBI, "NA_SE_VO_DUMMY_0x85_YOBI", "NA_SE_VO_DUMMY_0x85_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x86_YOBI, "NA_SE_VO_DUMMY_0x86_YOBI", "NA_SE_VO_DUMMY_0x86_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x87_YOBI, "NA_SE_VO_DUMMY_0x87_YOBI", "NA_SE_VO_DUMMY_0x87_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x88_YOBI, "NA_SE_VO_DUMMY_0x88_YOBI", "NA_SE_VO_DUMMY_0x88_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x89_YOBI, "NA_SE_VO_DUMMY_0x89_YOBI", "NA_SE_VO_DUMMY_0x89_YOBI", SEQ_VOICE, true, false), // .. }; } @@ -331,7 +353,7 @@ void AudioCollection::AddToCollection(char* otrPath, uint16_t seqNum) { SequenceInfo info = {seqNum, sequenceName, StringHelper::Replace(StringHelper::Replace(StringHelper::Replace(sequenceName, " ", "_"), "~", "-"),".", ""), - type}; + type, false, false}; sequenceMap.emplace(seqNum, info); } @@ -379,12 +401,10 @@ void AudioCollection::InitializeShufflePool() { for (auto& [seqId, seqInfo] : sequenceMap) { const std::string cvarKey = "gAudioEditor.Excluded." + seqInfo.sfxKey; - if (CVarGetInteger(cvarKey.c_str(), 0)) { + if (CVarGetInteger(cvarKey.c_str(), 0) && !seqInfo.canBeUsedAsReplacement) { excludedSequences.insert(&seqInfo); } else { - if (seqInfo.category != SEQ_NOSHUFFLE) { - includedSequences.insert(&seqInfo); - } + includedSequences.insert(&seqInfo); } } diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h index c60a7e739..1d53777e7 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.h +++ b/soh/soh/Enhancements/audio/AudioCollection.h @@ -25,6 +25,8 @@ struct SequenceInfo { std::string label; std::string sfxKey; SeqType category; + bool canBeReplaced; + bool canBeUsedAsReplacement; }; class AudioCollection { diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index ce33a0560..9374a486d 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -27,7 +27,7 @@ s8 reverbAdd = 0; #define SEQ_COUNT_BGM_EVENT 17 #define SEQ_COUNT_INSTRUMENT 6 #define SEQ_COUNT_SFX 57 -#define SEQ_COUNT_VOICE 107 +#define SEQ_COUNT_VOICE 108 size_t AuthenticCountBySequenceType(SeqType type) { switch (type) { @@ -97,7 +97,7 @@ void RandomizeGroup(SeqType type) { // don't randomize locked entries if ((seqData.category & type) && CVarGetInteger(cvarLockKey.c_str(), 0) == 0) { // Only save authentic sequence CVars - if (((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) { + if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) { continue; } const int randomValue = values.back(); @@ -194,10 +194,11 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { continue; } // Do not display custom sequences in the list - if (((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && defaultValue >= MAX_AUTHENTIC_SEQID) { + if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && defaultValue >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) { continue; } + const std::string initialSfxKey = seqData.sfxKey; const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); const std::string hiddenKey = "##" + cvarKey; @@ -215,7 +216,8 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { const int initialValue = map.contains(currentValue) ? currentValue : defaultValue; if (ImGui::BeginCombo(hiddenKey.c_str(), map.at(initialValue).label.c_str())) { for (const auto& [value, seqData] : map) { - if (~(seqData.category) & type) { + // If excluded as a replacement sequence, don't show in other dropdowns except the effect's own dropdown. + if (~(seqData.category) & type || (!seqData.canBeUsedAsReplacement && initialSfxKey != seqData.sfxKey)) { continue; } From cff2e372873072a04457499c3243549bbcf6045c Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:25:09 +0100 Subject: [PATCH 29/77] Restoration: RBA Values (#2672) * Restore RBA Values Matches all rba scenarios achievable in game to their original outcomes. This only ends up affecting certain trade items. * tooltip rewrite * rba cases generalised * re-add to menu bar * better byteswap and checks for endianness * remove leftover defines --- soh/soh/Enhancements/presets.h | 1 + soh/soh/SohMenuBar.cpp | 2 ++ soh/src/code/z_parameter.c | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index 8847f61f1..6afc36248 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -167,6 +167,7 @@ const std::vector enhancementsCvars = { "gBombchusOOB", "gQuickPutaway", "gGsCutscene", + "gRestoreRBAValues", "gSkipSaveConfirmation", "gAutosave", "gDisableCritWiggle", diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index d8cbefd0b..04f25d2e8 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -1067,6 +1067,8 @@ void DrawEnhancementsMenu() { UIWidgets::PaddedEnhancementCheckbox("Restore old Gold Skulltula cutscene", "gGsCutscene", true, false); UIWidgets::PaddedEnhancementCheckbox("Quick Bongo Kill", "gQuickBongoKill", true, false); UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows bypassing Bongo Bongo's intro cutscene to quickly kill him"); + UIWidgets::PaddedEnhancementCheckbox("Original RBA Values", "gRestoreRBAValues", true, false); + UIWidgets::Tooltip("Restores the original outcomes when performing Reverse Bottle Adventure."); ImGui::EndMenu(); } diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 75c85e3e4..1ff5b35b2 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2782,6 +2782,13 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) { } } +void byteSwapInventory() { + gSaveContext.inventory.equipment = BE16SWAP(gSaveContext.inventory.equipment); + gSaveContext.inventory.upgrades = BE32SWAP(gSaveContext.inventory.upgrades); + gSaveContext.inventory.questItems = BE32SWAP(gSaveContext.inventory.questItems); + gSaveContext.inventory.gsTokens = BE16SWAP(gSaveContext.inventory.gsTokens); +} + void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) { osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, gSaveContext.equips.cButtonSlots[button - 1], @@ -2793,7 +2800,14 @@ void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) { item = ITEM_MILK_HALF; } - gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item; + if (CVarGetInteger("gRestoreRBAValues",0)) { + byteSwapInventory(); + gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item; + byteSwapInventory(); + } else { + gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item; + } + gSaveContext.equips.buttonItems[button] = item; Interface_LoadItemIcon1(play, button); From 9d581f10e7b4fddbbbfbce961a11b2aa4eb78ccd Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Fri, 20 Oct 2023 00:13:33 +0100 Subject: [PATCH 30/77] magic (#3278) --- soh/include/functions.h | 4 +- soh/src/code/z_actor.c | 2 +- soh/src/code/z_kaleido_setup.c | 2 +- soh/src/code/z_parameter.c | 142 +++++++++--------- soh/src/code/z_play.c | 2 +- soh/src/code/z_player_lib.c | 2 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 2 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 4 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 12 +- .../actors/ovl_En_Partner/z_en_partner.c | 8 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 2 +- soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 2 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 2 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 2 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 2 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 2 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- .../actors/ovl_player_actor/z_player.c | 46 +++--- .../ovl_file_choose/z_file_choose.c | 4 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 4 +- 26 files changed, 130 insertions(+), 130 deletions(-) diff --git a/soh/include/functions.h b/soh/include/functions.h index 6b7732ae9..e75777c87 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -1090,8 +1090,8 @@ s32 Health_ChangeBy(PlayState* play, s16 healthChange); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); void Magic_Fill(PlayState* play); -void func_800876C8(PlayState* play); -s32 func_80087708(PlayState* play, s16 arg1, s16 arg2); +void Magic_Reset(PlayState* play); +s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type); void func_80088AA0(s16 seconds); void func_80088AF0(PlayState* play); void func_80088B34(s16 arg0); diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 1a122cc9b..79a3c8ace 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -2451,7 +2451,7 @@ void func_80030488(PlayState* play) { void Actor_DisableLens(PlayState* play) { if (play->actorCtx.lensActive) { play->actorCtx.lensActive = false; - func_800876C8(play); + Magic_Reset(play); } } diff --git a/soh/src/code/z_kaleido_setup.c b/soh/src/code/z_kaleido_setup.c index e9f097a45..77cc43e99 100644 --- a/soh/src/code/z_kaleido_setup.c +++ b/soh/src/code/z_kaleido_setup.c @@ -15,7 +15,7 @@ void KaleidoSetup_Update(PlayState* play) { if (pauseCtx->state == 0 && pauseCtx->debugState == 0 && play->gameOverCtx.state == GAMEOVER_INACTIVE && play->sceneLoadFlag == 0 && play->transitionMode == 0 && gSaveContext.cutsceneIndex < 0xFFF0 && gSaveContext.nextCutsceneIndex < 0xFFF0 && !Play_InCsMode(play) && - play->shootingGalleryStatus <= 1 && gSaveContext.magicState != 8 && gSaveContext.magicState != 9 && + play->shootingGalleryStatus <= 1 && gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY && gSaveContext.magicState != MAGIC_STATE_FILL && (play->sceneNum != SCENE_BOMBCHU_BOWLING_ALLEY || !Flags_GetSwitch(play, 0x38))) { u8 easyPauseBufferEnabled = CVarGetInteger("gCheatEasyPauseBufferEnabled", 0); diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 1ff5b35b2..c41d1c188 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2196,14 +2196,14 @@ u8 Item_Give(PlayState* play, u8 item) { } return Return_Item(item, MOD_NONE, item); } else if (item == ITEM_MAGIC_SMALL) { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { if (play != NULL) { Magic_Fill(play); } } if (play != NULL) { - func_80087708(play, 12, 5); + Magic_RequestChange(play, 12, MAGIC_ADD); } if (!Flags_GetInfTable(INFTABLE_198)) { @@ -2213,13 +2213,13 @@ u8 Item_Give(PlayState* play, u8 item) { return Return_Item(item, MOD_NONE, item); } else if (item == ITEM_MAGIC_LARGE) { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { if (play != NULL) { Magic_Fill(play); } } if (play != NULL) { - func_80087708(play, 24, 5); + Magic_RequestChange(play, 24, MAGIC_ADD); } if (!Flags_GetInfTable(INFTABLE_198)) { @@ -2328,7 +2328,7 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { slot = SLOT(item); if (item == RG_MAGIC_SINGLE) { gSaveContext.isMagicAcquired = true; - gSaveContext.magicFillTarget = 0x30; + gSaveContext.magicFillTarget = MAGIC_NORMAL_METER; Magic_Fill(play); return Return_Item_Entry(giEntry, RG_NONE); } else if (item == RG_MAGIC_DOUBLE) { @@ -2336,7 +2336,7 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { gSaveContext.isMagicAcquired = true; } gSaveContext.isDoubleMagicAcquired = true; - gSaveContext.magicFillTarget = 0x60; + gSaveContext.magicFillTarget = MAGIC_DOUBLE_METER; gSaveContext.magicLevel = 0; Magic_Fill(play); return Return_Item_Entry(giEntry, RG_NONE); @@ -3140,96 +3140,96 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { void Magic_Fill(PlayState* play) { if (gSaveContext.isMagicAcquired) { gSaveContext.prevMagicState = gSaveContext.magicState; - gSaveContext.magicFillTarget = (gSaveContext.isDoubleMagicAcquired + 1) * 0x30; - gSaveContext.magicState = 9; + gSaveContext.magicFillTarget = (gSaveContext.isDoubleMagicAcquired + 1) * MAGIC_NORMAL_METER; + gSaveContext.magicState = MAGIC_STATE_FILL; } } -void func_800876C8(PlayState* play) { - if ((gSaveContext.magicState != 8) && (gSaveContext.magicState != 9)) { - if (gSaveContext.magicState == 10) { +void Magic_Reset(PlayState* play) { + if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { + if (gSaveContext.magicState == MAGIC_STATE_ADD) { gSaveContext.prevMagicState = gSaveContext.magicState; } - gSaveContext.magicState = 5; + gSaveContext.magicState = MAGIC_STATE_RESET; } } -s32 func_80087708(PlayState* play, s16 arg1, s16 arg2) { +s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) { if (!gSaveContext.isMagicAcquired) { - return 0; + return false; } - if ((arg2 != 5) && (gSaveContext.magic - arg1) < 0) { + if ((type != 5) && (gSaveContext.magic - amount) < 0) { if (gSaveContext.magicCapacity != 0) { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - return 0; + return false; } - switch (arg2) { - case 0: - case 2: - if ((gSaveContext.magicState == 0) || (gSaveContext.magicState == 7)) { - if (gSaveContext.magicState == 7) { + switch (type) { + case MAGIC_CONSUME_NOW: + case MAGIC_CONSUME_NOW_ALT: + if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { + if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { play->actorCtx.lensActive = false; } - gSaveContext.magicTarget = gSaveContext.magic - arg1; - gSaveContext.magicState = 1; + gSaveContext.magicTarget = gSaveContext.magic - amount; + gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP; return 1; } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - return 0; + return false; } - case 1: - if ((gSaveContext.magicState == 0) || (gSaveContext.magicState == 7)) { - if (gSaveContext.magicState == 7) { + case MAGIC_CONSUME_WAIT_NO_PREVIEW: + if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { + if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { play->actorCtx.lensActive = false; } - gSaveContext.magicTarget = gSaveContext.magic - arg1; - gSaveContext.magicState = 6; - return 1; + gSaveContext.magicTarget = gSaveContext.magic - amount; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_3; + return true; } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - return 0; + return false; } - case 3: - if (gSaveContext.magicState == 0) { + case MAGIC_CONSUME_LENS: + if (gSaveContext.magicState == MAGIC_STATE_IDLE) { if (gSaveContext.magic != 0) { play->interfaceCtx.unk_230 = 80; - gSaveContext.magicState = 7; - return 1; + gSaveContext.magicState = MAGIC_STATE_CONSUME_LENS; + return true; } else { - return 0; + return false; } } else { - if (gSaveContext.magicState == 7) { - return 1; + if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { + return true; } else { - return 0; + return false; } } - case 4: - if ((gSaveContext.magicState == 0) || (gSaveContext.magicState == 7)) { - if (gSaveContext.magicState == 7) { + case MAGIC_CONSUME_WAIT_PREVIEW: + if ((gSaveContext.magicState == MAGIC_STATE_IDLE) || (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) { + if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) { play->actorCtx.lensActive = false; } - gSaveContext.magicTarget = gSaveContext.magic - arg1; - gSaveContext.magicState = 4; - return 1; + gSaveContext.magicTarget = gSaveContext.magic - amount; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_2; + return true; } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - return 0; + return false; } - case 5: + case MAGIC_ADD: if (gSaveContext.magicCapacity >= gSaveContext.magic) { - gSaveContext.magicTarget = gSaveContext.magic + arg1; + gSaveContext.magicTarget = gSaveContext.magic + amount; if (gSaveContext.magicTarget >= gSaveContext.magicCapacity) { gSaveContext.magicTarget = gSaveContext.magicCapacity; } - gSaveContext.magicState = 10; - return 1; + gSaveContext.magicState = MAGIC_STATE_ADD; + return true; } break; } @@ -3278,8 +3278,8 @@ void Interface_UpdateMagicBar(PlayState* play) { s16 temp; switch (gSaveContext.magicState) { - case 8: - temp = gSaveContext.magicLevel * 0x30; + case MAGIC_STATE_STEP_CAPACITY: + temp = gSaveContext.magicLevel * MAGIC_NORMAL_METER; if (gSaveContext.magicCapacity != temp) { if (gSaveContext.magicCapacity < temp) { gSaveContext.magicCapacity += 8; @@ -3293,11 +3293,11 @@ void Interface_UpdateMagicBar(PlayState* play) { } } } else { - gSaveContext.magicState = 9; + gSaveContext.magicState = MAGIC_STATE_FILL; } break; - case 9: + case MAGIC_STATE_FILL: gSaveContext.magic += 4; if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) { @@ -3314,32 +3314,32 @@ void Interface_UpdateMagicBar(PlayState* play) { } break; - case 1: + case MAGIC_STATE_CONSUME_SETUP: sMagicBorderRatio = 2; - gSaveContext.magicState = 2; + gSaveContext.magicState = MAGIC_STATE_CONSUME; break; - case 2: + case MAGIC_STATE_CONSUME: gSaveContext.magic -= 2; if (gSaveContext.magic <= 0) { gSaveContext.magic = 0; - gSaveContext.magicState = 3; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } } else if (gSaveContext.magic == gSaveContext.magicTarget) { - gSaveContext.magicState = 3; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } } - case 3: - case 4: - case 6: + case MAGIC_STATE_METER_FLASH_1: + case MAGIC_STATE_METER_FLASH_2: + case MAGIC_STATE_METER_FLASH_3: temp = sMagicBorderIndexes[sMagicBorderStep]; borderChangeR = ABS(sMagicBorder.r - sMagicBorderColors[temp][0]) / sMagicBorderRatio; borderChangeG = ABS(sMagicBorder.g - sMagicBorderColors[temp][1]) / sMagicBorderRatio; @@ -3376,16 +3376,16 @@ void Interface_UpdateMagicBar(PlayState* play) { } break; - case 5: + case MAGIC_STATE_RESET: if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } - gSaveContext.magicState = 0; + gSaveContext.magicState = MAGIC_STATE_IDLE; break; - case 7: + case MAGIC_STATE_CONSUME_LENS: if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && (msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->sceneLoadFlag == 0) && (play->transitionMode == 0) && !Play_InCsMode(play)) { @@ -3402,7 +3402,7 @@ void Interface_UpdateMagicBar(PlayState* play) { play->actorCtx.lensActive = false; Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - gSaveContext.magicState = 0; + gSaveContext.magicState = MAGIC_STATE_IDLE; if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { @@ -3454,7 +3454,7 @@ void Interface_UpdateMagicBar(PlayState* play) { } break; - case 10: + case MAGIC_STATE_ADD: gSaveContext.magic += 4; Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); if (gSaveContext.magic >= gSaveContext.magicTarget) { @@ -3465,7 +3465,7 @@ void Interface_UpdateMagicBar(PlayState* play) { break; default: - gSaveContext.magicState = 0; + gSaveContext.magicState = MAGIC_STATE_IDLE; break; } } @@ -3598,7 +3598,7 @@ void Interface_DrawMagicBar(PlayState* play) { ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE); gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); - if (gSaveContext.magicState == 4) { + if (gSaveContext.magicState == MAGIC_STATE_METER_FLASH_2) { // Yellow part of the bar indicating the amount of magic to be subtracted gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_yellow.r, magicbar_yellow.g, magicbar_yellow.b, interfaceCtx->magicAlpha); @@ -5245,7 +5245,7 @@ void Interface_Draw(PlayState* play) { Interface_DrawLineupTick(play); } - if (fullUi || gSaveContext.magicState > 0) { + if (fullUi || gSaveContext.magicState > MAGIC_STATE_IDLE) { Interface_DrawMagicBar(play); } @@ -6541,7 +6541,7 @@ void Interface_Update(PlayState* play) { ((play->csCtx.state == CS_STATE_IDLE) || !Player_InCsMode(play))) { if ((gSaveContext.isMagicAcquired != 0) && (gSaveContext.magicLevel == 0)) { gSaveContext.magicLevel = gSaveContext.isDoubleMagicAcquired + 1; - gSaveContext.magicState = 8; + gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY; osSyncPrintf(VT_FGCOL(YELLOW)); osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!" osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magicLevel); diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index fb4628834..3181b741c 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -545,7 +545,7 @@ void Play_Init(GameState* thisx) { if (gSaveContext.gameMode != 0 || gSaveContext.cutsceneIndex >= 0xFFF0) { gSaveContext.nayrusLoveTimer = 0; - func_800876C8(play); + Magic_Reset(play); gSaveContext.sceneSetupIndex = (gSaveContext.cutsceneIndex & 0xF) + 4; } else if (!LINK_IS_ADULT && IS_DAY) { gSaveContext.sceneSetupIndex = 0; diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 32a3e6e48..3b005bbbf 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -342,7 +342,7 @@ uint8_t Player_IsCustomLinkModel() { s32 Player_InBlockingCsMode(PlayState* play, Player* this) { return (this->stateFlags1 & 0x20000080) || (this->csMode != 0) || (play->sceneLoadFlag == 0x14) || (this->stateFlags1 & 1) || (this->stateFlags3 & 0x80) || - ((gSaveContext.magicState != 0) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0)); + ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0)); } s32 Player_InCsMode(PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 850f793da..d257a7fd9 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -55,7 +55,7 @@ void ArrowFire_Init(Actor* thisx, PlayState* play) { } void ArrowFire_Destroy(Actor* thisx, PlayState* play) { - func_800876C8(play); + Magic_Reset(play); LOG_STRING("消滅"); // "Disappearance" } diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 2d63f9890..94d7ecabc 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -56,7 +56,7 @@ void ArrowIce_Init(Actor* thisx, PlayState* play) { } void ArrowIce_Destroy(Actor* thisx, PlayState* play) { - func_800876C8(play); + Magic_Reset(play); LOG_STRING("消滅"); // "Disappearance" } diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 3bea3b09f..9ddfb96a6 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -56,7 +56,7 @@ void ArrowLight_Init(Actor* thisx, PlayState* play) { } void ArrowLight_Destroy(Actor* thisx, PlayState* play) { - func_800876C8(play); + Magic_Reset(play); LOG_STRING("消滅"); // "Disappearance" } diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 7223e936f..e8b2be4df 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -741,7 +741,7 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) { switch (actionIndex) { case FAIRY_UPGRADE_MAGIC: gSaveContext.isMagicAcquired = true; - gSaveContext.magicFillTarget = 0x30; + gSaveContext.magicFillTarget = MAGIC_NORMAL_METER; Interface_ChangeAlpha(9); break; case FAIRY_UPGRADE_DOUBLE_MAGIC: @@ -749,7 +749,7 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) { gSaveContext.isMagicAcquired = true; } gSaveContext.isDoubleMagicAcquired = true; - gSaveContext.magicFillTarget = 0x60; + gSaveContext.magicFillTarget = MAGIC_DOUBLE_METER; gSaveContext.magicLevel = 0; Interface_ChangeAlpha(9); break; diff --git a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index e088b9f10..6f8624518 100644 --- a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -85,9 +85,9 @@ void EnMThunder_Init(Actor* thisx, PlayState* play2) { this->unk_1CA = 0; if (player->stateFlags2 & 0x20000) { - if (!gSaveContext.isMagicAcquired || gSaveContext.magicState || + if (!gSaveContext.isMagicAcquired || (gSaveContext.magicState != MAGIC_STATE_IDLE) || (((this->actor.params & 0xFF00) >> 8) && - !(func_80087708(play, (this->actor.params & 0xFF00) >> 8, 0)))) { + !(Magic_RequestChange(play, (this->actor.params & 0xFF00) >> 8, MAGIC_CONSUME_NOW)))) { Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, @@ -116,7 +116,7 @@ void EnMThunder_Destroy(Actor* thisx, PlayState* play) { EnMThunder* this = (EnMThunder*)thisx; if (this->unk_1CA != 0) { - func_800876C8(play); + Magic_Reset(play); } Collider_DestroyCylinder(play, &this->collider); @@ -158,8 +158,8 @@ void func_80A9F408(EnMThunder* this, PlayState* play) { if (this->unk_1CA == 0) { if (player->unk_858 >= 0.1f) { - if ((gSaveContext.magicState) || (((this->actor.params & 0xFF00) >> 8) && - !(func_80087708(play, (this->actor.params & 0xFF00) >> 8, 4)))) { + if ((gSaveContext.magicState != MAGIC_STATE_IDLE) || (((this->actor.params & 0xFF00) >> 8) && + !(Magic_RequestChange(play, (this->actor.params & 0xFF00) >> 8, MAGIC_CONSUME_WAIT_PREVIEW)))) { func_80A9F350(this, play); func_80A9EFE0(this, func_80A9F350); this->unk_1C8 = 0; @@ -193,7 +193,7 @@ void func_80A9F408(EnMThunder* this, PlayState* play) { } else { player->stateFlags2 &= ~0x20000; if ((this->actor.params & 0xFF00) >> 8) { - gSaveContext.magicState = 1; + gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP; } if (player->unk_858 < 0.85f) { this->collider.info.toucher.dmgFlags = D_80AA044C[this->unk_1C7]; diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c index 4a2201ab7..bfd4dfbbe 100644 --- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c +++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c @@ -195,7 +195,7 @@ void UseBow(Actor* thisx, PlayState* play, u8 started, u8 arrowType) { } else if (started == 0) { if (this->itemTimer <= 0) { if (AMMO(ITEM_BOW) > 0) { - if (arrowType >= 1 && !func_80087708(play, magicArrowCosts[arrowType], 0)) { + if (arrowType >= 1 && !Magic_RequestChange(play, magicArrowCosts[arrowType], MAGIC_CONSUME_NOW)) { func_80078884(NA_SE_SY_ERROR); this->canMove = 1; return; @@ -455,7 +455,7 @@ void UseSpell(Actor* thisx, PlayState* play, u8 started, u8 spellType) { if (started == 0 && this->usedSpell != 0) { this->itemTimer = 10; - gSaveContext.magicState = 5; + gSaveContext.magicState = MAGIC_STATE_RESET; switch (this->usedSpell) { case 1: @@ -487,7 +487,7 @@ void UseSpell(Actor* thisx, PlayState* play, u8 started, u8 spellType) { break; } - gSaveContext.magicState = 3; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; this->magicTimer--; if (this->magicTimer <= 0) { gSaveContext.magic--; @@ -497,7 +497,7 @@ void UseSpell(Actor* thisx, PlayState* play, u8 started, u8 spellType) { this->itemTimer = 10; this->usedSpell = 0; - gSaveContext.magicState = 5; + gSaveContext.magicState = MAGIC_STATE_RESET; } } } diff --git a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 0a3172fd0..b4b48d2aa 100644 --- a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -568,7 +568,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { // Causes Dark Link to shield in place when Link is using magic attacks other than the spin attack - if ((gSaveContext.magicState == 3) && (player->meleeWeaponState == 0 || (player->meleeWeaponAnimation < SPIN_ATTACK_1H) || + if ((gSaveContext.magicState == MAGIC_STATE_METER_FLASH_1) && (player->meleeWeaponState == 0 || (player->meleeWeaponAnimation < SPIN_ATTACK_1H) || (player->meleeWeaponAnimation > BIG_SPIN_2H))) { sStickTilt = 0.0f; input->cur.stick_x = 0; diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 2c23aa82d..d07f2de50 100644 --- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1810,7 +1810,7 @@ void func_80B5772C(EnZl3* this, PlayState* play) { } void func_80B57754(EnZl3* this, PlayState* play) { - if (gSaveContext.magicState == 0) { + if (gSaveContext.magicState == MAGIC_STATE_IDLE) { Actor_Spawn(&play->actorCtx, play, ACTOR_OCEFF_WIPE4, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 1, true); func_80B56DA4(this); diff --git a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 882c6b46e..73a588ab3 100644 --- a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -65,7 +65,7 @@ void MagicDark_Init(Actor* thisx, PlayState* play) { void MagicDark_Destroy(Actor* thisx, PlayState* play) { if (gSaveContext.nayrusLoveTimer == 0) { - func_800876C8(play); + Magic_Reset(play); } } diff --git a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 75be6e0bc..b245c988c 100644 --- a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -93,7 +93,7 @@ void MagicFire_Init(Actor* thisx, PlayState* play) { } void MagicFire_Destroy(Actor* thisx, PlayState* play) { - func_800876C8(play); + Magic_Reset(play); } void MagicFire_UpdateBeforeCast(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 90ca0e269..ac7a35036 100644 --- a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -70,7 +70,7 @@ void MagicWind_Init(Actor* thisx, PlayState* play) { void MagicWind_Destroy(Actor* thisx, PlayState* play) { MagicWind* this = (MagicWind*)thisx; SkelCurve_Destroy(play, &this->skelCurve); - func_800876C8(play); + Magic_Reset(play); // "wipe out" LOG_STRING("消滅"); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 178921453..8aa68b160 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -70,7 +70,7 @@ void OceffSpot_Destroy(Actor* thisx, PlayState* play) { LightContext_RemoveLight(play, &play->lightCtx, this->lightNode1); LightContext_RemoveLight(play, &play->lightCtx, this->lightNode2); - func_800876C8(play); + Magic_Reset(play); if ((gSaveContext.nayrusLoveTimer != 0) && (play->actorCtx.actorLists[ACTORCAT_PLAYER].length != 0)) { player->stateFlags3 |= PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } diff --git a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index d4d9acb92..3869fa6e4 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -60,7 +60,7 @@ void OceffStorm_Destroy(Actor* thisx, PlayState* play) { OceffStorm* this = (OceffStorm*)thisx; Player* player = GET_PLAYER(play); - func_800876C8(play); + Magic_Reset(play); if (gSaveContext.nayrusLoveTimer != 0) { player->stateFlags3 |= PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 41b2d2905..0076a6385 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -40,7 +40,7 @@ void OceffWipe_Destroy(Actor* thisx, PlayState* play) { OceffWipe* this = (OceffWipe*)thisx; Player* player = GET_PLAYER(play); - func_800876C8(play); + Magic_Reset(play); if (gSaveContext.nayrusLoveTimer != 0) { player->stateFlags3 |= PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 13a955640..38014b5e2 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -40,7 +40,7 @@ void OceffWipe2_Destroy(Actor* thisx, PlayState* play) { OceffWipe2* this = (OceffWipe2*)thisx; Player* player = GET_PLAYER(play); - func_800876C8(play); + Magic_Reset(play); if (gSaveContext.nayrusLoveTimer != 0) { player->stateFlags3 |= PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index eb85a2816..df3fc1a87 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -43,7 +43,7 @@ void OceffWipe3_Destroy(Actor* thisx, PlayState* play) { OceffWipe3* this = (OceffWipe3*)thisx; Player* player = GET_PLAYER(play); - func_800876C8(play); + Magic_Reset(play); if (gSaveContext.nayrusLoveTimer != 0) { player->stateFlags3 |= PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 043db276d..5a66b2991 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -39,7 +39,7 @@ void OceffWipe4_Init(Actor* thisx, PlayState* play) { void OceffWipe4_Destroy(Actor* thisx, PlayState* play) { OceffWipe4* this = (OceffWipe4*)thisx; - func_800876C8(play); + Magic_Reset(play); } void OceffWipe4_Update(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index a4d933c58..5f799227b 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -2224,7 +2224,7 @@ s32 func_8083442C(Player* this, PlayState* play) { s32 magicArrowType; if ((this->heldItemAction >= PLAYER_IA_BOW_FIRE) && (this->heldItemAction <= PLAYER_IA_BOW_0E) && - (gSaveContext.magicState != 0)) { + (gSaveContext.magicState != MAGIC_STATE_IDLE)) { func_80078884(NA_SE_SY_ERROR); } else { func_80833638(this, func_808351D4); @@ -2240,7 +2240,7 @@ s32 func_8083442C(Player* this, PlayState* play) { if (this->unk_860 >= 0) { if ((magicArrowType >= 0) && (magicArrowType <= 2) && - !func_80087708(play, sMagicArrowCosts[magicArrowType], 0)) { + !Magic_RequestChange(play, sMagicArrowCosts[magicArrowType], MAGIC_CONSUME_NOW)) { arrowType = ARROW_NORMAL; } @@ -2979,7 +2979,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { } if (actionParam == PLAYER_IA_LENS_OF_TRUTH) { - if (func_80087708(play, 0, 3)) { + if (Magic_RequestChange(play, 0, MAGIC_CONSUME_LENS)) { if (play->actorCtx.lensActive) { Actor_DisableLens(play); } else { @@ -3004,7 +3004,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { temp = Player_ActionToMagicSpell(this, actionParam); if (temp >= 0) { if (((actionParam == PLAYER_IA_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || - ((gSaveContext.magicCapacity != 0) && (gSaveContext.magicState == 0) && + ((gSaveContext.magicCapacity != 0) && (gSaveContext.magicState == MAGIC_STATE_IDLE) && (gSaveContext.magic >= sMagicSpellCosts[temp]))) { this->itemAction = actionParam; this->unk_6AD = 4; @@ -4981,7 +4981,7 @@ void func_8083AF44(PlayState* play, Player* this, s32 magicSpell) { func_80835DE4(play, this, func_808507F4, 0); this->unk_84F = magicSpell - 3; - func_80087708(play, sMagicSpellCosts[magicSpell], 4); + Magic_RequestChange(play, sMagicSpellCosts[magicSpell], MAGIC_CONSUME_WAIT_PREVIEW); u8 isFastFarores = CVarGetInteger("gFastFarores", 0) && this->itemAction == PLAYER_IA_FARORES_WIND; @@ -9740,7 +9740,7 @@ void Player_Init(Actor* thisx, PlayState* play2) { } if (gSaveContext.nayrusLoveTimer != 0) { - gSaveContext.magicState = 3; + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; func_80846A00(play, this, 1); this->stateFlags3 &= ~PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } @@ -10666,8 +10666,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { func_80848C74(play, this); } - if ((this->stateFlags3 & PLAYER_STATE3_RESTORE_NAYRUS_LOVE) && (gSaveContext.nayrusLoveTimer != 0) && (gSaveContext.magicState == 0)) { - gSaveContext.magicState = 3; + if ((this->stateFlags3 & PLAYER_STATE3_RESTORE_NAYRUS_LOVE) && (gSaveContext.nayrusLoveTimer != 0) && (gSaveContext.magicState == MAGIC_STATE_IDLE)) { + gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1; func_80846A00(play, this, 1); this->stateFlags3 &= ~PLAYER_STATE3_RESTORE_NAYRUS_LOVE; } @@ -11373,7 +11373,7 @@ void Player_Destroy(Actor* thisx, PlayState* play) { Collider_DestroyQuad(play, &this->meleeWeaponQuads[1]); Collider_DestroyQuad(play, &this->shieldQuad); - func_800876C8(play); + Magic_Reset(play); gSaveContext.linkAge = play->linkAgeOnLoad; @@ -13098,39 +13098,39 @@ void func_8084EAC0(Player* this, PlayState* play) { } if (CVarGetInteger("gBlueManaPercentRestore", 0)) { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { Magic_Fill(play); } - func_80087708(play, + Magic_RequestChange(play, (gSaveContext.magicLevel * 48 * CVarGetInteger("gBluePotionMana", 100) / 100 + 15) / 16 * 16, - 5); + MAGIC_ADD); } else { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { Magic_Fill(play); } - func_80087708(play, CVarGetInteger("gBluePotionMana", 100), 5); + Magic_RequestChange(play, CVarGetInteger("gBluePotionMana", 100), MAGIC_ADD); ; } } else if (CVarGetInteger("gGreenPotionEffect", 0) && this->itemAction == PLAYER_IA_BOTTLE_POTION_GREEN) { if (CVarGetInteger("gGreenPercentRestore", 0)) { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { Magic_Fill(play); } - func_80087708(play, + Magic_RequestChange(play, (gSaveContext.magicLevel * 48 * CVarGetInteger("gGreenPotionMana", 100) / 100 + 15) / 16 * 16, - 5); + MAGIC_ADD); } else { - if (gSaveContext.magicState != 10) { + if (gSaveContext.magicState != MAGIC_STATE_ADD) { Magic_Fill(play); } - func_80087708(play, CVarGetInteger("gGreenPotionMana", 100), 5); + Magic_RequestChange(play, CVarGetInteger("gGreenPotionMana", 100), MAGIC_ADD); ; } } else if (CVarGetInteger("gMilkEffect", 0) && (this->itemAction == PLAYER_IA_BOTTLE_MILK_FULL || @@ -13174,7 +13174,7 @@ void func_8084EAC0(Player* this, PlayState* play) { func_8083C0E8(this, play); func_8005B1A4(Play_GetCamera(play, 0)); } else if (this->unk_850 == 1) { - if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.magicState != 9)) { + if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { func_80832B78(play, this, &gPlayerAnim_link_bottle_drink_demo_end); this->unk_850 = 2; Player_UpdateBottleHeld(play, this, ITEM_BOTTLE, PLAYER_IA_BOTTLE); @@ -13933,7 +13933,7 @@ void func_808507F4(Player* this, PlayState* play) { u8 isFastFarores = CVarGetInteger("gFastFarores", 0) && this->itemAction == PLAYER_IA_FARORES_WIND; if (LinkAnimation_Update(play, &this->skelAnime)) { if (this->unk_84F < 0) { - if ((this->itemAction == PLAYER_IA_NAYRUS_LOVE) || isFastFarores || (gSaveContext.magicState == 0)) { + if ((this->itemAction == PLAYER_IA_NAYRUS_LOVE) || isFastFarores || (gSaveContext.magicState == MAGIC_STATE_IDLE)) { func_80839FFC(this, play); func_8005B1A4(Play_GetCamera(play, 0)); } @@ -13944,10 +13944,10 @@ void func_808507F4(Player* this, PlayState* play) { if (func_80846A00(play, this, this->unk_84F) != NULL) { this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE; if ((this->unk_84F != 0) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { - gSaveContext.magicState = 1; + gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP; } } else { - func_800876C8(play); + Magic_Reset(play); } } else { LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, D_80854A64[this->unk_84F], 0.83f * (isFastFarores ? 2 : 1)); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 630a1159a..12bf9bf17 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -2987,8 +2987,8 @@ void FileChoose_LoadGame(GameState* thisx) { gSaveContext.unk_13EE = 0x32; gSaveContext.nayrusLoveTimer = 0; gSaveContext.healthAccumulator = 0; - gSaveContext.magicState = 0; - gSaveContext.prevMagicState = 0; + gSaveContext.magicState = MAGIC_STATE_IDLE; + gSaveContext.prevMagicState = MAGIC_STATE_IDLE; gSaveContext.forcedSeqId = NA_BGM_GENERAL_SFX; gSaveContext.skyboxTime = 0; gSaveContext.nextTransitionType = 0xFF; diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 642fec066..6651f9316 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -4167,8 +4167,8 @@ void KaleidoScope_Update(PlayState* play) gSaveContext.health = CVarGetInteger("gFullHealthSpawn", 0) ? gSaveContext.healthCapacity : 0x30; Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA); gSaveContext.healthAccumulator = 0; - gSaveContext.magicState = 0; - gSaveContext.prevMagicState = 0; + gSaveContext.magicState = MAGIC_STATE_IDLE; + gSaveContext.prevMagicState = MAGIC_STATE_IDLE; osSyncPrintf(VT_FGCOL(YELLOW)); osSyncPrintf("MAGIC_NOW=%d ", gSaveContext.magic); osSyncPrintf("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget); From c3784b975848108edb1b7d4693d05ea73c2b9e1e Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Fri, 20 Oct 2023 00:14:23 +0100 Subject: [PATCH 31/77] Fix greg as reward logic (#3297) --- .../Enhancements/randomizer/3drando/logic.cpp | 24 +++++++++++-------- .../Enhancements/randomizer/3drando/logic.hpp | 2 ++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp index ddf53824e..51cdebabb 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp @@ -121,7 +121,8 @@ namespace Logic { //Greg bool Greg = false; - bool GregInLogic = false; + bool GregInBridgeLogic = false; + bool GregInLacsLogic = false; //Progressive Items uint8_t ProgressiveBulletBag = 0; @@ -607,22 +608,23 @@ namespace Logic { DungeonCount = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0); HasAllStones = StoneCount == 3; HasAllMedallions = MedallionCount == 6; - GregInLogic = BridgeRewardOptions.Is(BRIDGE_OPTION_GREG) || LACSRewardOptions.Is(LACS_OPTION_GREG); + GregInBridgeLogic = BridgeRewardOptions.Is(BRIDGE_OPTION_GREG); + GregInLacsLogic = LACSRewardOptions.Is(LACS_OPTION_GREG); CanBuildRainbowBridge = Bridge.Is(RAINBOWBRIDGE_OPEN) || (Bridge.Is(RAINBOWBRIDGE_VANILLA) && ShadowMedallion && SpiritMedallion && LightArrows) || - (Bridge.Is(RAINBOWBRIDGE_STONES) && StoneCount + (Greg && GregInLogic ? 1 : 0) >= BridgeStoneCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInLogic ? 1 : 0) >= BridgeMedallionCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount + (Greg && GregInLogic ? 1 : 0) >= BridgeRewardCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= BridgeDungeonCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_STONES) && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeStoneCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeMedallionCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeRewardCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeDungeonCount.Value()) || (Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value()) || (Bridge.Is(RAINBOWBRIDGE_GREG) && Greg); CanTriggerLACS = (LACSCondition == LACSCONDITION_VANILLA && ShadowMedallion && SpiritMedallion) || - (LACSCondition == LACSCONDITION_STONES && StoneCount + (Greg && GregInLogic ? 1 : 0) >= LACSStoneCount.Value()) || - (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount + (Greg && GregInLogic ? 1 : 0) >= LACSMedallionCount.Value()) || - (LACSCondition == LACSCONDITION_REWARDS && StoneCount + MedallionCount + (Greg && GregInLogic ? 1 : 0) >= LACSRewardCount.Value()) || - (LACSCondition == LACSCONDITION_DUNGEONS && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= LACSDungeonCount.Value()) || + (LACSCondition == LACSCONDITION_STONES && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSStoneCount.Value()) || + (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSMedallionCount.Value()) || + (LACSCondition == LACSCONDITION_REWARDS && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSRewardCount.Value()) || + (LACSCondition == LACSCONDITION_DUNGEONS && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSDungeonCount.Value()) || (LACSCondition == LACSCONDITION_TOKENS && GoldSkulltulaTokens >= LACSTokenCount.Value()); CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value(); } @@ -835,6 +837,8 @@ namespace Logic { //Greg Greg = false; + GregInBridgeLogic = false; + GregInLacsLogic = false; //Progressive Items ProgressiveBulletBag = 0; diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp index 4d24fd3ff..21776af5e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp @@ -115,6 +115,8 @@ extern bool LightTrialClear; //Greg extern bool Greg; +extern bool GregInBridgeLogic; +extern bool GregInLacsLogic; // Progression Items extern uint8_t ProgressiveBulletBag; From 35b4357776cec4d042359a6787dad59744e4cd88 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Thu, 19 Oct 2023 20:36:52 -0700 Subject: [PATCH 32/77] Moved `Heaps_Free` outside `Main` after DeinitOTR, and mirrored `Heaps_Alloc` before and outside of `Main`. (#3279) --- soh/src/code/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/soh/src/code/main.c b/soh/src/code/main.c index b59a825c1..9d52833fd 100644 --- a/soh/src/code/main.c +++ b/soh/src/code/main.c @@ -65,8 +65,10 @@ int main(int argc, char** argv) CrashHandlerRegisterCallback(CrashHandler_PrintSohData); BootCommands_Init(); + Heaps_Alloc(); Main(0); DeinitOTR(); + Heaps_Free(); return 0; } @@ -87,7 +89,6 @@ void Main(void* arg) { PreNmiBuff_Init(gAppNmiBufferPtr); Fault_Init(); SysCfb_Init(0); - Heaps_Alloc(); sysHeap = (uintptr_t)gSystemHeap; fb = SysCfb_GetFbPtr(0); gSystemHeapSize = 1024 * 1024 * 4; @@ -156,6 +157,4 @@ void Main(void* arg) { osDestroyThread(&sGraphThread); func_800FBFD8(); osSyncPrintf("mainproc 実行終了\n"); // "End of execution" - - Heaps_Free(); } From e6445e0ce3b71c4db2e3a177054cffee1d3c5930 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:40:10 +0100 Subject: [PATCH 33/77] Age Requirement Docs (#3277) * age req docs * move macros * use decomp names --- soh/include/macros.h | 5 - soh/src/code/z_play.c | 7 +- .../actors/ovl_player_actor/z_player.c | 4 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 8 +- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 14 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 10 ++ .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 143 +++++++++++++++++- 7 files changed, 162 insertions(+), 29 deletions(-) diff --git a/soh/include/macros.h b/soh/include/macros.h index 5157315ac..93f7e17c6 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -292,11 +292,6 @@ extern GraphicsContext* __gfxCtx; #define SEG_ADDR(seg, addr) (addr | (seg << 24) | 1) // #endregion -// #region SOH [Enhancements] -#define CHECK_EQUIPMENT_AGE(i, j) (CVarGetInteger("gTimelessEquipment", 0) || (gEquipAgeReqs[i][j] == 9) || (gEquipAgeReqs[i][j] == ((void)0, gSaveContext.linkAge))) -#define CHECK_SLOT_AGE(slotIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gSlotAgeReqs[slotIndex] == 9) || gSlotAgeReqs[slotIndex] == ((void)0, gSaveContext.linkAge)) -#define CHECK_ITEM_AGE(itemIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gItemAgeReqs[itemIndex] == 9) || (gItemAgeReqs[itemIndex] == gSaveContext.linkAge)) - #define DPAD_ITEM(button) ((gSaveContext.buttonStatus[(button) + 5] != BTN_DISABLED) \ ? gSaveContext.equips.buttonItems[(button) + 4] \ : ITEM_NONE) diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 3181b741c..817c90ecf 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -9,6 +9,7 @@ #include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" #include +#include #include "soh/Enhancements/enhancementTypes.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" @@ -654,12 +655,12 @@ void Play_Init(GameState* thisx) { Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); // In order to keep bunny hood equipped on first load, we need to pre-set the age reqs for the item and slot if ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) { - gItemAgeReqs[ITEM_MASK_BUNNY] = 9; + gItemAgeReqs[ITEM_MASK_BUNNY] = AGE_REQ_NONE; if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) - gSlotAgeReqs[SLOT_TRADE_CHILD] = 9; + gSlotAgeReqs[SLOT_TRADE_CHILD] = AGE_REQ_NONE; } else { - gItemAgeReqs[ITEM_MASK_BUNNY] = gSlotAgeReqs[SLOT_TRADE_CHILD] = 1; + gItemAgeReqs[ITEM_MASK_BUNNY] = gSlotAgeReqs[SLOT_TRADE_CHILD] = AGE_REQ_CHILD; } func_800304DC(play, &play->actorCtx, play->linkActorEntry); diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 5f799227b..f4f465204 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -17,6 +17,7 @@ #include "overlays/actors/ovl_En_Fish/z_en_fish.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" +#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h" #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_link_child/object_link_child.h" #include "textures/icon_item_24_static/icon_item_24_static.h" @@ -12715,8 +12716,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) { equipItem = giEntry.itemId; equipNow = CVarGetInteger("gAskToEquip", 0) && giEntry.modIndex == MOD_NONE && equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA && - ((gItemAgeReqs[equipItem] == 9 || gItemAgeReqs[equipItem] == gSaveContext.linkAge) || - CVarGetInteger("gTimelessEquipment", 0)); + CHECK_AGE_REQ_ITEM(equipItem); Message_StartTextbox(play, giEntry.textId, &this->actor); // RANDOTODO: Macro this boolean check. diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index dd6ea6a16..23c531f15 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -476,7 +476,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { osSyncPrintf("kscope->select_name[Display_Equipment] = %d\n", pauseCtx->cursorItem[PAUSE_EQUIP]); - if (!(CHECK_EQUIPMENT_AGE(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP]))) { + if (!(CHECK_AGE_REQ_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP]))) { pauseCtx->nameColorSet = 1; } @@ -511,7 +511,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { (pauseCtx->unk_1E4 == 0) && CHECK_BTN_ANY(input->press.button, buttonsToCheck) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) { - if (CHECK_EQUIPMENT_AGE(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP])) { + if (CHECK_AGE_REQ_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP])) { if (CHECK_BTN_ALL(input->press.button, BTN_A)) { // Allow Link to remove his equipment from the equipment subscreen by toggling on/off @@ -643,7 +643,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { for (k = 0, temp = rowStart + 1, bit = rowStart, j = point; k < 3; k++, bit++, j += 4, temp++) { if ((gBitFlags[bit] & gSaveContext.inventory.equipment) && (pauseCtx->cursorSpecialPos == 0)) { - if (CHECK_EQUIPMENT_AGE(i, k + 1)) { + if (CHECK_AGE_REQ_EQUIP(i, k + 1)) { if (temp == cursorSlot) { pauseCtx->equipVtx[j].v.ob[0] = pauseCtx->equipVtx[j + 2].v.ob[0] = pauseCtx->equipVtx[j].v.ob[0] - 2; @@ -702,7 +702,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { for (k = 0, bit = rowStart, point = 4; k < 3; k++, point += 4, temp++, bit++) { int itemId = ITEM_SWORD_KOKIRI + temp; - bool age_restricted = !CHECK_ITEM_AGE(itemId); + bool age_restricted = !CHECK_AGE_REQ_ITEM(itemId); if (age_restricted) { gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); gSPGrayscale(POLY_KAL_DISP++, true); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 2fe8fddb7..744606910 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -33,7 +33,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, gDPPipeSync(POLY_KAL_DISP++); - if (!CHECK_SLOT_AGE(SLOT(item))) { + if (!CHECK_AGE_REQ_SLOT(SLOT(item))) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 100, 100, 100, pauseCtx->alpha); } else { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha); @@ -490,7 +490,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { pauseCtx->cursorItem[PAUSE_ITEM] = cursorItem; pauseCtx->cursorSlot[PAUSE_ITEM] = cursorSlot; - if (!CHECK_SLOT_AGE(cursorSlot)) { + if (!CHECK_AGE_REQ_SLOT(cursorSlot)) { pauseCtx->nameColorSet = 1; } @@ -540,8 +540,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { gSlotAgeReqs[SLOT_TRADE_CHILD] = gItemAgeReqs[ITEM_MASK_BUNNY] = ((((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA) && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) && INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) - ? 9 - : 1; + ? AGE_REQ_NONE + : AGE_REQ_CHILD; } if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE) && cursorSlot == SLOT_TRADE_ADULT && CHECK_BTN_ALL(input->press.button, BTN_A)) { @@ -566,7 +566,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } if (CHECK_BTN_ANY(input->press.button, buttonsToCheck)) { - if (CHECK_SLOT_AGE(cursorSlot) && + if (CHECK_AGE_REQ_SLOT(cursorSlot) && (cursorItem != ITEM_SOLD_OUT) && (cursorItem != ITEM_NONE)) { KaleidoScope_SetupItemEquip(play, cursorItem, cursorSlot, pauseCtx->itemVtx[index].v.ob[0] * 10, @@ -618,7 +618,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { if (gSaveContext.inventory.items[i] != ITEM_NONE) { if ((pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_ITEM) && (pauseCtx->cursorSpecialPos == 0)) { - if (CHECK_SLOT_AGE(i)) { + if (CHECK_AGE_REQ_SLOT(i)) { if ((sEquipState == 2) && (i == 3)) { gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, magicArrowEffectsR[pauseCtx->equipTargetItem - 0xBF], magicArrowEffectsG[pauseCtx->equipTargetItem - 0xBF], @@ -653,7 +653,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { gSPVertex(POLY_KAL_DISP++, &pauseCtx->itemVtx[j + 0], 4, 0); int itemId = gSaveContext.inventory.items[i]; - bool not_acquired = !CHECK_ITEM_AGE(itemId); + bool not_acquired = !CHECK_AGE_REQ_ITEM(itemId); if (not_acquired) { gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); gSPGrayscale(POLY_KAL_DISP++, true); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index a3c97d9b2..6f4ed7ad2 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -8,9 +8,19 @@ extern u8 gAmmoItems[]; extern s16 D_8082AAEC[]; extern s16 D_8082AB2C[]; extern u8 gEquipAgeReqs[][4]; +extern u8 gSlotAgeReqs[]; +extern u8 gItemAgeReqs[]; extern u8 gAreaGsFlags[]; extern bool gSelectingMask; +#define AGE_REQ_ADULT LINK_AGE_ADULT +#define AGE_REQ_CHILD LINK_AGE_CHILD +#define AGE_REQ_NONE 9 + +#define CHECK_AGE_REQ_EQUIP(i, j) (CVarGetInteger("gTimelessEquipment", 0) || (gEquipAgeReqs[i][j] == AGE_REQ_NONE) || (gEquipAgeReqs[i][j] == ((void)0, gSaveContext.linkAge))) +#define CHECK_AGE_REQ_SLOT(slotIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gSlotAgeReqs[slotIndex] == AGE_REQ_NONE) || gSlotAgeReqs[slotIndex] == ((void)0, gSaveContext.linkAge)) +#define CHECK_AGE_REQ_ITEM(itemIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gItemAgeReqs[itemIndex] == AGE_REQ_NONE) || (gItemAgeReqs[itemIndex] == gSaveContext.linkAge)) + void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx); s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point); void KaleidoScope_DrawDebugEditor(PlayState* play); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 6651f9316..1229da3c3 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -734,20 +734,147 @@ static u16 D_8082ABEC[] = { }; u8 gSlotAgeReqs[] = { - 1, 9, 9, 0, 0, 9, 1, 9, 9, 0, 0, 9, 1, 9, 1, 0, 0, 9, 9, 9, 9, 9, 0, 1, + AGE_REQ_CHILD, // SLOT_DEKU_STICK + AGE_REQ_NONE, // SLOT_DEKU_NUT + AGE_REQ_NONE, // SLOT_BOMB + AGE_REQ_ADULT, // SLOT_BOW + AGE_REQ_ADULT, // SLOT_ARROW_FIRE + AGE_REQ_NONE, // SLOT_DINS_FIRE + AGE_REQ_CHILD, // SLOT_SLINGSHOT + AGE_REQ_NONE, // SLOT_OCARINA + AGE_REQ_NONE, // SLOT_BOMBCHU + AGE_REQ_ADULT, // SLOT_HOOKSHOT + AGE_REQ_ADULT, // SLOT_ARROW_ICE + AGE_REQ_NONE, // SLOT_FARORES_WIND + AGE_REQ_CHILD, // SLOT_BOOMERANG + AGE_REQ_NONE, // SLOT_LENS_OF_TRUTH + AGE_REQ_CHILD, // SLOT_MAGIC_BEAN + AGE_REQ_ADULT, // SLOT_HAMMER + AGE_REQ_ADULT, // SLOT_ARROW_LIGHT + AGE_REQ_NONE, // SLOT_NAYRUS_LOVE + AGE_REQ_NONE, // SLOT_BOTTLE_1 + AGE_REQ_NONE, // SLOT_BOTTLE_2 + AGE_REQ_NONE, // SLOT_BOTTLE_3 + AGE_REQ_NONE, // SLOT_BOTTLE_4 + AGE_REQ_ADULT, // SLOT_TRADE_ADULT + AGE_REQ_CHILD, // SLOT_TRADE_CHILD }; u8 gEquipAgeReqs[][4] = { - { 0, 1, 0, 0 }, - { 9, 1, 9, 0 }, - { 0, 9, 0, 0 }, - { 9, 9, 0, 0 }, + { + AGE_REQ_ADULT, // 0 UPG_QUIVER + AGE_REQ_CHILD, // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_KOKIRI + AGE_REQ_ADULT, // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_MASTER + AGE_REQ_ADULT // EQUIP_TYPE_SWORD EQUIP_VALUE_SWORD_BIGGORON + }, + { + AGE_REQ_NONE, // 0 UPG_BOMB_BAG + AGE_REQ_CHILD, // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_DEKU + AGE_REQ_NONE, // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_HYLIAN + AGE_REQ_ADULT // EQUIP_TYPE_SHIELD EQUIP_VALUE_SHIELD_MIRROR + }, + { + AGE_REQ_ADULT, // 0 UPG_STRENGTH + AGE_REQ_NONE, // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_KOKIRI + AGE_REQ_ADULT, // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_GORON + AGE_REQ_ADULT // EQUIP_TYPE_TUNIC EQUIP_VALUE_TUNIC_ZORA + }, + { + AGE_REQ_NONE, // 0 UPG_SCALE + AGE_REQ_NONE, // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_KOKIRI + AGE_REQ_ADULT, // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_IRON + AGE_REQ_ADULT // EQUIP_TYPE_BOOTS EQUIP_VALUE_BOOTS_HOVER + }, + }; u8 gItemAgeReqs[] = { - 1, 9, 9, 0, 0, 9, 1, 9, 9, 9, 0, 0, 0, 9, 1, 9, 1, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 1, 9, 0, 9, 0, 0, 9, 0, 0, 1, 1, 1, 0, 0, 0, 9, 9, 9, 1, 0, 0, 9, 9, 0, + AGE_REQ_CHILD, // ITEM_DEKU_STICK + AGE_REQ_NONE, // ITEM_DEKU_NUT + AGE_REQ_NONE, // ITEM_BOMB + AGE_REQ_ADULT, // ITEM_BOW + AGE_REQ_ADULT, // ITEM_ARROW_FIRE + AGE_REQ_NONE, // ITEM_DINS_FIRE + AGE_REQ_CHILD, // ITEM_SLINGSHOT + AGE_REQ_NONE, // ITEM_OCARINA_FAIRY + AGE_REQ_NONE, // ITEM_OCARINA_OF_TIME + AGE_REQ_NONE, // ITEM_BOMBCHU + AGE_REQ_ADULT, // ITEM_HOOKSHOT + AGE_REQ_ADULT, // ITEM_LONGSHOT + AGE_REQ_ADULT, // ITEM_ARROW_ICE + AGE_REQ_NONE, // ITEM_FARORES_WIND + AGE_REQ_CHILD, // ITEM_BOOMERANG + AGE_REQ_NONE, // ITEM_LENS_OF_TRUTH + AGE_REQ_CHILD, // ITEM_MAGIC_BEAN + AGE_REQ_ADULT, // ITEM_HAMMER + AGE_REQ_ADULT, // ITEM_ARROW_LIGHT + AGE_REQ_NONE, // ITEM_NAYRUS_LOVE + AGE_REQ_NONE, // ITEM_BOTTLE_EMPTY + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_RED + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_GREEN + AGE_REQ_NONE, // ITEM_BOTTLE_POTION_BLUE + AGE_REQ_NONE, // ITEM_BOTTLE_FAIRY + AGE_REQ_NONE, // ITEM_BOTTLE_FISH + AGE_REQ_NONE, // ITEM_BOTTLE_MILK_FULL + AGE_REQ_NONE, // ITEM_BOTTLE_RUTOS_LETTER + AGE_REQ_NONE, // ITEM_BOTTLE_BLUE_FIRE + AGE_REQ_NONE, // ITEM_BOTTLE_BUG + AGE_REQ_NONE, // ITEM_BOTTLE_BIG_POE + AGE_REQ_NONE, // ITEM_BOTTLE_MILK_HALF + AGE_REQ_NONE, // ITEM_BOTTLE_POE + AGE_REQ_CHILD, // ITEM_WEIRD_EGG + AGE_REQ_CHILD, // ITEM_CHICKEN + AGE_REQ_CHILD, // ITEM_ZELDAS_LETTER + AGE_REQ_CHILD, // ITEM_MASK_KEATON + AGE_REQ_CHILD, // ITEM_MASK_SKULL + AGE_REQ_CHILD, // ITEM_MASK_SPOOKY + AGE_REQ_CHILD, // ITEM_MASK_BUNNY_HOOD + AGE_REQ_CHILD, // ITEM_MASK_GORON + AGE_REQ_CHILD, // ITEM_MASK_ZORA + AGE_REQ_CHILD, // ITEM_MASK_GERUDO + AGE_REQ_CHILD, // ITEM_MASK_TRUTH + AGE_REQ_CHILD, // ITEM_SOLD_OUT + AGE_REQ_ADULT, // ITEM_POCKET_EGG + AGE_REQ_ADULT, // ITEM_POCKET_CUCCO + AGE_REQ_ADULT, // ITEM_COJIRO + AGE_REQ_ADULT, // ITEM_ODD_MUSHROOM + AGE_REQ_ADULT, // ITEM_ODD_POTION + AGE_REQ_ADULT, // ITEM_POACHERS_SAW + AGE_REQ_ADULT, // ITEM_BROKEN_GORONS_SWORD + AGE_REQ_ADULT, // ITEM_PRESCRIPTION + AGE_REQ_ADULT, // ITEM_EYEBALL_FROG + AGE_REQ_ADULT, // ITEM_EYE_DROPS + AGE_REQ_ADULT, // ITEM_CLAIM_CHECK + AGE_REQ_ADULT, // ITEM_BOW_FIRE + AGE_REQ_ADULT, // ITEM_BOW_ICE + AGE_REQ_ADULT, // ITEM_BOW_LIGHT + AGE_REQ_CHILD, // ITEM_SWORD_KOKIRI + AGE_REQ_ADULT, // ITEM_SWORD_MASTER + AGE_REQ_ADULT, // ITEM_SWORD_BIGGORON + AGE_REQ_CHILD, // ITEM_SHIELD_DEKU + AGE_REQ_NONE, // ITEM_SHIELD_HYLIAN + AGE_REQ_ADULT, // ITEM_SHIELD_MIRROR + AGE_REQ_NONE, // ITEM_TUNIC_KOKIRI + AGE_REQ_ADULT, // ITEM_TUNIC_GORON + AGE_REQ_ADULT, // ITEM_TUNIC_ZORA + AGE_REQ_NONE, // ITEM_BOOTS_KOKIRI + AGE_REQ_ADULT, // ITEM_BOOTS_IRON + AGE_REQ_ADULT, // ITEM_BOOTS_HOVER + AGE_REQ_CHILD, // ITEM_BULLET_BAG_30 + AGE_REQ_CHILD, // ITEM_BULLET_BAG_40 + AGE_REQ_CHILD, // ITEM_BULLET_BAG_50 + AGE_REQ_ADULT, // ITEM_QUIVER_30 + AGE_REQ_ADULT, // ITEM_QUIVER_40 + AGE_REQ_ADULT, // ITEM_QUIVER_50 + AGE_REQ_NONE, // ITEM_BOMB_BAG_20 + AGE_REQ_NONE, // ITEM_BOMB_BAG_30 + AGE_REQ_NONE, // ITEM_BOMB_BAG_40 + AGE_REQ_CHILD, // ITEM_STRENGTH_GORONS_BRACELET + AGE_REQ_ADULT, // ITEM_STRENGTH_SILVER_GAUNTLETS + AGE_REQ_ADULT, // ITEM_STRENGTH_GOLD_GAUNTLETS + AGE_REQ_NONE, // ITEM_SCALE_SILVER + AGE_REQ_NONE, // ITEM_SCALE_GOLDEN + AGE_REQ_ADULT, // ITEM_GIANTS_KNIFE }; u8 gAreaGsFlags[] = { From c61f519f17fa0975f5fc0fc569925ee1702d2891 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 20 Oct 2023 20:23:41 -0400 Subject: [PATCH 34/77] move soh assets out of otrexporter --- .../custom}/accessibility/texts/filechoose_eng.json | 0 .../custom}/accessibility/texts/filechoose_fra.json | 0 .../custom}/accessibility/texts/filechoose_ger.json | 0 .../accessibility/texts/kaleidoscope_eng.json | 0 .../accessibility/texts/kaleidoscope_fra.json | 0 .../accessibility/texts/kaleidoscope_ger.json | 0 .../custom}/accessibility/texts/misc_eng.json | 0 .../custom}/accessibility/texts/misc_fra.json | 0 .../custom}/accessibility/texts/misc_ger.json | 0 .../custom}/accessibility/texts/scenes_eng.json | 0 .../custom}/accessibility/texts/scenes_fra.json | 0 .../custom}/accessibility/texts/scenes_ger.json | 0 .../assets/custom}/fonts/Fipps-Regular.otf | Bin .../assets/custom}/fonts/PressStart2P-Regular.ttf | Bin .../helpers/cosmetics/gEndGrayscaleAndEndDlistDL | 0 .../gChristmasGreenTreasureChestFrontTex.rgb5a1.png | Bin ...istmasGreenTreasureChestSideAndTopTex.rgb5a1.png | Bin .../gChristmasRedTreasureChestFrontTex.rgb5a1.png | Bin ...hristmasRedTreasureChestSideAndTopTex.rgb5a1.png | Bin .../gGoldTreasureChestFrontTex.rgb5a1.png | Bin .../gGoldTreasureChestSideAndTopTex.rgb5a1.png | Bin .../object_box/gKeyTreasureChestFrontTex.rgb5a1.png | Bin .../gKeyTreasureChestSideAndTopTex.rgb5a1.png | Bin .../gSkullTreasureChestFrontTex.rgb5a1.png | Bin .../gSkullTreasureChestSideAndTopTex.rgb5a1.png | Bin .../object_mag/gTitleBossRushSubtitleTex.rgba32.png | Bin .../gTitleRandomizerSubtitleTex.rgba32.png | Bin .../gTriforcePieceCompletedDL | 0 .../gTriforcePieceCompletedDL_tri_0 | 0 .../gTriforcePieceCompletedDL_tri_1 | 0 .../gTriforcePieceCompletedDL_vtx_0 | 0 .../gTriforcePieceCompletedDL_vtx_1 | 0 ...gTriforcePieceCompletedDL_f3dlite_triforce_edges | 0 ...riforcePieceCompletedDL_f3dlite_triforce_surface | 0 .../objects/object_triforce_completed/noise_tex | Bin .../object_triforce_piece_0/gTriforcePiece0DL | 0 .../object_triforce_piece_0/gTriforcePiece0DL_tri_0 | 0 .../object_triforce_piece_0/gTriforcePiece0DL_tri_1 | 0 .../object_triforce_piece_0/gTriforcePiece0DL_tri_2 | 0 .../object_triforce_piece_0/gTriforcePiece0DL_vtx_0 | 0 .../object_triforce_piece_0/gTriforcePiece0DL_vtx_1 | 0 .../object_triforce_piece_0/gTriforcePiece0DL_vtx_2 | 0 .../mat_gTriforcePiece0DL_f3dlite_shard_edge | 0 .../mat_gTriforcePiece0DL_f3dlite_triforce_edges | 0 .../mat_gTriforcePiece0DL_f3dlite_triforce_surface | 0 .../objects/object_triforce_piece_0/noise_tex | Bin .../object_triforce_piece_1/gTriforcePiece1DL | 0 .../object_triforce_piece_1/gTriforcePiece1DL_tri_0 | 0 .../object_triforce_piece_1/gTriforcePiece1DL_tri_1 | 0 .../object_triforce_piece_1/gTriforcePiece1DL_vtx_0 | 0 .../object_triforce_piece_1/gTriforcePiece1DL_vtx_1 | 0 .../mat_gTriforcePiece1DL_f3dlite_shard_edge | 0 .../mat_gTriforcePiece1DL_f3dlite_triforce_surface | 0 .../objects/object_triforce_piece_1/noise_tex | Bin .../object_triforce_piece_2/gTriforcePiece2DL | 0 .../object_triforce_piece_2/gTriforcePiece2DL_tri_0 | 0 .../object_triforce_piece_2/gTriforcePiece2DL_tri_1 | 0 .../object_triforce_piece_2/gTriforcePiece2DL_tri_2 | 0 .../object_triforce_piece_2/gTriforcePiece2DL_vtx_0 | 0 .../object_triforce_piece_2/gTriforcePiece2DL_vtx_1 | 0 .../object_triforce_piece_2/gTriforcePiece2DL_vtx_2 | 0 .../mat_gTriforcePiece2DL_f3dlite_shard_edge | 0 .../mat_gTriforcePiece2DL_f3dlite_triforce_edges | 0 .../mat_gTriforcePiece2DL_f3dlite_triforce_surface | 0 .../objects/object_triforce_piece_2/noise_tex | Bin .../custom}/scenes/nonmq/syotes_scene/syotes_room_0 | Bin .../assets/custom}/textures/buttons/ABtn.png | Bin .../assets/custom}/textures/buttons/BBtn.png | Bin .../assets/custom}/textures/buttons/CDown.png | Bin .../assets/custom}/textures/buttons/CLeft.png | Bin .../assets/custom}/textures/buttons/CRight.png | Bin .../assets/custom}/textures/buttons/CUp.png | Bin .../assets/custom}/textures/buttons/LBtn.png | Bin .../assets/custom}/textures/buttons/RBtn.png | Bin .../assets/custom}/textures/buttons/StartBtn.png | Bin .../assets/custom}/textures/buttons/ZBtn.png | Bin .../assets/custom}/textures/icons/gIcon.png | Bin .../custom}/textures/nintendo_rogo_static/SoHShiny | Bin .../textures/nintendo_rogo_static/gShipLogoDL | 0 .../textures/nintendo_rogo_static/gShipLogoDL_tri_0 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_tri_1 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_tri_2 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_tri_3 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_vtx_0 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_vtx_1 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_vtx_2 | 0 .../textures/nintendo_rogo_static/gShipLogoDL_vtx_3 | 0 .../mat_gShipLogoDL_f3d_material | 0 .../mat_gShipLogoDL_f3d_material_001 | 0 .../mat_gShipLogoDL_f3d_material_002 | 0 .../mat_gShipLogoDL_f3d_material_003 | 0 .../mat_revert_gShipLogoDL_f3d_material | 0 .../mat_revert_gShipLogoDL_f3d_material_001 | 0 .../mat_revert_gShipLogoDL_f3d_material_002 | 0 .../mat_revert_gShipLogoDL_f3d_material_003 | 0 .../nintendo_rogo_static_Tex_LUS_000000 | Bin .../textures/parameter_static/gArrowDown.ia16.png | Bin .../textures/parameter_static/gArrowUp.ia16.png | Bin .../textures/parameter_static/gDPad.ia16.png | Bin .../parameter_static/gTriforcePiece.rgba32.png | Bin .../gFileSelBossRushSettingsENGTex.ia8.png | Bin .../gFileSelBossRushSettingsFRATex.ia8.png | Bin .../gFileSelBossRushSettingsGERTex.ia8.png | Bin .../title_static/gFileSelMQButtonTex.ia16.png | Bin .../gFileSelPleaseChooseAQuestENGTex.ia8.png | Bin .../gFileSelPleaseChooseAQuestFRATex.ia8.png | Bin .../gFileSelPleaseChooseAQuestGERTex.ia8.png | Bin .../title_static/gFileSelRANDButtonTex.ia16.png | Bin .../textures/virtual/gEmptyTexture.rgba32.png | Bin 109 files changed, 0 insertions(+), 0 deletions(-) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/filechoose_eng.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/filechoose_fra.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/filechoose_ger.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/kaleidoscope_eng.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/kaleidoscope_fra.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/kaleidoscope_ger.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/misc_eng.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/misc_fra.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/misc_ger.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/scenes_eng.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/scenes_fra.json (100%) rename {OTRExporter/assets => soh/assets/custom}/accessibility/texts/scenes_ger.json (100%) rename {OTRExporter/assets => soh/assets/custom}/fonts/Fipps-Regular.otf (100%) rename {OTRExporter/assets => soh/assets/custom}/fonts/PressStart2P-Regular.ttf (100%) rename {OTRExporter/assets => soh/assets/custom}/helpers/cosmetics/gEndGrayscaleAndEndDlistDL (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/gTriforcePieceCompletedDL (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_completed/noise_tex (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_0/noise_tex (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/gTriforcePiece1DL (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_1/noise_tex (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface (100%) rename {OTRExporter/assets => soh/assets/custom}/objects/object_triforce_piece_2/noise_tex (100%) rename {OTRExporter/assets => soh/assets/custom}/scenes/nonmq/syotes_scene/syotes_room_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/ABtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/BBtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/CDown.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/CLeft.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/CRight.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/CUp.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/LBtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/RBtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/StartBtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/buttons/ZBtn.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/icons/gIcon.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/SoHShiny (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_tri_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_tri_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_tri_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_tri_3 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/parameter_static/gArrowDown.ia16.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/parameter_static/gArrowUp.ia16.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/parameter_static/gDPad.ia16.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/parameter_static/gTriforcePiece.rgba32.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelMQButtonTex.ia16.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/title_static/gFileSelRANDButtonTex.ia16.png (100%) rename {OTRExporter/assets => soh/assets/custom}/textures/virtual/gEmptyTexture.rgba32.png (100%) diff --git a/OTRExporter/assets/accessibility/texts/filechoose_eng.json b/soh/assets/custom/accessibility/texts/filechoose_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_eng.json rename to soh/assets/custom/accessibility/texts/filechoose_eng.json diff --git a/OTRExporter/assets/accessibility/texts/filechoose_fra.json b/soh/assets/custom/accessibility/texts/filechoose_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_fra.json rename to soh/assets/custom/accessibility/texts/filechoose_fra.json diff --git a/OTRExporter/assets/accessibility/texts/filechoose_ger.json b/soh/assets/custom/accessibility/texts/filechoose_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_ger.json rename to soh/assets/custom/accessibility/texts/filechoose_ger.json diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_eng.json diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_fra.json diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_ger.json diff --git a/OTRExporter/assets/accessibility/texts/misc_eng.json b/soh/assets/custom/accessibility/texts/misc_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_eng.json rename to soh/assets/custom/accessibility/texts/misc_eng.json diff --git a/OTRExporter/assets/accessibility/texts/misc_fra.json b/soh/assets/custom/accessibility/texts/misc_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_fra.json rename to soh/assets/custom/accessibility/texts/misc_fra.json diff --git a/OTRExporter/assets/accessibility/texts/misc_ger.json b/soh/assets/custom/accessibility/texts/misc_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_ger.json rename to soh/assets/custom/accessibility/texts/misc_ger.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_eng.json b/soh/assets/custom/accessibility/texts/scenes_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_eng.json rename to soh/assets/custom/accessibility/texts/scenes_eng.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_fra.json b/soh/assets/custom/accessibility/texts/scenes_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_fra.json rename to soh/assets/custom/accessibility/texts/scenes_fra.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_ger.json b/soh/assets/custom/accessibility/texts/scenes_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_ger.json rename to soh/assets/custom/accessibility/texts/scenes_ger.json diff --git a/OTRExporter/assets/fonts/Fipps-Regular.otf b/soh/assets/custom/fonts/Fipps-Regular.otf similarity index 100% rename from OTRExporter/assets/fonts/Fipps-Regular.otf rename to soh/assets/custom/fonts/Fipps-Regular.otf diff --git a/OTRExporter/assets/fonts/PressStart2P-Regular.ttf b/soh/assets/custom/fonts/PressStart2P-Regular.ttf similarity index 100% rename from OTRExporter/assets/fonts/PressStart2P-Regular.ttf rename to soh/assets/custom/fonts/PressStart2P-Regular.ttf diff --git a/OTRExporter/assets/helpers/cosmetics/gEndGrayscaleAndEndDlistDL b/soh/assets/custom/helpers/cosmetics/gEndGrayscaleAndEndDlistDL similarity index 100% rename from OTRExporter/assets/helpers/cosmetics/gEndGrayscaleAndEndDlistDL rename to soh/assets/custom/helpers/cosmetics/gEndGrayscaleAndEndDlistDL diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png b/soh/assets/custom/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png similarity index 100% rename from OTRExporter/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png rename to soh/assets/custom/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png diff --git a/OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png b/soh/assets/custom/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png similarity index 100% rename from OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png rename to soh/assets/custom/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_completed/noise_tex b/soh/assets/custom/objects/object_triforce_completed/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/noise_tex rename to soh/assets/custom/objects/object_triforce_completed/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/noise_tex b/soh/assets/custom/objects/object_triforce_piece_0/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_0/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/noise_tex b/soh/assets/custom/objects/object_triforce_piece_1/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_1/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/noise_tex b/soh/assets/custom/objects/object_triforce_piece_2/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_2/noise_tex diff --git a/OTRExporter/assets/scenes/nonmq/syotes_scene/syotes_room_0 b/soh/assets/custom/scenes/nonmq/syotes_scene/syotes_room_0 similarity index 100% rename from OTRExporter/assets/scenes/nonmq/syotes_scene/syotes_room_0 rename to soh/assets/custom/scenes/nonmq/syotes_scene/syotes_room_0 diff --git a/OTRExporter/assets/textures/buttons/ABtn.png b/soh/assets/custom/textures/buttons/ABtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/ABtn.png rename to soh/assets/custom/textures/buttons/ABtn.png diff --git a/OTRExporter/assets/textures/buttons/BBtn.png b/soh/assets/custom/textures/buttons/BBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/BBtn.png rename to soh/assets/custom/textures/buttons/BBtn.png diff --git a/OTRExporter/assets/textures/buttons/CDown.png b/soh/assets/custom/textures/buttons/CDown.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CDown.png rename to soh/assets/custom/textures/buttons/CDown.png diff --git a/OTRExporter/assets/textures/buttons/CLeft.png b/soh/assets/custom/textures/buttons/CLeft.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CLeft.png rename to soh/assets/custom/textures/buttons/CLeft.png diff --git a/OTRExporter/assets/textures/buttons/CRight.png b/soh/assets/custom/textures/buttons/CRight.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CRight.png rename to soh/assets/custom/textures/buttons/CRight.png diff --git a/OTRExporter/assets/textures/buttons/CUp.png b/soh/assets/custom/textures/buttons/CUp.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CUp.png rename to soh/assets/custom/textures/buttons/CUp.png diff --git a/OTRExporter/assets/textures/buttons/LBtn.png b/soh/assets/custom/textures/buttons/LBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/LBtn.png rename to soh/assets/custom/textures/buttons/LBtn.png diff --git a/OTRExporter/assets/textures/buttons/RBtn.png b/soh/assets/custom/textures/buttons/RBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/RBtn.png rename to soh/assets/custom/textures/buttons/RBtn.png diff --git a/OTRExporter/assets/textures/buttons/StartBtn.png b/soh/assets/custom/textures/buttons/StartBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/StartBtn.png rename to soh/assets/custom/textures/buttons/StartBtn.png diff --git a/OTRExporter/assets/textures/buttons/ZBtn.png b/soh/assets/custom/textures/buttons/ZBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/ZBtn.png rename to soh/assets/custom/textures/buttons/ZBtn.png diff --git a/OTRExporter/assets/textures/icons/gIcon.png b/soh/assets/custom/textures/icons/gIcon.png similarity index 100% rename from OTRExporter/assets/textures/icons/gIcon.png rename to soh/assets/custom/textures/icons/gIcon.png diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/SoHShiny b/soh/assets/custom/textures/nintendo_rogo_static/SoHShiny similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/SoHShiny rename to soh/assets/custom/textures/nintendo_rogo_static/SoHShiny diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 b/soh/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 rename to soh/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 diff --git a/OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png b/soh/assets/custom/textures/parameter_static/gArrowDown.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png rename to soh/assets/custom/textures/parameter_static/gArrowDown.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png b/soh/assets/custom/textures/parameter_static/gArrowUp.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png rename to soh/assets/custom/textures/parameter_static/gArrowUp.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gDPad.ia16.png b/soh/assets/custom/textures/parameter_static/gDPad.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gDPad.ia16.png rename to soh/assets/custom/textures/parameter_static/gDPad.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gTriforcePiece.rgba32.png b/soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gTriforcePiece.rgba32.png rename to soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png b/soh/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png rename to soh/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png b/soh/assets/custom/textures/title_static/gFileSelRANDButtonTex.ia16.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png rename to soh/assets/custom/textures/title_static/gFileSelRANDButtonTex.ia16.png diff --git a/OTRExporter/assets/textures/virtual/gEmptyTexture.rgba32.png b/soh/assets/custom/textures/virtual/gEmptyTexture.rgba32.png similarity index 100% rename from OTRExporter/assets/textures/virtual/gEmptyTexture.rgba32.png rename to soh/assets/custom/textures/virtual/gEmptyTexture.rgba32.png From 2eaed8d81ea2586a8a4112f17bd3a88d3c7882db Mon Sep 17 00:00:00 2001 From: Ralphie Morell Date: Sat, 21 Oct 2023 21:51:37 -0400 Subject: [PATCH 35/77] Rando: Master Sword Shuffle (#2981) * The mother of all commits * Removed `GI_SWORD_MASTER`; "Master Sword" Items now actually give MS * Removed dupe MS entries in item pool; updated GIMESSAGE (should stop crashing on non-Windows); re-added MS in item list * Give Adult Link a freebie with shuffle MS on; cihld -> adult no longer gives MS; ToT Master Sword now gives correct item * add master sword GI draw func based on ToT MS object * Force `MasterSword` logic var to only update upon getting MS * Dorf funny line now activates with LA and MS in inv * Apply suggestions * Updated RAND_INF; Check Tracker changes; Gave RAND_INF and ice trap logic to ToT MS check; Fixed swordless behavior for HBA/fishing * ToT MS Check now works in check tracker; Visual bug where box hovers over non-existent MS gone; Fixed RAND_INF check with ToT MS pedestal; Ganon no longer gives free MS * adult equips no longer reset in MS shuffle * Apply (most) locacc review suggestions Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> * Reorganized swordless check for interface to fit edge cases; getting master sword no longer highlights box * Edge case for BGS but no bow * Fix implicit declaration error for GI hooks (#9) * Adjusted `CanAdultAttack/Damage`; applied logic suggestions * Fixed build errors (hopefully) * Cleanup merge * get shit working again * Tidied up remaining uses of DD flag as rando indicator * make master sword invisible and fix ms flag (#10) * Add text to sheik if go mode is obtained but barrier is still up * overhaul swordless behavior in `func_80083108` * reworked ToT MS Check to have an actual GI * suggestions * Apply suggestions * Better swordless handling with temp B (#11) * better swordless handling with temp B * prevent auto save in fishing pond * prevent auto save during bombchu bowling * enum fix --------- Co-authored-by: Adam Bird Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: RaelCappra Co-authored-by: Adam Bird --- soh/include/functions.h | 9 +- soh/include/z64save.h | 6 +- .../Enhancements/debugger/debugSaveEditor.h | 2 + soh/soh/Enhancements/mods.cpp | 7 +- .../randomizer/3drando/hint_list.cpp | 14 +++ .../hint_list/hint_list_exclude_overworld.cpp | 4 + .../Enhancements/randomizer/3drando/hints.cpp | 35 ++++++++ .../Enhancements/randomizer/3drando/hints.hpp | 6 ++ .../randomizer/3drando/item_list.cpp | 2 +- .../randomizer/3drando/item_location.cpp | 3 +- .../randomizer/3drando/item_location.hpp | 5 ++ .../randomizer/3drando/item_pool.cpp | 14 ++- .../Enhancements/randomizer/3drando/keys.hpp | 2 + .../location_access/locacc_castle_town.cpp | 1 + .../location_access/locacc_death_mountain.cpp | 2 +- .../location_access/locacc_deku_tree.cpp | 43 ++++----- .../locacc_dodongos_cavern.cpp | 26 +++--- .../location_access/locacc_fire_temple.cpp | 29 ++++--- .../location_access/locacc_forest_temple.cpp | 68 +++++++-------- .../location_access/locacc_ganons_castle.cpp | 36 ++++---- .../locacc_gerudo_training_grounds.cpp | 40 ++++----- .../location_access/locacc_gerudo_valley.cpp | 14 +-- .../location_access/locacc_hyrule_field.cpp | 2 +- .../location_access/locacc_ice_cavern.cpp | 18 ++-- .../locacc_jabujabus_belly.cpp | 4 +- .../location_access/locacc_kakariko.cpp | 4 +- .../location_access/locacc_lost_woods.cpp | 10 +-- .../location_access/locacc_shadow_temple.cpp | 39 +++++---- .../location_access/locacc_spirit_temple.cpp | 18 ++-- .../location_access/locacc_water_temple.cpp | 13 +-- .../location_access/locacc_zoras_domain.cpp | 2 +- .../Enhancements/randomizer/3drando/logic.cpp | 15 ++-- .../Enhancements/randomizer/3drando/logic.hpp | 2 + .../randomizer/3drando/settings.cpp | 46 +++++----- .../randomizer/3drando/settings.hpp | 1 + .../Enhancements/randomizer/3drando/shops.cpp | 6 +- .../randomizer/3drando/spoiler_log.cpp | 1 + .../randomizer/3drando/spoiler_log.hpp | 1 + soh/soh/Enhancements/randomizer/draw.cpp | 23 ++++- soh/soh/Enhancements/randomizer/draw.h | 2 +- .../Enhancements/randomizer/randomizer.cpp | 54 ++++++++++-- .../Enhancements/randomizer/randomizerTypes.h | 3 + .../randomizer/randomizer_check_objects.cpp | 32 +------ .../randomizer/randomizer_check_tracker.cpp | 6 ++ .../randomizer/randomizer_entrance.c | 1 + .../Enhancements/randomizer/randomizer_inf.h | 3 +- soh/soh/Enhancements/randomizer/savefile.cpp | 6 ++ soh/soh/OTRGlobals.cpp | 3 +- soh/src/code/z_game_over.c | 1 + soh/src/code/z_parameter.c | 87 ++++++++++++++++--- soh/src/code/z_play.c | 27 +++--- soh/src/code/z_sram.c | 10 ++- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 9 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 17 ++++ .../overlays/actors/ovl_Fishing/z_fishing.c | 10 --- .../actors/ovl_player_actor/z_player.c | 21 +++-- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 3 + 57 files changed, 558 insertions(+), 310 deletions(-) diff --git a/soh/include/functions.h b/soh/include/functions.h index e75777c87..3a1aa8ae2 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -2449,13 +2449,18 @@ void Heaps_Free(void); CollisionHeader* BgCheck_GetCollisionHeader(CollisionContext* colCtx, s32 bgId); -void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH); - // Exposing these methods to leverage them from the file select screen to render messages void Message_OpenText(PlayState* play, u16 textId); void Message_Decode(PlayState* play); void Message_DrawText(PlayState* play, Gfx** gfxP); +// #region SOH [General] + +void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH); +void Interface_RandoRestoreSwordless(void); + +// #endregion + #ifdef __cplusplus #undef this }; diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 4b87a179a..9458f28c7 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -289,7 +289,6 @@ typedef struct { /* */ u8 mqDungeonCount; /* */ u8 pendingIceTrapCount; /* */ SohStats sohStats; - /* */ u8 temporaryWeapon; /* */ FaroresWindData backupFW; /* */ RandomizerCheckTrackerData checkTrackerData[RC_MAX]; // #endregion @@ -302,11 +301,11 @@ typedef struct { /* */ char childAltarText[250]; /* */ char adultAltarText[750]; /* */ RandomizerCheck rewardCheck[9]; - /* */ char ganonHintText[150]; + /* */ char ganonHintText[300]; /* */ char gregHintText[250]; /* */ char ganonText[250]; /* */ char dampeText[150]; - /* */ char sheikText[150]; + /* */ char sheikText[200]; /* */ char sariaText[150]; /* */ char warpMinuetText[100]; /* */ char warpBoleroText[100]; @@ -314,6 +313,7 @@ typedef struct { /* */ char warpRequiemText[100]; /* */ char warpNocturneText[100]; /* */ char warpPreludeText[100]; + /* */ RandomizerCheck masterSwordHintCheck; /* */ RandomizerCheck lightArrowHintCheck; /* */ RandomizerCheck sariaCheck; /* */ RandomizerCheck gregCheck; diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index 3c3b66d73..42c9c91c0 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -500,6 +500,8 @@ const std::vector flagTables = { { RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD, "KAK_100_GOLD_SKULLTULA_REWARD" }, { RAND_INF_GREG_FOUND, "RAND_INF_GREG_FOUND" }, + + { RAND_INF_TOT_MASTER_SWORD, "RAND_INF_TOT_MASTER_SWORD"}, { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" }, { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" }, { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" }, diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 73d6c4634..d23c5609e 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -248,6 +248,8 @@ void AutoSave(GetItemEntry itemEntry) { // Don't autosave immediately after buying items from shops to prevent getting them for free! // Don't autosave in the Chamber of Sages since resuming from that map breaks the game // Don't autosave during the Ganon fight when picking up the Master Sword + // Don't autosave in the fishing pond to prevent getting rod on B outside of the pond + // Don't autosave in the bombchu bowling alley to prevent having chus on B outside of the minigame // Don't autosave in grottos since resuming from grottos breaks the game. if ((CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF) && (gPlayState != NULL) && (gSaveContext.pendingSale == ITEM_NONE) && (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS)) { @@ -311,8 +313,9 @@ void AutoSave(GetItemEntry itemEntry) { CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { performSave = true; } - if ((gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN) || (gPlayState->sceneNum == SCENE_GROTTOS) || - (gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES)) { + if (gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN || gPlayState->sceneNum == SCENE_GROTTOS || + gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES || gPlayState->sceneNum == SCENE_FISHING_POND || + gPlayState->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) { if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_MAJOR_ITEMS || CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS || CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index b830efb60..d9d94da20 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -2958,6 +2958,20 @@ void HintTable_Init() { "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " }, }); + + /*-------------------------- + |MASTER SWORD LOCATION TEXT| + ---------------------------*/ + + hintTable[MASTER_SWORD_LOCATION_HINT] = HintText::MasterSword({ + // obscure text + Text{"And even if you do, you'll never find the legendary blade hidden in ", + /*french*/ + "Et même si tu les trouves, tu ne touveras jamais l'épée de légende cachée dans ", + /*spanish*/ + "E incluso si lo haces, nunca encontrarás la espada legendaria escondida en " }, + }); + hintTable[YOUR_POCKET] = HintText::Exclude({ // obscure text Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" }, diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp index 8b9f37f9e..f2e110226 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp @@ -131,6 +131,10 @@ void HintTable_Init_Exclude_Overworld() { Text{"a #hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"}, }); + hintTable[TOT_MASTER_SWORD] = HintText::Exclude({ + //obscure text + Text{"a #pedestal in a temple# holds", /*french*/"un #piédestal dans un temple# contient", /*spanish*/"un #pedestal en un templo# sostiene"}, + }); hintTable[TOT_LIGHT_ARROWS_CUTSCENE] = HintText::Exclude({ //obscure text diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index dea7833fc..3bdaeee5d 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -6,6 +6,7 @@ #include "item_pool.hpp" #include "logic.hpp" #include "random.hpp" +#include "settings.hpp" #include "spoiler_log.hpp" #include "fill.hpp" #include "hint_list.hpp" @@ -143,7 +144,9 @@ Text warpRequiemText; Text warpNocturneText; Text warpPreludeText; + std::string lightArrowHintLoc; +std::string masterSwordHintLoc; std::string sariaHintLoc; std::string dampeHintLoc; @@ -203,6 +206,10 @@ Text& GetWarpPreludeText() { return warpPreludeText; } +std::string GetMasterSwordHintLoc() { + return masterSwordHintLoc; +} + std::string GetLightArrowHintLoc() { return lightArrowHintLoc; } @@ -607,6 +614,22 @@ void CreateGanonText() { } ganonHintText = ganonHintText + "!"; + if (ShuffleMasterSword) { + //Get the location of the master sword + auto masterSwordLocation = FilterFromPool(allLocations, [](const LocationKey loc){return Location(loc)->GetPlacedItemKey() == MASTER_SWORD;}); + + // Add second text box + ganonHintText = ganonHintText + "^"; + if (masterSwordLocation.empty()) { + ganonHintText = ganonHintText+Hint(MASTER_SWORD_LOCATION_HINT).GetText()+Hint(YOUR_POCKET).GetText(); + masterSwordHintLoc = "Link's Pocket"; + } else { + ganonHintText = ganonHintText+Hint(MASTER_SWORD_LOCATION_HINT).GetText()+GetHintRegion(Location(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText(); + masterSwordHintLoc = Location(masterSwordLocation[0])->GetName(); + } + ganonHintText = ganonHintText + "!"; + } + CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText)); } @@ -865,6 +888,18 @@ void CreateSheikText() { }; Text temp2 = Text{"%w.", "%w.", "%w."}; sheikText = temp1 + area + temp2; + if (ShuffleMasterSword) { + sheikText = sheikText + "^"; + auto masterSwordLocation = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == MASTER_SWORD;}); + masterSwordHintLoc = Location(masterSwordLocation[0])->GetName(); + area = GetHintRegion(Location(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText(); + Text temp3 = Text{ + "I also heard that he stole %rthe Master Sword%w and hid it somewhere within %g", + "Test", + "Test" + }; + sheikText = sheikText + temp3 + area + temp2; + } } void CreateSariaText() { diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp index 83985c0da..9bc6d61db 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp @@ -43,6 +43,7 @@ enum class HintCategory { Altar, Validation, LightArrow, + MasterSword, GanonLine, MerchantsDialogs, }; @@ -116,6 +117,10 @@ public: return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::LightArrow}; } + static auto MasterSword(std::vector&& obscureText, std::vector&& ambiguousText = {}, Text&& clearText = {}) { + return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::MasterSword}; + } + static auto GanonLine(std::vector&& obscureText, std::vector&& ambiguousText = {}, Text&& clearText = {}) { return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonLine}; } @@ -228,5 +233,6 @@ Text& GetWarpNocturneText(); Text& GetWarpPreludeText(); std::string GetDampeHintLoc(); +std::string GetMasterSwordHintLoc(); std::string GetLightArrowHintLoc(); std::string GetSariaHintLoc(); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp index 417203a5b..c3722ffd0 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp @@ -12,7 +12,7 @@ static std::array itemTable; void ItemTable_Init() { // RandomizerGet English name French Spanish Item Type getItemID advancement logic hint key itemTable[NONE] = Item(RG_NONE, Text{"No Item", "Rien", "Sin Objeto"}, ITEMTYPE_EVENT, GI_RUPEE_GREEN, false, &noVariable, NONE); itemTable[KOKIRI_SWORD] = Item(RG_KOKIRI_SWORD, Text{"Kokiri Sword", "Épée Kokiri", "Espada Kokiri"}, ITEMTYPE_ITEM, GI_SWORD_KOKIRI, true, &KokiriSword, KOKIRI_SWORD); - //[MASTER_SWORD] + itemTable[MASTER_SWORD] = Item(RG_MASTER_SWORD, Text{"Master Sword", "Épée de Legende", "Espada Master"}, ITEMTYPE_ITEM, 0x73, true, &MasterSword, MASTER_SWORD); itemTable[GIANTS_KNIFE] = Item(RG_GIANTS_KNIFE, Text{"Giant's Knife", "Lame des Géants", "Espada de Biggoron"}, ITEMTYPE_ITEM, GI_SWORD_KNIFE, false, &noVariable, GIANTS_KNIFE); itemTable[BIGGORON_SWORD] = Item(RG_BIGGORON_SWORD, Text{"Biggoron's Sword", "Épée de Biggoron", "Espada de Biggoron"}, ITEMTYPE_ITEM, GI_SWORD_BGS, true, &BiggoronSword, BIGGORON_SWORD); itemTable[DEKU_SHIELD] = Item(RG_DEKU_SHIELD, Text{"Deku Shield", "Bouclier Mojo", "Escudo deku"}, ITEMTYPE_ITEM, GI_SHIELD_DEKU, false, &noVariable, DEKU_SHIELD); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp index 1c085021c..577de1c19 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp @@ -754,7 +754,7 @@ void LocationTable_Init() { /*------------------------------- --- CUTSCENES --- -------------------------------*/ - + locationTable[TOT_MASTER_SWORD] = ItemLocation::Delayed(RC_TOT_MASTER_SWORD, 0xFF, "ToT Master Sword", TOT_MASTER_SWORD, MASTER_SWORD, {}, SpoilerCollectionCheck::MasterSword(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[TOT_LIGHT_ARROWS_CUTSCENE] = ItemLocation::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE, 0xFF, "ToT Light Arrow Cutscene", TOT_LIGHT_ARROWS_CUTSCENE, LIGHT_ARROWS, {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[LW_GIFT_FROM_SARIA] = ItemLocation::Delayed(RC_LW_GIFT_FROM_SARIA, 0xFF, "LW Gift From Saria", LW_GIFT_FROM_SARIA, PROGRESSIVE_OCARINA, {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); locationTable[ZF_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_ZF_GREAT_FAIRY_REWARD, 0xFF, "ZF Great Fairy Reward", ZF_GREAT_FAIRY_REWARD, FARORES_WIND, {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); @@ -1265,6 +1265,7 @@ std::vector overworldLocations = { OGC_GREAT_FAIRY_REWARD, //Temple of Time + TOT_MASTER_SWORD, SHEIK_AT_TEMPLE, TOT_LIGHT_ARROWS_CUTSCENE, diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp index e900ab941..5a61c2986 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp @@ -149,9 +149,14 @@ class SpoilerCollectionCheck { static auto MagicBeans() { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, 0x00, 0x00); } + + static auto MasterSword() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD, 0x00, 0x00); + } static auto Merchant() { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, 0x00, 0x00); + } static auto RandomizerInf() { diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index 485fc4154..1eb496eb2 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -108,9 +108,10 @@ const std::array alwaysItems = { ARROWS_10, TREASURE_GAME_HEART, }; -const std::array easyItems = { +const std::array easyItems = { BIGGORON_SWORD, KOKIRI_SWORD, + MASTER_SWORD, BOOMERANG, LENS_OF_TRUTH, MEGATON_HAMMER, @@ -682,6 +683,13 @@ void GenerateItemPool() { PlaceItemInLocation(KF_KOKIRI_SWORD_CHEST, KOKIRI_SWORD, false, true); } + if (ShuffleMasterSword) { + AddItemToMainPool(MASTER_SWORD); + IceTrapModels.push_back(0xE0); //Master Sword without the GI enum + } else { + PlaceItemInLocation(TOT_MASTER_SWORD, MASTER_SWORD, false, true); + } + if (ShuffleWeirdEgg) { AddItemToMainPool(WEIRD_EGG); IceTrapModels.push_back(GI_WEIRD_EGG); @@ -1161,6 +1169,10 @@ void GenerateItemPool() { ReplaceMaxItem(KOKIRI_SWORD, 0); } + if (!ShuffleMasterSword) { + ReplaceMaxItem(MASTER_SWORD, 0); + } + if (ProgressiveGoronSword) { ReplaceMaxItem(BIGGORON_SWORD, 0); AddItemToMainPool(PROGRESSIVE_GORONSWORD, 2); diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp index 6e9e87f4e..e6e36e93d 100644 --- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/keys.hpp @@ -357,6 +357,7 @@ typedef enum { MARKET_BOMBCHU_SHOP_ITEM_6, MARKET_BOMBCHU_SHOP_ITEM_7, MARKET_BOMBCHU_SHOP_ITEM_8, + TOT_MASTER_SWORD, TOT_LIGHT_ARROWS_CUTSCENE, //HYRULE_CASTLE HC_MALON_EGG, @@ -1804,6 +1805,7 @@ typedef enum { VALIDATION_LINE, LIGHT_ARROW_LOCATION_HINT, + MASTER_SWORD_LOCATION_HINT, DAMPE_DIARY, YOUR_POCKET, diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp index 6691ac2f2..d98096314 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp @@ -52,6 +52,7 @@ void AreaTable_Init_CastleTown() { areaTable[TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, { //Locations + LocationAccess(TOT_MASTER_SWORD, {[]{return IsAdult;}}), LocationAccess(TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}), }, { //Exits diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp index b52be650e..bf1d06148 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp @@ -95,7 +95,7 @@ void AreaTable_Init_DeathMountain() { LocationAccess(GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && LogicChildRollingWithStrength));}}), LocationAccess(GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}), LocationAccess(GC_GS_BOULDER_MAZE, {[]{return IsChild && CanBlastOrSmash;}}), - LocationAccess(GC_GS_CENTER_PLATFORM, {[]{return IsAdult;}}), + LocationAccess(GC_GS_CENTER_PLATFORM, {[]{return CanAdultAttack;}}), LocationAccess(GC_MEDIGORON, {[]{return IsAdult && AdultsWallet && (CanBlastOrSmash || GoronBracelet);}}), LocationAccess(GC_MAZE_GOSSIP_STONE, {[]{return CanBlastOrSmash || CanUse(SILVER_GAUNTLETS);}}), LocationAccess(GC_MEDIGORON_GOSSIP_STONE, {[]{return CanBlastOrSmash || GoronBracelet;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp index c39676a82..2224df4ca 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp @@ -23,8 +23,8 @@ void AreaTable_Init_DekuTree() { if (Dungeon::DekuTree.IsVanilla()) { areaTable[DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_MAP_CHEST, {[]{return true;}}), @@ -33,7 +33,7 @@ void AreaTable_Init_DekuTree() { Entrance(DEKU_TREE_ENTRYWAY, {[]{return true;}}), Entrance(DEKU_TREE_2F_MIDDLE_ROOM, {[]{return true;}}), Entrance(DEKU_TREE_COMPASS_ROOM, {[]{return true;}}), - Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return Here(DEKU_TREE_LOBBY, []{return IsAdult || CanChildAttack || Nuts;});}}), + Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return Here(DEKU_TREE_LOBBY, []{return CanAdultAttack || CanChildAttack || Nuts;});}}), Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}), Entrance(DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}), }); @@ -55,13 +55,13 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_COMPASS_CHEST, {[]{return true;}}), LocationAccess(DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_GS_COMPASS_ROOM, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_GS_COMPASS_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DEKU_TREE_LOBBY, {[]{return HasFireSourceWithTorch || CanUse(BOW);}}), @@ -70,14 +70,14 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}, + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || Boomerang);}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}, /*Glitched*/[]{return CanUse(MEGATON_HAMMER);}}), }, { //Locations LocationAccess(DEKU_TREE_BASEMENT_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_GS_BASEMENT_GATE, {[]{return IsAdult || CanChildAttack;}}), - LocationAccess(DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(DINS_FIRE) || (LogicDekuBasementGS && (IsAdult || Sticks || KokiriSword));}}), + LocationAccess(DEKU_TREE_GS_BASEMENT_GATE, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);}}), + LocationAccess(DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(DINS_FIRE) || (LogicDekuBasementGS && CanJumpslash);}}), }, { //Exits Entrance(DEKU_TREE_LOBBY, {[]{return true;}}), @@ -100,8 +100,8 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}), @@ -110,9 +110,9 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(BOW);}) && - (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE)));}}), + (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE)));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}), @@ -131,8 +131,8 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return true;}}), @@ -153,15 +153,15 @@ void AreaTable_Init_DekuTree() { if (Dungeon::DekuTree.IsMQ()) { areaTable[DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_MQ_SLINGSHOT_CHEST, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_MQ_SLINGSHOT_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}), LocationAccess(DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}), LocationAccess(DEKU_TREE_MQ_BASEMENT_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}), - LocationAccess(DEKU_TREE_MQ_GS_LOBBY, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_MQ_GS_LOBBY, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DEKU_TREE_ENTRYWAY, {[]{return true;}}), @@ -201,7 +201,8 @@ void AreaTable_Init_DekuTree() { //Exits Entrance(DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return IsAdult && CanUse(FIRE_ARROWS);});}) && - Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return IsAdult || KokiriSword || CanUseProjectile || (Nuts && Sticks);});}}), + Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUseProjectile || (Nuts && CanUse(STICKS));});}}), Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp index 133cdc340..9f8effbcc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp @@ -54,17 +54,17 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (IsAdult && CanUse(LONGSHOT)) || (LogicDCScarecrowGS && (IsAdult || CanChildAttack));}}), + LocationAccess(DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (IsAdult && CanUse(LONGSHOT)) || (LogicDCScarecrowGS && (CanAdultAttack || CanChildAttack));}}), }, { //Exits Entrance(DODONGOS_CAVERN_LOBBY, {[]{return true;}}), - Entrance(DODONGOS_CAVERN_SE_ROOM, {[]{return Here(DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || IsAdult || CanChildAttack || (CanTakeDamage && CanShield);});}}), + Entrance(DODONGOS_CAVERN_SE_ROOM, {[]{return Here(DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || CanAdultAttack || CanChildAttack || (CanTakeDamage && CanShield);});}}), Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}), }); areaTable[DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}), @@ -78,8 +78,10 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), - Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), }); areaTable[DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -119,7 +121,7 @@ void AreaTable_Init_DodongosCavern() { LocationAccess(DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}), }, { //Exits - Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return IsAdult || HasExplosives || GoronBracelet;}}), + Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives || GoronBracelet;}}), }); areaTable[DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -156,8 +158,10 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}), - Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), - Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), }); areaTable[DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -197,7 +201,7 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}), @@ -221,10 +225,10 @@ void AreaTable_Init_DodongosCavern() { }, { //Locations LocationAccess(DODONGOS_CAVERN_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(DODONGOS_CAVERN_MQ_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack || Nuts;}}), + LocationAccess(DODONGOS_CAVERN_MQ_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), LocationAccess(DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}), LocationAccess(DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, {[]{return CanBlastOrSmash || (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || (IsAdult && (LogicDCJump || HoverBoots || Hookshot));}}), - LocationAccess(DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || IsAdult);}}), + LocationAccess(DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || CanAdultAttack);}}), LocationAccess(DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}), LocationAccess(DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, {[]{return CanBlastOrSmash;}}), LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, {[]{return CanStunDeku;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp index 887766fe5..2275b0b6a 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp @@ -46,12 +46,12 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 8) || !IsKeysanity;}}), - Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return Here(FIRE_TEMPLE_LOOP_ENEMIES, []{return IsAdult || KokiriSword;});}}), + Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return Here(FIRE_TEMPLE_LOOP_ENEMIES, []{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);});}}), }); areaTable[FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(FIRE_TEMPLE_LOOP_ENEMIES, {[]{return true;}}), @@ -64,7 +64,8 @@ void AreaTable_Init_FireTemple() { }, { //Exits Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return true;}}), - Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), + Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(BOOMERANG)));});}}), }); areaTable[FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -110,7 +111,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return IsAdult;}}), + LocationAccess(FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return CanAdultAttack || HookshotOrBoomerang;}}), }, { //Exits Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}), @@ -149,7 +150,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}), - LocationAccess(FIRE_TEMPLE_GS_BOULDER_MAZE, {[]{return HasExplosives && (IsAdult || Boomerang || CanUse(HOOKSHOT));}}), + LocationAccess(FIRE_TEMPLE_GS_BOULDER_MAZE, {[]{return HasExplosives && (IsAdult || HookshotOrBoomerang);}}), }, { //Exits Entrance(FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return true;}}), @@ -203,7 +204,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);}}), }, { //Exits Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}), @@ -276,8 +277,10 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), - Entrance(FIRE_TEMPLE_WEST_CLIMB, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), + Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && ((CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(BOOMERANG)));});}}), + Entrance(FIRE_TEMPLE_WEST_CLIMB, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && ((CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOOMERANG)));});}}), }); areaTable[FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -314,14 +317,14 @@ void AreaTable_Init_FireTemple() { if (Dungeon::FireTemple.IsMQ()) { areaTable[FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return IsAdult || KokiriSword || Sticks || Slingshot || Bombs || CanUse(DINS_FIRE);}}), + LocationAccess(FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || Bombs || CanUse(DINS_FIRE);}}), LocationAccess(FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, {[]{return IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT)))));}}), //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT))))) }, { //Exits Entrance(FIRE_TEMPLE_ENTRYWAY, {[]{return true;}}), Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return IsAdult && CanUse(GORON_TUNIC) && CanUse(MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (LogicFireBossDoorJump || HoverBoots)) || HasAccessTo(FIRE_TEMPLE_MQ_UPPER));}}), - Entrance(FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(FIRE_TEMPLE, 5) && (IsAdult || KokiriSword);}}), + Entrance(FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(FIRE_TEMPLE, 5) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), Entrance(FIRE_TEMPLE_MQ_BIG_LAVA_ROOM, {[]{return IsAdult && FireTimer >= 24 && CanUse(MEGATON_HAMMER);}}), }); @@ -330,7 +333,7 @@ void AreaTable_Init_FireTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (HasExplosives || Hammer || Hookshot);}}), + LocationAccess(FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(BOOMERANG))));}}), LocationAccess(FIRE_TEMPLE_MQ_MAP_CHEST, {[]{return IsAdult && CanUse(MEGATON_HAMMER);}}), }, {}); @@ -353,7 +356,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, {[]{return true;}}), + LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, {[]{return CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD);}}), LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (LogicFireMQMazeSideRoom || HasAccessTo(FIRE_TEMPLE_MQ_UPPER_MAZE));}}), //Trick: HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult()) }, { @@ -378,7 +381,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_FREESTANDING_KEY, {[]{return (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze;}}), + LocationAccess(FIRE_TEMPLE_MQ_FREESTANDING_KEY, {[]{return ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(SLINGSHOT) || CanUse(BOOMERANG)) && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze;}}), //Trick: (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze LocationAccess(FIRE_TEMPLE_MQ_CHEST_ON_FIRE, {[]{return ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4);}}), //Trick: ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4) diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp index d4e95e15c..fea9fda6f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp @@ -34,7 +34,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}), - Entrance(FOREST_TEMPLE_LOBBY, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_LOBBY, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -66,7 +66,7 @@ void AreaTable_Init_ForestTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}), @@ -74,8 +74,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(LONGSHOT) || Here(FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}), @@ -90,8 +90,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return true;}}), @@ -102,8 +102,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(HOOKSHOT) || HasAccessTo(FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && LogicForestOutdoorsLedge && HoverBoots);}}), @@ -118,22 +118,22 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}), Entrance(FOREST_TEMPLE_MAP_ROOM, {[]{return true;}}), - Entrance(FOREST_TEMPLE_FALLING_ROOM, {[]{return LogicForestDoorFrame && CanUse(HOVER_BOOTS) && CanUse(SCARECROW);}}), + Entrance(FOREST_TEMPLE_FALLING_ROOM, {[]{return LogicForestDoorFrame && CanJumpslash && CanUse(HOVER_BOOTS) && CanUse(SCARECROW);}}), }); areaTable[FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MAP_CHEST, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + LocationAccess(FOREST_TEMPLE_MAP_CHEST, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }, { //Exits - Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), - Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }); areaTable[FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -147,12 +147,12 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }); areaTable[FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return IsAdult || CanChildDamage;}}), + LocationAccess(FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}), }, { //Exits Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}), @@ -161,7 +161,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FOREST_TEMPLE_LOBBY, {[]{return SmallKeys(FOREST_TEMPLE, 1, 5);}}), - Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -172,7 +172,7 @@ void AreaTable_Init_ForestTemple() { Entrance(FOREST_TEMPLE_WEST_CORRIDOR, {[]{return true;}}), Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return CanUse(HOVER_BOOTS) || (LogicForestOutsideBackdoor && CanJumpslash && GoronBracelet);}}), Entrance(FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return IsAdult && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), - Entrance(FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return CanUse(BOW) && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), + Entrance(FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (CanUse(BOW) || CanUse(SLINGSHOT)) && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), }); areaTable[FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -204,11 +204,11 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_BOW_CHEST, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_BOW_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits - Entrance(FOREST_TEMPLE_RED_POE_ROOM, {[]{return IsAdult || KokiriSword;}}), - Entrance(FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return IsAdult || KokiriSword;}}), + Entrance(FOREST_TEMPLE_RED_POE_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), + Entrance(FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }); areaTable[FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -261,8 +261,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FOREST_TEMPLE_LOBBY, {[]{return IsAdult || CanChildAttack || Nuts;}}), - Entrance(FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_LOBBY, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -282,12 +282,12 @@ void AreaTable_Init_ForestTemple() { if (Dungeon::ForestTemple.IsMQ()) { areaTable[FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return IsAdult || Bombs || CanUse(STICKS) || Nuts || CanUse(BOOMERANG) || CanUse(DINS_FIRE) || KokiriSword || CanUse(SLINGSHOT);}}), + LocationAccess(FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return CanJumpslash || Bombs || Nuts || HookshotOrBoomerang || CanUse(DINS_FIRE) || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(HOVER_BOOTS);}}), LocationAccess(FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}), }, { //Exits Entrance(FOREST_TEMPLE_ENTRYWAY, {[]{return true;}}), - Entrance(FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(FOREST_TEMPLE, 1) && (IsAdult || CanChildAttack || Nuts);}}), + Entrance(FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(FOREST_TEMPLE, 1) && (CanAdultAttack || CanChildAttack || Nuts);}}), }); areaTable[FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -295,12 +295,12 @@ void AreaTable_Init_ForestTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_WOLFOS_CHEST, {[]{return (CanPlay(SongOfTime) || IsChild) && (IsAdult || CanUse(DINS_FIRE) || CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword);}}), - LocationAccess(FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_MQ_WOLFOS_CHEST, {[]{return (CanPlay(SongOfTime) || IsChild) && (CanJumpslash || CanUse(DINS_FIRE) || CanUse(SLINGSHOT));}}), + LocationAccess(FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits - Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), - Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), //This is as far as child can get + Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), + Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), //This is as far as child can get Entrance(FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT)));}}), //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT))) Entrance(FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(HOVER_BOOTS)) || (LogicForestMQHallwaySwitchBoomerang && CanUse(BOOMERANG)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(HOOKSHOT));}}), @@ -321,7 +321,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return CanJumpslash;}}), }, { //Exits Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}), @@ -329,7 +329,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return (IsAdult && (CanUse(IRON_BOOTS) || CanUse(LONGSHOT) || (LogicForestMQWellSwim && CanUse(HOOKSHOT)))) || ProgressiveScale >= 2;}}), @@ -339,8 +339,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_MQ_WELL_CHEST, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), @@ -376,7 +376,7 @@ void AreaTable_Init_ForestTemple() { EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(BOW));}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_BOW_CHEST, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_BOW_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), LocationAccess(FOREST_TEMPLE_MQ_MAP_CHEST, {[]{return IsAdult && CanUse(BOW);}}), LocationAccess(FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return IsAdult && CanUse(BOW);}}), }, { diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp index ebb8625ec..fa6ab967b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp @@ -56,7 +56,7 @@ void AreaTable_Init_GanonsCastle() { EventAccess(&ForestTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (FireArrows || DinsFire);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return IsAdult || CanChildDamage;}}), + LocationAccess(GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}), }, {}); areaTable[GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -68,7 +68,7 @@ void AreaTable_Init_GanonsCastle() { //Events EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), EventAccess(&FairyPot, {[]{return FairyPot || BlueFire;}}), - EventAccess(&WaterTrialClear, {[]{return BlueFire && Hammer && CanUse(LIGHT_ARROWS);}}), + EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(MEGATON_HAMMER) && CanUse(LIGHT_ARROWS);}}), }, { //Locations LocationAccess(GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, {[]{return true;}}), @@ -77,7 +77,7 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&ShadowTrialClear, {[]{return CanUse(LIGHT_ARROWS) && Hammer && ((FireArrows && (LogicLensCastle || CanUse(LENS_OF_TRUTH))) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(LENS_OF_TRUTH))))));}}), + EventAccess(&ShadowTrialClear, {[]{return CanUse(LIGHT_ARROWS) && CanUse(MEGATON_HAMMER) && ((FireArrows && (LogicLensCastle || CanUse(LENS_OF_TRUTH))) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(LENS_OF_TRUTH))))));}}), }, { //Locations LocationAccess(GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, {[]{return CanUse(FIRE_ARROWS) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}), @@ -86,11 +86,11 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&NutPot, {[]{return NutPot || ((LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && Bow && (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS))) && IsAdult);}}), - EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (MirrorShield || SunlightArrows) && HasBombchus && (LogicSpiritTrialHookshot || CanUse(HOOKSHOT));}}), + EventAccess(&NutPot, {[]{return NutPot || (((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT)) && HasBombchus && CanUse(BOW) && (CanUse(MIRROR_SHIELD) || (SunlightArrows && CanUse(LIGHT_ARROWS))));}}), + EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (CanUse(MIRROR_SHIELD) || SunlightArrows) && HasBombchus && ((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT));}}), }, { //Locations - LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return LogicSpiritTrialHookshot || CanUse(HOOKSHOT);}}), + LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && CanJumpslash;}}), LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && (LogicLensCastle || CanUse(LENS_OF_TRUTH));}}), }, {}); @@ -112,9 +112,9 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return true;}}), - LocationAccess(GANONDORF_HINT, {[]{return BossKeyGanonsCastle;}}), - LocationAccess(GANON, {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS);}}), + LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GANONDORF_HINT, {[]{return BossKeyGanonsCastle && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GANON, {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS) && CanUse(MASTER_SWORD);}}), }, {}); /*--------------------------- @@ -123,7 +123,7 @@ void AreaTable_Init_GanonsCastle() { if (Dungeon::GanonsCastle.IsMQ()) { areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return (IsAdult || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}), + Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return (CanUse(MASTER_SWORD) || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}), Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_MQ_WATER_TRIAL, {[]{return true;}}), @@ -153,12 +153,12 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && CanPlay(SongOfTime);}}), + EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && CanPlay(SongOfTime);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return HasFireSource;}}), - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, {[]{return HookshotOrBoomerang;}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (CanUse(BOW) || CanUse(SLINGSHOT));}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HasFireSource;}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HookshotOrBoomerang;}}), }, {}); areaTable[GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -170,10 +170,10 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3);}}), - EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), + EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}), + LocationAccess(GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire;}}), }, {}); areaTable[GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -203,11 +203,11 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&LightTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}), + EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}), //Trick: IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ) }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}), + LocationAccess(GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) && CanPlay(ZeldasLullaby);}}), }, {}); } } diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp index 77cf0a4e2..93ffca145 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp @@ -25,13 +25,13 @@ void AreaTable_Init_GerudoTrainingGrounds() { //Locations LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, {[]{return HasExplosives && (IsAdult || KokiriSword);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, {[]{return HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return true;}}), - Entrance(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (IsAdult || KokiriSword) && (CanUse(HOOKSHOT) || LogicGtgWithoutHookshot);}}), - Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return Here(GERUDO_TRAINING_GROUNDS_LOBBY, []{return (IsAdult || KokiriSword) && HasExplosives;});}}), + Entrance(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (CanUse(HOOKSHOT) || LogicGtgWithoutHookshot);}}), + Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return Here(GERUDO_TRAINING_GROUNDS_LOBBY, []{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HasExplosives;});}}), Entrance(GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE, {[]{return true;}}), }); @@ -69,11 +69,11 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(MEGATON_HAMMER) && Bow;}}), + Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(MEGATON_HAMMER) && CanUse(BOW);}}), Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return true;}}), }); @@ -95,7 +95,7 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, {[]{return CanJumpslash;}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (LogicLensGtg || CanUse(LENS_OF_TRUTH)) && (CanUse(HOOKSHOT) || (LogicGtgFakeWall && CanUse(HOVER_BOOTS)));}}), @@ -104,10 +104,10 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, {[]{return CanJumpslash;}}), }, {}); } @@ -135,10 +135,10 @@ void AreaTable_Init_GerudoTrainingGrounds() { //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(BOW));}}), }, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, {[]{return IsAdult;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || CanUse(LONGSHOT)) && CanUse(HOVER_BOOTS) && IsAdult;}}), + Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || (CanUse(LONGSHOT) && HasFireSource)) && CanUse(HOVER_BOOTS) && IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }); areaTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { @@ -148,7 +148,7 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return IsAdult || KokiriSword || HasExplosives;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || HasExplosives;}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(HOOKSHOT));}}), @@ -160,8 +160,8 @@ void AreaTable_Init_GerudoTrainingGrounds() { EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), }, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, {[]{return CanUse(SILVER_GAUNTLETS);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, {[]{return CanUse(SILVER_GAUNTLETS) && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (LogicLensGtgMQ || CanUse(LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(HOVER_BOOTS)));}}), @@ -170,12 +170,12 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, {[]{return Bow;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, {[]{return CanUse(HOOKSHOT) || Bow || HasExplosives;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, {[]{return CanUse(BOW);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, {[]{return CanUse(HOOKSHOT) || CanUse(BOW) || HasExplosives;}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return Hammer;}}), + Entrance(GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return CanUse(MEGATON_HAMMER);}}), Entrance(GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return CanUse(LONGSHOT);}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp index 70fd1f22b..f7b1c95af 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp @@ -104,13 +104,13 @@ void AreaTable_Init_GerudoValley() { LocationAccess(GF_CHEST, {[]{return CanUse(HOVER_BOOTS) || (IsAdult && CanUse(SCARECROW)) || CanUse(LONGSHOT);}}), LocationAccess(GF_HBA_1000_POINTS, {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}), LocationAccess(GF_HBA_1500_POINTS, {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}), - LocationAccess(GF_NORTH_F1_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), - LocationAccess(GF_NORTH_F2_CARPENTER, {[]{return (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen);}}), - LocationAccess(GF_SOUTH_F1_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), - LocationAccess(GF_SOUTH_F2_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_NORTH_F1_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_NORTH_F2_CARPENTER, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen);}}), + LocationAccess(GF_SOUTH_F1_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_SOUTH_F2_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), LocationAccess(GF_GERUDO_MEMBERSHIP_CARD, {[]{return CanFinishGerudoFortress;}}), LocationAccess(GF_GS_ARCHERY_RANGE, {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}), - LocationAccess(GF_GS_TOP_FLOOR, {[]{return IsAdult && AtNight && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}), + LocationAccess(GF_GS_TOP_FLOOR, {[]{return IsAdult && AtNight && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}), }, { //Exits Entrance(GV_FORTRESS_SIDE, {[]{return true;}}), @@ -149,7 +149,7 @@ void AreaTable_Init_GerudoValley() { }, { //Locations LocationAccess(WASTELAND_CHEST, {[]{return HasFireSource;}}), - LocationAccess(WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (IsAdult || Sticks || KokiriSword);}}), + LocationAccess(WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (CanJumpslash || CanUse(HOVER_BOOTS)) ;}}), LocationAccess(WASTELAND_GS, {[]{return HookshotOrBoomerang;}}), }, { //Exits @@ -172,7 +172,7 @@ void AreaTable_Init_GerudoValley() { LocationAccess(COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(DESERT_COLOSSUS);}}), LocationAccess(COLOSSUS_GS_BEAN_PATCH, {[]{return CanPlantBugs && CanChildAttack;}}), LocationAccess(COLOSSUS_GS_TREE, {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}), - LocationAccess(COLOSSUS_GS_HILL, {[]{return IsAdult && AtNight && (CanPlantBean(DESERT_COLOSSUS) || CanUse(LONGSHOT) || (LogicColossusGS && CanUse(HOOKSHOT))) && CanGetNightTimeGS;}}), + LocationAccess(COLOSSUS_GS_HILL, {[]{return IsAdult && AtNight && ((CanPlantBean(DESERT_COLOSSUS) && CanAdultAttack) || CanUse(LONGSHOT) || (LogicColossusGS && CanUse(HOOKSHOT))) && CanGetNightTimeGS;}}), LocationAccess(COLOSSUS_GOSSIP_STONE, {[]{return true;}}), }, { //Exits diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp index 7b247049d..50a0c340e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp @@ -115,7 +115,7 @@ void AreaTable_Init_HyruleField() { LocationAccess(LH_SUN, {[]{return IsAdult && WaterTempleClear && CanUse(BOW);}}), LocationAccess(LH_FREESTANDING_POH, {[]{return IsAdult && (CanUse(SCARECROW) || CanPlantBean(LAKE_HYLIA));}}), LocationAccess(LH_GS_BEAN_PATCH, {[]{return CanPlantBugs && CanChildAttack;}}), - LocationAccess(LH_GS_LAB_WALL, {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && (Sticks || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)))) && AtNight && CanGetNightTimeGS;}}), + LocationAccess(LH_GS_LAB_WALL, {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_GS_SMALL_ISLAND, {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_GS_TREE, {[]{return IsAdult && CanUse(LONGSHOT) && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_LAB_GOSSIP_STONE, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp index f5efcc3c8..551cfc978 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp @@ -13,7 +13,7 @@ void AreaTable_Init_IceCavern() { areaTable[ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(ICE_CAVERN_BEGINNING, {[]{return Dungeon::IceCavern.IsVanilla();}}), - Entrance(ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ();}}), + Entrance(ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ() && CanUseProjectile;}}), Entrance(ZORAS_FOUNTAIN, {[]{return true;}}), }); @@ -24,7 +24,7 @@ void AreaTable_Init_IceCavern() { areaTable[ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}), - Entrance(ICE_CAVERN_MAIN, {[]{return Here(ICE_CAVERN_BEGINNING, []{return IsAdult || HasExplosives || CanUse(DINS_FIRE);});}}), + Entrance(ICE_CAVERN_MAIN, {[]{return Here(ICE_CAVERN_BEGINNING, []{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) || HasExplosives || CanUse(DINS_FIRE);});}}), }); areaTable[ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, { @@ -34,8 +34,8 @@ void AreaTable_Init_IceCavern() { //Locations LocationAccess(ICE_CAVERN_MAP_CHEST, {[]{return BlueFire && IsAdult;}}), LocationAccess(ICE_CAVERN_COMPASS_CHEST, {[]{return BlueFire;}}), - LocationAccess(ICE_CAVERN_IRON_BOOTS_CHEST, {[]{return BlueFire && (IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE));}}), - LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return BlueFire && IsAdult;}}), + LocationAccess(ICE_CAVERN_IRON_BOOTS_CHEST, {[]{return BlueFire && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE));}}), + LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return BlueFire && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE)) && IsAdult;}}), LocationAccess(ICE_CAVERN_FREESTANDING_POH, {[]{return BlueFire;}}), LocationAccess(ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}), LocationAccess(ICE_CAVERN_GS_HEART_PIECE_ROOM, {[]{return BlueFire && HookshotOrBoomerang;}}), @@ -53,24 +53,24 @@ void AreaTable_Init_IceCavern() { }, {}, { //Exits Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}), - Entrance(ICE_CAVERN_MQ_MAP_ROOM, {[]{return IsAdult || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword));}}), + Entrance(ICE_CAVERN_MQ_MAP_ROOM, {[]{return CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(STICKS) || CanUse(SLINGSHOT) || CanUse(BOW)));}}), Entrance(ICE_CAVERN_MQ_COMPASS_ROOM, {[]{return IsAdult && BlueFire;}}), Entrance(ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}), }); areaTable[ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), + EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}), }, { //Locations - LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}), + LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || CanUseProjectile);}}), }, {}); areaTable[ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult;}}), + LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) ;}}), LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return IsAdult;}}), - LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK, {[]{return IsAdult || CanUseProjectile;}}), + LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK, {[]{return (IsAdult && CanJumpslash) || CanUseProjectile;}}), LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW, {[]{return (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult;}}), //Tricks: (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult }, {}); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp index d7b48d7f1..108b69ccc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp @@ -111,7 +111,7 @@ void AreaTable_Init_JabuJabusBelly() { areaTable[JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}), @@ -150,7 +150,7 @@ void AreaTable_Init_JabuJabusBelly() { areaTable[JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp index db9bb69dc..55af16208 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp @@ -184,7 +184,7 @@ void AreaTable_Init_Kakariko() { areaTable[KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(KAK_REDEAD_GROTTO_CHEST, {[]{return IsAdult || (Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(KAK_REDEAD_GROTTO_CHEST, {[]{return CanUse(STICKS) || CanUse(KOKIRI_SWORD) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), }, { //Exits Entrance(KAKARIKO_VILLAGE, {[]{return true;}}), @@ -241,7 +241,7 @@ void AreaTable_Init_Kakariko() { areaTable[GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(GRAVEYARD_COMPOSERS_GRAVE_CHEST, {[]{return HasFireSource;}}), - LocationAccess(SONG_FROM_COMPOSERS_GRAVE, {[]{return IsAdult || (Slingshot || Boomerang || Sticks || HasExplosives || KokiriSword || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOW) || CanUse(HOOKSHOT));}}), + LocationAccess(SONG_FROM_COMPOSERS_GRAVE, {[]{return CanUseProjectile || CanJumpslash || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(THE_GRAVEYARD, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp index 1ba2048a0..c16468d24 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp @@ -34,8 +34,8 @@ void AreaTable_Init_LostWoods() { areaTable[KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || ((IsAdult && (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MASTER_SWORD) || CanUse(BOOMERANG))));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || ((IsAdult && (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanJumpslash || CanUse(SLINGSHOT) || HasExplosives || CanUse(DINS_FIRE))));}}), EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}), }, { //Locations @@ -144,7 +144,7 @@ void AreaTable_Init_LostWoods() { //Locations LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}), LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, {[]{return IsChild && CanStunDeku;}}), - LocationAccess(LW_GS_ABOVE_THEATER, {[]{return IsAdult && AtNight && (CanPlantBean(LW_BEYOND_MIDO) || (LogicLostWoodsGSBean && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE)))) && CanGetNightTimeGS;}}), + LocationAccess(LW_GS_ABOVE_THEATER, {[]{return IsAdult && AtNight && ((CanPlantBean(LW_BEYOND_MIDO) && CanAdultAttack) || (LogicLostWoodsGSBean && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE)))) && CanGetNightTimeGS;}}), LocationAccess(LW_GS_BEAN_PATCH_NEAR_THEATER, {[]{return CanPlantBugs && (CanChildAttack || (Scrubsanity.Is(SCRUBSANITY_OFF) && DekuShield));}}), }, { //Exits @@ -185,7 +185,7 @@ void AreaTable_Init_LostWoods() { areaTable[SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(LW_BEYOND_MIDO, {[]{return true;}}), - Entrance(SACRED_FOREST_MEADOW, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + Entrance(SACRED_FOREST_MEADOW, {[]{return IsAdult || CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER);}}), Entrance(SFM_WOLFOS_GROTTO, {[]{return CanOpenBombGrotto;}}), }); @@ -218,7 +218,7 @@ void AreaTable_Init_LostWoods() { areaTable[SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(SFM_WOLFOS_GROTTO_CHEST, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(SFM_ENTRYWAY, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp index 5296a6398..a3dda7521 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp @@ -26,12 +26,12 @@ void AreaTable_Init_ShadowTemple() { EventAccess(&NutPot, {[]{return true;}}), }, { //Locations - LocationAccess(SHADOW_TEMPLE_MAP_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MAP_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(SHADOW_TEMPLE_ENTRYWAY, {[]{return true;}}), - Entrance(SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return HoverBoots;}}), + Entrance(SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return CanUse(HOVER_BOOTS);}}), }); areaTable[SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -39,7 +39,7 @@ void AreaTable_Init_ShadowTemple() { EventAccess(&FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS }, { //Locations - LocationAccess(SHADOW_TEMPLE_COMPASS_CHEST, {[]{return IsAdult || KokiriSword || Sticks;}}), + LocationAccess(SHADOW_TEMPLE_COMPASS_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT);}}), LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP, {[]{return false;}}), }, { @@ -50,14 +50,14 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SHADOW_TEMPLE_FREESTANDING_KEY, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (LogicShadowFreestandingKey && HasBombchus));}}), - LocationAccess(SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}), LocationAccess(SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot;}}), }, { @@ -68,20 +68,20 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SHADOW_TEMPLE_WIND_HINT_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP, {[]{return CanUse(LONGSHOT) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), }, { //Exits - Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), + Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), }); areaTable[SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(DINS_FIRE);}}), LocationAccess(SHADOW_TEMPLE_BOSS_KEY_CHEST, {[]{return CanUse(DINS_FIRE);}}), - LocationAccess(SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {[]{return CanAdultAttack;}}), }, { //Exits Entrance(SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(BOW) || CanUse(DISTANT_SCARECROW) || (LogicShadowStatue && HasBombchus)) && SmallKeys(SHADOW_TEMPLE, 5) && CanUse(HOVER_BOOTS) && BossKeyShadowTemple;}}) @@ -102,15 +102,15 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_MQ_COMPASS_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanPlay(SongOfTime) && IsAdult && CanUse(BOW);}}), + LocationAccess(SHADOW_TEMPLE_MQ_COMPASS_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanPlay(SongOfTime) && IsAdult && CanUse(BOW);}}), }, {}); areaTable[SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MQ_MAP_CHEST, {[]{return CanAdultAttack || Nuts;}}), + LocationAccess(SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return CanAdultAttack || Nuts;}}), }, { //Exits Entrance(SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(SHADOW_TEMPLE, 2);}}), @@ -134,8 +134,9 @@ void AreaTable_Init_ShadowTemple() { LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), - LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), - LocationAccess(SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), + LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, {[]{return CanJumpslash && HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), + LocationAccess(SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && + LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}), }, { //Exits @@ -148,7 +149,7 @@ void AreaTable_Init_ShadowTemple() { }, { //Locations LocationAccess(SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_AFTER_WIND, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp index ec01cdbfd..2aa0c0516 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp @@ -46,9 +46,9 @@ void AreaTable_Init_SpiritTemple() { LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}), LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}), LocationAccess(SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(DINS_FIRE) || - (CanTakeDamage && (Sticks || KokiriSword || HasProjectile(HasProjectileAge::Child))) || + (CanTakeDamage && (CanJumpslash || HasProjectile(HasProjectileAge::Child))) || (IsChild && SmallKeys(SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) || - ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || CanTakeDamage));}}), + ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || (CanTakeDamage && CanJumpslash)));}}), }, { //Exits Entrance(SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), @@ -57,7 +57,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_COMPASS_CHEST, {[]{return CanUse(HOOKSHOT) && CanPlay(ZeldasLullaby);}}), - LocationAccess(SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, {[]{return Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch);}}), + LocationAccess(SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, {[]{return (CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasBombchus || (Bombs && IsAdult && LogicSpiritLowerAdultSwitch)) && (CanUse(HOVER_BOOTS) || CanJumpslash);}}), LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}), LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}), LocationAccess(SPIRIT_TEMPLE_GS_BOULDER_ROOM, {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch));}}), @@ -98,7 +98,7 @@ void AreaTable_Init_SpiritTemple() { (SmallKeys(SPIRIT_TEMPLE, 3) && CanUse(SILVER_GAUNTLETS) && (Hookshot || HoverBoots || LogicSpiritLobbyJump));}}), }, { //Exits - Entrance(SPIRIT_TEMPLE_OUTDOOR_HANDS, {[]{return true;}}), + Entrance(SPIRIT_TEMPLE_OUTDOOR_HANDS, {[]{return CanJumpslash || HasExplosives;}}), Entrance(SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return SmallKeys(SPIRIT_TEMPLE, 4) && CanUse(SILVER_GAUNTLETS);}}), Entrance(SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return true;}}), }); @@ -125,7 +125,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && LogicFlamingChests) || (Bow && Hookshot));}}), - LocationAccess(SPIRIT_TEMPLE_TOPMOST_CHEST, {[]{return MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), + LocationAccess(SPIRIT_TEMPLE_TOPMOST_CHEST, {[]{return (MirrorShield && CanAdultAttack) || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), }, { //Exits Entrance(SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}), @@ -174,7 +174,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 7);}}), - LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}), + LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby) && (CanJumpslash || CanUse(HOVER_BOOTS));}}), LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 5);}}), LocationAccess(SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}), @@ -187,7 +187,7 @@ void AreaTable_Init_SpiritTemple() { //Trick: MirrorShield && IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(DINS_FIRE) && Bow)) Entrance(SPIRIT_TEMPLE_MQ_SHARED, {[]{return true;}}), Entrance(SPIRIT_TEMPLE_MQ_BOSS_AREA, {[]{return SmallKeys(SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}), - Entrance(SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), + Entrance(SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), }); areaTable[SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -200,9 +200,9 @@ void AreaTable_Init_SpiritTemple() { //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult }, { //Exits - Entrance(SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)));}}), + Entrance(SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)));}}), //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH))) - Entrance(DESERT_COLOSSUS, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult);}}), + Entrance(DESERT_COLOSSUS, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult);}}), //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult) }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp index 79d9dff7c..559b6c20c 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp @@ -122,7 +122,7 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(WATER_TEMPLE_GS_BEHIND_GATE, {[]{return CanUse(HOOKSHOT) || (IsAdult && CanUse(HOVER_BOOTS));}}), + LocationAccess(WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (CanJumpslash || CanUse(MEGATON_HAMMER)) && (CanUse(HOOKSHOT) || (IsAdult && CanUse(HOVER_BOOTS)));}}), }, { //Exits Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(IRON_BOOTS);}}), @@ -131,7 +131,7 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(HOOKSHOT) && CanUse(IRON_BOOTS) && GoronBracelet;}}), - Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return IsAdult || CanChildAttack;}}), + Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return CanJumpslash || CanUseProjectile;}}), }); areaTable[WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -257,8 +257,8 @@ void AreaTable_Init_WaterTemple() { //Exits Entrance(WATER_TEMPLE_ENTRYWAY, {[]{return true;}}), Entrance(WATER_TEMPLE_MQ_DIVE, {[]{return IsAdult && WaterTimer >= 24 && CanUse(IRON_BOOTS);}}), - Entrance(WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(WATER_TEMPLE, 1) && IsAdult && CanUse(LONGSHOT);}}), - Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple && IsAdult && CanUse(LONGSHOT);}}), + Entrance(WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(WATER_TEMPLE, 1) && IsAdult && CanUse(LONGSHOT) && CanJumpslash && Hearts > 0;}}), + Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple && IsAdult && CanJumpslash && CanUse(LONGSHOT);}}), }); areaTable[WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -273,7 +273,8 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(WATER_TEMPLE_MQ_COMPASS_CHEST, {[]{return (IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE) || Here(WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(STICKS) && HasExplosives;});}}), + LocationAccess(WATER_TEMPLE_MQ_COMPASS_CHEST, {[]{return ((IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE) || Here(WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(STICKS) && HasExplosives;})) && + (CanJumpslash || CanUseProjectile);}}), LocationAccess(WATER_TEMPLE_MQ_LONGSHOT_CHEST, {[]{return IsAdult && CanUse(HOOKSHOT);}}), LocationAccess(WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, {[]{return CanUse(DINS_FIRE);}}), LocationAccess(WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(LONGSHOT);}}), @@ -296,7 +297,7 @@ void AreaTable_Init_WaterTemple() { //Locations LocationAccess(WATER_TEMPLE_MQ_FREESTANDING_KEY, {[]{return HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump;}}), LocationAccess(WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, {[]{return CanUse(FIRE_ARROWS) && (HoverBoots || CanUse(SCARECROW));}}), - LocationAccess(WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump));}}), + LocationAccess(WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump) && CanJumpslash);}}), //Trick: LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump)) }, {}); } diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp index 6d46e783e..d9c91b876 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp @@ -95,7 +95,7 @@ void AreaTable_Init_ZorasDomain() { LocationAccess(ZD_CHEST, {[]{return IsChild && CanUse(STICKS);}}), LocationAccess(ZD_KING_ZORA_THAWED, {[]{return KingZoraThawed;}}), LocationAccess(ZD_TRADE_PRESCRIPTION, {[]{return KingZoraThawed && Prescription;}}), - LocationAccess(ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(SLINGSHOT) || Bow || MagicMeter || LogicDomainGS) && CanGetNightTimeGS;}}), + LocationAccess(ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(SLINGSHOT) || Bow || (MagicMeter && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD))) || (LogicDomainGS && CanJumpslash)) && CanGetNightTimeGS;}}), LocationAccess(ZD_GOSSIP_STONE, {[]{return true;}}), }, { //Exits diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp index 51cdebabb..580c687d0 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp @@ -256,6 +256,8 @@ namespace Logic { bool CanBlastOrSmash = false; bool CanChildAttack = false; bool CanChildDamage = false; + bool CanAdultAttack = false; + bool CanAdultDamage = false; bool CanCutShrubs = false; bool CanDive = false; bool CanLeaveForest = false; @@ -511,7 +513,6 @@ namespace Logic { SilverScale = ProgressiveScale >= 1; GoldScale = ProgressiveScale >= 2; AdultsWallet = ProgressiveWallet >= 1; - MasterSword = MasterSword || IsAdult; BiggoronSword = BiggoronSword || ProgressiveGiantKnife >= 2; ScarecrowSong = ScarecrowSong || FreeScarecrow || (ChildScarecrow && AdultScarecrow); @@ -560,8 +561,10 @@ namespace Logic { CanBlastOrSmash = HasExplosives || CanUse(MEGATON_HAMMER); CanChildAttack = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD)); CanChildDamage = IsChild && (Slingshot || Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD)); - CanStunDeku = IsAdult || CanChildAttack || Nuts || HasShield; - CanCutShrubs = IsAdult /*|| Sticks*/ || KokiriSword || Boomerang || HasExplosives || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD); + CanAdultAttack = IsAdult && (CanUse(BOW) || CanUse(BOOMERANG) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || HasExplosives || CanUse(DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot); + CanAdultDamage = IsAdult && (CanUse(BOW) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || HasExplosives || CanUse(DINS_FIRE) || MasterSword || Hammer || BiggoronSword); + CanStunDeku = CanAdultAttack || CanChildAttack || Nuts || HasShield; + CanCutShrubs = CanUse(KOKIRI_SWORD) || CanUse(BOOMERANG) || HasExplosives || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD); CanDive = ProgressiveScale >= 1; CanLeaveForest = OpenForest.IsNot(OPENFOREST_CLOSED) || IsAdult || DekuTreeClear || ShuffleInteriorEntrances || ShuffleOverworldEntrances; CanPlantBugs = IsChild && Bugs; @@ -588,8 +591,8 @@ namespace Logic { HasFireSourceWithTorch = HasFireSource || CanUse(STICKS); //Gerudo Fortress - CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL) && GerudoFortressKeys >= 4 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen)) || - (GerudoFortress.Is(GERUDOFORTRESS_FAST) && GerudoFortressKeys >= 1 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))) || + CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL) && GerudoFortressKeys >= 4 && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen)) || + (GerudoFortress.Is(GERUDOFORTRESS_FAST) && GerudoFortressKeys >= 1 && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))) || (GerudoFortress.IsNot(GERUDOFORTRESS_NORMAL) && GerudoFortress.IsNot(GERUDOFORTRESS_FAST)); HasShield = CanUse(HYLIAN_SHIELD) || CanUse(DEKU_SHIELD); //Mirror shield can't reflect attacks @@ -598,7 +601,7 @@ namespace Logic { AdultReflectShield = IsAdult && CanUse(HYLIAN_SHIELD); //Mirror shield can't reflect attacks AdultShield = IsAdult && (CanUse(HYLIAN_SHIELD) || CanUse(MIRROR_SHIELD)); CanShieldFlick = ChildShield || AdultShield; - CanJumpslash = IsAdult || Sticks || KokiriSword; + CanJumpslash = CanUse(STICKS) || CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD); // Not including hammer as hammer jump attacks can be weird CanUseProjectile = HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT) || CanUse(BOOMERANG); CanUseMagicArrow = CanUse(FIRE_ARROWS) || CanUse(ICE_ARROWS) || CanUse(LIGHT_ARROWS); diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp index 21776af5e..2c5bca890 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp @@ -247,6 +247,8 @@ extern bool IsGlitched; extern bool CanBlastOrSmash; extern bool CanChildAttack; extern bool CanChildDamage; +extern bool CanAdultAttack; +extern bool CanAdultDamage; extern bool CanCutShrubs; extern bool CanDive; extern bool CanLeaveForest; diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 2cd894ffd..08d09cfa8 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -176,26 +176,28 @@ namespace Settings { }; //Shuffle Settings - Option RandomizeShuffle = Option::Bool("Randomize Settings", {"No","Yes"}, OptionCategory::Toggle); - Option ShuffleRewards = Option::U8 ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"}); - Option LinksPocketItem = Option::U8 ("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}); - Option ShuffleSongs = Option::U8 ("Shuffle Songs", {"Song locations", "Dungeon rewards", "Anywhere"}); - Option Shopsanity = Option::U8 ("Shopsanity", {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"}); - Option ShopsanityPrices = Option::U8 ("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" }); - Option ShopsanityPricesAffordable = Option::Bool("Affordable Prices", {"Off", "On"}); - Option Tokensanity = Option::U8 ("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}); - Option Scrubsanity = Option::U8 ("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}); - Option ShuffleCows = Option::Bool("Shuffle Cows", {"Off", "On"}); - Option ShuffleKokiriSword = Option::Bool("Shuffle Kokiri Sword", {"Off", "On"}); - Option ShuffleOcarinas = Option::Bool("Shuffle Ocarinas", {"Off", "On"}); - Option ShuffleWeirdEgg = Option::Bool("Shuffle Weird Egg", {"Off", "On"}); - Option ShuffleGerudoToken = Option::Bool("Shuffle Gerudo Card", {"Off", "On"}); - Option ShuffleMagicBeans = Option::Bool("Shuffle Magic Beans", {"Off", "On"}); - Option ShuffleMerchants = Option::U8 ("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}); - Option ShuffleFrogSongRupees = Option::Bool("Shuffle Frog Song Rupees",{"Off", "On"}); - Option ShuffleAdultTradeQuest = Option::Bool("Shuffle Adult Trade", {"Off", "On"}); - Option ShuffleChestMinigame = Option::U8 ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"}); - Option Shuffle100GSReward = Option::Bool("Shuffle 100 GS Reward", {"Off", "On"}); + Option RandomizeShuffle = Option::Bool("Randomize Settings", {"No","Yes"}, OptionCategory::Toggle); + Option ShuffleRewards = Option::U8 ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"}); + Option LinksPocketItem = Option::U8 ("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}); + Option ShuffleSongs = Option::U8 ("Shuffle Songs", {"Song locations", "Dungeon rewards", "Anywhere"}); + Option Shopsanity = Option::U8 ("Shopsanity", {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"}); + Option ShopsanityPrices = Option::U8 ("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" }); + Option ShopsanityPricesAffordable = Option::Bool("Affordable Prices", {"Off", "On"}); + Option Tokensanity = Option::U8 ("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}); + Option Scrubsanity = Option::U8 ("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}); + Option ShuffleCows = Option::Bool("Shuffle Cows", {"Off", "On"}); + Option ShuffleKokiriSword = Option::Bool("Shuffle Kokiri Sword", {"Off", "On"}); + Option ShuffleMasterSword = Option::Bool("Shuffle Master Sword", {"Off", "On"}); + Option ShuffleOcarinas = Option::Bool("Shuffle Ocarinas", {"Off", "On"}); + Option ShuffleWeirdEgg = Option::Bool("Shuffle Weird Egg", {"Off", "On"}); + Option ShuffleGerudoToken = Option::Bool("Shuffle Gerudo Card", {"Off", "On"}); + Option ShuffleMagicBeans = Option::Bool("Shuffle Magic Beans", {"Off", "On"}); + Option ShuffleMerchants = Option::U8 ("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}); + Option ShuffleFrogSongRupees = Option::Bool("Shuffle Frog Song Rupees",{"Off", "On"}); + Option ShuffleAdultTradeQuest = Option::Bool("Shuffle Adult Trade", {"Off", "On"}); + Option ShuffleChestMinigame = Option::U8 ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"}); + Option Shuffle100GSReward = Option::Bool("Shuffle 100 GS Reward", {"Off", "On"}); + std::vector