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

Merge branch 'master' of https://github.com/mmxbass/z3randomizer

Browse Source
This commit is contained in:
Karkat
2017-09-10 20:42:55 -04:00
parent dbd28a0551 8e1ebe5404
commit 144375c140
4 changed files with 180 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
c2807_v3.gfx
View File

Binary file not shown.

BIN
c2e3e.gfx
View File

Binary file not shown.

329
pendantcrystalhud.asm
View File

@@ -141,172 +141,195 @@ ShowDungeonItems:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawHUDDungeonItems: DrawHUDDungeonItems:
; left side LDA HUDDundeonItems : BNE +
;LDA.w #$2871 : STA $1604 ; dungeon row LDA.w #$11CE : STA $00 ; thing we wrote over
LDA.w #$2810 : STA $1644 ; small keys RTL
LDA.w #$2811 : STA $1684 ; big key +
LDA.w #$2821 : STA $16C4 ; map
LDA.w #$2C20 : STA $1704 ; compass
; dungeon names ; dungeon names
LDA.w #$2D50 : STA $1606 ; sewers LDA.w #$2D50 : STA $1646 ; sewers
LDA.w #$2D51 : STA $1608 ; Eastern LDA.w #$2D54 : STA $1648 ; Agahnims Tower
LDA.w #$2D52 : STA $160A ; Desert
LDA.w #$2D53 : STA $160C ; Hera
LDA.w #$2D54 : STA $160E ; Agahnims Tower
LDA.w #$2D55 : STA $1612 ; PoD LDA.w #$2D51 : STA $164C ; Eastern
LDA.w #$2D56 : STA $1614 ; Swamp LDA.w #$2D52 : STA $164E ; Desert
LDA.w #$2D57 : STA $1616 ; Skull Woods LDA.w #$2D53 : STA $1650 ; Hera
LDA.w #$2D58 : STA $1618 ; Thieves Town
LDA.w #$2D59 : STA $161A ; Ice
LDA.w #$2D5A : STA $161C ; Mire
LDA.w #$2D5B : STA $161E ; Turtle Rock
LDA.w #$2D5C : STA $1622 ; Ganon's Tower LDA.w #$2D55 : STA $1654 ; PoD
LDA.w #$2D56 : STA $1656 ; Swamp
LDA.w #$2D57 : STA $1658 ; Skull Woods
LDA.w #$2D58 : STA $165A ; Thieves Town
LDA.w #$2D59 : STA $165C ; Ice
LDA.w #$2D5A : STA $165E ; Mire
LDA.w #$2D5B : STA $1660 ; Turtle Rock
SEP #$20 ; set 8-bit accumulator LDA.w #$2D5C : STA $1664 ; Ganon's Tower
; Small Keys
LDA.b #$16 : !ADD $7EF37C : STA $1646 : LDA.b #$28 : ADC #$00 : sta $1646+1 ; sewers
LDA.b #$16 : !ADD $7EF37E : STA $1648 : LDA.b #$28 : ADC #$00 : sta $1648+1 ; Eastern
LDA.b #$16 : !ADD $7EF37F : STA $164A : LDA.b #$28 : ADC #$00 : sta $164A+1 ; Desert
LDA.b #$16 : !ADD $7EF386 : STA $164C : LDA.b #$28 : ADC #$00 : sta $164C+1 ; Hera
LDA.b #$16 : !ADD $7EF380 : STA $164E : LDA.b #$28 : ADC #$00 : sta $164E+1 ; Agahnims Tower
LDA.b #$16 : !ADD $7EF382 : STA $1652 : LDA.b #$28 : ADC #$00 : sta $1652+1 ; PoD ; write black
LDA.b #$16 : !ADD $7EF381 : STA $1654 : LDA.b #$28 : ADC #$00 : sta $1654+1 ; Swamp LDX.w #$0000 ; Paint entire box black & draw empty pendants and crystals
LDA.b #$16 : !ADD $7EF384 : STA $1656 : LDA.b #$28 : ADC #$00 : sta $1656+1 ; Skull Woods -
LDA.b #$16 : !ADD $7EF387 : STA $1658 : LDA.b #$28 : ADC #$00 : sta $1658+1 ; Thieves Town LDA #$24F5 : STA $1686, X : STA $16C6, X
LDA.b #$16 : !ADD $7EF385 : STA $165A : LDA.b #$28 : ADC #$00 : sta $165A+1 ; Ice INX #2 : CPX.w #$0020 : BCC -
LDA.b #$16 : !ADD $7EF383 : STA $165C : LDA.b #$28 : ADC #$00 : sta $165C+1 ; Mire
LDA.b #$16 : !ADD $7EF388 : STA $165E : LDA.b #$28 : ADC #$00 : sta $165E+1 ; Turtle Rock
LDA.b #$16 : !ADD $7EF389 : STA $1662 : LDA.b #$28 : ADC #$00 : sta $1662+1 ; Ganon's Tower LDA !HUD_FLAG : AND.w #$0020 : BEQ + : BRL +++ : +
LDA HUDDundeonItems : AND.w #$0001 : BNE + : BRL ++ : +
LDA.w #$2810 : STA $1684 ; small keys icon
SEP #$20 ; set 8-bit accumulator
; Small Keys
LDA.b #$16 : !ADD $7EF37C : STA $1686 : LDA.b #$28 : ADC #$00 : sta $1686+1 ; sewers
LDA.b #$16 : !ADD $7EF380 : STA $1688 : LDA.b #$28 : ADC #$00 : sta $1688+1 ; Agahnims Tower
REP #$20 ; set 16-bit accumulator LDA.b #$16 : !ADD $7EF37E : STA $168C : LDA.b #$28 : ADC #$00 : sta $168C+1 ; Eastern
LDA.b #$16 : !ADD $7EF37F : STA $168E : LDA.b #$28 : ADC #$00 : sta $168E+1 ; Desert
LDA.b #$16 : !ADD $7EF386 : STA $1690 : LDA.b #$28 : ADC #$00 : sta $1690+1 ; Hera
LDA.b #$16 : !ADD $7EF382 : STA $1694 : LDA.b #$28 : ADC #$00 : sta $1694+1 ; PoD
LDA.b #$16 : !ADD $7EF381 : STA $1696 : LDA.b #$28 : ADC #$00 : sta $1696+1 ; Swamp
LDA.b #$16 : !ADD $7EF384 : STA $1698 : LDA.b #$28 : ADC #$00 : sta $1698+1 ; Skull Woods
LDA.b #$16 : !ADD $7EF387 : STA $169A : LDA.b #$28 : ADC #$00 : sta $169A+1 ; Thieves Town
LDA.b #$16 : !ADD $7EF385 : STA $169C : LDA.b #$28 : ADC #$00 : sta $169C+1 ; Ice
LDA.b #$16 : !ADD $7EF383 : STA $169E : LDA.b #$28 : ADC #$00 : sta $169E+1 ; Mire
LDA.b #$16 : !ADD $7EF388 : STA $16A0 : LDA.b #$28 : ADC #$00 : sta $16A0+1 ; Turtle Rock
LDA.b #$16 : !ADD $7EF389 : STA $16A4 : LDA.b #$28 : ADC #$00 : sta $16A4+1 ; Ganon's Tower
REP #$20 ; set 16-bit accumulator
++
; Big Keys ; Big Keys
LDA $7EF367 : AND.w #$0080 : BEQ + ; sewers LDA HUDDundeonItems : AND.w #$0002 : BNE + : BRL ++ : +
LDA.w #$2826 : STA $1686 LDA.w #$2811 : STA $16C4 ; big key icon
+ LDA $7EF367 : AND.w #$0080 : BEQ + ; sewers
LDA $7EF367 : AND.w #$0020 : BEQ + ; Eastern LDA.w #$2826 : STA $16C6
LDA.w #$2826 : STA $1688 +
+ LDA $7EF367 : AND.w #$0008 : BEQ + ; Agahnims Tower
LDA $7EF367 : AND.w #$0010 : BEQ + ; Desert LDA.w #$2826 : STA $16C8
LDA.w #$2826 : STA $168A +
+ LDA $7EF367 : AND.w #$0020 : BEQ + ; Eastern
LDA $7EF366 : AND.w #$0020 : BEQ + ; Hera LDA.w #$2826 : STA $16CC
LDA.w #$2826 : STA $168C +
+ LDA $7EF367 : AND.w #$0010 : BEQ + ; Desert
LDA $7EF367 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA.w #$2826 : STA $16CE
LDA.w #$2826 : STA $168E +
+ LDA $7EF366 : AND.w #$0020 : BEQ + ; Hera
LDA $7EF367 : AND.w #$0002 : BEQ + ; PoD LDA.w #$2826 : STA $16D0
LDA.w #$2826 : STA $1692 +
+ LDA $7EF367 : AND.w #$0002 : BEQ + ; PoD
LDA $7EF367 : AND.w #$0004 : BEQ + ; Swamp LDA.w #$2826 : STA $16D4
LDA.w #$2826 : STA $1694 +
+ LDA $7EF367 : AND.w #$0004 : BEQ + ; Swamp
LDA $7EF366 : AND.w #$0080 : BEQ + ; Skull Woods LDA.w #$2826 : STA $16D6
LDA.w #$2826 : STA $1696 +
+ LDA $7EF366 : AND.w #$0080 : BEQ + ; Skull Woods
LDA $7EF366 : AND.w #$0010 : BEQ + ; Thieves Town LDA.w #$2826 : STA $16D8
LDA.w #$2826 : STA $1698 +
+ LDA $7EF366 : AND.w #$0010 : BEQ + ; Thieves Town
LDA $7EF366 : AND.w #$0040 : BEQ + ; Ice LDA.w #$2826 : STA $16DA
LDA.w #$2826 : STA $169A +
+ LDA $7EF366 : AND.w #$0040 : BEQ + ; Ice
LDA $7EF367 : AND.w #$0001 : BEQ + ; Mire LDA.w #$2826 : STA $16DC
LDA.w #$2826 : STA $169C +
+ LDA $7EF367 : AND.w #$0001 : BEQ + ; Mire
LDA $7EF366 : AND.w #$0008 : BEQ + ; Turtle Rock LDA.w #$2826 : STA $16DE
LDA.w #$2826 : STA $169E +
+ LDA $7EF366 : AND.w #$0008 : BEQ + ; Turtle Rock
LDA $7EF366 : AND.w #$0004 : BEQ + ; Ganon's Tower LDA.w #$2826 : STA $16E0
LDA.w #$2826 : STA $16A2 +
+ LDA $7EF366 : AND.w #$0004 : BEQ + ; Ganon's Tower
LDA.w #$2826 : STA $16E4
+
++
; This should only display if select is pressed in hud
+++
LDA !HUD_FLAG : AND.w #$0020 : BNE + : BRL +++ : +
; Maps ; Maps
LDA $7EF369 : AND.w #$0080 : BEQ + ; sewers LDA HUDDundeonItems : AND.w #$0004 : BNE + : BRL ++ : +
LDA.w #$2826 : STA $16C6 LDA.w #$2821 : STA $1684 ; map icon
+ LDA $7EF369 : AND.w #$0080 : BEQ + ; sewers
LDA $7EF369 : AND.w #$0020 : BEQ + ; Eastern LDA.w #$2826 : STA $1686
LDA.w #$2826 : STA $16C8 +
+ LDA $7EF369 : AND.w #$0008 : BEQ + ; Agahnims Tower
LDA $7EF369 : AND.w #$0010 : BEQ + ; Desert LDA.w #$2826 : STA $1688
LDA.w #$2826 : STA $16CA +
+ LDA $7EF369 : AND.w #$0020 : BEQ + ; Eastern
LDA $7EF368 : AND.w #$0020 : BEQ + ; Hera LDA.w #$2826 : STA $168C
LDA.w #$2826 : STA $16CC +
+ LDA $7EF369 : AND.w #$0010 : BEQ + ; Desert
LDA $7EF369 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA.w #$2826 : STA $168E
LDA.w #$2826 : STA $16CE +
+ LDA $7EF368 : AND.w #$0020 : BEQ + ; Hera
LDA $7EF369 : AND.w #$0002 : BEQ + ; PoD LDA.w #$2826 : STA $1690
LDA.w #$2826 : STA $16D2 +
+ LDA $7EF369 : AND.w #$0002 : BEQ + ; PoD
LDA $7EF369 : AND.w #$0004 : BEQ + ; Swamp LDA.w #$2826 : STA $1694
LDA.w #$2826 : STA $16D4 +
+ LDA $7EF369 : AND.w #$0004 : BEQ + ; Swamp
LDA $7EF368 : AND.w #$0080 : BEQ + ; Skull Woods LDA.w #$2826 : STA $1696
LDA.w #$2826 : STA $16D6 +
+ LDA $7EF368 : AND.w #$0080 : BEQ + ; Skull Woods
LDA $7EF368 : AND.w #$0010 : BEQ + ; Thieves Town LDA.w #$2826 : STA $1698
LDA.w #$2826 : STA $16D8 +
+ LDA $7EF368 : AND.w #$0010 : BEQ + ; Thieves Town
LDA $7EF368 : AND.w #$0040 : BEQ + ; Ice LDA.w #$2826 : STA $169A
LDA.w #$2826 : STA $16DA +
+ LDA $7EF368 : AND.w #$0040 : BEQ + ; Ice
LDA $7EF369 : AND.w #$0001 : BEQ + ; Mire LDA.w #$2826 : STA $169C
LDA.w #$2826 : STA $16DC +
+ LDA $7EF369 : AND.w #$0001 : BEQ + ; Mire
LDA $7EF368 : AND.w #$0008 : BEQ + ; Turtle Rock LDA.w #$2826 : STA $169E
LDA.w #$2826 : STA $16DE +
+ LDA $7EF368 : AND.w #$0008 : BEQ + ; Turtle Rock
LDA $7EF368 : AND.w #$0004 : BEQ + ; Ganon's Tower LDA.w #$2826 : STA $16A0
LDA.w #$2826 : STA $16E2 +
+ LDA $7EF368 : AND.w #$0004 : BEQ + ; Ganon's Tower
LDA.w #$2826 : STA $16A4
+
++
; Compasses ; Compasses
LDA $7EF365 : AND.w #$0080 : BEQ + ; sewers LDA HUDDundeonItems : AND.w #$0008 : BNE + : BRL ++ : +
LDA.w #$2C26 : STA $1706 LDA.w #$2C20 : STA $16C4 ; compass icon
+ LDA $7EF365 : AND.w #$0080 : BEQ + ; sewers
LDA $7EF365 : AND.w #$0020 : BEQ + ; Eastern LDA.w #$2C26 : STA $16C6
LDA.w #$2C26 : STA $1708 +
+ LDA $7EF365 : AND.w #$0008 : BEQ + ; Agahnims Tower
LDA $7EF365 : AND.w #$0010 : BEQ + ; Desert LDA.w #$2C26 : STA $16C8
LDA.w #$2C26 : STA $170A +
+ LDA $7EF365 : AND.w #$0020 : BEQ + ; Eastern
LDA $7EF364 : AND.w #$0020 : BEQ + ; Hera LDA.w #$2C26 : STA $16CC
LDA.w #$2C26 : STA $170C +
+ LDA $7EF365 : AND.w #$0010 : BEQ + ; Desert
LDA $7EF365 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA.w #$2C26 : STA $16CE
LDA.w #$2C26 : STA $170E +
+ LDA $7EF364 : AND.w #$0020 : BEQ + ; Hera
LDA $7EF365 : AND.w #$0002 : BEQ + ; PoD LDA.w #$2C26 : STA $16D0
LDA.w #$2C26 : STA $1712 +
+ LDA $7EF365 : AND.w #$0002 : BEQ + ; PoD
LDA $7EF365 : AND.w #$0004 : BEQ + ; Swamp LDA.w #$2C26 : STA $16D4
LDA.w #$2C26 : STA $1714 +
+ LDA $7EF365 : AND.w #$0004 : BEQ + ; Swamp
LDA $7EF364 : AND.w #$0080 : BEQ + ; Skull Woods LDA.w #$2C26 : STA $16D6
LDA.w #$2C26 : STA $1716 +
+ LDA $7EF364 : AND.w #$0080 : BEQ + ; Skull Woods
LDA $7EF364 : AND.w #$0010 : BEQ + ; Thieves Town LDA.w #$2C26 : STA $16D8
LDA.w #$2C26 : STA $1718 +
+ LDA $7EF364 : AND.w #$0010 : BEQ + ; Thieves Town
LDA $7EF364 : AND.w #$0040 : BEQ + ; Ice LDA.w #$2C26 : STA $16DA
LDA.w #$2C26 : STA $171A +
+ LDA $7EF364 : AND.w #$0040 : BEQ + ; Ice
LDA $7EF365 : AND.w #$0001 : BEQ + ; Mire LDA.w #$2C26 : STA $16DC
LDA.w #$2C26 : STA $171C +
+ LDA $7EF365 : AND.w #$0001 : BEQ + ; Mire
LDA $7EF364 : AND.w #$0008 : BEQ + ; Turtle Rock LDA.w #$2C26 : STA $16DE
LDA.w #$2C26 : STA $171E +
+ LDA $7EF364 : AND.w #$0008 : BEQ + ; Turtle Rock
LDA $7EF364 : AND.w #$0004 : BEQ + ; Ganon's Tower LDA.w #$2C26 : STA $16E0
LDA.w #$2C26 : STA $1722 +
+ LDA $7EF364 : AND.w #$0004 : BEQ + ; Ganon's Tower
LDA.w #$2C26 : STA $16E4
+
++
+++
LDA.w #$11CE : STA $00 ; thing we wrote over LDA.w #$11CE : STA $00 ; thing we wrote over
RTL RTL

4
tables.asm
View File

@@ -167,6 +167,10 @@ org $308044 ; PC 0x180044
AllowHammerTablets: AllowHammerTablets:
db #$00 ; #$00 = Off (default) - #$01 = On db #$00 ; #$00 = Off (default) - #$01 = On
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308045 ; PC 0x180045
HUDDundeonItems:
db #$FF ; display ----dcba a: Small Keys, b: Big Key, c: Map, d: Compass
;--------------------------------------------------------------------------------
org $308080 ; PC 0x180080 org $308080 ; PC 0x180080
Upgrade5BombsRefill: Upgrade5BombsRefill:
db #$00 db #$00