From fcf64194a0074239e4f0e3fb238ae71975a2b97b Mon Sep 17 00:00:00 2001
From: Chesyon <55322011+Chesyon@users.noreply.github.com>
Date: Wed, 6 May 2026 08:27:02 -0400
Subject: [PATCH] Use decompiled DungeonRand16Bit in dg_random

---
 include/overlay_29_022EA9EC.h | 2 +-
 src/dg_random.c               | 3 +--
 src/overlay_29_022EA9EC.c     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/overlay_29_022EA9EC.h b/include/overlay_29_022EA9EC.h
index e2a28edc..8c4aa5dc 100644
--- a/include/overlay_29_022EA9EC.h
+++ b/include/overlay_29_022EA9EC.h
@@ -12,6 +12,6 @@ typedef struct prng_state {
 } prng_state;
 
 void InitDungeonRng(u32 seed);
-u32 DungeonRand16Bit(void);
+u16 DungeonRand16Bit(void);
 
 #endif //PMDSKY_OVERLAY_29_022EA9EC_H
diff --git a/src/dg_random.c b/src/dg_random.c
index 45ac4769..735937ad 100644
--- a/src/dg_random.c
+++ b/src/dg_random.c
@@ -1,9 +1,8 @@
 #include "dg_random.h"
+#include "overlay_29_022EA9EC.h"
 
 // file starts at 0x022ea968
 
-extern s16 DungeonRand16Bit(void);
-
 s32 DungeonRandInt(s32 end)
 {
     s32 entropy = DungeonRand16Bit();
diff --git a/src/overlay_29_022EA9EC.c b/src/overlay_29_022EA9EC.c
index a0dcf85e..4c9f51c8 100644
--- a/src/overlay_29_022EA9EC.c
+++ b/src/overlay_29_022EA9EC.c
@@ -15,7 +15,7 @@ void InitDungeonRng(u32 seed) {
     } while (scratch_0<5);
 }
 
-u32 DungeonRand16Bit(void) {
+u16 DungeonRand16Bit(void) {
     u32 mult = DUNGEON_PRNG_LCG_MULTIPLIER;
 
     if (DUNGEON_PRNG_STATE.use_secondary) {