2179 Commits

Author SHA1 Message Date
Ariel A
bc034aaf73 Merge branch 'followers-expanded-id' into lighting-expanded-id 2025-01-25 21:42:02 -05:00
Ariel A
8933b84e1c Merge branch 'followers' into followers-expanded-id 2025-01-25 21:40:51 -05:00
Ariel A
c492bb3fec fix: follower field movements after scripted movement update 2025-01-21 23:27:28 -05:00
Ariel A
a6ef9c7577 Merge branch 'followers' into followers-expanded-id 2025-01-01 00:39:14 -05:00
Ariel A
01335fa453 Unfreeze follower object during lockall (if safe movement flag set).
MSGBOX_SIGN no longer freezes follower.
2025-01-01 00:35:30 -05:00
Ariel A
0f706ac9e0 Merge branch 'followers' into followers-expanded-id 2024-10-21 00:05:26 -04:00
Ariel A
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -04:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
Ariel A
3abf4871fd Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-08-12 23:13:02 -04:00
Eduardo Quezada
d88834dd58 Backported OBJ_EVENT_GFX_SPECIES macro from Expansion 2024-08-07 13:42:18 -04:00
Ariel A
d6762d4dbc Merge branch 'lighting' into lighting-expanded-id 2024-06-01 15:22:21 -04:00
Ariel A
a49d908254 Merge branch 'followers' into followers-expanded-id 2024-05-21 22:23:00 -04:00
Ariel A
f82b40178e Merge branch 'followers' into lighting 2024-05-21 22:16:01 -04:00
Ariel A
b37d9b3000 fix: disable followers in Union Room
Fixed #17
2024-05-21 22:14:29 -04:00
Ariel A
9b6843442a fix: add mart light sprite to Route102 2024-05-21 22:10:53 -04:00
Ariel A
991b104d52 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-05-17 21:45:44 -04:00
Ariel A
05bf03975a Merge branch 'followers' into lighting 2024-05-17 21:40:20 -04:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Ariel A
e36a7c59cf Merge branch 'followers' into followers-expanded-id 2024-05-03 00:45:04 -04:00
Ariel A
4948d80030 fix: follower pokemon should disappear when healed by nurse 2024-04-30 23:09:43 -04:00
Ariel A
3c9c48e2a1 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-04-28 20:39:39 -04:00
Ariel A
ad0ae99207 Merge branch 'followers' into lighting 2024-04-27 23:30:08 -04:00
Ariel A
42d9b284b9 Merge branch 'followers' into followers-expanded-id 2024-04-27 23:19:38 -04:00
Ariel A
d7a021a914 fix: Made Common_Movement_* 'safe' for followers
fixed #31
2024-04-27 22:47:41 -04:00
Ariel A
86171be6d3 Merge branch 'lighting' into lighting-expanded-id 2024-03-06 22:28:35 -05:00
Ariel A
f1892cf797 Merge branch 'followers' into lighting 2024-03-06 22:21:13 -05: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
9eac31641d Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-02-17 17:58:32 -05:00
Ariel A
7cf2d1eca0 Merge branch 'followers' into lighting 2024-02-17 17:51:30 -05:00
Ariel A
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
Ariel A
725252905b Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05:00
Ariel A
f861504cfc Undo map.json changes. 2024-02-15 22:23:59 -05:00
Ariel A
a407c72235 Cleaned up follower code.
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -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
72c81db042 Merge branch 'followers' into lighting 2023-12-31 01:45:07 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
Document datahpupdate
2023-11-07 12:25:26 -05:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04: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
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -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
c5fb5fbb5f
Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed
Renamed "ButItFailed" script names
2023-08-12 23:00:57 -04:00
Eduardo Quezada
33b16cb82d 2nd pass 2023-08-11 16:55:27 -04:00