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

12360 Commits

Author SHA1 Message Date
hedara90
3bcfa355eb
Config for move slot rearrangement in battle (#6017) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-17 23:03:01 +01:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01: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
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports (#6041) 2025-01-17 14:39:52 -03:00
Mercy
21d2e40f0a
Fix Match Call Behavior (#5931) (#6033) 2025-01-16 21:23:12 -08:00
Pawkkie
465d30fbd0
Add AI_FLAG_PREDICT_SWITCH (#6028) 2025-01-16 21:43:16 +01:00
cawtds
75d5edad08
Fix UB when accessing move result flags (#6030) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-01-15 21:30:25 +01:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves (#6026) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-01-15 15:20:31 +01:00
Martin Griffin
ed0c9a4671
Restore lock/lockall/locktrainer/release/releaseall in triggers (#5976) 2025-01-15 10:22:26 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-15 14:07:12 +01:00
DizzyEggg
9385dfed67 Fix CaveTransition pals 2025-01-15 10:08:02 +01:00
Alex
c46f8541f9
Fixes self effect moves not procing for spread moves when battler 3 w… (#6020) 2025-01-14 15:18:00 -05:00
AZero13
7eb96ec615
Use SET8 and SET32 consistently (#5544) 
Co-authored-by: Rose <83477269+AreaZR@users.noreply.github.com>
 2025-01-14 20:42:55 +01:00
Pawkkie
e8dd8da5f7
Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE (#6025) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-01-14 14:13:48 -05:00
Alex
1c3ce75a60
Wrong undefs (#6024) 2025-01-14 14:01:10 -05:00
AZero13
5effd5a8b5
Remove redundant calls to GetMonData in pokemon.c (#5545) 
Co-authored-by: Rose <83477269+AreaZR@users.noreply.github.com>
 2025-01-14 20:00:48 +01:00
Hedara
9bf7a772d0 Fixed potential unaligned issue in PC screen 2025-01-14 09:50:08 +01:00
Alex
f1eebc978d
Fixes defrosting if frozon mon is not damaged by opponent (#6016) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-01-13 10:09:55 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Eduardo Quezada
453bb29b73
Fixed Gen 1/2's Transform "pink color" reference 2025-01-12 07:43:57 -03:00
hedara90
9c7c94d474
Fixed a bunch of move anims (#5936) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-12 10:01:44 +01:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Alex
28561bca4a
Fixes zmove trigger sprite on b button exit (#6009) 2025-01-12 00:59:57 +01:00
Alex
9e8ab3d891
Fixes Tera giving boost to dynamic bp moves (#6008) 2025-01-12 00:59:12 +01:00
Alex
2da547908e
Fixes Shell Bell inlcuding heal amount from Future Sight when triggered (#5962) 2025-01-12 00:27:31 +01:00
Alex
ddef67bbb1
Future Sight Innards Out follow up for upcoming (#5998) 2025-01-12 00:25:50 +01:00
Alex
10a3ed2044
Use gCurrentMove instead of checking FF move (#5999) 2025-01-12 00:25:17 +01:00
Alex
8f34c76395
Removes Resource Flags and moves fields to DisableStruct (#5945) 2025-01-11 09:39:10 -03:00
DizzyEggg
bfa9d905e1
Free some IWRAM (#6000) 2025-01-11 13:30:11 +01:00
DizzyEggg
f15d89893e
Allow Party Menu with 0 Pokemon (#5997) 2025-01-11 12:14:31 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Alex
6e5f40d506
Introduces BattlerState struct for the Battle Engine (#5954) 2025-01-11 07:12:22 -03:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup (#5994) 2025-01-11 10:07:47 +01:00
Eduardo Quezada
c33c38e020
Remove form change function footguns (#5995) 2025-01-11 09:57:39 +01:00
Pawkkie
f8151f0be5
Missed two uses of new hazard type enum (#5996) 2025-01-10 20:14:15 -03:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs (#5964) 2025-01-10 17:07:32 -05:00
DizzyEggg
3c7708fae4
Remove out of bounds gSprites access in move relearner (#5991) 2025-01-10 17:00:30 +01:00
Alex
75a2d419e1
Follo up for Innards Out / Future Sight interaction (#5967) 2025-01-10 16:59:37 +01:00
Alex
ab49aaf3b1
Dynamic move type was ignored in doubles for spread moves (#5984) 2025-01-10 16:58:51 +01:00
DizzyEggg
07255a2237
extern void * const gNullScriptPtr; 2025-01-10 11:55:02 +01:00
DizzyEggg
25d678f1e7
PlayerHandleStatusXor - change u8 to u32 (#5988) 2025-01-10 09:53:27 +00:00
DizzyEggg
84856817b2
remove undef TASK_NONE from list_menu 2025-01-09 19:33:45 +01:00
DizzyEggg
9ab4f5d26a
extern gAncientPowerRockSpriteTemplate fix 2025-01-09 15:50:39 +01:00
DizzyEggg
83979375d3
Don't write to NULL in TryFindHiddenPokemon (#5983) 2025-01-09 14:19:07 +00:00
DizzyEggg
e244d942cc
CreateFacilityMon error: 'personality' may be used uninitialized (#5981) 2025-01-09 14:01:00 +01:00
Martin Griffin
4c4137d600
Revert #5033 change to MapHeaderRunScriptType (#5975) 2025-01-08 19:26:35 +01:00
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE (#5972) 2025-01-08 14:00:20 +01:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) 
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.

All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.

Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.

Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
   effect.
2. Immediately run triggers if they only affect flags/vars. This removes
   the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
   warp scripts onto the global script context if they would block
   (approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
   not see the player if the script has no effect, and the trainer will
   use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
   cant_see_if_* commands have been introduced so that scripts are able
   to do something when the player interacts with the trainer even if
   that trainer wouldn't see them.
 2025-01-08 10:27:00 +00:00
DizzyEggg
0ec1189f34
extern const gBasicHitSplatSpriteTemplate 2025-01-07 22:14:54 +01:00