Hedara
dd17524fc9
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
...
sha1sum changed
Conflicts:
include/global.h
include/overworld.h
include/pokemon.h
src/map_name_popup.c
src/pokedex_area_screen.c
src/pokemon.c
2025-11-01 15:09:20 +01: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
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
GriffinR
44c3069895
Add explicit defaults for MAPSEC data
2025-06-26 16:26:59 -04:00
GriffinR
50d81616cd
Relax MAPSEC region map data requirements
2025-06-10 13:05:03 -04:00
hedara90
0917af214c
Replace all usages of lz compression with smol ( #7032 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-31 19:47:54 +02:00
GriffinR
b89fda79ea
Generate MAPSEC constants from JSON
2024-11-06 21:43:13 -05:00
GriffinR
d90132842a
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
...
use json for region map sections
2022-09-25 21:56:09 -04:00
GriffinR
e473aaf783
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update
2022-09-25 11:56:57 -04:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
garakmon
3fe423a6f4
use json for region map sections
...
- update nlohmann/json and pantor/inja in tools/
- create new inja template
2022-04-04 23:32:03 -04:00
GriffinR
8b43cffe09
Move remaining region map graphics to region map folder
2022-02-22 18:43:23 -05:00
GriffinR
ed70b81ba0
Use constants for region map layout
2022-02-22 18:29:21 -05:00
GriffinR
a0c127f72c
Move region map layout to C
2022-02-22 18:13:11 -05:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
921f389e4e
Fix Rusboro and Lavarige typos
2020-09-11 14:47:47 -04:00
GriffinR
f5495d1220
Give proper names to underwater maps
2020-09-01 03:03:14 -04:00
GriffinR
86354f1d50
Document some pokenav and region map
2020-02-05 21:04:43 -05:00
garak
f6d55db535
decompile pokenav_unk_5 data
2019-07-19 21:05:55 -04:00
garak
ed25326140
fix formatting
2018-12-29 21:52:38 -05:00
garak
1baa17c632
index gRegionMapEntries by map section constants
2018-12-29 21:49:29 -05:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Diegoisawesome
26ef40553c
Move data from include to src
2018-08-23 02:32:34 -05:00