diff --git a/Oracle_main.asm b/Oracle_main.asm index 241f750..bfc0366 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -73,6 +73,14 @@ CUSTOMRODS = $7EF351 ; Goron Mines 0x0E (Misery Mire) ; Dragon Ship 0x18 (Turtle Rock) +; Collectibles +Bananas = $7EF38B +Pineapples = $7EF38D +RockMeat = $7EF38F +Seashells = $7EF391 +Honeycomb = $7EF393 +DekuSticks = $7EF395 + incsrc "Overworld/custom_gfx.asm" print "End of custom_gfx.asm ", pc incsrc "Overworld/ZCustomOverworld.asm" diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm index f989b06..d36ba2c 100644 --- a/Sprites/all_sprites.asm +++ b/Sprites/all_sprites.asm @@ -318,8 +318,6 @@ warnpc $00841E ; ========================================================= -Bananas = $7EF38B - org $1EF27D ShopItem_Banana: {