diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /maps | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/LakeOfRage.asm | 2 | ||||
| -rw-r--r-- | maps/PlayersHouse2F.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index b493f90e..35c811a1 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -202,7 +202,7 @@ WesleyScript: .MetWesley: writetext WesleyGivesGiftText promptbutton - verbosegiveitem BLACKBELT + verbosegiveitem BLACKBELT_I iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY writetext WesleyGaveGiftText diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 711b9594..65b4dbe1 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -9,7 +9,7 @@ PlayersHouse2F_MapScripts: db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .InitializeRoom - callback MAPCALLBACK_TILES, .SetSpawn + callback MAPCALLBACK_TILES, .SetUpTileDecorations ; unused .Null: @@ -26,7 +26,7 @@ PlayersHouse2F_MapScripts: .SkipInitialization: return -.SetSpawn: +.SetUpTileDecorations: special ToggleMaptileDecorations return |