Commit graph

324 commits

Author SHA1 Message Date
May Evans fc597000fb Fix trainer sprite loading
Moved Yujirou to the end of the file and made the bank switching code more efficient, was swamp code before.
2023-04-02 21:37:57 +01:00
May Evans 67132fefcb Yujirou Event Scripting, half-finished
This code has a lot of problems with solutions that me and Frrf can't seem to figure out. We've taken a lot of references from Erika's Gym but we've got many bugs after Yujirou is defeated, such as one case where you end up instantly doing the rematch fight, which is insane because there's no way this can actually happen.

What's committed is a fight that can be re-fought when it shouldn't.
2023-03-30 21:01:18 +01:00
May Evans 188da49450 QoL Tweaks
- Brock skip works properly
- Removed a Cut tree south of Cerulean
- "disabled!" is now "Disabled!" because the grammar burned my eyes
2023-03-28 20:02:22 +01:00
Vortyne 17eaf761e3
Name some unnamed animation constants (#396) 2023-03-25 23:31:59 -04:00
May Evans a85c26b7d3 LOTS of things
- Replaces the Old Rod with the Candy Sack, an item to evolve Meltan into Melmetal. Meltan and Melmetal aren't in yet.
- Improves Gym Leader and Elite Four AI by a lot. They still use items, they're just better. Fixes XSpecial use while we're at it; before, it didn't actually increase the stat...
- The Scarlet Book now takes up both shelves, one section for each Paradox Pokemon. I also moved the bookshelf so it looks nicer.
- Text in Celadon University has been reduced significantly, taking up less memory and being a bit more RBY-like. It has also been made more accurate (thanks to Daiginjo for translating my booklet!)
- The Magikarp researcher in Celadon University now gives TM Dragon Rage (no longer unused!)
- Added a guard for Mt. Moon Crater.
- Removed TrainerNamePointers, Blank Leader Name Code, and Dakutens/Hakutens using a guide published by YakiNeen.
- PP no longer uses a shitty graphic and is instead properly implemented into the font, optimising the status screen. Also displays in-battle which is kinda cool.
- Lorelei, Bruno, and Agatha now play the Gym Leader theme, not just Lance.

Still unsure how to fix Celadon University's trainers, all I know is a lot of the information should be taken from the Oak fight I did. The code is radically different and doesn't call trainer headers at all. You'll likely want to start from scratch.

The Mt. Moon Crater Guard's text is a little wonky, not sure what's up there. May have been from the way I accessed Mt. Moon in testing. Anyway, if you want to mess around feel free.
2023-02-19 06:25:33 +00:00
dannye 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06:00
MementoMartha a05796ece5 Citrine Pass and a few little tweaks 2022-10-02 17:16: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
May Evans bcef765d45 Fix the Ghost identification and squiggly lines from night shade, etc
pretty objective fixes, need to make the rocket hideout more interesting
2022-09-28 13:59:54 +01:00
MementoMartha 91c79913fd fixing a few small bugs 2022-09-28 10:46:42 +01:00
MementoMartha d8cb5a331f polishing the added pokemon a little 2022-09-27 22:58:06 +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
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
MementoMartha aba9da027c Struggle fixes 2022-09-12 22:16:45 +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
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
emaskyesmogon 392f7abb97 Yellow Trainer Arrays
Allows more freedom in enemy design
2022-09-02 20:34:43 -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 a216a0f2e7 more bug fixes 2022-08-31 15:28:36 +01:00
May Evans 648289d4a9 lots of bug fixes
added a log for them in the readme
2022-08-31 15:18:16 +01:00
May Evans 7c6bbb630f Fix a bunch of single player battle engine bugs
went through a bunch of the tutorials here;
https://github.com/pret/pokered/wiki/Bugs-and-Glitches#blaine-uses-super-potion-even-when-his-pok%C3%A9mon-arent-below-10-health

Overall:
- Blaine is no longer addicted to Super Potions
- CoolTrainerF no longer switches a lot
- Transformed Pokemon aren't presumed to be Dittos (very important given Animon)
- Status curing items don't remove modifiers anymore
- Learning new moves plays the sound in the correct bank
2022-08-31 14:42:36 +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
SatoMew ac7263b1ad
Update comments related to Swift and Substitute checks (#380)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-08-11 21:22:57 -04:00
Rangi 498da6ab09 Clarify how Metronome picks a move 2022-07-26 00:01:21 -04:00
Rangi 8f81e71f19 Identify some .asm_* labels 2022-07-10 21:11:03 -04:00
Colton G. Rushton cc46b0e510
wOAMBuffer -> wShadowOAM (#370) 2022-07-09 17:18:18 -04:00
vulcandth fcd6e5a1b2
Stop_reducing_move_anim_flashing_Dream_Eater -> Stop_reducing_move_anim_flashing_Blizzard (#369) 2022-06-30 21:24:33 -04:00
Rangi 4e96f9d232 cp MR_FUJIS_HOUSE -> cp POKEMON_TOWER_7F + 1
Fixes #362
2022-06-17 22:58:46 -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
vulcandth 6b5be9129c
RGBDS syntax updates (#358)
New MACRO and DEF syntax
2022-06-06 17:25:31 -04:00
vulcandth d7808d110f
Improved Virtual Console patch identifiers (#357) 2022-06-06 17:22:34 -04:00
vulcandth fe8d3c51a4
Build the Virtual Console patches with make red_vc and make blue_vc (#351) 2022-03-26 16:59:36 -04:00
Rangi 7e78c1171d Gen 1's Minimize graphic was not a complete 8x8 tile 2022-03-04 18:21:12 -05:00
Rangi 09e92c554c Use ~X instead of $ff ^ X 2021-11-23 21:00:07 -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
Yoann Fievez 8349bfd8e6
Refactorize check button pressed (#340) 2021-11-05 15:40:15 -04:00
Rangi 2ee8ce26da Comment on the CooltrainerFAI bug
Fixes #308
2021-11-03 17:07:08 -04:00
Rangi 58d08bff43 Identify some percentage constant values 2021-11-02 19:57:08 -04:00
Amber Brault 30acb46b98
Fix typos (#334) 2021-09-26 21:57:55 -05:00
Rangi 7ee8a6509e wcf4b -> wStringBuffer 2021-08-28 17:02:20 -04:00
SnorlaxMonster 319c29c751 Correct comments on SwitchAndTeleportEffect
The comments in the SwitchAndTeleportEffect section incorrectly stated
that the random number was generated in the
half-open interval [0, playerLevel + enemyLevel),
instead of the closed interval [0, playerLevel + enemyLevel].
2021-06-14 21:47:19 +10:00
Rangi f9ae7b1240 More WRAM label cleanup (still needs UNIONs and renaming) 2021-05-31 16:25:16 -04:00
Rangi 8701ef4d61 Improve some RAM formatting 2021-05-31 11:46:10 -04:00
Rangi c8626595b4 Use BANK("Pics #") for Pokémon and trainer pics 2021-05-06 23:04:00 -04:00
Rangi 6a31663c96 Use {interpolation} to generate sequences of RAM labels
Fixes #319
2021-04-27 15:49:59 -04:00
dannye 5eff10358e Merge branch 'master' of https://github.com/pret/pokered 2021-04-10 22:38:40 -05:00
dannye 17044ab7eb Fix battle sound pitch/tempo modifiers 2021-04-03 13:02:22 -05:00
dannye b2afaae7ab Fix remaining uses of fade 2021-03-30 01:06:32 -05:00
dannye fa206ce835 Fix incorrect sfx id
AUDIO_1 is loaded during trade animations, not AUDIO_2
2021-03-30 01:03:30 -05: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 5f87413b23 Move crysaudio ram from sram to wram 2021-03-28 12:26:46 -05:00
dannye 459b5bd615 Misc clean up and small improvements 2021-03-28 02:23:54 -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 5c9c7bf362 Clean up handling of extra effective status effects 2021-02-21 11:43:38 -06:00
Rangi 95353fdefa Identify hUILayoutFlags 2021-02-13 19:48:34 -05:00
SatoMew 083cb38e33 Update related tile animation constants 2020-11-29 21:28:38 +00:00
SatoMew 242b2e05cf Label and document hFFD7 more accurately 2020-11-29 20:17:29 +00:00
Rangi 6adbaefde1 Keep wGrassMons and wWaterMons together with a UNION 2020-11-28 17:11:12 -05:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
dannye afc4ce2dc5 Use more joypad constants 2020-11-07 21:07:07 -06:00
Rangi 13d4d533f7 Sync more with pokeyellow 2020-11-06 10:33:58 -05:00
Rangi e16dec874a Sync more with pokeyellow 2020-11-05 16:55:39 -05:00
Rangi 2a4b8b5a24 Remove trailing whitespace 2020-11-05 15:17:39 -05:00
Rangi 379a563c43 All battle back pictures end with "b" 2020-11-05 11:04:20 -05:00
Rangi bc287b9b80 Some formatting changes 2020-10-19 20:26:35 -04: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 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 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 884ef9c1a8 Factor out animation tilemaps 2020-07-16 22:23:31 -04:00
Rangi 6f7337bbb1 Define constants for subanimation transform types 2020-07-16 22:14:39 -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 0db7ee08ff Use a macro for BattleTransition_DoubleCircle data 2020-07-16 20:11:00 -04:00
Rangi cd71ae03af Separate move/battle animation data from move data (to do: further identify animation data labels+constants) 2020-07-16 19:50:48 -04:00
Rangi 58f1089370 Define constants for default trainer DVs 2020-07-16 09:40:30 -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 772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi 2b2ed54bbf Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow 2020-07-05 17:51:29 -04:00
Rangi a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi 155695cbfe Use constants for damage limits in CalculateDamage
Fixes #255
2020-07-05 15:12:29 -04:00
Rangi b30b14f322 Correct comments in AISwitchIfEnoughMons
Fixes #244
2020-07-05 14:40:20 -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