thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity
3439 commits 6 branches 0 tags 35 MiB
Commit graph

442 commits

Author SHA1 Message Date
May Evans 99fa5a27b9 Fix Mt. Moon Crater and Oak team choices 2022-12-14 20:03:55 +00:00
May Evans e7784604ce Faraway Island warp now works 
Essentially, I bruteforced making it work; made the tiles we desire be warps for us instead. You do this by noting the bottom-left tile of the block for some reason, so tile $30 of forest will be a warp tile even though it really looks like it shouldn't be. As far as I can tell, there are no consequences for this war crime code as long as you don't put a warp where it shouldn't be.
 2022-12-12 06:17:33 +00:00
May Evans d31edda1da Add Prof. Oak post-game fight 
This was surprisingly easy to add, albeit a bit awkward. I learned how to add trainer battles without headers this way, so I may go back to CeladonU and restructure with this in mind.

This commit adds a fully functioning Professor Oak fight, using the Rival party choice script as a launchpad. You can desynchronise the choices easily, just a few number changes. I used the S. S. Anne 2F and Route 22 scripts to hodgepodge it together.

Because of how I did this, Oak is fully re-fightable, taking inspiration from XY Serena's daily re-fights.

I tried to add a Yes/No prompt, but it would still pull you into the fight, presumably because it's calling a beforebattle script before the code. It's a bit of a hassle and my CeladonU code sucked, so I decided to leave it out for now.

It's intended to be unlocked once you enter the Hall of Fame, thus that change there. That hasn't been tested properly so uhhhh *shrug*
 2022-12-12 05:22:41 +00:00
May Evans 1042a9759b Finish the Pewter Museum of Science 
This fixes all the bugs with the Scarlet Book and Sada. Thanks to Vortiene for the help!
 2022-12-06 00:20:10 +00:00
May Evans 9ed18b1d8f Work on the Scarlet Book & Wild Data 
* Wild data added to the Mt. Moon Crater
* CoolTrainer NPC (young Sada) added to the Pewter Museum of Science.
* [EXPERIMENTAL] Added the Scarlet Book to the hidden item list for the Pewter Mueseum of Science.

Notes;
* This commit will not work without SV Pokemon being implemented.
* The Scarlet Book has not been placed correctly. The tileset for the museum doesn't load properly in Polished Map, so I'm kind of stumped. Neither has Sada.

Things to do:
* Add an NPC to Mt. Moon B2F that blocks off the crater, along with a warp there. NPC should disappear when you have 8 Gym Badges.
 2022-12-05 01:49:52 +00:00
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
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 97cb4cfaf3 Add another CeladonU NPC 
This is a reference to another bit of the Tamamushi booklets, where they talk about the Pokemon that can fly without wings.

Also, shortened one of the text chains. In general, they need to be much shorter.
 2022-10-17 13:09:14 +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 4cc05243ed Free roaming from Cerulean, add Faraway Island sign 
- Replaces tiles east and west of Cerulean so you can roam back to Mt. Moon and over to Rock Tunnel with no issue.
- Adds the Faraway Island sign, with a - "JI" bit to represent Mr. Fuji. This was in the Japanese release, but never got translated internationally. "I depart" may need fine-tuning, as it implies he died; this was a mistranslation, obviously.
- Added a text bank for the Mew encounter to make Martha's job easier later.
 2022-10-16 07:46:08 +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
emaskyesmogon a35fc22072 optional and nerfed brock 2022-10-14 17:51:37 -06: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 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
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
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
Rangi 3520a4c99a Distinguish Elite 4 "meta" constants from event constants 
Fixes #390
 2022-09-15 18:10:45 -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
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
dannye 5eff10358e Merge branch 'master' of https://github.com/pret/pokered 2021-04-10 22:38:40 -05:00
Rangi 2954013da1 Trim extra newlines from some files 2021-04-08 12:51:25 -04:00
dannye 3508dc8e1d Remove last few red audio variables 2021-03-29 00:42:28 -05:00
dannye c1278c478e Fix pokeflute in battle sfx 
and other small improvements
 2021-03-28 23:23:45 -05: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 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
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
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
dannye 87eed68710 Insert Crystal audio engine and music 
most credit goes to Sanqui
 2017-05-07 15:30:08 -05: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
PikalaxALT 1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
PikalaxALT 28dc5686b0 Fix game time labels 2016-01-03 14:18:33 -05:00
Marcus Huderle 1a5a108bdf Label elite four scripts more completely. 2015-12-18 20:03:09 -08:00
dannye 351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi 30063216cd use the new battle type constants 2015-08-29 23:35:58 -07:00
YamaArashi b6a7e5e9cf documented flags and misc. fixes 2015-08-29 17:15:05 -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 132d036752 named more variables 2015-08-12 22:14:31 -07:00
dannye fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05: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
dannye 66bc517605 Merge branch 'master' of https://github.com/YamaArashi/pokered 2015-08-10 00:00:12 -05:00
dannye 8a6d46f3d9 Replace some hardcoded data sizes 2015-08-09 23:56:20 -05:00
YamaArashi 2b01815999 commented audio code 2015-08-08 22:32:44 -07:00
YamaArashi 525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
dannye f8a9c37a00 Use more lb 
and other clean up
 2015-08-05 16:25:58 -05:00
YamaArashi 93255d6d17 yet more naming 2015-07-25 19:26:54 -07:00
YamaArashi 7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi 82512e4491 named animation functions/variables 2015-07-24 14:39:45 -07:00
YamaArashi e6d02b4b7b make route22 rival events more consistent 2015-07-23 21:20:20 -07:00
YamaArashi 6af65df2fc named function 2015-07-23 21:00:30 -07:00
YamaArashi 04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -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
YamaArashi dcc7f3bc9f named more constants 2015-07-21 14:21:14 -07:00
YamaArashi 73171bfff5 named most of the used events 2015-07-21 10:36:03 -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
YamaArashi e607199397 replace uses of minus one 2015-07-19 14:01:08 -07:00
YamaArashi 02bd91b707 jpab/jpba macros 2015-07-19 11:56:13 -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
YamaArashi d0526c0362 small changes 2015-07-18 22:34:11 -07:00
YamaArashi c169073eed misc 2015-07-18 21:58:55 -07:00
dannye 148d3f3cf2 Consolidate coord macros 2015-07-18 15:52:03 -05:00
YamaArashi fc9af362ae fix variable naming 2015-07-18 08:17:46 -07:00
YamaArashi 6931ce9625 money / coins hram constants 2015-07-17 01:22:00 -07:00
dannye fb559f1f4e More direction constants 
facing directions, npc movement, joypad
 2015-07-17 02:52:25 -05: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 ac78dda7d8 more movement stuff 2015-07-15 13:58:21 -07:00
YamaArashi 994c2cbf28 named wram variables 2015-07-14 23:16:06 -07:00
YamaArashi 07dd705637 hall of fame / credits 2015-07-14 19:46:52 -07:00
YamaArashi 01631a2e59 player animations, emotion bubbles, etc. 2015-07-14 14:32:49 -07:00
dannye ef9e59101e Use more screen dimension constants 2015-07-14 02:16:19 -05: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
dannye b509b48a7f Use more *Coord 
also town map code relabelling
YamaArashi just did town map relabelling but oh well
I aleady made the changes and don't feel like redoing it
 2015-07-14 00:21:03 -05: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
dannye f702fc7840 Start using text predef macros 
also sprite direction constants
 2015-07-04 00:47:29 -05:00
U-Daniel-PC\Daniel bc6f0bc08a More TX_ASM 2015-07-03 22:49:20 -05:00
U-Daniel-PC\Daniel 5d9d26bd5c No more ldh 2015-07-03 15:13:35 -05:00
U-Daniel-PC\Daniel 8431fa7756 TX_ASM 2015-07-03 14:58:50 -05:00
U-Daniel-PC\Daniel f4a31b3e0b Rename/organize part 2 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:38:12 -05:00
U-Daniel-PC\Daniel 013c2c7d66 Hardcoded audio bank references 2015-06-12 11:42:39 -05:00
U-Daniel-PC\Daniel 695757abe5 Name a few unknowns 2015-06-12 11:00:48 -05:00
U-Daniel-PC\Daniel 3cd3efd060 Name the last of unnamed text 2015-06-12 11:00:25 -05:00
U-Daniel-PC\Daniel 084c8407d8 Remove hard-coded wPokedexOwned/wPokedexSeen array size 2015-02-20 01:01:57 -05:00
yenatch b65c6e8156 Merge remote-tracking branch 'origin/master' 2015-02-13 14:50:56 -08:00
YamaArashi 32f7cf12de Named wram symbols 2015-02-07 18:37:40 -08:00
yenatch 451f7fce29 Pick off some more static map ids. 2015-02-07 11:18:28 -08:00
YamaArashi 3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
U-Daniel-PC\Daniel 49a25618ea Clean up white space, fix label typo 2015-01-22 22:13:21 -05:00
IIMarckus 5ea1d8a61f Labels for Fuji in Pokémon Tower. 2014-10-26 21:00:29 -06:00
IIMarckus 5459477ecd Merge branch 'master' of https://github.com/dannye/pokered 2014-10-20 18:56:21 -06:00
IIMarckus 519dd7fd56 Improve labels for Yellow Safari Zone entrance. 2014-10-18 08:57:53 -06:00
IIMarckus a36e090d43 Add parts of the Safari Zone entrance script from Yellow. 2014-10-17 22:47:31 -06:00
IIMarckus deb2db01cb Replace hardcoded pointer with label. 2014-10-17 13:16:11 -06:00
IIMarckus 292cf55bad More idioms. 2014-10-17 09:28:15 -06:00
IIMarckus 7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
IIMarckus 008cface52 Minor comment/label improvements in Cinnabar Lab. 2014-10-16 00:12:44 -06:00
U-Daniel-PC\Daniel 0991bd3abe A few static hide/show ids 2014-09-26 09:26:18 -04: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 a81487e9c6 Rename hVBlank* constants to h*. 2014-09-23 15:02:03 -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
YamaArashi 2ed65d9c3e Commented/labelled misc functions 2014-09-14 11:29:18 -07:00
YamaArashi 0c916aea33 Commented more sprite and map code 2014-09-13 00:50:56 -07:00
YamaArashi 91793015e5 Labelled and commented mostly sprite-related things 2014-09-09 20:55:19 -07:00
yenatch 365ae68d80 Use PARTY_LENGTH and related constants in menu and hud code. 
This should allow reducing PARTY_LENGTH to work as intended.
Increasing it also works provided space is provided in wram, but breaks pc/saving.
 2014-08-22 23:17:47 -07:00
YamaArashi 59f0507e4c Labelled many functions/variables 2014-08-08 22:39:13 -07:00
U-Fish-PC\Daniel bd533aa79b Use *Coord instead of FuncCoord 
Using 'Coord =' doesn't like using wTileMap
So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord
to avoid static addresses
 2014-06-25 16:58:27 -04:00
yenatch b36f793667 Use macros for predef calls/jumps instead of static ids. 2014-06-16 13:57:26 -07:00
yenatch d10108a066 Use macros to define predefs. 2014-06-16 13:25:46 -07:00
yenatch 35f2bb90d4 Rename predef functions so they aren't excessive in length. 
This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
 2014-06-16 13:03:05 -07:00
yenatch 38ac74f222 Remove generated "indirect jump" comments. 
The destination is obvious when using the predef macro.
 2014-06-16 11:37:36 -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 b83acb03e5 Clean up white space 2014-06-09 16:58:02 -04:00
U-Fish-PC\Daniel 32de1b2694 Relabel a few missed map scripts and TheEndTextString 2014-05-31 10:35:46 -04:00
U-Fish-PC\Daniel 286c160c27 Merge branch 'master' of https://github.com/yenatch/pokered 
Conflicts:
	engine/battle/1c.asm
 2014-05-30 13:17:47 -04:00
yenatch da0a72cdbf Use VRAM constants where applicable. 2014-05-29 01:31:46 -07:00
U-Fish-PC\Daniel 89be95cded TM_28 in Cerulean script 2014-05-28 15:30:06 -04: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 4be11293e5 Label BCD math predefs. 2014-05-25 17:27:02 -07:00
yenatch 031e33957d Rename joypad registers. 2014-05-25 10:53:09 -07:00
yenatch d307c85499 Clean up some bank 3 functions and rename flag action functions. 2014-05-25 10:09:39 -07:00
yenatch 64479cd642 Rename random number function and hram labels. 
GenRandom -> Random
GenRandomInBattle -> BattleRandom
H_RAND1 -> hRandomAdd
H_RAND2 -> hRandomSub
 2014-05-24 11:40:38 -07:00
yenatch 8f8281fe6e Comment some more bank 0 functions. 2014-05-23 15:34:35 -07:00
U-Fish-PC\Daniel 15427f5320 Pull a lot of engine out of main.asm 2014-05-22 18:13:20 -04:00
U-Fish-PC\Daniel 77e300927b Name hidden object routines 2014-05-21 19:13:07 -04:00
U-Fish-PC\Daniel a9528fc870 More misc relabelling 2014-05-21 13:10:07 -04:00
U-Fish-PC\Daniel f29c4e473e Misc relabelling 2014-05-21 11:58:18 -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 24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00