Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-11 06:25:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,563 Commits 2 Branches 0 Tags 366 MiB
e78094de85
Commit Graph

426 Commits

Author SHA1 Message Date
Eduardo Quezada
dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada
c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada
7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada
0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
Eduardo Quezada
f5e9cc595b Multiple changes 
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
 2022-07-27 18:14:48 -04:00
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR
16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR
a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
cbt6
0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
GriffinR
59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
cbt6
0f3e26f9a4 Fix formatting and style 2022-02-10 01:53:48 +08: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
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
lioniac
0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
Squeetz
d4695fffe7 Rename and document HITMARKER_x100000 
This marker makes the target unable to Counter or Mirror Coat the damage back to an attacker, however the game does not have a scenario where this is applicable since all its uses are in end-turn events. It's used for all passive damage, where the damage dealt isn't coming from an attacker.
Alternate name: HITMARKER_NO_ATTACKER
 2021-08-11 15:45:30 +02:00
PikalaxALT
3dce3407d5
Merge pull request #427 from GriffinRichards/name-mapgroups 
Name map groups
 2021-05-13 14:24:11 -04:00
GriffinR
7deccc36b7 Name unused house maps/map groups 2021-05-13 12:51:45 -04:00
PikalaxALT
c05af7f394 Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT 2021-05-08 14:36:03 -04:00
PikalaxALT
8cb3819cc2 Merge remote-tracking branch 'origin/master' into doc_field_effect_templates 2021-05-08 11:35:23 -04:00
PikalaxALT
014dd7f0be Sync field_effect_objects.h from Emerald 2021-05-03 15:22:13 -04:00
PikalaxALT
7f50753360 Sync field_effect_object_template_pointers.h with Emerald 2021-05-03 14:09:21 -04:00
PikalaxALT
cb90fda18d Refactor some field effect graphics 2021-05-03 13:27:37 -04:00
PikalaxALT
9a91476b81 Improve documentation of trainer tower sets 2021-04-28 20:44:15 -04:00
PikalaxALT
a60d6675d7 Trainer tower sets to C 2021-04-28 18:44:38 -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
a704592eb7 Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types 2021-03-31 09:42:57 -04:00
PikalaxALT
f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
PikalaxALT
8e82c291fd Document bike.c and fix weird goto 2021-03-30 15:45:42 -04:00
PikalaxALT
f6565a15d4 Style fixes; attempt to match help_system NONMATCHING 2021-03-21 20:28:42 -04:00
PikalaxALT
cdfeb638f4 Document remaining routines in field_specials 2021-03-20 11:13:58 -04:00
PikalaxALT
45f75213c0 Some more quest log and field player avater documentation 2021-03-19 09:26:01 -04:00
PikalaxALT
815636f271 Document ShouldIgnoreDeoxysForm 2021-03-18 18:23:41 -04:00
PikalaxALT
014596dea5 Document and refactor AdjustFriendship 2021-03-18 17:50:55 -04:00
PikalaxALT
c779411957 Sync EVO_MODE consts from emerald 2021-03-18 13:14:08 -04:00
PikalaxALT
4d86834d12 Document item use functions in pokemon.c 2021-03-16 21:16:31 -04: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
Deokishisu
fc623d2abf Rename "Hidden" Movement Type to "Buried" 
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`.

As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
 2021-02-14 14:59:10 -05:00
GriffinR
515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
Deokishisu
b423d06cd9 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
 2021-02-05 01:17:54 -05:00
GriffinR
1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR
9350e2d338 Sync mapjson with pokeemerald 2021-01-19 01:38:15 -05:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
luckytyphlosion
a04106a011 pokemon_summary_screen.c, part 4. 2020-06-23 22:06:21 -04:00
PikalaxALT
61a06dffe7 Address review comments 2020-04-10 10:57:20 -04:00
PikalaxALT
c05ca373e0 Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-06 15:27:10 -04:00
GriffinR
93d17ef7c8
Merge branch 'master' into doc-rm 2020-04-06 00:37:08 -04:00
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
GriffinR
250f955ae6 Start documenting region map 2020-04-01 17:32:22 -04:00
PikalaxALT
581ec47ae2 Document map_name_popup task fields 2020-03-29 10:42:31 -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
PikalaxALT
fe9c3d3b58 through sub_8055B38 2020-03-27 18:08:28 -04:00
GriffinR
eebe7f2233 Use trainer type constants 2020-03-27 10:21:26 -04:00
PikalaxALT
84a69bf140 through Overworld_ResetStateAfterFly 2020-03-26 18:29:48 -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
f1841ef24d through sub_805D1A8 2020-03-25 08:57:52 -04:00
GriffinR
970717ee2c Move object event graphics info pointers to src 2020-03-25 00:46:27 -04:00
PikalaxALT
87b2c7f34b through PlayerSetAnimId; some quest log doc 2020-03-24 08:56:14 -04:00
PikalaxALT
5b3e9f376b through PlayerGetCopyableMovement 2020-03-23 21:42:35 -04:00
GriffinR
b607821bf6 Move evobjmv data up to movement type func tables to src 2020-03-23 17:34:12 -04:00
PikalaxALT
f9a3607824 through CheckForObjectEventCollision 2020-03-23 08:54:37 -04:00
PikalaxALT
4f65d54095
Merge pull request #309 from PikalaxALT/pokemon_special_anim 
Pokemon special anim
 2020-03-22 14:50:33 -04:00
PikalaxALT
218555e72c through sub_811D5C0 2020-03-21 10:48:55 -04:00
GriffinR
9c1a8011d9 Move heal location data 2020-03-19 19:32:13 -04:00
PikalaxALT
e078e4b315 Some documentation of field_control_avatar and related routines 2020-03-19 08:45:32 -04:00
PikalaxALT
ba7e4acfee through CheckStandardWildEncounter 2020-03-17 22:08:02 -04:00
PikalaxALT
901fceec18 through GetInteractedObjectEventScript 2020-03-17 20:59:39 -04:00
PikalaxALT
51eac4e14b field_weather_util 2020-03-16 20:37:51 -04:00
PikalaxALT
0367cc7d78 Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system 2020-03-16 07:51:21 -04:00
ultima-soul
e1f7efb8e6 Document some metatile behaviors and address review comments. 2020-03-15 19:44:47 -07:00
PikalaxALT
6753e18db0 through sub_8090FC4 2020-03-13 20:53:22 -04:00
ultima-soul
99e4de062a Merge branch 'master' into event_object_movement 2020-03-13 00:32:04 -07:00
ultima-soul
339c2914af Decompile/port event_object_movement 2020-03-12 12:46:40 -07:00
PikalaxALT
3aeb294572 Port pokemon_storage_2 from emerald 2020-03-11 13:32:30 -04:00
GriffinR
cbe6e27f37 region_map.h to region_map_sections.h 2020-03-11 01:04:27 -04:00
PikalaxALT
ecf7cf9835 through sub_80FFF80 2020-03-06 17:07:36 -05:00
GriffinR
4e67eb8a18 Combine animated door frames 2020-03-05 21:38:09 -05:00
GriffinR
1bb4b48024 Label field door metatiles 2020-03-05 21:24:36 -05:00
PikalaxALT
362cddc0f5
Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -05:00
GriffinR
102744163b Use explicit initializers for help text 2020-03-05 01:12:29 -05:00
GriffinR
4df660dc76 Add enums for help system text, label help context 2020-03-04 18:26:54 -05:00
GriffinR
4c1d30a832 Add more metatile labels 2020-03-03 22:23:40 -05:00
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -05:00
GriffinR
4ab3d77d80 Fix special var names 2020-03-02 12:57:54 -05:00
GriffinR
6191739a4d Label sign bg events 2020-03-02 12:24:05 -05:00
PikalaxALT
e8504c7a3f
Merge pull request #276 from GriffinRichards/doc-sixisland 
Document Six and Seven Island scripts
 2020-03-02 12:17:52 -05:00
PikalaxALT
ae08a40290
Merge pull request #279 from PikalaxALT/field_effect 
Field effect
 2020-03-02 12:11:22 -05:00
GriffinR
6280a3786b
Merge branch 'master' into doc-sixisland 2020-03-02 10:48:56 -05:00
PikalaxALT
5198a05272
Merge pull request #275 from GriffinRichards/doc-fiveisland 
Document Five Island scripts
 2020-03-02 10:48:13 -05:00
PikalaxALT
a7966b5047 Finish field_effect.c 2020-03-02 09:47:33 -05:00
PikalaxALT
f825186655 Use VS Seeker field effect 2020-02-28 15:55:12 -05:00
PikalaxALT
80e5031619 Use Surf field effect 2020-02-28 15:29:16 -05:00