5f9f173b6a
Generate heal location constants automatically, move data back to a single file.
2025-02-03 16:00:29 -05:00
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
587d494421
Merge branch 'porymap-6' into generate-map-constants
2024-12-17 20:48:28 -05:00
b10c2f7584
Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6
2024-11-26 12:47:28 -05:00
2a3e92e10f
Sync Makefile and common syms ( #676 )
2024-11-26 12:46:12 -05:00
d4eee4692f
Generate region_map_sections from JSON ( #677 )
2024-11-26 12:45:53 -05:00
b76867fc3b
Replace incorrect Japanese characters
2024-11-19 19:35:18 -05:00
94b8dc79de
Use LOCALID constants for clone's target_local_id
2024-10-16 15:27:53 -04:00
b1d92b79b6
Fix event_constants recipe running twice
2024-10-15 22:20:43 -04:00
50babdb07f
Move local IDs to map.json
2024-10-15 02:51:08 -04:00
4dc5c47799
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-14 22:48:30 -04:00
a2e408cf4e
Add support for local IDs in map.json
2024-10-14 22:44:16 -04:00
d2c592030d
Sync toolchain fixes from pokeemerald
2024-10-11 15:21:06 -04:00
bb50006fc9
Move heal locations data to their associated map.json ( #673 )
2024-10-11 15:17:18 -04:00
967a1f98b4
Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6
2024-10-11 13:38:34 -04:00
99de06de5f
Fix libpng installation for workflow on Ubuntu 24.04
2024-10-11 13:36:05 -04:00
d45b94ea64
Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6
2024-09-18 19:40:41 -04:00
311d317eb3
Merge pull request #672 from GriffinRichards/sync-toolchain
...
Sync Makefile and tools with pokeemerald
2024-09-18 19:40:16 -04:00
e47a054393
Sync remaining tools
2024-09-14 11:26:14 -04:00
f89a69a2d9
Have scaninc ignore non-existing files
2024-09-13 23:12:50 -04:00
ab80760dfc
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
2024-09-13 23:12:20 -04:00
93b4a7b815
Toolchain sync fixes
2024-09-12 17:49:50 -04:00
2ed7806380
Deleted generated constants, add midi.cfg
2024-09-12 12:58:22 -04:00
f0566e68f0
Sync tools directory
2024-09-12 12:39:00 -04:00
a14180a64e
Initial Makefile sync
2024-09-12 12:22:25 -04:00
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
caf8c6bfa9
Merge pull request #670 from abcboy101/decode
...
Update link_rfu_2.c
2024-08-29 14:16:53 -04:00
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
5e464c2091
Sync map macro change with pokeemerald
2024-08-27 13:57:07 -04:00
6319b453bc
Update link_rfu_2.c
2024-08-24 22:19:28 -04:00
466a69a6e0
Update src/event_object_movement.c
...
Co-authored-by: GriffinR <griffin.g.richards@gmail.com >
2024-08-10 20:41:21 +02:00
f155bf5419
Merge pull request #667 from abcboy101/decode
...
Decode unused JP text
2024-08-09 20:46:07 -04:00
588e164e67
Decode unused JP text
2024-08-09 20:19:38 -04:00
d61220569d
fix for potential UB in CameraObjectReset2
2024-06-27 16:13:17 +02:00
e6eb717275
UB fix ClockwiseWipe_TopRight
2024-06-25 22:09:08 +02:00
c6a2f50491
Merge pull request #657 from aarant/master
...
Linkerscript now tracks RAM/ROM usage
2024-06-22 12:02:35 -04:00
21e8a142db
Revert section rename
2024-06-22 11:58:39 -04:00
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
b2e2648d15
Use C preprocessor directives
2024-06-22 11:51:16 -04:00
9b2fc69e5e
Merge pull request #656 from SatoMew/misc-fixes
...
Spring cleaning
2024-06-22 11:46:13 -04:00
ceeb6a4ca0
Merge pull request #661 from Kurausukun/gcc14-fix
...
Fix Compilation on GCC 14
2024-06-19 09:29:49 -04:00
6bd758f45d
fix compilation on gcc 14
2024-06-06 23:22:37 -04:00
4578a59673
Fix Localization Oversight in Daisy's Text
...
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
2024-05-24 22:09:31 -04:00
fb0c7dc3f2
Fix Typo in Nurse Script
...
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom => EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom
2024-05-24 21:58:35 -04:00
bc76541189
feat: Linkerscript now tracks RAM/ROM usage
...
Based on https://github.com/pret/pokeemerald/pull/1952
2024-05-16 19:03:37 -04:00
b9dec717da
Spring cleaning
2024-05-12 14:34:43 +01:00
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
efdae01b4b
Remove non-existent tilesets from label comments and alphabetize
2024-01-18 14:42:20 -05:00
9588ba6e01
Merge pull request #652 from Kurausukun/macros
...
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
2023-12-27 17:43:49 -05:00
2da3a172d6
safeguard SQUARE and CUBE macros in parentheses
2023-12-27 17:37:11 -05:00
GriffinR