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

17941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
5502fe2c5e
GetBattlerMon cleanup (#6967) 2025-06-01 21:10:24 +02:00
hedara90
ec15948ea8
Put the gen 1 compression tests behind a config (#7033) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-06-01 20:59:00 +02:00
Eduardo Quezada
3565c7a8a6
Documented usage of delay X (#6951) 2025-06-01 17:11:42 +02:00
cawtds
d3af14b2bb
Adds FRLG asserts to Alloc/Free (#7025) 2025-06-01 14:22:00 +01:00
Eduardo Quezada
8697bef20c
BtlController_EmitTwoReturnValues cleanup (#6855) 2025-06-01 11:29:02 +02:00
hedara90
392d4db319
Fix follower compression (#7038) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-06-01 10:06:12 +02:00
hedara90
0917af214c
Replace all usages of lz compression with smol (#7032) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-31 19:47:54 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
ShinyVolcarona
7f4f391e9b
New Attack Animations: 25w20a (#6886) 2025-05-31 11:34:24 +02:00
jfb1337
096493aa35
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705) 
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-05-31 09:47:25 +02:00
Alex
eb81820ae3
Clean up battlescript calls with func BattleScriptCall (#6873) 2025-05-31 09:09:35 +02:00
cawtds
21499cbee1
Refactor field moves (#6660) 2025-05-31 09:03:12 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004) 2025-05-31 08:45:46 +02:00
hedara90
6e64f6f5ef
New sprite compressor (#5627) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
 2025-05-30 23:10:54 +02:00
Alex
d25f637b4e
Master to Upcoming, 2025-05-30 (#7027) 2025-05-30 21:56:46 +02:00
Hedara
0e968b31a9 Start of 1.13 cycle 2025-05-30 21:24:29 +02:00
Alex
8cfe915bcd
Expansion 1.11.4 & 1.12.0 (#7026) 2025-05-30 21:17:15 +02:00
Hedara
98c03315a9 Start of 1.12.1 cycle 2025-05-30 20:55:09 +02:00
Hedara
efa2fb3be7 Expansion 1.12.0 2025-05-30 20:53:32 +02:00
Hedara
09ee1d0b2d Merge branch 'upcoming' into expansion-1.11.4 2025-05-30 20:45:19 +02:00
Hedara
acb4a9cf62 Expansion 1.11.4 2025-05-30 20:15:56 +02:00
hedara90
347d0e1189
Master to upcoming merge (#7024) 2025-05-30 20:01:35 +02:00
cawtds
555bda4e66
Fix UB when using time menu (#7023) 2025-05-30 20:00:25 +02:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
Bivurnum
37669e62ae
Bug fix: setfollowernpc macro no longer runs when FNPC_ENABLE_NPC_FOLLOWERS is FALSE (#6755) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-05-30 17:41:02 +02:00
khbsd
38ba41b324
fix: better area mons handling, no longer duplicates hiddenMons field (#6945) 2025-05-30 17:22:05 +02:00
psf
9656400f88
Moved time constants to dedicated files (#7019) 2025-05-30 16:39:01 +02:00
cawtds
1e32cf278c
fix battle controller macros (#7021) 2025-05-30 16:31:38 +02:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix (#7015) 2025-05-30 11:58:32 +02:00
Bivurnum
5dd45a0479
Fixed surf blob binding to invisible follower NPC on map reload (#7013) 2025-05-29 18:18:30 +02:00
Bivurnum
e631f3baa9
Fix follower NPC not reappearing after Mossdeep gym warp (#7014) 2025-05-29 18:17:54 +02:00
Alex
2864831c2b
Pret merge, (29th of May, 2025) (#7012) 2025-05-29 18:17:20 +02:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets (#6998) 2025-05-29 11:25:10 +02:00
Bivurnum
f2a3226b47
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010) 2025-05-29 11:05:23 +02:00
Bivurnum
79abc885e7
Fixes follower NPC not changing state with player after warp (#7009) 2025-05-29 11:04:41 +02:00
Raymond Dodge
e605b87722
Fix out-of-bounds in Heal Bell Cures Entire Party test (#7011) 2025-05-29 10:59:47 +02:00
Hedara
8ce7ffd080 Merge remote-tracking branch 'pret/master' into pret-merge 2025-05-29 09:10:41 +02:00
psf
cc8694d26d
Clarifies when to use each merge type for maintainers (#6999) 
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-05-28 17:22:11 +02:00
Alex
7a9b51b387
Master to upcoming, 2025-05-28 (#7001) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: malad1211 <43647853+malad1211@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Vex <edanvirgo@gmail.com>
Co-authored-by: PCG <75729017+PCG06@users.noreply.github.com>
 2025-05-28 16:32:21 +02:00
Hedara
c8570d7c2b Remove incorrectly re-added ABILITYEFFECT_ cases 2025-05-28 14:38:57 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
PCG
00f3c09a22
Fixed CreateMon param order in CreateFacilityMon (#6989) 2025-05-28 12:51:00 +02:00
psf
d80e92e687
Pret merge (27th of May, 2025) (#6995) 2025-05-28 03:44:51 -07:00
Vex
ecb20b2a25
Fix Eiscue not resetting back to Ice Face form after battle. (#6997) 2025-05-28 12:43:38 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
Alex
7da5121b6c
Expansion 1.11.3 (#6994) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-27 20:52:45 +02:00
Hedara
156e0b394c Start of 1.11.4 cycle 2025-05-27 20:34:28 +02:00
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00