Skip to content

Commit 73a1014

Browse files
committed
Fix BT nothing item
1 parent 85a6c26 commit 73a1014

4 files changed

Lines changed: 9 additions & 1 deletion

File tree

patches/ips/nothing_item.ips

0 Bytes
Binary file not shown.

patches/rom_map/Bank 89.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ $9600 - $9700: spark booster plms graphics
44
$9700 - $9800: blue booster plm graphics
55
$AF60 - $B0C0: Area FX.asm
66
$B0C0 - $B100: decompression.asm
7+
$B100 - $B200: nothing item graphics (zeros, used only for Bomb Torizo Room; nothing_item.asm)

patches/src/nothing_item.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ org !bank_84_free_space_start
99
dw $EE64, inst ; PLM $F700 (nothing, for Bomb Torizo Room)
1010

1111
inst:
12-
dw $8764, $9700, $0000, $0000, $0000, $0000 ; Load item graphics (zeros)
12+
dw $8764, $B100, $0000, $0000, $0000, $0000 ; Load item graphics (zeros, written in patch.rs)
1313
dw $8A24, .triggered ; Set link instruction for when triggered
1414
dw $86C1, $DF89 ; Pre-instruction = go to link instruction if triggered
1515
dw $E04F ; Draw item frame 0 (not sure why we need to do this, but it doesn't work otherwise)

rust/maprando/src/patch.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,10 +2740,17 @@ impl Patcher<'_> {
27402740
Ok(())
27412741
}
27422742

2743+
fn write_nothing_item_graphics(&mut self) -> Result<()> {
2744+
// Used in Bomb Torizo Room.
2745+
self.rom.write_n(snes2pc(0x89B100), &[0; 0x100])?;
2746+
Ok(())
2747+
}
2748+
27432749
fn write_custom_item_graphics(&mut self) -> Result<()> {
27442750
self.write_walljump_item_graphics()?;
27452751
self.write_spark_booster_item_graphics()?;
27462752
self.write_bluebooster_item_graphics()?;
2753+
self.write_nothing_item_graphics()?;
27472754
Ok(())
27482755
}
27492756

0 commit comments

Comments
 (0)