6 files changed, 95 insertions, 3 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index a8067f6ca..562741b93 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -158,7 +158,7 @@
 #define FLAG_RECEIVED_GREEN_SCARF           0xCB
 #define FLAG_RECEIVED_YELLOW_SCARF          0xCC
 
-#define FLAG_ECOUNTERED_LATIAS_OR_LATIOS    0xCE
+#define FLAG_ENCOUNTERED_LATIAS_OR_LATIOS    0xCE
 
 #define FLAG_RECEIVED_BASEMENT_KEY          0xD0
 #define FLAG_RECEIVED_TM24                  0xD1
diff --git a/include/macros.inc b/include/macros.inc
index f34353079..93a029cdd 100644
--- a/include/macros.inc
+++ b/include/macros.inc
@@ -4,6 +4,7 @@
 	.include "include/macros/pokemon_data.inc"
 	.include "include/macros/ec.inc"
 	.include "include/macros/map.inc"
+	.include "include/macros/me_script.inc"
 
 	.macro region_map_location x, y, width, height, name
 	.byte \x
diff --git a/include/macros/event.inc b/include/macros/event.inc
index fcbd3a055..a27e1da76 100644
--- a/include/macros/event.inc
+++ b/include/macros/event.inc
@@ -1236,7 +1236,6 @@
 	.macro setvaddress long, word
 	.byte 0xb8
 	.4byte \long
-	.2byte \word
 	.endm
 
 	.macro vgoto pointer
diff --git a/include/macros/me_script.inc b/include/macros/me_script.inc
new file mode 100644
index 000000000..4d5f59d1b
--- /dev/null
+++ b/include/macros/me_script.inc
@@ -0,0 +1,88 @@
+	.macro me_nop
+	.byte 0
+	.endm
+
+	.macro me_checkcompat word, v1, v2, v3, v4
+	.byte 1
+	.4byte \word
+	.2byte \v1
+	.4byte \v2
+	.2byte \v3
+	.4byte \v4
+	.endm
+
+	.macro me_end
+	.byte 2
+	.endm
+
+	.macro me_setmsg value, str
+	.byte 3
+	.byte \value
+	.4byte \str
+	.endm
+
+	.macro me_setstatus value
+	.byte 4
+	.byte \value
+	.endm
+
+	.macro me_runscript script
+	.byte 5
+	.4byte \script
+	.endm
+
+	.macro me_initramscript mapId, objId, script, end
+	.byte 6
+	map \mapId
+	.byte \objId
+	.4byte \script, \end
+	.endm
+
+	.macro me_setenigmaberry berry
+	.byte 7
+	.4byte \berry
+	.endm
+
+	.macro me_giveribbon index, ribbonId
+	.byte 8
+	.byte \index, \ribbonId
+	.endm
+
+	.macro me_givenationaldex
+	.byte 9
+	.endm
+
+	.macro me_addrareword word
+	.byte 10
+	.byte \word
+	.endm
+
+	.macro me_setrecordmixinggift unk, quantity, itemId
+	.byte 11
+	.byte \unk, \quantity
+	.2byte \itemId
+	.endm
+
+	.macro me_givepokemon data
+	.byte 12
+	.4byte \data
+	.endm
+
+	.macro me_addtrainer data
+	.byte 13
+	.4byte \data
+	.endm
+
+	.macro me_enableresetrtc
+	.byte 14
+	.endm
+
+	.macro me_checksum checksum, data, dataEnd
+	.byte 15
+	.4byte \checksum, \data, \dataEnd
+	.endm
+
+	.macro me_crc crc, data, dataEnd
+	.byte 16
+	.4byte \crc, \data, \dataEnd
+	.endm
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index ab23a8d00..a92bb6667 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -4,5 +4,9 @@
 u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
+#if DEBUG
+bool8 unref_sub_812620C(u8 *a1, const u8 * _a2);
+bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2);
+#endif // DEBUG
 
 #endif // GUARD_MYSTERY_EVENT_SCRIPT_H
diff --git a/include/util.h b/include/util.h
index 676c3bd9b..02c503f75 100644
--- a/include/util.h
+++ b/include/util.h
@@ -9,7 +9,7 @@ extern const u32 gBitTable[];
 u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *));
 void StoreWordInTwoHalfwords(u16 *, u32);
 void LoadWordFromTwoHalfwords(u16 *, u32 *);
-u16 CalcCRC16(u8 *data, int length);
+u16 CalcCRC16(const u8 *data, int length);
 void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
 void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output);