diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-15 21:14:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 21:14:22 -0500 |
| commit | 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4 (patch) | |
| tree | 17932d687fef4c87e555c45fda32564f4df7aa0a /maps | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
| parent | 8b007e8d51ec86992d97fa4b1c05b762e0916427 (diff) | |
Merge pull request #487 from luckytyphlosion/master
Fix more w-izing edge cases.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/KrissHouse2F.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f250d2cec..f1dcc7e2f 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -34,19 +34,19 @@ KrissHouse2F_MapScripts: db 0, 0, 0 ; filler -Doll1: +DecoDoll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2: +DecoDoll2Script: describedecoration DECODESC_RIGHT_DOLL -wDecoBigDoll: +DecoBigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsole: +DecoGameConsoleScript: describedecoration DECODESC_CONSOLE -KrissHousePoster: +DecoPosterScript: conditional_event EVENT_KRISS_ROOM_POSTER, .Script .Script: @@ -131,11 +131,11 @@ KrissHouse2F_MapEvents: bg_event 2, 1, BGEVENT_UP, KrissHousePC bg_event 3, 1, BGEVENT_READ, KrissHouseRadio bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster + bg_event 6, 0, BGEVENT_IFSET, DecoPosterScript .ObjectEvents: db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, wDecoBigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoGameConsoleScript, EVENT_KRISS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll1Script, EVENT_KRISS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll2Script, EVENT_KRISS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoBigDollScript, EVENT_KRISS_HOUSE_2F_BIG_DOLL |