Skip to content

Commit

Permalink
Add seed display to SM start screen and disable demos
Browse files Browse the repository at this point in the history
  • Loading branch information
tewtal committed Nov 21, 2018
1 parent c54d1ac commit d489800
Show file tree
Hide file tree
Showing 7 changed files with 199 additions and 5 deletions.
1 change: 1 addition & 0 deletions banks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Bank Mirror banks Content
8F:8000-E99F CF SM Bank #8F - Room MDB
8F:EA00-EAFF CF -- SM Golden 4 Skip --
8F:EB00-EBFF CF -- SM Wake Zebes --
8F:EC00-ECFF CF -- SM Escape Climb fix --
90:8000-F63F D0 SM Bank #90
91:8000-FFFF D1 SM Bank #91
92:8000-EDFF D2 SM Bank #92
Expand Down
1 change: 1 addition & 0 deletions src/main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ incsrc "sm/ending.asm" ; Super Metroid Ending conditions
incsrc "sm/newgame.asm" ; Super Metroid New Game Initialization
incsrc "sm/nofanfare.asm" ; Super Metroid Remove Item fanfares
incsrc "sm/minorfixes.asm" ; Super Metroid some softlock removals etc
incsrc "sm/demofix.asm" ; Super Metroid Stop demos from playing

; --- ALTTP code ---
incsrc "z3/hirom.asm" ; ALTTP ExHiROM patch
Expand Down
2 changes: 0 additions & 2 deletions src/sm/Demo_fix → src/sm/demofix.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
hirom

org $CB9F2C
base $8B9F2C

Expand Down
3 changes: 2 additions & 1 deletion src/sm/randomizer/randomizer.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
incsrc g4_skip.asm
incsrc wake_zebes.asm
incsrc patches.asm
incsrc tracking.asm
incsrc tracking.asm
incsrc seed_display.asm
193 changes: 193 additions & 0 deletions src/sm/randomizer/seed_display.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
org $c2ecbb
base $82ecbb
jsr seed_display

org $c2f800
base $82f800
seed_display:
pha
phx
php
rep #$30

lda.l $420000
and #$003f
asl
asl
asl
tay
ldx #$0000
-
lda WordTable, y
and #$00ff
asl
phx
tax
lda CharTable, x
plx
sta $7fc052, x
inx
inx
iny
cpx #$000E
bne -

lda.l $420001
and #$003f
asl
asl
asl
tay
ldx #$0000
-
lda WordTable, y
and #$00ff
asl
phx
tax
lda CharTable, x
plx
sta $7fc060, x
inx
inx
iny
cpx #$000E
bne -

lda.l $420002
and #$003f
asl
asl
asl
tay
ldx #$0000
-
lda WordTable, y
and #$00ff
asl
phx
tax
lda CharTable, x
plx
sta $7fc092, x
inx
inx
iny
cpx #$000E
bne -

lda.l $420003
and #$003f
asl
asl
asl
tay
ldx #$0000
-
lda WordTable, y
and #$00ff
asl
phx
tax
lda CharTable, x
plx
sta $7fc0a0, x
inx
inx
iny
cpx #$000E
bne -
plp
plx
pla
ldx #$07fe
rts

CharTable:
; 0x00 0x0F
dw $000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f
; 0x10 0x0F
dw $000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f,$000f
; 0x20 0x0F
dw $000f,$0084,$002d,$000f,$000f,$000f,$000f,$0022,$008a,$008b,$000f,$0086,$0089,$0087,$0088,$000f
NumTable:
; 0x30 0x0F
dw $0060,$0061,$0062,$0063,$0064,$0065,$0066,$0067,$0068,$0069,$000f,$000f,$000f,$000f,$000f,$0085
; 0x40 0x0F
dw $000f,$006a,$006b,$006c,$006d,$006e,$006f,$0070,$0071,$0072,$0073,$0074,$0075,$0076,$0077,$0078
; 0x50 0x0F
dw $0079,$007a,$007b,$007c,$007d,$007e,$007f,$0080,$0081,$0082,$0083,$000f,$000f,$000f,$000f,$000f








WordTable:
db "GEEMER "
db "RIPPER "
db "ATOMIC "
db "POWAMP "
db "SCISER "
db "NAMIHE "
db "PUROMI "
db "ALCOON "
db "BEETOM "
db "OWTCH "
db "ZEBBO "
db "ZEELA "
db "HOLTZ "
db "VIOLA "
db "WAVER "
db "RINKA "
db "BOYON "
db "CHOOT "
db "KAGO "
db "SKREE "
db "COVERN "
db "EVIR "
db "TATORI "
db "OUM "
db "PUYO "
db "YARD "
db "ZOA "
db "FUNE "
db "GAMET "
db "GERUTA "
db "SOVA "
db "BULL "
db "ARRGI "
db "BABUSU "
db "BORU "
db "HACHI "
db "BABURU "
db "TAINON "
db "GERUDO "
db "GIBO "
db "KOPPI "
db "PON "
db "HOBA "
db "HYU "
db "KISU "
db "KYUNE "
db "RIBA "
db "MEDUSA "
db "TERU "
db "FANGIN "
db "PIKKU "
db "POPO "
db "NOMOSU "
db "GUZU "
db "AIGORU "
db "ROPA "
db "GAPURA "
db "HEISHI "
db "SUTARU "
db "TOZOKU "
db "TOPPO "
db "WAINDA "
db "KURIPI "
db "ZORA "
2 changes: 1 addition & 1 deletion src/sm/transition.asm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ base $818087
jml sm_load_hook


; Place all the transition code in upper bank B8/F8 (free space in SM)
; Place all the transition code in the top of the upper bank AA/EA (free space in SM)
org $eafd00
base $aafd00

Expand Down
2 changes: 1 addition & 1 deletion src/z3/transition.asm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Transition into Zelda


; Place all the transition code in upper bank B8/F8 (free space in SM)
; Place all the transition code in the top of the upper bank AA/EA (free space in SM)
org $eaf800
base $aaf800

Expand Down

0 comments on commit d489800

Please sign in to comment.