From 9813caaf5345ea28f8230d41461618673779c2fb Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 31 Jan 2017 03:08:44 -0500
Subject: make ROM match again (#227)

* some labels and enumerate player speeds

* clear up speed enums

* GetPlayerSpeed

* oops

* start decompiling mauville_old_man.c

* formatting

* decompile more of mauville_old_man.c

* someone fix this please

* formatting

* make ROM build again

* formatting again

* make ROM match again
---
 src/mauville_old_man.c | 8 ++++----
 src/new_game.c         | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 82e936633..d03042ca5 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -35,10 +35,10 @@ void sub_80F7A34(void)
 
 void sub_80F7A6C(void)
 {
-    OldMan *oldMan = &gSaveBlock1.oldMan;
+    struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1;
     
-    oldMan->oldMan1.unk_2D94 = 1;
-    oldMan->oldMan1.unk_2D95 = 0;
+    bard->unk_2D94 = 1;
+    bard->unk_2D95 = 0;
 }
 
 void sub_80F7A7C(void)
@@ -59,7 +59,7 @@ void sub_80F7A98(void)
     sub_81099CC();
 }
 
-void sub_80F7AA4(void)
+void SetMauvilleOldMan(void)
 {
     u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2;
     
diff --git a/src/new_game.c b/src/new_game.c
index ddc9ea403..99c7839eb 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -70,6 +70,7 @@ void ClearPokedexFlags(void)
 void sub_8052DA8(void)
 {
     s32 i;
+
     sub_80B2D1C();
     for (i = 0; i < 5; i++)
         gSaveBlock1.sb1_2EFC_struct[i] = gUnknown_08216604;
@@ -139,7 +140,7 @@ void NewGameInitData(void)
     sub_810C994();
     sub_8133F80();
     sub_80E6764();
-    sub_80F7AA4();
+    SetMauvilleOldMan();
     sub_80FA17C();
     sub_810FA54();
     ResetLotteryCorner();
-- 
cgit v1.2.3