Skip to content

Commit

Permalink
Bugfix: NPC's use wrong time of day pals
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoupPotato
SoupPotato committed Jun 26, 2024
1 parent d3344fc commit 26d3f2c
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 92 deletions.
3 changes: 1 addition & 2 deletions engine/gfx/sprite_palettes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
92 changes: 46 additions & 46 deletions gfx/overworld/npc_sprites.pal
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
48 changes: 24 additions & 24 deletions gfx/overworld/npc_sprites_darkness.pal
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions gfx/tilesets/ice_path.pal
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions maps/IcePathB1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions maps/IcePathB2FMahoganySide.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion maps/IcePathB3F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions maps/SeafoamIslandsB1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion maps/SeafoamIslandsB3F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 26d3f2c

Please sign in to comment.