Changes to special weapon modes:
- allow killing red baris with fire rod/bombos - allow medallions to kill bunny beams
This commit is contained in:
@@ -334,24 +334,24 @@ BossMapIconGFX:
|
|||||||
incbin bossicons.4bpp
|
incbin bossicons.4bpp
|
||||||
|
|
||||||
if !FEATURE_NEW_TEXT
|
if !FEATURE_NEW_TEXT
|
||||||
org $339C00
|
org $339C00
|
||||||
NewFont:
|
NewFont:
|
||||||
incbin newfont.bin
|
incbin newfont.bin
|
||||||
NewFontInverted:
|
NewFontInverted:
|
||||||
incbin newfont_inverted.bin
|
incbin newfont_inverted.bin
|
||||||
|
|
||||||
org $0CD7DF
|
org $0CD7DF
|
||||||
incbin text_unscramble1.bin
|
incbin text_unscramble1.bin
|
||||||
org $0CE4D5
|
org $0CE4D5
|
||||||
incbin text_unscramble2.bin
|
incbin text_unscramble2.bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
org $328000
|
org $328000
|
||||||
Extra_Text_Table:
|
Extra_Text_Table:
|
||||||
if !FEATURE_NEW_TEXT
|
if !FEATURE_NEW_TEXT
|
||||||
incsrc itemtext_lower.asm
|
incsrc itemtext_lower.asm
|
||||||
else
|
else
|
||||||
incsrc itemtext.asm
|
incsrc itemtext.asm
|
||||||
endif
|
endif
|
||||||
warnpc $32E000
|
warnpc $32E000
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -22,19 +22,19 @@ def process_values(sprite, values)
|
|||||||
if ret[10] == 4 # powder
|
if ret[10] == 4 # powder
|
||||||
ret[10] = 0
|
ret[10] = 0
|
||||||
end
|
end
|
||||||
if ret[11] > 0 && ![0xA1, 0xA3, 0xCD].include?(sprite) # fire rod
|
if ret[11] > 0 && ![0x23, 0xA1, 0xA3, 0xCD].include?(sprite) # fire rod
|
||||||
ret[11] = 0
|
ret[11] = 0
|
||||||
end
|
end
|
||||||
if ret[12] != 3 && sprite != 0xCC # ice rod
|
if ret[12] != 3 && sprite != 0xCC # ice rod
|
||||||
ret[12] = 0
|
ret[12] = 0
|
||||||
end
|
end
|
||||||
if ret[13] > 0 && ![0xA3, 0xA1].include?(sprite) # bombos
|
if ret[13] > 0 && ![0x23, 0xA1, 0xA3, 0xD1].include?(sprite) # bombos
|
||||||
ret[13] = 0
|
ret[13] = 0
|
||||||
end
|
end
|
||||||
if ret[14] != 1 # ether
|
if ret[14] != 1 && ![0xD1].include?(sprite) # ether
|
||||||
ret[14] = 0
|
ret[14] = 0
|
||||||
end
|
end
|
||||||
if [1, 2].include?(ret[15]) # quake
|
if [1, 2].include?(ret[15]) && ![0xD1].include?(sprite) # quake
|
||||||
ret[15] = 0
|
ret[15] = 0
|
||||||
end
|
end
|
||||||
if sprite == 0x53 and ret[2] == 3
|
if sprite == 0x53 and ret[2] == 3
|
||||||
|
|||||||
Reference in New Issue
Block a user