Merge branch 'main' into error-checking-in-write-file

40Cakes · Dec 17, 2023 · 1763191 · 1763191
2 parents 6ae8465 + fae4bdc
commit 1763191
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 110 deletions.
diff --git a/modules/memory.py b/modules/memory.py
@@ -137,6 +137,7 @@ class GameState(IntEnum):
     GARBAGE_COLLECTION = auto()
     EVOLUTION = auto()
     UNKNOWN = auto()
+    QUEST_LOG = auto()
 
 
 def get_game_state_symbol() -> str:
@@ -152,6 +153,8 @@ def get_game_state() -> GameState:
         return state_cache.game_state.value
 
     match get_game_state_symbol():
+        case "CB2_SETUPOVERWORLDFORQLPLAYBACKWITHWARPEXIT" | "CB2_SETUPOVERWORLDFORQLPLAYBACK" | "CB2_LOADMAPFORQLPLAYBACK" | "CB2_ENTERFIELDFROMQUESTLOG":
+            return GameState.QUEST_LOG
         case "CB2_OVERWORLD":
             result = GameState.OVERWORLD
         case "BATTLEMAINCB2":