From 26d3f2cf2f8342e9f300f8cb6b4b0de02bef8679 Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Wed, 26 Jun 2024 02:11:47 +0100 Subject: [PATCH] Bugfix: NPC's use wrong time of day pals --- engine/gfx/sprite_palettes.asm | 3 +- gfx/overworld/npc_sprites.pal | 92 +++++++++++++------------- gfx/overworld/npc_sprites_darkness.pal | 48 +++++++------- gfx/tilesets/ice_path.pal | 8 +-- maps/IcePathB1F.asm | 8 +-- maps/IcePathB2FMahoganySide.asm | 8 +-- maps/IcePathB3F.asm | 2 +- maps/SeafoamIslandsB1F.asm | 12 ++-- maps/SeafoamIslandsB3F.asm | 2 +- 9 files changed, 91 insertions(+), 92 deletions(-) diff --git a/engine/gfx/sprite_palettes.asm b/engine/gfx/sprite_palettes.asm index fe2b64b8f..5d5317445 100644 --- a/engine/gfx/sprite_palettes.asm +++ b/engine/gfx/sprite_palettes.asm @@ -58,9 +58,8 @@ CopySpritePal:: .check_daytimes ld a, [wPalFlags] bit USE_DAYTIME_PAL_F, a - ld a, 1 + ld a, DAY jr nz, .daytime - jr .daytime ; always daytime pals for this hack, remove to change. ld a, [wTimeOfDayPal] .daytime maskbits NUM_DAYTIMES diff --git a/gfx/overworld/npc_sprites.pal b/gfx/overworld/npc_sprites.pal index 68c5e673c..811beb025 100644 --- a/gfx/overworld/npc_sprites.pal +++ b/gfx/overworld/npc_sprites.pal @@ -1,20 +1,20 @@ ; morn - RGB 28,31,16, 31,22,10, 31,07,01, 00,00,00 ; red - RGB 28,31,16, 31,22,10, 10,09,31, 00,00,00 ; blue - RGB 28,31,16, 31,22,10, 07,23,03, 00,00,00 ; green - RGB 28,31,16, 31,22,10, 15,10,03, 00,00,00 ; brown - RGB 28,31,16, 31,22,10, 18,04,18, 00,00,00 ; purple - RGB 28,31,16, 31,22,10, 13,13,13, 00,00,00 ; gray - RGB 28,31,16, 31,22,10, 31,10,11, 00,00,00 ; pink - RGB 28,31,16, 31,22,10, 03,23,21, 00,00,00 ; teal - RGB 28,31,16, 31,22,10, 25,25,00, 00,00,00 ; yellow - RGB 28,31,16, 31,22,10, 31,13,00, 00,00,00 ; orange - RGB 28,31,16, 31,22,10, 04,18,31, 00,00,00 ; azure - RGB 28,31,16, 28,31,16, 20,20,20, 00,00,00 ; white - RGB 28,31,16, 31,22,10, 10,10,10, 00,00,00 ; black - RGB 28,31,16, 28,31,16, 31,07,01, 00,00,00 ; poke ball - RGB 28,31,16, 28,31,16, 10,09,31, 00,00,00 ; deco item - RGB 28,31,16, 28,31,16, 07,23,03, 00,00,00 ; key item + RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 28,31,16, 31,19,10, 04,19,00, 00,00,00 ; green + RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 28,31,16, 31,19,10, 17,08,28, 00,00,00 ; purple + RGB 28,31,16, 31,19,10, 11,14,15, 00,00,00 ; gray + RGB 28,31,16, 31,19,10, 27,07,16, 00,00,00 ; pink + RGB 28,31,16, 31,19,10, 03,23,21, 00,00,00 ; teal + RGB 28,31,16, 30,27,08, 29,17,00, 00,00,00 ; yellow + RGB 28,31,16, 31,19,10, 31,13,00, 00,00,00 ; orange + RGB 28,31,16, 31,19,10, 04,18,31, 00,00,00 ; azure + RGB 28,31,16, 31,31,31, 26,26,26, 00,00,00 ; white + RGB 28,31,16, 23,23,23, 10,10,10, 00,00,00 ; black + RGB 28,31,16, 27,31,27, 31,07,01, 00,00,00 ; poke ball + RGB 28,31,16, 27,31,27, 10,09,31, 00,00,00 ; deco item + RGB 28,31,16, 27,31,27, 07,23,03, 00,00,00 ; key item RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree ; day @@ -37,39 +37,39 @@ RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree ; nite - RGB 15,14,24, 16,09,09, 17,03,00, 00,00,00 ; red - RGB 15,14,24, 16,09,09, 05,04,27, 00,00,00 ; blue - RGB 15,14,24, 16,09,09, 03,10,02, 00,00,00 ; green - RGB 15,14,24, 16,09,09, 08,04,02, 00,00,00 ; brown - RGB 15,14,24, 16,09,09, 10,01,16, 00,00,00 ; purple - RGB 15,14,24, 16,09,09, 07,07,10, 00,00,00 ; gray - RGB 15,14,24, 16,09,09, 17,07,08, 00,00,00 ; pink - RGB 15,14,24, 16,09,09, 02,12,16, 00,00,00 ; teal - RGB 15,14,24, 16,09,09, 12,12,00, 00,00,00 ; yellow - RGB 15,14,24, 16,09,09, 17,08,00, 00,00,00 ; orange - RGB 15,14,24, 16,09,09, 02,09,27, 00,00,00 ; azure - RGB 15,14,24, 15,14,24, 10,10,15, 00,00,00 ; white - RGB 15,14,24, 16,09,09, 05,05,08, 00,00,00 ; black - RGB 15,14,24, 15,14,24, 17,03,00, 00,00,00 ; poke ball - RGB 15,14,24, 15,14,24, 05,04,27, 00,00,00 ; deco item - RGB 15,14,24, 15,14,24, 03,10,02, 00,00,00 ; key item - RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree + RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 15,14,24, 31,19,10, 04,19,00, 00,00,00 ; green + RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 15,14,24, 31,19,10, 17,08,28, 00,00,00 ; purple + RGB 15,14,24, 31,19,10, 11,14,15, 00,00,00 ; gray + RGB 15,14,24, 31,19,10, 27,07,16, 00,00,00 ; pink + RGB 15,14,24, 31,19,10, 03,23,21, 00,00,00 ; teal + RGB 15,14,24, 30,27,08, 29,17,00, 00,00,00 ; yellow + RGB 15,14,24, 31,19,10, 31,13,00, 00,00,00 ; orange + RGB 15,14,24, 31,19,10, 04,18,31, 00,00,00 ; azure + RGB 15,14,24, 31,31,31, 26,26,26, 00,00,00 ; white + RGB 15,14,24, 23,23,23, 10,10,10, 00,00,00 ; black + RGB 15,14,24, 27,31,27, 31,07,01, 00,00,00 ; poke ball + RGB 15,14,24, 27,31,27, 10,09,31, 00,00,00 ; deco item + RGB 15,14,24, 27,31,27, 07,23,03, 00,00,00 ; key item + RGB 15,14,24, 12,25,01, 05,14,00, 00,00,00 ; tree ; eve RGB 31,21,14, 31,19,10, 31,07,01, 00,00,00 ; red RGB 31,21,14, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 31,21,14, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 31,21,14, 31,19,10, 04,19,00, 00,00,00 ; green RGB 31,21,14, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 31,21,14, 31,19,10, 18,04,18, 00,00,00 ; purple - RGB 31,21,14, 31,19,10, 13,13,13, 00,00,00 ; gray - RGB 31,21,14, 31,19,10, 31,10,11, 00,00,00 ; pink + RGB 31,21,14, 31,19,10, 17,08,28, 00,00,00 ; purple + RGB 31,21,14, 31,19,10, 11,14,15, 00,00,00 ; gray + RGB 31,21,14, 31,19,10, 27,07,16, 00,00,00 ; pink RGB 31,21,14, 31,19,10, 03,23,21, 00,00,00 ; teal - RGB 31,21,14, 31,21,14, 25,25,00, 00,00,00 ; yellow - RGB 31,21,14, 31,22,10, 31,13,00, 00,00,00 ; orange - RGB 31,21,14, 31,22,10, 04,18,31, 00,00,00 ; azure - RGB 31,21,14, 31,21,14, 20,20,20, 00,00,00 ; white - RGB 31,21,14, 31,22,10, 10,10,10, 00,00,00 ; black - RGB 31,21,14, 31,21,14, 31,07,01, 00,00,00 ; poke ball - RGB 31,21,14, 31,21,14, 10,09,31, 00,00,00 ; deco item - RGB 31,21,14, 31,21,14, 07,23,03, 00,00,00 ; key item - RGB 19,23,08, 10,19,01, 04,10,00, 06,05,05 ; tree + RGB 31,21,14, 30,27,08, 29,17,00, 00,00,00 ; yellow + RGB 31,21,14, 31,19,10, 31,13,00, 00,00,00 ; orange + RGB 31,21,14, 31,19,10, 04,18,31, 00,00,00 ; azure + RGB 31,21,14, 31,31,31, 26,26,26, 00,00,00 ; white + RGB 31,21,14, 23,23,23, 10,10,10, 00,00,00 ; black + RGB 31,21,14, 27,31,27, 31,07,01, 00,00,00 ; poke ball + RGB 31,21,14, 27,31,27, 10,09,31, 00,00,00 ; deco item + RGB 31,21,14, 27,31,27, 07,23,03, 00,00,00 ; key item + RGB 19,23,08, 12,25,01, 05,14,00, 06,05,05 ; tree diff --git a/gfx/overworld/npc_sprites_darkness.pal b/gfx/overworld/npc_sprites_darkness.pal index 6ec855ad4..bb8433ce8 100644 --- a/gfx/overworld/npc_sprites_darkness.pal +++ b/gfx/overworld/npc_sprites_darkness.pal @@ -1,24 +1,24 @@ - RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 27,31,27, 31,19,10, 04,19,00, 00,00,00 ; green - RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 27,31,27, 31,19,10, 17,08,28, 00,00,00 ; purple - RGB 27,31,27, 31,19,10, 11,14,15, 00,00,00 ; gray - RGB 27,31,27, 31,19,10, 27,07,16, 00,00,00 ; pink - RGB 27,31,27, 31,19,10, 03,23,21, 00,00,00 ; teal - RGB 27,31,27, 30,27,08, 29,17,00, 00,00,00 ; yellow - RGB 27,31,27, 31,19,10, 31,13,00, 00,00,00 ; orange - RGB 27,31,27, 31,19,10, 04,18,31, 00,00,00 ; azure - RGB 27,31,27, 27,31,27, 20,20,20, 00,00,00 ; white - RGB 27,31,27, 31,19,10, 10,10,10, 00,00,00 ; black - RGB 27,31,27, 27,31,27, 31,07,01, 00,00,00 ; poke ball - RGB 27,31,27, 27,31,27, 10,09,31, 00,00,00 ; deco item - RGB 27,31,27, 27,31,27, 07,23,03, 00,00,00 ; key item - RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; emote gray - RGB 31,31,31, 31,31,31, 00,00,00, 00,00,00 ; emote black - RGB 31,31,31, 31,31,31, 02,23,02, 00,00,00 ; emote green - RGB 31,31,31, 31,31,31, 23,02,23, 00,00,00 ; emote purple - RGB 31,31,31, 31,31,31, 31,00,00, 00,00,00 ; emote red - RGB 31,31,31, 31,31,31, 31,16,01, 00,00,00 ; emote orange - RGB 31,31,31, 31,31,31, 00,00,31, 00,00,00 ; emote blue + RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 01,01,02, 31,19,10, 04,19,00, 00,00,00 ; green + RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 01,01,02, 31,19,10, 17,08,28, 00,00,00 ; purple + RGB 01,01,02, 31,19,10, 11,14,15, 00,00,00 ; gray + RGB 01,01,02, 31,19,10, 27,07,16, 00,00,00 ; pink + RGB 01,01,02, 31,19,10, 03,23,21, 00,00,00 ; teal + RGB 01,01,02, 30,27,08, 29,17,00, 00,00,00 ; yellow + RGB 01,01,02, 31,19,10, 31,13,00, 00,00,00 ; orange + RGB 01,01,02, 31,19,10, 04,18,31, 00,00,00 ; azure + RGB 01,01,02, 27,31,27, 20,20,20, 00,00,00 ; white + RGB 01,01,02, 31,19,10, 10,10,10, 00,00,00 ; black + RGB 01,01,02, 27,31,27, 31,07,01, 00,00,00 ; poke ball + RGB 01,01,02, 27,31,27, 10,09,31, 00,00,00 ; deco item + RGB 01,01,02, 27,31,27, 07,23,03, 00,00,00 ; key item + RGB 01,01,02, 12,25,01, 05,14,00, 07,07,07 ; tree + RGB 01,01,02, 31,31,31, 13,13,13, 00,00,00 ; emote gray + RGB 01,01,02, 31,31,31, 00,00,00, 00,00,00 ; emote black + RGB 01,01,02, 31,31,31, 02,23,02, 00,00,00 ; emote green + RGB 01,01,02, 31,31,31, 23,02,23, 00,00,00 ; emote purple + RGB 01,01,02, 31,31,31, 31,00,00, 00,00,00 ; emote red + RGB 01,01,02, 31,31,31, 31,16,01, 00,00,00 ; emote orange + RGB 01,01,02, 31,31,31, 00,00,31, 00,00,00 ; emote blue diff --git a/gfx/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal index cb7659f50..dd0933c77 100644 --- a/gfx/tilesets/ice_path.pal +++ b/gfx/tilesets/ice_path.pal @@ -1,8 +1,8 @@ -; gray +; gray (boulders) RGB 15, 14, 24 - RGB 11, 11, 19 - RGB 07, 07, 12 - RGB 00, 00, 00 + RGB 09, 28, 31 + RGB 16, 11, 31 + RGB 05, 00, 09 ; red RGB 15, 14, 24 RGB 14, 07, 17 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2585fe936..f58dcc009 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -89,8 +89,8 @@ IcePathB1F_MapEvents: bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion def_object_events - object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 - object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 - object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 - object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index a770e8418..3869262d3 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -45,9 +45,9 @@ IcePathB2FMahoganySide_MapEvents: bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos def_object_events - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A - object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index e0e923b84..669e448eb 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -26,4 +26,4 @@ IcePathB3F_MapEvents: def_object_events object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 + object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/SeafoamIslandsB1F.asm b/maps/SeafoamIslandsB1F.asm index a9323e4f3..eec98ac70 100644 --- a/maps/SeafoamIslandsB1F.asm +++ b/maps/SeafoamIslandsB1F.asm @@ -41,11 +41,11 @@ SeafoamIslandsB1F_MapEvents: bg_event 22, 14, BGEVENT_ITEM, SeafoamIslandsB1FHiddenIceHeal def_object_events - object_event 9, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 - object_event 14, 20, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 - object_event 40, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 - object_event 39, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 - object_event 12, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 - object_event 38, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 9, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 14, 20, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 40, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 39, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 12, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 + object_event 38, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB1FBoulder, -1 object_event 29, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SeafoamIslandsB1FIceHeal, EVENT_SEAFOAM_ISLANDS_B1F_ICE_HEAL object_event 19, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SeafoamIslandsB1FMaxElixer, EVENT_SEAFOAM_ISLANDS_B1F_MAX_ELIXER diff --git a/maps/SeafoamIslandsB3F.asm b/maps/SeafoamIslandsB3F.asm index 8b2709429..858a1d1ca 100644 --- a/maps/SeafoamIslandsB3F.asm +++ b/maps/SeafoamIslandsB3F.asm @@ -45,6 +45,6 @@ SeafoamIslandsB3F_MapEvents: bg_event 9, 7, BGEVENT_ITEM, SeafoamIslandsB3FHiddenRareCandy def_object_events - object_event 26, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_ROOF, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB3FBoulder, -1 + object_event 26, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, PAL_NPC_COPY_BG_GRAY, OBJECTTYPE_SCRIPT, 0, SeafoamIslandsB3FBoulder, -1 object_event 19, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SeafoamIslandsB3FBigPearl, EVENT_SEAFOAM_ISLANDS_B3F_BIG_PEARL object_event 17, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SeafoamIslandsB3FRevive, EVENT_SEAFOAM_ISLANDS_B3F_REVIVE