Skip to content

Commit cc5d4f2

Browse files
Admentus64Admentus64
committed
Update v23.3.0
1 parent 6e11d2f commit cc5d4f2

File tree

8 files changed

+242
-205
lines changed

8 files changed

+242
-205
lines changed

‎Files/Games/Majora's Mask/redux.ppf‎

73.3 KB
Binary file not shown.

‎Files/Games/Majora's Mask/symbols.json‎

Lines changed: 81 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,89 @@
11
{
2-
"CFG_B_BUTTON_ITEM_ENABLED": "03800047",
2+
"CFG_BOSS_REMAINS_BOMBCHU_DROPS": "03800056",
3+
"CFG_BOSS_REMAINS_DEKU_HOP": "03800054",
4+
"CFG_BOSS_REMAINS_HEALTH_BAR": "03800055",
5+
"CFG_BOSS_REMAINS_UNDERWATER_OCARINA": "03800053",
6+
"CFG_B_BUTTON_ITEM_ENABLED": "03800048",
7+
"CFG_CLOCK_CONTROL_ENABLED": "03800042",
38
"CFG_DUAL_DPAD_ENABLED": "03800041",
4-
"CFG_FLOW_OF_TIME_ENABLED": "03800048",
5-
"CFG_FPS_ENABLED": "0380004E",
6-
"CFG_HIDE_HUD_ENABLED": "03800043",
7-
"CFG_INFINITE_AMMO": "0380004C",
8-
"CFG_INFINITE_HEALTH": "0380004A",
9-
"CFG_INFINITE_MAGIC": "0380004B",
10-
"CFG_INFINITE_RUPEES": "0380004D",
11-
"CFG_INSTANT_ELEGY_ENABLED": "03800049",
12-
"CFG_INVENTORY_EDITOR_ENABLED": "0380004F",
13-
"CFG_OCARINA_ICONS_ENABLED": "03800042",
14-
"CFG_RUPEE_DRAIN": "03800050",
15-
"CFG_SKIP_GUARD_ENABLED": "03800044",
16-
"CFG_SWAP_ENABLED": "03800045",
17-
"CFG_UNEQUIP_ENABLED": "03800046",
9+
"CFG_FIERCE_DEITY_GIANTS_MASK": "03800057",
10+
"CFG_FLOW_OF_TIME_ENABLED": "03800049",
11+
"CFG_FPS_ENABLED": "03800050",
12+
"CFG_HIDE_HUD_ENABLED": "03800044",
13+
"CFG_INFINITE_AMMO": "0380004E",
14+
"CFG_INFINITE_HEALTH": "0380004C",
15+
"CFG_INFINITE_MAGIC": "0380004D",
16+
"CFG_INFINITE_RUPEES": "0380004F",
17+
"CFG_INSTANT_ELEGY_ENABLED": "0380004A",
18+
"CFG_INVENTORY_EDITOR_ENABLED": "03800051",
19+
"CFG_INVERSE_AIM": "0380004B",
20+
"CFG_OCARINA_ICONS_ENABLED": "03800043",
21+
"CFG_RUPEE_DRAIN": "03800052",
22+
"CFG_SKIP_GUARD_ENABLED": "03800045",
23+
"CFG_SWAP_ENABLED": "03800046",
24+
"CFG_UNEQUIP_ENABLED": "03800047",
1825
"CFG_WS_ENABLED": "03800040",
19-
"DPAD_CONFIG": "03811990",
20-
"DPAD_TEXTURE": "03814828",
21-
"EXT_MSG_DATA_FILE": "038122E8",
22-
"EXT_MSG_TABLE": "038137A8",
23-
"EXT_MSG_TABLE_COUNT": "03812280",
24-
"EXT_OBJECTS": "03812310",
25-
"FONT_TEXTURE": "03815828",
26+
"DPAD_CONFIG": "03818610",
27+
"DPAD_TEXTURE": "0381A710",
28+
"DUNGEON_MAP_LINK_HEAD_TEXTURE": "0381DF58",
29+
"EXT_OBJECTS": "03818DD0",
30+
"FONT_TEXTURE": "0381B710",
2631
"G_C_HEAP": "03820000",
2732
"G_PAYLOAD_ADDR": "03800000",
28-
"HASH_ICONS": "03811A24",
29-
"HUD_COLOR_CONFIG": "03811A8C",
30-
"ITEM_OVERRIDE_COUNT": "0381227C",
31-
"ITEM_OVERRIDE_ENTRIES": "03812528",
32-
"MISC_CONFIG": "03812094",
33-
"MMR_CONFIG": "03811B8C",
34-
"MUSIC_CONFIG": "038120BC",
33+
"HUD_COLOR_CONFIG": "038186AC",
34+
"HUD_TOGGLE_TEXTURE": "0381DED8",
35+
"ITEM_OVERRIDE_COUNT": "03818BD8",
36+
"ITEM_OVERRIDE_ENTRIES": "03818F9C",
37+
"MISC_CONFIG": "03818914",
38+
"MMR_CONFIG": "0381878C",
39+
"MUSIC_CONFIG": "038189C8",
3540
"OPTIONS_CONTEXT": "0380003C",
36-
"PAYLOAD_END": "03815830",
41+
"PARAMETER_AMMO_DIGIT_TEXTURE": "0381D1D8",
42+
"PARAMETER_CLOCK_TEXTURE": "0381D458",
43+
"PARAMETER_COUNTER_TEXTURE": "0381CBD8",
44+
"PARAMETER_NOTE_BUTTONS_TEXTURE": "0381D558",
45+
"PARAMETER_SUN_MOON_TEXTURE": "0381DA58",
46+
"PAYLOAD_END": "0381E160",
3747
"PAYLOAD_START": "03800000",
38-
"SAVE_FILE_CONFIG": "03812150",
39-
"TOWN_FAIRY_BYTES": "03813AA8",
40-
"WORLD_COLOR_CONFIG": "03812220",
41-
"block": "038122B6",
42-
"deku_stick_timer_switch": "038122C8",
43-
"dpad_alt": "038122B9",
44-
"elegy_timer": "038122C2",
45-
"forceSpawn": "038122FC",
46-
"fps_switch": "03812279",
47-
"gExternalEffects": "038119AC",
48-
"gHeapNext": "03812308",
49-
"gObjheap": "038139A8",
50-
"gObjheapItems": "038139C0",
51-
"gPlayUpdateInput": "03812410",
52-
"gSetupDb": "038121D0",
53-
"gSpriteDpad": "038121C0",
54-
"gSpriteFairy": "03812180",
55-
"gSpriteFont": "038121B0",
56-
"gSpriteIcon": "038121A0",
57-
"gSpriteIcon24": "03812190",
58-
"gStaticAddressConfig": "038121F8",
59-
"hud_counter": "038122B7",
60-
"hud_hearts_hide": "03812278",
61-
"hud_hide": "038122B8",
62-
"last_time": "038122C6",
63-
"pressed": "038122B0",
64-
"redraw_b_button": "038122F4",
65-
"rupee_drain_frames": "038122BB",
66-
"rupee_drain_secs": "038122BA",
67-
"started_timer": "038122C4",
68-
"time_tracker": "038122BC"
48+
"SAVE_FILE_CONFIG": "03818A14",
49+
"WORLD_COLOR_CONFIG": "03818B64",
50+
"add_time": "03818C6E",
51+
"block": "03818C09",
52+
"changed_time": "03818C6D",
53+
"clock_control_button_frames": "03818C6C",
54+
"clock_controls": "03818C72",
55+
"deku_stick_timer_switch": "03818C1C",
56+
"dpad_alt": "03818C0C",
57+
"elegy_timer": "03818C16",
58+
"fps_switch": "03818BD4",
59+
"gDungeonMapLinkHead": "03818A48",
60+
"gExternalEffects": "0381862C",
61+
"gHeapNext": "03818CCC",
62+
"gHudToggle": "03818A58",
63+
"gObjheap": "0381A41C",
64+
"gObjheapItems": "0381A434",
65+
"gParameterAmmoDigit": "03818A98",
66+
"gParameterClock": "03818A88",
67+
"gParameterCounter": "03818AA8",
68+
"gParameterNoteButtons": "03818A78",
69+
"gParameterSunMoon": "03818A68",
70+
"gPlayUpdateInput": "03818F84",
71+
"gSetupDb": "03818B08",
72+
"gShouldForceItemSpawn": "03818C51",
73+
"gSpriteDpad": "03818AF8",
74+
"gSpriteFont": "03818AE8",
75+
"gSpriteIcon": "03818AD8",
76+
"gSpriteIcon24": "03818AC8",
77+
"hour_table": "038189DC",
78+
"hud_counter": "03818C0A",
79+
"hud_hide": "03818C0B",
80+
"last_time": "03818C1A",
81+
"new_time": "03818C70",
82+
"pressed": "03818F50",
83+
"redraw_b_button": "03818C73",
84+
"rupee_drain_frames": "03818C0E",
85+
"rupee_drain_secs": "03818C0D",
86+
"started_timer": "03818C18",
87+
"time_tracker": "03818C10",
88+
"used_block": "03818C08"
6989
}

‎Files/Scripts/Common.psm1‎

Lines changed: 59 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function SetWiiVCMode([boolean]$Enable=!$IsWiiVC) {
1212
if ($RightPanel.Options.Controls.ContainsKey("OptionsPanel")) { ShowRightPanel $RightPanel.Options } else { ShowRightPanel $RightPanel.Settings }
1313
}
1414

15-
ChangeGamesList
16-
ChangePatchList
15+
if ( ($GamePatch.console -eq "Native" -and $WiiVC) -or ($GamePatch.console -eq "Wii VC" -and !$WiiVC) ) { ChangePatch }
16+
1717
SetVCContent
1818
if ( (TestFile $GameFiles.controls) -and $GameSettings -ne $null -and $IsWiiVC) { CreateVCRemapPanel }
1919
SetModeLabel
@@ -48,12 +48,7 @@ function ChangeConsolesList() {
4848

4949
# Reset
5050
$CurrentGame.Console.Items.Clear()
51-
52-
$Items = @()
53-
foreach ($item in $Files.json.consoles) {
54-
$Items += $item.title
55-
}
56-
51+
$Items = $Files.json.consoles.title
5752
$CurrentGame.Console.Items.AddRange($Items)
5853

5954
# Reset last index
@@ -92,10 +87,7 @@ function ChangeGamesList() {
9287

9388
$items = @()
9489
foreach ($item in $Files.json.games) {
95-
if ( ($CurrentGame.Console.Text -eq $GameConsole.title) -and ($GameConsole.mode -contains $item.console) ) {
96-
if ( ( $IsWiiVC -and $item.support_vc -eq 1) -or (!$IsWiiVC) ) { $items += $item.title }
97-
}
98-
elseif ($item.console -contains "All") { $items += $item.title }
90+
if ( ($CurrentGame.Console.Text -eq $GameConsole.title -and $GameConsole.mode -contains $item.console) -or $item.console -contains "All") { $items += $item.title }
9991
}
10092

10193
$CurrentGame.Game.Items.AddRange($items)
@@ -127,16 +119,7 @@ function ChangePatchList() {
127119
# Reset
128120
$Patches.Group.Text = $GameType.mode + " - Patch Options"
129121
$Patches.Type.Items.Clear()
130-
131-
# Set combobox for patches
132-
foreach ($item in $Files.json.patches) {
133-
if (!(CheckIfScriptOrPatchExists -Item $item)) { continue }
134-
135-
if (!(IsSet $item.patch)) { $Patches.Type.Items.Add($item.title) }
136-
else {
137-
if ( ( ($IsWiiVC -and $item.console -eq "Wii VC") -or (!$IsWiiVC -and $item.console -eq "Native") -or ($item.console -eq "Both") -or !(IsSet $item.console) ) ) { $Patches.Type.Items.Add($item.title) }
138-
}
139-
}
122+
$Patches.Type.Items.AddRange(($Files.json.patches.title | Get-Unique))
140123

141124
# Reset last index
142125
foreach ($index in $Patches.Type.Items) {
@@ -442,53 +425,55 @@ function ChangePatch() {
442425

443426
foreach ($item in $Files.json.patches) {
444427
if ($item.title -eq $Patches.Type.Text -and ( ($IsWiiVC -and $item.console -eq "Wii VC") -or (!$IsWiiVC -and $item.console -eq "Native") -or ($item.console -eq "Both") -or !(IsSet $item.console) ) ) {
445-
$global:GamePatch = $item
446-
$PatchToolTip.SetToolTip($Patches.Button, ([string]::Format($item.tooltip, [Environment]::NewLine)))
447-
GetHeader
448-
GetRegion
428+
if ( ($item.console -eq "Native" -and $IsWiiVC) -or ($item.console -eq "Wii VC" -and !$IsWiiVC) ) { continue }
429+
430+
$global:GamePatch = $item
431+
$PatchToolTip.SetToolTip($Patches.Button, ([string]::Format($item.tooltip, [Environment]::NewLine)))
432+
GetHeader
433+
GetRegion
449434

450-
if ( (IsSet $GamePatch.script) -or (TestFile $GameFiles.controls) ) {
451-
$global:GameSettingsFile = GetGameSettingsFile
452-
$global:GameSettings = GetSettings $GameSettingsFile
453-
}
435+
if ( (IsSet $GamePatch.script) -or (TestFile $GameFiles.controls) ) {
436+
$global:GameSettingsFile = GetGameSettingsFile
437+
$global:GameSettings = GetSettings $GameSettingsFile
438+
}
454439

455-
$CustomHeader.ROMTitle.Refresh()
456-
$CustomHeader.ROMGameID.Refresh()
457-
$CustomHeader.VCTitle.Refresh()
458-
$CustomHeader.VCGameID.Refresh()
440+
$CustomHeader.ROMTitle.Refresh()
441+
$CustomHeader.ROMGameID.Refresh()
442+
$CustomHeader.VCTitle.Refresh()
443+
$CustomHeader.VCGameID.Refresh()
459444

460-
ChangeGameRev
461-
SetGameScript
445+
ChangeGameRev
446+
SetGameScript
462447

463-
# If the patch is a preset disable all options buttons
464-
if (IsSet $GamePatch.preset) {
465-
EnableElem -Elem @($Patches.Extend, $Patches.ExtendLabel, $Patches.Redux, $Patches.ReduxLabel, $Patches.Options, $Patches.OptionsLabel, $Patches.PreviewButton, $Redux.WindowPanel) -Active $False -Hide
466-
foreach ($item in $Redux.Groups) {
467-
if ($item.IsRedux) { EnableElem -Elem $item -Active $True }
468-
}
469-
}
470-
else { # Patches with additional options when available
471-
# Disable boxes if needed
472-
EnableElem -Elem @($Patches.Extend, $Patches.ExtendLabel) -Active (IsSet $GamePatch.allow_extend) -Hide
473-
EnableElem -Elem @($Patches.Redux, $Patches.ReduxLabel) -Active (IsSet $GamePatch.redux) -Hide
474-
EnableElem -Elem @($Patches.Options, $Patches.OptionsLabel) -Active (IsSet $GamePatch.script) -Hide
475-
EnableElem -Elem $Redux.WindowPanel -Active $Patches.Options.Checked
476-
DisableReduxOptions
477-
if (HasCommand "CreateOptionsPreviews") { EnableElem -Elem $Patches.PreviewButton -Active $True -Hide } else { EnableElem -Elem $Patches.PreviewButton -Active $False -Hide }
448+
# If the patch is a preset disable all options buttons
449+
if (IsSet $GamePatch.preset) {
450+
EnableElem -Elem @($Patches.Extend, $Patches.ExtendLabel, $Patches.Redux, $Patches.ReduxLabel, $Patches.Options, $Patches.OptionsLabel, $Patches.PreviewButton, $Redux.WindowPanel) -Active $False -Hide
451+
foreach ($item in $Redux.Groups) {
452+
if ($item.IsRedux) { EnableElem -Elem $item -Active $True }
478453
}
454+
}
455+
else { # Patches with additional options when available
456+
# Disable boxes if needed
457+
EnableElem -Elem @($Patches.Extend, $Patches.ExtendLabel) -Active (IsSet $GamePatch.allow_extend) -Hide
458+
EnableElem -Elem @($Patches.Redux, $Patches.ReduxLabel) -Active (IsSet $GamePatch.redux) -Hide
459+
EnableElem -Elem @($Patches.Options, $Patches.OptionsLabel) -Active (IsSet $GamePatch.script) -Hide
460+
EnableElem -Elem $Redux.WindowPanel -Active $Patches.Options.Checked
461+
DisableReduxOptions
462+
if (HasCommand "CreateOptionsPreviews") { EnableElem -Elem $Patches.PreviewButton -Active $True -Hide } else { EnableElem -Elem $Patches.PreviewButton -Active $False -Hide }
463+
}
479464

480-
# Create VC controls panel
481-
if ($RightPanel.RemapControls.Controls.ContainsKey("RemapVCControlsPanel")) { $RightPanel.RemapControls.Controls.RemoveByKey("RemapVCControlsPanel") }
482-
if ( (TestFile $GameFiles.controls) -and $GameSettings -ne $null) {
483-
$Files.json.controls = SetJSONFile $GameFiles.controls
484-
if ($IsWiiVC) { CreateVCRemapPanel } # Create VC remap settings
485-
}
486-
else {
487-
$Files.json.controls = $null
488-
if ($RightPanel.RemapControls.Visible) { ShowRightPanel $RightPanel.Options }
489-
}
465+
# Create VC controls panel
466+
if ($RightPanel.RemapControls.Controls.ContainsKey("RemapVCControlsPanel")) { $RightPanel.RemapControls.Controls.RemoveByKey("RemapVCControlsPanel") }
467+
if ( (TestFile $GameFiles.controls) -and $GameSettings -ne $null) {
468+
$Files.json.controls = SetJSONFile $GameFiles.controls
469+
if ($IsWiiVC) { CreateVCRemapPanel } # Create VC remap settings
470+
}
471+
else {
472+
$Files.json.controls = $null
473+
if ($RightPanel.RemapControls.Visible) { ShowRightPanel $RightPanel.Options }
474+
}
490475

491-
break
476+
break
492477
}
493478
}
494479

@@ -599,12 +584,18 @@ function SetModeLabel() {
599584
#==================================================================================================================================================================================================================================================================
600585
function EnablePatchButtons() {
601586

602-
if ($GamePath -eq $null) { $enable = $False }
603-
else { $enable = ($GamePath.Extension -eq ".wad" -and $IsWiiVC) -or ($GamePath.Extension -ne ".wad" -and !$IsWiiVC) }
604-
605-
if ($enable) { UpdateStatusLabel "Ready to patch!" -NoConsole } # Set the status that we are ready to roll... Or not...
606-
elseif ($IsWiiVC) { UpdateStatusLabel "Select your Wii VC WAD file to continue." -NoConsole }
607-
else { UpdateStatusLabel "Select your ROM file to continue." -NoConsole }
587+
if ($GamePath -eq $null) { $enable = $False }
588+
elseif ($GamePatch.console -eq "Native" -and $WiiVC) { $enable = $False }
589+
elseif ($GamePatch.console -eq "Wii VC" -and !$WiiVC) { $enable = $False }
590+
elseif ($GameType.support_vc -eq 0 -and $WiiVC) { $enable = $False }
591+
else { $enable = ($GamePath.Extension -eq ".wad" -and $IsWiiVC) -or ($GamePath.Extension -ne ".wad" -and !$IsWiiVC) }
592+
593+
if ($GameType.support_vc -eq 0 -and $WiiVC) { UpdateStatusLabel "This game does not support Wii VC!" -NoConsole }
594+
elseif ($GamePatch.console -eq "Native" -and $WiiVC) { UpdateStatusLabel "This patch does not support Wii VC!" -NoConsole }
595+
elseif ($GamePatch.console -eq "Wii VC" -and !$WiiVC) { UpdateStatusLabel "This patch only supports Wii VC!" -NoConsole }
596+
elseif ($enable) { UpdateStatusLabel "Ready to patch!" -NoConsole } # Set the status that we are ready to roll... Or not...
597+
elseif ($IsWiiVC) { UpdateStatusLabel "Select your Wii VC WAD file to continue." -NoConsole }
598+
else { UpdateStatusLabel "Select your ROM file to continue." -NoConsole }
608599

609600
$Patches.Button.Enabled = $CustomHeader.Panel.Enabled = $VC.ExtractROMButton.Enabled = $enable # Enable patcher buttons
610601

‎Files/Scripts/Main.psm1‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -415,14 +415,7 @@ function InitializeEvents() {
415415
# Current Game
416416
$CurrentGame.Console.Add_SelectedIndexChanged({
417417
$Settings["Core"][$this.Name] = $this.SelectedIndex
418-
if ($this.Text -ne $GameConsole.title) {
419-
$switchedWiiVC = $IsWiiVC
420-
ChangeGamesList
421-
if ($switchedWiiVC -ne $IsWiiVC) {
422-
ChangePatchList
423-
ChangeGameMode
424-
}
425-
}
418+
if ($this.Text -ne $GameConsole.title) { ChangeGamesList }
426419
})
427420

428421
$CurrentGame.Game.Add_SelectedIndexChanged({

0 commit comments

Comments
 (0)