summaryrefslogtreecommitdiff
path: root/main.asm
AgeCommit message (Collapse)Author
2014-04-16Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel
2014-04-15Merge remote-tracking branch 'yenatch/png'yenatch
2014-04-07Replace item constantsU-Fish-PC\Daniel
2014-04-07Replace one-byte sound effect pointersU-Fish-PC\Daniel
2014-04-06Merge https://github.com/yenatch/pokeredIIMarckus
Conflicts: main.asm
2014-04-06A little more map name consistencyU-Fish-PC\Daniel
2014-04-05Fix tile padding for house and ship_port tileset graphics.yenatch
2014-04-05Convert pngs in gfx/ to 1bpp and 2bpp.yenatch
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-05Use dimension constants in warp data and add map name consisntencyU-Fish-PC\Daniel
2014-04-04"Fix" name indentation in credits.yenatch
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-04Another bank.yenatch
2014-04-04More tileset constants.yenatch
2014-04-03Tileset constants in the wild.yenatch
2014-04-03Name the tilesets and give them constants.yenatch
Also clean up the tileset macro and remove placeholders/redundant files.
2014-04-02Reference more static banks.yenatch
2014-04-02Japanese character conversion tables.yenatch
2014-04-02More Red pic labels and misc constants.yenatch
Also correct erroneous label "Unknown_72ede".
2014-03-30Use labels instead of static addresses in sound pointers.yenatch
Static address substraction would wreak havoc in other memory configurations.
2014-03-30Stop using [$ff00+$xx] syntax.yenatch
rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30Remove the last "\@"s on local labels.yenatch
2014-03-30Yet another static rom address (Tset15_Coll)yenatch
2014-03-29Merge remote-tracking branch 'origin/master' into masteryenatch
2014-03-29Merge remote-tracking branch 'huderlem/master' into masteryenatch
Conflicts: main.asm
2014-03-26ledge tiles documentedLin
2014-02-20Removed hardcoded address. Labeled a few functions.Marcus Huderle
2014-02-02Replace hardcoded song idsU-Fish-PC\Daniel
2014-02-01Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel
Conflicts: main.asm
2014-01-29Labeled Battle Center and Trade Center constants.Marcus Huderle
2014-01-28Fix BookshelfTileIDs formatU-Fish-PC\Daniel
2014-01-27Get rid of globals.asm. Use ::s to export labels between objects.yenatch
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-26added a couple of new moves constantsAdam AKA Coolboyman
2014-01-23Make text.asm an objectyenatch
2014-01-23Move text banks into text.asmyenatch
2014-01-23Split out move namesyenatch
2014-01-23Split out the rest of map textyenatch
2014-01-23Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel
2014-01-23Split out route textyenatch
2014-01-22Even more map textyenatch
2014-01-22Silph Co 1f text was actually somewhere elseyenatch
2014-01-22Move city and town map text into text/mapsyenatch
2014-01-22split out a bunch of map textyenatch
2014-01-22split viridian and oaks lab text into text/maps/yenatch
2014-01-22stamp out even more text macros in mainyenatch
Conflicts: main.asm
2014-01-22rename existing map text files and put them in text/maps/yenatch
2014-01-22Merge branch 'split-audio' into textyenatch
Conflicts: main.asm
2014-01-22Merge remote-tracking branch 'iimarckus/master' into resplit-audioyenatch
Conflicts: main.asm
2014-01-22use 'next' macro in stringsyenatch
2014-01-22rename and add some text macrosyenatch
cont replaces next, and next becomes a generic newline. para replaces page (now used for pokedex entries). dex ends a pokedex entry.
2014-01-21clean up missed text macros in main.asmyenatch
2014-01-21use text macros in main.asmyenatch