Commit Graph
100 Commits
Author SHA1 Message Date
GriffinR c9281e5a57 Add more usage of GENDER_COUNT 2022-09-12 14:54:05 -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 b3c7b9e09f Merge pull request #547 from cbt6/field-moves
Document field moves
2022-09-04 10:52:05 -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 097fc309f6 Merge pull request #546 from cbt6/pokemon-storage
Document Pokemon storage system
2022-09-03 14:11:29 -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 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 72f76b19b3 Sync script.c 2022-08-22 20:27:23 -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 219a38578a Sync battle anim - script funcs 2022-08-19 10:29:25 -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 a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
GriffinR 5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -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 f476806547 Sync battle anim - rock 2022-08-17 14:18:30 -04:00
GriffinR 96ecc82c98 Sync battle anim - poison, psychic 2022-08-17 13:52:24 -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 1711490e16 Sync battle anim - mon movement 2022-08-17 12:31:28 -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 a67c9aeda6 Merge pull request #539 from GriffinRichards/town-map
Format town map sprite
2022-08-17 11:24:32 -04:00
GriffinR b0acce4fbc Format town map sprite 2022-08-17 09:25:32 -04:00
GriffinR 3a0cd4180d Sync battle anim - ground 2022-08-16 15:38: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
GriffinR 89774bfdac Merge pull request #538 from cbt6/movement
Document remaining movement types and actions
2022-08-16 00:51:01 -04:00
GriffinR f1fddd83f9 Merge pull request #535 from cbt6/movement-action
Sync movement action functions
2022-08-15 15:19:20 -04:00
GriffinR b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -04:00
GriffinR 102dc65fd1 Sync battle anim - dragon 2022-08-14 18:36:29 -04:00
GriffinR 92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR e4aec1b6d1 Sync battle anim - bug 2022-08-14 18:21:03 -04:00
GriffinR 702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00
GriffinR b3c2c7291f Merge pull request #534 from GriffinRichards/sync-scriptcmds
Sync script commands
2022-08-14 17:28:52 -04:00
GriffinR 442935bba0 Delete random text file 2022-08-12 20:02:49 -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
GriffinR 84d47d2c85 Merge pull request #531 from GriffinRichards/doc-dodrio
Sync dodrio berry picking
2022-08-11 14:53:28 -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
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
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 25344d1bbd Merge pull request #530 from cbt6/sym-gitignore
Add symbol files to .gitignore
2022-08-07 01:13:24 -04:00
GriffinR 12fdf455ce Merge dodrio_berry_picking 1 and 2, sync function names 2022-08-06 20:40:11 -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 bc5426a3c6 Merge pull request #528 from GriffinRichards/doc-behaviors
Document metatile behaviors
2022-08-06 02:45:30 -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
GriffinR 40cbfc0722 Merge pull request #526 from cbt6/save
Document src/save.c
2022-08-05 08:18:37 -04:00
GriffinR 49ea462d7f Merge pull request #525 from AsparagusEduardo/pokefirered_pokeemeraldSync2
2nd batch of syncing with pokeemerald
2022-08-01 16:56:48 -04:00
GriffinR f5c4a07d56 Merge pull request #524 from AsparagusEduardo/pokefirered_pokeemeraldSync
Sync with pokeemerald
2022-07-30 09:07:28 -04:00
GriffinR deec274991 Merge pull request #523 from cbt6/field-effect-helpers
Document src/field_effect_helpers.c
2022-07-26 11:06:45 -05:00
GriffinR 2e4534c593 Merge pull request #522 from cbt6/overworld
Document src/overworld.c
2022-07-16 18:18:48 -04:00
GriffinR d60f819e5c Merge pull request #521 from cbt6/field-effect-constants
Add field effect constants as comments
2022-07-13 07:53:36 -04:00
GriffinR fccd29fd2e Merge pull request #520 from cbt6/field-effect
Document src/field_effect.c
2022-07-12 18:24:31 -04: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
GriffinR 27e02b89b2 Merge pull request #519 from cbt6/field-message
Document src/field_message_box.c
2022-07-03 13:23:50 -04:00
GriffinR 724068dadf Merge pull request #516 from Kurausukun/bpm
Use Floats and Round Correctly in Tempo Calculation
2022-06-28 00:27:24 -04:00
GriffinR d1935aebb4 Merge branch 'master' of https://github.com/pret/pokefirered into header 2022-06-27 18:26:40 -04:00
GriffinR 56f7c919f4 Merge pull request #515 from GriffinRichards/addr-comm
Remove address comments
2022-06-27 18:24:17 -04:00
GriffinR 23e9d9d43c Merge pull request #513 from coltongit/patch-1
Remove dead prototypes
2022-06-24 21:28:51 -04:00
GriffinR 9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
GriffinR d73f39ae40 Merge pull request #514 from LOuroboros/patch-1
Replaced undefined BUGFIX_SETMONIVS with good ol' BUGFIX
2022-06-24 20:47:55 -04:00
GriffinR 75c7e67f00 Fix Museum_1F -> PokemonCenter_1F text 2022-06-24 19:02:11 -04:00
GriffinR 2eb1c9664e Separate crt0, rom_header, and rom_header_gf 2022-06-21 20:16:20 -04:00
GriffinR c89af0d429 Merge pull request #511 from cbt6/field-transition
Document src/field_fadetransition.c
2022-06-21 12:25:41 -04:00
GriffinR f2b5d8000d Merge pull request #510 from Kurausukun/fix_constant
Fix Constant Usage
2022-06-19 21:46:47 -04:00
GriffinR 0ef7307040 Merge pull request #503 from colonelsalt/document_transform
Some documentation of transform types
2022-05-13 05:17:42 -04:00