summaryrefslogtreecommitdiff
path: root/berry_fix/payload
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-12-31 14:36:01 -0500
committerGitHub <noreply@github.com>2020-12-31 14:36:01 -0500
commit22cd65bd55eb66a83d7d48cbfaf7aa8b8dc0d4ef (patch)
tree76b8c07967f50421adae2f847b6e6ce143e31332 /berry_fix/payload
parent2183626229f0a6cebc2d0d8b2fed28080b9a55a6 (diff)
parent9509797b98cf187a9595741c0c196b4103984292 (diff)
Merge pull request #375 from GriffinRichards/deadname
Remove deadnaming, sync BgEvent
Diffstat (limited to 'berry_fix/payload')
-rw-r--r--berry_fix/payload/include/global.fieldmap.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h
index f68ca9125..5cc3e8b1b 100644
--- a/berry_fix/payload/include/global.fieldmap.h
+++ b/berry_fix/payload/include/global.fieldmap.h
@@ -79,23 +79,16 @@ struct CoordEvent
struct BgEvent
{
- /*0x00*/u16 x;
- /*0x02*/u16 y;
- /*0x04*/u8 elevation;
- /*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.
+ u16 x, y;
+ u8 elevation;
+ u8 kind; // The "kind" field determines how to access bgUnion union below.
+ union {
u8 *script;
-
- // hidden item type
struct {
u16 item;
- u16 hiddenItemId; // flag offset to determine flag lookup
+ u16 hiddenItemId;
} hiddenItem;
-
- // secret base type
u32 secretBaseId;
-
} bgUnion;
};