Sync bg_event macros with pokeruby

This commit is contained in:
Marcus Huderle
2018-07-11 11:12:26 -05:00
parent 8ffd7a70fc
commit 7d375972ba
165 changed files with 1251 additions and 1106 deletions
+16 -16
View File
@@ -18,24 +18,24 @@ PetalburgCity_MapWarps: @ 85260A8
warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
PetalburgCity_MapCoordEvents: @ 85260D8
coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A
coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6
coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2
coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE
coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691
coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7
coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD
coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3
coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A
coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6
coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2
coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE
coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691
coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7
coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD
coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3
PetalburgCity_MapBGEvents: @ 8526158
bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476
bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F
bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491
bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0
bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476
bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F
bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491
bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, 95
PetalburgCity_MapEvents:: @ 85261B8
map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents