dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,475 Commits 1 Branch 0 Tags
3de70980e550ead4eb5025b7eaa2c20335044ba4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR 3de70980e5 Document text window 2022-10-05 15:00:58 -04:00
GriffinR b41b3614ad Merge pull request #563 from cbt6/item-use 
Document item use
 2022-10-03 14:38:39 -04:00
GriffinR 4b5bbbf1b7 Merge pull request #562 from GriffinRichards/sync-palette 
Sync/document some misc small files
 2022-10-02 08:05:59 -04:00
GriffinR 77238d182d Correct bag anim names 2022-10-02 07:58:27 -04:00
GriffinR ab2aacc9d5 Sync berry_fix_program 2022-10-02 00:10:53 -04:00
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
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
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
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 d5dfd66812 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:42:26 -04: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 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