Commit Graph

561 Commits

Author SHA1 Message Date
GriffinR cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
GriffinR 0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00
GriffinR a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR bf17d54b52 Finish adding local IDs to map.json files 2024-10-12 23:32:28 -04:00
GriffinR cb66ea6653 Continue adding local IDs to map.json files 2024-10-12 12:24:57 -04:00
GriffinR 9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
GriffinR 091b7269df Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-09-19 12:33:34 -04:00
GriffinR 04197b4912 Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
Bassoonian 5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
Jaizu 189d542520 Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00
GriffinR a5c2ac5e49 Use BUGFIX in assembly files 2023-10-20 09:10:49 -04:00
GriffinR b248791f47 Merge pull request #1904 from GriffinRichards/temp-alias
Add temp flag and var aliases
2023-08-11 15:45:00 -04:00
Martin Griffin 912a80e27a Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR 866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR 6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
PSF b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
Zunawe 492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
GriffinR bb078e0618 Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments
Document music usage to make it easier to search for a specific track
2023-03-05 15:29:38 -05:00
Eduardo Quezada a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
GriffinR ce6875817f Merge pull request #1860 from GriffinRichards/metatile-labels
Format metatile_labels
2023-03-04 23:36:04 -05:00
Zunawe f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Zunawe 60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
Zunawe 8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
GriffinR b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR 9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
GriffinR e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
GriffinR c76beed989 Merge pull request #1807 from pret/porymap-5
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
GriffinR 01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
GriffinR cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
GriffinR a418f8d976 Merge pull request #1755 from GriffinRichards/map-dynamic
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
tustin2121 4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
Getting rid of the VAR_ prefix, to avoid the porymap problem.
2022-10-18 21:12:31 -04:00
tustin2121 327c648e87 Document seldom-used trigger functionality
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
LOuroboros 222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
GriffinR 36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Eduardo Quezada c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
GriffinR 0516f94837 Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore
Added constants for GetLeadMonFriendshipScore
2022-08-26 14:52:10 -04:00
Eduardo Quezada 6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00
GriffinR ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
LOuroboros 11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
LOuroboros 1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00
GriffinR 898ec580ae Merge pull request #1737 from GriffinRichards/lock-unlock
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
Eduardo Quezada e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
Eduardo Quezada 63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
GriffinR 5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
Colton G. Rushton 3de23b332a Supplant https://github.com/pret/pokeemerald/pull/1579 2022-06-18 21:51:05 -03:00