From f5683b5c46b802cf75491d931a33d2fbe52a332c Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 10:44:26 -0400 Subject: move headers and connections into map dirs --- data/maps/Route4_PokemonCenter_1F/header.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_1F/header.inc (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..f48c8935e --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +Route4_PokemonCenter_1F:: @ 83517D0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C + .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 -- cgit v1.2.3 From 799e971efef15b66345b255d57e94780733f667a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 11:03:10 -0400 Subject: fix map events names --- data/maps/Route4_PokemonCenter_1F/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc index f48c8935e..fc36624b4 100644 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_1F:: @ 83517D0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C - .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C + .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 -- cgit v1.2.3 From fb1ae058073d64305cb5dbae873095febdd36d74 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 12:08:12 -0400 Subject: move map events to map directories --- data/maps/Route4_PokemonCenter_1F/events.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_1F/events.inc (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/events.inc b/data/maps/Route4_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..8e00de94c --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/events.inc @@ -0,0 +1,16 @@ +Route4_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8BB, 0, 0, 0 + object_event 2, 30, 0, 1, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F75F, 0, 0, 0 + object_event 3, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F754, 0, 0, 0 + object_event 4, 19, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F74B, 0, 0, 0 + object_event 5, 18, 0, 14, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8C4, 0, 0, 0 + object_event 6, 105, 0, 12, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8CD, 0, 0, 0 + +Route4_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 2, 790 + warp_def 7, 8, 3, 2, 790 + warp_def 8, 8, 3, 2, 790 + warp_def 1, 6, 4, 0, 4097 + +Route4_PokemonCenter_1F_MapEvents:: + map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 -- cgit v1.2.3 From 4e5d818f89caae9153dd53ba321900e0d4e16c1e Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 6 May 2019 22:13:57 -0400 Subject: dump event scripts --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 181 ++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_1F/scripts.inc (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 new file mode 100644 index 000000000..e488082c2 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -0,0 +1,181 @@ +Route4_PokemonCenter_1F_MapScripts:: @ 816F739 + map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 + map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 + setworldmapflag 2210 + setrespawn 12 + end + +Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B + loadword 0, gUnknown_819D9D4 + callstd 2 + end + +Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 + lock + loadword 0, gUnknown_819DA3A + callstd 4 + release + end + +Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F + lock + faceplayer + checkflag FLAG_0x249 + goto_if 1, EventScript_16F8A2 + showmoneybox 0, 0, 0 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F786 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F794 + end + +EventScript_16F786:: @ 816F786 + loadword 0, gUnknown_819DA9A + callstd 5 + goto EventScript_16F7A2 + end + +EventScript_16F794:: @ 816F794 + loadword 0, gUnknown_819DB34 + callstd 5 + goto EventScript_16F7A2 + end + +EventScript_16F7A2:: @ 816F7A2 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F888 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, 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 1, EventScript_16F7F6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F822 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16F8AC + end + +EventScript_16F7F6:: @ 816F7F6 + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F861 + call EventScript_1A8C27 + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangePokemonNickname + waitstate + goto EventScript_16F86A + end + +EventScript_16F822:: @ 816F822 + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F84B + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + goto EventScript_16F856 + end + +EventScript_16F84B:: @ 816F84B + call EventScript_1A8C3C + goto EventScript_16F861 + end + +EventScript_16F856:: @ 816F856 + call EventScript_1A8C3C + goto EventScript_16F86A + end + +EventScript_16F861:: @ 816F861 + hidemoneybox + .byte 0 + .byte 0 + goto EventScript_16F86A + end + +EventScript_16F86A:: @ 816F86A + setflag FLAG_0x249 + release + end + +EventScript_16F86F:: @ 816F86F + takemoney 500, 0 + updatemoneybox 0, 0, 0 + playfanfare MUS_FANFA1 + message Text_19DBD3 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_MAGIKARP + return + +EventScript_16F888:: @ 816F888 + loadword 0, gUnknown_819DC07 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +EventScript_16F895:: @ 816F895 + loadword 0, gUnknown_819DC78 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +EventScript_16F8A2:: @ 816F8A2 + loadword 0, gUnknown_819DC9A + callstd 4 + release + end + +EventScript_16F8AC:: @ 816F8AC + textcolor 0 + loadword 0, gUnknown_819DC3E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB + lock + faceplayer + call EventScript_1A6578 + release + end + +Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 + loadword 0, gUnknown_819DCDB + callstd 2 + end + +Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD + lock + loadword 0, gUnknown_819DD54 + callstd 4 + release + end -- cgit v1.2.3 From 55d66b51770b4f657ed55822e7e76f6d6e3261d8 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 13 May 2019 19:44:24 -0400 Subject: convert map data to json --- data/maps/Route4_PokemonCenter_1F/events.inc | 16 ---- data/maps/Route4_PokemonCenter_1F/header.inc | 8 -- data/maps/Route4_PokemonCenter_1F/map.json | 127 +++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 24 deletions(-) delete mode 100644 data/maps/Route4_PokemonCenter_1F/events.inc delete mode 100644 data/maps/Route4_PokemonCenter_1F/header.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/map.json (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/events.inc b/data/maps/Route4_PokemonCenter_1F/events.inc deleted file mode 100644 index 8e00de94c..000000000 --- a/data/maps/Route4_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route4_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8BB, 0, 0, 0 - object_event 2, 30, 0, 1, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F75F, 0, 0, 0 - object_event 3, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F754, 0, 0, 0 - object_event 4, 19, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F74B, 0, 0, 0 - object_event 5, 18, 0, 14, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8C4, 0, 0, 0 - object_event 6, 105, 0, 12, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8CD, 0, 0, 0 - -Route4_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 2, 790 - warp_def 7, 8, 3, 2, 790 - warp_def 8, 8, 3, 2, 790 - warp_def 1, 6, 4, 0, 4097 - -Route4_PokemonCenter_1F_MapEvents:: - map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc deleted file mode 100644 index fc36624b4..000000000 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4_PokemonCenter_1F:: @ 83517D0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C - .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json new file mode 100644 index 000000000..51492a5b3 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE4_POKEMON_CENTER_1F", + "name": "Route4_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3 From 7dca612936fda9254239e0e350a45c56a766053a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:07 -0400 Subject: Fix indentation in .inc files --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 276 +++++++++++++------------- 1 file changed, 138 insertions(+), 138 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 e488082c2..e943780de 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,181 +1,181 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 - map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 - map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 + map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 - setworldmapflag 2210 - setrespawn 12 - end + setworldmapflag 2210 + setrespawn 12 + end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - loadword 0, gUnknown_819D9D4 - callstd 2 - end + loadword 0, gUnknown_819D9D4 + callstd 2 + end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 - lock - loadword 0, gUnknown_819DA3A - callstd 4 - release - end + lock + loadword 0, gUnknown_819DA3A + callstd 4 + release + end Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F - lock - faceplayer - checkflag FLAG_0x249 - goto_if 1, EventScript_16F8A2 - showmoneybox 0, 0, 0 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F786 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F794 - end + lock + faceplayer + checkflag FLAG_0x249 + goto_if 1, EventScript_16F8A2 + showmoneybox 0, 0, 0 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F786 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F794 + end EventScript_16F786:: @ 816F786 - loadword 0, gUnknown_819DA9A - callstd 5 - goto EventScript_16F7A2 - end + loadword 0, gUnknown_819DA9A + callstd 5 + goto EventScript_16F7A2 + end EventScript_16F794:: @ 816F794 - loadword 0, gUnknown_819DB34 - callstd 5 - goto EventScript_16F7A2 - end + loadword 0, gUnknown_819DB34 + callstd 5 + goto EventScript_16F7A2 + end EventScript_16F7A2:: @ 816F7A2 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F888 - checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16F7F6 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F822 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16F8AC - end + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F888 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, 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 1, EventScript_16F7F6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F822 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16F8AC + end EventScript_16F7F6:: @ 816F7F6 - call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F861 - call EventScript_1A8C27 - fadescreen 1 - hidemoneybox - .byte 0 - .byte 0 - special ChangePokemonNickname - waitstate - goto EventScript_16F86A - end + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F861 + call EventScript_1A8C27 + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangePokemonNickname + waitstate + goto EventScript_16F86A + end EventScript_16F822:: @ 816F822 - call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F84B - fadescreen 1 - hidemoneybox - .byte 0 - .byte 0 - special ChangeBoxPokemonNickname - waitstate - lock - faceplayer - goto EventScript_16F856 - end + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F84B + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + goto EventScript_16F856 + end EventScript_16F84B:: @ 816F84B - call EventScript_1A8C3C - goto EventScript_16F861 - end + call EventScript_1A8C3C + goto EventScript_16F861 + end EventScript_16F856:: @ 816F856 - call EventScript_1A8C3C - goto EventScript_16F86A - end + call EventScript_1A8C3C + goto EventScript_16F86A + end EventScript_16F861:: @ 816F861 - hidemoneybox - .byte 0 - .byte 0 - goto EventScript_16F86A - end + hidemoneybox + .byte 0 + .byte 0 + goto EventScript_16F86A + end EventScript_16F86A:: @ 816F86A - setflag FLAG_0x249 - release - end + setflag FLAG_0x249 + release + end EventScript_16F86F:: @ 816F86F - takemoney 500, 0 - updatemoneybox 0, 0, 0 - playfanfare MUS_FANFA1 - message Text_19DBD3 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_MAGIKARP - return + takemoney 500, 0 + updatemoneybox 0, 0, 0 + playfanfare MUS_FANFA1 + message Text_19DBD3 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_MAGIKARP + return EventScript_16F888:: @ 816F888 - loadword 0, gUnknown_819DC07 - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + loadword 0, gUnknown_819DC07 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end EventScript_16F895:: @ 816F895 - loadword 0, gUnknown_819DC78 - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + loadword 0, gUnknown_819DC78 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end EventScript_16F8A2:: @ 816F8A2 - loadword 0, gUnknown_819DC9A - callstd 4 - release - end + loadword 0, gUnknown_819DC9A + callstd 4 + release + end EventScript_16F8AC:: @ 816F8AC - textcolor 0 - loadword 0, gUnknown_819DC3E - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + textcolor 0 + loadword 0, gUnknown_819DC3E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - loadword 0, gUnknown_819DCDB - callstd 2 - end + loadword 0, gUnknown_819DCDB + callstd 2 + end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD - lock - loadword 0, gUnknown_819DD54 - callstd 4 - release - end + lock + loadword 0, gUnknown_819DD54 + callstd 4 + release + end -- cgit v1.2.3 From 2c20a3214efe5211425a735167070eda2f28f496 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:38 -0400 Subject: Document world map flags --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 e943780de..d4904e476 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 .byte 0 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 - setworldmapflag 2210 + setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn 12 end -- cgit v1.2.3 From 119693e1816563b66b19eef216f08cab65a644ba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 09:38:19 -0400 Subject: propagate msgbox macro --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 36 +++++++++------------------ 1 file changed, 12 insertions(+), 24 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 d4904e476..fb10bc0da 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -9,14 +9,12 @@ Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - loadword 0, gUnknown_819D9D4 - callstd 2 + msgbox gUnknown_819D9D4, 2 end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 lock - loadword 0, gUnknown_819DA3A - callstd 4 + msgbox gUnknown_819DA3A release end @@ -34,14 +32,12 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F end EventScript_16F786:: @ 816F786 - loadword 0, gUnknown_819DA9A - callstd 5 + msgbox gUnknown_819DA9A, 5 goto EventScript_16F7A2 end EventScript_16F794:: @ 816F794 - loadword 0, gUnknown_819DB34 - callstd 5 + msgbox gUnknown_819DB34, 5 goto EventScript_16F7A2 end @@ -64,8 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F861 call EventScript_1A8C27 @@ -80,8 +75,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F84B fadescreen 1 @@ -128,8 +122,7 @@ EventScript_16F86F:: @ 816F86F return EventScript_16F888:: @ 816F888 - loadword 0, gUnknown_819DC07 - callstd 4 + msgbox gUnknown_819DC07 hidemoneybox .byte 0 .byte 0 @@ -137,8 +130,7 @@ EventScript_16F888:: @ 816F888 end EventScript_16F895:: @ 816F895 - loadword 0, gUnknown_819DC78 - callstd 4 + msgbox gUnknown_819DC78 hidemoneybox .byte 0 .byte 0 @@ -146,15 +138,13 @@ EventScript_16F895:: @ 816F895 end EventScript_16F8A2:: @ 816F8A2 - loadword 0, gUnknown_819DC9A - callstd 4 + msgbox gUnknown_819DC9A release end EventScript_16F8AC:: @ 816F8AC textcolor 0 - loadword 0, gUnknown_819DC3E - callstd 4 + msgbox gUnknown_819DC3E hidemoneybox .byte 0 .byte 0 @@ -169,13 +159,11 @@ Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - loadword 0, gUnknown_819DCDB - callstd 2 + msgbox gUnknown_819DCDB, 2 end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD lock - loadword 0, gUnknown_819DD54 - callstd 4 + msgbox gUnknown_819DD54 release end -- cgit v1.2.3 From d7bd4d3bd17e84cace0ac902aab2f9bb38894c77 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 09:52:32 -0400 Subject: Propagate giveitem macro --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 fb10bc0da..d2d305823 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -32,12 +32,12 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F end EventScript_16F786:: @ 816F786 - msgbox gUnknown_819DA9A, 5 + msgbox gUnknown_819DA9A, MSGBOX_YESNO goto EventScript_16F7A2 end EventScript_16F794:: @ 816F794 - msgbox gUnknown_819DB34, 5 + msgbox gUnknown_819DB34, MSGBOX_YESNO goto EventScript_16F7A2 end @@ -60,7 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F861 call EventScript_1A8C27 @@ -75,7 +75,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F84B fadescreen 1 -- cgit v1.2.3 From a2d1b854d678204929580b8d82e507f908261fc1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 13:30:03 -0400 Subject: goto_if_eq and switch/case in scripts --- 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 d2d305823..3019e152f 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_0x249 - goto_if 1, EventScript_16F8A2 + goto_if_eq EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F786 + goto_if_eq EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_16F888 + goto_if_eq EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16F7F6 + goto_if_eq EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F822 + goto_if_eq EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, EventScript_16F84B + goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox .byte 0 -- cgit v1.2.3 From 4156dd6b5789e613e4c25ec2cfe9867ec491f85a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 13:57:21 -0400 Subject: setrespawn --- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 3019e152f..6788cc0c8 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F - setrespawn 12 + setrespawn SPAWN_ROUTE4 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B -- cgit v1.2.3 From cfc43d11115ab3258592801665caef9cfe859589 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Fri, 17 May 2019 14:14:21 +0100 Subject: Label weather --- data/maps/Route4_PokemonCenter_1F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 51492a5b3..066ee63c6 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} -- cgit v1.2.3 From 44e30e713664330179a41f08a90ad7f168fd82da Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 21 May 2019 17:00:28 -0400 Subject: split map text into map directories --- data/maps/Route4_PokemonCenter_1F/text.inc | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 data/maps/Route4_PokemonCenter_1F/text.inc (limited to 'data/maps/Route4_PokemonCenter_1F') diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..f357b7f76 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -0,0 +1,54 @@ +gUnknown_819D9D4:: @ 819D9D4 + .string "Okay, set six POKé BALLS in my\n" + .string "belt…\p" + .string "Yeah, that'll do it. At most, you\n" + .string "can have six POKéMON with you.$" + +gUnknown_819DA3A:: @ 819DA3A + .string "TEAM ROCKET attacks CERULEAN\n" + .string "citizens…\p" + .string "Not a day goes by without TEAM\n" + .string "ROCKET being in the news.$" + +gUnknown_819DA9A:: @ 819DA9A + .string "MAN: Hello there, laddie!\n" + .string "Have I got a deal just for you!\p" + .string "I'll let you have a secret POKéMON\n" + .string "- a MAGIKARP - for just ¥500!\p" + .string "So, you'll buy it, am I right?$" + +gUnknown_819DB34:: @ 819DB34 + .string "MAN: Hello there, sweetie pie!\n" + .string "Have I got a deal just for you!\p" + .string "I'll let you have a secret POKéMON\n" + .string "- a MAGIKARP - for just ¥500!\p" + .string "So, you'll buy it, am I right?$" + +Text_19DBD3:: @ 819DBD3 + .string "{PLAYER} paid an outrageous ¥500\n" + .string "and bought the MAGIKARP…$" + +gUnknown_819DC07:: @ 819DC07 + .string "No? You say no? I'm only doing this\n" + .string "as a favor to you!$" + +gUnknown_819DC3E:: @ 819DC3E + .string "There's no more room for any more\n" + .string "POKéMON, it looks like.$" + +gUnknown_819DC78:: @ 819DC78 + .string "You'll need more money than that!$" + +gUnknown_819DC9A:: @ 819DC9A + .string "MAN: Well, I don't give refunds.\n" + .string "You knew what you were getting!$" + +gUnknown_819DCDB:: @ 819DCDB + .string "Sometimes, you'll have too many\n" + .string "POKéMON with you to add any more.\p" + .string "In that case, you should just\n" + .string "store some using any PC.$" + +gUnknown_819DD54:: @ 819DD54 + .string "It's a newspaper.$" + -- cgit v1.2.3