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

Minor typo fix

Browse Source 
Fixed some hard-locks in crossed mode
This commit is contained in:
aerinon
2020-01-06 21:30:09 -07:00
parent c475dc746c
commit 2cadb5a272
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doors.py
View File

@@ -900,7 +900,7 @@ def create_doors(world, player):
create_door(player, 'GT Torch EN', Intr).dir(Ea, 0x8c, Top, High).small_key().pos(2), create_door(player, 'GT Torch EN', Intr).dir(Ea, 0x8c, Top, High).small_key().pos(2),
create_door(player, 'GT Hope Room WN', Intr).dir(We, 0x8c, Top, High).small_key().pos(2), create_door(player, 'GT Hope Room WN', Intr).dir(We, 0x8c, Top, High).small_key().pos(2),
create_door(player, 'GT Torch SW', Intr).dir(So, 0x8c, Left, High).no_exit().pos(1), create_door(player, 'GT Torch SW', Intr).dir(So, 0x8c, Left, High).no_exit().pos(1),
create_door(player, 'GT Big Chest NW', Intr).dir(So, 0x8c, Left, High).pos(1), create_door(player, 'GT Big Chest NW', Intr).dir(No, 0x8c, Left, High).pos(1),
create_door(player, 'GT Blocked Stairs Down Stairs', Sprl).dir(Dn, 0x8c, 3, HTH).ss(Z, 0x12, 0x40, True, True).kill(), create_door(player, 'GT Blocked Stairs Down Stairs', Sprl).dir(Dn, 0x8c, 3, HTH).ss(Z, 0x12, 0x40, True, True).kill(),
create_door(player, 'GT Blocked Stairs Block Path', Lgcl), create_door(player, 'GT Blocked Stairs Block Path', Lgcl),
create_door(player, 'GT Big Chest SW', Nrml).dir(So, 0x8c, Left, High).pos(4), create_door(player, 'GT Big Chest SW', Nrml).dir(So, 0x8c, Left, High).pos(4),

2
Rom.py
View File

@@ -18,7 +18,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '43012635a9b4db76110d4213ecaaa0fb' RANDOMIZERBASEHASH = '7dd5fc42926c73856b8b2b956668efd3'
class JsonRom(object): class JsonRom(object):

4
asm/drhooks.asm
View File

@@ -43,8 +43,8 @@ org $00d6ae ;(PC: 56ae)
LoadTransAuxGfx: LoadTransAuxGfx:
org $00df5a ;(PC: 5f5a) org $00df5a ;(PC: 5f5a)
PrepTransAuxGfx: PrepTransAuxGfx:
;org $0ffd65 ;(PC: 07fd65) org $0ffd65 ;(PC: 07fd65)
;Dungeon_LoadCustomTileAttr: Dungeon_LoadCustomTileAttr:
;org $01fec1 ;org $01fec1
;Dungeon_ApproachFixedColor_variable: ;Dungeon_ApproachFixedColor_variable:
;org $a0f972 ; Rando version ;org $a0f972 ; Rando version

2
asm/gfx.asm
View File

@@ -4,7 +4,7 @@ GfxFixer:
jsl LoadRoomHook ; this is the rando version - let's only call this guy once - may fix star tiles and slower loads jsl LoadRoomHook ; this is the rando version - let's only call this guy once - may fix star tiles and slower loads
jsl Dungeon_InitStarTileCh jsl Dungeon_InitStarTileCh
jsl LoadTransAuxGfx jsl LoadTransAuxGfx
;jsl Dungeon_LoadCustomTileAttr jsl Dungeon_LoadCustomTileAttr
jsl PrepTransAuxGfx jsl PrepTransAuxGfx
lda #$09 : sta $17 : sta $0710 lda #$09 : sta $17 : sta $0710
jsl Palette_SpriteAux3 jsl Palette_SpriteAux3

2
data/base2current.json
View File

File diff suppressed because one or more lines are too long