6 files changed, 31 insertions, 22 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index d805aecb5..11ec30d74 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -653,6 +653,9 @@
 			.4byte \pointer2 @ text
 			.4byte \pointer3 @ text
 			.4byte \pointer4 @ event script
+		.elseif \type == 9
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
 		.endif
 	.endm
 
@@ -824,8 +827,9 @@
 	.4byte \text
 	.endm
 
+	@ RENAMED!
 	@ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
-	.macro givepoke species, level, item, unknown1, unknown2, unknown3
+	.macro givemon species, level, item, unknown1, unknown2, unknown3
 	.byte 0x79
 	.2byte \species
 	.byte \level
@@ -840,7 +844,8 @@
 	.2byte \species
 	.endm
 
-	.macro setpokemove byte1, byte2, word
+	@ RENAMED!
+	.macro setmonmove byte1, byte2, word
 	.byte 0x7b
 	.byte \byte1
 	.byte \byte2
@@ -860,14 +865,16 @@
 	.2byte \species
 	.endm
 
+	@ RENAMED!
 	@ Writes the name of the species of the first Pokémon in the player's party to the specified buffer.
-	.macro getfirstpartypokename out
+	.macro getfirstpartymonname out
 	.byte 0x7e
 	.byte \out
 	.endm
 
+	@ RENAMED!
 	@ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
-	.macro getpartypokename out, slot
+	.macro getpartymonname out, slot
 	.byte 0x7f
 	.byte \out
 	.2byte \slot
@@ -1181,12 +1188,8 @@
 	.endm
 
 	@ In Emerald, this command consumes its parameters and does nothing. In FireRed, this command is a nop.
-	.macro addelevmenuitem a, b, c, d
+	.macro addelevmenuitem
 	.byte 0xb1
-	.byte \a
-	.2byte \b
-	.2byte \c
-	.2byte \d
 	.endm
 
 	@ In FireRed and Emerald, this command is a nop.
diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 9c68e8414..075993fd3 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -14,13 +14,15 @@
 	.4byte \address
 	.endm
 
-	.macro object_event byte1, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16
-	.byte \byte1
-	.2byte \word1
-	.byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14
+	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
+	.byte \index
+	.2byte \gfx
+	.byte 0
+	.2byte \x, \y
+	.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0
+	.2byte \trainer_type, \sight_radius_tree_etc
 	.4byte \script
-	.2byte \word2
-	.byte \byte15, \byte16
+	.2byte \event_flag, 0
 	inc _num_npcs
 	.endm
 
@@ -53,6 +55,10 @@
 	inc _num_signs
 	.endm
 
+	.macro bg_hidden_item_event x, y, height, item, flag, unknown
+	bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown
+	.endm
+
 	.macro map_events npcs, warps, traps, signs
 	.byte _num_npcs, _num_warps, _num_traps, _num_signs
 	.4byte \npcs, \warps, \traps, \signs
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index 909b24916..ac7b6ea9f 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -5,7 +5,7 @@
 	.endm
 	.endm
 
-	enum_start
+	enum_start 0
 	create_movement step_00
 	create_movement step_01
 	create_movement step_02
diff --git a/asm/overworld.s b/asm/overworld.s
index 9fb3a8564..4210aaa9d 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -722,7 +722,7 @@ get_mapdata_header: @ 8055170
 	.align 2, 0
 _08055180: .4byte gSaveBlock1Ptr
 _08055184:
-	ldr r0, _08055194 @ =gUnknown_834EB8C
+	ldr r0, _08055194 @ =gMapLayouts
 	subs r1, 0x1
 	lsls r1, 2
 	adds r1, r0
@@ -731,7 +731,7 @@ _0805518E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08055194: .4byte gUnknown_834EB8C
+_08055194: .4byte gMapLayouts
 	thumb_func_end get_mapdata_header
 
 	thumb_func_start warp_shift
diff --git a/asm/script_menu.s b/asm/script_menu.s
index e43045009..d917b5d5b 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -1732,7 +1732,7 @@ sub_809D6B0: @ 809D6B0
 	thumb_func_start sub_809D6D4
 sub_809D6D4: @ 809D6D4
 	push {lr}
-	ldr r0, _0809D74C @ =gUnknown_81A7AE0
+	ldr r0, _0809D74C @ =EventScript_1A7AE0
 	bl ScriptContext1_SetupScript
 	ldr r0, _0809D750 @ =sub_809D288
 	bl FindTaskIdByFunc
@@ -1788,7 +1788,7 @@ _0809D748:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0809D74C: .4byte gUnknown_81A7AE0
+_0809D74C: .4byte EventScript_1A7AE0
 _0809D750: .4byte sub_809D288
 _0809D754: .4byte gTasks+0x8
 _0809D758: .4byte gSprites
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index b7875e7a9..482b5da60 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -2273,7 +2273,7 @@ sub_815BD80: @ 815BD80
 	str r0, [sp, 0x4]
 	movs r0, 0
 	str r0, [sp, 0x10]
-	ldr r1, _0815BE1C @ =gUnknown_82E55CC
+	ldr r1, _0815BE1C @ =Route1_Layout
 	mov r8, r1
 	movs r0, 0x80
 	lsls r0, 4
@@ -2339,7 +2339,7 @@ _0815BDF0:
 	ldrh r0, [r6]
 	b _0815BE34
 	.align 2, 0
-_0815BE1C: .4byte gUnknown_82E55CC
+_0815BE1C: .4byte Route1_Layout
 _0815BE20: .4byte 0x000003ff
 _0815BE24:
 	adds r0, r3, 0x1