Ariel A
|
841d0cf251
|
Merge branch 'followers' into followers-expanded-id
|
2025-06-24 20:50:58 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Ariel A
|
c8fb56d73b
|
Merge branch 'followers' into followers-expanded-id
|
2025-02-10 00:24:50 -05:00 |
|
Ariel A
|
ef05bbf394
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-02-10 00:11:38 -05:00 |
|
GriffinR
|
cdadd7d2ed
|
Generate heal location constants automatically, move data back to a single file.
|
2025-02-03 20:25:11 -05:00 |
|
Eduardo Quezada
|
3f98c78297
|
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
|
2024-12-04 17:38:23 -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 |
|
Eduardo Quezada
|
d88834dd58
|
Backported OBJ_EVENT_GFX_SPECIES macro from Expansion
|
2024-08-07 13:42:18 -04:00 |
|
Jaizu
|
189d542520
|
Fix Steven partner battle post-battle script (#2001)
|
2024-06-17 15:44:52 -04:00 |
|
Ariel A
|
a49d908254
|
Merge branch 'followers' into followers-expanded-id
|
2024-05-21 22:23:00 -04:00 |
|
Ariel A
|
b37d9b3000
|
fix: disable followers in Union Room
Fixed #17
|
2024-05-21 22:14:29 -04:00 |
|
Ariel A
|
3486097ee9
|
Merge branch 'followers' into followers-expanded-id
|
2024-03-06 22:13:07 -05:00 |
|
Eduardo Quezada
|
ed4a291b37
|
Revert Object Event change from vanilla
|
2024-02-17 18:09:11 -05:00 |
|
Ariel A
|
195d2bb79a
|
Merge branch 'followers' into followers-expanded-id
|
2024-02-17 17:19:01 -05:00 |
|
Ariel A
|
f861504cfc
|
Undo map.json changes.
|
2024-02-15 22:23:59 -05:00 |
|
Eduardo Quezada
|
ebbcb7d025
|
Whitespace, documentation and style
|
2024-01-22 19:12:52 -03:00 |
|
Ariel A
|
398a9ee8fa
|
Merge branch 'followers' into followers-expanded-id
|
2023-12-31 01:49:56 -05:00 |
|
Ariel A
|
7d7531f2fa
|
Merge branch 'master' into followers
|
2023-12-31 01:28:27 -05:00 |
|
GriffinR
|
a5c2ac5e49
|
Use BUGFIX in assembly files
|
2023-10-20 09:10:49 -04:00 |
|
Ariel A
|
bf80e5cf4f
|
Merge branch 'followers' into followers-expanded-id
# TODOs changed:
# -: Define action flags:
|
2023-09-03 17:42:31 -04:00 |
|
Ariel A
|
8df538479a
|
Merge branch 'master' into followers
|
2023-09-03 17:39:35 -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 |
|
Ariel A
|
5d392244be
|
Merge branch 'followers' into followers-expanded-id
|
2023-05-15 19:08:45 -04:00 |
|
Ariel A
|
d12efe8cd7
|
Merge branch 'master' into followers
|
2023-05-15 18:37:38 -04:00 |
|
Ariel A
|
9e00e23b96
|
Added OW daycare pokemon.
|
2023-04-23 17:34:38 -04:00 |
|
Zunawe
|
492422b6bd
|
Fix scanner item flag name
|
2023-03-23 21:47:26 -07:00 |
|
Ariel A
|
96c829ca99
|
Merge branch 'followers' into followers-expanded-id
|
2023-03-13 17:59:44 -04:00 |
|
Ariel A
|
b1ea5fb8c3
|
Fixed bug with applymovement not hiding followers after a battle.
|
2023-03-13 17:51:35 -04: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 |
|