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

asm/contest_link_81D9DE4.s

@@ -97,7 +97,7 @@ _081D9EB4:
 	ldrb r1, [r1]
 	adds r0, 0x2C
 	strb r1, [r0]
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	lsrs r0, 24

asm/easy_chat.s

@@ -7951,7 +7951,7 @@ sub_811EA28: @ 811EA28
 	bgt _0811EA48
 	cmp r0, 0x11
 	blt _0811EA66
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	b _0811EA60
 	.pool
@@ -9131,7 +9131,7 @@ _0811F2FE:
 	adds r3, 0x1
 	cmp r3, 0x10
 	ble _0811F2FE
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0

asm/macros/map.inc

@@ -65,7 +65,7 @@
 	.endm
 
 	.macro bg_hidden_item_event x, y, height, item, flag
-	bg_event \x, \y, \height, 7, \item, \flag, 0
+	bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
 	.endm
 
 	.macro bg_secret_base_event x, y, height, secret_base_id

asm/party_menu.s

@@ -10499,7 +10499,7 @@ sub_81B5958: @ 81B5958
 	thumb_func_start sub_81B5974
 sub_81B5974: @ 81B5974
 	push {lr}
-	bl sub_809D1E8
+	bl TrySetDiveWarp
 	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24

asm/pokenav.s

@@ -30184,7 +30184,7 @@ _081D6670:
 	asrs r0, 1
 	lsls r0, 1
 	subs r4, r0
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0

asm/rom_8011DC0.s

@@ -8335,7 +8335,7 @@ _08019C5A:
 	beq _08019CE6
 	mov r0, sp
 	adds r1, r4, 0
-	bl plaer_get_pos_including_state_based_drift
+	bl player_get_pos_including_state_based_drift
 	mov r0, sp
 	movs r1, 0
 	ldrsh r2, [r0, r1]
@@ -8881,7 +8881,7 @@ sub_801A064: @ 801A064
 	adds r5, 0x6
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl plaer_get_pos_including_state_based_drift
+	bl player_get_pos_including_state_based_drift
 	lsls r0, r7, 2
 	adds r0, r7
 	subs r0, 0x38

asm/script_menu.s

@@ -718,7 +718,7 @@ _080E23AC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	bls _080E23AC
-	ldr r6, =0x00000864
+	ldr r6, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	adds r0, r6, 0
 	bl FlagGet
 	lsls r0, 24