cleanup intro modifier

Events/intro.asm

@@ -1,15 +1,10 @@
-;===========================================================
+; =============================================================================
-; Intro
+;  Intro Modifier 
-; game will Switch to part 1 after your uncle left the house
+;  Skips the intro sequence with the rain 
-;===========================================================
 
-namespace Intro 
-{
-  Main: 
-  {
 lorom
 
-    ORG $05DF12
+org $05DF12
 JSL $04ECA0
 NOP
 NOP
@@ -23,36 +18,16 @@ namespace Intro
 STA $7ef3CC   ; disable telepathic message
 JSL $00FC41   ; fix monsters
 RTL
-  }  ; label Main
 
-  Items: 
+; =============================================================================
-  {
+; SRM Start Modifier
-    ; SRM Start Modyfier
+; Credit: Conn, Euclid, MathOnNapkins
-    ; This ASM was written by Euclid, modified by Conn; thanks to MoN for his banks research
-    ; This is a ASM FrontEnd Code for Zelda ALTTP (US, no header) to modify the sram on startup
-    ; the values are included to better distinguish where is what. You need to set your own values. Description at the end.
-
-    lorom
 
 org $0cdc5a
-    jsr $ffb1
+JSR $ffb1
 
 org $0cffb1
-
+; =============================================================================
-    LDA #$0000     
-    STA $7003C5,x
-
-    LDA #$0000   
-    STA $7003C7,x
-
-    LDA #$0101      ; 01=sword,  02 = shield to start with        
-    STA $700359,x   ; sword/shield save
-
-    LDY #$0000              
-    RTS
-
-
-    ;---------------------------------------------------------
 ;$3C5: $00: Unset, Will put Link in his bed state at the beginning of the game. (Also can't use sword or shield)
 ;      $01: Start in the castle on start up.
 ;      $02: Indicates you have completed the first Hyrule Castle dungeon.
@@ -70,7 +45,10 @@ namespace Intro
 ;         In other words, don't expect this to stay in one state if you're using fortune tellers. Has no other known purpose.
 ;    07 - Unused? (98% certainty)
 ;    10 - Start value (in house, bed)
+LDA #$0000     
+STA $7003C5,x
 
+; =============================================================================
 ;$3C7: Map Icons Indicator 2 (value, not bitwise)
 ;    00 - start value (cross at Hyrule Castle)
 ;    01 - cross at Sahasrala's house
@@ -83,13 +61,15 @@ namespace Intro
 ;    08 - Agahnim (skull icon at Ganon's Tower)
 ;    All values beyond 8 are invalid, it seems.
 
-
 ;$3C8: Starting Entrance to use. Abbreviations: LH = Link's House - SA = Sanctuary - MC = Mountain Cave - PP = Pyramid of Power in DW  
 ;    00 - Start the game in Link's house always.
 ;    01 - SA.
 ;    03 - Secret passage under HC garden (near dying uncle).
 ;    05 - LH or SA or MC.
+LDA #$0000   
+STA $7003C7,x
 
+; =============================================================================
 ;$359: Sword you start with
 ;    00 - No sword
 ;    01 - Fighter Sword
@@ -97,11 +77,13 @@ namespace Intro
 ;    03 - Tempered Sword
 ;    04 - Golden Sword
 
-    ;$35A: Shield you start with           .      
+;$35A: Shield you start with
 ;     00 - No shield
 ;     01 - Blue Shield
 ;     02 - Hero's Shield
 ;     03 - Mirror Shield  
-  }
+LDA #$0101      ; 01=sword,  02 = shield to start with
-}  ; namespace Intro
+STA $700359,x   
-namespace off
+
+LDY #$0000
+RTS