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
a247433e20 Sync/document item_menu_icons.c 2022-10-01 23:42:11 -04:00
GriffinR
4e3dedd6fa Sync palette 2022-10-01 22:30:05 -04:00
GriffinR
fc836b9de4
Merge pull request #558 from GriffinRichards/doc-intro 
Document intro
 2022-09-30 01:53:07 -04:00
GriffinR
3c9a9f7388
Merge pull request #560 from lioniac/mystery-gift-vars 
Mystery Gift vars named
 2022-09-26 12:50:55 -04:00
cbt6
c26afe5e1b Remove include/tilesets.h 2022-09-26 22:33:56 +08:00
lioniac
fe757ff8ae
Updated vars.h 2022-09-26 10:31:44 -03:00
GriffinR
fa9808f79d Document intro functions 2022-09-24 16:15:20 -04:00
GriffinR
aeef671c42 Merge branch 'master' of https://github.com/pret/pokefirered into doc-strings 2022-09-22 13:36:32 -04:00
cbt6
61ad87a314 Document party menu 2022-09-17 14:29:32 +08:00
GriffinR
27b2b0b24a Document intro graphics/data 2022-09-13 16:10:15 -04:00
GriffinR
7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -04:00
GriffinR
c4cf82f439 Sync easy chat strings 2022-09-12 18:27:34 -04:00
GriffinR
f08115d9fe
Merge pull request #553 from GriffinRichards/sync-fld-weather-eff 
Sync field weather effects
 2022-09-12 17:56:14 -04:00
GriffinR
228869156c
Merge pull request #550 from GriffinRichards/sync-urmsg 
Document union room message texts
 2022-09-12 17:10:15 -04:00
GriffinR
ffaea1265b
Merge pull request #552 from GriffinRichards/sync-keyboardtext 
Sync keyboard text
 2022-09-12 15:03:52 -04:00
GriffinR
f59fb1710f
Merge pull request #551 from GriffinRichards/sync-rouletteutil 
Sync palette util
 2022-09-12 14:55:30 -04:00
GriffinR
c9281e5a57 Add more usage of GENDER_COUNT 2022-09-12 14:54:05 -04:00
GriffinR
398417593b
Merge pull request #549 from AsparagusEduardo/pret_unused 
Removed UNUSED attribute
 2022-09-12 14:47:25 -04:00
GriffinR
0a01d8f31b
Merge pull request #545 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:31:51 -04:00
GriffinR
212e455aae Sync field weather effects 2022-09-06 15:30:34 -04:00
GriffinR
d08aa80a70 Sync palette util 2022-09-06 14:54:40 -04:00
GriffinR
fc7da1aa5e Sync keyboard text 2022-09-06 14:10:43 -04:00
GriffinR
8fd8d21980 Document global ur text 2022-09-06 01:57:40 -04:00
Eduardo Quezada
81ef26732d Removed UNUSED attribute 2022-09-04 18:06:58 -03:00
Eduardo Quezada
9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
 2022-09-04 17:44:13 -03:00
cbt6
dbaf8f5900 Document field moves 2022-09-04 17:55:15 +08: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
76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
cbt6
3a1994f7f7 Rearrange Pokemon storage source files 2022-09-03 23:35:07 +08:00
cbt6
859ca7994e Document Pokemon storage system 2022-09-03 23:27:56 +08:00
GriffinR
dcdf31f020 Sync fieldmap 2022-09-02 19:24:59 -04:00
GriffinR
a30ea109c1
Merge pull request #544 from GriffinRichards/fix-b-msg 
Fix battle message charmap copied from emerald
 2022-09-01 23:08:21 -04:00
GriffinR
17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
GriffinR
7c0b46f6da
Merge pull request #541 from GriffinRichards/sync-script 
Sync script.c
 2022-08-26 23:55:31 -04:00
GriffinR
321f5371d8 Sync cable club 2022-08-25 18:48:54 -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
72f76b19b3 Sync script.c 2022-08-22 20:27:23 -04:00
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
8a793e73a5 Sync link_rfu_2 2022-08-19 15:27:54 -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
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
Eduardo Quezada
27e81b2fc7 UnusedControllerStruct 2022-08-18 12:59:38 -04:00
Eduardo Quezada
26e8d57ba1 Special Trainer IDs 2022-08-18 12:58:27 -04:00
Eduardo Quezada
57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -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
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