summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Longstaff <JordanLongstaff@users.noreply.github.com>2026-04-17 07:26:40 -0400
committerGitHub <noreply@github.com>2026-04-17 07:26:40 -0400
commit9eb9f6f9786bef851871630e2009c01ea11cbff8 (patch)
treed8769b8b28460e87d23c67c603c0af67fd41d926
parent6eb574fff775a66f3371c3bd91afc751a72ca190 (diff)
Document `WEEKEVENTREG` enabling peephole in Curiosity Shop (#1870)
-rw-r--r--include/z64save.h2
-rw-r--r--src/overlays/actors/ovl_En_Test3/z_en_test3.c8
-rw-r--r--src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c2
-rw-r--r--tools/disasm/n64-jp-1.1/functions.txt2
-rw-r--r--tools/disasm/n64-us/functions.txt2
-rw-r--r--tools/overlayhelpers/mscriptdis.py2
-rwxr-xr-xtools/weekeventregconvert.py2
7 files changed, 10 insertions, 10 deletions
diff --git a/include/z64save.h b/include/z64save.h
index ecbe36d9b..cf4ca90bc 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -1246,7 +1246,7 @@ typedef enum {
#define WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_LOW_BIT PACK_WEEKEVENTREG_FLAG(64, 0x08)
#define WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_HIGH_BIT PACK_WEEKEVENTREG_FLAG(64, 0x10)
-#define WEEKEVENTREG_64_20 PACK_WEEKEVENTREG_FLAG(64, 0x20)
+#define WEEKEVENTREG_CAN_USE_CURIOSITY_SHOP_PEEPHOLE PACK_WEEKEVENTREG_FLAG(64, 0x20)
#define WEEKEVENTREG_64_40 PACK_WEEKEVENTREG_FLAG(64, 0x40)
#define WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1 PACK_WEEKEVENTREG_FLAG(64, 0x80)
#define WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_1 PACK_WEEKEVENTREG_FLAG(65, 0x01)
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
index 2275b54a9..c3abb7379 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
@@ -79,7 +79,7 @@ void func_80A40678(EnTest3* this, PlayState* play);
void func_80A40824(EnTest3* this, PlayState* play);
void func_80A4084C(EnTest3* this, PlayState* play);
void func_80A40908(EnTest3* this, PlayState* play);
-void func_80A40A6C(EnTest3* this, PlayState* play);
+void EnTest3_EnablePeephole(EnTest3* this, PlayState* play);
#include "src/overlays/actors/ovl_En_Test3/scheduleScripts.schl.inc"
@@ -96,7 +96,7 @@ ActorProfile En_Test3_Profile = {
};
static struct_80A4168C D_80A4168C[] = {
- { func_80A40A6C, NULL },
+ { EnTest3_EnablePeephole, NULL },
{ NULL, NULL },
};
@@ -1014,8 +1014,8 @@ void func_80A409D4(EnTest3* this, PlayState* play) {
}
}
-void func_80A40A6C(EnTest3* this, PlayState* play) {
- SET_WEEKEVENTREG(WEEKEVENTREG_64_20);
+void EnTest3_EnablePeephole(EnTest3* this, PlayState* play) {
+ SET_WEEKEVENTREG(WEEKEVENTREG_CAN_USE_CURIOSITY_SHOP_PEEPHOLE);
}
void EnTest3_Update(Actor* thisx, PlayState* play2) {
diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
index cc67d6c21..86f1b6b5f 100644
--- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
+++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
@@ -405,7 +405,7 @@ void func_80BA311C(ObjNozoki* this, PlayState* play) {
}
void func_80BA3230(ObjNozoki* this, PlayState* play) {
- if (CHECK_WEEKEVENTREG(WEEKEVENTREG_64_20)) {
+ if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CAN_USE_CURIOSITY_SHOP_PEEPHOLE)) {
Actor* npc = play->actorCtx.actorLists[ACTORCAT_NPC].first;
Actor* test3 = SubS_FindActor(play, npc, ACTORCAT_NPC, ACTOR_EN_TEST3);
diff --git a/tools/disasm/n64-jp-1.1/functions.txt b/tools/disasm/n64-jp-1.1/functions.txt
index d1f93e964..f66e723ee 100644
--- a/tools/disasm/n64-jp-1.1/functions.txt
+++ b/tools/disasm/n64-jp-1.1/functions.txt
@@ -10392,7 +10392,7 @@ func_80A40824 = 0x80A438A4; // type:func size:0x28
func_80A4084C = 0x80A438CC; // type:func size:0xBC
func_80A40908 = 0x80A43988; // type:func size:0xCC
func_80A409D4 = 0x80A43A54; // type:func size:0x98
-func_80A40A6C = 0x80A43AEC; // type:func size:0x24
+EnTest3_EnablePeephole = 0x80A43AEC; // type:func size:0x24
EnTest3_Update = 0x80A43B10; // type:func size:0x260
EnTest3_OverrideLimbDraw = 0x80A43D70; // type:func size:0x244
EnTest3_PostLimbDraw = 0x80A43FB4; // type:func size:0x368
diff --git a/tools/disasm/n64-us/functions.txt b/tools/disasm/n64-us/functions.txt
index 3b7469813..233ebbca8 100644
--- a/tools/disasm/n64-us/functions.txt
+++ b/tools/disasm/n64-us/functions.txt
@@ -10394,7 +10394,7 @@ func_80A40824 = 0x80A40824; // type:func
func_80A4084C = 0x80A4084C; // type:func
func_80A40908 = 0x80A40908; // type:func
func_80A409D4 = 0x80A409D4; // type:func
-func_80A40A6C = 0x80A40A6C; // type:func
+EnTest3_EnablePeephole = 0x80A40A6C; // type:func
EnTest3_Update = 0x80A40A90; // type:func
EnTest3_OverrideLimbDraw = 0x80A40CF0; // type:func
EnTest3_PostLimbDraw = 0x80A40F34; // type:func
diff --git a/tools/overlayhelpers/mscriptdis.py b/tools/overlayhelpers/mscriptdis.py
index 0efba0c82..76ca6181a 100644
--- a/tools/overlayhelpers/mscriptdis.py
+++ b/tools/overlayhelpers/mscriptdis.py
@@ -578,7 +578,7 @@ week_event_reg = {
(64 << 8) | 0x04: "WEEKEVENTREG_64_04",
(64 << 8) | 0x08: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_LOW_BIT",
(64 << 8) | 0x10: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_HIGH_BIT",
- (64 << 8) | 0x20: "WEEKEVENTREG_64_20",
+ (64 << 8) | 0x20: "WEEKEVENTREG_CAN_USE_CURIOSITY_SHOP_PEEPHOLE",
(64 << 8) | 0x40: "WEEKEVENTREG_64_40",
(64 << 8) | 0x80: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1",
(65 << 8) | 0x01: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_1",
diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py
index 5e8e7cfc6..b4d2e9e2a 100755
--- a/tools/weekeventregconvert.py
+++ b/tools/weekeventregconvert.py
@@ -521,7 +521,7 @@ weekEventReg = {
(64 << 8) | 0x04: "WEEKEVENTREG_64_04",
(64 << 8) | 0x08: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_LOW_BIT",
(64 << 8) | 0x10: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_HIGH_BIT",
- (64 << 8) | 0x20: "WEEKEVENTREG_64_20",
+ (64 << 8) | 0x20: "WEEKEVENTREG_CAN_USE_CURIOSITY_SHOP_PEEPHOLE",
(64 << 8) | 0x40: "WEEKEVENTREG_64_40",
(64 << 8) | 0x80: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1",
(65 << 8) | 0x01: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_1",