Merge pull request #365 from garakmon/event-flags

[WIP] Event flags
2018-10-19 14:24:34 -05:00
parent 95d8815721 113a8d1efd
commit bf8fa23462
340 changed files with 2531 additions and 2600 deletions
--- a/asm/contest_link_81D9DE4.s
+++ b/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
--- a/asm/easy_chat.s
+++ b/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
--- a/asm/macros/map.inc
+++ b/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
--- a/asm/pokenav.s
+++ b/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
--- a/asm/script_menu.s
+++ b/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