From 393cbdd0abe160b7bdd77edac5c6a91ec7d2795d Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 8 May 2023 05:03:53 -0500 Subject: [PATCH 1/5] Apples/BeeTraps/Fairies now spawn automatically under pots --- Rom.py | 2 +- data/base2current.bps | Bin 106730 -> 106752 bytes source/item/FillUtil.py | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index aa09743e..17c948ab 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '3c651a38ea79504029c71b382c9c17da' +RANDOMIZERBASEHASH = '08f762abe1d3687e07eb584ef962b9c0' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index ab93a09e84c87d32990525473ea45acda28d3f49..14b7becf7237325b18adac97c1ceee1e349a9a4f 100644 GIT binary patch delta 670 zcmWm4ZAcSw9KiAWopU=Un-*$w6I-`RQ?ab}ys2e@73w7Dg-DHhp^2c86*;v3teFp; z&JOzRN%Dqr-^WAoc5=_94|wk{}^(q&=^fd*`*At`gMd$bfLk5 z_n~Gqcv+;BZIH1Y;}S0!S~eqkG8vL;j&KEi4E<2dR&SmHf&JYOhiY-nwW&)c*50q8 zs%N;-OK4IMtGX8e1aa5%?v*k(%K4NdTkHB?_=5?W>aAWzuNa{f-wrFd=s`tq{0mPJ zl8K0?^LYd^NoP{pN1!sPI3*2%XsIHld;)2tSV~#~sU;yL9d0v27r60fGZ>%}r&-`C zX=ukS7AR5Dl?=19(5VQV!vPBvt8dre_vTOcF;QC48!+N^3tWNYxWWqip$9iwp&V{v zWQDU(j#sT<1U>#|1zR#^8(827?zDlf@cCUSPXIR$lEzQ+={}V{H!^%-dj4K)+N}@Z zuni`m5ZBqEOr;aoLjK$}LD&cyYFWj)q$O| delta 655 zcmWm4eMl2=9LMqdo_n~>HjUPtCb^xFHl!y^_lSfEqN1xPA_OIiw22Cd!Y1Rl#l$IR zlT&`8u_O@h61H8Zl)>;6{}Bq;1N~7NWQ4H5lq5_Da(}&FANZhUMQTYA9)!%1p-ISM zi=aWK`|z`b^?;My7uW?jfOc_?%mR>!D;fPVMTfwxgr2f4DhzMgZ`8Ei6ys8<@iB9p zLy&R|jL@Y57srKmKaW(jH_qkJ8{;!mV{~8or}Hy(&H9u}gGT7>D7&PxYK175>PDgb z_fw51R3lRA2cX&zxYR3#-WEh}CPPxyQ7%8g&=19I?bcjYWpm@};f7`&Btw|wT_3vOYy z*%-tL8%zU*TkKGxk&CNS;p40E_|cihGx&)e?kgIc5%$(ata89POWokmPEh?E7xj{8 zSFt!Ka!9r~Dsqh8WN0Ix`k8N7SIHA^Bm(#JkZ5cm`IjLpaSrZsfDTG=&;do~uX-bX zqxdJdY{VU&2ruW?=1?KuIgd_?y`IR--M$FlG>0 Date: Mon, 8 May 2023 07:49:38 -0500 Subject: [PATCH 2/5] Added better GFX for fairy and good bee --- Rom.py | 2 +- data/base2current.bps | Bin 106752 -> 106950 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 17c948ab..5718b113 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '08f762abe1d3687e07eb584ef962b9c0' +RANDOMIZERBASEHASH = '939310f7bb9ea2553c431e3dcdbf1ba3' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 14b7becf7237325b18adac97c1ceee1e349a9a4f..db98d6082954232e388b10100f797e7d08626d7c 100644 GIT binary patch delta 9492 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 F{{d~6Wsv{? delta 9611 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 V@|Mm5@Wxy8ulKgs Date: Tue, 9 May 2023 21:36:38 -0500 Subject: [PATCH 3/5] More GFX updates - Apples and Chickens now have GFX - Fixed issue with Menu not allowing DPad input with standing item on screen - Fixed issue with keys not drawing properly during tablet animation --- Rom.py | 2 +- data/base2current.bps | Bin 106950 -> 107092 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 5718b113..47ea824a 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '939310f7bb9ea2553c431e3dcdbf1ba3' +RANDOMIZERBASEHASH = '333e288ccb654220c0b492f4bf030e0c' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index db98d6082954232e388b10100f797e7d08626d7c..e6fe5db2ed9421aaa85e2d587be04fdfc66f977c 100644 GIT binary patch delta 7380 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 From 66cec505def502b056c31e1be2c02757742a9de4 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 9 May 2023 21:49:11 -0500 Subject: [PATCH 4/5] Only apply powder patch if flag is set --- Rom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 47ea824a..dc955bda 100644 --- a/Rom.py +++ b/Rom.py @@ -1647,7 +1647,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): # powder patch: remove the need to leave the screen after powder, since it causes problems for potion shop at race game # temporarally we are just nopping out this check we will conver this to a rom fix soon. - rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F]) + if world.powder_patch_required[player]: + rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA]) # sprite patches rom.write_byte(snes_to_pc(0x0DB7D1), 0x03) # patch apple sprites to not permadeatch like enemies From 2dd0a64a4be6b4878516595438d4b6c1909b69d1 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 9 May 2023 21:53:06 -0500 Subject: [PATCH 5/5] Version bump 0.3.0.8 --- CHANGELOG.md | 5 +++++ OverworldShuffle.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23e4234e..44dc184d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.3.0.8 +- All Bonk prize GFX are no longer using the Power Star placeholder GFX +- Fixed issue with dislaying Key GFX during tablet animations +- Fixed issue with DPad input being disabled in Pause Menu if an item GFX is on screen + ## 0.3.0.7 - \~Merged in DR v1.2.0.16~ - Major overhaul of how item GFX are drawn on screen diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 301af8cb..bd8a05d2 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -7,7 +7,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType from OverworldGlitchRules import create_owg_connections from Utils import bidict -version_number = '0.3.0.7' +version_number = '0.3.0.8' # branch indicator is intentionally different across branches version_branch = '-u'