aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'yenatch/png'yenatch2014-04-151-34/+44
|\
| * Fix tile padding for house and ship_port tileset graphics.yenatch2014-04-051-2/+2
| |
| * Convert pngs in gfx/ to 1bpp and 2bpp.yenatch2014-04-051-34/+44
| | | | | | | | | | | | | | | | | | 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
* | Merge https://github.com/yenatch/pokeredIIMarckus2014-04-061-690/+707
|\| | | | | | | | | Conflicts: main.asm
| * "Fix" name indentation in credits.yenatch2014-04-041-65/+65
| | | | | | | | | | | | | | 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.
| * Another bank.yenatch2014-04-041-1/+1
| |
| * More tileset constants.yenatch2014-04-041-17/+17
| |
| * Tileset constants in the wild.yenatch2014-04-031-198/+198
| |
| * Name the tilesets and give them constants.yenatch2014-04-031-403/+418
| | | | | | | | Also clean up the tileset macro and remove placeholders/redundant files.
| * Reference more static banks.yenatch2014-04-021-6/+8
| |
* | A little more map name consistencyU-Fish-PC\Daniel2014-04-061-6/+6
| |
* | Use dimension constants in warp data and add map name consisntencyU-Fish-PC\Daniel2014-04-051-991/+991
|/
* Japanese character conversion tables.yenatch2014-04-021-54/+14
|
* More Red pic labels and misc constants.yenatch2014-04-021-20/+19
| | | | Also correct erroneous label "Unknown_72ede".
* Use labels instead of static addresses in sound pointers.yenatch2014-03-301-6/+6
| | | | Static address substraction would wreak havoc in other memory configurations.
* Stop using [$ff00+$xx] syntax.yenatch2014-03-301-1325/+1325
| | | | rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
* Remove the last "\@"s on local labels.yenatch2014-03-301-13/+13
|
* Yet another static rom address (Tset15_Coll)yenatch2014-03-301-1/+1
|
* Merge remote-tracking branch 'origin/master' into masteryenatch2014-03-291-2/+3
|\
| * ledge tiles documentedLin2014-03-261-2/+3
| |
* | Merge remote-tracking branch 'huderlem/master' into masteryenatch2014-03-291-20/+24
|\ \ | | | | | | | | | | | | Conflicts: main.asm
| * | Removed hardcoded address. Labeled a few functions.Marcus Huderle2014-02-201-18/+22
| | |
| * | Labeled Battle Center and Trade Center constants.Marcus Huderle2014-01-291-4/+4
| |/
* | Replace hardcoded song idsU-Fish-PC\Daniel2014-02-021-10/+10
| |
* | Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2014-02-011-20910/+921
|\| | | | | | | | | Conflicts: main.asm
| * Get rid of globals.asm. Use ::s to export labels between objects.yenatch2014-01-271-491/+491
| | | | | | | | | | | | | | | | | | | | | | 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.
| * added a couple of new moves constantsAdam AKA Coolboyman2014-01-261-10/+10
| |
| * Make text.asm an objectyenatch2014-01-231-2/+0
| |
| * Move text banks into text.asmyenatch2014-01-231-3196/+1
| |
| * Split out move namesyenatch2014-01-231-166/+1
| |
| * Split out the rest of map textyenatch2014-01-231-840/+27
| |
| * Split out route textyenatch2014-01-231-2885/+27
| |
| * Even more map textyenatch2014-01-221-4367/+83
| |
| * Silph Co 1f text was actually somewhere elseyenatch2014-01-221-8/+1
| |
| * Move city and town map text into text/mapsyenatch2014-01-221-1187/+9
| |
| * split out a bunch of map textyenatch2014-01-221-3064/+61
| |
| * split viridian and oaks lab text into text/maps/yenatch2014-01-221-956/+7
| |
| * stamp out even more text macros in mainyenatch2014-01-221-68/+71
| | | | | | | | | | Conflicts: main.asm
| * rename existing map text files and put them in text/maps/yenatch2014-01-221-3/+3
| |
| * Merge branch 'split-audio' into textyenatch2014-01-221-251/+261
| |\ | | | | | | | | | | | | Conflicts: main.asm
| | * Merge remote-tracking branch 'iimarckus/master' into resplit-audioyenatch2014-01-221-252/+262
| | |\ | | | | | | | | | | | | | | | | Conflicts: main.asm
| * | | use 'next' macro in stringsyenatch2014-01-221-95/+132
| | | |
| * | | rename and add some text macrosyenatch2014-01-221-2553/+2553
| | | | | | | | | | | | | | | | | | | | | | | | cont replaces next, and next becomes a generic newline. para replaces page (now used for pokedex entries). dex ends a pokedex entry.
| * | | clean up missed text macros in main.asmyenatch2014-01-211-1069/+1307
| | | |
| * | | use text macros in main.asmyenatch2014-01-211-7078/+9882
| |/ /
| * | condense MapSongBanksyenatch2014-01-211-496/+248
| | |
| * | use music constants everywhereyenatch2014-01-211-273/+273
| | | | | | | | | | | | some sfx are treated as music, but don't have constants yet
| * | split audio components into audio_red.o and audio_blue.oyenatch2014-01-091-1293/+1
| | |
| * | split out the audio enginesyenatch2014-01-061-5079/+3
| | |
* | | Fix BookshelfTileIDs formatU-Fish-PC\Daniel2014-01-281-1/+1
| | |
generated by cgit v1.3.1-sl0p (git 2.54.0) at 2026-08-18 12:11:27 +0000 — sl0p fork