From a7bca8aa92b7696047bcb3da8607ac7981647630 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:02:34 -0400 Subject: Hidden item flags --- data/maps/Route4_PokemonCenter_1F/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index f3401744c..706fe51ea 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} +} \ No newline at end of file -- cgit v1.2.3 From a16d9af699f367458d6832377a2806659d303bbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:13:35 -0400 Subject: Document renewable_hidden_items --- data/maps/Route4_PokemonCenter_1F/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 706fe51ea..f3401744c 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3 From d98d4d887c16e8fa13360e3f243bf019844d3c41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 15:05:51 -0400 Subject: Set map.json files with map_obj_gfx constants --- data/maps/Route4_PokemonCenter_1F/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index f3401744c..936900208 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, -- cgit v1.2.3 From 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 20:20:45 -0400 Subject: update famechecker macro --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 6788cc0c8..7cd5c0b99 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -21,7 +21,7 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_0x249 + checkflag FLAG_BOUGHT_MAGIKARP goto_if_eq EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender @@ -107,7 +107,7 @@ EventScript_16F861:: @ 816F861 end EventScript_16F86A:: @ 816F86A - setflag FLAG_0x249 + setflag FLAG_BOUGHT_MAGIKARP release end -- cgit v1.2.3 From 9aa5709329f4cbd497d0f21af10218f8a7547151 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 21:24:16 -0400 Subject: use TRUE and FALSE for flag conditionals; more story flags --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 7cd5c0b99..e1a823cb5 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -22,13 +22,13 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer checkflag FLAG_BOUGHT_MAGIKARP - goto_if_eq EventScript_16F8A2 + goto_if TRUE, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F786 + goto_if eq, EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F794 + goto_if eq, EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +43,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F888 + goto_if eq, EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F895 + goto_if eq, EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if eq, EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if eq, EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if eq, EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F861 + goto_if eq, EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox @@ -77,7 +77,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F84B + goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox .byte 0 -- cgit v1.2.3