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 |
|
Alex
|
87cbb457f1
|
Fixes AI not seeing primal weather and partner absorbing abilities (#6936)
|
2025-05-22 17:25:29 -04:00 |
|
Alex
|
f9400332fc
|
Fixes AI repeated use of weather set up moves (#6963)
|
2025-05-22 16:50:13 -04:00 |
|
hedara90
|
c3ea322903
|
Update README.md
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
|
2025-05-22 21:50:10 +02:00 |
|
Hedara
|
b6aa0618b5
|
Fix unused variable
|
2025-05-22 21:49:45 +02:00 |
|
Eduardo Quezada
|
2e3ae0d167
|
Added check for gBattleStringsTable (#6948)
|
2025-05-22 21:05:22 +02:00 |
|
Pawkkie
|
0530f49fd4
|
Fix AI boosting stats into mon with Haze (#6894)
|
2025-05-22 21:05:02 +02:00 |
|
GriffinR
|
fba096a500
|
Remove map_group_count.h
|
2025-05-22 13:59:23 -04:00 |
|
GriffinR
|
d6962aacd7
|
Merge pull request #2146 from AlexOn1ine/removeFiles
Remove files that were wrongly commited
|
2025-05-22 13:58:18 -04:00 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +02:00 |
|
Hedara
|
90aed43c27
|
Merge branch 'master' into master-upcoming
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
|
2025-05-22 15:41:08 +02:00 |
|
AlexOn1ine
|
e245f1ec22
|
Remove files that were wrongly commited
|
2025-05-22 14:33:31 +02:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Eduardo Quezada
|
9554146738
|
Fixed forfeit money for B_WHITEOUT_MONEY <= GEN_3 (#6942)
|
2025-05-22 14:27:28 +02:00 |
|
Alex
|
8ec998abff
|
Fixes ate type being ignored after checking summary screen (#6888)
|
2025-05-22 14:07:36 +02:00 |
|