Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,125 Commits 1 Branch 0 Tags
Commit Graph

411 Commits

Author SHA1 Message Date
Ariel A
685a8a9118 Merge remote-tracking branch 'upstream/master' into followers 2025-06-24 20:39:12 -04:00
Ariel A
07fd8a28fb fix: hide followers when player enters Battle Pike curtains 2025-06-24 20:16:04 -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
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Ariel A
c492bb3fec fix: follower field movements after scripted movement update 2025-01-21 23:27:28 -05:00
GriffinR
2f67b17571
Document bard music (#2053) 
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
 2025-01-17 17:54:38 +00: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
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -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
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
Jaizu
ef03daf6d4 Fix Pokeblock script missing a releaseall 2024-05-19 12:52:04 +02:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Ariel A
4948d80030 fix: follower pokemon should disappear when healed by nurse 2024-04-30 23:09:43 -04:00
Ariel A
d7a021a914 fix: Made Common_Movement_* 'safe' for followers 
fixed #31
 2024-04-27 22:47:41 -04:00
Ariel A
725252905b Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -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
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
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
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -04:00
Ariel A
b1ea5fb8c3 Fixed bug with applymovement not hiding followers after a battle. 2023-03-13 17:51:35 -04:00
GriffinR
0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Eduardo Quezada
96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
Ariel A
beb282a359 Added movements/scripts for overworld follower field moves. 2023-01-03 18:18:09 -05:00
Ariel A
5d9e9d3e0e Fixed some follower movements. 2022-10-22 18:50:27 -04:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Ariel A
8c60050553 Added proper movement actions for exiting/entering pokeball. 2022-08-28 23:34:39 -04:00
Ariel A
37ca4a6ceb Made talking to defeated trainers follower-safe. 2022-08-16 19:59:14 -04:00
Eduardo Quezada
63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
Ariel A
11a7aa1ec8 Made cutting trees follower-safe. 2022-05-29 01:45:03 -04:00
Ariel A
4236f18f2d Fixed follower bugs when returning from a battle facility challenge. 2022-05-20 00:18:41 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Ariel A
ec756d3d12 Fixed object events not being unfrozen after using Flash. 2022-05-17 00:33:37 -04:00
Eduardo Quezada
21d8c8e9c5 Using follower's nickname instead of ther species name. 2022-05-13 21:22:25 -04:00
Ariel A
831c73c18c Added system for conditional follower messages. 2022-05-03 23:01:02 -04:00
cbt6
f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup 
Miscellaneous fixes
 2022-01-19 22:17:37 -05:00
GriffinR
110fbc559c Make item optional for givemon and setwildbattle 2022-01-11 02:08:14 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00