Commit Graph

2441 Commits

Author SHA1 Message Date
Bryan Bishop
608fdac82c Merge pull request #246 from yenatch/master
Some intro comments and more bank 38/39 incbins.
2014-04-14 10:52:57 -05:00
yenatch
992a9e506c Rough intro comments and palettes. 2014-04-14 03:37:50 -04:00
yenatch
b8cd97f943 Incbins and jumptables in bank 38 (slots, cards, PC). 2014-04-13 18:30:39 -04:00
Bryan Bishop
27ec064056 Merge pull request #245 from yenatch/master
Picking off small incbins and static labels.
2014-04-13 11:36:28 -05:00
yenatch
1fd39f7fb9 Item usage strings and misc labels. 2014-04-13 02:06:22 -04:00
yenatch
113dd395d2 Include palette 0 in PokemonPalettes.
Now PokemonPalettes is referenced.
2014-04-13 00:03:21 -04:00
yenatch
266087909b Assorted labels, incbins, text, graphics, etc. 2014-04-13 00:02:26 -04:00
yenatch
f66f4d51c7 Replace static bank 0 calls in the event scripting engine. 2014-04-12 15:45:40 -04:00
yenatch
d9c5c2c55b Boxes, trading, assorted incbins. 2014-04-12 15:45:19 -04:00
Bryan Bishop
0b0db14435 Merge pull request #244 from yenatch/drumkit
Magnet Train and drumkits.
2014-04-10 20:49:11 -05:00
yenatch
5097747404 Anonymous jumptables and sfx in bank 23. 2014-04-10 21:31:56 -04:00
yenatch
6045c560ad Magnet Train data. 2014-04-10 21:31:56 -04:00
yenatch
4b9563d026 Field effect data and sound effects. 2014-04-10 21:31:56 -04:00
yenatch
3848af8e0e Better labels for drumkits.
Also use noise commands for instruments.
2014-04-10 21:31:55 -04:00
Bryan Bishop
ebdf9f46e3 Merge pull request #243 from yenatch/master
Fix bank 1. Found a scrapped title screen.
2014-04-10 20:22:54 -05:00
yenatch
93cbbaf49d Unused title screen code, graphics, tilemaps, palettes.
At 43:4000 (UnusedTitleScreen) is a semi-functional title screen.
It's never used, and appears in the Japanese version at the same offset.

Notably, a portion of the logo is cut out and used as OAM.
The final title screen instead uses BG priority to avoid this.
2014-04-10 15:53:09 -04:00
yenatch
0eb49d5941 Fix a title screen label that accidentally made its way into bank 1.
Somehow, a title screen (bank 0x43) function had its label put in bank 1.
This caused changes to either bank to break the compiled rom.

fixes 61a3d145
2014-04-09 18:27:29 -04:00
Bryan Bishop
7c1a08b346 Merge pull request #242 from yenatch/master
Redone graphics handling and renamed pics.
2014-04-02 09:51:13 -05:00
yenatch
5153360215 Rename trainer pics to use names instead of ids. 2014-04-02 01:34:14 -04:00
yenatch
f68b3dc8ed Image extensions for trainers. 2014-04-02 01:01:11 -04:00
yenatch
850ade2f41 Image extensions in battle animation graphics. 2014-04-02 00:47:22 -04:00
yenatch
d29fb5d207 Image extensions in gfx/tilesets. 2014-04-02 00:45:07 -04:00
yenatch
73ffc4677a Image extensions in gfx/{intro,title}. 2014-04-02 00:41:56 -04:00
yenatch
6a66f28bf5 Fix image extensions in gfx/{credits,misc}. 2014-04-02 00:16:03 -04:00
yenatch
49987a7527 A couple more EvosAttacks references. 2014-04-01 17:37:42 -04:00
yenatch
48f4314854 Move monster pics from numbered directories to named ones. 2014-04-01 16:30:38 -04:00
yenatch
1aa75da4d5 Monster pic dimensions in filenames.
While we're here, add the .2bpp root extension too.
2014-04-01 12:44:15 -04:00
yenatch
6122490cc3 Simple graphics handling in the makefile.
Two-way conversion invokes circular dependency warnings, and is outside the scope of the build.
Now it's one-way.
2014-03-31 21:20:42 -04:00
yenatch
8f67227209 Bump pokemontools for gfx handling. 2014-03-31 20:50:23 -04:00
Bryan Bishop
3e81c5eda7 Merge pull request #241 from yenatch/cygwin
Bring back Cygwin instructions and get rid of init.sh
2014-03-08 10:24:46 -06:00
yenatch
77d1d312b0 Clean up the readme again. 2014-03-08 10:59:53 -05:00
yenatch
4a1997ea93 Return of Cygwin (also drop init.sh)
Git requires packages `libsasl2` and `ca-certificates` to work with submodules and https respectively.
Cygwin doesn't install these when installing git. This seems to be the cause of most issues for Cygwin users.
2014-03-08 10:54:11 -05:00
Bryan Bishop
d7166960f8 Merge pull request #240 from yenatch/text
text macros
2014-03-08 08:21:26 -06:00
yenatch
4517ed2e30 Use the "page" text macro in Pokedex entries. 2014-03-07 21:46:33 -05:00
Bryan Bishop
69b20fa83e Merge pull request #239 from yenatch/incbins
Growth rates and misc incbin labels.
2014-03-07 00:01:23 -06:00
yenatch
13d13263af Text macros in move and item descriptions. 2014-03-06 00:58:15 -05:00
yenatch
6062ee0900 Text macros in Pokedex entries. 2014-03-06 00:46:01 -05:00
yenatch
fd6cfc73ee Text macros in text/. 2014-03-06 00:45:28 -05:00
yenatch
e703b5ef48 Text macros in maps/.
Looks fine at a glance.
2014-03-06 00:29:44 -05:00
yenatch
bdbf38b072 Text macros in main.asm.
So far so good.
2014-03-06 00:29:22 -05:00
yenatch
34d7cbb8b7 Text macros.
UnknownText_0x1aa0dc: ; 0x1aa0dc
	db $0, "Nihihi! This GYM", $4f
	db "is great! Only", $51
	db "girls are allowed", $4f
	db "here!", $57
; 0x1aa115

is now

UnknownText_0x1aa0dc: ; 0x1aa0dc
	text "Nihihi! This GYM"
	line "is great! Only"
	para "girls are allowed"
	line "here!"
	done
; 0x1aa115
2014-03-05 22:49:09 -05:00
yenatch
1fe2560a36 Growth rate data. 2014-03-05 06:11:52 -05:00
yenatch
c0e07f5e5d Items and dolls bought by Mom. 2014-03-05 04:32:35 -05:00
yenatch
6856667b36 Magnemite and Magneton handling in the Time Machine. 2014-03-05 02:45:33 -05:00
yenatch
d952b5c3eb Label more graphics in bank 3e. 2014-03-05 02:43:08 -05:00
yenatch
6fddb8ba85 Use struct macros for audio channels in wram. 2014-03-04 21:41:30 -05:00
Bryan Bishop
c1f18c79b8 Merge pull request #238 from yenatch/incbins
Pokedex and some mobile link location names.
2014-03-04 09:17:17 -06:00
yenatch
3453e7ce9c Label a stats screen jumptable. 2014-03-04 06:21:22 -05:00
yenatch
47bb5ff1ab Strings in bank 12.
This was a mistake.
2014-03-04 06:18:36 -05:00
yenatch
e4f142191b Some animation and sprite data in bank 11. 2014-03-04 05:32:18 -05:00