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

1665 Commits

Author SHA1 Message Date
GriffinR
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -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
efa422d6fa Sync battle anim - mons 2022-08-17 13:14:34 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data 
Sync data.c
 2022-08-17 11:36:07 -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
ba890e57a4 Sync battle anim - ghost 2022-08-16 15:27:42 -04:00
GriffinR
796d307ffb Sync battle anim - fire 2022-08-16 15:15:07 -04:00
GriffinR
b598507a2e Sync battle anim - fight 2022-08-16 14:51:48 -04:00
GriffinR
ba6bb34226 Sync battle anim - electric 2022-08-16 14:35:37 -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
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
GriffinR
b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -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
b3c2c7291f
Merge pull request #534 from GriffinRichards/sync-scriptcmds 
Sync script commands
 2022-08-14 17:28:52 -04:00
GriffinR
1040b2a66a Restore NUM_LOAF_STRINGS 2022-08-12 15:42:26 -04:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
GriffinR
874f1c9832 Sync data.c 2022-08-12 12:07:43 -04:00
GriffinR
a530bb3a74
Merge pull request #533 from GriffinRichards/sync-naming-screen 
Sync naming screen
 2022-08-12 10:43:54 -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
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
GriffinR
bf544e84cf Clean up graphics 2022-08-09 11:13:40 -04:00
GriffinR
1e02571269 Sync naming_screen 2022-08-08 12:05:30 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
0e8b639fae Sync dbp - rename files 2022-08-07 13:55:50 -04:00
GriffinR
77e6f75509 Sync dbp - comm funcs 2022-08-07 13:47:22 -04:00
GriffinR
bc62f128ab Sync dbp - function bodies 2022-08-07 13:28:05 -04:00
GriffinR
76adc777bf Sync dbp - struct members 2022-08-07 01:40:12 -04:00
GriffinR
d6d5290099
Merge pull request #527 from GriffinRichards/sync-more-save 
Sync save sector checks
 2022-08-06 18:22:56 -04:00
GriffinR
3fd7e08ae1
Merge pull request #529 from GriffinRichards/rename-viridian 
Rename Viridian City houses
 2022-08-06 12:53:54 -04:00
GriffinR
507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
GriffinR
1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
GriffinR
f16b6100c8 Sync save sector checks 2022-08-05 11:49:17 -04:00
cbt6
686c8383e5 Document src/save.c 2022-08-05 14:18:53 +08:00
Eduardo Quezada
b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada
95b16a2391 Review changes from https://github.com/pret/pokeemerald/pull/1721 2022-08-01 15:18:37 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
36a5761d36 PSS sync 2022-07-31 22:39:59 -04:00
Eduardo Quezada
9d9c2a9667 Combining pss 8 and 9 2022-07-31 22:02:44 -04:00
Eduardo Quezada
2d2d17dde3 Sync pokemon_storage_system_8.c 2022-07-31 21:41:39 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada
60ce72fa5a Synced src/mon_markings.c and partly synced PSS 2022-07-30 12:29:20 -04:00
Eduardo Quezada
dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada
c40791fd4e SPRITE_INVALID_TAG -> TAG_NONE 2022-07-29 18:37:43 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada
78e3780fa4 And this one 2022-07-29 17:09:04 -04:00
Eduardo Quezada
e0010b9205 Reverted FONT_SMALL 2022-07-29 17:04:04 -04:00
Eduardo Quezada
c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada
4c9e831a05 Standarized use of star in void and struct pointers 2022-07-29 11:20:00 -04:00
Eduardo Quezada
4998b976e1 Standarized use of star in pointer types 2022-07-29 10:35:48 -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
Eduardo Quezada
a81c1539e5 SpriteCallbackDummy2 -> SpriteCallbackDummy_2 2022-07-27 14:45:55 -04:00
Eduardo Quezada
611112269e StringCopy10 to StringCopy_Nickname 2022-07-27 14:35:19 -04:00
cbt6
4940c4da98 Document src/field_effect_helpers.c 2022-07-19 00:01:57 +08:00
cbt6
d6cb94895f Document src/overworld.c 2022-07-17 04:07:09 +08:00
cbt6
56ca6d4bcc Document src/field_effect.c 2022-07-13 04:07:52 +08:00
GriffinR
d848452ffb
Merge pull request #512 from GriffinRichards/header 
Separate crt0, rom_header, and rom_header_gf
 2022-07-05 11:43:30 -04:00
cbt6
951b72145f Document src/field_message_box.c 2022-07-03 23:48:40 +08:00
GriffinR
d1935aebb4 Merge branch 'master' of https://github.com/pret/pokefirered into header 2022-06-27 18:26:40 -04:00
Colton G. Rushton
440eb970f1
Remove dead prototypes 
See https://github.com/pret/pokeemerald/pull/1656
 2022-06-23 09:48:12 -03:00
GriffinR
2eb1c9664e Separate crt0, rom_header, and rom_header_gf 2022-06-21 20:16:20 -04:00
colonelsalt
1bca7cadc1 Rename transform arg in header as well 2022-05-13 08:47:57 +01:00
GriffinR
16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR
82f0cced2d Merge pokemon jump files 2022-03-01 17:53:05 -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
759f373d31
Merge pull request #488 from GriffinRichards/map-constants 
Sync roamer.c, add missing map constant usage
 2022-02-14 21:17:44 -05:00
GriffinR
59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
GriffinR
2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -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
dd5f6ccd3b Add union for clone objects 2022-02-05 13:42:46 -05:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
7e38583a5d Rotating Gate -> dir stair warp 2021-11-20 10:50:22 -05:00
GriffinR
b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
lioniac
e006569719 Deleted unused pokenav header 2021-11-01 16:14:59 -03:00
lioniac
0cc1d8a1b5 Multiple renamings; Removed some orphaned functions 2021-10-27 11:56:03 -03:00
Jademalo
1c4d5bfed0 IDE support formatting and consistency 2021-10-23 10:10:06 +01:00
Jademalo
46867c546d Improve IDE Support 2021-10-22 04:42:48 +01:00
lioniac
d9800a63e0 Few renamings based on Emerald 2021-10-18 15:33:46 -03:00
GriffinR
1460774d1d Sync fieldmap.c 2021-10-01 17:56:14 -04:00
PikalaxALT
f77e1a9901
Merge pull request #457 from Kurausukun/cgbsound 
Port CgbSound Documentation and Fakematch Fixes
 2021-08-11 19:55: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
Kurausukun
dbc41d1d14 port cgbsound documentation and fakematch fixes 2021-08-08 20:44:52 -04:00
GriffinR
1150e16b68
Merge pull request #450 from PikalaxALT/flatten_sprite_pos 
Flatten pos fields in struct Sprite
 2021-07-25 12:51:51 -04:00
PikalaxALT
864d371c25 Swap two fields in player PC struct 2021-07-17 20:33:31 -04:00
PikalaxALT
aec808ac0d Flatten pos fields in struct Sprite 2021-07-07 09:05:48 -04:00
GriffinR
585d92f298
Merge pull request #445 from Kurausukun/ubfix 
Port UBFIX Macro and Some Usages from Emerald
 2021-07-03 17:25:05 -04:00
Kurausukun
ff94d49a45 add SAFE_DIV macro and usages 2021-07-03 17:18:41 -04:00
Kurausukun
88bd618496 port UBFIXes from emerald 2021-06-26 22:51:41 -04:00
Kurausukun
72fc4b6f84 change itemPrintFunc to use u32 instead of s32 2021-06-17 23:26:02 -04:00
Deokishisu
8e4320cc21 Sync LinkPlayer Struct with pokeemerald 
In pokefirered, the `LinkPlayer` struct used an 11-byte name field and puts extra link-related info in the last three bytes. pokeemerald separates these last three bytes into their own fields. This commit replicates how pokeemerald handles those fields.

Also renamed `IntlConvertLinkPlayerName` to pokeemerald's `ConvertLinkPlayerName` because I was there and noticed it.
 2021-06-03 12:45:59 -04:00
GriffinR
753b19d0ea
Merge pull request #435 from Kurausukun/dumb 
[LEAK-INFORMED] Fix CreateShedinja Fakematch
 2021-06-02 16:38:03 -04:00
PikalaxALT
c7e8b0857a Sync link_rfu_3.c from Emerald 2021-06-01 16:27:38 -04:00
PikalaxALT
6580ac8739 Sync link_rfu_2 symbols from Emerald 2021-06-01 15:55:14 -04:00
Kurausukun
e80a68327b [LEAK-INFORMED] fix CreateShedinja fakematch 2021-05-31 01:20:36 -04:00
PikalaxALT
1a9ba7bb0a Revert typedefs in math_util 2021-05-26 09:59:32 -04:00
PikalaxALT
5c965f5357 Rename fixed point math routines again 2021-05-24 14:59:35 -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
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
a64b074e7d Rename palette tags and files 2021-05-08 11:34:38 -04:00
GriffinR
4767019e4f
Merge pull request #432 from PikalaxALT/fix_list_menu 
Replace unknown list struct
 2021-05-08 11:21:09 -04:00
PikalaxALT
e07dd9507b Name used object event palette tags 2021-05-08 10:27:52 -04:00
PikalaxALT
b79634e2f3 TrainerTowerTrainer.{unkC --> textColor} 2021-05-06 12:52:05 -04:00
PikalaxALT
f2847354f4 Improve documentation of math_util 2021-05-06 09:27:56 -04:00
PikalaxALT
693e1c0fc9 Replace unknown list struct 2021-05-06 09:14:13 -04:00
PikalaxALT
27d4411de0 Fix accidental label swap in link_rfu.h 2021-05-05 13:07:22 -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
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
d0f3c277a7 Corrections and augmentations to ttower docs 2021-04-29 09:56:44 -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
GriffinR
d21090cf04
Merge pull request #406 from hjk321/index-graphics 
Document, Index, and Prettify Graphics, Part 1 (A-H)
 2021-04-23 14:01:11 -04:00
PikalaxALT
704dc2f913 Document Pokedex Screen 2021-04-21 10:34:15 -04:00
GriffinR
918ed2d31e
Merge pull request #417 from SatoMew/master 
Replace rival labels
 2021-04-18 18:23:00 -04:00
SatoMew
c128e68062 Replace rival labels 2021-04-17 16:32:55 +01:00
PikalaxALT
627402560c Name remaining symbols in pokemon_summary_screen.c 2021-04-13 09:17:12 -04:00
PikalaxALT
03b4ea32a9 Merge remote-tracking branch 'origin' into doc_pokesum 2021-04-12 16:18:38 -04: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
48fb5e9b45 correct text color variable names 2021-04-09 01:30:49 -04:00
PikalaxALT
c9632154ba Document pokemon summary screen, 2 2021-04-04 11:27:51 -04:00
PikalaxALT
c99894bc60 Document Pokemon Summary Screen, 1 2021-04-04 09:59:40 -04: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
hjk321
7d9bcc9f77 Document and index graphics/battle_anims and graphics/battle_interface 2021-03-30 17:13:37 -05:00
PikalaxALT
d9234adb00 Fix typos 2021-03-30 16:07:18 -04:00
PikalaxALT
8e82c291fd Document bike.c and fix weird goto 2021-03-30 15:45:42 -04:00
PikalaxALT
6b64fbc522 Merge branch 'master' of github.com:pret/pokefirered into misc_doc 2021-03-24 08:15:08 -04:00
PikalaxALT
877e09438b Fix alignment and typos 2021-03-23 15:58:16 -04:00
PikalaxALT
56b37fef8d Update some more names in help system 2021-03-23 13:52:14 -04:00
PikalaxALT
10a96540ff Rename help system C files 2021-03-23 11:43:46 -04:00
PikalaxALT
d1f62285b5 Document help system 2021-03-23 11:28:06 -04:00