From f2f53e8999d9103893df361ec1befe97f62bfa42 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 4 Jul 2021 11:29:21 -0500 Subject: [PATCH 1/6] Adding OW Rando credits --- stats/creditsnew.asm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index 2b1bbba..969680a 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -424,6 +424,15 @@ CreditsLineBlank: %blankline() %blankline() +%smallcredits("OVERWORLD RANDOMIZER", "green") + +%blankline() + +%bigcredits("CODEMANN8") + +%blankline() +%blankline() + %smallcredits("FESTIVE RANDOMIZER", "yellow") %blankline() @@ -448,15 +457,11 @@ CreditsLineBlank: %blankline() -%bigcredits("ACHY ARTHEAU") +%bigcredits("ACHY ARTHEAU TARTHORON") %blankline() -%bigcredits("GLAN TWROXAS") - -%blankline() - -%bigcredits("PLAGUEDONE TARTHORON") +%bigcredits("GLAN PLAGUEDONE TWROXAS") %blankline() %blankline() @@ -503,15 +508,11 @@ CreditsLineBlank: %blankline() -%bigcredits("MICHAELK FOUTON") +%bigcredits("MICHAELK FOUTON BONTA") %blankline() -%bigcredits("BONTA EMOSARU") - -%blankline() - -%bigcredits("SAKURATSUBASA") +%bigcredits("EMOSARU SAKURATSUBASA") %blankline() From 6f7f9d2a39e9fb646be5437ccdbb89425f7d2911 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 4 Jul 2021 11:38:24 -0500 Subject: [PATCH 2/6] Adding OW Rando credits --- stats/creditsnew.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index 969680a..69c22bd 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -424,7 +424,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("OVERWORLD RANDOMIZER", "green") +%smallcredits("OVERWORLD RANDOMIZER", "yellow") %blankline() @@ -433,7 +433,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("FESTIVE RANDOMIZER", "yellow") +%smallcredits("FESTIVE RANDOMIZER", "green") %blankline() @@ -446,7 +446,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("SPRITE DEVELOPMENT", "green") +%smallcredits("SPRITE DEVELOPMENT", "yellow") %blankline() @@ -466,7 +466,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("YOUR SPRITE BY", "yellow") +%smallcredits("YOUR SPRITE BY", "green") %addarbline(YourSpriteCreditsHi) %addarbline(YourSpriteCreditsLo) @@ -474,7 +474,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("MSU SUPPORT", "green") +%smallcredits("MSU SUPPORT", "yellow") %blankline() @@ -483,7 +483,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("PALETTE SHUFFLER", "yellow") +%smallcredits("PALETTE SHUFFLER", "green") %blankline() From 17b7a2355053a715bb53f288600b88825e54a31b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 6 Jul 2021 11:57:34 -0500 Subject: [PATCH 3/6] Fixed Frogsmith spawning as a bad sprite --- owrando.asm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/owrando.asm b/owrando.asm index d499c6b..13eae58 100644 --- a/owrando.asm +++ b/owrando.asm @@ -18,6 +18,15 @@ jml OWFluteCancel2 : nop org $0ab90d ;JSL $02E99D jsl OWFluteCancel +; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house +org $068a76 ;LDA $7EF3CA : AND.w #$40 +lda $1b : eor #1 : nop #2 + +; allows Frog to be accepted at Blacksmith +org $06b3ee ;LDA $7EF3CC : CMP #$07 : BEQ $06B42E +jsl OWSmithAccept : nop #2 +db #$b0 ; BCS instead of BEQ + ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm 4068 () jsl.l OWWorldCheck @@ -122,6 +131,13 @@ OWFluteCancel2: lda #$01 : sta $7f5006 + rtl } +OWSmithAccept: +{ + lda $7ef3cc : cmp #$07 : beq + + cmp #$08 : beq + + clc : rtl + + sec : rtl +} org $aa9000 OWEdgeTransition: From 7f4d783870bb40ce8a39ced41e2a64c3cd32736c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 6 Jul 2021 14:29:10 -0500 Subject: [PATCH 4/6] Fixed Stumpy sprite loading --- owrando.asm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/owrando.asm b/owrando.asm index 13eae58..2caf31c 100644 --- a/owrando.asm +++ b/owrando.asm @@ -27,6 +27,10 @@ org $06b3ee ;LDA $7EF3CC : CMP #$07 : BEQ $06B42E jsl OWSmithAccept : nop #2 db #$b0 ; BCS instead of BEQ +; load Stumpy per screen's original world, not current world flag +org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) +lda $8a : eor #$40 + ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm 4068 () jsl.l OWWorldCheck From a87ae37eab79dd19215bf42c90540d8d46f47711 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 6 Jul 2021 14:29:48 -0500 Subject: [PATCH 5/6] Minor reformatting comments --- owrando.asm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/owrando.asm b/owrando.asm index 2caf31c..dade358 100644 --- a/owrando.asm +++ b/owrando.asm @@ -19,58 +19,58 @@ org $0ab90d ;JSL $02E99D jsl OWFluteCancel ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house -org $068a76 ;LDA $7EF3CA : AND.w #$40 +org $068a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40) lda $1b : eor #1 : nop #2 ; allows Frog to be accepted at Blacksmith -org $06b3ee ;LDA $7EF3CC : CMP #$07 : BEQ $06B42E +org $06b3ee ; < 333ee - sprite_smithy_bros.asm:347 (LDA $7EF3CC : CMP.b #$08 : BEQ .no_returning_smithy_tagalong) jsl OWSmithAccept : nop #2 -db #$b0 ; BCS instead of BEQ +db #$b0 ; BCS to replace BEQ ; load Stumpy per screen's original world, not current world flag org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) lda $8a : eor #$40 ;(replacing -> LDA $8A : AND.b #$40) -org $00d8c4 ; < ? - Bank00.asm 4068 () +org $00d8c4 ; < ? - Bank00.asm:4068 () jsl.l OWWorldCheck -org $0283dc ; < ? - Bank02.asm 816 () +org $0283dc ; < ? - Bank02.asm:816 () jsl.l OWWorldCheck -org $02aa36 ; < ? - Bank02.asm 6559 () +org $02aa36 ; < ? - Bank02.asm:6559 () jsl.l OWWorldCheck -org $02aeca ; < ? - Bank02.asm 7257 () +org $02aeca ; < ? - Bank02.asm:7257 () jsl.l OWWorldCheck16 : nop -org $02b349 ; < ? - Bank02.asm 7902 () +org $02b349 ; < ? - Bank02.asm:7902 () jsl.l OWWorldCheck -org $02c40a ; < ? - Bank02.asm 10547 () +org $02c40a ; < ? - Bank02.asm:10547 () jsl.l OWWorldCheck -org $05afd9 ; < ? - sprite_warp_vortex.asm 60 () +org $05afd9 ; < ? - sprite_warp_vortex.asm:60 () jsl.l OWWorldCheck -org $07a3f0 ; < ? - Bank07.asm 5772 () ; flute activation/use +org $07a3f0 ; < ? - Bank07.asm:5772 () ; flute activation/use jsl.l OWWorldCheck -org $07a967 ; < ? - Bank07.asm 6578 () +org $07a967 ; < ? - Bank07.asm:6578 () jsl.l OWWorldCheck -org $07a9a1 ; < ? - Bank07.asm 6622 () +org $07a9a1 ; < ? - Bank07.asm:6622 () jsl.l OWWorldCheck -org $07a9ed ; < ? - Bank07.asm 6677 () +org $07a9ed ; < ? - Bank07.asm:6677 () jsl.l OWWorldCheck -org $07aa34 ; < ? - Bank07.asm 6718 () +org $07aa34 ; < ? - Bank07.asm:6718 () jsl.l OWWorldCheck -org $08d408 ; < ? - ancilla_morph_poof.asm 48 () +org $08d408 ; < ? - ancilla_morph_poof.asm:48 () jsl.l OWWorldCheck -org $0aba6c ; < ? - Bank0a.asm 474 () +org $0aba6c ; < ? - Bank0a.asm:474 () jsl.l OWWorldCheck16 : nop -org $0aba99 ; < ? - Bank0a.asm 515 () +org $0aba99 ; < ? - Bank0a.asm:515 () jsl.l OWWorldCheck -org $0bfeab ; < ? - Bank0b.asm 36 () +org $0bfeab ; < ? - Bank0b.asm:36 () jsl.l OWWorldCheck16 : nop org $0cffb6 ; < ? - ?.asm ? () jsl.l OWWorldCheck16 : nop org $0cffe8 ; < ? - ?.asm ? () jsl.l OWWorldCheck16 : nop -org $1beca2 ; < ? - palettes.asm 556 () +org $1beca2 ; < ? - palettes.asm:556 () jsl.l OWWorldCheck16 : nop -org $1bed95 ; < ? - palettes.asm 748 () +org $1bed95 ; < ? - palettes.asm:748 () jsl.l OWWorldCheck16 : nop org $02b16e ; AND #$3F : ORA 7EF3CA From e5ec4f8393bd6b85a5d30350c26257ad91353c9e Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 6 Jul 2021 14:44:55 -0500 Subject: [PATCH 6/6] Fixed Stumpy --- owrando.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owrando.asm b/owrando.asm index dade358..0edfdf7 100644 --- a/owrando.asm +++ b/owrando.asm @@ -20,7 +20,7 @@ jsl OWFluteCancel ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house org $068a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40) -lda $1b : eor #1 : nop #2 +lda $1b : eor.b #1 : nop #2 ; allows Frog to be accepted at Blacksmith org $06b3ee ; < 333ee - sprite_smithy_bros.asm:347 (LDA $7EF3CC : CMP.b #$08 : BEQ .no_returning_smithy_tagalong) @@ -29,7 +29,7 @@ db #$b0 ; BCS to replace BEQ ; load Stumpy per screen's original world, not current world flag org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) -lda $8a : eor #$40 +lda $8a : and.b #$40 ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 ()