13648 Commits

Author SHA1 Message Date
RoamerX
c262995dd7 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-11-10 12:09:54 +08:00
FosterProgramming
8eea132406
Fix missing FREE_MATCH_CALL (#8171)
Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
2025-11-09 09:16:19 -08:00
FosterProgramming
3e583f8add
Fix tera tint not applying on activation (#8135) 2025-11-09 18:10:44 +01:00
Alex
6c383fac96
Fixes Magician for spread moves (#8170) 2025-11-09 18:10:11 +01:00
FosterProgramming
43f9a78da5
Fix recharge moves + add recharge move tests (#8181) 2025-11-09 17:46:22 +01:00
FosterProgramming
bdaf4ae3b3
Fix destiny knot behavior and add tests (#8174) 2025-11-09 15:03:43 +01:00
FosterProgramming
c2c0c06a6f
Fix gba sprites trying load non existent female versions (#7996) 2025-11-08 17:22:47 +01:00
ghostyboyy97
0bd9dd6ee8
fix (contrary): Contrary stat down handling in MoveEffectInPlus (#8165)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-11-08 17:21:16 +01:00
FosterProgramming
504b08dace
Fix transform not loading the correct sprites when facing shiny or unown (#8146) 2025-11-07 16:07:17 +01:00
FosterProgramming
ff1039f148
Fix grade in summary screen not accounting for 26 IV (#8157) 2025-11-06 21:12:05 -08:00
FosterProgramming
97b115d572
Adds an auto-generated include file of script commands (#8156) 2025-11-06 21:10:42 -08:00
FosterProgramming
be7646b67a
Allow vs seekers to work with script not starting with trainerbattle (#8062)
Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
2025-11-06 10:16:19 -08:00
FosterProgramming
1f8a40962a
Allow to send active mon to PC when capturing a Pokemon (#8111) 2025-11-06 00:21:13 +00:00
hedara90
c8159ba182
Reset saveblock data between test runs (#8145)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-11-05 20:45:39 +00:00
PhallenTree
cfcce251d0
Fix typo in Electrode-Hisui pokedex entry (#8143) 2025-11-05 14:49:12 +01:00
Bassoonian
be4ce5901f
Fix Kyurem typo in swap move tables (#8139) 2025-11-05 14:48:53 +01:00
FosterProgramming
b3965098f7
Fix berry blender not computing flavor correctly (#8113) 2025-11-04 18:32:54 +00:00
ghostyboyy97
3c72ca1158
fix (AI scoring): shield dust considerations, IsMoveEffectInMinus self effect edge case, hitsToKO zero-case consideration (#8126)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-11-04 09:35:43 +01:00
Alex
499986a804
Clean up redundant todo (#8094) 2025-11-03 15:02:36 +01:00
Alex
dd1b0b3067
Initialize DamageContext struct with zero values
Also forgot to initialize the struct in `Cmd_damagecalc`
2025-11-01 19:39:28 +01:00
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
2025-11-01 15:13:16 +01:00
Hedara
dd17524fc9 Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
sha1sum changed

 Conflicts:
	include/global.h
	include/overworld.h
	include/pokemon.h
	src/map_name_popup.c
	src/pokedex_area_screen.c
	src/pokemon.c
2025-11-01 15:09:20 +01:00
Hedara
67e30c96c0 Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
Conflicts:
	include/item_menu.h
2025-11-01 14:56:09 +01:00
Hedara
8c4d1269a0 Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge
Conflicts:
	INSTALL.md
	include/battle.h
	include/save.h
	src/wild_encounter.c
2025-11-01 14:51:14 +01:00
Zimmermann Gyula
a10a824081
Change magic number to constant in dexnav. (#8102) 2025-11-01 13:06:49 +01:00
Eduardo Quezada
f66ba68eee
Fixed Zygarde Complete disappearing upon catch (#8089) 2025-10-31 19:41:46 +01:00
FosterProgramming
6c3f87e74e
Fix bug when a captured pokemon replaces a party member who changed forms (#8091) 2025-10-31 17:50:29 +01:00
FosterProgramming
79441c6574
Fix bug where mon selection doesn't properly account for party order (#8088) 2025-10-31 17:44:08 +01:00
FosterProgramming
0b005d4b6f
Fix non-battle trainer script not running properly (#8056) 2025-10-30 19:47:22 +01:00
Alex
3a3b947622
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-30 17:51:57 +01:00
Eduardo Quezada
8de86ba243
Fixed Belly Drum/Contrary interaction at max Attack (#8078) 2025-10-30 17:14:07 +01:00
Eduardo Quezada
814cf53629
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080) 2025-10-30 15:43:50 +01:00
Alex
ea3b72f43f
Initialize DamageContext on declaration to zero (#8076) 2025-10-29 19:04:56 +01:00
FosterProgramming
712e087754
Fix move description prompt window not appear when choosing a move after canceling target selection (#8055) 2025-10-29 17:53:41 +01:00
PhallenTree
4a714225e5
Fixes hazards and switch-in items not being reset when switching in (#8074) 2025-10-29 14:25:05 +01:00
grintoul
c90e6952f3
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-28 19:26:10 +01:00
grintoul
a9fc0b28c9
Corrects battler partner identification in battle_ai_switch_items.c (#8071) 2025-10-28 19:23:41 +01:00
FosterProgramming
3b66cd007b
Fix target cancelling not working properly with z-move (#8067) 2025-10-28 17:19:52 +01:00
FosterProgramming
b82a5a4c1c
Fix wrong gimmick spite showing when inputting too fast (#8066) 2025-10-28 17:02:35 +01:00
Estellar
1de27646d2
Remove magic numbers in slot_machine.c (#2195) 2025-10-28 09:19:12 +00:00
FosterProgramming
6faf35dde9
Fix emergency exit not triggering properly during wild battles (#8037) 2025-10-26 22:35:27 +01:00
FosterProgramming
a9486a5521
Fix battle arena counting all judges loss for the opponent (#8046) 2025-10-26 15:28:40 +01:00
FosterProgramming
292d9b2933
Fix PC turning on/off animation not working in Battle Frontier (#8048) 2025-10-26 13:40:55 +00:00
Raymond Dodge
95d98305dd
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881) 2025-10-26 11:45:40 +01:00
khbsd
7b3a2f3aaf
fix: hypertraining a stat now optionally reflects in the summary screen (#8035) 2025-10-25 19:15:03 -07:00
hedara90
6eaa09bf5d
Add error messages for trying to send an illegal mon to the PC and fixes index in double wild battles (#7982)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-25 14:37:17 +02:00
Alex
eb1be34d47
Fix Salt Cure script (#8005) 2025-10-24 18:53:53 +02:00
Alex
8ea947d5a1
Fixes Protosynthesis not activating after weather was reset (#8021) 2025-10-24 18:53:34 +02:00
Alex
8e76889579
Fixes visual glitch after Misty Explosion (#8022) 2025-10-24 18:50:41 +02:00
Alex
083add8127
Adds missing alive check for Rapid Spin (#8024) 2025-10-24 18:50:23 +02:00