diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 11:12:26 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-11 11:12:26 -0500 |
| commit | 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 (patch) | |
| tree | dd9dc3d2c03bd3f2cb512189dfba57f315298a45 /data/maps/RustboroCity | |
| parent | 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d (diff) | |
Sync bg_event macros with pokeruby
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/events.inc | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 4c70edf34..4471d06e0 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -31,39 +31,39 @@ RustboroCity_MapWarps: @ 8526960 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents: @ 85269C0 - coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3 + coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A + coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 + coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 + coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F + coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6 + coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE + coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A + coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16 + coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22 + coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B + coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37 + coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43 + coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F + coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3 + coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33 + coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73 + coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3 + coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3 + coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33 + coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 + coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 RustboroCity_MapBGEvents: @ 8526B10 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919 + bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 + bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 + bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A + bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 + bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907 + bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A + bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 + bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC + bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 + bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 RustboroCity_MapEvents:: @ 8526B88 map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents |