Commit graph

304 commits

Author SHA1 Message Date
May Evans e2c1037033 Maximise DVs, WRAM fix..?
Implements a fix with the WRAM stack space that pret mentioned.

DVs should be forced to max with the changes I added, will need testing.
2022-09-04 00:56:58 +01:00
MementoMartha 8ee7e59d47 finishing some more pokemon
plus a few minor tweaks as well
2022-09-03 16:19:29 +01:00
emaskyesmogon 198c9c8255 Next Evolution Batch
Kingdra, Lickilicky, Magnezone and Porygon2.
2022-09-02 11:05:54 -06:00
emaskyesmogon b4804ae629 New Mons
Adds Blissey, Hitmontop, Steelix, Crobat, Politoed and Slowking. Remnants for Porygon2, Lickilicky, Kingdra and Magnezone can be seen but are currently non functional due to wram space.
2022-09-01 16:32:37 -06:00
MementoMartha 197d669830 R/B/G sprites, and a few minor edits 2022-09-01 16:30:39 +01:00
emaskyesmogon 149d9d6f4b Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack 2022-09-01 08:51:21 -06:00
emaskyesmogon 363fe3c315 oop
these were supposed to be in the last commit
2022-09-01 08:37:56 -06:00
emaskyesmogon 5944210393 Eevees and More
Adds the five eeveelutions we don't have, evo items for Glaceon and Sylveon, fixes Rhyperior's dex entry, renamed the Super Rod to Fishing Rod, and commented out the OW Crocky/Kabutops for now
2022-09-01 08:37:35 -06:00
MementoMartha 20b6899169 Finished adding Rhyperior 2022-09-01 10:16:49 +01:00
emaskyesmogon 1893b4c7cf expanded Pokemon size
Rhyperior files are dummies and will need to be properly edited with sprites, Rhydon evo data, etc, but it (and the other files included) show that the trainer and pokemon sprite indexes have been separated, which allows us to add the other KEP mons
2022-08-31 20:47:02 -06:00
MementoMartha 53e0cbf9f5 Learnsets, Sun Stones and Evos, oh my 2022-08-31 16:43:33 +01:00
MementoMartha ac45c8b5bc Adding move data, types, and some Pokemon data 2022-08-31 10:17:48 +01:00
Rangi bbb0e7e82d
Use the same music headers as pokecrystal (#382) 2022-08-11 21:23:08 -04:00
Colton G. Rushton cc46b0e510
wOAMBuffer -> wShadowOAM (#370) 2022-07-09 17:18:18 -04:00
Colton G. Rushton a24a39793c
Identify the rest of the hardware constants (#371)
See https://github.com/pret/pokecrystal/pull/972 and https://github.com/pret/pokecrystal/pull/947 for details.
2022-07-04 01:10:14 -04:00
vulcandth 70cbb48328
party_struct constants and ExchangeBytes size (#364)
Co-Authored-By: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-07-04 01:08:17 -04:00
vulcandth edb55e00f8
Rename SLP to SLP_MASK (#361)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-17 22:25:52 -04:00
Rangi 6c945a6b6a Mention WildDataPointers in map_constants.asm 2022-06-07 22:27:30 -04:00
vulcandth 6b5be9129c
RGBDS syntax updates (#358)
New MACRO and DEF syntax
2022-06-06 17:25:31 -04:00
Rangi 865d37e02a Use compound assignment operators 2021-11-23 20:56:57 -05:00
Yoann Fievez f68af5c6e9
Add some constants for options (#344)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2021-11-05 19:45:09 -04:00
Rangi 8701ef4d61 Improve some RAM formatting 2021-05-31 11:46:10 -04:00
Rangi 346ce9454a Use macros for bit arrays 2021-05-23 22:09:02 -04:00
Rangi 6a31663c96 Use {interpolation} to generate sequences of RAM labels
Fixes #319
2021-04-27 15:49:59 -04:00
Rangi bcc4380d40 Port 'add_tmnum' from pokecrystal 2021-04-19 16:30:07 -04:00
Rangi dd690920c9 Use rgbds 0.5.0 features:
- FOR loops
- {interpolation}
- REDEF EQUS
- \# for all macro args
2021-04-17 19:06:56 -04:00
Rangi 4b64b146e4 Use assertions to catch the GetName bug, and use a NAME_BUFFER_LENGTH constant 2021-04-13 20:08:38 -04:00
Rangi 95ec2cf039 Verify data table and name list sizes with assertion macros
Fixes #312
2021-03-25 16:44:41 -04:00
Rangi 94daf57156 The 'tmhm' macro adjusts to the number of TMs/HMs 2021-01-06 10:20:37 -05:00
SatoMew 3756ec6dd9 Improve new constants and comment based on feedback 2020-11-29 22:07:26 +00:00
SatoMew 083cb38e33 Update related tile animation constants 2020-11-29 21:28:38 +00:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi d3e81422d5 Sync home and macro code with pokeyellow 2020-11-05 10:50:30 -05:00
Rangi abaf9fee7c Port some formatting from pokeyellow 2020-11-04 16:31:47 -05:00
SatoMew 886225f5de Clarify comment in constants/pokemon_constants.asm 2020-09-27 00:49:03 +01:00
SatoMew e535af3dff Fix alignment in Pokémon name constants 2020-09-22 20:02:05 +01:00
SatoMew 2ff7b40d82 Replace ghost Marowak's ambiguous constant 2020-09-22 18:38:29 +01:00
Rangi 8ce20e5c31 Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters) 2020-08-31 10:58:41 -04:00
Rangi bfd9f617c9 Use constants to delineate map types, and factor out more data 2020-08-31 10:23:19 -04:00
Rangi f82097b894 Identify some map object related constants 2020-08-17 14:22:27 -04:00
Akihiro Otomo b48bbbb047
fix OAMFLAG_VFLIPPED (#283)
Replace incorrect label OAMFLAG_VFLIPPED with OAM_HFLIP
2020-08-02 00:31:10 -04:00
Rangi 69788c536b Add comments associating constants with data, and identify some more data 2020-07-20 12:31:35 -04:00
Rangi 76289dfda0 Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal 2020-07-17 15:58:06 -04:00
Rangi f53341efa1 Define constants for subanimations' base coords and frame block modes 2020-07-17 15:16:54 -04:00
Rangi 72a0e98c93 JUGGLER_X -> UNUSED_JUGGLER 2020-07-17 13:56:59 -04:00
Rangi 3c1cdbc4d0 Identify remaining tilemap IDs 2020-07-17 13:47:33 -04:00
Rangi 30ecbf6ea3 SONY -> RIVAL 2020-07-17 13:27:27 -04:00
Rangi 2454296d32 Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
2020-07-17 12:48:15 -04:00
Rangi 6f7337bbb1 Define constants for subanimation transform types 2020-07-16 22:14:39 -04:00
Rangi 41a9e30268 Add constants for move animations' frame blocks 2020-07-16 22:00:16 -04:00
Rangi 2f43a41100 Use a battle_anim macro for move animations' special effects and subanimations
Move animations' sound IDs are off by one from move IDs.
2020-07-16 21:45:30 -04:00
Rangi 76b882d952 Reformat map scripts' coordinate and movement data
'dbmapcoord' has X, Y order like other coordinate-related data macros
2020-07-16 12:32:19 -04:00
Rangi 594c58a289 Revise some map scripts, mostly for getting items 2020-07-16 11:19:05 -04:00
Rangi 58f1089370 Define constants for default trainer DVs 2020-07-16 09:40:30 -04:00
Rangi 8c83ebe966 Define constants for in-game trades 2020-07-16 09:32:09 -04:00
TheFakeMateo 4ecff22f71 Deobfuscate exit warps on indoor maps 2020-07-15 18:12:58 -05:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi 3e572b6f48 Use const_skip and const_next macros for brevity 2020-07-09 14:51:48 -04:00
Rangi 676a35f76f Eliminate enum: use const instead, with case-by-case parallel const implementations 2020-07-09 12:43:26 -04:00
Rangi 51ac538c25 Identify SPRITESTATEDATA2_ORIGFACINGDIRECTION 2020-07-07 16:57:51 -04:00
Rangi 1e593d8f8c Remove c1x*/c2x* comments, use struct offset constants 2020-07-07 14:15:39 -04:00
Rangi 45ed05decf Use HIGH() and LOW() 2020-07-07 11:10:29 -04:00
Rangi bbc257476f PSYCHIC -> PSYCHIC_TYPE (PSYCHIC is ambiguous with PSYCHIC_M) 2020-07-07 10:54:05 -04:00
Rangi dd08b8dd6b Use labels for HRAM and VRAM 2020-07-06 21:13:17 -04:00
Rangi 43e0e40d5a Avoid repeating the NUM_TMS value 2020-07-06 11:28:51 -04:00
Rangi 25a3e67b94 add_tm and add_hm define TM##_MOVE and HM##_MOVE constants, to avoid repeating the move names twice 2020-07-06 09:32:55 -04:00
Rangi 405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi b2369b0961 Port credits command constants from pokeyellow 2020-07-05 15:35:38 -04:00
Rangi 155695cbfe Use constants for damage limits in CalculateDamage
Fixes #255
2020-07-05 15:12:29 -04:00
Rangi d9db3d7495 Update map hide/show data labels
Fixes #235
2020-07-05 14:38:08 -04:00
Rangi 139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi 36f8cd1477 UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET_PAL_DEFAULT 2020-07-04 16:16:29 -04:00
Rangi e4e0af4d67 Remove remaining raw $xxxx values, and replace "+ -1" with "- 1" (supported by rgbds 0.4.0) 2020-07-04 01:00:45 -04:00
Rangi 7e92d5ba8c Make suggested changes from review 2020-07-04 00:37:10 -04:00
Rangi 6ef36800b0 Replace raw hex values with HRAM constants
To do: turn constants into labels and use ldh
2020-07-03 22:22:09 -04:00
Rangi 962722746e tilesets.asm -> tileset_constants.asm 2020-07-03 16:45:00 -04:00
Rangi 9878f01e29 Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 16:37:47 -04:00
Rangi ccb01731fe Make suggested edits:
- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants
2020-07-03 15:57:35 -04:00
Rangi c9c59dc343 Reorganize constants/
To do: add comments associating constants with data and code
2020-07-03 12:44:47 -04:00
Rangi b29e5ee203 Add subdirectories to data/ similar to pokecrystal
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
2020-07-03 11:51:00 -04:00
Rangi eeb45036e2 Individual images for party menu icon graphics 2020-06-27 22:16:01 -04:00
dannye 969b43d443 Update labels to match new audio macro names
and synchronize engine_2 and engine_3 with engine_1
2019-08-17 14:47:16 -05:00
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
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
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