IIMarckus 
							
						 
						
							
							
							
							
								
							
							
								7f8974dab5 
								
							 
						 
						
							
							
								
								Merge  https://github.com/yenatch/pokered  
							
							 
							
							... 
							
							
							
							Conflicts:
	main.asm 
							
						 
						
							2014-04-06 08:52:55 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								46164d4d47 
								
							 
						 
						
							
							
								
								combine audio and music folders  
							
							 
							
							
							
						 
						
							2014-04-06 09:51:22 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								391bbad29e 
								
							 
						 
						
							
							
								
								A little more map name consistency  
							
							 
							
							
							
						 
						
							2014-04-06 09:33:02 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								fc4213813e 
								
							 
						 
						
							
							
								
								Accidentally added a second minimize graphic.  
							
							 
							
							
							
						 
						
							2014-04-05 21:26:34 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								c5813528f8 
								
							 
						 
						
							
							
								
								Image handling in the makefile.  
							
							 
							
							
							
						 
						
							2014-04-05 17:01:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								05c58eaa70 
								
							 
						 
						
							
							
								
								Fix tile padding for house and ship_port tileset graphics.  
							
							 
							
							
							
						 
						
							2014-04-05 16:53:25 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								b8a4f91b84 
								
							 
						 
						
							
							
								
								Add *.1bpp, *.2bpp, *.pic to .gitignore.  
							
							 
							
							... 
							
							
							
							These are now generated by the build. 
							
						 
						
							2014-04-05 16:48:03 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								666a5374ff 
								
							 
						 
						
							
							
								
								Remove "globals.asm" from .gitignore.  
							
							 
							
							... 
							
							
							
							globals.asm is no longer part of the build, is not generated, does not exist at all. 
							
						 
						
							2014-04-05 16:46:39 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								01888c742d 
								
							 
						 
						
							
							
								
								Convert pngs in gfx/ to 1bpp and 2bpp.  
							
							 
							
							... 
							
							
							
							All graphics are now png.
Some files were split out of necessity:
- gfx/trade.2bpp -> gfx/game_boy.norepeat.png gfx/link_cable.png
- gfx/red/introfight.2bpp -> gfx/red/intro_nido_{1,2,3}.6x6.png
- gfx/blue/introfight.2bpp -> gfx/blue/intro_purin_{1,2,3}.6x6.png 
							
						 
						
							2014-04-05 16:41:36 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								f8452ebeb8 
								
							 
						 
						
							
							
								
								Use dimension constants in warp data and add map name consisntency  
							
							 
							
							
							
						 
						
							2014-04-05 10:47:23 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								ade6194359 
								
							 
						 
						
							
							
								
								Replace .pic with .png.  
							
							 
							
							... 
							
							
							
							Compression is 1:1, so they're interchangeable.
The drawback is this inflates the first build time.
We've agreed that this is worth having pngs out of the box. 
							
						 
						
							2014-04-04 23:13:09 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								0c8b9e5222 
								
							 
						 
						
							
							
								
								"Fix" name indentation in credits.  
							
							 
							
							... 
							
							
							
							This appears to have taken advantage of number chars being -10 through -1.
By adding to the middle of the screen, a number char could represent the number of tiles to indent.
Or not, which is why this commit exists. 
							
						 
						
							2014-04-04 00:33:41 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								fc29a55d1e 
								
							 
						 
						
							
							
								
								Another bank.  
							
							 
							
							
							
						 
						
							2014-04-04 00:12:32 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								16c4f5756f 
								
							 
						 
						
							
							
								
								More tileset constants.  
							
							 
							
							
							
						 
						
							2014-04-04 00:12:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								868671dafa 
								
							 
						 
						
							
							
								
								Tileset constants in the wild.  
							
							 
							
							
							
						 
						
							2014-04-03 23:58:04 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								8a106a2c61 
								
							 
						 
						
							
							
								
								Name the tilesets and give them constants.  
							
							 
							
							... 
							
							
							
							Also clean up the tileset macro and remove placeholders/redundant files. 
							
						 
						
							2014-04-03 22:46:39 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								56a3115141 
								
							 
						 
						
							
							
								
								Reference more static banks.  
							
							 
							
							
							
						 
						
							2014-04-02 12:47:49 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								8039c8db78 
								
							 
						 
						
							
							
								
								Japanese character conversion tables.  
							
							 
							
							
							
						 
						
							2014-04-02 02:17:41 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								134fe3b439 
								
							 
						 
						
							
							
								
								More Red pic labels and misc constants.  
							
							 
							
							... 
							
							
							
							Also correct erroneous label "Unknown_72ede". 
							
						 
						
							2014-04-02 02:17:01 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								0d51959c83 
								
							 
						 
						
							
							
								
								Use labels instead of static addresses in sound pointers.  
							
							 
							
							... 
							
							
							
							Static address substraction would wreak havoc in other memory configurations. 
							
						 
						
							2014-03-30 16:56:42 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								ebce80653c 
								
							 
						 
						
							
							
								
								Stop using [$ff00+$xx] syntax.  
							
							 
							
							... 
							
							
							
							rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c, 
							
						 
						
							2014-03-30 16:30:30 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								5e692b30db 
								
							 
						 
						
							
							
								
								Remove the last "\@"s on local labels.  
							
							 
							
							
							
						 
						
							2014-03-30 16:11:47 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								463b95b6b5 
								
							 
						 
						
							
							
								
								Yet another static rom address (Tset15_Coll)  
							
							 
							
							
							
						 
						
							2014-03-30 16:10:23 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								e5c8c8d3f0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into master  
							
							 
							
							
							
						 
						
							2014-03-29 22:54:04 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								caf92984d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'huderlem/master' into master  
							
							 
							
							... 
							
							
							
							Conflicts:
	main.asm 
							
						 
						
							2014-03-29 22:51:57 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								da67a699c5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'danny/master' into master  
							
							 
							
							
							
						 
						
							2014-03-29 22:40:02 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								017870daed 
								
							 
						 
						
							
							
								
								Merge pull request  #37  from Lin20/master  
							
							 
							
							... 
							
							
							
							ledge tiles documented 
							
						 
						
							2014-03-27 02:08:41 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								Lin 
							
						 
						
							
							
							
							
								
							
							
								3e0d3ce5cb 
								
							 
						 
						
							
							
								
								ledge tiles documented  
							
							 
							
							
							
						 
						
							2014-03-26 22:48:45 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								Marcus Huderle 
							
						 
						
							
							
							
							
								
							
							
								14dbeb36b0 
								
							 
						 
						
							
							
								
								Removed hardcoded address. Labeled a few functions.  
							
							 
							
							
							
						 
						
							2014-02-20 11:55:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								54623151e4 
								
							 
						 
						
							
							
								
								Install: Command Line Tools for Xcode instead of the larger Xcode.  
							
							 
							
							
							
						 
						
							2014-02-14 21:57:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								b1b084334c 
								
							 
						 
						
							
							
								
								Let rgbasm handle undefined version constants.  
							
							 
							
							
							
						 
						
							2014-02-14 19:35:38 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								1439ba6f2a 
								
							 
						 
						
							
							
								
								audio: Include all constants  
							
							 
							
							
							
						 
						
							2014-02-14 19:34:42 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								d0b7dee9e9 
								
							 
						 
						
							
							
								
								Makefile: Don't group redrle with phony targets  
							
							 
							
							
							
						 
						
							2014-02-14 00:19:16 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								3e8d8e930b 
								
							 
						 
						
							
							
								
								make compare: Use md5sum -c instead of comparing a base rom  
							
							 
							
							
							
						 
						
							2014-02-14 00:17:02 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								d4c563c4a3 
								
							 
						 
						
							
							
								
								Rom checksums for use with md5sum -c  
							
							 
							
							
							
						 
						
							2014-02-14 00:11:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								b159712346 
								
							 
						 
						
							
							
								
								Makefile: nothing uses the ALL_DEPENDENCIES variable.  
							
							 
							
							
							
						 
						
							2014-02-14 00:08:31 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								4af544b9e0 
								
							 
						 
						
							
							
								
								Makefile: fix a syntax error in redrle  
							
							 
							
							
							
						 
						
							2014-02-14 00:07:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								205c475191 
								
							 
						 
						
							
							
								
								Consolidate rgbfix options between Red and Blue.  
							
							 
							
							... 
							
							
							
							Yellow and JP roms will take different options, but this is good for now. 
							
						 
						
							2014-02-14 00:05:01 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								89b7957556 
								
							 
						 
						
							
							
								
								No more init.sh  
							
							 
							
							
							
						 
						
							2014-02-13 22:35:30 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								43342f1376 
								
							 
						 
						
							
							
								
								Rewrite the install instructions without init.sh.  
							
							 
							
							... 
							
							
							
							Cygwin instructions return. 
							
						 
						
							2014-02-13 22:34:52 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								8f1b7acd3c 
								
							 
						 
						
							
							
								
								Readme: Builds both Red and Blue.  
							
							 
							
							
							
						 
						
							2014-02-13 03:04:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								0192edb8ad 
								
							 
						 
						
							
							
								
								Install: Refer to pokeblue.gbc by its filename.  
							
							 
							
							
							
						 
						
							2014-02-13 03:02:19 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								4ddba9774e 
								
							 
						 
						
							
							
								
								Replace hardcoded song ids  
							
							 
							
							
							
						 
						
							2014-02-02 12:03:41 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								ed4ac6d551 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/iimarckus/pokered  
							
							 
							
							... 
							
							
							
							Conflicts:
	main.asm 
							
						 
						
							2014-02-01 08:46:53 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								Marcus Huderle 
							
						 
						
							
							
							
							
								
							
							
								38435ee672 
								
							 
						 
						
							
							
								
								Labeled Battle Center and Trade Center constants.  
							
							 
							
							
							
						 
						
							2014-01-29 14:39:44 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								U-Fish-PC\Daniel 
							
						 
						
							
							
							
							
								
							
							
								71d31fee0e 
								
							 
						 
						
							
							
								
								Fix BookshelfTileIDs format  
							
							 
							
							
							
						 
						
							2014-01-28 09:06:26 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								b48435bb26 
								
							 
						 
						
							
							
								
								Makefile: condense dependency scanning into one loop  
							
							 
							
							
							
						 
						
							2014-01-27 17:27:37 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								c49dd99a98 
								
							 
						 
						
							
							
								
								Split wram.asm from poke{red,blue}.o into wram.o  
							
							 
							
							... 
							
							
							
							wram.asm still defines some constants. They're moved into constants/wram_constants.asm. 
							
						 
						
							2014-01-27 17:09:09 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								2b961ceaf4 
								
							 
						 
						
							
							
								
								Clean up makefile messages and prerequisite handling  
							
							 
							
							
							
						 
						
							2014-01-27 16:37:16 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
							
								 
								yenatch 
							
						 
						
							
							
							
							
								
							
							
								1b9ee46af9 
								
							 
						 
						
							
							
								
								Get rid of globals.asm. Use ::s to export labels between objects.  
							
							 
							
							... 
							
							
							
							globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary
This speeds up build time by at least a third. 
							
						 
						
							2014-01-27 16:24:13 -05:00