diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-11 17:43:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-11 17:43:20 -0500 |
| commit | 97a11c623ebd2c3e8d40a9c01b42669b2094da2c (patch) | |
| tree | fdf8c33ef5d460793b4e84450ab42e030a58fe01 /maps | |
| parent | d132a20b7aa5e0e411683e792d90947ab195e1d4 (diff) | |
Sync some files with pokegold
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/PlayersHouse2F.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index c36e3d76d..61cee6f23 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -31,19 +31,19 @@ PlayersHouse2F_MapScripts: db 0, 0, 0 ; unused -Doll1Script:: +PlayersHouseDoll1Script:: describedecoration DECODESC_LEFT_DOLL -Doll2Script: +PlayersHouseDoll2Script: describedecoration DECODESC_RIGHT_DOLL -BigDollScript: +PlayersHouseBigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsoleScript: +PlayersHouseGameConsoleScript: describedecoration DECODESC_CONSOLE -PosterScript: +PlayersHousePosterScript: conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: @@ -124,10 +124,10 @@ PlayersHouse2F_MapEvents: bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript - bg_event 6, 0, BGEVENT_IFSET, PosterScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript def_object_events - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL |