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

Incorporating CrossGenWork2 branch again

Browse Source
This commit is contained in:
aerinon
2020-08-14 16:27:37 -06:00
parent 459e3cdc26
commit 53a5d6a98f
4 changed files with 6 additions and 6 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.12-u' __version__ = '0.1.0.13-u'
class EnemizerError(RuntimeError): class EnemizerError(RuntimeError):
pass pass

6
Rom.py
View File

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'ad03900849f7220770bd8d00ed514dad' RANDOMIZERBASEHASH = '01b83de5f8d3df6d17ecf0b1ed760cd9'
class JsonRom(object): class JsonRom(object):
@@ -2137,9 +2137,9 @@ def patch_shuffled_dark_sanc(world, rom, player):
rom.write_bytes(0x180262, [unknown_1, unknown_2, 0x00]) rom.write_bytes(0x180262, [unknown_1, unknown_2, 0x00])
# 24B116 and 20BAD8 # 24B118 and 20BB32
compass_r_addr = 0x123118 # 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 = 0x103b32 # e2 20 ad 0c 04 c9 00 d0
def compass_code_good(rom): def compass_code_good(rom):

2
asm/drhooks.asm
View File

@@ -125,7 +125,7 @@ nop #2 : jsl BlindAtticFix
; also rando's hooks.asm line 1360 ; also rando's hooks.asm line 1360
; 106e4e -> goes to a0ee4e ; 106e4e -> goes to a0ee4e
org $a0ee84 ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX) org $a0ee8a ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
jsl DrHudOverride jsl DrHudOverride
org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30) org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30)
jsl DrHudDungeonItemsAdditions jsl DrHudDungeonItemsAdditions

2
data/base2current.json
View File

File diff suppressed because one or more lines are too long