5 files changed, 15 insertions, 15 deletions
diff --git a/tools/disasm/n64-jp-1.1/functions.txt b/tools/disasm/n64-jp-1.1/functions.txt
index f66e723ee..7903d5cef 100644
--- a/tools/disasm/n64-jp-1.1/functions.txt
+++ b/tools/disasm/n64-jp-1.1/functions.txt
@@ -16522,12 +16522,12 @@ EnBombers_Draw = 0x80C074A4; // type:func size:0x13C
 EnBombers2_Init = 0x80C077C0; // type:func size:0x150
 EnBombers2_Destroy = 0x80C07910; // type:func size:0x2C
 EnBombers2_ChangeAnim = 0x80C0793C; // type:func size:0x94
-func_80C04B40 = 0x80C079D0; // type:func size:0x60
-func_80C04BA0 = 0x80C07A30; // type:func size:0x160
-func_80C04D00 = 0x80C07B90; // type:func size:0x8C
-func_80C04D8C = 0x80C07C1C; // type:func size:0x32C
-func_80C050B8 = 0x80C07F48; // type:func size:0x154
-func_80C0520C = 0x80C0809C; // type:func size:0x1EC
+EnBombers2_SetupAwaitTalk = 0x80C079D0; // type:func size:0x60
+EnBombers2_AwaitTalk = 0x80C07A30; // type:func size:0x160
+EnBombers2_SetupTalking = 0x80C07B90; // type:func size:0x8C
+EnBombers2_Talking = 0x80C07C1C; // type:func size:0x32C
+EnBombers2_StartWalking = 0x80C07F48; // type:func size:0x154
+EnBombers2_Walking = 0x80C0809C; // type:func size:0x1EC
 EnBombers2_Update = 0x80C08288; // type:func size:0x2DC
 EnBombers2_OverrideLimbDraw = 0x80C08564; // type:func size:0x84
 EnBombers2_Draw = 0x80C085E8; // type:func size:0x128
diff --git a/tools/disasm/n64-jp-1.1/variables.txt b/tools/disasm/n64-jp-1.1/variables.txt
index aba1d6964..a7655a18e 100644
--- a/tools/disasm/n64-jp-1.1/variables.txt
+++ b/tools/disasm/n64-jp-1.1/variables.txt
@@ -19479,7 +19479,7 @@ D_80C08790_unknown = 0x80C08790;
 D_80C087A0_unknown = 0x80C087A0;
 D_80C087A4_unknown = 0x80C087A4;
 D_80C087B0_unknown = 0x80C087B0;
-jtbl_func_80C04D8C_1 = 0x80C087C0; // type:jtbl
+jtbl_EnBombers2_UpdateTalk_1 = 0x80C087C0; // type:jtbl
 ovl_En_Bombers2_OverlayInfo = 0x80C087E0; // type:s32
 ovl_En_Bombers2_RelocCount = 0x80C087F0; // type:s32
 ovl_En_Bombers2_OverlayRelocations = 0x80C087F4; // type:s32
diff --git a/tools/disasm/n64-us/functions.txt b/tools/disasm/n64-us/functions.txt
index 2b35b88eb..bd4da6bf0 100644
--- a/tools/disasm/n64-us/functions.txt
+++ b/tools/disasm/n64-us/functions.txt
@@ -16532,12 +16532,12 @@ EnBombers_Draw = 0x80C04614; // type:func
 EnBombers2_Init = 0x80C04930; // type:func
 EnBombers2_Destroy = 0x80C04A80; // type:func
 EnBombers2_ChangeAnim = 0x80C04AAC; // type:func
-func_80C04B40 = 0x80C04B40; // type:func
-func_80C04BA0 = 0x80C04BA0; // type:func
-func_80C04D00 = 0x80C04D00; // type:func
-func_80C04D8C = 0x80C04D8C; // type:func
-func_80C050B8 = 0x80C050B8; // type:func
-func_80C0520C = 0x80C0520C; // type:func
+EnBombers2_SetupAwaitTalk = 0x80C04B40; // type:func
+EnBombers2_AwaitTalk = 0x80C04BA0; // type:func
+EnBombers2_SetupTalking = 0x80C04D00; // type:func
+EnBombers2_Talking = 0x80C04D8C; // type:func
+EnBombers2_StartWalking = 0x80C050B8; // type:func
+EnBombers2_Walking = 0x80C0520C; // type:func
 EnBombers2_Update = 0x80C053F8; // type:func
 EnBombers2_OverrideLimbDraw = 0x80C056D4; // type:func
 EnBombers2_Draw = 0x80C05758; // type:func
diff --git a/tools/overlayhelpers/mscriptdis.py b/tools/overlayhelpers/mscriptdis.py
index 76ca6181a..82c7227f2 100644
--- a/tools/overlayhelpers/mscriptdis.py
+++ b/tools/overlayhelpers/mscriptdis.py
@@ -750,7 +750,7 @@ week_event_reg = {
     (85 << 8) | 0x40: "WEEKEVENTREG_85_40",
     (85 << 8) | 0x80: "WEEKEVENTREG_85_80",
     (86 << 8) | 0x01: "WEEKEVENTREG_86_01",
-    (86 << 8) | 0x02: "WEEKEVENTREG_86_02",
+    (86 << 8) | 0x02: "WEEKEVENTREG_TALKED_TO_BOMBERS_GUARD",
     (86 << 8) | 0x04: "WEEKEVENTREG_86_04",
     (86 << 8) | 0x08: "WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION",
     (86 << 8) | 0x10: "WEEKEVENTREG_86_10",
diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py
index b4d2e9e2a..12b00f5f2 100755
--- a/tools/weekeventregconvert.py
+++ b/tools/weekeventregconvert.py
@@ -693,7 +693,7 @@ weekEventReg = {
     (85 << 8) | 0x40: "WEEKEVENTREG_85_40",
     (85 << 8) | 0x80: "WEEKEVENTREG_85_80",
     (86 << 8) | 0x01: "WEEKEVENTREG_86_01",
-    (86 << 8) | 0x02: "WEEKEVENTREG_86_02",
+    (86 << 8) | 0x02: "WEEKEVENTREG_TALKED_TO_BOMBERS_GUARD",
     (86 << 8) | 0x04: "WEEKEVENTREG_86_04",
     (86 << 8) | 0x08: "WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION",
     (86 << 8) | 0x10: "WEEKEVENTREG_86_10",