# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1333732738 18000
# Node ID 6ec288064d492132a64b90c3f3481efa6f5e8a9c
# Parent  ecff37d222932000db104639baae4dd8e94e858c
improved do-save-corruption

diff -r ecff37d22293 -r 6ec288064d49 clojure/com/aurellem/run/bootstrap_0.clj
--- a/clojure/com/aurellem/run/bootstrap_0.clj	Fri Apr 06 09:09:52 2012 -0500
+++ b/clojure/com/aurellem/run/bootstrap_0.clj	Fri Apr 06 12:18:58 2012 -0500
@@ -418,17 +418,18 @@
   ([desired-quantity [moves state :as script]]
      (set-quantity 99 desired-quantity script)))
 
+(defn activate-start-menu [script]
+  (first-difference [:b] [:b :start] AF script))
+
 (defn-memo do-save-corruption
   ([] (do-save-corruption
        (walk-to-counter)))
   ([script]
      (->> script
-          (first-difference [] [:start] AF)
+          activate-start-menu
           (set-cursor 4)
-          (do-nothing 5)
-          (play-moves [[:a]])
-          (play-moves (repeat 85 [:b]))
-          (play-moves [[:a]])
+          select-menu-entry
+          select-menu-entry
           (play-moves
            ;; this section is copied from speedrun-2942 and corrupts
            ;; the save so that the total number of pokemon is set to
@@ -485,14 +486,13 @@
        select-menu-entry
        scroll-text))
 
-(defn activate-start-menu [script]
-  (first-difference [:b] [:b :start] AF script))
-
 (defn-memo corrupt-item-list
   "Corrupt the num-of-items variable by switching a corrupted pokemon
    into out-of-bounds memory."
   ([] (corrupt-item-list
-       (corrupted-checkpoint)))
+       ;;(corrupted-checkpoint)
+       (do-save-corruption)
+       ))
   ([script]
      (->> script
           activate-start-menu
@@ -556,11 +556,10 @@
           (play-moves [[:b]])
           end-text)))
 
-(defn corrupt-item-list-again
+(defn-memo corrupt-item-list-again
   ([] (corrupt-item-list-again (buy-bootstrapping-items)))
   ([script]
      (->> script
-
           activate-start-menu             
           (set-cursor-relative 0)                   
           select-menu-entry               
@@ -568,7 +567,6 @@
           ;; repair list-offset for pokemon-list
           (set-cursor-relative -1)
 
-          
           (set-cursor 4)                  ; switching it to    
           select-menu-entry               ; tenth place.       
           (set-cursor 1)
@@ -578,44 +576,18 @@
           (set-cursor 9)                  ; goto 10th pokemon
           select-menu-entry               ; do switch
           close-menu
-          close-menu                     
-          
-          (do-nothing 1)
-          ;;select-menu-entry     
-          ;;
-          ;;(set-cursor 9)
-          ;;select-menu-entry 
-          ;;close-menu
-         
-          )))
-          ;; (do-nothing 10)
-          ;; (play-moves [[:b]])
-          ;; (do-nothing 100)
-          ;; (play-moves [[:b]])
-          ;; (do-nothing 40)
-          ;; (play-moves [[:b]])
-          ;; (first-difference [:b] [:start :b] AF)
-          ;; (menu [[:a] ↑ ↑ ↑ ↑ ↑         
-          ;;        [:a] ↓ [:a]            
-          ;;        ↓ ↓ ↓ ↓ ↓ [:a]])       
-          ;;                               
-          ;; )))                           
+          close-menu)))
           
 (defn-memo viridian-store->viridian-poke-center
   ([] (viridian-store->viridian-poke-center
        (corrupt-item-list-again)))
   ([script]
      (->> script
-          (do-nothing 100)
-          (play-moves [[:b]])
-          (do-nothing 100)
-          (play-moves [[:b]])
-          (do-nothing 40)
           ;; leave store
           (walk [↓ ↓ 
                  → ↓ ↓])
-          (walk [← ← ← ←
-                 ↓ ↓ ↓ ↓ ↓ ↓
+          (walk [← ← ← 
+                 ↓ ↓ ↓ ↓ ↓
                  ← ← ← ↑]))))
 
 (defn-memo to-poke-center-computer
@@ -625,7 +597,7 @@
      (->> script
           (walk [→ →
                  ↑ ↑ ↑
-                 → → → → → → → → → ↑])
+                 → → → → → → → → →])
           (do-nothing 1))))
 
 (defn-memo begin-deposits