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

18188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hedara
da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
 2025-08-21 15:40:38 +02:00
hedara90
95eb3ba1a7
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2025-08-21 14:43:41 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
RavePossum
2d9dc28b7a
Fix in-game partner battles always causing a whiteout (#7587) 2025-08-21 12:44:15 +02:00
Eduardo Quezada
96653e704e
Fixed Teleport's description not being updated based on B_TELEPORT_BEHAVIOR (#7580) 2025-08-19 14:39:20 +02:00
RavePossum
cc705a580d
Fix Form Change Item Task Data and Clean Up Field Use Funcs (#7535) 2025-08-19 08:57:35 +02:00
Alex
554c909983
Fixes Counter / Mirror Coat / Metal Burst damage assignment (#7538) 2025-08-19 08:56:21 +02:00
khbsd
82bf955e35
fix: remove unused wild_encounters.json.txt jinja file (#7581) 2025-08-19 08:54:43 +02:00
Eduardo Quezada
e974adcbeb
Wrote some tests (#7563) 2025-08-18 19:54:28 +02:00
hedara90
1a39ebd7da
Changed default print level for DebugPrintf for mGBA to MGBA_LOG_WARN (#7567) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-08-18 19:51:19 +02:00
Ruby
7b8edfa631
Added comment in event.inc for simple menus in dynmultichoice (#7568) 2025-08-17 21:50:23 +02:00
surskitty
f998ec8ea8
Incorrect call in Rest (#7569) 2025-08-17 09:14:18 +02:00
hedara90
3a4dbec021
Re-order moves in fling test (#7559) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-08-15 19:34:54 +02:00
Ruby
d5ada82455
Moved summary screen nature colors to summary_screen.h (#7560) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-08-15 19:33:39 +02:00
Eduardo Quezada
4986e06cae
Fixed B_PSYWAVE_DMG (#7557) 2025-08-15 09:03:21 +02:00
GriffinR
92f7727a60
Merge pull request #2107 from AsparagusEduardo/pret/pr/simpleMultiBattleFix 
Simplified Multi Battle bugfix, removing duplicate code
 2025-08-14 15:09:42 -04:00
Alex
65b316625f
Fixes Knock Off still activating when there is no Item (#7496) 2025-08-13 15:00:04 +02:00
ghoulslash
18363207d9
Fix Mimicry Only Activating Once per Turn (#7537) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-08-12 15:40:10 +02:00
Eduardo Quezada
cc736c4233
Corrected Liquid Ooze test (#7527) 2025-08-10 22:56:42 +02:00
Alex
7de3663f38
Fixes Life Orb still activating if move was absorbed (#7521) 2025-08-10 16:58:36 +02:00
cornixsenex
80a3a3b7ef
Remove shadow and hide follower on stair warp (#7368) 2025-08-08 11:22:42 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44:12 +02:00
Hedara
8d8cf1b5d4 Removed now unnecessary loop 2025-08-08 01:22:00 +02:00
Hedara
b553278a3d Replaced manual zeroing with existing function calls 2025-08-08 01:22:00 +02:00
Hedara
27539239db Clear out parties between battle tests 2025-08-08 01:22:00 +02:00
RavePossum
bf68865e0d
Implement using party menu items from field (#7481) 2025-08-07 21:21:33 +02:00
RavePossum
729abca058
Fix using town map as registered item (#7482) 2025-08-07 19:53:01 +02:00
Eduardo Quezada
bef3e990ef
Fixes shadows and mon animations for transformed battlers (#7500) 2025-08-07 19:47:16 +02:00
Eduardo Quezada
521363ed8b
Fixed compile issue OW_TIMES_OF_DAY is GEN_3 (#7499) 2025-08-07 19:43:07 +02:00
Hedara
e8fefbcc75 Add bad egg check 2025-08-05 23:34:59 +02:00
Hedara
1cb053e8e7 Add test for BoxPokemon integrity 2025-08-05 23:34:59 +02:00
Danny Wang (ThePeeps191)
f8cbea9167
Updating a link to porytiles in INSTALL.md (#7490) 2025-08-05 19:50:32 +02:00
grintoul
27886a6577
Macro-for-AI-Flag-definitions (#7471) 2025-08-05 14:14:04 +02:00
RavePossum
7500fc00db
Restore git history check (#7463) 2025-08-04 17:24:49 +02:00
Bivurnum
f6a120310e
Bug fix: add handling for forced movements into/after ledge jumps with follower NPCs (#7055) 2025-08-04 15:10:20 +02:00
FosterProgramming
c037ba2522
Clear gScanlineEffect to fix timeout in acid downpour animation (#7442) 2025-08-04 14:44:58 +02:00
Kevin
523390ac51
Update how_to_new_pokemon.md (#7440) 2025-08-04 13:49:05 +02:00
ghoulslash
3dbcb2adb4
Add Synthesis + Utililty Umbrella test (#7472) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-08-04 12:42:22 +02:00
PhallenTree
014f289ea9
Fixes Round and Fusion moves doubling power from previous turn's move (#7476) 2025-08-04 12:41:43 +02:00
ghoulslash
2546158479
Fixes Leech Seed recovery not applying behind Sub (#7468) 2025-08-03 19:48:20 -04:00
AlexOn1ine
54ffc6bf08 Fixes Leech Seed recovery not applying behind Sub 2025-08-03 21:59:48 +02:00
hedara90
297cd83871
Clean up some Normalize tests to make them make sense (#7461) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-08-02 17:43:44 +02:00
Josh
65f9c04757
Key split restructure (#2168) 
Key split tables have been given names based on usage (KeySplitTable1 -> keysplit_piano etc) and a new macro has been set up to better represent the individual bytes for key splits with it being more obvious to how said bytes are used for the respective voice in the voicegroup.

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2025-08-02 02:11:50 +01:00
PhallenTree
01105171a3
Fixes Magnet Rise when user is Rooted/Smacked Down (#7449) 2025-07-31 19:30:50 +02:00
allcontributors[bot]
48c850c60b
add tustin2121 as a contributor for doc, and code (#7445) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
 2025-07-30 18:32:16 -07:00
Alex
060bb8ae18
1.12.2 release (#7441) 2025-07-30 21:15:11 +02:00
Josh
0dfec24967
Allow names for voicegroups and use a macro for use with drumsets (#2149) 
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
 2025-07-30 19:43:08 +01:00
Hedara
637f7dff46 Start of 1.12.3 cycle 2025-07-30 20:35:16 +02:00
Hedara
d8059ce3d1 1.12.2 release version 2025-07-30 20:34:43 +02:00
Alex
cb4450efaf
Fixes Effect Spore and Baneful Bunker/Burning Bulwark (#7412) 2025-07-30 19:54:12 +02:00