Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-31 20:52:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,754 Commits 2 Branches 0 Tags 366 MiB
2ff6f20f42
Commit Graph

374 Commits

Author SHA1 Message Date
cawtds
d7519b540e dynamax candy functionality 2024-06-01 21:12:29 +02:00
cawtds
48013b0879 added mint functionality and nature mod color 2024-05-30 14:29:40 +02:00
cawtds
253c75849b updated daycare/egg hatching: 
added nature inheritance
updated iv inheritance
updated incense based species
added item based egg moves
added ability inheritance
updated egg species determination for regional variants
 2024-05-26 21:04:00 +02:00
cawtds
d55f15e57e readded some key item field functions, pokedex refactoring 2024-05-25 14:45:33 +02:00
Deokishisu
4578a59673
Fix Localization Oversight in Daisy's Text 
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
 2024-05-24 22:09:31 -04:00
cawtds
cf09c3d886 fixed mr mime typing 
fixed pokedex screen crashing after battle due to memory
fixed dex ordering modes a-z, lightest, smallest and type
 2024-05-20 17:53:56 +02:00
cawtds
64f3aa42f1 finished revival blessing 2024-05-19 13:00:15 +02:00
cawtds
5ea880f8b7 fixed z-moves 2024-05-18 13:53:20 +02:00
cawtds
b801236595 added dynamax 2024-05-17 18:44:29 +02:00
cawtds
b2a56f6b6c added new pokeball graphics, fixed/refactored tmhms, smaller pokedex entry font to fit whole text 2024-05-14 22:20:07 +02:00
cawtds
2b3e3789a7 fixed learning tmhm moves, fixed and refactored tutor moves 2024-05-14 19:48:52 +02:00
cawtds
56d32c797d finished updating battle_main, removed unused functions/variables, fixed trainer money rewards 2024-05-12 02:30:07 +02:00
cawtds
94cebee475 updated battle intro 2024-05-11 16:32:29 +02:00
cawtds
87b28b8041 prep battle controller refactoring, add trainer for double battle tests 2024-05-09 17:47:03 +02:00
cawtds
8ab3940a99 added mega evolution, removed old type effectiveness 2024-05-09 12:48:10 +02:00
cawtds
c2e0ab5d73
Rtc implementation (#5) 
added RTC and fixed time based evolutions
 2024-05-05 14:20:30 +02:00
cawtds
6ec21fcd8a updated up to Cmd_handleballthrow 2024-05-02 12:24:35 +02:00
cawtds
09a32a59f3 updated up to Cmd_removeitem 2024-05-01 22:22:17 +02:00
cawtds
965d08e6df updated Cmd_returnball and ItemBattleEffects 2024-05-01 12:56:52 +02:00
cawtds
395e4d0cb6 seperated kanto dex from national dex 
included cross generational evolutions in kanto dex
removed debug prints
 2024-04-27 02:03:51 +02:00
cawtds
d17698ee8f changed all ability variables to u16 or larger 
added ability capsule and ability patch functionality
removed unused ribbons to free space in pokemonsubstruct3 for hidden ability
 2024-04-26 22:09:46 +02:00
cawtds
1766e837b4 readded pokeflute out of battle use 
added reduceEv out of battle use
added resetEvs out of battle use
 2024-04-26 17:57:46 +02:00
cawtds
e5172d1b48 fixed evolution stone usage 
GetEvolutionTargetSpecies now usesnew evolution handling
removed national dex restriction for gen2+ evolutions
 2024-04-25 23:12:36 +02:00
cawtds
04c1ecb778 fixed exp candies 2024-04-24 21:38:28 +02:00
cawtds
ef015afb79 fixed in battle and out of battle item usage; 
removed some debug prints
fixed numerical order to show correct entries
refactored pp functions
expanded CannotUseBagBattleItem to CannotUseItemsInBattle
 2024-04-23 21:57:55 +02:00
cawtds
a06fb5c287 add item_icons for new items 2024-04-21 22:04:34 +02:00
cawtds
71b9b1ef25 added missing battle functionality for items 2024-04-20 13:07:53 +02:00
cawtds
d869d3355d first changes to item_use in preparation for new items 2024-04-16 21:40:57 +02:00
cawtds
356ffd1627 added fairy type 2024-03-23 15:40:31 +01:00
Edward Nolan
93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -04:00
GriffinR
673c86c56f
Merge branch 'master' into sync-text 2022-11-26 18:08:49 -05:00
GriffinR
e78094de85 Document fonts 2022-11-22 14:20:27 -05:00
GriffinR
a19cb44458 Clean up mystery gift sync, document wonder news 2022-11-22 01:58:30 -05:00
GriffinR
a7609df31b Sync union_room_player_avatar 2022-11-08 13:37:11 -05:00
GriffinR
9983b41c1d Sync union room 2022-11-08 01:19:15 -05:00
GriffinR
403cbeded2 Fix Marcos/Macros typo 2022-10-30 22:01:45 -04:00
GriffinR
f096196c91
Merge branch 'master' into porymap-5 2022-10-27 14:16:25 -04:00
GriffinR
2b2bf84502 Use actual flag values for hidden items 2022-10-25 14:51:01 -04:00
GriffinR
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -04:00
GriffinR
bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR
0400ee2124
Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
Jaizu
ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR
5dc80c492a
Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3 
Sync src/battle_util.c with pokeemerald
 2022-08-17 11:29:51 -04:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
GriffinR
2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR
f113da30ad Use 'goto_if_eq VAR, value, Script' syntax 2022-08-09 20:41:54 -04:00
GriffinR
3add78dbd1 Use constants for setfieldeffectargument 2022-08-09 20:12:26 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
0c1adf2115 Use seteventmon 2022-08-09 15:29:16 -04:00
GriffinR
8e7dd94eca Drop some optional script command arguments 2022-08-09 15:25:44 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
GriffinR
9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
GriffinR
75c7e67f00 Fix Museum_1F -> PokemonCenter_1F text 2022-06-24 19:02:11 -04:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -05:00
cbt6
ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR
38601cf09b Reformat clone objects in JSON 2022-02-05 14:34:53 -05:00
LOuroboros
cdfaa6a3ac Informative note about PewterCity_Gym_Text_BrockDefeat 2021-06-26 04:10:05 -03:00
GriffinR
7deccc36b7 Name unused house maps/map groups 2021-05-13 12:51:45 -04:00
GriffinR
75f2be2e29 Name map groups 2021-04-28 16:37:08 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00
SatoMew
9b6469a7a3 Fix Record Corner labels 2021-04-10 18:43:10 +01:00
PikalaxALT
f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
Deokishisu
0589bd5827 Fix Typos / Use Box Constants 
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.

The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.

Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
 2021-03-10 16:22:08 -05:00
Deokishisu
57e3f5e0f8 Mirror pokeemerald PR#1329 & PR#1335 to pokefirered 
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.

The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.

I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
 2021-02-16 16:56:31 -05:00
GriffinR
515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
Deokishisu
ee0fb9ea5a Fix TM34 Transposition Typo 
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
 2021-02-03 19:54:45 -05:00
GriffinR
b7a88180d3 Fix Fuchsica typo 2020-08-31 21:37:59 -04:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
GriffinR
d6a494551a Fix corresponding mislabeled rival script 2020-05-04 14:45:07 -04:00
GriffinR
5bd2c0ef5c Fix mislabeled starter script 2020-05-04 14:34:45 -04:00
PikalaxALT
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
PikalaxALT
af32535610 Name all specials 2020-03-31 08:49:47 -04:00
PikalaxALT
0f618efb15 Finish overworld.c 2020-03-28 21:39:28 -04:00
PikalaxALT
9bcc82856d Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 12:26:00 -04:00
PikalaxALT
816e7ad1f8 through ChooseAmbientCrySpecies 2020-03-28 10:42:23 -04:00
GriffinR
eebe7f2233 Use trainer type constants 2020-03-27 10:21:26 -04:00
PikalaxALT
402f2643bd Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar 2020-03-26 17:07:52 -04:00
GriffinR
6cf4bc4101 Label object event graphics 2020-03-26 13:39:40 -04:00
PikalaxALT
5b3e9f376b through PlayerGetCopyableMovement 2020-03-23 21:42:35 -04:00
PikalaxALT
f9a3607824 through CheckForObjectEventCollision 2020-03-23 08:54:37 -04:00
PikalaxALT
e078e4b315 Some documentation of field_control_avatar and related routines 2020-03-19 08:45:32 -04:00
PikalaxALT
901fceec18 through GetInteractedObjectEventScript 2020-03-17 20:59:39 -04:00
GriffinR
d450d5d406 var_value to string 2020-03-13 01:21:46 -04:00
GriffinR
a0f951b09c trainer_type and trainer_sight_or_berry_tree_id to string 2020-03-11 12:08:08 -04:00
PikalaxALT
362cddc0f5
Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -05:00
GriffinR
4df660dc76 Add enums for help system text, label help context 2020-03-04 18:26:54 -05:00
GriffinR
13e06bf7f8 Combine special prefixes, drop more 2020-03-04 10:42:16 -05:00
GriffinR
ce3e1b8af0 Add missing movement type constant use 2020-03-03 22:25:48 -05:00
GriffinR
4c1d30a832 Add more metatile labels 2020-03-03 22:23:40 -05:00
GriffinR
9fbe7e14a8 Label remaining JP script text 2020-03-03 17:50:24 -05:00
GriffinR
7af1b35d17 Sync some specials/drop unnecessary prefixes 2020-03-03 17:45:25 -05:00
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -05:00
GriffinR
42e6e9bd9c Remove interactwith from field move scripts 2020-03-02 14:55:20 -05:00