FosterProgramming
4e6f726efe
Fix bug with IF_GENDER evolution condition ( #7749 )
2025-09-19 19:13:29 +02:00
AlexOn1ine
1131b205f2
conflicts
2025-08-28 14:09:38 +02:00
RavePossum
2fbf45d057
Restore X item friendship increase ( #7583 )
2025-08-26 22:17:30 +02:00
FosterProgramming
1e6bb4f47c
Fix overlap between spin evolution and script evolution ( #7593 )
2025-08-22 20:23:18 +02:00
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
Martin Griffin
dc1abb72dc
Fix substruct offsets from #7313 ( #7431 )
2025-07-29 13:13:29 +02:00
Nephrite
7c6cff1fb3
Get/SetMonData optimisation ( #7313 )
2025-07-28 11:42:28 +01:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
Eduardo Quezada
cf4bb3e286
Moved some fields to BattlerState/PartyState ( #7409 )
2025-07-25 22:16:35 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code ( #7262 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Pawkkie
419219bb31
Add AI_FLAG_ASSUME_STAB ( #6797 )
2025-07-10 19:58:31 +02:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids ( #7173 )
2025-07-04 19:07:53 +02:00
surskitty
b3f52166df
Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies ( #7275 )
2025-07-04 11:06:36 +02:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) ( #6821 )
2025-06-30 23:50:48 +02:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation
2025-06-30 11:51:45 -04:00
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums ( #7071 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) ( #7018 )
2025-06-18 10:59:24 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities ( #7043 )
2025-06-03 22:05:22 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums ( #7041 )
2025-06-02 15:54:37 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +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
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
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
Alex
b31a73f990
Rename ItemId_GetX to GetItemX ( #2116 )
2025-05-22 13:27:52 +01:00
Alex
8ec998abff
Fixes ate type being ignored after checking summary screen ( #6888 )
2025-05-22 14:07:36 +02:00
Eduardo Quezada
87fbf22476
Fix Rage Fist evolution method ( #6937 )
2025-05-21 10:41:51 +02:00
Eduardo Quezada
4145404d22
Optimized PokemonUseItemEffects function ( #6878 )
2025-05-17 15:08:28 +02:00
Bassoonian
16357c7e29
Streamline pointer notation ( #2139 )
2025-05-16 12:04:44 +01:00
AlexOn1ine
33607529cd
conflicts
2025-05-16 10:46:32 +02:00
Hedara
578c5f96cd
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
...
Conflicts:
include/battle_gfx_sfx_util.h
src/apprentice.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_dome.c
src/battle_gfx_sfx_util.c
src/battle_script_commands.c
src/battle_tv.c
src/item_menu.c
src/move_relearner.c
src/pokemon.c
src/scrcmd.c
2025-05-15 21:31:54 +02:00
Hedara
2945c83bbc
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
...
Conflicts:
include/battle.h
include/battle_ai_script_commands.h
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/pokemon.h
include/recorded_battle.h
src/battle_ai_script_commands.c
src/battle_anim.c
src/battle_anim_mons.c
src/battle_anim_sound_tasks.c
src/battle_anim_status_effects.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_interface.c
src/battle_main.c
src/battle_message.c
src/battle_records.c
src/battle_script_commands.c
src/battle_tv.c
src/battle_util.c
src/battle_util2.c
src/pokeball.c
src/pokemon.c
src/recorded_battle.c
src/reshow_battle_screen.c
2025-05-15 21:15:37 +02:00
Eduardo Quezada
3b6dbf38fd
Review changes
2025-05-12 20:53:14 -04:00
Eduardo Quezada
13071f7019
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
Hedara
1abfa7acfa
Merge branch 'master' into master-upcoming
...
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex ( #2134 )
2025-05-09 16:33:23 +01:00
Alex
2044bea883
Rename battlerId to battler for consistency ( #2126 )
2025-05-09 12:43:23 +01:00
i0brendan0
8cc289ef35
Fix rerolls overwriting Fixed Personality ( #6774 )
2025-05-08 11:28:00 +02:00
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -04:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
Eduardo Quezada
c1b9ed5dcf
Fixed upcoming not compiling in gcc 11.4.0 ( #6710 )
2025-04-27 23:11:03 -04:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon ( #6702 )
2025-04-27 15:27:21 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
DavidJCobb
b4ee45f3e8
Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
...
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.
I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
DavidJCobb
2738d11b0f
Additional fixes to last few commits
...
ROM now compiles, but it's not comparing as equal...
2025-04-26 01:00:16 -04:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs ( #6687 )
2025-04-24 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor ( #6556 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
hedara90
7d4de15d9d
Change HasTwoFramesAnimation to take into account species with 1 frame ( #6655 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-21 11:09:20 +02:00
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking ( #6631 )
2025-04-16 23:45:41 +02:00
