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

begin event flag names, add temporary hidden item macro

Browse Source
This commit is contained in:
garak
2018-10-17 22:07:23 -04:00
parent 7d88b9647f
commit d1b7f32b0a
108 changed files with 398 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LilycoveCity/events.inc
+10 -10
View File
@@ -8,14 +8,14 @@ LilycoveCity_EventObjects: @ 8526CE8
object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_0x354
object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_0x412
object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_0x354
object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_0x354
object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_0x354
object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_0x354
object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_MAX_REPEL
object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_0x3CB
object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
@@ -49,9 +49,9 @@ LilycoveCity_MapBGEvents: @ 8526F68
bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44
bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62
bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74
bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_TEMP_1B
bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_0x02B
bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_0x04B
bg_hidden_item_event_new 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE
bg_hidden_item_event_new 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP
bg_hidden_item_event_new 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL
LilycoveCity_MapEvents:: @ 8527004
map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
LilycoveCity_MapScript1_1E2B47: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_0x4086, 0
setflag FLAG_0x322
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
checkflag FLAG_SYS_WEATHER_CTRL
call_if 1, LilycoveCity_EventScript_27207A
call LilycoveCity_EventScript_271ED7