alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Bug fixes for crashes involving new baserom

Browse Source
This commit is contained in:
aerinon
2020-06-25 16:16:56 -06:00
parent 50f55b8008
commit ed20ff5f63
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main.py
View File

@@ -24,7 +24,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute
from ItemList import generate_itempool, difficulties, fill_prizes from ItemList import generate_itempool, difficulties, fill_prizes
from Utils import output_path, parse_player_names from Utils import output_path, parse_player_names
__version__ = '0.1.0.9-u' __version__ = '0.1.0.10-u'
class EnemizerError(RuntimeError): class EnemizerError(RuntimeError):
pass pass

4
Rom.py
View File

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'ebd479fdf1152d9a093c56ce57e13571' RANDOMIZERBASEHASH = '2a64368fe169ff1e5099ef65f926417f'
class JsonRom(object): class JsonRom(object):
@@ -2136,7 +2136,7 @@ def patch_shuffled_dark_sanc(world, rom, player):
# 24B116 and 20BAD8 # 24B116 and 20BAD8
compass_r_addr = 0x123116 # a9 90 24 8f 9a c7 7e compass_r_addr = 0x123118 # a9 90 24 8f 9a c7 7e
compass_w_addr = 0x103b2c # e2 20 ad 0c 04 c9 00 d0 compass_w_addr = 0x103b2c # e2 20 ad 0c 04 c9 00 d0

6
asm/drhooks.asm
View File

@@ -101,9 +101,9 @@ nop : stz $0dd0, X : rts
.not_in_ganons_tower .not_in_ganons_tower
org $2081f2 org $208206
jsl MirrorCheckOverride2 jsl MirrorCheckOverride2
org $20825c org $208270
jsl MirrorCheckOverride2 jsl MirrorCheckOverride2
org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD) org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
jsl BlockEraseFix jsl BlockEraseFix
@@ -122,7 +122,7 @@ nop #3
; also rando's hooks.asm line 1360 ; also rando's hooks.asm line 1360
; 106e4e -> goes to a0ee4e ; 106e4e -> goes to a0ee4e
org $a0ee4e ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX) org $a0ee84 ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
jsl DrHudOverride jsl DrHudOverride
org $098638 ; rando's hooks.asm line 2192 org $098638 ; rando's hooks.asm line 2192
jsl CountChestKeys jsl CountChestKeys

2
data/base2current.json
View File

File diff suppressed because one or more lines are too long