changeset 236:30ced394823a

merge.
author Robert McIntyre <rlm@mit.edu>
date Sat, 24 Mar 2012 20:06:25 -0500
parents 5becef6312b9 (diff) 00e4efa7c104 (current diff)
children ff37bc3004a7
files clojure/com/aurellem/gb/characters.clj
diffstat 10 files changed, 578 insertions(+), 512 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/exp/cartography	Sat Mar 24 18:21:16 2012 -0500
     1.2 +++ b/clojure/com/aurellem/exp/cartography	Sat Mar 24 20:06:25 2012 -0500
     1.3 @@ -7,400 +7,400 @@
     1.4  D168                   Pokemon 6 Species
     1.5  D169                   End-of-List Sentinel (0xFF)
     1.6  D16A                   Pokemon 1 Color Map
     1.7 -D16B                   /h				
     1.8 +D16B                   /h                               
     1.9  D16C                   \l Pokemon 1 Current Hit Points
    1.10 -D16D                   Unused				
    1.11 -D16E                   Status				
    1.12 +D16D                   Unused                           
    1.13 +D16E                   Status                           
    1.14  D16F                   Type 1  (does not affect display)
    1.15  D170                   Type 2  (does not affect display)
    1.16 -D171                   Scratch Area 				
    1.17 -D172                   Move 1 ID 			
    1.18 -D173                   Move 2 ID  			
    1.19 -D174                   Move 3 ID  			
    1.20 +D171                   Scratch Area                             
    1.21 +D172                   Move 1 ID                        
    1.22 +D173                   Move 2 ID                        
    1.23 +D174                   Move 3 ID                        
    1.24  D175                   Move 4 ID
    1.25  D176                   /h   Pokemon 1 OT ID
    1.26  D177                   \l
    1.27 -D178                   /h				
    1.28 +D178                   /h                               
    1.29  D179                   |m   Pokemon 1 Experience Points
    1.30 -D17A                   \l				
    1.31 -D17B                   /h HP Stat Expeience		
    1.32 -D17C                   \l	  				
    1.33 +D17A                   \l                               
    1.34 +D17B                   /h HP Stat Expeience             
    1.35 +D17C                   \l                                       
    1.36  D17D                   /h Attack Stat Experience
    1.37 -D17E                   \l	  				
    1.38 +D17E                   \l                                       
    1.39  D17F                   /h Defense Stat Experience
    1.40 -D180                   \l	  				
    1.41 +D180                   \l                                       
    1.42  D181                   /h Speed Stat Experience
    1.43 -D182                   \l	  				
    1.44 +D182                   \l                                       
    1.45  D183                   /h Special Stat Experience
    1.46 -D184                   \l				
    1.47 +D184                   \l                               
    1.48  D185                   Diversification -- Defense, Attack (HP)
    1.49  D186                   Diversification -- Special, Speed (HP)
    1.50 -D187                   Current/Maximum PP Move 1		
    1.51 -D188                   Current/Maximum PP Move 2		
    1.52 -D189                   Current/Maximum PP Move 3		
    1.53 -D18A                   Current/Maximum PP Move 4		
    1.54 -D18B                   Current Level			
    1.55 +D187                   Current/Maximum PP Move 1                
    1.56 +D188                   Current/Maximum PP Move 2                
    1.57 +D189                   Current/Maximum PP Move 3                
    1.58 +D18A                   Current/Maximum PP Move 4                
    1.59 +D18B                   Current Level                    
    1.60  D18C                   /h   Pokemon 1 Total Hit Points
    1.61 -D18D                   \l				
    1.62 -D18E                   /h   Pokemon 1 Attack      	
    1.63 -D18F                   \l				
    1.64 -D190                   /h   Pokemon 1 Defense     	
    1.65 -D191                   \l				
    1.66 -D192                   /h   Pokemon 1 Speed       	
    1.67 -D193                   \l				
    1.68 -D194                   /h   Pokemon 1 Special     	
    1.69 +D18D                   \l                               
    1.70 +D18E                   /h   Pokemon 1 Attack            
    1.71 +D18F                   \l                               
    1.72 +D190                   /h   Pokemon 1 Defense           
    1.73 +D191                   \l                               
    1.74 +D192                   /h   Pokemon 1 Speed             
    1.75 +D193                   \l                               
    1.76 +D194                   /h   Pokemon 1 Special           
    1.77  D195                   \l
    1.78  D196                   Pokemon 2 Color Map
    1.79  D197                   /h
    1.80  D198                   \l Pokemon 2 Current Hit Points
    1.81  D199                   Unused
    1.82 -D19A                   Status				
    1.83 +D19A                   Status                           
    1.84  D19B                   Type 1  (does not affect display)
    1.85  D19C                   Type 2  (does not affect display)
    1.86 -D19D                   Scratch Area 				
    1.87 +D19D                   Scratch Area                             
    1.88  D19E                   Move 1 ID
    1.89  D19F                   Move 2 ID
    1.90  D1A0                   Move 3 ID
    1.91  D1A1                   Move 4 ID
    1.92  D1A2                   /h   Pokemon 2 OT ID
    1.93 -D1A3                   \l				
    1.94 -D1A4                   /h				
    1.95 +D1A3                   \l                               
    1.96 +D1A4                   /h                               
    1.97  D1A5                   |m   Pokemon 2 Experience Points
    1.98 -D1A6                   \l				
    1.99 -D1A7                   /h HP Stat Expeience		
   1.100 -D1A8                   \l	 			
   1.101 +D1A6                   \l                               
   1.102 +D1A7                   /h HP Stat Expeience             
   1.103 +D1A8                   \l                               
   1.104  D1A9                   /h Attack Stat Experience
   1.105 -D1AA                   \l	 			
   1.106 +D1AA                   \l                               
   1.107  D1AB                   /h Defense Stat Experience
   1.108 -D1AC                   \l	 			
   1.109 +D1AC                   \l                               
   1.110  D1AD                   /h Speed Stat Experience
   1.111 -D1AE                   \l	 			
   1.112 +D1AE                   \l                               
   1.113  D1AF                   /h Special Stat Experience
   1.114 -D1B0                   \l				
   1.115 +D1B0                   \l                               
   1.116  D1B1                   Diversification -- Defense, Attack (HP)
   1.117  D1B2                   Diversification -- Special, Speed (HP)
   1.118 -D1B3                   Current/Maximum PP Move 1	
   1.119 -D1B4                   Current/Maximum PP Move 2	
   1.120 -D1B5                   Current/Maximum PP Move 3	
   1.121 -D1B6                   Current/Maximum PP Move 4	
   1.122 -D1B7                   Current Level			
   1.123 +D1B3                   Current/Maximum PP Move 1        
   1.124 +D1B4                   Current/Maximum PP Move 2        
   1.125 +D1B5                   Current/Maximum PP Move 3        
   1.126 +D1B6                   Current/Maximum PP Move 4        
   1.127 +D1B7                   Current Level                    
   1.128  D1B8                   /h   Pokemon 2 Total Hit Points
   1.129 -D1B9                   \l				
   1.130 -D1BA                   /h   Pokemon 2 Attack      	
   1.131 -D1BB                   \l				
   1.132 -D1BC                   /h   Pokemon 2 Defense     	
   1.133 -D1BD                   \l				
   1.134 -D1BE                   /h   Pokemon 2 Speed       	
   1.135 -D1BF                   \l				
   1.136 -D1C0                   /h   Pokemon 2 Special     	
   1.137 +D1B9                   \l                               
   1.138 +D1BA                   /h   Pokemon 2 Attack            
   1.139 +D1BB                   \l                               
   1.140 +D1BC                   /h   Pokemon 2 Defense           
   1.141 +D1BD                   \l                               
   1.142 +D1BE                   /h   Pokemon 2 Speed             
   1.143 +D1BF                   \l                               
   1.144 +D1C0                   /h   Pokemon 2 Special           
   1.145  D1C1                   \l
   1.146  D1C2                   Pokemon 3 Color Map
   1.147 -D1C3                   /h				
   1.148 +D1C3                   /h                               
   1.149  D1C4                   \l Pokemon 3 Current Hit Points
   1.150 -D1C5                   Unused 				
   1.151 -D1C6                   Status				
   1.152 +D1C5                   Unused                           
   1.153 +D1C6                   Status                           
   1.154  D1C7                   Type 1  (does not affect display)
   1.155 -D1C8                   Type 2  (does not affect display)	
   1.156 -D1C9                   Scratch Area 				
   1.157 -D1CA                   Move 1 ID 			
   1.158 -D1CB                   Move 2 ID  			
   1.159 -D1CC                   Move 3 ID  			
   1.160 +D1C8                   Type 2  (does not affect display)        
   1.161 +D1C9                   Scratch Area                             
   1.162 +D1CA                   Move 1 ID                        
   1.163 +D1CB                   Move 2 ID                        
   1.164 +D1CC                   Move 3 ID                        
   1.165  D1CD                   Move 4 ID
   1.166  D1CE                   /h   Pokemon 3 OT ID
   1.167  D1CF                   \l
   1.168 -D1D0                   /h				
   1.169 +D1D0                   /h                               
   1.170  D1D1                   |m   Pokemon 3 Experience Points
   1.171 -D1D2                   \l				
   1.172 -D1D3                   /h HP Stat Expeience	
   1.173 -D1D4                   \l	  				
   1.174 +D1D2                   \l                               
   1.175 +D1D3                   /h HP Stat Expeience     
   1.176 +D1D4                   \l                                       
   1.177  D1D5                   /h Attack Stat Experience
   1.178 -D1D6                   \l	  				
   1.179 +D1D6                   \l                                       
   1.180  D1D7                   /h Defense Stat Experience
   1.181 -D1D8                   \l	  				
   1.182 +D1D8                   \l                                       
   1.183  D1D9                   /h Speed Stat Experience
   1.184 -D1DA                   \l	  				
   1.185 +D1DA                   \l                                       
   1.186  D1DB                   /h Special Stat Experience
   1.187 -D1DC                   \l				
   1.188 -D1DD                   Diversification -- Defense, Attack (HP)	
   1.189 +D1DC                   \l                               
   1.190 +D1DD                   Diversification -- Defense, Attack (HP)  
   1.191  D1DE                   Diversification -- Special, Speed (HP)
   1.192 -D1DF                   Current/Maximum PP Move 1		
   1.193 -D1E0                   Current/Maximum PP Move 2		
   1.194 -D1E1                   Current/Maximum PP Move 3		
   1.195 -D1E2                   Current/Maximum PP Move 4		
   1.196 -D1E3                   Current Level			
   1.197 +D1DF                   Current/Maximum PP Move 1                
   1.198 +D1E0                   Current/Maximum PP Move 2                
   1.199 +D1E1                   Current/Maximum PP Move 3                
   1.200 +D1E2                   Current/Maximum PP Move 4                
   1.201 +D1E3                   Current Level                    
   1.202  D1E4                   /h   Pokemon 3 Total Hit Points
   1.203 -D1E5                   \l				
   1.204 -D1E6                   /h   Pokemon 3 Attack      	
   1.205 -D1E7                   \l				
   1.206 -D1E8                   /h   Pokemon 3 Defense     	
   1.207 -D1E9                   \l				
   1.208 -D1EA                   /h   Pokemon 3 Speed       	
   1.209 -D1EB                   \l				
   1.210 -D1EC                   /h   Pokemon 3 Special     	
   1.211 +D1E5                   \l                               
   1.212 +D1E6                   /h   Pokemon 3 Attack            
   1.213 +D1E7                   \l                               
   1.214 +D1E8                   /h   Pokemon 3 Defense           
   1.215 +D1E9                   \l                               
   1.216 +D1EA                   /h   Pokemon 3 Speed             
   1.217 +D1EB                   \l                               
   1.218 +D1EC                   /h   Pokemon 3 Special           
   1.219  D1ED                   \l
   1.220  D1EE                   Pokemon 4 Color Map
   1.221 -D1EF                   /h				
   1.222 +D1EF                   /h                               
   1.223  D1F0                   \l Pokemon 4 Current Hit Points
   1.224 -D1F1                   Unused 				
   1.225 -D1F2                   Status				
   1.226 +D1F1                   Unused                           
   1.227 +D1F2                   Status                           
   1.228  D1F3                   Type 1  (does not affect display)
   1.229  D1F4                   Type 2  (does not affect display)
   1.230 -D1F5                   Scratch Area 				
   1.231 -D1F6                   Move 1 ID 			
   1.232 -D1F7                   Move 2 ID  			
   1.233 -D1F8                   Move 3 ID  			
   1.234 +D1F5                   Scratch Area                             
   1.235 +D1F6                   Move 1 ID                        
   1.236 +D1F7                   Move 2 ID                        
   1.237 +D1F8                   Move 3 ID                        
   1.238  D1F9                   Move 4 ID
   1.239  D1FA                   /h   Pokemon 4 OT ID
   1.240  D1FB                   \l
   1.241 -D1FC                   /h				
   1.242 +D1FC                   /h                               
   1.243  D1FD                   |m   Pokemon 4 Experience Points
   1.244 -D1FE                   \l				
   1.245 +D1FE                   \l                               
   1.246  D1FF                   /h HP Stat Expeience
   1.247 -D200                   \l	  				
   1.248 +D200                   \l                                       
   1.249  D201                   /h Attack Stat Experience
   1.250 -D202                   \l	  				
   1.251 +D202                   \l                                       
   1.252  D203                   /h Defense Stat Experience
   1.253 -D204                   \l	  				
   1.254 +D204                   \l                                       
   1.255  D205                   /h Speed Stat Experience
   1.256 -D206                   \l	  				
   1.257 +D206                   \l                                       
   1.258  D207                   /h Special Stat Experience
   1.259 -D208                   \l				
   1.260 -D209                   Diversification -- Defense, Attack (HP)	
   1.261 -D20A                   Diversification -- Special, Speed (HP)	
   1.262 -D20B                   Current/Maximum PP Move 1		
   1.263 -D20C                   Current/Maximum PP Move 2		
   1.264 -D20D                   Current/Maximum PP Move 3		
   1.265 -D20E                   Current/Maximum PP Move 4		
   1.266 -D20F                   Current Level			
   1.267 +D208                   \l                               
   1.268 +D209                   Diversification -- Defense, Attack (HP)  
   1.269 +D20A                   Diversification -- Special, Speed (HP)   
   1.270 +D20B                   Current/Maximum PP Move 1                
   1.271 +D20C                   Current/Maximum PP Move 2                
   1.272 +D20D                   Current/Maximum PP Move 3                
   1.273 +D20E                   Current/Maximum PP Move 4                
   1.274 +D20F                   Current Level                    
   1.275  D210                   /h   Pokemon 4 Total Hit Points
   1.276 -D211                   \l				
   1.277 -D212                   /h   Pokemon 4 Attack      	
   1.278 -D213                   \l				
   1.279 -D214                   /h   Pokemon 4 Defense     	
   1.280 -D215                   \l				
   1.281 -D216                   /h   Pokemon 4 Speed       	
   1.282 -D217                   \l				
   1.283 -D218                   /h   Pokemon 4 Special     	
   1.284 +D211                   \l                               
   1.285 +D212                   /h   Pokemon 4 Attack            
   1.286 +D213                   \l                               
   1.287 +D214                   /h   Pokemon 4 Defense           
   1.288 +D215                   \l                               
   1.289 +D216                   /h   Pokemon 4 Speed             
   1.290 +D217                   \l                               
   1.291 +D218                   /h   Pokemon 4 Special           
   1.292  D219                   \l
   1.293  D21A                   Pokemon 5 Color Map
   1.294 -D21B                   /h				
   1.295 +D21B                   /h                               
   1.296  D21C                   \l Pokemon 5 Current Hit Points
   1.297 -D21D                   Unused 				
   1.298 -D21E                   Status				
   1.299 +D21D                   Unused                           
   1.300 +D21E                   Status                           
   1.301  D21F                   Type 1  (does not affect display)
   1.302 -D220                   Type 2  (does not affect display)	
   1.303 -D221                   Scratch Area 				
   1.304 -D222                   Move 1 ID 			
   1.305 -D223                   Move 2 ID  			
   1.306 -D224                   Move 3 ID  			
   1.307 +D220                   Type 2  (does not affect display)        
   1.308 +D221                   Scratch Area                             
   1.309 +D222                   Move 1 ID                        
   1.310 +D223                   Move 2 ID                        
   1.311 +D224                   Move 3 ID                        
   1.312  D225                   Move 4 ID
   1.313 -D226                   /h   Pokemon 5 OT ID		
   1.314 -D227                   \l				
   1.315 -D228                   /h				
   1.316 +D226                   /h   Pokemon 5 OT ID             
   1.317 +D227                   \l                               
   1.318 +D228                   /h                               
   1.319  D229                   |m   Pokemon 5 Experience Points
   1.320 -D22A                   \l				
   1.321 -D22B                   /h HP Stat Expeience		
   1.322 -D22C                   \l	  				
   1.323 +D22A                   \l                               
   1.324 +D22B                   /h HP Stat Expeience             
   1.325 +D22C                   \l                                       
   1.326  D22D                   /h Attack Stat Experience
   1.327 -D22E                   \l	  				
   1.328 +D22E                   \l                                       
   1.329  D22F                   /h Defense Stat Experience
   1.330 -D230                   \l	  				
   1.331 +D230                   \l                                       
   1.332  D231                   /h Speed Stat Experience
   1.333 -D232                   \l	  				
   1.334 +D232                   \l                                       
   1.335  D233                   /h Special Stat Experience
   1.336 -D234                   \l				
   1.337 +D234                   \l                               
   1.338  D235                   Diversification -- Defense, Attack (HP)
   1.339  D236                   Diversification -- Special, Speed (HP)
   1.340 -D237                   Current/Maximum PP Move 1		
   1.341 -D238                   Current/Maximum PP Move 2		
   1.342 -D239                   Current/Maximum PP Move 3		
   1.343 -D23A                   Current/Maximum PP Move 4		
   1.344 -D23B                   Current Level			
   1.345 +D237                   Current/Maximum PP Move 1                
   1.346 +D238                   Current/Maximum PP Move 2                
   1.347 +D239                   Current/Maximum PP Move 3                
   1.348 +D23A                   Current/Maximum PP Move 4                
   1.349 +D23B                   Current Level                    
   1.350  D23C                   /h   Pokemon 5 Total Hit Points
   1.351 -D23D                   \l				
   1.352 -D23E                   /h   Pokemon 5 Attack      	
   1.353 -D23F                   \l				
   1.354 -D240                   /h   Pokemon 5 Defense     	
   1.355 -D241                   \l				
   1.356 -D242                   /h   Pokemon 5 Speed       	
   1.357 -D243                   \l				
   1.358 -D244                   /h   Pokemon 5 Special     	
   1.359 +D23D                   \l                               
   1.360 +D23E                   /h   Pokemon 5 Attack            
   1.361 +D23F                   \l                               
   1.362 +D240                   /h   Pokemon 5 Defense           
   1.363 +D241                   \l                               
   1.364 +D242                   /h   Pokemon 5 Speed             
   1.365 +D243                   \l                               
   1.366 +D244                   /h   Pokemon 5 Special           
   1.367  D245                   \l
   1.368  D246                   Pokemon 6 Color Map
   1.369 -D247                   /h				
   1.370 +D247                   /h                               
   1.371  D248                   \l Pokemon 6 Current Hit Points
   1.372 -D249                   Unused 				
   1.373 -D24A                   Status				
   1.374 +D249                   Unused                           
   1.375 +D24A                   Status                           
   1.376  D24B                   Type 1  (does not affect display)
   1.377 -D24C                   Type 2  (does not affect display)	
   1.378 -D24D                   Scratch Area 				
   1.379 -D24E                   Move 1 ID 			
   1.380 -D24F                   Move 2 ID  			
   1.381 -D250                   Move 3 ID  			
   1.382 +D24C                   Type 2  (does not affect display)        
   1.383 +D24D                   Scratch Area                             
   1.384 +D24E                   Move 1 ID                        
   1.385 +D24F                   Move 2 ID                        
   1.386 +D250                   Move 3 ID                        
   1.387  D251                   Move 4 ID
   1.388 -D252                   /h   Pokemon 6 OT ID		
   1.389 -D253                   \l				
   1.390 -D254                   /h				
   1.391 +D252                   /h   Pokemon 6 OT ID             
   1.392 +D253                   \l                               
   1.393 +D254                   /h                               
   1.394  D255                   |m   Pokemon 6 Experience Points
   1.395 -D256                   \l				
   1.396 +D256                   \l                               
   1.397  D257                   /h HP Stat Expeience
   1.398 -D258                   \l	  				
   1.399 +D258                   \l                                       
   1.400  D259                   /h Attack Stat Experience
   1.401 -D25A                   \l	  				
   1.402 +D25A                   \l                                       
   1.403  D25B                   /h Defense Stat Experience
   1.404 -D25C                   \l	  				
   1.405 +D25C                   \l                                       
   1.406  D25D                   /h Speed Stat Experience
   1.407 -D25E                   \l	  				
   1.408 +D25E                   \l                                       
   1.409  D25F                   /h Special Stat Experience
   1.410 -D260                   \l				
   1.411 +D260                   \l                               
   1.412  D261                   Diversification -- Defense, Attack (HP)
   1.413  D262                   Diversification -- Special, Speed (HP)
   1.414 -D263                   Current/Maximum PP Move 1		
   1.415 -D264                   Current/Maximum PP Move 2		
   1.416 -D265                   Current/Maximum PP Move 3		
   1.417 -D266                   Current/Maximum PP Move 4		
   1.418 -D267                   Current Level			
   1.419 +D263                   Current/Maximum PP Move 1                
   1.420 +D264                   Current/Maximum PP Move 2                
   1.421 +D265                   Current/Maximum PP Move 3                
   1.422 +D266                   Current/Maximum PP Move 4                
   1.423 +D267                   Current Level                    
   1.424  D268                   /h   Pokemon 6 Total Hit Points
   1.425 -D269                   \l				
   1.426 -D26A                   /h   Pokemon 6 Attack      	
   1.427 -D26B                   \l				
   1.428 -D26C                   /h   Pokemon 6 Defense     	
   1.429 -D26D                   \l				
   1.430 -D26E                   /h   Pokemon 6 Speed       	
   1.431 -D26F                   \l				
   1.432 -D270                   /h   Pokemon 6 Special     	
   1.433 +D269                   \l                               
   1.434 +D26A                   /h   Pokemon 6 Attack            
   1.435 +D26B                   \l                               
   1.436 +D26C                   /h   Pokemon 6 Defense           
   1.437 +D26D                   \l                               
   1.438 +D26E                   /h   Pokemon 6 Speed             
   1.439 +D26F                   \l                               
   1.440 +D270                   /h   Pokemon 6 Special           
   1.441  D271                   \l
   1.442 -D272                    ---	
   1.443 -D273                   /	
   1.444 -D274                   |	
   1.445 -D275                   |	
   1.446 -D276                   |	
   1.447 +D272                    ---     
   1.448 +D273                   /        
   1.449 +D274                   |        
   1.450 +D275                   |        
   1.451 +D276                   |        
   1.452  D277                   |  OT pokemon 1
   1.453 -D278                   |	
   1.454 -D279                   |	
   1.455 -D27A                   |	
   1.456 -D27B                   \	
   1.457 +D278                   |        
   1.458 +D279                   |        
   1.459 +D27A                   |        
   1.460 +D27B                   \        
   1.461  D27C                    ---
   1.462 -D27D                    ---	
   1.463 -D27E                   /	
   1.464 -D27F                   |	
   1.465 -D280                   |	
   1.466 -D281                   |	
   1.467 +D27D                    ---     
   1.468 +D27E                   /        
   1.469 +D27F                   |        
   1.470 +D280                   |        
   1.471 +D281                   |        
   1.472  D282                   |  OT pokemon 2
   1.473 -D283                   |	
   1.474 -D284                   |	
   1.475 -D285                   |	
   1.476 -D286                   \	
   1.477 +D283                   |        
   1.478 +D284                   |        
   1.479 +D285                   |        
   1.480 +D286                   \        
   1.481  D287                    ---
   1.482 -D288                    ---	
   1.483 -D289                   /	
   1.484 -D28A                   |	
   1.485 -D28B                   |	
   1.486 -D28C                   |	
   1.487 +D288                    ---     
   1.488 +D289                   /        
   1.489 +D28A                   |        
   1.490 +D28B                   |        
   1.491 +D28C                   |        
   1.492  D28D                   |  OT pokemon 3
   1.493 -D28E                   |	
   1.494 -D28F                   |	
   1.495 -D290                   |	
   1.496 -D291                   \	
   1.497 +D28E                   |        
   1.498 +D28F                   |        
   1.499 +D290                   |        
   1.500 +D291                   \        
   1.501  D292                    ---
   1.502 -D293                    ---	
   1.503 -D294                   /	
   1.504 -D295                   |	
   1.505 -D296                   |	
   1.506 -D297                   |	
   1.507 +D293                    ---     
   1.508 +D294                   /        
   1.509 +D295                   |        
   1.510 +D296                   |        
   1.511 +D297                   |        
   1.512  D298                   |  OT pokemon 4
   1.513 -D299                   |	
   1.514 -D29A                   |	
   1.515 -D29B                   |	
   1.516 -D29C                   \	
   1.517 +D299                   |        
   1.518 +D29A                   |        
   1.519 +D29B                   |        
   1.520 +D29C                   \        
   1.521  D29D                    ---
   1.522 -D29E                    ---	
   1.523 -D29F                   /	
   1.524 -D2A0                   |	
   1.525 -D2A1                   |	
   1.526 -D2A2                   |	
   1.527 +D29E                    ---     
   1.528 +D29F                   /        
   1.529 +D2A0                   |        
   1.530 +D2A1                   |        
   1.531 +D2A2                   |        
   1.532  D2A3                   |  OT pokemon 5
   1.533 -D2A4                   |	
   1.534 -D2A5                   |	
   1.535 -D2A6                   |	
   1.536 -D2A7                   \	
   1.537 +D2A4                   |        
   1.538 +D2A5                   |        
   1.539 +D2A6                   |        
   1.540 +D2A7                   \        
   1.541  D2A8                    ---
   1.542 -D2A9                    ---	
   1.543 -D2AA                   /	
   1.544 -D2AB                   |	
   1.545 -D2AC                   |	
   1.546 -D2AD                   |	
   1.547 +D2A9                    ---     
   1.548 +D2AA                   /        
   1.549 +D2AB                   |        
   1.550 +D2AC                   |        
   1.551 +D2AD                   |        
   1.552  D2AE                   |  OT pokemon 6
   1.553 -D2AF                   |	
   1.554 -D2B0                   |	
   1.555 -D2B1                   |	
   1.556 -D2B2                   \	
   1.557 +D2AF                   |        
   1.558 +D2B0                   |        
   1.559 +D2B1                   |        
   1.560 +D2B2                   \        
   1.561  D2B3                    ---
   1.562 -D2B4                    ---	      	
   1.563 -D2B5                   /	      	
   1.564 -D2B6                   |	      	
   1.565 -D2B7                   |	      	
   1.566 -D2B8                   |	      	
   1.567 +D2B4                    ---             
   1.568 +D2B5                   /                
   1.569 +D2B6                   |                
   1.570 +D2B7                   |                
   1.571 +D2B8                   |                
   1.572  D2B9                   |  Pokemon 1 Name
   1.573 -D2BA                   |	      	
   1.574 -D2BB                   |	      	
   1.575 -D2BC                   |	      	
   1.576 -D2BD                   \	      	
   1.577 +D2BA                   |                
   1.578 +D2BB                   |                
   1.579 +D2BC                   |                
   1.580 +D2BD                   \                
   1.581  D2BE                    ---
   1.582 -D2BF                    ---	      	
   1.583 -D2C0                   /	      	
   1.584 -D2C1                   |	      	
   1.585 -D2C2                   |	      	
   1.586 -D2C3                   |	      	
   1.587 +D2BF                    ---             
   1.588 +D2C0                   /                
   1.589 +D2C1                   |                
   1.590 +D2C2                   |                
   1.591 +D2C3                   |                
   1.592  D2C4                   |  Pokemon 2 Name
   1.593 -D2C5                   |	      	
   1.594 -D2C6                   |	      	
   1.595 -D2C7                   |	      	
   1.596 -D2C8                   \	      	
   1.597 +D2C5                   |                
   1.598 +D2C6                   |                
   1.599 +D2C7                   |                
   1.600 +D2C8                   \                
   1.601  D2C9                    ---
   1.602 -D2CA                    ---	      	
   1.603 -D2CB                   /	      	
   1.604 -D2CC                   |	      	
   1.605 -D2CD                   |	      	
   1.606 -D2CE                   |	      	
   1.607 +D2CA                    ---             
   1.608 +D2CB                   /                
   1.609 +D2CC                   |                
   1.610 +D2CD                   |                
   1.611 +D2CE                   |                
   1.612  D2CF                   |  Pokemon 3 Name
   1.613 -D2D0                   |	      	
   1.614 -D2D1                   |	      	
   1.615 -D2D2                   |	      	
   1.616 -D2D3                   \	      	
   1.617 +D2D0                   |                
   1.618 +D2D1                   |                
   1.619 +D2D2                   |                
   1.620 +D2D3                   \                
   1.621  D2D4                    ---
   1.622 -D2D5                    ---	      	
   1.623 -D2D6                   /	      	
   1.624 -D2D7                   |	      	
   1.625 -D2D8                   |	      	
   1.626 -D2D9                   |	      	
   1.627 +D2D5                    ---             
   1.628 +D2D6                   /                
   1.629 +D2D7                   |                
   1.630 +D2D8                   |                
   1.631 +D2D9                   |                
   1.632  D2DA                   |  Pokemon 4 Name
   1.633 -D2DB                   |	      	
   1.634 -D2DC                   |	      	
   1.635 -D2DD                   |	      	
   1.636 -D2DE                   \	      	
   1.637 +D2DB                   |                
   1.638 +D2DC                   |                
   1.639 +D2DD                   |                
   1.640 +D2DE                   \                
   1.641  D2DF                    ---
   1.642 -D2E0                    ---	      	
   1.643 -D2E1                   /	      	
   1.644 -D2E2                   |	      	
   1.645 -D2E3                   |	      	
   1.646 -D2E4                   |	      	
   1.647 +D2E0                    ---             
   1.648 +D2E1                   /                
   1.649 +D2E2                   |                
   1.650 +D2E3                   |                
   1.651 +D2E4                   |                
   1.652  D2E5                   |  Pokemon 5 Name
   1.653 -D2E6                   |	      	
   1.654 -D2E7                   |	      	
   1.655 -D2E8                   |	      	
   1.656 -D2E9                   \	      	
   1.657 +D2E6                   |                
   1.658 +D2E7                   |                
   1.659 +D2E8                   |                
   1.660 +D2E9                   \                
   1.661  D2EA                    ---
   1.662 -D2EB                    ---	      	
   1.663 -D2EC                   /	      	
   1.664 -D2ED                   |	      	
   1.665 -D2EE                   |	      	
   1.666 -D2EF                   |	      	
   1.667 +D2EB                    ---             
   1.668 +D2EC                   /                
   1.669 +D2ED                   |                
   1.670 +D2EE                   |                
   1.671 +D2EF                   |                
   1.672  D2F0                   |  Pokemon 6 Name
   1.673 -D2F1                   |	      	
   1.674 -D2F2                   |	      	
   1.675 -D2F3                   |	      	
   1.676 -D2F4                   \	      	
   1.677 +D2F1                   |                
   1.678 +D2F2                   |                
   1.679 +D2F3                   |                
   1.680 +D2F4                   \                
   1.681  D2F5                    ---
   1.682  D2F6                   Pokedex Caught 1-8    
   1.683  D2F7                   Pokedex Caught 9-16   
   1.684 @@ -481,218 +481,219 @@
   1.685  D342                   Item 19 Quantity
   1.686  D343                   Item 20 Type    
   1.687  D344                   Item 20 Quantity
   1.688 -D345                   Item End-of-List Sentinel
   1.689 -D346                   /h (bcd) money
   1.690 -D347                   |m (bcd) money
   1.691 -D348                   \l (bcd) money
   1.692 -D349                   /
   1.693 -D34A                   |
   1.694 -D34B                   |
   1.695 -D34C                   |
   1.696 -D34D                   |   
   1.697 -D34E                   |   Rival's Name
   1.698 -D34F                   |
   1.699 -D350                   |
   1.700 -D351                   |
   1.701 -D352                   |
   1.702 -D353                   \
   1.703 -D354                   Text Speed
   1.704 -D355                   Badges
   1.705 -D356                   
   1.706 -D357                   
   1.707 -D358                   
   1.708 -D359                   
   1.709 -D35A                   
   1.710 -D35B                   
   1.711 -D35C                   
   1.712 -D35D                   BEGIN MAP DATA
   1.713 -D35E                   
   1.714 -D35F                   
   1.715 -D360                   
   1.716 -D361                   Player Offset X
   1.717 -D362                   Player Offset Y
   1.718 -D363                   
   1.719 -D364                   
   1.720 -D365                   
   1.721 -D366                   
   1.722 -D367                   
   1.723 -D368                   
   1.724 -D369                   
   1.725 -D36A                   
   1.726 -D36B                   
   1.727 -D36C                   
   1.728 +D345                   Item End-of-List Sentinel   T
   1.729 +D346                   /h (bcd) money              Q
   1.730 +D347                   |m (bcd) money              T
   1.731 +D348                   \l (bcd) money              Q
   1.732 +D349                   /                           T
   1.733 +D34A                   |                           Q
   1.734 +D34B                   |                           T
   1.735 +D34C                   |                           Q
   1.736 +D34D                   |                           T
   1.737 +D34E                   |   Rival's Name            Q
   1.738 +D34F                   |                           T
   1.739 +D350                   |                           Q
   1.740 +D351                   |                           T
   1.741 +D352                   |                           Q
   1.742 +D353                   \                           T
   1.743 +D354                   Text Speed                  Q
   1.744 +D355                   Badges                      T
   1.745 +D356                                               Q
   1.746 +D357                                               T
   1.747 +D358                                               Q
   1.748 +D359                                               T
   1.749 +D35A                                               Q
   1.750 +D35B                                               T
   1.751 +D35C                                               Q
   1.752 +D35D                   BEGIN MAP DATA              T
   1.753 +D35E                                               Q
   1.754 +D35F                                               T
   1.755 +D360                                               Q
   1.756 +D361                   Player Offset X             T
   1.757 +D362                   Player Offset Y             Q
   1.758 +D363                                               T
   1.759 +D364                                               Q
   1.760 +D365                                               T
   1.761 +D366                                               Q
   1.762 +D367                                               T
   1.763 +D368                                               Q
   1.764 +D369                                               T
   1.765 +D36A                                               Q
   1.766 +D36B                                               T
   1.767 +D36C                                               Q
   1.768  D36D                   /l  <<Map Function Address!>> the code at the
   1.769  D36E                   \h  stored location EXECUTED on map refresh!
   1.770 -D36F                   
   1.771 -D370                   
   1.772 -D371                   
   1.773 -D372                   
   1.774 -D373                   
   1.775 -D374                   
   1.776 -D375                   
   1.777 -D376                   
   1.778 -D377                   
   1.779 -D378                   
   1.780 -D379                   
   1.781 -D37A                   
   1.782 -D37B                   
   1.783 -D37C                   
   1.784 -D37D                   
   1.785 -D37E                   
   1.786 -D37F                   
   1.787 -D380                   
   1.788 -D381                   
   1.789 -D382                   
   1.790 -D383                   
   1.791 -D384                   
   1.792 -D385                   
   1.793 -D386                   
   1.794 -D387                   
   1.795 -D388                   
   1.796 -D389                   
   1.797 -D38A                   
   1.798 -D38B                   
   1.799 -D38C                   
   1.800 -D38D                   
   1.801 -D38E                   
   1.802 -D38F                   
   1.803 -D390                   
   1.804 -D391                   
   1.805 -D392                   
   1.806 -D393                   
   1.807 -D394                   
   1.808 -D395                   
   1.809 -D396                   
   1.810 -D397                   
   1.811 -D398                   
   1.812 -D399                   
   1.813 -D39A                   
   1.814 -D39B                   END MAP DATA
   1.815 -D39C                   
   1.816 -D39D                   
   1.817 -D39E                   
   1.818 -D39F                   
   1.819 -D3A0                   
   1.820 -D3A1                   
   1.821 -D3A2                   
   1.822 -D3A3                   
   1.823 -D3A4                   
   1.824 -D3A5                   
   1.825 -D3A6                   
   1.826 -D3A7                   
   1.827 -D3A8                   
   1.828 -D3A9                   
   1.829 -D3AA                   
   1.830 -D3AB                   
   1.831 -D3AC                   
   1.832 -D3AD                   
   1.833 -D3AE                   
   1.834 -D3AF                   
   1.835 -D3B0                   
   1.836 -D3B1                   
   1.837 -D3B2                   
   1.838 -D3B3                   
   1.839 -D3B4                   
   1.840 -D3B5                   
   1.841 -D3B6                   
   1.842 -D3B7                   
   1.843 -D3B8                   
   1.844 -D3B9                   
   1.845 -D3BA                   
   1.846 -D3BB                   
   1.847 -D3BC                   
   1.848 -D3BD                   
   1.849 -D3BE                   
   1.850 -D3BF                   
   1.851 -D3C0                   
   1.852 -D3C1                   
   1.853 -D3C2                   
   1.854 -D3C3                   
   1.855 -D3C4                   
   1.856 -D3C5                   
   1.857 -D3C6                   
   1.858 -D3C7                   
   1.859 -D3C8                   
   1.860 -D3C9                   
   1.861 -D3CA                   
   1.862 -D3CB                   
   1.863 -D3CC                   
   1.864 -D3CD                   
   1.865 -D3CE                   
   1.866 -D3CF                   
   1.867 -D3D0                   
   1.868 -D3D1                   
   1.869 -D3D2                   
   1.870 -D3D3                   
   1.871 -D3D4                   
   1.872 -D3D5                   
   1.873 -D3D6                   
   1.874 -D3D7                   
   1.875 -D3D8                   
   1.876 -D3D9                   
   1.877 -D3DA                   
   1.878 -D3DB                   
   1.879 -D3DC                   
   1.880 -D3DD                   
   1.881 -D3DE                   
   1.882 -D3DF                   
   1.883 -D3E0                   
   1.884 -D3E1                   
   1.885 -D3E2                   
   1.886 -D3E3                   
   1.887 -D3E4                   
   1.888 -D3E5                   
   1.889 -D3E6                   
   1.890 -D3E7                   
   1.891 -D3E8                   
   1.892 -D3E9                   
   1.893 -D3EA                   
   1.894 -D3EB                   
   1.895 -D3EC                   
   1.896 -D3ED                   
   1.897 -D3EE                   
   1.898 -D3EF                   
   1.899 -D3F0                   
   1.900 -D3F1                   
   1.901 -D3F2                   
   1.902 -D3F3                   
   1.903 -D3F4                   
   1.904 -D3F5                   
   1.905 -D3F6                   
   1.906 -D3F7                   
   1.907 -D3F8                   
   1.908 -D3F9                   
   1.909 -D3FA                   
   1.910 -D3FB                   
   1.911 -D3FC                   
   1.912 -D3FD                   
   1.913 -D3FE                   
   1.914 -D3FF                   
   1.915 -D400                   
   1.916 -D401                   
   1.917 -D402                   
   1.918 -D403                   
   1.919 -D404                   
   1.920 -D405                   
   1.921 -D406                   
   1.922 -D407                   
   1.923 -D408                   
   1.924 -D409                   
   1.925 -D40A                   
   1.926 -D40B                   
   1.927 -D40C                   
   1.928 -D40D                   
   1.929 -D40E                   
   1.930 -D40F                   
   1.931 -D410                   
   1.932 -D411                   
   1.933 -D412                   
   1.934 -D413                   
   1.935 -D414                   
   1.936 -D415                   
   1.937 -D416                   
   1.938 -D417                   
   1.939 -D418                   
   1.940 -D419                   
   1.941 -D41A                   
   1.942 -D41B                   
   1.943 \ No newline at end of file
   1.944 +D36F                                               T
   1.945 +D370                                               Q
   1.946 +D371                                               T
   1.947 +D372                                               Q
   1.948 +D373                                               T
   1.949 +D374                                               Q
   1.950 +D375                                               T
   1.951 +D376                                               Q
   1.952 +D377                                               T
   1.953 +D378                                               Q
   1.954 +D379                                               T
   1.955 +D37A                                               Q
   1.956 +D37B                                               T
   1.957 +D37C                                               Q
   1.958 +D37D                                               T
   1.959 +D37E                                               Q
   1.960 +D37F                                               T
   1.961 +D380                                               Q
   1.962 +D381                                               T
   1.963 +D382                                               Q
   1.964 +D383                                               T
   1.965 +D384                                               Q
   1.966 +D385                                               T
   1.967 +D386                                               Q
   1.968 +D387                                               T
   1.969 +D388                                               Q
   1.970 +D389                                               T
   1.971 +D38A                                               Q
   1.972 +D38B                                               T
   1.973 +D38C                                               Q
   1.974 +D38D                                               T
   1.975 +D38E                                               Q
   1.976 +D38F                                               T
   1.977 +D390                                               Q
   1.978 +D391                                               T
   1.979 +D392                                               Q
   1.980 +D393                                               T
   1.981 +D394                                               Q
   1.982 +D395                                               T
   1.983 +D396                                               Q
   1.984 +D397                                               T
   1.985 +D398                                               Q
   1.986 +D399                                               T
   1.987 +D39A                                               Q
   1.988 +D39B                   END MAP DATA                T
   1.989 +D39C                                               Q
   1.990 +D39D                                               T
   1.991 +D39E                                               Q
   1.992 +D39F                                               T
   1.993 +D3A0                                               Q
   1.994 +D3A1                                               T
   1.995 +D3A2                                               Q
   1.996 +D3A3                                               T
   1.997 +D3A4                                               Q
   1.998 +D3A5                                               T
   1.999 +D3A6                                               Q
  1.1000 +D3A7                                               T
  1.1001 +D3A8                                               Q
  1.1002 +D3A9                                               T
  1.1003 +D3AA                                               Q
  1.1004 +D3AB                                               T
  1.1005 +D3AC                                               Q
  1.1006 +D3AD                                               T
  1.1007 +D3AE                                               Q
  1.1008 +D3AF                                               T
  1.1009 +D3B0                                               Q
  1.1010 +D3B1                                               T
  1.1011 +D3B2                                               Q
  1.1012 +D3B3                                               T
  1.1013 +D3B4                                               Q
  1.1014 +D3B5                                               T
  1.1015 +D3B6                                               Q
  1.1016 +D3B7                                               T
  1.1017 +D3B8                                               Q
  1.1018 +D3B9                                               T
  1.1019 +D3BA                                               Q
  1.1020 +D3BB                                               T
  1.1021 +D3BC                                               Q
  1.1022 +D3BD                                               T
  1.1023 +D3BE                                               Q
  1.1024 +D3BF                                               T
  1.1025 +D3C0                                               Q
  1.1026 +D3C1                                               T
  1.1027 +D3C2                                               Q
  1.1028 +D3C3                                               T
  1.1029 +D3C4                                               Q
  1.1030 +D3C5                                               T
  1.1031 +D3C6                                               Q
  1.1032 +D3C7                                               T
  1.1033 +D3C8                                               Q
  1.1034 +D3C9                                               T
  1.1035 +D3CA                                               Q
  1.1036 +D3CB                                               T
  1.1037 +D3CC                                               Q
  1.1038 +D3CD                                               T
  1.1039 +D3CE                                               Q
  1.1040 +D3CF                                               T
  1.1041 +D3D0                                               Q
  1.1042 +D3D1                                               T
  1.1043 +D3D2                                               Q
  1.1044 +D3D3                                               T
  1.1045 +D3D4                                               Q
  1.1046 +D3D5                                               T
  1.1047 +D3D6                                               Q
  1.1048 +D3D7                                               T
  1.1049 +D3D8                                               Q
  1.1050 +D3D9                                               T
  1.1051 +D3DA                                               Q
  1.1052 +D3DB                                               T
  1.1053 +D3DC                                               Q
  1.1054 +D3DD                                               T
  1.1055 +D3DE                                               Q
  1.1056 +D3DF                                               T
  1.1057 +D3E0                                               Q
  1.1058 +D3E1                                               T
  1.1059 +D3E2                                               Q
  1.1060 +D3E3                                               T
  1.1061 +D3E4                                               Q
  1.1062 +D3E5                                               T
  1.1063 +D3E6                                               Q
  1.1064 +D3E7                                               T
  1.1065 +D3E8                                               Q
  1.1066 +D3E9                                               T
  1.1067 +D3EA                                               Q
  1.1068 +D3EB                                               T
  1.1069 +D3EC                                               Q
  1.1070 +D3ED                                               T
  1.1071 +D3EE                                               Q
  1.1072 +D3EF                                               T
  1.1073 +D3F0                                               Q
  1.1074 +D3F1                                               T
  1.1075 +D3F2                                               Q
  1.1076 +D3F3                                               T
  1.1077 +D3F4                                               Q
  1.1078 +D3F5                                               T
  1.1079 +D3F6                                               Q
  1.1080 +D3F7                                               T
  1.1081 +D3F8                                               Q
  1.1082 +D3F9                                               T
  1.1083 +D3FA                                               Q
  1.1084 +D3FB                                               T
  1.1085 +D3FC                                               Q
  1.1086 +D3FD                                               T
  1.1087 +D3FE                                               Q
  1.1088 +D3FF                                               T
  1.1089 +D400                                               Q
  1.1090 +D401                                               T
  1.1091 +D402                                               Q
  1.1092 +D403                                               T
  1.1093 +D404                                               Q
  1.1094 +D405                                               T
  1.1095 +D406                                               Q
  1.1096 +D407                                               T
  1.1097 +D408                                               Q
  1.1098 +D409                                               T
  1.1099 +D40A                                               Q
  1.1100 +D40B                                               T
  1.1101 +D40C                                               Q
  1.1102 +D40D                                               T
  1.1103 +D40E                                               Q
  1.1104 +D40F                                               T
  1.1105 +D410                                               Q
  1.1106 +D411                                               T
  1.1107 +D412                                               Q
  1.1108 +D413                                               T
  1.1109 +D414                                               Q
  1.1110 +D415                                               T
  1.1111 +D416                                               Q
  1.1112 +D417                                               T
  1.1113 +D418                                               Q
  1.1114 +D419                                               T
  1.1115 +D41A                                               Q
  1.1116 +D41B                                               T
  1.1117 +                                                   
  1.1118 \ No newline at end of file
     2.1 --- a/clojure/com/aurellem/exp/item_bridge.clj	Sat Mar 24 18:21:16 2012 -0500
     2.2 +++ b/clojure/com/aurellem/exp/item_bridge.clj	Sat Mar 24 20:06:25 2012 -0500
     2.3 @@ -79,9 +79,6 @@
     2.4          map-function-address-start
     2.5          [0xD3 0x1D]))))
     2.6         
     2.7 -
     2.8 -
     2.9 -
    2.10  (defn-memo corrupt-moves []
    2.11    (concat
    2.12     (first
    2.13 @@ -104,8 +101,6 @@
    2.14       (advance [] [:a])
    2.15       (advance [:a] [:a :start])))
    2.16     [[]]))
    2.17 -  
    2.18 -
    2.19  
    2.20  (defn corrupt
    2.21    "enter the codes to destroy the
    2.22 @@ -119,10 +114,13 @@
    2.23  (defn mid-game-corrupt []
    2.24    (read-state "corrupt-mid-game"))
    2.25  
    2.26 +(defn gen-start-game-corrupt []
    2.27 +  (->> (finish-title)
    2.28 +       (advance [:b] [:a :b :start])
    2.29 +       (play-moves (corrupt-moves))))
    2.30  
    2.31 -     
    2.32 -
    2.33 -
    2.34 +(defn start-game-corrupt []
    2.35 +  (read-state "corrupt-start-game"))
    2.36  
    2.37  (defn test-memory-fun [n]
    2.38    (capture-program-counter
    2.39 @@ -197,4 +195,22 @@
    2.40      (trampoline-assembly (menu-open-state)))
    2.41     (set-memory-range 
    2.42      memory-function-address-start
    2.43 -    insertion-address-bits))))
    2.44 \ No newline at end of file
    2.45 +    insertion-address-bits))))
    2.46 +
    2.47 +
    2.48 +
    2.49 +;;map-functions
    2.50 +
    2.51 +;; Room, Upstairs        0xBO 0x40
    2.52 +;; Room, Downstairs      0x02 0x41
    2.53 +;; Pallet Town           0xFA 0x4D
    2.54 +;; Rival's House         0x3B 0x5C
    2.55 +;; Oak's Lab             0x92 0x43
    2.56 +;; Route 1               0x58 0x43
    2.57 +;; Viridian City         0x2A 0x50
    2.58 +;; Viridian PkmnCenter   0x5D 0x42
    2.59 +;; Viridian Mart         0x7A 0x4C
    2.60 +;; Viridian House #1     0x79 0x4D
    2.61 +;; Viridian House #2     0xD3 0x4D
    2.62 +;; Route 22              0xB3 0x4E
    2.63 +;; League Front Gate     0x8D 0x5F
    2.64 \ No newline at end of file
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/clojure/com/aurellem/exp/map-functions.txt	Sat Mar 24 20:06:25 2012 -0500
     3.3 @@ -0,0 +1,15 @@
     3.4 +map-functions
     3.5 +
     3.6 +Room, Upstairs        0xBO 0x40
     3.7 +Room, Downstairs      0x02 0x41
     3.8 +Pallet Town           0xFA 0x4D
     3.9 +Rival's House         0x3B 0x5C
    3.10 +Oak's Lab             0x92 0x43
    3.11 +Route 1               0x58 0x43
    3.12 +Viridian City         0x2A 0x50
    3.13 +Viridian PkmnCenter   0x5D 0x42
    3.14 +Viridian Mart         0x7A 0x4C
    3.15 +Viridian House #1     0x79 0x4D
    3.16 +Viridian House #2     0xD3 0x4D
    3.17 +Route 22              0xB3 0x4E
    3.18 +League Front Gate     0x8D 0x5F
     4.1 --- a/clojure/com/aurellem/gb/characters.clj	Sat Mar 24 18:21:16 2012 -0500
     4.2 +++ b/clojure/com/aurellem/gb/characters.clj	Sat Mar 24 20:06:25 2012 -0500
     4.3 @@ -14,10 +14,7 @@
     4.4     :off-turn-pokemon [0x59]
     4.5     :your-pokemon [0x01 0x08 0xD0 0x0]
     4.6     :opponent-pokemon [0x50 0x01 0xD9 0xCF 0x0]
     4.7 -
     4.8     :n-times [0x50 0x09 0x05 0xCD 0x11 0x0]
     4.9 -   
    4.10 -   
    4.11     })
    4.12  
    4.13  
     5.1 --- a/clojure/com/aurellem/gb/pokedex.clj	Sat Mar 24 18:21:16 2012 -0500
     5.2 +++ b/clojure/com/aurellem/gb/pokedex.clj	Sat Mar 24 20:06:25 2012 -0500
     5.3 @@ -10,14 +10,14 @@
     5.4    (+ (if capture?
     5.5         pokedex-captured-start-address
     5.6         pokedex-seen-start-address)
     5.7 -     (int (/ (dec species-num) 8))))
     5.8 +     (int (/  (dec species-num) 8))))
     5.9    
    5.10  (defn read-pokedex
    5.11    ([^SaveState state capture? species-num]
    5.12       (bit-test
    5.13        (aget (memory state)
    5.14              (pokedex-offset capture? species-num))
    5.15 -      (rem species-num 8))))
    5.16 +      (rem (dec species-num) 8))))
    5.17  
    5.18  (defn set-pokedex
    5.19    ([^SaveState state capture? set? species-num]
    5.20 @@ -75,9 +75,9 @@
    5.21         (map #(.toUpperCase (.substring (str %) 1))
    5.22              (map pokedex-num->species-name (range 1 152)))
    5.23         (map #(if % "   X   " "       ")
    5.24 -            (map read-pokedex-seen (range 152)))
    5.25 +            (map read-pokedex-seen (range 1 152)))
    5.26         (map #(if % "   X   " "       ")
    5.27 -            (map read-pokedex-captured (range 152)))))
    5.28 +            (map read-pokedex-captured (range 1 152)))))
    5.29       (println "+-----------+-------+-------+"))
    5.30    ([] (print-pokedex @current-state)))
    5.31  
     6.1 --- a/clojure/com/aurellem/gb/pokemon_presets.clj	Sat Mar 24 18:21:16 2012 -0500
     6.2 +++ b/clojure/com/aurellem/gb/pokemon_presets.clj	Sat Mar 24 20:06:25 2012 -0500
     6.3 @@ -13,4 +13,34 @@
     6.4      :speed-exp 0xFFFF
     6.5      :special-exp 0xFFFF}
     6.6     :moves [:fly :surf :cut :strength]})
     6.7 -   
     6.8 \ No newline at end of file
     6.9 +
    6.10 +(def ideal-pikachu
    6.11 +  {:species :pikachu
    6.12 +   :ID 5195
    6.13 +   :original-trainer "RLM"
    6.14 +
    6.15 +   :dv
    6.16 +   {:hp 15
    6.17 +    :attack 15
    6.18 +    :defense 15
    6.19 +    :speed 15
    6.20 +    :special 15}
    6.21 +   
    6.22 +   :experience
    6.23 +   {:main-exp 20
    6.24 +    :hp-exp 0xFFFF
    6.25 +    :attack-exp 0xFFFF
    6.26 +    :defense-exp 0xFFFF
    6.27 +    :speed-exp 0xFFFF
    6.28 +    :special-exp 0xFFFF}
    6.29 +
    6.30 +   :stats
    6.31 +   {:level 2
    6.32 +    :current-hp 15
    6.33 +    :hp 15
    6.34 +    :attack 9
    6.35 +    :defense 8
    6.36 +    :speed 10
    6.37 +    :special 8}
    6.38 +
    6.39 +   :moves [:thundershock :growl :surf]})
     7.1 --- a/clojure/com/aurellem/gb/saves.clj	Sat Mar 24 18:21:16 2012 -0500
     7.2 +++ b/clojure/com/aurellem/gb/saves.clj	Sat Mar 24 20:06:25 2012 -0500
     7.3 @@ -2,7 +2,14 @@
     7.4    (:use (com.aurellem.gb gb-driver))
     7.5    (:import [com.aurellem.gb.gb_driver SaveState]))
     7.6  
     7.7 -(defn pre-wild-battle [] (read-state "prepare-for-battle"))
     7.8 +(defn pre-wild-battle []
     7.9 +  (read-state "prepare-for-battle"))
    7.10  
    7.11  (defn pre-trainer-battle []
    7.12 -  (read-state "pre-trainer-battle"))
    7.13 \ No newline at end of file
    7.14 +  (read-state "pre-trainer-battle"))
    7.15 +
    7.16 +(defn rlm-pallet-town []
    7.17 +  (read-state "rlm-pallet-town"))
    7.18 +
    7.19 +
    7.20 +
     8.1 Binary file save-states/corrupt-start-game.sav has changed
     9.1 Binary file save-states/rlm-pallet-town.sav has changed
    10.1 Binary file save-states/rlm-prepare-pikachu.sav has changed