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

401 Commits

Author SHA1 Message Date
Pablo Pena
e449a612f5
fix: use BackPickId to calculate player intro ball throw animation palette (#7193) 2025-06-23 19:45:12 +02:00
Alex
d33651bfd0
Battle controller pret documentation (#7029) 2025-06-02 14:22:11 +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
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
8ec998abff
Fixes ate type being ignored after checking summary screen (#6888) 2025-05-22 14:07:36 +02:00
AlexOn1ine
33607529cd conflicts 2025-05-16 10:46:32 +02:00
Hedara
49906a81f7 Merge commit 'c39ef1a03002a7af94' into pret-merge 
Conflicts:
	src/battle_ai_switch_items.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_safari.c
	src/battle_controller_wally.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/battle_util2.c
	src/pokemon.c
 2025-05-15 17:31:50 +02:00
Bassoonian
e42890e954
Consolidates a bunch of battle controller functions (#6838) 2025-05-15 11:26:18 +02:00
Eduardo Quezada
13071f7019 Added IsOnPlayerSide 2025-05-12 13:53:15 -04:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon (#6800) 2025-05-09 15:14:09 +02:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
Eduardo Quezada
addebea4d6
Better handling of battle coords (#6787) 2025-05-07 22:25:10 +02:00
Eduardo Quezada
1f23fe0dd3
Use GetPartyBattlerData where appropiate (#6779) 2025-05-06 17:13:50 +02:00
DavidJCobb
0f17e70371 Shorter names for engine/controller communication enum members 2025-05-02 00:01:15 -04: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
d8721b668e Fixed find-and-replace mistake 
Functions were using the wrong constant.
 2025-04-26 10:54:22 -04:00
DavidJCobb
9dc48899d3 BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names 
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.

Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
 2025-04-26 00:13:42 -04:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-04-12 10:23:48 +02:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
aronson
692f7968fc
Use non-preproc guards on AI frame count 
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-03-31 12:06:12 -05:00
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
Alex
5c05715585
Adds move description battle config (#6364) 2025-03-20 10:12:37 +01:00
hedara90
4e01ce6993
Moved some AI stuff out of the battlestruct (#6405) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-03-11 21:23:02 +01:00
Hedara
7665324be0 Removed hard-coded types 2025-03-03 10:00:53 +01:00
Hedara
682b7874b2 Missed an Ivy Cudgel 2025-03-02 22:11:23 +01:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
hedara90
cf43787d72
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-25 22:28:22 +01:00
Alex
cc9ca81c29
Add abstraction layer for battler positions (#6212) 2025-02-11 11:32:34 -05:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-02-09 00:54:58 +01:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Eduardo Quezada
7c6eda21b1
Added missing in-battle "Move Info" button prompt (#6155) 2025-02-01 18:47:36 +01:00
Frank DeBlasio
a075166b6b
Added WEATHER_DOWNPOUR to Weather Ball's dynamic type (#6100) 2025-01-25 10:10:12 +01:00
Alex
da9943d3b8
Clean up array access by using index instead of dereferencing the value (#6057) 2025-01-20 16:44:22 +01:00
hedara90
3bcfa355eb
Config for move slot rearrangement in battle (#6017) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-17 23:03:01 +01:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-15 14:07:12 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Alex
28561bca4a
Fixes zmove trigger sprite on b button exit (#6009) 2025-01-12 00:59:57 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs (#5964) 2025-01-10 17:07:32 -05:00
DizzyEggg
25d678f1e7
PlayerHandleStatusXor - change u8 to u32 (#5988) 2025-01-10 09:53:27 +00:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
kittenchilly
0294beddf1
Add manual breaking back to "What will (mon) do?" message (#5908) 2025-01-06 14:23:09 -03:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
RavePossum
fd397e9e1c
Fix move category and category icon when PSS is off (#5786) 2024-12-08 11:07:19 +01:00
hedara90
e4ef3a440f
Automatic Line Breaks, somewhat even lines (#5689) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-11-29 18:46:45 +01:00