decompile game_stats.s

pret · Jul 13, 2024 · de1c266 · de1c266
1 parent 7cd584e
commit de1c266
Show file tree

Hide file tree

Showing 8 changed files with 406 additions and 473 deletions.
diff --git a/asm/game_stats.s b/asm/game_stats.s
diff --git a/include/constants/game_stats.h b/include/constants/game_stats.h
@@ -32,4 +32,7 @@
 #define GAME_STAT_UNK100             100
 #define GAME_STAT_UNK114             114
 
+#define NUM_GAME_STATS_WORD           72
+#define NUM_GAME_STATS               149
+
 #endif //POKEHEARTGOLD_CONSTANTS_GAME_STATS_H
diff --git a/include/game_stats.h b/include/game_stats.h
@@ -7,15 +7,16 @@
 
 typedef struct GAME_STATS GAME_STATS;
 
-u32 Save_GameStats_sizeof(void);
-void Save_GameStats_Init(GAME_STATS *gameStats);
+u32 GameStats_sizeof(void);
+void GameStats_Init(GAME_STATS *gameStats);
 GAME_STATS *Save_GameStats_Get(SaveData *saveData);
-void GameStats_Inc(GAME_STATS *gameStats, int which);
-u32 GameStats_GetCapped(GAME_STATS *gameStats, int which);
-u32 GameStats_Add(GAME_STATS *gameStats, int which, u32 value);
-u32 GameStats_AddSpecial(GAME_STATS *gameStats, int which);
-u32 GameStats_IncSpeciesCaught(GAME_STATS *gameStats, const Pokedex *pokedex, u16 species);
-u32 GameStats_SetCapped(GAME_STATS *gameStats, int which, u32 value);
-u32 GameStats_UpdateBounded(GAME_STATS *gameStats, int which, u32 value);
+u32 GameStats_Inc(GAME_STATS *gameStats, int statIdx);
+u32 GameStats_GetCapped(GAME_STATS *gameStats, int statIdx);
+u32 GameStats_Add(GAME_STATS *gameStats, int statIdx, u32 addend);
+u32 GameStats_AddSpecial(GAME_STATS *gameStats, int statIdx);
+void GameStats_IncSpeciesCaught(GAME_STATS *gameStats, const Pokedex *pokedex, u16 species);
+u32 GameStats_SetCapped(GAME_STATS *gameStats, int statIdx, u32 value);
+u32 GameStats_UpdateBounded(GAME_STATS *gameStats, int statIdx, u32 value);
+u32 GameStats_GetStat2(GAME_STATS *gameStat);
 
 #endif //POKEHEARTGOLD_GAME_STATS_H
diff --git a/lib/include/nitro/hw/ARM7/mmap.h b/lib/include/nitro/hw/ARM7/mmap.h
@@ -24,7 +24,6 @@
 #define HW_INTR_CHECK_BUF           (HW_PRV_WRAM_SYSRV + 0x38)
 #define HW_INTR_VECTOR_BUF          (HW_PRV_WRAM_SYSRV + 0x3C)
 
-#define HW_VBLANK_COUNT_BUF         (HW_MAIN_MEM + 0x007ffc3c)
 #define HW_LOCK_ID_FLAG_SUB         (HW_MAIN_MEM + 0x007fffb8)
 
 #define HW_CARD_LOCK_BUF            (HW_MAIN_MEM + 0x007FFFE0)

diff --git a/lib/include/nitro/hw/mmap_shared.h b/lib/include/nitro/hw/mmap_shared.h
@@ -21,6 +21,7 @@
 #define HW_WRAM                 0x037F8000
 
 #define HW_MAIN_MEM_SYSTEM      (HW_MAIN_MEM + 0x007ffc00)
+#define HW_VBLANK_COUNT_BUF     (HW_MAIN_MEM + 0x007ffc3c)
 #define HW_WM_BOOT_BUF          (HW_MAIN_MEM + 0x007ffc40)
 #define HW_ARENA_INFO_BUF       (HW_MAIN_MEM + 0x007ffda0)
 #define HW_CTRDG_LOCK_BUF       (HW_MAIN_MEM + 0x007fffe8)

diff --git a/lib/include/nitro/os/interrupt.h b/lib/include/nitro/os/interrupt.h
@@ -85,4 +85,8 @@ void OS_WaitIrq(BOOL clear, OSIrqMask irqFlags);
 OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit);
 void OSi_EnterDmaCallback(u32 dmaNo, void (*callback)(void * arg), void * arg);
 
+static inline vu32 OS_GetVBlankCount(void) {
+    return *(vu32 *)HW_VBLANK_COUNT_BUF;
+}
+
 #endif //NITRO_SUB_OS_INTERRUPT_H
diff --git a/main.lsf b/main.lsf
@@ -115,7 +115,7 @@ Static main
     Object src/seal_case.o
     Object src/igt.o
     Object src/sav_chatot.o
-    Object asm/game_stats.o
+    Object src/game_stats.o
     Object asm/unk_0202D230.o
     Object src/save_special_ribbons.o
     Object src/roamer.o