From 31d31d326034fde26dedaf2dadb1c608e00fb92f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 18:09:24 -0500 Subject: Sync compare macros, some event_scripts.s doc, begin map_scripts constants --- data/maps/SSAnne_Kitchen/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 8ab022028..97ca7f889 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -19,11 +19,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_160B15 release end -- cgit v1.2.3 From 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 00:44:57 -0500 Subject: Sync event macros --- data/maps/SSAnne_Kitchen/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 97ca7f889..b5619e78e 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_160B03 + call_if_eq EventScript_160B03 compare VAR_0x8008, 1 - call_if eq, EventScript_160B0C + call_if_eq EventScript_160B0C compare VAR_0x8008, 2 - call_if eq, EventScript_160B15 + call_if_eq EventScript_160B15 release end -- cgit v1.2.3 From 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 01:45:31 -0500 Subject: Use MSGBOX constants --- data/maps/SSAnne_Kitchen/scripts.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b5619e78e..565efd607 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,15 +2,15 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - msgbox gUnknown_81733F8, 2 + msgbox gUnknown_81733F8, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - msgbox gUnknown_8173429, 2 + msgbox gUnknown_8173429, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - msgbox gUnknown_8173462, 2 + msgbox gUnknown_8173462, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE @@ -41,13 +41,13 @@ EventScript_160B15:: @ 8160B15 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - msgbox gUnknown_81734A0, 2 + msgbox gUnknown_81734A0, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - msgbox gUnknown_81734D3, 2 + msgbox gUnknown_81734D3, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - msgbox gUnknown_817353E, 2 + msgbox gUnknown_817353E, MSGBOX_NPC end -- cgit v1.2.3 From aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 01:29:57 -0500 Subject: Name item ball scripts --- data/maps/SSAnne_Kitchen/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 968d87938..cb062a8fd 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "script": "SSAnne_Kitchen_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], -- cgit v1.2.3