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

12360 Commits

Author SHA1 Message Date
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00
Hedara
6896750921 Merge commit '0aae36984f2561f075b2b7e7d2a0924a912f6af7' into pret-merge 2025-05-15 21:48:17 +02:00
Hedara
468454d810 Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge 
Conflicts:
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
 2025-05-15 21:38:57 +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
Hedara
a001e36f1c Merge commit '384b8f127e6a18aef0a3' into pret-merge 
Conflicts:
	src/battle_anim_mons.c
 2025-05-15 17:36:48 +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
Hedara
659473760c Merge commit '263026e4320c' into pret-merge 
Conflicts:
	src/battle_anim_rock.c
	src/battle_anim_water.c
 2025-05-15 16:21:33 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
kittenchilly
4474bd5b80
Add move description data for Z-Moves and Max/G-Max moves (#6852) 2025-05-15 10:44:09 +02:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
ghoulslash
d4c64d3b67 rename berrystatraise script to consumablestatraise 2025-05-12 21:11:25 -04:00
ghoulslash
14a66d612f combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries 2025-05-12 21:06:12 -04:00
cawtds
be03feca94
Fixed double battles send out breaking (#6822) 2025-05-12 18:07:22 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
Alex
51b000860b
Add BattlerId enum and document (#2135) 2025-05-11 07:36:39 +01:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
Alex
8d5d7c7fca
Fixes ai moves being recorded without correct index (#6803) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-05-10 19:38:48 +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
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02:00
i0brendan0
8cc289ef35
Fix rerolls overwriting Fixed Personality (#6774) 2025-05-08 11:28:00 +02:00
hedara90
b6b6e91959
A lot of tests (#6734) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-07 16:50:12 +02:00
Alex
7c4fb512a1
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782) 2025-05-07 11:04:11 +02:00
Eduardo Quezada
15e39339b9 InitSpritePosToAnimAttacker documentation 2025-05-06 15:11:38 -04:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762) 2025-05-06 12:07:01 +02:00
GriffinR
c39ef1a030
Merge pull request #2125 from DavidJCobb/battle-link-re 
Battle link reverse-engineering
 2025-05-05 18:17:28 -04:00
spindrift64
0742741dd3
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773) 2025-05-04 22:26:12 +02:00
PCG
904b399a81
Added Egg Moves for Basculin White Striped (#6769) 2025-05-04 11:43:57 +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
DavidJCobb
d83b0671f7 Battle anims, ice: ARRAY_COUNT works if used with a cast 2025-05-01 23:49:05 -04:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry (#6718) 2025-05-01 10:16:15 +02:00
Cafe
b451bc3606
New Lurantis animation (#6725) 2025-04-30 12:45:29 +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
DavidJCobb
35b33a46e9 Identified task and sprite fields related to battle weather animations 
Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm.
 2025-04-28 05:39:52 -04:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon (#6702) 2025-04-27 15:27:21 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection (#6697) 2025-04-26 21:46:41 +02: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
d8721b668e Fixed find-and-replace mistake 
Functions were using the wrong constant.
 2025-04-26 10:54:22 -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
bab9f0cfef gBattleControllerExecFlags macro in MarkAllBattlersForControllerExec 
whoops, missed one
 2025-04-26 00:46:06 -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
hedara90
5cd7bd77b3
Fix various Toxic Spikes interactions (#6690) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
 2025-04-24 17:06:47 +02:00