summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/field_specials.h1
-rw-r--r--include/global.fieldmap.h36
-rw-r--r--include/strings.h5
3 files changed, 28 insertions, 14 deletions
diff --git a/include/field_specials.h b/include/field_specials.h
index 9a85a8b49..40adbdf9a 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -14,5 +14,6 @@ u8 ContextNpcGetTextColor(void);
void set_unknown_box_id(u8);
u16 get_unknown_box_id(void);
bool8 sub_80CC7B4(void);
+u16 sub_80CC44C(struct HiddenItemStruct hiddenItem, u8 attr);
#endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 3623737ea..cc9510997 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -120,26 +120,34 @@ struct CoordEvent
u8 *script;
};
+struct HiddenItemStruct
+{
+ u32 field_00:16;
+ u32 hiddenItemId:8; // flag offset to determine flag lookup
+ u32 field_03_0:7;
+ u32 field_03_7:1;
+};
+
+union BgUnion
+{ // 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;
+
+ // hidden item type probably
+ struct HiddenItemStruct hiddenItem;
+
+ // secret base type
+ u32 secretBaseId;
+
+};
+
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
- // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
- u8 *script;
-
- // hidden item type probably
- struct {
- u8 filler6[0x2];
- u16 hiddenItemId; // flag offset to determine flag lookup
- } hiddenItem;
-
- // secret base type
- u32 secretBaseId;
-
- } bgUnion;
+ union BgUnion bgUnion;
};
struct MapEvents
diff --git a/include/strings.h b/include/strings.h
index b0221b8e9..9ddce6044 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -324,4 +324,9 @@ extern const u8 gText_ThrowAwayStrVar2OfThisItemQM[];
extern const u8 gText_BerryPouch[];
extern const u8 gText_TheBerryPouchWillBePutAway[];
+// itemfinder
+extern const u8 gText_ItemfinderResponding[];
+extern const u8 gText_ItemfinderShakingWildly[];
+extern const u8 gText_NopeTheresNoResponse[];
+
#endif //GUARD_STRINGS_H