summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-09-14 15:56:57 -0400
committerEblo <7004497+Eblo@users.noreply.github.com>2025-09-14 15:56:57 -0400
commit970562e0ca1db5c4185482f0d6a849cd60eab407 (patch)
tree40104a149c2d79063730f4493644300f25554fea
parentb627ff5423d0bd563b602f4611fb4bdcd5b866b4 (diff)
Additional cleanup
-rw-r--r--mm/2s2h/DeveloperTools/SaveEditor.h6
-rw-r--r--mm/include/z64math.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/mm/2s2h/DeveloperTools/SaveEditor.h b/mm/2s2h/DeveloperTools/SaveEditor.h
index cecdbcd41..f45ffc25c 100644
--- a/mm/2s2h/DeveloperTools/SaveEditor.h
+++ b/mm/2s2h/DeveloperTools/SaveEditor.h
@@ -584,7 +584,7 @@ const std::vector<FlagTable> flagTables = {
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_GORMAN, "Notebook Row: Gorman" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_POSTMAN, "Notebook Row: Postman" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_ROSA_SISTERS, "Notebook Row: Rosa Sisters" },
- { PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_TOILET_HAND, "Notebook Row:&nbsp;???" },
+ { PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_TOILET_HAND, "Notebook Row: ???" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_ANJUS_GRANDMOTHER, "Notebook Row: Anju's Mom" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_KAMARO, "Notebook Row: Kamaro" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_MET_GROG, "Notebook Row: Grog" },
@@ -612,7 +612,7 @@ const std::vector<FlagTable> flagTables = {
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_BOMBERS_NOTEBOOK, "Notebook Item: Bombers Code" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MAYOR_HP, "Notebook Item: Mayor Dotour Piece of Heart" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROSA_SISTERS_HP, "Notebook Item: Rosa Sisters Piece of Heart" },
- { PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_TOILET_HAND_HP, "Notebook Item:&nbsp;???'s Piece of Heart" },
+ { PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_TOILET_HAND_HP, "Notebook Item: ???'s Piece of Heart" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_GRANDMA_SHORT_STORY_HP, "Notebook Item: Carnival of Time Piece of Heart" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_GRANDMA_LONG_STORY_HP, "Notebook Item: Four Giants Piece of Heart" },
{ PERSISTENT, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_POSTMAN_HP, "Notebook Item: Postman Piece of Heart" },
@@ -771,7 +771,7 @@ const std::vector<FlagTable> flagTables = {
{ PERSISTENT, WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE, "Obtained Gossip Stone Piece of Heart" },
{ CYCLE_RESET, WEEKEVENTREG_90_20, "B Button Only? (Hides Others)" },
{ CYCLE_RESET, WEEKEVENTREG_90_40, "Boat at Deku Palace" },
- { CYCLE_RESET, WEEKEVENTREG_90_80, "Helped&nbsp;???" },
+ { CYCLE_RESET, WEEKEVENTREG_90_80, "Helped ???" },
{ CYCLE_RESET, WEEKEVENTREG_91_01, "Mikau Requested Help" },
{ CYCLE_RESET, WEEKEVENTREG_91_02, "Mikau Performed His Song" },
{ CYCLE_RESET, WEEKEVENTREG_91_04, "Sent Letter to Kafei On Time" },
diff --git a/mm/include/z64math.h b/mm/include/z64math.h
index 93d0b112b..2701e4b57 100644
--- a/mm/include/z64math.h
+++ b/mm/include/z64math.h
@@ -146,7 +146,6 @@ extern Vec3f gZeroVec3f;
extern Vec3s gZeroVec3s;
#ifdef __cplusplus
-extern "C"
}
#endif