From 0c97c2f4759a1686b3bea2f22c18181db8908f4c Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 2 Dec 2024 11:48:55 -0500 Subject: [PATCH] housekeeping --- Sprites/Enemies/goriya.asm | 1 - Sprites/Objects/deku_leaf.asm | 4 ++-- Util/item_cheat.asm | 2 +- oracle.org | 11 ++++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Sprites/Enemies/goriya.asm b/Sprites/Enemies/goriya.asm index b769361..3e4e28b 100644 --- a/Sprites/Enemies/goriya.asm +++ b/Sprites/Enemies/goriya.asm @@ -116,7 +116,6 @@ Sprite_Goriya_Main: JSL Sprite_Move JSL Sprite_SpawnSparkleGarnish - JSL Sprite_PlayerCantPassThrough JSL Sprite_CheckDamageToPlayer : BCC .no_dano LDA.b #$FF : STA.w SprTimerD, X diff --git a/Sprites/Objects/deku_leaf.asm b/Sprites/Objects/deku_leaf.asm index 7ecd91a..2898fd3 100644 --- a/Sprites/Objects/deku_leaf.asm +++ b/Sprites/Objects/deku_leaf.asm @@ -14,7 +14,7 @@ !Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow !Palette = 00 ; Unused in this template (can be 0 to 7) !Hitbox = $0D ; 00 to 31, can be viewed in sprite draw tool -!Persist = 00 ; 01 = your sprite continue to live offscreen +!Persist = 01 ; 01 = your sprite continue to live offscreen !Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room) !CollisionLayer = 00 ; 01 = will check both layer for collision !CanFall = 00 ; 01 sprite can fall in hole, 01 = can't fall @@ -153,7 +153,7 @@ Sprite_DekuLeaf_Main: Sprite_DekuLeaf_Draw: { JSL Sprite_PrepOamCoord - LDA #$10 + LDA #$08 JSL OAM_AllocateFromRegionB LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame diff --git a/Util/item_cheat.asm b/Util/item_cheat.asm index 72eba91..0a50216 100644 --- a/Util/item_cheat.asm +++ b/Util/item_cheat.asm @@ -101,7 +101,7 @@ if !BetaRelease == 0 LDA #$03 : STA !Shield ; 0 - nothing. 1 - Green Mail. 2 - Blue Mail. 3 - Red Mail - LDA #$03 : STA !Mail + LDA #$02 : STA !Mail ; 0-No bottle. ; 1-Mushroom (no use). 2-Empty bottle. diff --git a/oracle.org b/oracle.org index 64e4dae..fddbde6 100644 --- a/oracle.org +++ b/oracle.org @@ -33,8 +33,9 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village - [ ] Fix Water Gate Collision ** =D5= Glacia Estate *** Item: Fire Rod -*** TODO [0/2] -- [ ] Improve enemy variety +*** TODO [0/3] +- [ ] Improve Ice Block sprite collision detection +- [ ] Tune enemies in dungeon, adjust positioning - [ ] Exterior gfx improvements ** ~S2~ Shrine of Power *** Item: Power Glove @@ -84,7 +85,7 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village - [X] Conflict over territory lead to Zora Princesses imprisonment - [ ] Restore River Zora King NPC ? -**** TODO Waterfall Song of Storms Event +**** ACTIVE Waterfall Song of Storms Event *** Old Man Mountain Quest 1) Take the warp portal at the northwest most point on Mount Snowpeak @@ -92,7 +93,7 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village 3) Escort the Old Man to a rock formation on the mountain and use magic mirror. 4) Receive the Goldstar before continuing to Glacia Estate -*** TODO Goron Mines Quest [2/4] +*** ACTIVE Goron Mines Quest [2/4] 1) [X] Collectible Goron Rock Meat from Lupo Mountain - Eon Gorons workers protesting labor, Piratians involved somehow - Requires Power Glove from Shrine of Power @@ -106,7 +107,7 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village **** Stone Mask - 850 Rupees *** Wolf Mask Quest 1) Wolfos appears outside of Kalyxo Castle at Night, defeat and play Song of Healing for Wolf Mask. -*** TODO Magic Bean Quest [1/4] +*** ACTIVE Magic Bean Quest [1/4] 1) [X] Buy Magic Bean from Bean Vendor, requires Bottle. 2) [ ] Take Magic Bean to the Ranch and plant it in empty soil north of the houses. 3) [ ] Requires rain (Song of Storms), Pollination (Good Bee) and three days in game time.