Commit graph

175 commits

Author SHA1 Message Date
MementoMartha a05796ece5 Citrine Pass and a few little tweaks 2022-10-02 17:16:30 +01:00
MementoMartha 2c81593537 more fixes 2022-10-01 13:15:58 +01:00
MementoMartha 830c3c3b1d more back door edits 2022-10-01 13:03:53 +01:00
MementoMartha a10c48a514 fixing a bug, adding a trainer 2022-10-01 12:23:58 +01:00
MementoMartha 91344e05e8 Rocket hideout improvements/changes 2022-10-01 11:38:00 +01:00
emaskyesmogon 74c0622040 Silph Co
Warps and elevator commented out
2022-09-30 15:59:25 -06:00
May Evans 4369a81d67 Update RocketHideoutB1F.asm 2022-09-30 14:09:51 +01: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
emaskyesmogon 1f57257315 Pokemon Tower Shortened
Added wild mons to floor 2
2022-09-29 15:52:28 -06:00
emaskyesmogon 781070a12a Update ViridianGym.asm
this one has the right coordinates oops
2022-09-29 15:31:11 -06:00
emaskyesmogon 05b901e62c Update ViridianGym.asm 2022-09-29 15:29:14 -06:00
emaskyesmogon 0621ab3df0 Viridian Gym
map edits to allow hideout warp
2022-09-29 15:28:59 -06:00
May Evans 4e9399bed5 more things for celadon u 2022-09-28 15:58:30 +01:00
May Evans 5bb215ec23 revert 2 bug fixes due to issues, add to celadon U
the ghost without silph scope fix doesn't work due to a codebase change, and the night shade wiggly animation causes a bank overflow

celadon university has 3 more books detailing lore from one of the old pokedex books
2022-09-28 14:50:54 +01:00
MementoMartha f9d86cdde9 Town Map and PC stuff 2022-09-28 13:43:17 +01:00
MementoMartha 91c79913fd fixing a few small bugs 2022-09-28 10:46:42 +01: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 89bb05b2dc added roingus girl and new cinnabar quiz questions 2022-09-27 15:26:37 +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
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
MementoMartha 22fa5782ad Some map/sprite edits 2022-09-22 10:15:32 +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
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 93e1e4c2f5 A few small tweaks
Misty, Brock, Red and Blue use their Yellow sprites, and Sea Cottage has been changed to Bill's Lighthouse from the anime.
2022-09-06 07:17:36 +01:00
emaskyesmogon b959e0bbe0 Underground Path
Allows Rock Tunnel to be optional
2022-09-01 08:52:16 -06:00
emaskyesmogon 363fe3c315 oop
these were supposed to be in the last commit
2022-09-01 08:37:56 -06:00
MementoMartha 7cd9a4b5f4 oh yeah, these too 2022-09-01 02:56:10 +01:00
May Evans 0c9da85a51 seems this is needed? 2022-08-31 17:45:23 +01:00
May Evans 8dafe51b13 Update DiglettsCave.asm 2022-08-31 17:28:26 +01:00
May Evans 697d478577 add more fossils etc 2022-08-31 17:26:15 +01:00
May Evans 585315dcfa add kabutops stationary
i simply do not know how to make the right missingno. show up!
2022-08-31 17:22:36 +01:00
May Evans 878f15ecda add crocky stationary..? 2022-08-31 17:20:31 +01:00
May Evans dbd504a154 associate diglett's cave theme? 2022-08-31 16:24:24 +01:00
May Evans 68941ff945 upper floor rock tunnel changes
Elevation added, scenery improved, surf zone added, generally just nicer to travel through
2022-08-31 02:04:26 +01:00
vulcandth ce4c2d3d12
Remove empty lines on the top of map header files (#375) 2022-07-10 23:42:17 -04:00
vulcandth 6b5be9129c
RGBDS syntax updates (#358)
New MACRO and DEF syntax
2022-06-06 17:25:31 -04:00
Rangi fc899e1906 warp_event warp IDs start at 1, like in pokegold/pokecrystal 2021-10-05 21:02:42 -04:00
Rangi 52660012c6 Clean up some redundant or unusual event comments 2021-10-05 20:46:46 -04:00
Rangi d48a318dbf Align object_event coordinates
Fixes #336
2021-09-26 23:20:57 -04:00
Yoann Fievez 2c4f35848b
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289

* Rename warp to warp_event

* Replace object to object_event

* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
2021-09-26 21:56:09 -05:00
SatoMew d966193d7b Change terminology as per feedback 2021-05-08 23:20:52 +01:00
SatoMew b3364f9f88 Identify the connections between Routes 22 and 23 as unused 2021-05-08 13:24:33 +01:00
dannye 5eff10358e Merge branch 'master' of https://github.com/pret/pokered 2021-04-10 22:38:40 -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
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi 2a4b8b5a24 Remove trailing whitespace 2020-11-05 15:17:39 -05:00
Rangi bfd9f617c9 Use constants to delineate map types, and factor out more data 2020-08-31 10:23:19 -04:00
Rangi 48da6c53be Align warp and sign coordinates 2020-08-21 12:04:49 -04:00
Rangi 4373aafac1 Use def_warps_to macro for automatic warp_to entries 2020-08-17 18:08:54 -04:00
Rangi f4514ff53c Use map constants for SilphCoElevator warps 2020-08-17 17:40:27 -04:00
Rangi e2c99f1910 Use def_* macros for automatic map event counts 2020-08-17 16:54:59 -04:00
Rangi 2fe1505bab Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects 2020-08-17 14:25:11 -04:00
Rangi 3b003960d4 Fix Town Map coordinates to be in (X, Y) order as comments claim 2020-08-17 13:40:20 -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 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
TheFakeMateo 4ecff22f71 Deobfuscate exit warps on indoor maps 2020-07-15 18:12:58 -05:00
Rangi 15bcd88228 Indent comments that describe data table macro formats 2020-07-15 12:39:50 -04:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi a49ca6ef41 Factor out MapBadgeFlags and EscapeRopeTilesets data tables 2020-07-08 10:31:44 -04:00
Rangi 405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -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 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 55bb99580e data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects
To do: Polished Map support for loading the objects
2020-07-03 18:19:56 -04:00
Rangi 62e137f6ce Factor out data/sprites/ 2020-07-03 16:58:55 -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