Commit Graph

489 Commits

Author SHA1 Message Date
Martin Griffin
fed3b0c81a Migrate INCBINs to INCGFX via migrate_incgfx.py
The exact command used to migrate source files was:
  git ls-files | grep 'src/.*\.[ch]$' | xargs grep -l INCBIN | xargs python3 migrate_incgfx.py

The Makefile rules were cleaned up manually by looking for graphics
rules and keeping only those ending with '\' (what the migration script
calls a "Multi-line rule"). You may think some of wallpaper rules could
be removed, but they're inputs for the '@cat $^ >$@' rules which are
currently unable to be migrated to 'INCGFX'.
2026-04-19 07:06:18 +01:00
Frank
80db2c6aec Renamed building and stadium palettes to be more accurate 2026-01-18 18:19:03 -05:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values (#2183)
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.

Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.

Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
2025-10-19 17:37:13 +01:00
GriffinR
44c3069895 Add explicit defaults for MAPSEC data 2025-06-26 16:26:59 -04:00
GriffinR
670d3a6c9f
Merge pull request #2152 from GriffinRichards/mapsec-data
Some checks failed
CI / build (push) Has been cancelled
Relax MAPSEC region map data requirements
2025-06-25 22:05:35 -04:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089)
Some checks failed
CI / build (push) Has been cancelled
2025-06-23 20:31:18 +01:00
GriffinR
50d81616cd Relax MAPSEC region map data requirements 2025-06-10 13:05:03 -04:00
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
GriffinR
fba096a500 Remove map_group_count.h 2025-05-22 13:59:23 -04:00
Alex
b31a73f990
Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +01:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139)
Some checks failed
CI / build (push) Has been cancelled
2025-05-16 12:04:44 +01:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
Some checks are pending
CI / build (push) Waiting to run
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Isaac Aronson
56947be5d6
Fix union room typo 2025-03-28 10:26:01 -05:00
Hedara
521432b269 Renamed a berry tag variable
Some checks failed
CI / build (push) Has been cancelled
2025-03-24 13:47:47 +01:00
Frank
a0a8434e26 Converted apprenctice IDs from hex to decimal 2025-02-13 12:13:22 -05:00
GriffinR
cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
Raymond Dodge
a3d0978762
Replace easy_chat alphabetialOrder magic numbers with EC_INDEX values (#2096)
Some checks failed
CI / build (push) Has been cancelled
2025-01-18 20:58:03 -05:00
GriffinR
2f67b17571
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
GriffinR
382ee9e276 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-11-23 16:10:33 -05:00
GriffinR
b89fda79ea Generate MAPSEC constants from JSON 2024-11-06 21:43:13 -05:00
Frank
544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros
Fix defines in MAP_NUM and MAP_GROUP
2024-09-19 12:17:16 -04:00
Bassoonian
cafeb3fa92 Update wild encounters json template 2024-09-19 11:27:02 +02:00
Bassoonian
49735754c3 Remove accidental expansion leftovers 2024-09-19 11:23:33 +02:00
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
Bassoonian
003bd54600 Rename battle terrain to environment 2024-07-13 12:02:18 +02:00
Kurausukun
7567b0a57a safeguard SQUARE and CUBE macro arguments in parentheses 2023-12-27 17:29:35 -05:00
Bassoonian
bc2a745171 Fix accidental symbol replacements 2023-12-12 23:18:35 +01:00
Bassoonian
e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
Bassoonian
cd9ef3a566 Formatting fix 2023-10-28 16:34:11 +02:00
Bassoonian
f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Eduardo Quezada
b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
GriffinR
10a10e914b
Merge pull request #1910 from GriffinRichards/misc-constants
Use miscellaneous missing constants
2023-08-15 17:53:41 -04:00
GriffinR
18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Eduardo Quezada
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR
8d88a38561
Merge pull request #1854 from GriffinRichards/constants-num-frames
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
2023-02-27 13:16:49 -05:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc
Document remaining field_specials task data
2023-02-08 22:34:57 -05:00
GriffinR
5496f0e6b0
Merge pull request #1850 from GriffinRichards/sync-trade
Sync trade
2023-02-03 19:05:00 -05:00
Jaizu
717ba22ea1
Make contest opponents an enum
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
2023-02-03 15:49:22 +01:00
GriffinR
3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00
GriffinR
4328ed8b19 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-02-01 14:59:45 -05:00