summaryrefslogtreecommitdiff
path: root/include/fieldmap.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-10-16 14:44:26 -0400
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-10-16 11:44:26 -0700
commit38d28d2c9165e5b3e6c768feb6d00310f6323c34 (patch)
tree56581be6316e4fbd3a5bd32deae4f14ab23b700c /include/fieldmap.h
parent049101deed4888d3435030f7587727b0727a10ab (diff)
Label battle AI script and update map BGM constants (#59)
* purge text label redundancy in data2 * revo you dummy dont commit experimental changes like that * Map header music constants * Declare CoordEvent and BgEvent structs * start labeling AI labels * more labels * even more AI labels * finish labeling battle AI * change flee2 to watch * egg nickname * oops
Diffstat (limited to 'include/fieldmap.h')
-rw-r--r--include/fieldmap.h23
1 files changed, 21 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 9a134e65c..852a6c337 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -55,6 +55,25 @@ struct WarpEvent
s8 mapNum;
};
+struct CoordEvent
+{
+ s16 x, y;
+ u8 filler_4[0x2];
+ u16 trigger;
+ u16 index;
+ u8 filler_A[0x2];
+ u8 *script;
+};
+
+struct BgEvent
+{
+ s16 x, y;
+ u8 filler_4;
+ u8 kind;
+ s16 filler_6;
+ u8 *script;
+};
+
struct MapEvents
{
u8 mapObjectCount;
@@ -64,8 +83,8 @@ struct MapEvents
struct MapObjectTemplate *mapObjects;
struct WarpEvent *warps;
- void *coordEvents;
- void *bgEvents;
+ struct CoordEvent *coordEvents;
+ struct BgEvent *bgEvents;
};
struct MapConnection