From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/rom6.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/rom6.c')

diff --git a/src/rom6.c b/src/rom6.c
index a2b52c9aa..c466e724d 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,6 +1,8 @@
+#include "field_map_obj.h"
+#include "pokemon_menu.h"
+#include "item_use.h"
 #include "global.h"
 #include "rom6.h"
-#include "asm.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
@@ -19,10 +21,6 @@ extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
 extern u8 UseRockSmashScript[];
 
-extern void sub_808AB90(void);
-extern void task08_080A1C44(u8);
-extern u8 sub_80CA1C8(void);
-
 static void task08_080C9820(u8);
 static void sub_810B3DC(u8);
 static void sub_810B428(u8);
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/rom6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/rom6.c')

diff --git a/src/rom6.c b/src/rom6.c
index c466e724d..d5314fdec 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,11 +1,11 @@
-#include "field_map_obj.h"
-#include "pokemon_menu.h"
-#include "item_use.h"
 #include "global.h"
 #include "rom6.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
+#include "field_map_obj.h"
 #include "field_player_avatar.h"
+#include "item_use.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
 #include "script.h"
 #include "songs.h"
-- 
cgit v1.2.3


From 8435b8835a9b5c5348b2849e943e36ffdd8c76b3 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 15 Jun 2017 03:34:11 -0400
Subject: move player_pc data to C file and do a lot of labeling

---
 src/rom6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/rom6.c')

diff --git a/src/rom6.c b/src/rom6.c
index a2b52c9aa..a8233eb5b 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -14,7 +14,7 @@
 extern u16 gScriptLastTalked;
 extern u32 gUnknown_0202FF84[];
 extern struct MapPosition gUnknown_0203923C;
-extern void (*gUnknown_0300485C)(void);
+extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
 extern u8 UseRockSmashScript[];
@@ -122,7 +122,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 {
     if (npc_before_player_of_type(0x56) == TRUE)
     {
-        gUnknown_0300485C = sub_808AB90;
+        gFieldCallback = sub_808AB90;
         gUnknown_03005CE4 = sub_810B53C;
         return TRUE;
     }
@@ -159,7 +159,7 @@ int SetUpFieldMove_Dig(void)
 {
     if (sub_80CA1C8() == TRUE)
     {
-        gUnknown_0300485C = sub_808AB90;
+        gFieldCallback = sub_808AB90;
         gUnknown_03005CE4 = sub_810B5D8;
         return TRUE;
     }
-- 
cgit v1.2.3