Show time offset in gen 7

Author: zaksabeast

3gx/includes/pnp.h

@@ -14,4 +14,5 @@ u32 host_just_pressed();
 u32 host_is_just_pressed(u32 io_bits);
 void host_set_print_max_len(u32 max_len);
 u64 host_get_game_title_id();
-void hid_init();
+void set_game_start_ms(u64 time);
+u64 host_game_start_ms();

3gx/includes/pokereader.h

@@ -1,4 +1,4 @@
 #pragma once
 
 void initialize();
-void run_frame();
+void run_frame();

3gx/sources/main.c

@@ -168,6 +168,12 @@ void main(void)
     plgLdrInit();
     initialize();
 
+    // NTP epoch (milliseconds since 1st Jan 1900 00:00)
+    u64 ms = osGetTime();
+    // Adjust to Jan 2000, which is what the games use.
+    u64 game_ms = ms - 3155673600000;
+    set_game_start_ms(game_ms);
+
     // Get memory layout changed event
     svcControlProcess(CUR_PROCESS_HANDLE, PROCESSOP_GET_ON_MEMORY_CHANGE_EVENT, (u32)&memLayoutChanged, 0);
 

3gx/sources/pnp.c

@@ -17,6 +17,7 @@ const u32 default_print_max_len = 30;
 u32 print_x = default_print_x;
 u32 print_y = default_print_y;
 u32 print_max_len = default_print_max_len;
+u64 game_start_ms = 0;
 
 #define MAX_LINES 18
 #define MAX_LINE_LENGTH 46
@@ -97,3 +98,13 @@ u64 host_get_game_title_id()
 {
   return get_title_id();
 }
+
+void set_game_start_ms(u64 ms)
+{
+  game_start_ms = ms;
+}
+
+u64 host_game_start_ms()
+{
+  return game_start_ms;
+}

reader_core/src/gen7/draw.rs

@@ -26,8 +26,9 @@ pub fn draw_citra_info(reader: &Gen7Reader) {
     let main_rng_seed_context = reader.main_rng_seed_context();
     let date = main_rng_seed_context.init_datetime;
     pnp::println!("Seed ticks: {:08X}", main_rng_seed_context.ticks);
-    pnp::println!("Init date: {}", date.format("%b %d %Y"));
-    pnp::println!("Init time: {}", date.format("%H:%M:%S"));
+    pnp::println!("Seed date: {}", date.format("%b %d %Y"));
+    pnp::println!("Seed time: {}", date.format("%H:%M:%S"));
+    pnp::println!("Time offset: {}", main_rng_seed_context.time_offset_ms);
 }
 
 pub fn draw_sos(reader: &Gen7Reader) {

reader_core/src/gen7/hook.rs

@@ -1,7 +1,8 @@
-use crate::utils;
+use crate::{pnp, utils};
 use chrono::NaiveDateTime;
 static mut MAIN_RNG_SEED_TICKS: u32 = 0;
 static mut MAIN_RNG_DATE_TIME: NaiveDateTime = NaiveDateTime::MIN;
+static mut MAIN_RNG_TIME_OFFSET_MS: u64 = 0;
 static mut SOS_SEED: u32 = 0;
 
 pub fn sos_seed() -> u32 {
@@ -16,33 +17,34 @@ fn init_sfmt_hook(regs: &[u32], _stack_pointer: *mut u32) {
 
 pub struct RngSeedContext {
     pub init_datetime: NaiveDateTime,
+    pub time_offset_ms: u64,
     pub ticks: u32,
 }
 
 pub fn main_rng_seed_context() -> RngSeedContext {
     unsafe {
         RngSeedContext {
             init_datetime: MAIN_RNG_DATE_TIME,
+            time_offset_ms: MAIN_RNG_TIME_OFFSET_MS,
             ticks: MAIN_RNG_SEED_TICKS,
         }
     }
 }
 
-const THIRTY_YEARS_MS: u64 = 946684800000;
-
 fn init_main_rng_hook(_regs: &[u32], stack_pointer: *mut u32) {
     let ticks = unsafe { stack_pointer.add(4).read() };
     let console_ms_epoch_low = unsafe { stack_pointer.add(12).read() };
     let console_ms_epoch_high = unsafe { stack_pointer.add(13).read() };
     let console_ms_epoch = ((console_ms_epoch_high as u64) << 32) | (console_ms_epoch_low as u64);
-    let standard_ms_epoch = console_ms_epoch.saturating_add(THIRTY_YEARS_MS);
-    let ms_epoch: i64 = standard_ms_epoch.try_into().unwrap_or_default();
+    let current_time = pnp::datetime_from_console_ms(console_ms_epoch);
+    // Assume we didn't start with any milliseconds and any extra milliseconds was spent loading
+    let start_ms = (pnp::game_start_ms() / 1000) * 1000;
+    let time_offset_ms = console_ms_epoch.saturating_sub(start_ms);
 
     unsafe {
         MAIN_RNG_SEED_TICKS = ticks;
-        if let Some(date_time) = NaiveDateTime::from_timestamp_millis(ms_epoch) {
-            MAIN_RNG_DATE_TIME = date_time;
-        }
+        MAIN_RNG_DATE_TIME = current_time;
+        MAIN_RNG_TIME_OFFSET_MS = time_offset_ms;
     }
 }
 

reader_core/src/pnp/bindings.rs

@@ -5,6 +5,7 @@ extern "C" {
     pub fn host_is_just_pressed(io_bits: u32) -> u32;
     pub fn host_set_print_max_len(max_len: u32);
     pub fn host_get_game_title_id() -> u64;
+    pub fn host_game_start_ms() -> u64;
 }
 
 #[cfg(feature = "test_stubs")]
@@ -16,29 +17,17 @@ pub mod test_stubs {
     #[no_mangle]
     pub extern "C" fn host_write_mem(_game_addr: u32, _size: u32, _in_ptr: u32) {}
     #[no_mangle]
-    pub extern "C" fn host_just_pressed() -> u32 {
-        0
-    }
-    #[no_mangle]
     pub extern "C" fn host_is_just_pressed(_io_bits: u32) -> u32 {
         0
     }
     #[no_mangle]
-    pub extern "C" fn host_reset_print() {}
-    #[no_mangle]
-    pub extern "C" fn host_set_print_colors(_text_color: u32, _background_color: u32) {}
-    #[no_mangle]
     pub extern "C" fn host_set_print_max_len(_max_len: u32) {}
     #[no_mangle]
-    pub extern "C" fn host_set_print_x(_x: u32) {}
-    #[no_mangle]
-    pub extern "C" fn host_set_print_y(_y: u32) {}
-    #[no_mangle]
     pub extern "C" fn host_get_game_title_id() -> u64 {
         0
     }
     #[no_mangle]
-    pub extern "C" fn host_get_is_mode3() -> u32 {
+    pub extern "C" fn host_game_start_ms() -> u64 {
         0
     }
 }

reader_core/src/pnp/mod.rs

@@ -5,10 +5,13 @@ mod input;
 mod memory;
 /// Tools for printing text to the console's screen.
 mod print;
+/// Tools related to time.
+mod time;
 /// Various utilities.
 mod utils;
 
 pub use input::*;
 pub use memory::*;
 pub use print::*;
+pub use time::*;
 pub use utils::*;

reader_core/src/pnp/time.rs

@@ -0,0 +1,14 @@
+use super::bindings;
+use chrono::NaiveDateTime;
+
+const THIRTY_YEARS_MS: u64 = 946684800000;
+
+pub fn datetime_from_console_ms(console_ms: u64) -> NaiveDateTime {
+    let standard_ms = console_ms.saturating_add(THIRTY_YEARS_MS);
+    let ms: i64 = standard_ms.try_into().unwrap_or_default();
+    NaiveDateTime::from_timestamp_millis(ms).unwrap_or_default()
+}
+
+pub fn game_start_ms() -> u64 {
+    unsafe { bindings::host_game_start_ms() }
+}