Splatlogger 1.5.3__tar.gz → 1.6__tar.gz

{splatlogger-1.5.3/src/Splatlogger.egg-info → splatlogger-1.6}/PKG-INFO

@@ -1,27 +1,35 @@
 Metadata-Version: 2.4
 Name: Splatlogger
-Version: 1.5.3
-Summary: A PID/PNID grabber and match logger for Splatoon using TCPGecko.
+Version: 1.6
+Summary: A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon.
 Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
 License-Expression: MIT
-Project-URL: Source Code, https://github.com/spoongaming61/Splatlogger
+Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: userpaths
 Requires-Dist: requests
+Requires-Dist: psutil
+Requires-Dist: pymemoryeditor
 
 # Splatlogger
-A PID/PNID grabber and match logger for Splatoon using TCPGecko, written in Python.
+A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon, written in Python.
 
 ## Prerequisites
-You'll need a modded Wii U running either the Tiramisu or Aroma environment, as well as Python 3.11 or newer installed on your system
-(only required if you're installing the package, on Android devices you can use Termux).
+To install the package, you'll need to have Python 3.11 or newer installed on your system
+(on Android devices you can use Termux).
+Python is not required for the Windows executable.
+
+Both the Wii U and Cemu (Windows and Linux only) are supported.
+
+Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew
+(e.g. Haxchi, browser exploit).
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko) (Geckiine or SDGeckiine will work as well).
 
-On Aroma, install the [TCPGecko Aroma plugin](https://github.com/spoongaming61/TCPGeckoAroma).
+On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
 To install the package from PyPI, run:
@@ -34,7 +42,8 @@ Or download the latest release from GitHub and run:
 python -m pip install /path/to/Splatlogger-1.x.zip
 ```
 
-On Windows, you can skip the installation and instead use the executable provided on the releases page. Though if you already have Python installed, it's recommended to use the package.
+On Windows, use the executable provided on the releases page.
+Though if you already have Python installed, it's recommended to use the package.
 
 If you do have Python installed but do not wish to install the package, you can run the module directly from the source code:
 ```
@@ -67,11 +76,20 @@ Options:
 
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
+- `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required and will be ignored.
+  - `PID` - PID of the Cemu process (optional).
+
+- `-stack Address (in hex)` - (Cemu only) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
+Reuired for logging stats, not needed otherwise.
+
+  <img src="stack.png" width="600" alt="(example)">
+
 - `-silent` - Disable printing logs to the console.
 
 Logs are saved in `/[User]/Documents/Splatlogger/logs/[Date]`.
 
-To always run with the same IP and options without having to type them in manually, create an `args.txt` file in `/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
+To always run with the same IP and options without having to type them in manually, create an `args.txt` file in
+`/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
 Afterward any arguments passed through the command line will be ignored.
 
 Only one program can be connected to TCPGecko at a time. If you have something else connected, disconnect it beforehand.

splatlogger-1.5.3/PKG-INFO → splatlogger-1.6/README.md

@@ -1,27 +1,19 @@
-Metadata-Version: 2.4
-Name: Splatlogger
-Version: 1.5.3
-Summary: A PID/PNID grabber and match logger for Splatoon using TCPGecko.
-Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
-License-Expression: MIT
-Project-URL: Source Code, https://github.com/spoongaming61/Splatlogger
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-Requires-Dist: userpaths
-Requires-Dist: requests
-
 # Splatlogger
-A PID/PNID grabber and match logger for Splatoon using TCPGecko, written in Python.
+A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon, written in Python.
 
 ## Prerequisites
-You'll need a modded Wii U running either the Tiramisu or Aroma environment, as well as Python 3.11 or newer installed on your system
-(only required if you're installing the package, on Android devices you can use Termux).
+To install the package, you'll need to have Python 3.11 or newer installed on your system
+(on Android devices you can use Termux).
+Python is not required for the Windows executable.
+
+Both the Wii U and Cemu (Windows and Linux only) are supported.
+
+Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew
+(e.g. Haxchi, browser exploit).
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko) (Geckiine or SDGeckiine will work as well).
 
-On Aroma, install the [TCPGecko Aroma plugin](https://github.com/spoongaming61/TCPGeckoAroma).
+On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
 To install the package from PyPI, run:
@@ -34,7 +26,8 @@ Or download the latest release from GitHub and run:
 python -m pip install /path/to/Splatlogger-1.x.zip
 ```
 
-On Windows, you can skip the installation and instead use the executable provided on the releases page. Though if you already have Python installed, it's recommended to use the package.
+On Windows, use the executable provided on the releases page.
+Though if you already have Python installed, it's recommended to use the package.
 
 If you do have Python installed but do not wish to install the package, you can run the module directly from the source code:
 ```
@@ -67,11 +60,20 @@ Options:
 
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
+- `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required and will be ignored.
+  - `PID` - PID of the Cemu process (optional).
+
+- `-stack Address (in hex)` - (Cemu only) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
+Reuired for logging stats, not needed otherwise.
+
+  <img src="stack.png" width="600" alt="(example)">
+
 - `-silent` - Disable printing logs to the console.
 
 Logs are saved in `/[User]/Documents/Splatlogger/logs/[Date]`.
 
-To always run with the same IP and options without having to type them in manually, create an `args.txt` file in `/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
+To always run with the same IP and options without having to type them in manually, create an `args.txt` file in
+`/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
 Afterward any arguments passed through the command line will be ignored.
 
 Only one program can be connected to TCPGecko at a time. If you have something else connected, disconnect it beforehand.

{splatlogger-1.5.3 → splatlogger-1.6}/pyproject.toml

@@ -4,16 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Splatlogger"
-version = "1.5.3"
+version = "1.6"
 authors = [
     { name="Shadow Doggo", email="shadowdoggo@protonmail.com" }
 ]
-description = "A PID/PNID grabber and match logger for Splatoon using TCPGecko."
+description = "A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon."
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "userpaths",
-    "requests"
+    "requests",
+    "psutil",
+    "pymemoryeditor"
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -23,7 +25,7 @@ license = "MIT"
 license-files = ["LICENSE"]
 
 [project.urls]
-"Source Code" = "https://github.com/spoongaming61/Splatlogger"
+"Source Code" = "https://codeberg.org/ShadowDoggo/Splatlogger"
 
 [project.scripts]
 splatlogger = "splatlogger.__main__:main"

splatlogger-1.5.3/README.md → splatlogger-1.6/src/Splatlogger.egg-info/PKG-INFO

@@ -1,13 +1,35 @@
+Metadata-Version: 2.4
+Name: Splatlogger
+Version: 1.6
+Summary: A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon.
+Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
+License-Expression: MIT
+Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: userpaths
+Requires-Dist: requests
+Requires-Dist: psutil
+Requires-Dist: pymemoryeditor
+
 # Splatlogger
-A PID/PNID grabber and match logger for Splatoon using TCPGecko, written in Python.
+A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon, written in Python.
 
 ## Prerequisites
-You'll need a modded Wii U running either the Tiramisu or Aroma environment, as well as Python 3.11 or newer installed on your system
-(only required if you're installing the package, on Android devices you can use Termux).
+To install the package, you'll need to have Python 3.11 or newer installed on your system
+(on Android devices you can use Termux).
+Python is not required for the Windows executable.
+
+Both the Wii U and Cemu (Windows and Linux only) are supported.
+
+Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew
+(e.g. Haxchi, browser exploit).
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko) (Geckiine or SDGeckiine will work as well).
 
-On Aroma, install the [TCPGecko Aroma plugin](https://github.com/spoongaming61/TCPGeckoAroma).
+On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
 To install the package from PyPI, run:
@@ -20,7 +42,8 @@ Or download the latest release from GitHub and run:
 python -m pip install /path/to/Splatlogger-1.x.zip
 ```
 
-On Windows, you can skip the installation and instead use the executable provided on the releases page. Though if you already have Python installed, it's recommended to use the package.
+On Windows, use the executable provided on the releases page.
+Though if you already have Python installed, it's recommended to use the package.
 
 If you do have Python installed but do not wish to install the package, you can run the module directly from the source code:
 ```
@@ -53,11 +76,20 @@ Options:
 
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
+- `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required and will be ignored.
+  - `PID` - PID of the Cemu process (optional).
+
+- `-stack Address (in hex)` - (Cemu only) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
+Reuired for logging stats, not needed otherwise.
+
+  <img src="stack.png" width="600" alt="(example)">
+
 - `-silent` - Disable printing logs to the console.
 
 Logs are saved in `/[User]/Documents/Splatlogger/logs/[Date]`.
 
-To always run with the same IP and options without having to type them in manually, create an `args.txt` file in `/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
+To always run with the same IP and options without having to type them in manually, create an `args.txt` file in
+`/[User]/Documents/Splatlogger` and put the arguments following `splatlogger` in there.
 Afterward any arguments passed through the command line will be ignored.
 
 Only one program can be connected to TCPGecko at a time. If you have something else connected, disconnect it beforehand.

{splatlogger-1.5.3 → splatlogger-1.6}/src/Splatlogger.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/Splatlogger.egg-info/requires.txt
 src/Splatlogger.egg-info/top_level.txt
 src/splatlogger/__init__.py
 src/splatlogger/__main__.py
+src/splatlogger/cemu_gecko.py
 src/splatlogger/data.py
 src/splatlogger/match_logger.py
 src/splatlogger/tcpgecko.py

splatlogger-1.6/src/Splatlogger.egg-info/requires.txt

@@ -0,0 +1,4 @@
+userpaths
+requests
+psutil
+pymemoryeditor

{splatlogger-1.5.3 → splatlogger-1.6}/src/splatlogger/__main__.py

@@ -5,19 +5,20 @@ import ipaddress
 import os
 import sys
 import time
-import xml.etree.ElementTree as ElementTree
 from datetime import datetime
 from typing import NamedTuple
+from xml.etree import ElementTree
 
 import requests
 import userpaths  # type: ignore[import-untyped]
 
+from .cemu_gecko import CemuGecko, CemuGeckoException
 from .data import Pointers, Offsets, PlayerInfo
 from .match_logger import MatchLogger
 from .tcpgecko import TCPGecko, TCPGeckoException
 from .tcpgecko_aroma import TCPGeckoAroma
 
-_VERSION: str = "1.5.3"
+_VERSION = "1.6"
 
 
 class Options(NamedTuple):
@@ -26,6 +27,8 @@ class Options(NamedTuple):
     log_latest: bool
     silent_logging: bool
     aroma: bool
+    cemu: bool
+    stack: int | None
 
 
 class AccountInfo(NamedTuple):
@@ -37,70 +40,106 @@ class AccountInfo(NamedTuple):
 def main() -> None:
     print(f"Splatlogger v{_VERSION} by Shadow Doggo\n")
 
-    parser: argparse.ArgumentParser = argparse.ArgumentParser(
-        description="A PID/PNID grabber and match logger for Splatoon using TCPGecko."
-    )
-    parser.add_argument("-ip", help="Your Wii U's LAN IP address.", required=True)
+    parser = argparse.ArgumentParser(description="A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon.")
+    parser.add_argument("-ip", help="Your Wii U's LAN IP address.")
     parser.add_argument("-log-level", help="Set how much data should be logged (see README).",
-                        choices=["none", "standard", "extended", "stats"],
-                        nargs="?", const="standard", default="standard")
+                        choices=["none", "standard", "extended", "stats"], default="standard")
     parser.add_argument("-auto",
                         help="Enable auto logging (see README).",
                         choices=["all", "latest"], nargs="?", const="all")
     parser.add_argument("-aroma", help="Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.",
                         action="store_true")
+    parser.add_argument("-cemu",
+                        help="Switch to Cemu mode (optional: PID of the Cemu process).", metavar="PID",
+                        nargs="?", const=-1)
+    parser.add_argument("-stack",
+                        help="Beginning address of the stack space for Default Core 1 (Cemu only, see README).",
+                        metavar="Address (in hex)")
     parser.add_argument("-silent", help="Disable printing logs to the console.", action="store_true")
 
-    args: argparse.Namespace
     if os.path.isfile(f"{userpaths.get_my_documents()}/Splatlogger/args.txt"):
         with open(f"{userpaths.get_my_documents()}/Splatlogger/args.txt", encoding="utf-8") as f:
             args = parser.parse_args(f.read().split())
     else:
         args = parser.parse_args()
 
-    options: Options = Options(log_level=args.log_level,
-                               auto_logging=args.auto in ("all", "latest"),
-                               log_latest=args.auto == "latest",
-                               silent_logging=args.silent,
-                               aroma=args.aroma)
-
-    gecko: TCPGecko
-    try:
-        ipaddress.ip_address(args.ip)
-        print(f"Connecting to: {args.ip}")
-        gecko = TCPGeckoAroma(args.ip) if options.aroma else TCPGecko(args.ip)
-    except ValueError:
-        print("Please provide a valid IP address.\nExiting.")
-        sys.exit()
-    except OSError as e:
-        print(f"Failed to connect: {e}\nExiting.")
+    if args.aroma and args.cemu:
+        print("Cannot use both Aroma and Cemu modes.")
         sys.exit()
 
-    static_mem_adr: int = 0
-    player_info_ary_adr: int = 0
+    stack_addr: int | None = None
+    if args.stack:
+        try:
+            stack_addr = int(args.stack, 16)
+        except ValueError:
+            print("Invalid stack address. Please provide a valid hex value.")
+            sys.exit()
+
+    options = Options(log_level=args.log_level,
+                      auto_logging=args.auto in ("all", "latest"),
+                      log_latest=args.auto == "latest",
+                      silent_logging=args.silent,
+                      aroma=args.aroma,
+                      cemu=args.cemu is not None,
+                      stack=stack_addr)
+
+    ptr_offset = 0
+    gecko: TCPGecko | TCPGeckoAroma | CemuGecko
+    if args.cemu:
+        ptr_offset = 0x503000
+        if args.log_level == "stats" and not args.stack:
+            print("Stack space address must be specified for stats logging on Cemu (see README).")
+            sys.exit()
+        try:
+            print("Opening Cemu process...")
+            gecko = CemuGecko(int(args.cemu))
+        except CemuGeckoException as e:
+            print(e)
+            sys.exit()
+    else:
+        if not args.ip:
+            print('No IP address was provided. Run "splatlogger -h" for help.')
+            sys.exit()
+        try:
+            ipaddress.ip_address(args.ip)
+            print(f"Connecting to: {args.ip}")
+            gecko = TCPGeckoAroma(args.ip) if options.aroma else TCPGecko(args.ip)
+        except ValueError:
+            print("Please provide a valid IP address.")
+            sys.exit()
+        except TCPGeckoException as e:
+            print(e)
+            sys.exit()
+
     for _ in range(3):
         try:
-            static_mem_adr = gecko.peek32(Pointers.STATIC_MEM)
-            player_info_ary_adr = gecko.peek32(static_mem_adr + Offsets.PLAYER_INFO_ARY)
-            print("Connected.\n")
+            static_mem_adr = gecko.peek32(Pointers.STATIC_MEM - ptr_offset)
+            player_info_ary_adr = gecko.peek32(static_mem_adr + Offsets.STATICMEM_PLAYER_INFO_ARY)
+            assert static_mem_adr != 0 and player_info_ary_adr != 0
+
+            print("Success.\n" if options.cemu else "Connected.\n")
             break
         except (OSError, TimeoutError, TCPGeckoException) as e:
             print(f"\nAn error has occurred: {e}\nRetrying in 10 seconds...")
             time.sleep(10)
+        except AssertionError:
+            print("\nUnable to find StaticMem and PlayerInfoAry address.\nRetrying in 10 seconds...")
+            time.sleep(10)
     else:
-        print("\nFailed after 3 tries.\nExiting.")
+        print("\nFailed after 3 tries.")
         sys.exit()
 
     match_logger: MatchLogger | None = None
     if options.log_level != "none":
-        match_logger = MatchLogger(gecko, options.log_level, options.auto_logging, options.aroma, static_mem_adr)
+        match_logger = MatchLogger(gecko, options.log_level, options.auto_logging, options.aroma,
+                                   options.cemu, options.stack, static_mem_adr)
         try:
             match_logger.create_new_log()
         except OSError as e:
-            print(f"Failed to create log file: {e}\nExiting.")
+            print(f"Failed to create log file: {e}")
             sys.exit()
 
-    if options.auto_logging and match_logger is not None:
+    if options.auto_logging and match_logger:
         print("Auto logging enabled.")
         _auto_log(options, gecko, match_logger, player_info_ary_adr)
 
@@ -112,18 +151,19 @@ def main() -> None:
             print(f"\nAn error has occurred: {e}\nRetrying in 10 seconds...")
             time.sleep(10)
     else:
-        print("\nFailed after 3 tries.\nExiting.")
+        print("\nFailed after 3 tries.")
         sys.exit()
 
 
-def _auto_log(options: Options, gecko: TCPGecko, match_logger: MatchLogger,
+def _auto_log(options: Options, gecko: TCPGecko | CemuGecko, match_logger: MatchLogger,
               player_info_ary_adr: int) -> None:
-    match_in_progress: bool = False
-    count: int = 0
-    retry_count: int = 0
+    match_in_progress = False
+    count = 0
+    retry_count = 0
+    ptr_offset = 0x503000 if options.cemu else 0
     while True:
         try:
-            main_mgr_vs_game_adr: int = gecko.peek32(Pointers.MAIN_MGR_VS_GAME)
+            main_mgr_vs_game_adr = gecko.peek32(Pointers.MAIN_MGR_VS_GAME - ptr_offset)
             if main_mgr_vs_game_adr == 0:
                 match_in_progress = False
 
@@ -138,6 +178,7 @@ def _auto_log(options: Options, gecko: TCPGecko, match_logger: MatchLogger,
                     print(f"\nMatch {count}\n")
 
                 time.sleep(1)
+
                 for _ in range(3):
                     try:
                         _splatlog(options, gecko, match_logger, player_info_ary_adr, count)
@@ -146,7 +187,7 @@ def _auto_log(options: Options, gecko: TCPGecko, match_logger: MatchLogger,
                         print(f"\nAn error has occurred: {e}\nRetrying in 10 seconds...")
                         time.sleep(10)
                 else:
-                    print("\nFailed after 3 tries.\nExiting.")
+                    print("\nFailed after 3 tries.")
                     sys.exit()
 
             retry_count = 0
@@ -160,61 +201,60 @@ def _auto_log(options: Options, gecko: TCPGecko, match_logger: MatchLogger,
                 retry_count += 1
                 time.sleep(10)
             else:
-                print("\nFailed after 3 tries.\nExiting.")
+                print("\nFailed after 3 tries.")
                 sys.exit()
 
 
-def _splatlog(options: Options, gecko: TCPGecko, match_logger: MatchLogger | None,
+def _splatlog(options: Options, gecko: TCPGecko | CemuGecko, match_logger: MatchLogger | None,
               player_info_ary_adr: int, match_count: int) -> None:
-    session_id: int = 0
-    player_count: int = 8
+    session_id = 0
+    player_count = 8
     request_errors: list[str] = []
     player_info_list: list[PlayerInfo] = []
-    time_: datetime = datetime.now()
+    date = datetime.now()
+    ptr_offset = 0x503000 if options.cemu else 0
 
-    session_adr = gecko.peek32(Pointers.SESSION)
+    session_adr = gecko.peek32(Pointers.SESSION - ptr_offset)
     if session_adr != 0:
-        session_id_idx: int = int.from_bytes(gecko.peek_raw(session_adr + Offsets.SESSION_ID_IDX,
-                                                            length=0x1), byteorder="big")
+        session_id_idx = int.from_bytes(gecko.peek_raw(session_adr + Offsets.SESSION_ID_IDX,
+                                                       length=1), byteorder="big")
         session_id = gecko.peek32(session_adr + session_id_idx * 4 + Offsets.SESSION_ID)
 
-    main_mgr_base_adr: int = gecko.peek32(Pointers.MAIN_MGR_BASE)
-    if main_mgr_base_adr != 0 and gecko.peek8(Pointers.MAIN_MGR_VS_GAME) != 0:
-        player_mgr_adr: int = gecko.peek32(main_mgr_base_adr + Offsets.PLAYER_MGR)
+    main_mgr_base_adr = gecko.peek32(Pointers.MAIN_MGR_BASE - ptr_offset)
+    if main_mgr_base_adr != 0 and gecko.peek8(Pointers.MAIN_MGR_VS_GAME - ptr_offset) != 0:
+        player_mgr_adr = gecko.peek32(main_mgr_base_adr + Offsets.MAINMGR_PLAYER_MGR)
         if player_mgr_adr != 0:
-            player_count = gecko.peek8(player_mgr_adr + Offsets.PLAYER_COUNT)
+            player_count = gecko.peek8(player_mgr_adr + Offsets.PLAYERMGR_PLAYER_COUNT)
     else:
         print("You are currently not in a match. Logging previous match data "
               "(Player 1 data will be your own, Session ID will be the current one).\n")
 
-    print(f"{'Player':8} | {'PID (Hex)':10} | {'PID (Dec)':10} | {'PNID':16} | Name\n"
+    print(f"{'Player':<8} | {'PID (Hex)':<10} | {'PID (Dec)':<10} | {'PNID':<16} | Name\n"
           f"{'-' * 73}")
 
-    player_idx: int
     for player_idx in range(player_count):
-        player_info_raw: bytes = gecko.peek_raw(gecko.peek32(player_info_ary_adr + player_idx * 0x4),
-                                                length=0xD4)
+        player_info_raw = gecko.peek_raw(gecko.peek32(player_info_ary_adr + player_idx * 0x4),
+                                         length=0xD4)
 
-        player_pid: int = int.from_bytes(player_info_raw[0xD0:0xD4], byteorder="big")
+        player_pid = int.from_bytes(player_info_raw[0xD0:0xD4], byteorder="big")
         if player_pid != 0:
-            player_name: str = (player_info_raw[0x6:0x26]
-                                .decode("utf-16-be")
-                                .split("\u0000")[0]
-                                .replace("\n", "")
-                                .replace("\r", ""))
+            player_name = (player_info_raw[0x6:0x26]
+                           .decode("utf-16-be")
+                           .split("\u0000")[0]
+                           .replace("\n", "")
+                           .replace("\r", ""))
 
-            act_info: AccountInfo = _get_act_info(player_pid)
+            act_info = _get_act_info(player_pid)
             if act_info.request_error != "":
                 request_errors.append(act_info.request_error)
 
             if options.log_level != "none":
-                player_info: PlayerInfo = PlayerInfo(
+                player_info = PlayerInfo(
                     idx=player_idx,
                     pid=player_pid,
                     pnid=act_info.pnid,
                     name=player_name,
                     mii_name=act_info.mii_name,
-                    region=int.from_bytes(player_info_raw[0x2C:0x30], byteorder="big"),
                     team=int.from_bytes(player_info_raw[0x33:0x34], byteorder="big"),
                     gender=int.from_bytes(player_info_raw[0x37:0x38], byteorder="big"),
                     skin_tone=int.from_bytes(player_info_raw[0x3B:0x3C], byteorder="big"),
@@ -232,9 +272,9 @@ def _splatlog(options: Options, gecko: TCPGecko, match_logger: MatchLogger | Non
 
             if not options.silent_logging:
                 print(f"Player {player_idx + 1} | "
-                      f"0x{f'{player_pid:X}':8} | "
+                      f"0x{f'{player_pid:X}':<8} | "
                       f"{player_pid:<10} | "
-                      f"{act_info.pnid:16} | "
+                      f"{act_info.pnid:<16} | "
                       f"{player_name} {f'({act_info.mii_name})' if player_name != act_info.mii_name else ''}")
 
     if not options.silent_logging:
@@ -248,29 +288,35 @@ def _splatlog(options: Options, gecko: TCPGecko, match_logger: MatchLogger | Non
         else:
             print("Session ID: None")
 
-        print(f"Fetched at: {time_.strftime('%Y-%m-%d %H:%M:%S')}")
+        print(f"Fetched at: {date.strftime('%Y-%m-%d %H:%M:%S')}")
 
-    if options.log_level != "none" and match_logger is not None:
-        match_logger.log_match(time_, session_id, match_count, player_info_list)
+    if options.log_level != "none" and match_logger:
+        match_logger.log_match(date, session_id, match_count, player_info_list)
 
 
 def _get_act_info(player_pid: int) -> AccountInfo:
-    pnid: str = ""
-    mii_name: str = ""
-    request_error: str = ""
+    pnid = ""
+    mii_name = ""
+    request_error = ""
 
     for _ in range(3):
         try:
-            response: requests.Response = requests.get(
+            response = requests.get(
                 f"https://account.pretendo.cc/v1/api/miis?pids={player_pid}",
                 headers={"X-Nintendo-Client-ID": "a2efa818a34fa16b8afbc8a74eba3eda",
                          "X-Nintendo-Client-Secret": "c91cdb5658bd4954ade78533a339cf9a"},
-                timeout=10
+                timeout=5
             )
 
-            root: ElementTree.Element[str] = ElementTree.fromstring(response.text)
-            assert (isinstance(root[0].find("user_id"), ElementTree.Element) and
-                    isinstance(root[0].find("name"), ElementTree.Element))
+            try:
+                root = ElementTree.fromstring(response.text)
+            except ElementTree.ParseError:
+                return AccountInfo("", "", "Got empty or invalid response.")
+
+            if not (isinstance(root[0].find("user_id"), ElementTree.Element) and
+                    isinstance(root[0].find("name"), ElementTree.Element)):
+                return AccountInfo("", "", "Got empty or invalid response.")
+
             pnid = root[0].find("user_id").text  # type: ignore
             mii_name = (root[0].find("name")  # type: ignore
                                .text