summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-12-28 02:09:11 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-12-28 02:09:11 -0600
commit2d04eb22abd3f60902ee1f9bc87bd510518709e3 (patch)
tree75c96f862678c22596f9b9e607b91805332c1ba8 /src
parentca49f8438d1d31c9b95e508224f7ce3cb29112f6 (diff)
Split rom_81370FC and port function names
Diffstat (limited to 'src')
-rw-r--r--src/battle_gfx_sfx_util.c10
-rw-r--r--src/decoration.c2
-rw-r--r--src/hall_of_fame.c4
-rw-r--r--src/landmark.c2
-rw-r--r--src/region_map.c2
-rw-r--r--src/tv.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 22be086f0..70b4d7d31 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[];
extern const u8 gUnknown_08C1F5E8[];
extern const u8 gUnknown_08C1F76C[];
extern const u8 gUnknown_08C1F8E8[];
-extern const u8 gUnknown_08C0237C[];
+extern const u8 gBlankGfxCompressed[];
extern const u16 gBattleInterface_BallStatusBarPal[];
extern const u16 gBattleInterface_BallDisplayPal[];
@@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 =
static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] =
{
- {gUnknown_08C0237C, 0x0100, 0xd704},
- {gUnknown_08C0237C, 0x0120, 0xd705},
- {gUnknown_08C0237C, 0x0100, 0xd706},
- {gUnknown_08C0237C, 0x0120, 0xd707}
+ {gBlankGfxCompressed, 0x0100, 0xd704},
+ {gBlankGfxCompressed, 0x0120, 0xd705},
+ {gBlankGfxCompressed, 0x0100, 0xd706},
+ {gBlankGfxCompressed, 0x0120, 0xd707}
};
static const struct SpritePalette gUnknown_0832C128[2] =
diff --git a/src/decoration.c b/src/decoration.c
index 512252f7d..c539091c8 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -25,7 +25,7 @@
#include "sound.h"
#include "event_scripts.h"
#include "event_data.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
#include "player_pc.h"
#include "strings.h"
#include "tv.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 2496b9564..414959882 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -97,7 +97,7 @@ extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16
extern void sub_8198204(u8 *dst, const u8 *src, u8, u8, u8);
extern bool8 sub_80F9C30(void);
extern void sub_8198314(void);
-extern void sub_8137C3C(void);
+extern void ReturnFromHallOfFamePC(void);
extern void sub_8198180(const u8 *src, u8, u8);
extern void sub_80F9BF4(u16, u16, u8);
extern void sub_81980F0(u8, u8, u8, u8, u16);
@@ -1108,7 +1108,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
if (sHofMonPtr != NULL)
FREE_AND_SET_NULL(sHofMonPtr);
- sub_8137C3C();
+ ReturnFromHallOfFamePC();
}
}
diff --git a/src/landmark.c b/src/landmark.c
index 3d4ed862b..4eade159a 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "event_data.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
struct Landmark
{
diff --git a/src/region_map.c b/src/region_map.c
index 261243792..086c0ba68 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -21,7 +21,7 @@
#include "m4a.h"
#include "field_effect.h"
#include "region_map.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
#define MAP_WIDTH 28
#define MAP_HEIGHT 15
diff --git a/src/tv.c b/src/tv.c
index 1621a9934..af0c7069c 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -32,7 +32,7 @@
#include "naming_screen.h"
#include "malloc.h"
#include "region_map.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
#include "decoration.h"
#include "secret_base.h"
#include "tv.h"