diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2026-07-19 10:59:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-19 07:59:01 -0700 |
| commit | a6850d214927aafa2635177510a5029ab7e989ea (patch) | |
| tree | 95d5d573da41d50cd4b32df9607d124c91e8f6e3 /tools | |
| parent | 5fd95d51f9ca06194a88c37362461e661c2e9ab6 (diff) | |
* Document a few symbols regarding the Ikana Canyon guard
* Use switch-case in lieu of temp
* Reformat switch-case
* Re-format switch-case, fix braces
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/n64-jp-1.1/functions.txt | 2 | ||||
| -rw-r--r-- | tools/disasm/n64-us/functions.txt | 2 | ||||
| -rw-r--r-- | tools/overlayhelpers/mscriptdis.py | 4 | ||||
| -rwxr-xr-x | tools/weekeventregconvert.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/disasm/n64-jp-1.1/functions.txt b/tools/disasm/n64-jp-1.1/functions.txt index 41b3b6889..27a2aa128 100644 --- a/tools/disasm/n64-jp-1.1/functions.txt +++ b/tools/disasm/n64-jp-1.1/functions.txt @@ -12985,7 +12985,7 @@ func_80B0F7FC = 0x80B12B9C; // type:func size:0xFC func_80B0F8F8 = 0x80B12C98; // type:func size:0x84 func_80B0F97C = 0x80B12D1C; // type:func size:0x88 func_80B0FA04 = 0x80B12DA4; // type:func size:0x44 -func_80B0FA48 = 0x80B12DE8; // type:func size:0xDC +EnGb2_MustTalkManually = 0x80B12DE8; // type:func size:0xDC func_80B0FB24 = 0x80B12EC4; // type:func size:0xCC func_80B0FBF0 = 0x80B12F90; // type:func size:0x19C func_80B0FD8C = 0x80B1312C; // type:func size:0x8C diff --git a/tools/disasm/n64-us/functions.txt b/tools/disasm/n64-us/functions.txt index 0753b9e96..5683abf80 100644 --- a/tools/disasm/n64-us/functions.txt +++ b/tools/disasm/n64-us/functions.txt @@ -12991,7 +12991,7 @@ func_80B0F7FC = 0x80B0F7FC; // type:func func_80B0F8F8 = 0x80B0F8F8; // type:func func_80B0F97C = 0x80B0F97C; // type:func func_80B0FA04 = 0x80B0FA04; // type:func -func_80B0FA48 = 0x80B0FA48; // type:func +EnGb2_MustTalkManually = 0x80B0FA48; // type:func func_80B0FB24 = 0x80B0FB24; // type:func func_80B0FBF0 = 0x80B0FBF0; // type:func func_80B0FD8C = 0x80B0FD8C; // type:func diff --git a/tools/overlayhelpers/mscriptdis.py b/tools/overlayhelpers/mscriptdis.py index 412201b18..07e728bc2 100644 --- a/tools/overlayhelpers/mscriptdis.py +++ b/tools/overlayhelpers/mscriptdis.py @@ -706,8 +706,8 @@ week_event_reg = { (80 << 8) | 0x04: "WEEKEVENTREG_80_04", (80 << 8) | 0x08: "WEEKEVENTREG_80_08", (80 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_PRIORITY_MAIL", - (80 << 8) | 0x20: "WEEKEVENTREG_80_20", - (80 << 8) | 0x40: "WEEKEVENTREG_80_40", + (80 << 8) | 0x20: "WEEKEVENTREG_TALKED_TO_CANYON_GUARD_WITH_NO_MASK", + (80 << 8) | 0x40: "WEEKEVENTREG_TALKED_TO_CANYON_GUARD_WITH_CAPTAINS_HAT", (80 << 8) | 0x80: "WEEKEVENTREG_80_80", (81 << 8) | 0x01: "WEEKEVENTREG_81_01", (81 << 8) | 0x02: "WEEKEVENTREG_81_02", diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index 7b8dd7604..4483fc57d 100755 --- a/tools/weekeventregconvert.py +++ b/tools/weekeventregconvert.py @@ -649,8 +649,8 @@ weekEventReg = { (80 << 8) | 0x04: "WEEKEVENTREG_80_04", (80 << 8) | 0x08: "WEEKEVENTREG_80_08", (80 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_PRIORITY_MAIL", - (80 << 8) | 0x20: "WEEKEVENTREG_80_20", - (80 << 8) | 0x40: "WEEKEVENTREG_80_40", + (80 << 8) | 0x20: "WEEKEVENTREG_TALKED_TO_CANYON_GUARD_WITH_NO_MASK", + (80 << 8) | 0x40: "WEEKEVENTREG_TALKED_TO_CANYON_GUARD_WITH_CAPTAINS_HAT", (80 << 8) | 0x80: "WEEKEVENTREG_80_80", (81 << 8) | 0x01: "WEEKEVENTREG_81_01", (81 << 8) | 0x02: "WEEKEVENTREG_81_02", |