Move heal locations data to their associated map.json#2034
Merged
GriffinRichards merged 6 commits intopret:porymap-6from Oct 11, 2024
Merged
Move heal locations data to their associated map.json#2034GriffinRichards merged 6 commits intopret:porymap-6from
GriffinRichards merged 6 commits intopret:porymap-6from
Conversation
…heal-locations-json
2 tasks
Merged
ycp3
added a commit
to ycp3/pokeemerald
that referenced
this pull request
Jun 26, 2025
* Rename battle terrain to environment * Address concerns * Fix defines in MAP_NUM and MAP_GROUP * Change metatile behaviors to enum (pret#2027) * Revert MB name changes * Remove accidental expansion leftovers * Update wild encounters json template * Move heal locations data to their associated map.json (pret#2034) * Generate local IDs from map.json files * Fix typo, remove old size check * Continue adding local IDs to map.json files * Finish adding local IDs to map.json files * OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA * Fix event_constants recipe running twice * Generate MAPSEC constants from JSON * Use size constants for MAPSEC popup theme array * Update vars.h (cleanup) Removed an extra are * extern const gBasicHitSplatSpriteTemplate * extern gAncientPowerRockSpriteTemplate fix * remove undef TASK_NONE from list_menu * extern void * const gNullScriptPtr; * Fixed Gen 1/2's Transform "pink color" reference * Fixed potential unaligned issue in PC screen * Fix CaveTransition pals * Define field script opcode constants (pret#2005) Replace the magic number opcodes in field script command macros with these new constants * Document bard music (pret#2053) * Missing bard song limit constants * Index bard sound arrays with word constants * Document bard music * Extern gSprites and gOamMatrices with known array size (pret#2090) * Fix conflicting types for rotating gate functions (pret#2087) * Replace easy_chat alphabetialOrder magic numbers with EC_INDEX values (pret#2096) * Fixed switchout bug in multibattle where order of mons gets messed up (pret#2099) * Generate heal location constants automatically, move data back to a single file. * Converted apprenctice IDs from hex to decimal * Fix collision comparison in PlayerNotOnBikeMoving * Fix offset for towerInterview in BattleFrontier * Remove casts in decoration.c (pret#2110) * Changed unused compressed pal include from u16 to u32 * Renamed a berry tag variable * Fix union room typo * Align gMPlayTrack_BGM * GENDER_COUNT in sPlayer/RivalAvatarGfxIds (pret#2117) * make linkDirection more robust to member reordering * Fixed a compilation error if using AGBPrint as your log handler, misnamed AGBPrintfInit should be AGBPrintInit * Fixes for Mirage Tower graphics (pret#2120) * Add documentation for CreateCeilingCrumbleSprites * Combine mirage tower graphics * Add comment about mirage tower / player palette * Added constant in Birch speech dialogue * BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type. Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility. * gBattleControllerExecFlags bits now identified via helper macros Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work. * gBattleControllerExecFlags macro in MarkAllBattlersForControllerExec whoops, missed one * Additional fixes to last few commits ROM now compiles, but it's not comparing as equal... * Update battle_controllers.h Simplified macros. * Fixed find-and-replace mistake Functions were using the wrong constant. * Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_ I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI. I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough. * Tweaks to documentation comments * Update battle_controllers.h typo * Identified task and sprite fields related to battle weather animations Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm. * Battle anims, ice: ARRAY_COUNT works if used with a cast * Shorter names for engine/controller communication enum members * Added missing include due to g++ changes * InitSpritePosToAnimAttacker documentation * Rename battlerId to battler for consistency (pret#2126) * Replace: moveId -> move, moveIdx -> moveIndex (pret#2134) * Add BattlerId enum and document (pret#2135) * Remove files that should not have been committed * Warn on suspicious setvar usages * Streamline pointer notation (pret#2139) * Fixes for C23 Support (pret#2138) * fixes for c23 support * include global.h in m4a.c & remove <string.h> include * Update header files to match source files (pret#2143) * Correct C23 Checks (pret#2144) * Remove berry yield bug fix * Rename ItemId_GetX to GetItemX (pret#2116) * Remove files that were wrongly commited * Remove map_group_count.h * sync list menu functions with firered * replace magic numbers with enums * fix sprite count in RepeatBallOpenParticleAnimation * Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches * Fixed typo in sMoveRelearnerMenuState (pret#2155) * Add missing uses of LOCALID_NONE for trainerbattle * Fix wrong keep temps files directory in makefile * Move gTradePlatform_Tilemap to header (pret#2088) * Match graphics declarations with externs (pret#2089) * Fix sGpuRegBuffer potential alignment issues (pret#2157) * Ensure sMonMarkings_Gfx alignment (pret#2158) --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com> Co-authored-by: GriffinR <griffin.g.richards@gmail.com> Co-authored-by: shachar700 <48739719+shachar700@users.noreply.github.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> Co-authored-by: DizzyEggg <jajkodizzy@wp.pl> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Raymond Dodge <git@rayrobdod.name> Co-authored-by: Frank <fdeblasio1004@gmail.com> Co-authored-by: Isaac Aronson <i@pingas.org> Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com> Co-authored-by: pokemonmasteraaron <webmaster.vgstorm@gmail.com> Co-authored-by: Estellar <137097857+estellarc@users.noreply.github.com> Co-authored-by: DavidJCobb <831497+DavidJCobb@users.noreply.github.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> Co-authored-by: Kurausukun <lord.uber1@gmail.com> Co-authored-by: Abaresk <abaresk01@gmail.com> Co-authored-by: AlexOn1ine <alexthenotes@gmail.com> Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
PhilipW02
pushed a commit
to PhilipW02/pokeemerald
that referenced
this pull request
Dec 8, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Syncing with pret/pokefirered#673