diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 20:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 20:29:55 -0500 |
| commit | c2a7216d9b8689591ede817015bf96f263396bb8 (patch) | |
| tree | 008635aac62c3fdbb446453d308c2255fb0554d9 /engine/std_scripts.asm | |
| parent | 0b8b6f9259bedacad55bb4667de5b2bbe6eafda7 (diff) | |
| parent | c6b12b07b302b82765181b2521e1e0f2ca5f7725 (diff) | |
Merge pull request #424 from roukaour/master
Rename a routine and some maps; remove all code from main.asm
Diffstat (limited to 'engine/std_scripts.asm')
| -rw-r--r-- | engine/std_scripts.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index b31f7a415..297725c60 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -497,7 +497,7 @@ InitializeEventsScript: setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_RIVAL_CHERRYGROVE_CITY setevent EVENT_RIVAL_AZALEA_TOWN - setevent EVENT_RIVAL_UNDERGROUND_PATH + setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND setevent EVENT_AZALEA_TOWN_SLOWPOKES setevent EVENT_KURTS_HOUSE_SLOWPOKE setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE @@ -550,8 +550,8 @@ InitializeEventsScript: setevent EVENT_ECRUTEAK_POKE_CENTER_BILL setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY setevent EVENT_LAKE_OF_RAGE_LANCE - setevent EVENT_WAREHOUSE_LAYOUT_1 - setevent EVENT_WAREHOUSE_BLOCKED_OFF + setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + setevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF setevent EVENT_DRAGONS_DEN_CLAIR setevent EVENT_RIVAL_OLIVINE_CITY setevent EVENT_RIVAL_VICTORY_ROAD |