dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Lilcove Motel typos

Browse Source
This commit is contained in:
SphericalIce
2021-02-14 21:38:39 +00:00
parent be0699bd64
commit 56e047f949
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
+7 -7
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
@@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_MAN_4", "graphics_id": "OBJ_EVENT_GFX_MAN_4",
@@ -64,7 +64,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID",
@@ -77,7 +77,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
@@ -90,7 +90,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_SCOTT", "graphics_id": "OBJ_EVENT_GFX_SCOTT",
@@ -103,7 +103,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott",
"flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" "flag": "FLAG_HIDE_LILYCOVE_MOTEL_SCOTT"
} }
], ],
"warp_events": [ "warp_events": [
data/maps/SlateportCity_Harbor/scripts.inc
+1 -1
View File
@@ -70,7 +70,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
removeobject LOCALID_SUBMARINE removeobject LOCALID_SUBMARINE
setvar VAR_SLATEPORT_HARBOR_STATE, 2 setvar VAR_SLATEPORT_HARBOR_STATE, 2
setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_MET_TEAM_AQUA_HARBOR
setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT setflag FLAG_HIDE_LILYCOVE_MOTEL_SCOTT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0 call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
data/scripts/hall_of_fame.inc
+1 -1
View File
@@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
compare VAR_FOSSIL_MANIAC_STATE, 0 compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS clearflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
data/scripts/new_game.inc
+1 -1
View File
@@ -229,7 +229,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE setflag FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL
setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS setflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
include/constants/flags.h
+2 -2
View File
@@ -829,7 +829,7 @@
#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM 0x310
#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM 0x311
#define FLAG_HIDE_ROUTE_119_SCOTT 0x312 #define FLAG_HIDE_ROUTE_119_SCOTT 0x312
#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 #define FLAG_HIDE_LILYCOVE_MOTEL_SCOTT 0x313
#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314 #define FLAG_HIDE_MOSSDEEP_CITY_SCOTT 0x314
#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
#define FLAG_HIDE_FANCLUB_BOY 0x316 #define FLAG_HIDE_FANCLUB_BOY 0x316
@@ -967,7 +967,7 @@
#define FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE 0x39A #define FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE 0x39A
#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B #define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B
#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C
#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D #define FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS 0x39D
#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E
#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F
#define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0 #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0