Commit Graph

3809 Commits

Author SHA1 Message Date
Marcus Huderle 14b76daff8
Convert .aif files to .wav (#711)
* Migrate .aif files to .wav

* cleanup
2025-12-01 09:01:35 -06:00
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
PikalaxALT b0f9143049
Ignore CMakeLists.txt and cmake/clangd artifacts 2025-11-16 20:39:37 -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
Jaizu 507f1d8d36
Modern fixes (#697) 2025-06-11 14:27:42 -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
LOuroboros 3efb581e7e Linked STARTMENU labels to the entries of sStartMenuActionTable
This makes it easier to remove options from the start menu at will.
Looking for a STARTMENU label and removing it from enum StartMenuOption and the SetUpStartMenu functions isn't good enough by itself.
2025-05-15 04:39:59 -03: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
PikalaxALT 7f7ff65e06
.i and .s files should be under build/ when KEEP_TEMPS=1 2025-03-07 20:29:16 -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
cawtds 355b92f791
consolidate arrow tiles (#682) 2025-02-03 12:19:40 -05:00
Kevin d844877218
Rename the Move Relearner specials. (#684) 2025-01-19 14:14:55 -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
abcboy101 6319b453bc Update link_rfu_2.c 2024-08-24 22:19:28 -04:00
Kurausukun bceff5fb5f add constant for 3 main bag pockets 2024-08-12 14:33:52 -04:00