Commit graph

601 commits

Author SHA1 Message Date
yenatch b36f793667 Use macros for predef calls/jumps instead of static ids. 2014-06-16 13:57:26 -07:00
yenatch d10108a066 Use macros to define predefs. 2014-06-16 13:25:46 -07:00
yenatch 35f2bb90d4 Rename predef functions so they aren't excessive in length.
This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
2014-06-16 13:03:05 -07:00
yenatch 38ac74f222 Remove generated "indirect jump" comments.
The destination is obvious when using the predef macro.
2014-06-16 11:37:36 -07:00
yenatch 53ae0e93fa Use monster struct macros in wram. Rename related labels for consistency. 2014-06-14 04:12:40 -07:00
yenatch 80f7845a07 Explicit sections for pics, sprites and misc graphics. 2014-05-31 12:51:14 -07:00
yenatch b32abf1f16 Split out joypad code from main.asm. 2014-05-31 12:25:40 -07:00
yenatch 188ac8a9b4 Remove redundant dimensions in image filenames. 2014-05-30 01:30:10 -07:00
yenatch da0a72cdbf Use VRAM constants where applicable. 2014-05-29 01:31:46 -07:00
yenatch 40c17c906b Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".

Label overleads are still an issue.
2014-05-26 22:04:39 -07:00
yenatch 6c94ac1248 Recomment LoadMonData_. 2014-05-25 21:53:02 -07:00
yenatch 41906725d0 Split out item fragment code. 2014-05-25 19:53:43 -07:00
yenatch db569956ef Split out overworld object movement. 2014-05-25 19:53:43 -07:00
yenatch f6038a3d52 Try to clean up PrepareOAMData. 2014-05-25 19:53:15 -07:00
yenatch 5a14234b49 Split out map sprite facing data. 2014-05-25 19:16:54 -07:00
yenatch 4be11293e5 Label BCD math predefs. 2014-05-25 17:27:02 -07:00
yenatch bba8405992 Rename GetJoypadState -> Joypad. 2014-05-25 11:21:48 -07:00
yenatch 031e33957d Rename joypad registers. 2014-05-25 10:53:09 -07:00
yenatch 1ee8de792b Move bank 0 into home.asm. 2014-05-25 10:26:42 -07:00
yenatch d307c85499 Clean up some bank 3 functions and rename flag action functions. 2014-05-25 10:09:39 -07:00
yenatch cdd34eb45b Use global labels for pics. 2014-05-24 21:01:59 -07:00
yenatch 64da5118df Organize file includes in banks 4 through 1e. 2014-05-24 19:57:50 -07:00
yenatch 7911bc1309 Rename engine/rng.asm to engine/random.asm. 2014-05-24 11:44:12 -07:00
yenatch 64479cd642 Rename random number function and hram labels.
GenRandom -> Random
GenRandomInBattle -> BattleRandom
H_RAND1 -> hRandomAdd
H_RAND2 -> hRandomSub
2014-05-24 11:40:38 -07:00
yenatch 8f8281fe6e Comment some more bank 0 functions. 2014-05-23 15:34:35 -07:00
yenatch 955b53047c More complete hardware constants. Rename joypad constants. 2014-05-23 15:25:16 -07:00
yenatch 61dbfa440b Use a dedicated label for base stats.
The existing {Bulbasaur,Ivysaur,...}BaseStats labels are for convenience.
2014-05-23 15:20:53 -07:00
yenatch 0dea0cc3fb Comment some bank 0 functions, and add wram labels for Predef. 2014-05-23 15:11:09 -07:00
U-Fish-PC\Daniel 15427f5320 Pull a lot of engine out of main.asm 2014-05-22 18:13:20 -04:00
U-Fish-PC\Daniel ea3ba4cde3 Pull out map header pointers and banks 2014-05-21 19:50:57 -04:00
U-Fish-PC\Daniel 77e300927b Name hidden object routines 2014-05-21 19:13:07 -04:00
U-Fish-PC\Daniel a9528fc870 More misc relabelling 2014-05-21 13:10:07 -04:00
U-Fish-PC\Daniel f29c4e473e Misc relabelling 2014-05-21 11:58:18 -04:00
U-Fish-PC\Daniel d693721f97 Use constants for the starter mons 2014-05-21 09:54:33 -04:00
U-Fish-PC\Daniel 1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
2014-05-19 16:05:19 -04:00
U-Fish-PC\Daniel 82ffb336a9 Pull more data out of main.asm 2014-05-19 08:05:48 -04:00
U-Fish-PC\Daniel 24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00
U-Fish-PC\Daniel 4e4e72d02a Pull map headers out of main.asm 2014-05-17 17:18:23 -04:00
U-Fish-PC\Daniel e1a931df6a Pull map objects out of main.asm 2014-05-17 15:43:13 -04:00
U-Fish-PC\Daniel b438d0c1d7 Organize base stats and wild mon data (Koolboyman) 2014-05-16 22:32:35 -04:00
U-Fish-PC\Daniel 1e86625c87 Pull most data out of main.asm 2014-05-16 19:50:38 -04:00
U-Fish-PC\Daniel b0a1502e21 More item IDs and palette function names 2014-05-16 17:27:39 -04:00
U-Fish-PC\Daniel 5296808894 Use more trainer/mon/palette constants 2014-05-16 16:15:59 -04:00
U-Fish-PC\Daniel 285cf2650d Clean up text labels, use move and type constants 2014-05-16 01:33:16 -04:00
U-Fish-PC\Daniel ae1ebde697 Label a lot of unnamed text 2014-05-15 20:00:54 -04:00
U-Fish-PC\Daniel e05fcc337a Label graphics loading functions and CheckIfMoveIsKnown 2014-05-15 16:43:21 -04:00
U-Fish-PC\Daniel ddbe488133 Label and comment AnimatePartyMon 2014-05-15 15:52:00 -04:00
Marcus Huderle d218d1972a Documented/Labeled Route 22 scripts. 2014-05-13 10:43:09 -05:00
Marcus Huderle ebecf8f7b5 Finished documenting/labeling functions in the MoveEffectPointerTable. 2014-05-12 23:22:14 -05:00
Marcus Huderle 36d588a83c Merged with yenatch 2014-05-12 17:41:21 -05:00
Marcus Huderle 13e496cc90 Documented/labeled lots of move-effect-related stuff. 2014-05-12 17:29:30 -05:00
Marcus Huderle 271b5a8aaf Documented reflect/light screen effect function. Labeled some related text. 2014-05-12 00:04:00 -05:00
yenatch 83d775e21a Merge remote-tracking branch 'iimarckus/master' 2014-04-27 02:54:39 -04:00
yenatch 3b9740cb82 Comments and labels for saving the last blackout map. 2014-04-27 02:44:29 -04:00
yenatch 55b9929167 Use callba/callab macros for cross-bank calls. 2014-04-22 17:14:11 -04:00
yenatch b73ed53ab7 Comment in-game trade evolution. 2014-04-22 13:37:07 -04:00
yenatch d0e2fc78c0 More move and effect constants. Use a constant for total move count. 2014-04-22 13:35:55 -04:00
yenatch fc8195cb82 Clean up rst vectors and interrupt labels. 2014-04-21 15:43:26 -04:00
IIMarckus 58c044c123 Comment where gym trainers get deactivated after beating the leader. 2014-04-21 02:40:45 -06:00
IIMarckus 65e7657318 Add labels and comments to the Fan Club. 2014-04-21 02:12:25 -06:00
IIMarckus 1040a2ccfa Use decimal for levels, and replace some hardcoded RAM addresses. 2014-04-21 01:02:51 -06:00
IIMarckus 3294ef805b Add a missed map constant. 2014-04-21 00:37:06 -06:00
IIMarckus d036e24ae1 Improve comments/labels for Silph Co 7F. 2014-04-19 23:31:59 -06:00
IIMarckus 199ec815c6 Label a Route 11 gatehouse script better. 2014-04-19 21:44:51 -06:00
yenatch 7eeaad6ab0 More move effect constants. 2014-04-16 13:21:22 -04:00
yenatch ed55794d11 Use map constants for hardcoded warp destinations. 2014-04-16 13:20:23 -04:00
yenatch 140b01bbd6 Use bits for status constants instead of masks. 2014-04-16 13:19:06 -04:00
U-Fish-PC\Daniel 803aa1f574 Merge branch 'master' of https://github.com/iimarckus/pokered 2014-04-16 07:54:36 -04:00
yenatch b45dbd8970 Merge remote-tracking branch 'yenatch/png' 2014-04-15 21:29:01 -07:00
U-Fish-PC\Daniel 15f56e7ab2 Replace item constants 2014-04-07 16:39:11 -04:00
U-Fish-PC\Daniel d6de00bbbb Replace one-byte sound effect pointers 2014-04-07 16:16:45 -04:00
IIMarckus 7f8974dab5 Merge https://github.com/yenatch/pokered
Conflicts:
	main.asm
2014-04-06 08:52:55 -06:00
U-Fish-PC\Daniel 391bbad29e A little more map name consistency 2014-04-06 09:33:02 -04:00
yenatch 05c58eaa70 Fix tile padding for house and ship_port tileset graphics. 2014-04-05 16:53:25 -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 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
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
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 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
Adam AKA Coolboyman 6bde08504f added a couple of new moves constants 2014-01-26 23:59:48 -08:00
yenatch b4e8ec0901 Make text.asm an object 2014-01-23 15:55:33 -05:00
yenatch b84ee8468c Move text banks into text.asm 2014-01-23 15:44:40 -05:00