608 Commits

Author SHA1 Message Date
Ariel A
9eac31641d Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-02-17 17:58:32 -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
98221c4f70 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-12-31 02:48:37 -05: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
f8ca559378 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-09-03 18:17:50 -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
540c536342 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-05-15 19:15:38 -04: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
6a89e5b0d2 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-04-23 17:50:20 -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
582761f56a Merge branch 'lighting' into lighting-expanded-id 2023-03-13 18:22:53 -04:00
Ariel A
284ec24e0c Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-03-13 18:19:35 -04:00
Ariel A
35b4d2f37e Merge branch 'followers' into lighting 2023-03-13 18:18:08 -04: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
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
Ariel A
3b3e45cff7 Fixed shadow positioning bug in some battle facilities. 2023-02-10 22:06:29 -05:00
Ariel A
15e6acc0a3 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-10 19:49:54 -05:00
Ariel A
b733cd14a5 Merge branch 'followers' into followers-expanded-id 2023-02-10 19:40:44 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
Ariel A
244f3ceb15 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-01-12 21:58:39 -05:00
Ariel A
95b98efc30 Updated existing OW pokemon events with new system. 2023-01-12 21:45:42 -05:00
GriffinR
e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
Ariel A
5cae740eba Merge branch 'followers' into lighting 2022-11-21 22:17:14 -05:00
Ariel A
e6d1cfae24 Merge branch 'master' into followers 2022-11-21 21:21:50 -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