dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,829 Commits 1 Branch 0 Tags
d559eb56ce5138863121d2879d0f010bb9280365
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR 7299efd381 Merge pull request #709 from PikalaxALT/ignore-cmake-clangd 
Ignore CMakeLists.txt and cmake/clangd artifacts
 2025-11-16 20:47:49 -05:00
GriffinR 287b37eed2 Remove some make rules copied from pokeemerald 2025-10-26 17:49:30 -04:00
GriffinR 4f5fe2a279 Fix incorrect MAPSEC limit for map names 2025-07-16 02:45:26 -04:00
GriffinR 6702a58f7c Convert substitute back sprite data to png 2025-07-13 13:02:58 -04:00
GriffinR f60d28ceb5 Merge pull request #693 from pret/porymap-6 
Update for Porymap 6
 2025-05-27 10:53:27 -04:00
GriffinR 8701517755 Merge pull request #694 from LOuroboros/startMenuSave 
Linked STARTMENU labels to the entries of sStartMenuActionTable
 2025-05-20 20:53:37 -04:00
GriffinR 32fdf48b0f Merge pull request #695 from RubyRaven6/ruby-misc 
Add NUM_TILES_PER_METATILE
 2025-05-20 20:51:51 -04:00
GriffinR c0036919b0 Add NUM_TILES_PER_METATILE 2025-05-18 14:22:42 +08:00
GriffinR 82d2283108 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2025-05-14 11:52:22 -04:00
GriffinR d61f959453 Merge pull request #690 from pret/bugfix/keep_temps_in_builddir 
.i and .s files should be under build/ when KEEP_TEMPS=1
 2025-03-08 02:05:57 -05:00
GriffinR 7722e7a92c Merge pull request #685 from GriffinRichards/heal-locations-file 
Generate heal location constants automatically
 2025-02-21 12:52:53 -05:00
GriffinR 5f9f173b6a Generate heal location constants automatically, move data back to a single file. 2025-02-03 16:00:29 -05:00
GriffinR 65be523af2 Merge pull request #675 from GriffinRichards/generate-map-constants 
Generate local IDs from map.json files
 2025-02-03 12:48:49 -05:00
GriffinR bf6bfbd2ed Merge pull request #668 from Kurausukun/pockets 
Add Constant for 3 Main Bag Pockets
 2025-02-03 12:29:05 -05:00
GriffinR 587d494421 Merge branch 'porymap-6' into generate-map-constants 2024-12-17 20:48:28 -05:00
GriffinR b10c2f7584 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2024-11-26 12:47:28 -05:00
GriffinR 2a3e92e10f Sync Makefile and common syms (#676) 2024-11-26 12:46:12 -05:00
GriffinR d4eee4692f Generate region_map_sections from JSON (#677) 2024-11-26 12:45:53 -05:00
GriffinR b76867fc3b Replace incorrect Japanese characters 2024-11-19 19:35:18 -05:00
GriffinR 94b8dc79de Use LOCALID constants for clone's target_local_id 2024-10-16 15:27:53 -04:00
GriffinR b1d92b79b6 Fix event_constants recipe running twice 2024-10-15 22:20:43 -04:00
GriffinR 50babdb07f Move local IDs to map.json 2024-10-15 02:51:08 -04:00
GriffinR 4dc5c47799 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-14 22:48:30 -04:00
GriffinR a2e408cf4e Add support for local IDs in map.json 2024-10-14 22:44:16 -04:00
GriffinR d2c592030d Sync toolchain fixes from pokeemerald 2024-10-11 15:21:06 -04:00
GriffinR bb50006fc9 Move heal locations data to their associated map.json (#673) 2024-10-11 15:17:18 -04:00
GriffinR 967a1f98b4 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2024-10-11 13:38:34 -04:00
GriffinR 99de06de5f Fix libpng installation for workflow on Ubuntu 24.04 2024-10-11 13:36:05 -04:00
GriffinR d45b94ea64 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2024-09-18 19:40:41 -04:00
GriffinR 311d317eb3 Merge pull request #672 from GriffinRichards/sync-toolchain 
Sync Makefile and tools with pokeemerald
 2024-09-18 19:40:16 -04:00
GriffinR e47a054393 Sync remaining tools 2024-09-14 11:26:14 -04:00
GriffinR f89a69a2d9 Have scaninc ignore non-existing files 2024-09-13 23:12:50 -04:00
GriffinR ab80760dfc Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings 2024-09-13 23:12:20 -04:00
GriffinR 93b4a7b815 Toolchain sync fixes 2024-09-12 17:49:50 -04:00
GriffinR 2ed7806380 Deleted generated constants, add midi.cfg 2024-09-12 12:58:22 -04:00
GriffinR f0566e68f0 Sync tools directory 2024-09-12 12:39:00 -04:00
GriffinR a14180a64e Initial Makefile sync 2024-09-12 12:22:25 -04:00
GriffinR 539ed36160 Merge pull request #662 from cawtds/ub-fix-battle-transition 
UB fix in battle_transition.c
 2024-08-29 14:18:26 -04:00
GriffinR caf8c6bfa9 Merge pull request #670 from abcboy101/decode 
Update link_rfu_2.c
 2024-08-29 14:16:53 -04:00
GriffinR 4f7b8c5e9e Merge pull request #663 from cawtds/ub-fix-camera-object 
Fix for potential UB in CameraObjectReset2
 2024-08-29 14:11:58 -04:00
GriffinR 5e464c2091 Sync map macro change with pokeemerald 2024-08-27 13:57:07 -04:00
GriffinR f155bf5419 Merge pull request #667 from abcboy101/decode 
Decode unused JP text
 2024-08-09 20:46:07 -04:00
GriffinR c6a2f50491 Merge pull request #657 from aarant/master 
Linkerscript now tracks RAM/ROM usage
 2024-06-22 12:02:35 -04:00
GriffinR 21e8a142db Revert section rename 2024-06-22 11:58:39 -04:00
GriffinR 4c015cd9db Merge pull request #659 from Deokishisu/patch-5 
BUGFIX for Localization Oversight in Daisy's Text && Fix Typo in Nurse Script
 2024-06-22 11:55:49 -04:00
GriffinR b2e2648d15 Use C preprocessor directives 2024-06-22 11:51:16 -04:00
GriffinR 9b2fc69e5e Merge pull request #656 from SatoMew/misc-fixes 
Spring cleaning
 2024-06-22 11:46:13 -04:00
GriffinR ceeb6a4ca0 Merge pull request #661 from Kurausukun/gcc14-fix 
Fix Compilation on GCC 14
 2024-06-19 09:29:49 -04:00
GriffinR 0c17a3b041 Merge pull request #653 from GriffinRichards/metatile-labels 
Remove non-existent tilesets from label comments and alphabetize
 2024-01-19 10:46:18 -05:00
GriffinR efdae01b4b Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:42:20 -05:00
GriffinR 9588ba6e01 Merge pull request #652 from Kurausukun/macros 
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
 2023-12-27 17:43:49 -05:00
GriffinR 2d8c81eb21 Merge pull request #648 from SnorlaxMonster/master 
Rename HITMARKER_IGNORE_SAFEGUARD
 2023-11-16 15:47:14 +00:00
GriffinR 1dd602d914 Merge pull request #641 from AnonymousRandomPerson/master 
Replaced decomp list with pret.github.io link
 2023-10-17 02:44:44 -04:00
GriffinR 23dd337246 Merge pull request #645 from Kurausukun/m4asym 
Add Missing Constant Usage in m4a_1
 2023-09-23 21:49:28 -04:00
GriffinR ff902c9f1b Merge pull request #642 from citrusbolt/blockboxrs 
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
 2023-09-12 18:48:37 -04:00
GriffinR f7d133f503 Merge pull request #644 from ednolan/fix_pokenon_misspelling2 
Fix misspelling: RivalPokenonTower -> RivalPokemonTower
 2023-09-11 08:49:08 -04:00
GriffinR 66669cca92 Merge pull request #643 from ednolan/fix_pokenon_misspelling 
Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER
 2023-09-10 21:24:50 -04:00
GriffinR f8741615bf Retire OK bot 2023-08-31 11:15:29 -04:00
GriffinR 0cab317261 Merge pull request #638 from GriffinRichards/doc-ql 
Document some quest log
 2023-08-31 11:13:49 -04:00
GriffinR f484b96062 Merge pull request #640 from WhenGryphonsFly/key_intr_enable 
Correct KEY_INTR_ENABLE
 2023-08-27 17:34:00 -04:00
GriffinR eb250ab92a Merge pull request #639 from AnonymousRandomPerson/master 
Added newer decomp projects to readme
 2023-08-18 23:46:13 -04:00
GriffinR 09ee60049c Quest log doc cleanup 2023-08-18 15:40:57 -04:00
GriffinR 10c1e1298f Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-08-18 11:26:22 -04:00
GriffinR e72a26a6c1 Merge pull request #624 from GriffinRichards/field-tasks 
Sync field_tasks
 2023-08-14 16:00:52 -04:00
GriffinR 120fbb0578 More PALSLOT constant usage 2023-08-07 00:44:46 -04:00
GriffinR 4da9e7549b Merge pull request #631 from GriffinRichards/colorize 
Correct more graphics colors
 2023-07-26 22:49:23 -04:00
GriffinR 25a8d2b9b1 Sync INSTALL 2023-07-06 12:05:22 -04:00
GriffinR b56e1cbf7c Remove some unused declarations 2023-06-25 16:30:20 -04:00
GriffinR 992f8bf017 Sync fix for EWRAM_DATA wildcard 2023-06-07 11:09:43 -04:00
GriffinR 8ef8535fc5 Colorize battle_interface/healthbox_elements.png 2023-06-02 15:51:59 -04:00
GriffinR cf089fedd0 Correct colors in pokemon_storage/menu.png 2023-06-02 14:34:36 -04:00
GriffinR 22fd5541e3 Correct colors in summary_screen/bg.png 2023-06-02 13:58:03 -04:00
GriffinR 86c21b8e79 Colorize menu icon graphics, document sMenuInfoIcons 2023-06-01 15:02:03 -04:00
GriffinR f52d3b6ce4 Correct item_menu/bg.pg colors, combine list tilemaps 2023-06-01 14:17:36 -04:00
GriffinR fe99ef341d Correct colors in item_pc/bg.png 2023-06-01 13:39:51 -04:00
GriffinR febf864bf6 Sync trainer card graphics 2023-06-01 13:39:17 -04:00
GriffinR 8b17c6d36d Colorize tm_case/hm.png 2023-06-01 10:29:53 -04:00
GriffinR b52ace21c4 Merge pull request #628 from GriffinRichards/pal-macros 
Sync palette macros
 2023-06-01 10:28:30 -04:00
GriffinR c212795217 Fix index comment for ScrCmd_playslotmachine 2023-05-31 21:47:33 -04:00
GriffinR dcdb9024d8 Sync palette macros 2023-05-26 14:52:21 -04:00
GriffinR f93d5a8ae1 Merge pull request #623 from GriffinRichards/item-icons 
Give proper names to item icon graphics
 2023-05-23 12:53:23 -04:00
GriffinR 1de6a20483 Merge pull request #625 from sophxm/master 
Remove unnecessary linker script preprocessing
 2023-05-23 12:46:56 -04:00
GriffinR cea26f20c5 Merge pull request #626 from LOuroboros/patch-1 
Updated BattleScripting addresses
 2023-05-21 23:55:49 -04:00
GriffinR 3a26fce16b Merge pull request #621 from Gamr13/master 
Fix macOS building
 2023-05-19 13:11:20 -04:00
GriffinR c110354043 Sync field_tasks 2023-05-17 15:52:14 -04:00
GriffinR 86c2142719 Give proper names to item icon graphics 2023-05-12 10:52:07 -04:00
GriffinR b83a178b18 Add some missing constants in wild_encounter.c 2023-05-12 02:16:33 -04:00
GriffinR 42332a824e Sync mapjson with pokeemerald 2023-05-09 10:52:53 -04:00
GriffinR ac16ba797f Merge pull request #622 from SombrAbsol/master 
Remove Magma Emblem and Old Sea Map item icons
 2023-05-09 09:32:31 -04:00
GriffinR 5c0bb3a18e Merge pull request #619 from GriffinRichards/sync-charmap 
Sync some charmap characters with pokeemerald
 2023-05-05 15:19:29 -04:00
GriffinR 1824a9fea2 Sync some charmap characters with pokeemerald 2023-05-03 14:22:01 -04:00
GriffinR f9f4b6ebbd Merge pull request #617 from waterwheels/patch-1 
Red and Leaf back palettes swapped
 2023-04-27 07:27:46 -04:00
GriffinR 055dee9832 Merge pull request #616 from fdeblasio/oakSpeechSpecies 
Made variable for Oak's introduction Pokemon
 2023-04-10 15:06:13 -04:00
GriffinR 45e4c30d38 Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql 2023-04-10 10:18:07 -04:00
GriffinR 74782403c1 Merge pull request #615 from fdeblasio/moreFireRedConstants 
Added constants for nature and species length
 2023-04-10 09:46:22 -04:00
GriffinR f6aa148946 Merge pull request #614 from GriffinRichards/metatile-labels 
Format metatile labels
 2023-03-24 09:54:02 -04:00
GriffinR 31d4dabcda Merge pull request #613 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:15:50 -04:00
GriffinR adf1437074 Format metatile labels 2023-03-21 13:09:32 -04:00
GriffinR a2f30a3382 Merge pull request #611 from GriffinRichards/sync-pokemon 
Sync pokemon.c
 2023-03-18 13:24:51 -04:00
GriffinR ac9bd3ec8f Treat map data as const 2023-03-16 12:46:46 -04:00