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

2096 Commits

Author SHA1 Message Date
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
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
6b2e49ffbc Updated Ever Grande window lights. 2023-03-13 18:15:42 -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
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
6fe4ce05e1 Added lighting to Sootopolis lava. 2023-02-10 19:32:48 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR
c663154760
Merge pull request #1836 from GriffinRichards/fix-clone 
Add fix for Battle Tower cloning bug
 2023-01-15 00:32:24 -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
Ariel A
4bee03bc18 Merge branch 'followers' into lighting 2023-01-03 18:19:19 -05:00
Ariel A
beb282a359 Added movements/scripts for overworld follower field moves. 2023-01-03 18:18:09 -05:00
GriffinR
e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -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
Ariel A
22c1d94ab9 Merge branch 'followers' into lighting 2022-11-05 19:04:14 -04: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
Ariel A
5d9e9d3e0e Fixed some follower movements. 2022-10-22 18:50:27 -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
Ariel A
3a86c8bd4c Merge branch 'followers' into lighting 2022-10-07 21:08:06 -04:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04:00
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Ariel A
e54c18fb8e Merge branch 'followers' into lighting 2022-09-10 22:29:18 -04:00
Ariel A
e322475aee Fixed Rayquaza cutscene flicker. 2022-09-03 21:43:04 -04: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
Ariel A
8c60050553 Added proper movement actions for exiting/entering pokeball. 2022-08-28 23:34:39 -04:00
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug 
Incorporate commented bug fixes in contest AI scripts
 2022-08-26 23:53:44 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
Eduardo Quezada
6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00