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

Minor fixes for a few lobbies

Browse Source
This commit is contained in:
aerinon
2020-09-15 16:13:54 -06:00
parent f881d1d133
commit 7653c95fd7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doors.py
View File

@@ -388,7 +388,7 @@ def create_doors(world, player):
create_door(player, 'PoD Dark Basement W Up Stairs', Sprl).dir(Up, 0x6a, 0, HTH).ss(S, 0x1b, 0x3c, True), create_door(player, 'PoD Dark Basement W Up Stairs', Sprl).dir(Up, 0x6a, 0, HTH).ss(S, 0x1b, 0x3c, True),
create_door(player, 'PoD Dark Basement E Up Stairs', Sprl).dir(Up, 0x6a, 1, HTH).ss(S, 0x1b, 0x9c, True), create_door(player, 'PoD Dark Basement E Up Stairs', Sprl).dir(Up, 0x6a, 1, HTH).ss(S, 0x1b, 0x9c, True),
create_door(player, 'PoD Dark Alley NE', Nrml).dir(No, 0x6a, Right, High).big_key().pos(0), create_door(player, 'PoD Dark Alley NE', Nrml).dir(No, 0x6a, Right, High).big_key().pos(0),
create_door(player, 'PoD Mimics 2 SW', Nrml).dir(So, 0x1b, Left, High).pos(1).kill().portal(X, 0x00), create_door(player, 'PoD Mimics 2 SW', Nrml).dir(So, 0x1b, Left, High).pos(1).kill().portal(Z, 0x00),
create_door(player, 'PoD Mimics 2 NW', Intr).dir(No, 0x1b, Left, High).pos(0), create_door(player, 'PoD Mimics 2 NW', Intr).dir(No, 0x1b, Left, High).pos(0),
create_door(player, 'PoD Bow Statue SW', Intr).dir(So, 0x1b, Left, High).pos(0), create_door(player, 'PoD Bow Statue SW', Intr).dir(So, 0x1b, Left, High).pos(0),
create_door(player, 'PoD Bow Statue Down Ladder', Lddr).no_entrance(), create_door(player, 'PoD Bow Statue Down Ladder', Lddr).no_entrance(),

2
Rom.py
View File

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '63d1141460fd237a6ce17ccc6e293985' RANDOMIZERBASEHASH = '150e8e5bdb52e565fa9e2172d98c31ab'
class JsonRom(object): class JsonRom(object):

10
asm/overrides.asm
View File

@@ -94,13 +94,13 @@ CutoffEntranceRug:
lda $a0 : cmp #$00BC : beq .check ;; TT Alcove lda $a0 : cmp #$00BC : beq .check ;; TT Alcove
cmp #$00A2 : beq .check ; Mire Bridges cmp #$00A2 : beq .check ; Mire Bridges
cmp #$001A : beq .check ; pod falling cmp #$001A : beq .check ; pod falling
cmp #$0049 : beq .check ; SW torch room cmp #$0049 : beq .check ; SW torch room
cmp #$0014 : beq .check ; TR Pipe room cmp #$0014 : beq .check ; TR Pipe room
cmp #$00C2 : bne + ; Mire Hub cmp #$00C2 : bne + ; Mire Hub
.check .check
lda $0c : cmp #$0007 : !bge .skip lda $0c : cmp #$0006 : !bge .skip
lda $0e : cmp #$0009 : !bge .skip lda $0e : cmp #$0008 : !bge .skip
cmp #$0003 : !blt .skip cmp #$0004 : !blt .skip
bra + bra +
.skip pla : rtl .skip pla : rtl
+ pla : lda $9B52, y : sta $7E2000, x ; what we wrote over + pla : lda $9B52, y : sta $7E2000, x ; what we wrote over

2
data/base2current.json
View File

File diff suppressed because one or more lines are too long