Commit Graph

3469 Commits

Author SHA1 Message Date
GriffinR 54f9b62ede Label minigame_digits 2022-10-01 23:47:18 -04:00
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 2e9ce9b2a0 Merge pull request #559 from GriffinRichards/doc-diploma
Document remainder of diploma
2022-09-30 01:39:35 -04:00
GriffinR 78c1a2ce46 Merge pull request #557 from GriffinRichards/sync-cries
Sync cries with pokeemerald
2022-09-26 20:36:30 -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
GriffinR 91506ed233 Merge pull request #561 from cbt6/tilesets-h
Remove include/tilesets.h
2022-09-26 11:17:13 -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
lioniac 8fb7eebfb9 Naming Mystery Gift Vars 2022-09-26 10:29:31 -03:00
GriffinR 7807b198d3 Ignore new Porymap config 2022-09-25 18:35:25 -04:00
GriffinR 4a3ef4f9b2 Ignore Porymap's prefabs file 2022-09-24 18:22:49 -04:00
GriffinR 7ee4e1d140 Document remainder of diploma 2022-09-24 17:48:25 -04:00
GriffinR fa9808f79d Document intro functions 2022-09-24 16:15:20 -04:00
GriffinR 536f40b386 Sync cries with pokeemerald 2022-09-22 14:36:16 -04:00
GriffinR efdcae1e47 Merge pull request #555 from GriffinRichards/doc-strings
Sync/document the rest of strings.c
2022-09-22 13:42:28 -04:00
GriffinR aeef671c42 Merge branch 'master' of https://github.com/pret/pokefirered into doc-strings 2022-09-22 13:36:32 -04:00
GriffinR 77c34e195e Merge pull request #556 from cbt6/party-menu
Document party menu
2022-09-22 13:06:42 -04:00
cbt6 e33ed44b7f Add parentheses and case statements 2022-09-23 00:39:59 +08:00
cbt6 500a488442 Remove goto in ItemUseCB_MedicineStep
Leak-informed
2022-09-17 16:21:42 +08: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 803c686569 Merge pull request #554 from GriffinRichards/sync-ec-strings
Sync easy chat strings
2022-09-12 20:19:32 -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
GriffinR 8a7f1cf1ce Sync static text in ur message 2022-09-05 23:07:27 -04:00
GriffinR faac89f686 Merge pull request #548 from AsparagusEduardo/pokefirered_pokeemeraldSync4
pokeemerald sync No. 4
2022-09-05 21:00:13 -04:00
Eduardo Quezada 7dcac240d4 Review changes 2022-09-04 21:23:24 -03:00
Eduardo Quezada b6bc114ef1 Review suggestions 2022-09-04 20:56:14 -03: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
GriffinR b3c7b9e09f Merge pull request #547 from cbt6/field-moves
Document field moves
2022-09-04 10:52:05 -04:00
cbt6 dbaf8f5900 Document field moves 2022-09-04 17:55:15 +08: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 097fc309f6 Merge pull request #546 from cbt6/pokemon-storage
Document Pokemon storage system
2022-09-03 14:11:29 -04:00
cbt6 3a1994f7f7 Rearrange Pokemon storage source files 2022-09-03 23:35:07 +08:00