Merge branch 'master' of github.com:pret/pokeemerald into trade

asm/contest_link_80F57C4.s

@@ -578,10 +578,10 @@ _080F5D58:
 	adds r0, r5, 0
 	movs r1, 0
 	bl VarSet
-	bl sub_8076D5C
+	bl SetContinueGameWarpStatusToDynamicWarp
 	movs r0, 0x1
 	bl TrySavingData
-	bl sav2_gender2_inplace_and_xFE
+	bl ClearContinueGameWarpStatus2
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl VarSet
@@ -5598,7 +5598,7 @@ _080F874C:
 	movs r3, 0x1
 	negs r3, r3
 	movs r0, 0
-	bl saved_warp2_set
+	bl SetDynamicWarp
 	bl ScriptContext2_Disable
 	bl EnableBothScriptContexts
 _080F877E:

asm/macros/map.inc

@@ -101,3 +101,7 @@
 	map \map
 	.space 2
 	.endm
+
+	.macro map_header_flags allow_bike:req, allow_escape_rope:req, allow_run:req, show_map_name:req
+	.byte ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike
+	.endm

asm/pokenav.s

@@ -29324,14 +29324,14 @@ sub_81D5FB4: @ 81D5FB4
 	mov r9, r0
 	cmp r0, 0x6
 	bne _081D5FD2
-	bl sub_8087D74
+	bl InitMapFromSavedGame
 	b _081D605E
 _081D5FD2:
 	bl sub_81D56B0
 	mov r0, r9
 	cmp r0, 0x5
 	bne _081D5FE6
-	bl sub_8087D74
+	bl InitMapFromSavedGame
 	bl sub_81D5710
 	b _081D605E
 _081D5FE6:
@@ -29342,7 +29342,7 @@ _081D5FE6:
 	ldr r0, =gMapHeader
 	ldr r0, [r0]
 	ldr r2, [r0, 0xC]
-	ldr r1, =gUnknown_03005DC0
+	ldr r1, =gBackupMapLayout
 	str r4, [r1, 0x8]
 	movs r0, 0x1F
 	str r0, [r1]

asm/rom_8011DC0.s

@@ -15686,7 +15686,7 @@ _0801EB04:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0801EBC2
-	bl sub_8076D5C
+	bl SetContinueGameWarpStatusToDynamicWarp
 	movs r0, 0
 	bl TrySavingData
 	ldr r0, =gUnknown_02022C84
@@ -15713,7 +15713,7 @@ _0801EB40:
 	bne _0801EBC2
 	movs r0, 0x37
 	bl PlaySE
-	bl sav2_gender2_inplace_and_xFE
+	bl ClearContinueGameWarpStatus2
 	ldr r0, =gUnknown_02022C84
 	ldr r1, [r0]
 	movs r0, 0xA
@@ -20568,7 +20568,7 @@ _080211EC:
 	beq _080211F8
 	b _08021302
 _080211F8:
-	bl sub_81971D0
+	bl InitStandardTextBoxWindows
 	bl sub_8197200
 	adds r0, r5, 0
 	bl sub_8022588
@@ -39128,7 +39128,7 @@ _0802A7CE:
 	movs r1, 0
 	movs r2, 0
 	bl ChangeBgY
-	bl sub_81971D0
+	bl InitStandardTextBoxWindows
 	bl sub_8197200
 	movs r1, 0x82
 	lsls r1, 5

asm/trainer_card.s

@@ -4971,7 +4971,7 @@ _080C5204:
 	b _080C52C8
 _080C5214:
 	str r4, [r0]
-	bl sav1_map_get_name
+	bl GetCurrentRegionMapSectionId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x3A
@@ -7780,7 +7780,7 @@ sub_80C6974: @ 80C6974
 	adds r1, r6
 	ldrb r1, [r1, 0xC]
 	bl StartSpriteAnim
-	bl sav1_map_get_name
+	bl GetCurrentRegionMapSectionId
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0x3A