Commit graph

376 commits

Author SHA1 Message Date
dannye 6574881cda Use generic names for noise instruments
coming up with satisfactory names is hard, besides this will improve compatibility with crystal
2019-07-28 17:29:35 -05:00
Rangi 092be231cc Merge branch 'master' of https://github.com/pret/pokered 2019-07-07 00:44:30 -04:00
Rangi f99a715fae Replace some hard-coded values with constants 2019-07-07 00:44:21 -04:00
dannye 735d5bd4c2 Manually merge pokecrystal audio files
and remove more CrystalComplete leftovers
2019-04-21 15:13:17 -05:00
dannye 84e5331fcc Bug fix: stop channels from cutting out during battle 2019-04-14 13:24:55 -05:00
dannye b1108ba91e Merge branch 'master' of https://github.com/pret/pokered 2019-04-13 17:21:23 -05:00
dannye e2c81e10f1 Merge commit '42cfe3d36192aca4d0c4ca222be0088c03236e0d' 2019-04-13 16:30:36 -05:00
SatoMew df2a68d6de Replace the few instances of Unknown Dungeon with Cerulean Cave 2019-04-08 18:47:31 +01:00
Rangi c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
Rangi 462088a25c Document the origin of MissingNo's base stats. 2018-07-08 16:25:39 -04:00
Pokeglitch 01fe449837 Updated the intro 2018-06-22 23:06:05 -04:00
yenatch bd35b37262 use constants for wEvosMoves size 2018-03-22 23:09:49 -04:00
xCrystal 94b9a86c8b Uppercase battle status constants 2017-12-30 00:59:48 +01:00
dannye 7a9a1b1e55 Fix typos in comments 2017-06-24 15:01:43 -05:00
dannye e9f33ce19c Typo: SFX_POKEFLUE → SFX_POKEFLUTE 2017-05-08 02:54:20 -05:00
dannye 87eed68710 Insert Crystal audio engine and music
most credit goes to Sanqui
2017-05-07 15:30:08 -05:00
YamaArashi 4d61c35172 correct mistaken comments 2016-10-29 02:04:48 -07:00
YamaArashi bb1bf5e6a7 link battle action constants 2016-10-29 01:44:13 -07:00
dannye 032f961ef2 Split macros.asm 2016-07-31 13:04:04 -05:00
dannye 52bb07ca18 Replace unnecessary tabs with spaces 2016-07-27 22:33:48 -05:00
dannye 70dde9d96b Clean up redundant labels
fix trainer header numbering
2016-07-20 00:40:04 -05:00
YamaArashi 3a6a300da4 sync text 2016-06-12 10:11:31 -07:00
YamaArashi cee4d559f9 crlf to lf 2016-06-11 17:11:05 -07:00
pikalaxalt a2f7701f34 Merge branch 'master' of https://github.com/pret/pokered 2016-06-09 20:45:02 -04:00
IIMarckus 674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
pikalaxalt 0d687ba25a TX_SFX_KEY_ITEM and mapconst macro 2016-05-30 09:08:40 -04:00
IIMarckus 72790bcbac Clean up labels and trainer headers for overworld Pokémon. 2016-04-06 20:58:45 -06:00
dannye 351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
PikalaxALT dd9b167689 Rewrite SetEvents and ResetEvents for unlimited number of events 2015-09-04 21:00:11 -04:00
dannye 5facf8377a No more wram_constants.asm
unfortunately, this means manually declaring the wEnemyMon1 party struct
2015-08-30 22:05:50 -05:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi 38d771dc44 commented pokeball function 2015-08-29 23:21:54 -07:00
YamaArashi 2ff0f3f208 added constants for item capacity 2015-08-29 17:29:16 -07:00
YamaArashi 696cffd3ae item name length constant 2015-08-14 04:11:53 -07:00
YamaArashi b6ac1018c2 add border constant and clear up misnomer 2015-08-14 02:46:12 -07:00
YamaArashi f6d618090a Named a test battle variable 2015-08-13 19:13:47 -07:00
YamaArashi 64cfbcce7a commented SGB palette stuff 2015-08-12 02:16:56 -07:00
dannye 4aedff0217 Replace hardcoded name lengths with NAME_LENGTH 2015-08-10 23:51:20 -05:00
dannye dfc152d667 No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
2015-08-10 11:09:16 -05:00
dannye dfa266f05c Use constants for elevator floors 2015-08-10 10:03:55 -05:00
YamaArashi 2b01815999 commented audio code 2015-08-08 22:32:44 -07:00
YamaArashi 56d75db28a constants for PrintNumber 2015-07-29 12:06:54 -07:00
dannye d7c5c8cf22 Merge branch 'master' of https://github.com/xCrystal/pokered 2015-07-26 23:23:05 -05:00
YamaArashi 82512e4491 named animation functions/variables 2015-07-24 14:39:45 -07:00
xCrystal bbb86671ea Use more wram labels and other constants 2015-07-24 10:49:33 +02:00
YamaArashi e6d02b4b7b make route22 rival events more consistent 2015-07-23 21:20:20 -07:00
YamaArashi 323895af6d fixed hram aliases and named wram var 2015-07-23 20:48:35 -07:00
Daniel Harding c34156c5fb Merge pull request #107 from YamaArashi/master
enumerate events
2015-07-22 10:24:00 -05:00
dannye a6f04b4349 Unify audio bank references
2→1
8→2
1f→3
2015-07-22 10:22:46 -05:00
dannye b4081e851a Rename sound effect files 2015-07-22 09:57:31 -05:00
dannye 4d88812f40 Name some battle sound effects 2015-07-21 21:04:21 -05:00
YamaArashi dcc7f3bc9f named more constants 2015-07-21 14:21:14 -07:00
YamaArashi 5ce58a048c comments for event constants 2015-07-21 10:49:53 -07:00
YamaArashi 73171bfff5 named most of the used events 2015-07-21 10:36:03 -07:00
YamaArashi cbcdb2ec2a move event macros to separate file 2015-07-20 22:11:59 -07:00
YamaArashi fd2b4b6c74 gym leader events 2015-07-20 19:41:23 -07:00
YamaArashi fcab935a0f enumerate events 2015-07-20 18:32:26 -07:00
YamaArashi db7d941d22 constants for flag actions 2015-07-19 20:45:34 -07:00
YamaArashi 1d86932cc9 naming 2015-07-19 17:52:26 -07:00
dannye 64b4cf624f Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/evos_moves.asm
	engine/overworld/healing_machine.asm
2015-07-19 03:52:20 -05:00
dannye ea9cc86949 Name sound effects 2015-07-19 03:46:12 -05:00
dannye 340230e997 Enumerate more constants 2015-07-19 00:43:43 -05:00
YamaArashi c169073eed misc 2015-07-18 21:58:55 -07:00
dannye b85d7c65f3 Enumerate map constants
closes https://github.com/iimarckus/pokered/issues/86
2015-07-17 11:20:35 -05:00
YamaArashi aa3da5f3b0 title / diploma / vending machine 2015-07-17 01:22:00 -07:00
dannye 40ea6a5f75 Merge branch 'master' of https://github.com/iimarckus/pokered 2015-07-16 23:27:57 -05:00
dannye 4670a1ddae Swap trade center and battle center
also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102
2015-07-16 23:21:57 -05:00
YamaArashi bd7d981593 menu stuff 2015-07-15 20:04:58 -07:00
YamaArashi 07dd705637 hall of fame / credits 2015-07-14 19:46:52 -07:00
dannye e25a7148d0 Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/town_map.asm
2015-07-14 00:58:09 -05:00
YamaArashi 5d3b958763 named town map stuff 2015-07-13 19:24:07 -07:00
YamaArashi 0066e09828 named party menu/naming screen wram variables 2015-07-13 15:40:33 -07:00
YamaArashi f66a74b9fc comment slot machine 2015-07-13 13:35:35 -07:00
YamaArashi bcfca2e267 movemon and removepokemon wram variables 2015-07-12 23:36:56 -07:00
YamaArashi 4a8c9993ad named wram variables 2015-07-12 23:00:48 -07:00
U-Daniel-PC\Daniel cd649184f5 Rename/organize part 1 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
2015-07-03 14:37:53 -05:00
U-Daniel-PC\Daniel 39abace569 Clean up white space 2015-06-11 17:41:33 -05:00
U-Daniel-PC\Daniel 10fd288ab4 Add newlines to EOFs 2015-06-01 22:15:02 -05:00
U-Daniel-PC\Daniel 08b939375e EOL Windows->UNIX 2015-06-01 22:13:46 -05:00
YamaArashi 3870f5e10a named misc functions 2015-02-08 01:44:41 -08:00
YamaArashi 83023cda19 commented menu stuff 2015-02-07 12:27:36 -08:00
YamaArashi 3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
xCrystal 9de54645c8 add constants for volatile statuses and more battle labels/commentary/constants 2015-02-04 23:22:46 -08:00
IIMarckus 5459477ecd Merge branch 'master' of https://github.com/dannye/pokered 2014-10-20 18:56:21 -06:00
IIMarckus 1d579928dc Modularize the beach house. 2014-10-17 12:16:52 -06:00
IIMarckus 50a39daa74 More idioms. 2014-10-17 09:24:04 -06:00
IIMarckus 7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
U-Daniel-PC\Daniel 4d60e6f1a9 Enumerate hide/show constants 2014-09-26 07:37:21 -04:00
U-Daniel-PC\Daniel de39851f4a Make Hide/Show objects more dynamic
be on the look out for more static ids in the wild
unused constants are still included because a
script could be written to check whether the player
has picked up an item/fought a legendary etc.
2014-09-25 19:21:49 -04:00
yenatch 6866df277f Add comments for move ids. 2014-09-23 14:56:07 -07:00
yenatch dff0cdeb5a Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm
2014-09-20 00:57:27 -04:00
yenatch 3de9d14d3e Recomment misc functions in home.asm. 2014-09-17 21:14:32 -07:00
yenatch 29aff84107 Enumerate move constants and add unnamed animation constants. 2014-09-17 12:36:49 -07:00
YamaArashi 2ed65d9c3e Commented/labelled misc functions 2014-09-14 11:29:18 -07:00
YamaArashi 91793015e5 Labelled and commented mostly sprite-related things 2014-09-09 20:55:19 -07:00
yenatch 81bbab85ac Hall of Fame sram labels and related constants. 2014-06-14 14:24:35 -07:00
yenatch 53ae0e93fa Use monster struct macros in wram. Rename related labels for consistency. 2014-06-14 04:12:40 -07:00
U-Fish-PC\Daniel 9eefed45f7 Use MAX_LEVEL instead of 100/$64 2014-06-10 17:06:30 -04:00
U-Fish-PC\Daniel b83acb03e5 Clean up white space 2014-06-09 16:58:02 -04:00
yenatch fc123e360b Space out monster constants to make gaps clearer. 2014-06-06 22:15:41 -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 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
U-Fish-PC\Daniel a9528fc870 More misc relabelling 2014-05-21 13:10:07 -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 5296808894 Use more trainer/mon/palette constants 2014-05-16 16:15:59 -04:00
Marcus Huderle ebecf8f7b5 Finished documenting/labeling functions in the MoveEffectPointerTable. 2014-05-12 23:22:14 -05: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 7eeaad6ab0 More move effect constants. 2014-04-16 13:21:22 -04:00
yenatch 140b01bbd6 Use bits for status constants instead of masks. 2014-04-16 13:19:06 -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
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 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 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 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
Adam AKA Coolboyman 6bde08504f added a couple of new moves constants 2014-01-26 23:59:48 -08:00
yenatch 001270908a define music constants instead of running around with ((label-$4000)/3) 2014-01-21 14:08:06 -05:00
Marcus Huderle 24988da53f Credits order INCBIN and more labeling. 2013-12-27 11:41:54 -06:00
Marcus Huderle fe9df41b5f Labeled Special Effect pointers and ids. 2013-12-23 18:57:01 -06:00
U-Fish-PC\Daniel 23c7161bbc Clean up constants 2013-12-11 10:37:17 -05:00
U-Fish-PC\Daniel d4d4481df0 Move slot machine constants 2013-12-11 02:00:10 -05:00
U-Fish-PC\Daniel 9c4be8a91e Disassemble Slot Machine and Others 2013-12-11 01:44:39 -05:00
yenatch 5dc5feb29c split related constants into constants/ 2013-12-05 01:34:12 -05:00