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,095 Commits 2 Branches 0 Tags 366 MiB
67a496b09a
Commit Graph

1453 Commits

Author SHA1 Message Date
cawtds
356ffd1627 added fairy type 2024-03-23 15:40:31 +01:00
cawtds
0ab492f7e8 working version with SpeciesInfo and new Moves 2024-03-17 18:04:06 +01:00
Edward Nolan
93d4e3ff66 Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER 2023-09-10 21:16:06 -04:00
GriffinR
10c1e1298f Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-08-18 11:26:22 -04:00
GriffinR
c212795217 Fix index comment for ScrCmd_playslotmachine 2023-05-31 21:47:33 -04:00
GriffinR
45e4c30d38 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-04-10 10:18:07 -04:00
GriffinR
a2f30a3382
Merge pull request #611 from GriffinRichards/sync-pokemon 
Sync pokemon.c
 2023-03-18 13:24:51 -04:00
cbt6
242bb41682 Document src/graphics.c 2023-03-11 23:57:01 +08:00
GriffinR
ab417d1255 Sync pokemon.c 2023-03-06 15:23:11 -05:00
GriffinR
ef12c2a7f9 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-01-30 10:23:08 -05:00
SphericalIce
8e2d4b179e Add missing newline in gOakSpeech_Text_LetsGo 2022-12-31 14:48:57 +00:00
SphericalIce
2070ea7896 Format strings in new_game_intro.inc 2022-12-31 14:42:41 +00:00
SphericalIce
0348b58899 Rename gOakText_AskPlayerGender to fit naming convention 2022-12-31 14:39:34 +00:00
SphericalIce
d080ebd0f0 Document oak_speech.c 2022-12-30 23:59:45 +00:00
GriffinR
fd81669091 Remove old move descriptions 2022-12-16 09:46:31 -05:00
GriffinR
66e279611b Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2022-11-30 15:03:21 -05: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
6d6f207eb4 Initial mystery gift sync 2022-11-19 21:01:35 -05:00
GriffinR
519443e214 Sync battle transitions 2022-11-18 21:16:08 -05:00
GriffinR
ae38640a3b Continue documenting quest log 2022-11-11 02:10:16 -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
c77adaf6bf Sync map data macros 2022-10-25 14:31:01 -04:00
GriffinR
32ab6087d8
Merge pull request #484 from GriffinRichards/clone-union 
Separate connection clone objects from normal objects
 2022-10-17 21:29:52 -04:00
GriffinR
5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR
aeb1c74bbf Label remaining scripts 2022-10-05 15:32:51 -04:00
GriffinR
7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -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
GriffinR
ccd527b782
Merge pull request #542 from GriffinRichards/sync-cableclub 
Sync cable club
 2022-09-03 14:27:13 -04:00
GriffinR
56fead7d16
Merge pull request #543 from Jaizu/common_movement_naming 
Add Common_ to movements.inc
 2022-09-03 14:20:33 -04:00
GriffinR
76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
Jaizu
ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR
feccd302d7
Merge pull request #540 from GriffinRichards/sync-b-anim 
Sync battle anim
 2022-08-25 10:09:32 -04:00
GriffinR
b06d2045fc Script_HeartIcon -> Script_XIcon 2022-08-24 18:17:18 -04:00
GriffinR
da955aaf64 Document safari reactions, move b string ids to constants 2022-08-23 11:11:50 -04:00
GriffinR
a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg 
Sync/document battle_message.c
 2022-08-23 10:45:48 -04:00
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
c976547c02 Clean up FRLG-specific anim scripts 2022-08-19 10:11:39 -04:00
GriffinR
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -04:00
GriffinR
4e106d86e3 Sync battle anim - sound tasks 2022-08-17 14:44:26 -04:00
GriffinR
8601b4fff3 Sync battle anim - smokescreen 2022-08-17 14:29:23 -04:00
GriffinR
a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -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
GriffinR
0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -04:00
GriffinR
bcab96fb86 Sync battle anim - effects 2 2022-08-16 13:54:37 -04:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR
702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04: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
60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -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
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
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
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
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
da47b35d81 Add field effect constants as comments 2022-07-13 16:35:10 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08: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
GriffinR
bef2668d8b
Merge pull request #481 from GriffinRichards/sync-classes 
Sync/update trainer classes
 2022-01-21 19:26:14 -05:00
GriffinR
cf41c78370 Remove berry fix 2022-01-15 13:03:36 -05:00
GriffinR
53eca1d3a7 Remove old asm constants 2022-01-10 19:39:09 -05:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
lioniac
0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
Deokishisu
18ca5ef678 Fix Magic Numbers in battle_anim_scripts.s 
This file should still be synced properly with pokeemerald in the future, but for now the magic numbers for the sound constants have been fixed.
 2021-10-01 00:01:16 -04: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
GriffinR
bbf39b8560
Merge pull request #442 from GriffinRichards/fix-offsets 
Remove hardcoded offsets in battle scripts
 2021-07-03 11:15:38 -04:00
LOuroboros
cdfaa6a3ac Informative note about PewterCity_Gym_Text_BrockDefeat 2021-06-26 04:10:05 -03:00
GriffinR
5bf794f051 Remove hardcoded offsets in battle scripts 2021-06-21 16:02:13 -04:00
PikalaxALT
14954c5463 Reorganize tileset graphics files 2021-06-03 15:00:52 -04:00
PikalaxALT
23c07589f5 Merge remote-tracking branch 'origin/master' into sync_bery_crush 2021-05-13 14:25:52 -04: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
aa202b0624 Merge remote-tracking branch 'origin/master' into sync_bery_crush 2021-05-11 12:13:18 -04:00
PikalaxALT
8cb3819cc2 Merge remote-tracking branch 'origin/master' into doc_field_effect_templates 2021-05-08 11:35:23 -04:00
PikalaxALT
11acb9adc7 Finish porting data_8479668.s to C 2021-05-08 09:42:12 -04:00
PikalaxALT
ee6b3c1acf Sync berry crush from Emerald 2021-05-05 13:03:39 -04:00
PikalaxALT
014dd7f0be Sync field_effect_objects.h from Emerald 2021-05-03 15:22:13 -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
Kurausukun
4b182affb6 standardize "grey" to "gray" 2021-04-09 22:34:08 -04:00
Kurausukun
4446da96fe fix text color names 2021-04-09 01:11:31 -04:00
PikalaxALT
f00b44699c Fix movement types; fix some math ops 2021-03-30 20:33:31 -04:00
PikalaxALT
2edc21281e Document symbols reffed in field_control_avatar 2021-03-20 17:27:21 -04:00
PikalaxALT
99ec579deb Name symbols in battle_anim_special.c 2021-03-14 16:29:33 -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
66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
Ashley Coleman
2745ac3445 Give meaningfull names to globals in pokedex_screen.s 2020-11-11 13:40:18 -08: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
luckytyphlosion
1ad6f5270c Port over PSS data to src. 2020-07-04 20:32:44 -04:00
luckytyphlosion
91fea55a24 pokemon_summary_screen.c, part 6. 2020-06-25 12:59:37 -04:00
PikalaxALT
94b68c54e8
Merge pull request #337 from GriffinRichards/fix-scriptlabel 
Fix mislabeled starter script
 2020-05-27 07:51:13 -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
Evan
87ba2b8bde battle anim documentation 2020-04-23 22:40:13 -06:00
fieldy101
9634b58d7a Port emerald water functions into firered 2020-04-22 23:30:44 +10:00
PikalaxALT
b22d3a821d Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-10 13:10:44 -04:00
PikalaxALT
fedb2f5c0b Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-07 11:05:48 -04:00
PikalaxALT
31ecdcdd0a Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-07 07:50:06 -04:00
PikalaxALT
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
GriffinR
100188ac43 Move gfx out of data 2020-04-06 10:02:14 -04:00
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
PikalaxALT
98c2df354f Fix alignment-related crashes 2020-04-04 15:09:22 -04:00
PikalaxALT
af32535610 Name all specials 2020-03-31 08:49:47 -04:00
PikalaxALT
4134baf3eb Some more docs in battle anims 2020-03-31 07:55:32 -04:00
PikalaxALT
b31317889d Partial doc of battle anim utility funcs 2020-03-30 08:52:49 -04:00
PikalaxALT
19812c9d18 Decoration data to C 2020-03-29 11:42:08 -04:00
PikalaxALT
0f618efb15 Finish overworld.c 2020-03-28 21:39:28 -04:00
PikalaxALT
781aa8949c Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 18:04:45 -04:00
PikalaxALT
d8c9214e0a
Merge pull request #314 from jiangzhengwenjz/bike 
bike
 2020-03-28 16:32:09 -04:00
PikalaxALT
f5f4d6bc1f through InitCurrentFlashLevelScanlineEffect 2020-03-28 14:40:25 -04:00
PikalaxALT
9bcc82856d Merge branch 'master' of github.com:pret/pokefirered into overworld 2020-03-28 12:26:00 -04:00
PikalaxALT
24ac46856a through sub_805644C 2020-03-28 12:20:20 -04:00
PikalaxALT
816e7ad1f8 through ChooseAmbientCrySpecies 2020-03-28 10:42:23 -04:00
jiangzhengwenjz
fd7abb3d73 bike 2020-03-28 10:11:45 +08:00