Bassoonian
|
b372c272f4
|
Update FRLG whiteouts to new pret system (#7040)
Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>
|
2025-06-08 14:45:14 +02:00 |
|
wiz1989
|
e63ac48de2
|
added Ash Greninja overworld sprites (#6976)
|
2025-06-07 09:57:43 +02:00 |
|
hedara90
|
8489b7a622
|
Added naive line break (#7076)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-06 20:13:07 -07:00 |
|
Alex
|
020be9d5b0
|
Deprecate sStatusFlagsForMoveEffects (#7063)
|
2025-06-05 14:32:28 +02:00 |
|
Eduardo Quezada
|
3decd3da0a
|
Animation documentation (#7052)
|
2025-06-04 11:19:57 +02:00 |
|
Eduardo Quezada
|
d795de9e9d
|
Remove more instances of hard-coded Move IDs (#7056)
|
2025-06-03 23:26:48 +02:00 |
|
Philipp AUER
|
21f0eb1583
|
Debug parties and battles (#6884)
Co-authored-by: sbird <sbird@no.tld>
|
2025-06-03 23:21:17 +02:00 |
|
Bassoonian
|
1a6ed20713
|
Add dedicated getter functions for Pokémon types and abilities (#7043)
|
2025-06-03 22:05:22 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
Alex
|
52b1b877ec
|
Change GetZMaxMoveAgainstProtectionModifier to prevent regressions (#7047)
|
2025-06-03 09:11:42 +02:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
Eduardo Quezada
|
5502fe2c5e
|
GetBattlerMon cleanup (#6967)
|
2025-06-01 21:10:24 +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 |
|
cawtds
|
555bda4e66
|
Fix UB when using time menu (#7023)
|
2025-05-30 20:00:25 +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 |
|
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 |
|
Bivurnum
|
79abc885e7
|
Fixes follower NPC not changing state with player after warp (#7009)
|
2025-05-29 11:04:41 +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 |
|
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 |
|
Hedara
|
5e9b8cdbad
|
Merge commit 'cc388ef' into pret-merge
Conflicts:
src/map_name_popup.c
|
2025-05-27 19:06:35 +02:00 |
|
Hedara
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
malad1211
|
d27a3575f2
|
Cleanup identical if blocks (#6988)
|
2025-05-27 10:12:12 +02:00 |
|
Alex
|
b49a3bbde5
|
Missed ItemId_GetDescription change (#6992)
|
2025-05-27 10:09:12 +02:00 |
|
Bivurnum
|
a967f36091
|
removeobject and removeobjectat macros work properly with npc followers (#6889)
|
2025-05-26 23:40:00 +02:00 |
|
Alex
|
983f8e34a1
|
Fixes repeated learning of level up moves (#6981)
|
2025-05-26 14:15:16 -07:00 |
|
Bivurnum
|
46e2e676c6
|
Make setobjextxy work with npc followers during ON_WARP map script (#6913)
|
2025-05-26 18:59:14 +02:00 |
|
Pawkkie
|
99073dc9f2
|
Fix bad odds / defensive switchin double switch cases (#6927)
|
2025-05-26 16:59:25 +02:00 |
|
Bassoonian
|
23695b9031
|
Master to upcoming merge (#6986)
|
2025-05-26 13:07:04 +02:00 |
|
Alex
|
803bd2dfbf
|
Prankster block check was missng the IsStatusMove check (#6987)
|
2025-05-26 13:06:19 +02:00 |
|
AlexOn1ine
|
5648792cbf
|
Add missing IsBattleMoveStatus
|
2025-05-26 12:17:43 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Philipp AUER
|
08f10d9f1a
|
Fix OW_POPUP_BW_TIME_MODE burning a lot of cycles due to RTC queries. (#6974)
Co-authored-by: sbird <sbird@no.tld>
|
2025-05-26 09:13:33 +02:00 |
|