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

7598 Commits

Author SHA1 Message Date
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
FosterProgramming
6c3f87e74e
Fix bug when a captured pokemon replaces a party member who changed forms (#8091) 2025-10-31 17:50:29 +01:00
Eduardo Quezada
8de86ba243
Fixed Belly Drum/Contrary interaction at max Attack (#8078) 2025-10-30 17:14:07 +01:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages (#2196) 2025-10-29 21:34:03 -04: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
FosterProgramming
b82a5a4c1c
Fix wrong gimmick spite showing when inputting too fast (#8066) 2025-10-28 17:02:35 +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
8ea947d5a1
Fixes Protosynthesis not activating after weather was reset (#8021) 2025-10-24 18:53:34 +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
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values (#2183) 
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.

Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.

Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
 2025-10-19 17:37:13 +01:00
Estellar
0965dffe70
Use TaskFunc wherever posible (#2188) 2025-10-18 17:53:50 +01:00
spindrift64
de3c031fc5
Fix Anticipation type effectiveness check (#7840) 2025-10-16 14:36:07 +02:00
Estellar
f4f7c38255
Use MainCallback wherever posible (#2184) 2025-10-14 09:41:27 +01:00
Marky
daedfd5e62
Add gBallItemIds Array (#7905) 2025-10-10 11:09:19 +02:00
FosterProgramming
41751451f6
Fix fusion pokemon aquiring illegal movesets (#7896) 2025-10-09 15:26:26 +02:00
DizzyEggg
e44c9866e7
Fix hgss pokedex when catching mon with terrain (#7884) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-10-08 17:54:23 +02:00
cawtds
c64c276d77
Fixes shininess for givemon (#7847) 2025-10-07 23:16:48 +02:00
Eduardo Quezada
13f392987a
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735) 2025-10-02 13:27:06 +02:00
Hedara
d3ba08e0bd Start of 1.13.3 cycle 2025-10-01 11:10:00 +02:00
Hedara
a54b343948 Expansion 1.13.2 release version 2025-10-01 11:09:29 +02:00
spindrift64
2231b2fdca
Immunity abilities trigger on turn 0 (leads) (#7814) 2025-09-30 19:07:23 +02:00
Alex
09aa452659
Fix Throat Spray activating multiply times (#7818) 2025-09-29 19:32:11 +02:00
khbsd
a4ecd7338b
fix: seen flags for first mon in enemy party (#7791) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-09-28 09:53:55 +02:00
Alex
e5e0800b90
Fixes Throat Spray being blocked by Sheer Force (#7808) 2025-09-27 15:59:31 -04:00
PhallenTree
58b9642cb1
Fixes Instructed moves looking at the wrong turn order number (#7788) 2025-09-24 19:11:45 +02:00
FosterProgramming
1d11a2cb0a
Improve how test involving ball throw work (#7774) 2025-09-22 20:44:12 +02:00
PhallenTree
5fad32decc
Fixes Helping Hand boosts not stacking with each other (#7775) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-09-22 20:00:34 +02:00
bassforte123
abc471e9bd
Fixed Ball Fetch Ability (#7764) 2025-09-21 13:16:53 +02:00
Alex
83bfb34beb
Fixes Mycelium Might and Lagging Tail adjusting prio incorrectly (#7742) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-09-17 18:33:09 +02:00
Alex
f671b130a6
Fixes Beat Up incorrect slots usage (#7741) 2025-09-17 11:40:40 +02:00
Eduardo Quezada
deaf77f619
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696) 2025-09-14 20:21:38 +02:00
Alex
499e90ac4b
Fixes Endure and Eject Pack issues (#7687) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-09-12 18:09:46 +02:00
Alex
ffd71b5337
Fixes incorrect ending for some scripts (#7691) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-09-10 22:16:47 +02:00
PhallenTree
827dd4a67c
Fixes Intrepid Sword/Dauntless Shield boosting after entering while at max stats (#7716) 2025-09-10 16:38:09 +02:00
Alex
6aead97a37
Fix incorrect wrap turn amount (#7667) 2025-09-08 11:53:05 +02:00
Alex
92ba0d813d
Fixes Sweet Veil not protecting sleep from Yawn status (#7704) 2025-09-08 11:51:22 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
Hedara
ef001df006 Start of 1.13.2 cycle 2025-09-02 16:18:32 +02:00
Hedara
c1b1fb4cdc 1.13.1 Release version 2025-09-02 16:17:05 +02:00
Hedara
9ff4c48f77 Start of 1.13.1 cycle 2025-08-28 16:16:40 +02:00
Hedara
7056aaba6e Expansion version 1.13.0 2025-08-28 16:15:09 +02:00
Hedara
acf7f0c6e1 Merge branch 'upcoming' into expansion-release 2025-08-28 16:13:58 +02:00
Hedara
d812b58064 Expansion version 1.12.3 2025-08-28 15:49:29 +02:00