diff --git a/.gitignore b/.gitignore index 2636fd6..81b6f96 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,138 @@ oos111x.sfc oos111x.smp.sym oos111x.srm oos111x.sym +Roms +Dungeons/Assets +Items/gfx/jump_frames.xcf +Masks/etc +Menu/rings/ +Overworld/project_files/DarkWorldMainSet.xcf +Sprites/Project Files/ +Thumbs.db +.favorites.json +Dungeons/Assets/ +Roms/oos111.bps +Roms/oos112.sfc +Sprites/Enemies/deku_scrub_enemy.zsm +Dungeons/Objects/object_files/kydreeok_body.zob +Sprites/Objects/Minecart/ +Util/tools +Util/rom_map.txt +Sprites/NPCs/korok_hollo.asm +Sprites/NPCs/korok_makar.asm +Sprites/NPCs/korok_rown.asm +Overworld/world_map/test_dw.bmp +Overworld/world_map/zelda3.sfc +Overworld/world_map/maptest.bmp +Sprites/Objects/whirlpool_export.asm +Sprites/Objects/ice_block_export.asm +Masks/gfx/[108]tlp11 +Masks/gfx/extra/ +Overworld/project_files/OverworldCastleBridge.png +Overworld/project_files/OverworldCastleBridge.xcf +Overworld/gfx/boat2_1.bin +Overworld/gfx/boat2_3.bin +Overworld/gfx/boat2_4.bin +Overworld/gfx/boat2_2.bin +Sprites/NPCs/zora_princess_proj.zsm +Util/SpcToASM/SpcConverter.deps.json +Util/SpcToASM/SpcConverter.dll +Util/SpcToASM/SpcConverter.exe +Util/SpcToASM/SpcConverter.pdb +Util/SpcToASM/SpcConverter.runtimeconfig.json +Masks/gfx/deku_link.pal +Masks/gfx/deku_new.pal +Masks/gfx/dekulinkpal.pal +Masks/gfx/dekulinkpal.pal.bak +Masks/gfx/gbc-link.pal +Masks/gfx/image.bin +Masks/gfx/image.png +Overworld/project_files/zora_overlay_2.zsa +Overworld/project_files/zora_temple_overlay.zsa +Sprites/wolfos_export.asm +Sprites/wolf_boss.zsm +Sprites/NPCs/project_files/korok_hollo.asm +Sprites/NPCs/project_files/korok_makar.asm +Sprites/NPCs/project_files/korok_rown.asm +Sprites/NPCs/project_files/zora_princess_proj.zsm +Util/zelda3.sfc +Util/templatemusic.asm +Util/ZSCustomOverworld.asm +Sprites/Objects/Project Files/ice_block_export.asm +Sprites/Objects/Project Files/whirlpool_export.asm +Overworld/world_map/dw_gfx_new.bmp +Menu/tilemaps/dung_map.bin +Dungeons/intro_cutscene.asm +Dungeons/water_switch.asm +run.sh +Sprites/Bosses/left_kydreeok_head.asm +Sprites/Bosses/kydreeok_wings.asm +Sprites/Bosses/kydreeok_body.zsm +Sprites/Bosses/dark_link.pal +Sprites/NPCs/deku_scrub_npcs.asm +Sprites/Enemies/anti_kirby_v2.asm +Masks/gfx/gbc_dark_link.4bpp +Sprites/kydrog_intro.asm +Util/ZScreamNew/ZScream.exe +Util/ZScreamNew/ZSCustomOverworld.asm +Util/dark_link.bin +Sprites/NPCs/project_files/deku_scrub_npcs.asm +Util/ZScreamNew/asar.dll +Util/ZScreamNew/CustomCollision.asm +Util/ZScreamNew/debug.asm +Util/ZScreamNew/DefaultNames.txt +Util/ZScreamNew/DW.png +Util/ZScreamNew/Lidgren.Network.dll +Util/ZScreamNew/Lidgren.Network.pdb +Util/ZScreamNew/Logs.txt +Util/ZScreamNew/LW.png +Util/ZScreamNew/MapTest.png +Util/ZScreamNew/newgraves.asm +Util/ZScreamNew/ScratchPad.dat +Util/ZScreamNew/SP.png +Util/ZScreamNew/spritesmove.asm +Util/ZScreamNew/tempPatch.asm +Util/ZScreamNew/ZScream.application +Util/ZScreamNew/ZScream.exe.config +Util/ZScreamNew/ZScream.exe.manifest +Util/ZScreamNew/ZS_Patches/Version.txt +Util/ZScreamNew/ZS_Patches/Hex Edits/Misc Small Patches.asm +Util/ZScreamNew/ZS_Patches/Items/AST Boots.asm +Util/ZScreamNew/ZS_Patches/Misc/Big Bomb Requirements.asm +Util/ZScreamNew/ZS_Patches/Misc/IntroSkip.asm +Util/ZScreamNew/ZS_Patches/Misc/JP1.0 Glitches.asm +Util/ZScreamNew/ZS_Patches/Misc/Link Bed Start Position.asm +Util/ZScreamNew/ZS_Patches/Misc/NoRocks.asm +Util/ZScreamNew/ZS_Patches/Misc/Rainstate Skip.asm +Util/ZScreamNew/ZS_Patches/Misc/TorchTags.asm +Util/ZScreamNew/ZS_Patches/Misc/Weathervane.asm +Util/ZScreamNew/ZS_Patches/Music/LostWoodsExitMusic.asm +Util/ZScreamNew/ZS_Patches/Npcs/Bottle Vendor.asm +Util/ZScreamNew/ZS_Patches/Sprites/Crystalswitch Conveyor.asm +Util/ZScreamNew/ZS_Patches/Sprites/Elemental Trinexx.asm +Util/ZScreamNew/ZS_Patches/Sprites/Eye Lasers Active.asm +Util/ZScreamNew/ZS_Patches/Sprites/Khodstare Speeds.asm +Util/ZScreamNew/ZS_Patches/Sprites/Spike Damage.asm +Util/ZScreamNew/ZS_Patches/Sprites/Spikes_Subtype.asm +Sprites/Bosses/bigchuchu_grow.asm +Sprites/Bosses/manhandla_chuchu_blast.asm +Sprites/Bosses/manhandla_export_2.asm +Sprites/Bosses/manhandla_export.asm +Music/Z3_SongOfHealingThemeV1-00.asm +Dungeons/experimental/HitBoxProperties.asm +Dungeons/experimental/intro_cutscene.asm +Dungeons/experimental/KillSprites +Dungeons/experimental/warpswitch.asm +Dungeons/experimental/water_switch.asm +Overworld/weathervane.asm +Util/banana.asm +Menu/tilemaps/sheet.png +Sprites/NPCs/project_files/eon_owl.zsm +Music/wip/oot_title.asm +Music/wip/phantom_ganon.asm +Music/wip/template_song.asm +Music/wip/twinrova_battle.asm +Sprites/NPCs/piratian.zsm +Masks/gfx/moosh.png +Masks/gfx/moosh.pal +Dungeons/DungeonMaps.asm diff --git a/Core/message.asm b/Core/message.asm index a2406b7..c739769 100644 --- a/Core/message.asm +++ b/Core/message.asm @@ -134,7 +134,7 @@ Message_1BA: db $00, $21, $42, $59, $E3, $59, $29, $25, $93, $59, $DA, $59, $21, $1E, $1A, $1D, $59, $C7, $DF, $2B, $1D, $42, $75, $32, $1E, $2C, $3F, $59, $E6, $59, $27, $1E, $31, $2D, $59, $2D, $21, $CE, $91, $BB, $28, $26, $2C, $76, $B4, $59, $0A, $1A, $25, $32, $31, $28, $59, $02, $92, $25, $1E, $41, $7E, $73, $08, $51, $2F, $1E, $59, $2D, $1A, $24, $A0, $D8, $59, $25, $22, $97, $2B, $2D, $32, $59, $C6, $73, $BD, $2B, $24, $B3, $D8, $59, $1C, $92, $25, $1E, $59, $C7, $59, $E3, $2B, $59, $BD, $29, $41, $73, $01, $1E, $DF, $CE, $59, $B6, $2C, $59, $2C, $B1, $9F, $30, $2C, $59, $2B, $2E, $27, $59, $1D, $1E, $1E, $29, $41, $7E, $73, $12, $1E, $1E, $24, $59, $D8, $59, $0C, $1E, $1A, $9F, $30, $59, $01, $BA, $1D, $1E, $59, $2D, $21, $A6, $1E, $42, $73, $25, $1E, $20, $A5, $1D, $2C, $59, $2C, $1A, $32, $59, $B6, $59, $21, $28, $25, $1D, $2C, $59, $CB, $A1, $1F, $B6, $73, $A8, $59, $E3, $2B, $59, $2A, $2E, $1E, $D3, $41, $7F Message_1BB: db $00, $21, $28, $32, $42, $59, $26, $94, $1E, $32, $3E, $59, $E8, $51, $CD, $BB, $28, $24, $B4, $51, $75, $A8, $59, $D8, $59, $0F, $22, $2B, $94, $1E, $59, $0A, $B4, $20, $42, $59, $1E, $21, $3F, $76, $16, $1E, $25, $25, $42, $59, $08, $59, $1C, $93, $51, $2D, $59, $21, $1E, $25, $29, $59, $E3, $59, $2D, $21, $A6, $1E, $41, $7E, $73, $01, $2E, $2D, $59, $08, $59, $1C, $93, $59, $2D, $1E, $25, $25, $59, $E3, $59, $2D, $B0, $2C, $59, $D8, $73, $0F, $22, $2B, $94, $1E, $59, $0A, $B3, $B1, $1D, $59, $93, $59, $28, $25, $1D, $59, $2C, $B0, $29, $42, $73, $21, $A6, $1E, $59, $B4, $59, $D8, $59, $1A, $1B, $32, $2C, $2C, $59, $D2, $BE, $E1, $A6, $1E, $41, $7E, $73, $08, $1F, $59, $E3, $51, $CD, $BB, $28, $24, $B4, $51, $59, $DA, $59, $1F, $B4, $1D, $59, $B0, $26, $42, $73, $2D, $21, $94, $8B, $1A, $59, $AC, $28, $1D, $59, $29, $BA, $1C, $1E, $59, $DA, $59, $D3, $1A, $2B, $2D, $41, $7F - db $FF ; end of message pointers checks + db $FF ; end of message pointers checks print "End of expanded dialogue ", pc diff --git a/Overworld/ZSCustomOverworld_Latest.asm b/Overworld/ZSCustomOverworld_Latest.asm index 1af91e4..7a5bea6 100644 --- a/Overworld/ZSCustomOverworld_Latest.asm +++ b/Overworld/ZSCustomOverworld_Latest.asm @@ -1041,7 +1041,6 @@ ActivateSubScreen: ; If $7EF3C5 >= 0x02. LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #$0002 : BCS .noRain BRA .turnOn - .noRain ; Get the overlay value for this overworld area. @@ -1881,7 +1880,6 @@ EnableSubScreenCheckForPyramid: CMP.w #$0096 : BNE .notPyramidOrCastle SEP #$20 ; Set A in 8bit mode. LDA.b #$01 : STA.b $1D - .notPyramidOrCastle SEP #$20 ; Set A in 8bit mode. diff --git a/Util/item_cheat.asm b/Util/item_cheat.asm index c1559c4..383bffe 100644 --- a/Util/item_cheat.asm +++ b/Util/item_cheat.asm @@ -75,22 +75,16 @@ if !BetaRelease == 0 endif LDA #$04 : STA Flute LDA #$01 : STA RocsFeather - ; 0 - nothing. 1 - bow w/ no arrows. 2 - bow w/ arrows. 3 - silver arrows LDA #$03 : STA Bow - - ; 0 - nothing. 1 - blue boomerang. 2 - red boomerang LDA #$02 : STA Boomerang STA Mirror STA Byrna - ; 0 - nothing. 1 - Lamp LDA #$01 : STA Lamp ; STA MagicHammer STA Pearl - ; fill all hearts LDA #$A0 : STA HeartRefill - ; magic power, maximum is 0x80 LDA #$80 : STA MagicPower ; Skip story events, test goron mines