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

7021 Commits

Author SHA1 Message Date
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
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
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
ghoulslash
5ad8d852fd Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix 2025-05-13 08:01:41 -04:00
Bassoonian
60587682e3
Remove redundant script declaration in battle_scripts.h (#6837) 2025-05-13 10:32:03 +02:00
ghoulslash
d4c64d3b67 rename berrystatraise script to consumablestatraise 2025-05-12 21:11:25 -04:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +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
hedara90
b6b6e91959
A lot of tests (#6734) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-07 16:50:12 +02:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762) 2025-05-06 12:07:01 +02:00
hedara90
fe2d7442af
Remove old slide workaround (#6754) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-03 10:54:49 +02:00
Alex
9259b7ee69
Bugfixes batch (#6750) 2025-05-02 20:14:27 +02:00
DavidJCobb
0f17e70371 Shorter names for engine/controller communication enum members 2025-05-02 00:01:15 -04:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry (#6718) 2025-05-01 10:16:15 +02:00
Eduardo Quezada
d2a4b5ef84
Changed Tackle for Scratch in tests (#6730) 2025-04-30 17:18:52 -04:00
Hedara
f0ecbce9c7 Start of 1.11.3 Cycle 2025-04-30 11:26:09 +02:00
Hedara
accb85554a Expansion 1.11.2 Release 2025-04-30 11:23:05 +02:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719) 2025-04-29 23:25:56 +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
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection (#6697) 2025-04-26 21:46:41 +02:00
DavidJCobb
7ee3043c58 Update battle_controllers.h 
typo
 2025-04-26 11:47:48 -04:00
DavidJCobb
2864408060 Tweaks to documentation comments 2025-04-26 11:40:14 -04: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
8f5c1a452d Update battle_controllers.h 
Simplified macros.
 2025-04-26 01:33:17 -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
DavidJCobb
a4370ffcde gBattleControllerExecFlags bits now identified via helper macros 
Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work.
 2025-04-26 00:45:03 -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
Alex
71cfab6477
Fixes Magician Life Orb interaction (#6676) 2025-04-22 21:01:00 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction (#6645) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-04-21 17:33:29 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-04-20 22:49:52 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation (#6656) 2025-04-20 22:36:27 +02:00
Alex
6b09480912
Fixes some restore issues (#6629) 2025-04-18 16:57:04 -04:00
LOuroboros
cb98106db0
Corrected Dexnav config related comment (#6610) 2025-04-13 21:49:38 -04:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain 
Rename battle terrain to environment
 2025-04-13 19:32:06 -04:00
Alex
a4bfbea3cb
Revert wrongly done Embody Aspect fix (#6607) 2025-04-14 00:17:10 +02:00
Bassoonian
d173e42372
Remove redundant AI defines (#6590) 2025-04-13 11:22:14 +02:00
Bassoonian
563e094ea8
Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579) 2025-04-12 12:56:30 -04:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor (#6553) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-10 23:56:26 +02:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
hedara90
4f0caf8199
Fixes Tera Type not being carried over to during form change / evolution (#6502) 2025-04-01 16:52:40 +02:00
Isaac Aronson
74e84da571
Remove NDEBUG guard on cycle counter functions 2025-03-31 13:11:18 -05:00
AlexOn1ine
d767211c4a helper function to get the species type based on personality 2025-03-31 14:49:40 +02:00
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
Hedara
3615fdde29 START OF 1.11.2 CYCLE 2025-03-30 14:56:39 +02:00