From da1b5365a71acc32b95d9b850b775609aecaa909 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 08:55:09 -0400 Subject: label a flag in the asm --- asm/contest_link_81D9DE4.s | 2 +- asm/easy_chat.s | 4 ++-- asm/pokenav.s | 2 +- asm/script_menu.s | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'asm') diff --git a/asm/contest_link_81D9DE4.s b/asm/contest_link_81D9DE4.s index 35191e10f..3969be9a2 100644 --- 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 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index e99c885cc..c73224807 100644 --- 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 diff --git a/asm/pokenav.s b/asm/pokenav.s index cfad3feda..a8d3c838f 100644 --- 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 diff --git a/asm/script_menu.s b/asm/script_menu.s index bb145e78d..703c052f3 100644 --- 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 -- cgit v1.2.3 From d1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 22:07:23 -0400 Subject: begin event flag names, add temporary hidden item macro --- asm/macros/map.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'asm') diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 23806b4cc..aa54c9001 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -68,6 +68,10 @@ bg_event \x, \y, \height, 7, \item, \flag, 0 .endm + .macro bg_hidden_item_event_new x, y, height, item, flag + 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 bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 .endm -- cgit v1.2.3 From 113a8d1efd45ed387a0ede7b7aa8744b622c662f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 14:59:18 -0400 Subject: clean flags and remove temp macro --- asm/macros/map.inc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'asm') diff --git a/asm/macros/map.inc b/asm/macros/map.inc index aa54c9001..9a028b2e5 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -65,10 +65,6 @@ .endm .macro bg_hidden_item_event x, y, height, item, flag - bg_event \x, \y, \height, 7, \item, \flag, 0 - .endm - - .macro bg_hidden_item_event_new x, y, height, item, flag bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 .endm -- cgit v1.2.3