Commit graph

363 commits

Author SHA1 Message Date
May Evans 255ffaf929 Add Mt. Moon Crater
The map functions and the ROM builds. It has no wild data, and nothing goes to it.

What's done;
- Map design, I think this is one of the best I've ever done, especially within these limits.
- Integration, set up a warp and you can go there, easy.

What's not done
- Wild data
- Fishing group
- Water mons
- Event signs
- Young Sada in Pewter Museum of Science

Very simple map to produce.
2022-12-05 00:07:16 +00:00
MementoMartha 2b3da5e254 A few fixes + added Blahaj cameo
Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark.

(note that KEP is not sponsored by IKEA)
2022-11-04 11:12:44 +00:00
MementoMartha 1e7613f804 Adding a stable MissingNo, and fixing a few minor things 2022-10-31 23:09:41 +00:00
MementoMartha 87fdb46ede Adding temporary warps to Faraway
Note that Faraway is still broken, the inner forest can't be accessed for some reason
2022-10-18 00:16:31 +01:00
May Evans 86f111e5d7 Revamp Pokemon Mansion B2F
This was hell to do. There is still one bug in there, and that's the item pickups don't work for some reason. I don't know how these work honestly so if anyone wants to sort that go ahead.

Anyway, some stuff on the map;
- Currently, a warp from B1F leads there, which is intentionally non-returnable. The player walks through the whole map to get to the warp panel. A walk of humanity's shame, if you will. A warp for where the player is meant to go will be necessary later.
- Lore from Japanese media, particularly the first movie's interpretation of Mewtwo, is included. This is based on context clues on its canonicity from LGPE and other bits.
- A clue on how to get the Old Sea Chart is not-so-subtly included.

The MissingNo. event is unfinished, I intend for Martha to deal with that. The text intentionally lacks a "done" bit to force an unpredictable error; I believe this is inconsequential gameplay-wise and should make for a good opening quote when fighting it.

Oh, and Faraway Island has Mankey, Butterfree, and Primeape as find-able Pokemon now. This should be expanded upon later.
2022-10-17 16:57:42 +01:00
May Evans fce6c3221c Add Pokemon Mansion B2F
Very dissatisfied with the map as-is. Needs a lot of work, possibly another tileset based on the `interior` one. I tried adding one but came across constant problems and the one I came up with kind of sucked. No events or warps yet.
2022-10-16 12:10:50 +01:00
May Evans 78ae4e9029 Move Mew, add Old Sea Chart, add wild data
I am 90% sure something will bug out, can't test the map right now for obvious reasons. Tested everything else, though.

Mostly copied data from Cinnabar Volcano while commenting out Vermillion Dock Mew info to move it.

Wild data has been added along with a fishing group, just dummied out slots.

Old Sea Chart is a clone of the Citrine Pass which is all it needs to be. It is obtainable near the truck.
2022-10-16 09:05:26 +01:00
May Evans aa32cfec8d Add Faraway Island maps
This adds the maps on their own with fully functional warps between each other. Music has been set to Viridian Forest. Mew, wild data, and a way to get there have not been added.
2022-10-15 23:00:57 +01:00
MementoMartha c3fd568b7b Finishing the Gauntlet maps
All the trainers are still missing, as is the guard. But the maps themselves are accessible, and the wild encounters work too.
2022-10-13 23:27:30 +01:00
MementoMartha a05796ece5 Citrine Pass and a few little tweaks 2022-10-02 17:16:30 +01:00
MementoMartha f6f43781b8 PZ, Magnezone and the Dubious Disc 2022-10-01 20:53:37 +01:00
MementoMartha 8ff7b19ead Hinaazu & Betobebii 2022-10-01 19:32:28 +01:00
MementoMartha e2198dd402 Para! 2022-10-01 15:55:30 +01:00
May Evans d048beca12 cut catsprite from constants
this makes poke balls show up correctly
2022-10-01 14:49:57 +01:00
MementoMartha c6a0566063 fixing some errors with items 2022-09-30 16:54:56 +01:00
emaskyesmogon 22c4561b35 New Evo Items
Based Martha can fix
2022-09-30 09:37:46 -06:00
May Evans fcf6e26692 Add Giovanni's Hideout
This is part of the removal of the Rocket Hideout. Floor 1 is repurposed to be a lore-centric room for Giovanni's character, located in Viridian Gym. I plan to have the Protector and TM Earthquake moved here.

The TM26 item pickup doesn't work for some reason. Otherwise, it's complete.
2022-09-30 00:02:23 +01:00
MementoMartha fe33ec1040 Electivire & Magmortar! 2022-09-29 17:00:48 +01:00
MementoMartha fece27f7c2 6 more Pokemon!
Animon, Bellossom, Porygon2, Kingdra, Politoed and Slowking have been added fully.
2022-09-29 13:54:40 +01:00
MementoMartha f9d86cdde9 Town Map and PC stuff 2022-09-28 13:43:17 +01:00
MementoMartha 28b5d01e08 Freeing up some event space 2022-09-28 10:57:47 +01:00
emaskyesmogon 9d13923e8e Running Shoes and 30 Item Bag
need to fix layout link to futureproof it better but for now it works. Mart changes save space in wRAM.
2022-09-27 16:55:15 -06:00
MementoMartha d8cb5a331f polishing the added pokemon a little 2022-09-27 22:58:06 +01:00
emaskyesmogon e02394e8d2 Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack 2022-09-27 10:37:03 -06:00
emaskyesmogon 7e03467783 204 mons
Steelix, Tsubomitto, Blissey, Crobat and Hitmontop
2022-09-27 10:36:06 -06:00
May Evans 19d5f2293c Add trainers to Celadon University, add two new salesmen, etc
Overall completes Celadon University sans a problem with sprites being a bit corrupted until you leave. New Magikarp Salesman-esque events in other pokecenters which is kinda neat
2022-09-27 16:06:13 +01:00
MementoMartha 4eaae2ab9d Adding Cinnabar Volcano, editing a few encounters 2022-09-27 12:09:22 +01:00
May Evans 0b65243c75 Add more to Celadon University
This adds;
- Text and stuff on the interior to add some really nice worldbuilding
- Trainers outside that you can fight with repeatedly.

The trainers need yes/no menus but I can't figure it out for the life of me. If anyone can do it, lemme know!
2022-09-27 01:48:52 +01:00
May Evans c243548fc4 Add Trader to Celadon University
Includes fixes to allow trade evos to exist
2022-09-26 22:08:35 +01:00
BlueZangoose 0f5a9eb146
Change names of move subanimations to be meaningful (#389)
Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-09-25 14:17:39 -04:00
MementoMartha f74055e77b Removing version differences, and adding Mew 2022-09-25 14:03:04 +01:00
Rangi c299cf1067 Use a SPRITE_SET_LENGTH constant 2022-09-24 11:39:39 -04:00
Rangi d2be79adf1
Add constants and table macros for the map sprite sets (#392)
Fixes #391
2022-09-24 11:30:29 -04:00
May Evans 9e4e07ec82 Add Celadon University
Has the map connections, warps, and maps all done. A single person is there right now; Prof. Westwood V, as a reference to the early worldbuilding. I'll work on this more as time goes on.
2022-09-24 13:20:58 +01:00
May Evans 80c0e598f3 Add scrapped cat sprite
Nya~
Unused for now, but usable!
2022-09-22 17:56:29 +01:00
MementoMartha e5038016b0 Mostly map edits and a few other tweaks
Underwater Tunnel is a new area that links Route 25 to Route 10, basically just being a straight tunnel needing Surf to traverse.

Also given Seafoam Islands and Lorelei's room an unused palette that gives it a more icy feel
2022-09-17 23:42:19 +01:00
Rangi 3520a4c99a Distinguish Elite 4 "meta" constants from event constants
Fixes #390
2022-09-15 18:10:45 -04:00
MementoMartha aba9da027c Struggle fixes 2022-09-12 22:16:45 +01:00
Rangi d809d3d59c Add UNUSED_TYPE/UNUSED_TYPE_END constants
Fixes #385
2022-09-11 15:02:51 -04:00
Rangi cab3ccdbbd Comment about UndergroundPathNorthSouth.blk size
Fixes #387
2022-09-11 15:00:31 -04:00
Rangi e9e769fba1 Copy pokecrystal's map_const macro
Fixes #386
2022-09-11 15:00:06 -04:00
vulcandth 74cee737f6
Rename macros/wram.asm to macros/ram.asm (#388) 2022-09-11 01:05:04 -04:00
SatoMew 63a7eb2cf5
Improve NPC trade labels and comments (#384)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-09-10 13:44:31 -04:00
MementoMartha 75d4e47586 Implementing static Crocky encounter 2022-09-10 18:43:00 +01:00
MementoMartha e9b9fc324a Fossils and Fishing Rod tweaks
Moved the (Super) Fishing Rod over to Pewter, Decilla now comes from the Old Amber and Aerodactyl has a new fossil
2022-09-06 11:57:02 +01:00
MementoMartha 702724642b Evolutions sprites and a few other minor fixes 2022-09-05 16:12:16 +01:00
May Evans 3180772ed1 wild DV buff
It doesn't appear to work properly for ATK/DEF, but SPC/SPE worked with a couple Bellsprout so it's good enough for now.
2022-09-04 11:56:47 +01:00
emaskyesmogon b857f71b5a DV Fix and New Mon stats
Kleav, Licky and Tang still need sprites though
2022-09-03 20:23:58 -06:00
emaskyesmogon 8539b71fc7 PokeDex is fixed 2022-09-03 19:24:56 -06:00
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
dannye 5eff10358e Merge branch 'master' of https://github.com/pret/pokered 2021-04-10 22:38:40 -05:00
dannye e2220aaa57 Don't include old audio constants 2021-04-03 22:16:13 -05:00
dannye 17044ab7eb Fix battle sound pitch/tempo modifiers 2021-04-03 13:02:22 -05:00
dannye c1278c478e Fix pokeflute in battle sfx
and other small improvements
2021-03-28 23:23:45 -05:00
Rangi 95ec2cf039 Verify data table and name list sizes with assertion macros
Fixes #312
2021-03-25 16:44:41 -04:00
dannye e8dd755e18 Merge branch 'master' of https://github.com/pret/pokered 2021-03-23 01:19:51 -05: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
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