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 |
|
Hedara
|
3a92cac23d
|
Merge commit '80ec69fc5d6eb5d392124e902c67ad68164192c5' into pret-merge
Conflicts:
graphics_file_rules.mk
|
2025-11-01 14:49:07 +01:00 |
|
grintoul
|
dba50c91ea
|
Aura Break tests (#8099)
|
2025-11-01 13:43:31 +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 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +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
|
31e663ceda
|
Fixed fainting form change tests (#8079)
|
2025-10-30 08:57:59 +01:00 |
|
Eduardo Quezada
|
9fa857d34c
|
Removed redundant comment
|
2025-10-29 21:08:05 -03:00 |
|
Eduardo Quezada
|
9bfac0099e
|
Fixed fainting form change tests
|
2025-10-29 18:13:41 -03: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 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +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 |
|
allcontributors[bot]
|
96f6e99486
|
add MandL27 as a contributor for code (#8064)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-10-28 17:22: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 |
|
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 |
|
Bassoonian
|
9fa6cd6a4c
|
Add test to detect save file shifting (#8030)
|
2025-10-25 14:38:58 +02: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 |
|
FosterProgramming
|
b4041535cf
|
Fix battle dome bug (again) (#8007)
|
2025-10-24 18:55:32 +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 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
FosterProgramming
|
5b4403ddfe
|
Fix stats defined in tests being overwritteng by stat change (#8018)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-23 18:59:15 +02:00 |
|
FosterProgramming
|
1343ddf7c3
|
Fix badge boost not applying in gen1 and 2 (#8013)
|
2025-10-22 22:57:04 +02:00 |
|
Eduardo Quezada
|
dc0d910182
|
Fixed Stomping Tantrum not doubling in damage if the user failed Protect (#8008)
|
2025-10-22 15:20:44 +02:00 |
|
PhallenTree
|
2416bfb53b
|
Fixes Echoed Voice base power increase depending on attacker's use of the move (#7997)
|
2025-10-22 13:39:24 +02:00 |
|
FosterProgramming
|
2d73286777
|
Fix long pokemon name in partner party not appearing properly (#8009)
|
2025-10-22 10:09:58 +02:00 |
|
Eduardo Quezada
|
5276f2bc6b
|
Fixed Max Move in-battle descriptions (#8004)
|
2025-10-21 20:49:48 +02:00 |
|
hedara90
|
3bb6cddffb
|
Fix Minior start of battle form (#7972)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-21 16:39:02 +02:00 |
|
allcontributors[bot]
|
41fa1ad2b9
|
add HashtagMarky as a contributor for code (#7998)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-10-21 13:08:31 +02:00 |
|
Alex
|
bc6ba15702
|
Fixes Terrain Extender timer (#7995)
|
2025-10-21 12:50:55 +02:00 |
|
Marky
|
c3735c5bd0
|
Fix OW Pokémon VObjects (#7991)
|
2025-10-21 11:23:05 +02:00 |
|
FosterProgramming
|
ac321bf581
|
Fix spritesheet rules for rayquaza sprite in cutscene (#7985)
|
2025-10-20 15:56:55 +02:00 |
|