Document EnAob01 (doggy racetrack owner) and use macros for weekEventRegs in all dog racing files (#1234)

* Document EnAob01 (doggy racetrack owner) and use macros for weekEventRegs in all dog racing files

* Respond to first review

* Respond to anon's review

* Forgot a _FLAG_ on one of my flags

* Respond to anon's review

* Respond to engineer's review

* Delete extra period

* Undo the EVENTINF stuff I goofed up

* Update comment

* Fix bss

* Respond to engineer's review

3 files changed, 42 insertions, 42 deletions

diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 8cbc8f13f..157036d0c 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -8997,37 +8997,37 @@
     0x809C0E30:("EnWarpTag_GrottoReturn",),
     0x809C0F18:("EnWarptag_Update",),
     0x809C0F3C:("EnWarpTag_Draw",),
-    0x809C10B0:("func_809C10B0",),
-    0x809C1124:("func_809C1124",),
-    0x809C1158:("func_809C1158",),
-    0x809C11EC:("func_809C11EC",),
-    0x809C1304:("func_809C1304",),
-    0x809C1424:("func_809C1424",),
-    0x809C14D0:("func_809C14D0",),
-    0x809C15BC:("func_809C15BC",),
-    0x809C165C:("func_809C165C",),
-    0x809C16DC:("func_809C16DC",),
-    0x809C1C9C:("func_809C1C9C",),
-    0x809C1D64:("func_809C1D64",),
-    0x809C1EC8:("func_809C1EC8",),
-    0x809C2060:("func_809C2060",),
-    0x809C21E0:("func_809C21E0",),
-    0x809C2504:("func_809C2504",),
-    0x809C2594:("func_809C2594",),
-    0x809C25E4:("func_809C25E4",),
-    0x809C2680:("func_809C2680",),
-    0x809C26E4:("func_809C26E4",),
-    0x809C2730:("func_809C2730",),
-    0x809C2788:("func_809C2788",),
-    0x809C2824:("func_809C2824",),
-    0x809C28B8:("func_809C28B8",),
-    0x809C2A64:("func_809C2A64",),
-    0x809C2BE4:("func_809C2BE4",),
-    0x809C2C9C:("func_809C2C9C",),
-    0x809C2D0C:("func_809C2D0C",),
-    0x809C2EC4:("func_809C2EC4",),
-    0x809C2F34:("func_809C2F34",),
-    0x809C2FA0:("func_809C2FA0",),
+    0x809C10B0:("EnAob01_Blink",),
+    0x809C1124:("EnAob01_AdvanceTime",),
+    0x809C1158:("EnAob01_InitializeDogPaths",),
+    0x809C11EC:("EnAob01_SpawnDogs",),
+    0x809C1304:("EnAob01_SpawnRacedogs",),
+    0x809C1424:("EnAob01_ProcessLaughAnim",),
+    0x809C14D0:("EnAob01_ProcessSurpriseAnim",),
+    0x809C15BC:("EnAob01_ProcessIdleAnim",),
+    0x809C165C:("EnAob01_UpdateCollision",),
+    0x809C16DC:("EnAob01_BeforeRace_HandleConversation",),
+    0x809C1C9C:("EnAob01_BeforeRace_StartRace",),
+    0x809C1D64:("EnAob01_BeforeRace_RespondToPlayAgainQuestion",),
+    0x809C1EC8:("EnAob01_UpdateCommon",),
+    0x809C2060:("EnAob01_BeforeRace_Idle",),
+    0x809C21E0:("EnAob01_BeforeRace_Talk",),
+    0x809C2504:("EnAob01_Race_DogHasReachedNextCutsceneTrigger",),
+    0x809C2594:("EnAob01_Race_FollowSelectedDog",),
+    0x809C25E4:("EnAob01_Race_IsRaceOver",),
+    0x809C2680:("EnAob01_Race_CurrentCutsceneHasEnded",),
+    0x809C26E4:("EnAob01_Race_SkipNonRaceCutscene",),
+    0x809C2730:("EnAob01_Race_HandleRaceCutscene",),
+    0x809C2788:("EnAob01_Race_HandleRaceEndCutscene",),
+    0x809C2824:("EnAob01_Race_StartCutscene",),
+    0x809C28B8:("EnAob01_AfterRace_GiveRaceResult",),
+    0x809C2A64:("EnAob01_AfterRace_GiveReward",),
+    0x809C2BE4:("EnAob01_AfterRace_AfterGivingReward",),
+    0x809C2C9C:("EnAob01_AfterRace_AskToPlayAgain",),
+    0x809C2D0C:("EnAob01_AfterRace_Talk",),
+    0x809C2EC4:("EnAob01_PlayerIsHoldingDog",),
+    0x809C2F34:("EnAob01_Race_HidePlayer",),
+    0x809C2FA0:("EnAob01_InitializeDogTextOffsets",),
     0x809C3190:("EnAob01_Init",),
     0x809C3350:("EnAob01_Destroy",),
     0x809C339C:("EnAob01_Update",),
@@ -15199,7 +15199,7 @@
     0x80BAA6D0:("EnSuttari_UpdateCollider",),
     0x80BAA848:("EnSuttari_GetActorById",),
     0x80BAA88C:("EnSuttari_TriggerTransition",),
-    0x80BAA8D0:("EnSuttari_UpdateTime",),
+    0x80BAA8D0:("EnSuttari_AdvanceTime",),
     0x80BAA904:("func_80BAA904",),
     0x80BAA9B4:("func_80BAA9B4",),
     0x80BAAA94:("func_80BAAA94",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index ffd045d44..6abc9a1a8 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -9860,11 +9860,11 @@
     0x809C3770:("En_Aob_01_InitVars","UNK_TYPE1","",0x1),
     0x809C3790:("sAnimationInfo","UNK_TYPE4","",0x4),
     0x809C3820:("D_809C3820","UNK_TYPE1","",0x1),
-    0x809C384C:("D_809C384C","UNK_TYPE4","",0x4),
+    0x809C384C:("sDogInfo","UNK_TYPE4","",0x4),
     0x809C392C:("D_809C392C","UNK_TYPE1","",0x1),
     0x809C394C:("D_809C394C","UNK_TYPE4","",0x4),
     0x809C395C:("D_809C395C","UNK_PTR","",0x4),
-    0x809C3968:("D_809C3968","UNK_TYPE1","",0x1),
+    0x809C3968:("sFocusOffset","UNK_TYPE1","",0x1),
     0x809C3980:("D_809C3980","f32","",0x4),
     0x809C3984:("D_809C3984","f32","",0x4),
     0x809C3988:("D_809C3988","f32","",0x4),
diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py
index 34b3ddc46..b96696b46 100755
--- a/tools/weekeventregconvert.py
+++ b/tools/weekeventregconvert.py
@@ -73,7 +73,7 @@ weekEventReg = {
     ( 8 << 8) | 0x04: "WEEKEVENTREG_08_04",
     ( 8 << 8) | 0x08: "WEEKEVENTREG_08_08",
     ( 8 << 8) | 0x10: "WEEKEVENTREG_08_10",
-    ( 8 << 8) | 0x20: "WEEKEVENTREG_08_20",
+    ( 8 << 8) | 0x20: "WEEKEVENTREG_RECEIVED_DOGGY_RACETRACK_HEART_PIECE",
     ( 8 << 8) | 0x40: "WEEKEVENTREG_08_40",
     ( 8 << 8) | 0x80: "WEEKEVENTREG_08_80",
     ( 9 << 8) | 0x01: "WEEKEVENTREG_09_01",
@@ -279,7 +279,7 @@ weekEventReg = {
     (34 << 8) | 0x01: "WEEKEVENTREG_34_01",
     (34 << 8) | 0x02: "WEEKEVENTREG_34_02",
     (34 << 8) | 0x04: "WEEKEVENTREG_34_04",
-    (34 << 8) | 0x08: "WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED",
+    (34 << 8) | 0x08: "WEEKEVENTREG_TALKED_SWAMP_SPIDER_HOUSE_MAN",
     (34 << 8) | 0x10: "WEEKEVENTREG_34_10",
     (34 << 8) | 0x20: "WEEKEVENTREG_34_20",
     (34 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_MASK_OF_TRUTH",
@@ -523,12 +523,12 @@ weekEventReg = {
     (64 << 8) | 0x10: "WEEKEVENTREG_64_10",
     (64 << 8) | 0x20: "WEEKEVENTREG_64_20",
     (64 << 8) | 0x40: "WEEKEVENTREG_64_40",
-    (64 << 8) | 0x80: "WEEKEVENTREG_64_80",
-    (65 << 8) | 0x01: "WEEKEVENTREG_65_01",
-    (65 << 8) | 0x02: "WEEKEVENTREG_65_02",
-    (65 << 8) | 0x04: "WEEKEVENTREG_65_04",
-    (65 << 8) | 0x08: "WEEKEVENTREG_65_08",
-    (65 << 8) | 0x10: "WEEKEVENTREG_65_10",
+    (64 << 8) | 0x80: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1",
+    (65 << 8) | 0x01: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_1",
+    (65 << 8) | 0x02: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_2",
+    (65 << 8) | 0x04: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_2",
+    (65 << 8) | 0x08: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_3",
+    (65 << 8) | 0x10: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_NIGHT_3",
     (65 << 8) | 0x20: "WEEKEVENTREG_65_20",
     (65 << 8) | 0x40: "WEEKEVENTREG_65_40",
     (65 << 8) | 0x80: "WEEKEVENTREG_65_80",