summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/decoration.h1
-rw-r--r--include/global.fieldmap.h10
-rw-r--r--include/global.h2
-rw-r--r--include/secret_base.h2
4 files changed, 8 insertions, 7 deletions
diff --git a/include/decoration.h b/include/decoration.h
index 2e72e305a..bd8c41d1e 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -292,6 +292,7 @@ extern bool8 sub_807D770(void);
extern void sub_8109DAC(u8); // src/trader
extern void ReshowPlayerPC(u8); // src/player_pc
+void Task_SecretBasePC_Decoration(u8 taskId);
void sub_80FE2B4(void);
void Task_DecorationPCProcessMenuInput(u8);
void sub_80FE394(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 5c93eb8ab..7a8cc4592 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -111,11 +111,11 @@ struct CoordEvent
struct BgEvent
{
- u16 x, y;
- u8 unk4;
- u8 kind;
- // 0x2 padding for the union beginning.
- union { // carried over from diego's FR/LG work, seems to be the same struct
+ /*0x00*/u16 x;
+ /*0x02*/u16 y;
+ /*0x04*/u8 unk4;
+ /*0x05*/u8 kind;
+ /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct
// in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
u8 *script;
diff --git a/include/global.h b/include/global.h
index f0eb7401f..51c599a73 100644
--- a/include/global.h
+++ b/include/global.h
@@ -130,7 +130,7 @@ struct UCoords16
struct SecretBaseRecord
{
- /*ID?*/ /*0x1A08*/ u8 sbr_field_0;
+ /*ID?*/ /*0x1A08*/ u8 secretBaseId;
/*0x1A09*/ u8 sbr_field_1_0:4;
/*0x1A09*/ u8 gender:1;
/*0x1A09*/ u8 sbr_field_1_5:1;
diff --git a/include/secret_base.h b/include/secret_base.h
index bb747bb02..0318445ec 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -9,7 +9,7 @@ void sub_80BC038();
u8 sub_80BC050();
u8 *GetSecretBaseMapName(u8 *);
void sub_80BC300();
-const u8 sub_80BCCA4(u8);
+u8 sub_80BCCA4(u8);
u8 *sub_80BCCE8(void);
void sub_80BCF1C(u8);
void sub_80BD674(void *, u32, u8);