diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_objects.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 4 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index c7ac32fcc..d30f363c0 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2780,7 +2780,7 @@ Function5629: ; 5629 ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] - cp MAPOBJECT_NOT_VISIBLE + cp -1 ret z cp $d ret nc diff --git a/engine/specials.asm b/engine/specials.asm index 7c2a25316..c75e9d7a9 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -91,7 +91,7 @@ SpecialsPointers:: ; c029 add_special Function17440 add_special Special_SelectRandomBugContestContestants add_special Functionc3fc - add_special Function26feb + add_special ToggleMaptileDecorations add_special ToggleDecorationsVisibility add_special SpecialGiveShuckle add_special SpecialReturnShuckle @@ -265,7 +265,7 @@ Functionc298: ; c298 SpecialNameRival: ; 0xc29d ld b, $2 ; rival ld de, RivalName - callba Function116b7 + callba _NamingScreen ; default to "SILVER" ld hl, RivalName ld de, DefaultRivalName diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 1dd4eb6bd..28e60bdbd 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -542,8 +542,8 @@ InitializeEventsScript: setevent EVENT_KRISS_HOUSE_2F_DOLL_1 setevent EVENT_KRISS_HOUSE_2F_DOLL_2 setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL - setevent EVENT_2A4 - setevent EVENT_2AF + setevent EVENT_DECO_BED_1 + setevent EVENT_DECO_PLANT_4 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN setevent EVENT_OLIVINE_GYM_JASMINE setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN @@ -617,7 +617,7 @@ InitializeEventsScript: setevent EVENT_MT_MOON_SQUARE_CLEFAIRY setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - setevent EVENT_036 + setevent EVENT_INITIALIZED_EVENTS return AskNumber1MScript: |