Commit Graph

16581 Commits

Author SHA1 Message Date
AERDU
e4e4460636 fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032) 2025-01-18 19:54:20 +01:00
Alex
9ed3b176f0 Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
ghoulslash
37cbae5e54 Fix Symbiosis Needing battler Argument + Tests (#6039)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Bassoonian
db5dc85b70 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-18 13:07:05 +01:00
Bassoonian
cc9a4d34c6 Fix tests not building 2025-01-18 13:07:01 +01:00
Bassoonian
199760a6d3 Add known failing learnset cap test (#6046) 2025-01-17 21:04:46 -05:00
DizzyEggg
e83f7c79eb Fix conflicting types for rotating gate functions (#2087)
Some checks are pending
CI / build (push) Waiting to run
2025-01-17 18:19:21 -05:00
DizzyEggg
0a436d580e Extern gSprites and gOamMatrices with known array size (#2090) 2025-01-17 18:18:17 -05:00
Eduardo Quezada
17e224343f Fixed whitespace issue with trainerproc (#6042) 2025-01-17 22:04:16 +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
Raymond Dodge
b5b0ffd511 Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
2025-01-17 17:04:00 +00:00
Mercy
21d2e40f0a Fix Match Call Behavior (#5931) (#6033) 2025-01-16 21:23:12 -08: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
9952b676db Merge pull request #2095 from DizzyEggg/transition
Some checks failed
CI / build (push) Has been cancelled
Fix CaveTransition pals
2025-01-15 09:21:22 +00:00
DizzyEggg
9385dfed67 Fix CaveTransition pals 2025-01-15 10:08:02 +01:00
Alex
1c3ce75a60 Wrong undefs (#6024) 2025-01-14 14:01:10 -05:00
Pawkkie
7af6c4c09e Workflow for Scope Discussion (#6022) 2025-01-13 17:03:18 -08:00
psf
c02b7ba828 Codify new expansion release schedule (#5916)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-01-13 16:52:49 -03:00
Eduardo Quezada
52201b1561 Improved Hidden Power test (#6014) 2025-01-13 10:16:43 +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
RavePossum
536f386bed Explicitly specify dependencies for teachable learnset helper (#6015) 2025-01-13 00:01:47 +01:00
Alex
96122d9342 Adds Liquid Ooze and Aromatic Mist test (#6012) 2025-01-12 09:08:04 -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
10a3ed2044 Use gCurrentMove instead of checking FF move (#5999) 2025-01-12 00:25:17 +01:00
hedara90
846734e894 Ported Makefile fix from upcoming (#6007)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-11 21:53:15 +01:00
Eduardo Quezada
8427d47ea5 Fixed Gimmick tests failing when running first (#6001) 2025-01-11 13:36:00 +01:00
psf
71cf1bfaa7 Updated Makefile to allow for the creation of specific tests (#5993) 2025-01-11 07:25:04 +00: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
DizzyEggg
25d678f1e7 PlayerHandleStatusXor - change u8 to u32 (#5988) 2025-01-10 09:53:27 +00:00
Martin Griffin
1c765d1126 Merge pull request #2085 from DizzyEggg/patch-4
Some checks failed
CI / build (push) Has been cancelled
remove undef TASK_NONE from list_menu
2025-01-09 19:29:09 +00:00
DizzyEggg
84856817b2 remove undef TASK_NONE from list_menu 2025-01-09 19:33:45 +01:00
Martin Griffin
0779c9cf49 Merge pull request #2084 from DizzyEggg/patch-3
Some checks are pending
CI / build (push) Waiting to run
extern gAncientPowerRockSpriteTemplate fix
2025-01-09 15:51:10 +00:00
DizzyEggg
9ab4f5d26a extern gAncientPowerRockSpriteTemplate fix 2025-01-09 15:50:39 +01:00
DizzyEggg
e244d942cc CreateFacilityMon error: 'personality' may be used uninitialized (#5981) 2025-01-09 14:01:00 +01:00
Alex
e264fa6fc0 Removed OW_AUTO_SIGNPOST (#5978) 2025-01-08 16:14:38 -08:00
Pawkkie
b5f539ed21 Rename AI_FLAG_PREFER_STRONGEST_MOVE (#5972) 2025-01-08 14:00:20 +01:00
Martin Griffin
697d2b7f30 Merge pull request #2083 from DizzyEggg/patch-2
Some checks failed
CI / build (push) Has been cancelled
missing const in extern gBasicHitSplatSpriteTemplate
2025-01-08 06:05:37 +00:00
DizzyEggg
0ec1189f34 extern const gBasicHitSplatSpriteTemplate 2025-01-07 22:14:54 +01:00
Alex
c3833fa55f Fixes Parting Shot / Eject Pack interaction (#5963) 2025-01-07 15:24:12 -05:00
Pawkkie
46fc560320 Update scope.md (again) (#5971) 2025-01-07 12:17:14 -08:00
PhallenTree
c10287b4c1 Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
Martin Griffin
5a0c5480b2 Fixed interaction between Innards Out and Future Sight (#5966) 2025-01-07 14:57:46 +00:00
wiz1989
5bfc25a4ff changed data according to suggestions from the PR 2025-01-07 15:33:22 +01:00
wiz1989
04da838d88 Innards Out and Future Sight interaction 2025-01-07 14:00:09 +01:00