Commit graph

263 commits

Author SHA1 Message Date
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
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 91c79913fd fixing a few small bugs 2022-09-28 10:46:42 +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
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
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 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
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
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
May Evans 0c9da85a51 seems this is needed? 2022-08-31 17:45:23 +01:00
May Evans c1d2bc7678 more fixes 2022-08-31 15:50:28 +01:00
May Evans a216a0f2e7 more bug fixes 2022-08-31 15:28:36 +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
Rangi 09e92c554c Use ~X instead of $ff ^ X 2021-11-23 21:00:07 -05:00
Daniel Harding f3dbec09a8
Merge pull request #325 from CelestialAmber/master
Partially document CeruleanCity.asm
2021-05-31 15:43:57 -05:00
Daniel Harding c5bb400e08
Merge pull request #323 from KqesaR/master
Clean many labels of scripts of gyms
2021-05-31 15:42:41 -05:00
Rangi f9ae7b1240 More WRAM label cleanup (still needs UNIONs and renaming) 2021-05-31 16:25:16 -04:00
Amber Brault 7b5bcbc024 Update CeruleanCity.asm 2021-05-31 16:00:32 -04:00
Yoann Fievez a448ac897d Clean many labels of scripts of all gyms 2021-05-31 20:41:10 +02:00
Amber Brault 78b08c3a76 Partially document CeruleanCity.asm 2021-05-31 11:41:36 -04:00
Rangi 506a14084e
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318) 2021-04-13 18:24:37 -04:00
Rangi 2954013da1 Trim extra newlines from some files 2021-04-08 12:51:25 -04:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi 13d4d533f7 Sync more with pokeyellow 2020-11-06 10:33:58 -05:00
SatoMew 9e8caa1a10 Use the constant in all relevant situations 2020-09-22 19:15:37 +01:00
Rangi b506214f68 Identify some hSpriteDataOffset values 2020-08-30 16:33:14 -04:00
Rangi 637f38b139 Use decimal, not hex, for sprite (object) coordinates in map scripts 2020-08-28 12:10:55 -04:00
Rangi e88eebbc4d Consistent labels for Gym name scripts 2020-07-18 14:01:13 -04:00
Rangi 30ecbf6ea3 SONY -> RIVAL 2020-07-17 13:27:27 -04:00
Rangi 84abdb0237 $ec = "▷" 2020-07-16 12:48:42 -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 8c83ebe966 Define constants for in-game trades 2020-07-16 09:32:09 -04:00
Rangi 4b4ad9894e Disassemble the BLUEMONS.GB debug ROM 2020-07-15 13:35:39 -04:00
Rangi 5c0f33cb53 Use a 'trainer' macro for trainers in scripts/ 2020-07-14 15:53:25 -04:00
Rangi be326c6565 Factor out spinner tiles from RocketHideoutB2F since they're also used by ViridianGym, and to make their data and code more accessible 2020-07-14 15:14:32 -04:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi 4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi 13129459f1 Sync coordinate macros with pokecrystal 2020-07-07 11:30:10 -04:00
Rangi 45ed05decf Use HIGH() and LOW() 2020-07-07 11:10:29 -04:00
Rangi 06db7ec55b callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar 2020-07-06 21:18:22 -04:00
Rangi 77ed5f3820 Use ASCII quotes in comments 2020-07-06 21:15:12 -04:00
Rangi dd08b8dd6b Use labels for HRAM and VRAM 2020-07-06 21:13:17 -04:00
Rangi 772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi 9c2be80bf3 text_linkpromptbutton -> text_waitbutton
Fixes #260
2020-07-06 12:40:36 -04:00
Rangi 405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi 5fe8aab344 db $f6 == script_cable_club_receptionist 2020-07-05 19:55:03 -04:00
Rangi 2b2ed54bbf Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow 2020-07-05 17:51:29 -04:00
Rangi 139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -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 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 35deb77113 H_CONSTANTNAMES -> hConstantNames 2020-07-03 19:59:41 -04:00
Rangi 64da1f5d6b Move graphics-only object file sources into gfx/
Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes.

It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated").
2020-07-03 17:32:21 -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 d5089d3c62 Organize gfx/ 2020-06-27 21:43:32 -04:00
Rangi 4b853ad676
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
2020-06-27 15:32:24 -04:00
Matt aa030e9673 change input hex to constants 2020-05-05 21:42:40 -04:00
Matt 1978a37e19 document vermilion gym 2020-05-05 21:28:19 -04:00
Matt 8210dca8e5 label npc conditional text 2020-05-03 14:41:11 -04:00
Matt 6ec4b00b52 clean up vermilion labels 2020-05-03 14:25:01 -04:00
Matt b6aa26ffa4 label hardcoded HRAM address, start documenting Vermilion 2020-05-03 02:00:01 -04:00
Daniel Harding 5048f24816
Merge pull request #223 from pret/audio-macros
Audio macros
2020-02-05 17:59:01 -06:00
deak311andris 71090c1349 Deobfuscate Pewter city 2019-10-07 15:53:27 +02:00
deak311andris 1aa28afad4 Deobfuscate Viridian City 2019-10-07 15:45:45 +02:00
deak311andris 2e45c2946a Deobfuscate gyms consistently 2019-10-07 07:23:57 +02:00
deak311andris 8d2afb7c13 OaksLab deobfuscation 2019-10-03 15:19:30 +02:00
dannye 20c4116788 Update audio macro names
change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names
2019-07-27 23:21:39 -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
luckytyphlosion c085aa4a2a Fix spritestatedata macros to be prefixed with w. 2018-11-18 17:54:46 -05:00
xCrystal 237aeb8fbd Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x 2017-12-30 01:54:27 +01:00
Matthew Glazar d51dcc263e Remove duplicate OaksLabText labels
For unknown reasons, the text pointer list for Oak's Lab is
duplicated. This is currently implemented by treating the
two text pointer lists as one large list. This leads to
duplicate labels and some confusing logic.

Refactor the code to treat the two text pointer lists
separately. This lets us remove several labels. It also
makes the code which sets the text pointer list
self-documenting.
2017-04-02 13:32:21 -07:00
YamaArashi 77c3e22a4e use more HRAM constants 2016-10-29 10:32:03 -07:00
dannye 5207a14af3 Redo audio header macro 2016-07-27 22:08:13 -05:00
dannye 70dde9d96b Clean up redundant labels
fix trainer header numbering
2016-07-20 00:40:04 -05:00
dannye 80bae03975 Clean up text commands 2016-07-18 01:17:03 -05:00
dannye a51037eeee Remove the last address comments
except for wram.asm and sram.asm
also delete unused yellow file
2016-06-12 02:19:44 -05:00
dannye 48e0125bd6 Remove some leftover address comments 2016-06-12 01:42:19 -05:00
YamaArashi 7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
pikalaxalt d8dae96f35 Implement handy text macros from yellow 2016-06-09 21:20:02 -04:00
pikalaxalt a2f7701f34 Merge branch 'master' of https://github.com/pret/pokered 2016-06-09 20:45:02 -04:00
IIMarckus 3425fd6ef8 Sync somewhat with pokeyellow. 2016-06-08 05:45:50 -06: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
pikalaxalt 31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
IIMarckus adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
IIMarckus 72790bcbac Clean up labels and trainer headers for overworld Pokémon. 2016-04-06 20:58:45 -06:00