diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /data/maps/Route4_PokemonCenter_1F | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'data/maps/Route4_PokemonCenter_1F')
| -rw-r--r-- | data/maps/Route4_PokemonCenter_1F/map.json | 12 | ||||
| -rw-r--r-- | data/maps/Route4_PokemonCenter_1F/scripts.inc | 24 |
2 files changed, 18 insertions, 18 deletions
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, diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 6788cc0c8..e1a823cb5 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -21,14 +21,14 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_0x249 - goto_if_eq EventScript_16F8A2 + checkflag FLAG_BOUGHT_MAGIKARP + 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 @@ -107,7 +107,7 @@ EventScript_16F861:: @ 816F861 end EventScript_16F86A:: @ 816F86A - setflag FLAG_0x249 + setflag FLAG_BOUGHT_MAGIKARP release end |