diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index a87b0b5..8d2ceeb 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb org $1FFFF8 ; <- FFFF8 timestamp rom -db #$20, #$17, #$09, #$19 ; year/month/day +db #$20, #$17, #$09, #$28 ; year/month/day ;================================================================================ diff --git a/hooks.asm b/hooks.asm index 4f6979e..a8016bc 100644 --- a/hooks.asm +++ b/hooks.asm @@ -1600,9 +1600,21 @@ org $1DE1A1 ; <- EE1A1 - sprite_great_catfish.asm : 445 JSL.l LoadCatfishItemGFX NOP #2 ;-------------------------------------------------------------------------------- +org $1DDF49 ; <- EDF49 - sprite_great_catfish.asm : 19 +JML.l JumpToSplashItemTarget : NOP +org $1DDF4E ; <- EDF4E - sprite_great_catfish.asm : 21 +SplashItem_SpawnSplash: +org $1DDF52 ; <- EDF52 - sprite_great_catfish.asm : 27 +SplashItem_SpawnOther: +org $1DE228 ; <- EE228 - sprite_great_catfish.asm : 290 +LDA.b #$FF +;-------------------------------------------------------------------------------- org $1DDF81 ; <- EDF81 - sprite_great_catfish.asm : 61 JSL.l DrawThrownItem ;-------------------------------------------------------------------------------- +;org $1DE1B0 ; <- EE1B0 - sprite_great_catfish.asm : 461 +;NOP #2 +;-------------------------------------------------------------------------------- org $05EE53 ; <- 2EE53 - mushroom.asm : 22 JSL.l ItemCheck_Mushroom NOP #2 diff --git a/tables.asm b/tables.asm index 7deb19c..dbfac39 100644 --- a/tables.asm +++ b/tables.asm @@ -10,7 +10,7 @@ HeartPiece_Lumberjack_Tree: HeartPiece_Spectacle_Cave: db #$17 HeartPiece_Circle_Bushes: - db #$3D + db #$17 HeartPiece_Graveyard_Warp: db #$17 HeartPiece_Mire_Warp: @@ -22,7 +22,7 @@ org $308010 ; PC 0x180010 RupeeNPC_MoldormCave: db #$46 ; #$46 = 300 Rupees RupeeNPC_NortheastDarkSwampCave: - db #$46 + db #$46 ; #$46 = 300 Rupees LibraryItem: db #$1D ; #$1D = Book of Mudora MushroomItem: @@ -139,7 +139,7 @@ db #$00 ; #$00 = Off (default) - #$01 = On ;-------------------------------------------------------------------------------- org $30803E ; PC 0x18003E InvincibleGanon: -db #$05 +db #$00 ; #$00 = Off (default) ; #$01 = On ; #$02 = Require All Dungeons @@ -674,7 +674,7 @@ dw #$280E ; #$280D = Star (default) - #$280E = Triforce Piece ;================================================================================ org $308167 ; PC 0x180167 GoalItemRequirement: -db #$FF ; #$00 = Off (default) - #$XX = Require $XX Goal Items - #$FF = Counter-Only +db #$00 ; #$00 = Off (default) - #$XX = Require $XX Goal Items - #$FF = Counter-Only ;================================================================================ org $308168 ; PC 0x180168 ByrnaCaveSpikeDamage: @@ -690,7 +690,7 @@ db #$01 ; #00 = Do not respawn on Pyramid after Death - #$01 = Respawn on Pyrami ;================================================================================ org $30816A ; PC 0x18016A FreeItemText: -db #$01 ; #00 = Off - #$01 = On (default) +db #$00 ; #00 = Off - #$01 = On (default) ;================================================================================ org $30816B ; PC 0x18016B ByrnaCaveCaneOfByrnaUsage: diff --git a/zoraking.asm b/zoraking.asm index 8c51665..91d8437 100644 --- a/zoraking.asm +++ b/zoraking.asm @@ -5,4 +5,9 @@ LoadZoraKingItemGFX: LDA.l $1DE1C3 ; location randomizer writes zora item to JSL.l PrepDynamicTile RTL +;-------------------------------------------------------------------------------- +JumpToSplashItemTarget: + LDA $0D90, X + CMP.b #$FF : BNE + : JML.l SplashItem_SpawnSplash : + + CMP.b #$00 : JML.l SplashItem_SpawnOther ;-------------------------------------------------------------------------------- \ No newline at end of file