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 |
|
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 |
|
Hedara
|
090550626e
|
Merge commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge
Conflicts:
include/constants/metatile_behaviors.h
|
2025-05-27 18:34:53 +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 |
|
ghoulslash
|
84118dec97
|
Fix heal bell test, add sparkly swirl test (#6262)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-26 19:45:51 +02:00 |
|
Bivurnum
|
46e2e676c6
|
Make setobjextxy work with npc followers during ON_WARP map script (#6913)
|
2025-05-26 18:59:14 +02:00 |
|
Bivurnum
|
494a04cd76
|
Add follower NPC documentation (#6704)
|
2025-05-26 17:05:54 +02:00 |
|
Pawkkie
|
99073dc9f2
|
Fix bad odds / defensive switchin double switch cases (#6927)
|
2025-05-26 16:59:25 +02:00 |
|
Alex
|
de463af0df
|
Fixes weather anim damage being applied to the wrong mon (#6973)
|
2025-05-26 13:22:05 +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 |
|
Martin Griffin
|
372553b319
|
Explicit -std=gnu17 in CPPFLAGS to mirror CFLAGS (#6839)
|
2025-05-26 09:33:17 +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 |
|
Bassoonian
|
812bde8a48
|
Pret merge (24th of May, 2025) (#6978)
|
2025-05-25 23:08:37 +02:00 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01:11 +02:00 |
|
Pawkkie
|
f8b3a02f6c
|
Backport #6712 Fix party data assignment (#6980)
|
2025-05-25 10:06:49 +02:00 |
|
surskitty
|
8a960e77f7
|
Beefing up the DNS tutorial for some of the common questions/errors. (#6922)
|
2025-05-24 23:06:51 -04:00 |
|
Alex
|
d0313ff323
|
Rename AI test (#6977)
|
2025-05-24 17:12:48 -04:00 |
|
Hedara
|
dc6e40a839
|
Fix tests using old item functions
|
2025-05-24 21:57:51 +02:00 |
|
Hedara
|
86ca6e2719
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-24 21:27:25 +02:00 |
|
Hedara
|
bd735033af
|
Merge commit 'e245f1ec2291a9eac1b8688c99c0126e100178e8' into pret-merge
|
2025-05-24 21:25:57 +02:00 |
|
Hedara
|
2e4833240f
|
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
|
2025-05-24 21:24:56 +02:00 |
|
Hedara
|
3ecd8afab0
|
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
Conflicts:
Makefile
|
2025-05-24 20:42:01 +02:00 |
|
Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Hedara
|
a90dd491d2
|
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
|
2025-05-24 19:35:01 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
PhallenTree
|
0b67aa7546
|
Fixes checking wrong move's Dynamic Move Type in Summary Screen (#6975)
|
2025-05-24 15:13:08 +02:00 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +02:00 |
|
Hedara
|
a714779928
|
Merge commit '74bf498' into pret-merge
|
2025-05-23 17:35:13 +02:00 |
|
Eduardo Quezada
|
c50ebf17d0
|
Documented usage of createsprite gSlideMonToOffsetSpriteTemplate (#6953)
|
2025-05-23 14:41:25 +02:00 |
|
Eduardo Quezada
|
10b5c3f4da
|
Documented usage of createsprite gSparkElectricitySpriteTemplate (#6955)
|
2025-05-23 14:35:55 +02:00 |
|
Pawkkie
|
71f1c97d3e
|
Fix switch AI considering non-choiced SE moves when choiced (#6892)
|
2025-05-23 14:20:36 +02:00 |
|
Pawkkie
|
d3cadf093e
|
Fix HasBattlerSideMoveWithEffect comment (#6965)
|
2025-05-23 14:18:59 +02:00 |
|
Alex
|
6e63827bd7
|
Master to upcoming, 2025-05-22 (#6959)
|
2025-05-23 14:18:16 +02:00 |
|