diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-29 13:36:55 -0600 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-01-29 14:36:02 -0600 |
| commit | bd667102fafbace31694447190f5dd79b016834e (patch) | |
| tree | 888e4399ffa35a6df1dbd5f78bf48907efa72d58 | |
| parent | e43f341799ddc5f298b7e3c2e029b73e519fc003 (diff) | |
Fix PetaburgCity map scripts label
| -rw-r--r-- | data/event_scripts.s | 4 | ||||
| -rw-r--r-- | data/maps/PetalburgCity/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/PetalburgCity/scripts.inc | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 438bdb7f3..3c3c38eb9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -61,11 +61,7 @@ gStdScripts:: @ 81DC2A0 .4byte Std_RegisteredInMatchCall .4byte Std_9 .4byte Std_10 - gStdScripts_End:: @ 81DC2CC - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C - .byte 0 .include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/SlateportCity/scripts.inc" diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 6a4f82bfa..5cf3cc6e1 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,7 +1,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents - .4byte gStdScripts_End + .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 137731ae2..f69eb3a3a 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,3 +1,8 @@ +PetalburgCity_MapScripts:: + map_script 3, PetalburgCity_MapScript1_1DC2D7 + map_script 2, PetalburgCity_MapScript2_1DC31C + .byte 0 + PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_0x4057, 0 |