From cff26c7af9ad82d276a773fae83447784c25276d Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sat, 13 Jul 2024 18:08:08 -0400 Subject: [PATCH] fossil guy adjustments --- data/tilesets/museum_attributes.bin | Bin 704 -> 704 bytes data/tilesets/museum_metatiles.bin | Bin 704 -> 704 bytes gfx/tilesets/museum.png | Bin 4187 -> 4157 bytes maps/PewterMuseumOfScience1F.asm | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/tilesets/museum_attributes.bin b/data/tilesets/museum_attributes.bin index 84a0b54c12e4ca358cef37d7890c5c844033edf0..0a1aff10fc1415f8392e78cbd82edd293045d40f 100644 GIT binary patch delta 12 TcmX@WdVqDq9wrt>21W(|8@dAj delta 12 TcmX@WdVqDq9wruEUPcB091#N; diff --git a/data/tilesets/museum_metatiles.bin b/data/tilesets/museum_metatiles.bin index 201e5bc83b7059395703624504c5be205321e074..d1c3827ba9060d95f05c62b662cfe1b1c9b957ac 100644 GIT binary patch delta 12 TcmX@WdVqDq9wrt>K}JCU8~y_! delta 12 TcmX@WdVqDq9wrtGOGZHe9Z~~; diff --git a/gfx/tilesets/museum.png b/gfx/tilesets/museum.png index a5beaaeb934b292c6474d5b2d439975698f77497..bd605c3f2835e4498fec8931dfff626729e5be4d 100644 GIT binary patch delta 4030 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 delta 4060 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 O002ovP6b4+LSTZqifN?) diff --git a/maps/PewterMuseumOfScience1F.asm b/maps/PewterMuseumOfScience1F.asm index 2c8d4a3..de92dce 100644 --- a/maps/PewterMuseumOfScience1F.asm +++ b/maps/PewterMuseumOfScience1F.asm @@ -562,7 +562,7 @@ PewterMuseumOfScience1F_MapEvents: bg_event 8, 1, BGEVENT_UP, ScarletBookScript def_object_events - object_event 12, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumFossilScientist, -1 + object_event 18, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumFossilScientist, -1 object_event 1, 4, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumOldManScript, -1 object_event 17, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MuseumAmberManScript, -1 object_event 12, 4, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MuseumReceptionistScript, -1