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

17611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
allcontributors[bot]
00bc660727
add RubyRaven6 as a contributor for code, and doc (#6918) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-19 19:35:38 -07:00
allcontributors[bot]
fe7425235a
add wiz1989 as a contributor for code (#6902) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-19 15:47:16 -07:00
Kurausukun
bd0a02c456
Correct C23 Checks (#2144) 2025-05-19 15:43:06 +01:00
Bassoonian
59d315734d
Update header files to match source files (#2143) 2025-05-19 09:18:04 +01:00
Kurausukun
e1e7d1cf35
Fixes for C23 Support (#2138) 
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
 2025-05-19 09:11:59 +01:00
allcontributors[bot]
f8d31a7410
add PCG06 as a contributor for code (#6900) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-19 07:41:39 +02:00
allcontributors[bot]
6df68c4dd3
add mudskipper13 as a contributor for code, and doc (#6915) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 21:08:43 -07:00
allcontributors[bot]
6bdec079c0
add kittenchilly as a contributor for code (#6898) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 17:49:50 -07:00
allcontributors[bot]
ec58de2b6a
add ExpoSeed as a contributor for code, and maintenance (#6899) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 15:00:00 -07:00
allcontributors[bot]
c83e7bda23
add LinathanZel as a contributor for code (#6901) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 08:42:48 -07:00
allcontributors[bot]
7b679a6feb
add AsparagusEduardo as a contributor for code, data, and 10 more (#6905) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 07:07:59 -07:00
Bassoonian
f1a655366b
Fix typo in the readme (#6908) 2025-05-18 06:47:35 -07:00
allcontributors[bot]
6a726d9821
add agsmgmaster64 as a contributor for code (#6906) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-18 06:47:00 -07:00
psf
5164c40e49
Update .all-contributorsrc to skip CI (#6907) 2025-05-18 00:36:52 +02:00
allcontributors[bot]
5fdc7f9283
add khbsd as a contributor for doc, and code (#6903) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-05-17 15:15:28 -07:00
allcontributors[bot]
c0b70dd35b
add Cafeei as a contributor for design (#6904) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
 2025-05-17 14:54:23 -07:00
psf
9145132377
Fixed URL for contributors badge on README.md (#6897) 2025-05-17 16:38:49 -04:00
allcontributors[bot]
6cbb7b31af
add Pawkkie as a contributor for doc (#6896) 
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
 2025-05-17 13:25:53 -07:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
psf
b8b73bf219
Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700) 2025-05-17 19:33:22 +02:00
RoamerX
6f69e7f5eb 对于对战开拓区&对战帐篷的文本进行了重新翻译 
虽然原本进行了一些修正和润色，但是整体质量偏低，于是重新进行了汉化
调整了开拓区对战设施的成绩页面文字展示位置
对培育屋的文本进行了重新翻译
参照官方正作的使用逻辑统一调整了数字使用阿拉伯数字和汉字的情况
参照官方正作的使用逻辑统一调整了使用“战斗”和“对战”的情况
修正了部分连接相关文本的译名
主要参考deepseek英文翻译及原版英文
 2025-05-18 00:10:23 +08:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
Eduardo Quezada
6711df36a3
Create missing ability and move effect test files (#6845) 2025-05-16 12:20:44 +02:00
Eduardo Quezada
3a3c246509
Consolidated stat-priority ability tests (#6863) 2025-05-16 12:09:39 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00
Alex
fb1737ddbf
Pret merge (15th of May, 2025) (#6870) 2025-05-16 08:00:07 +02:00
GriffinR
74bf498aaa
Merge pull request #2137 from mrgriffin/pret-suspicious-setvar 
Warn on suspicious setvar usages
 2025-05-15 17:21:00 -04: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
Alex
75cd16dae0
Fix potential bug in BattleScript_FriskActivates (#6850) 2025-05-15 10:44:37 +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
54e9505d2b Warn on suspicious setvar usages 2025-05-15 09:42:59 +01:00
hedara90
9924ae3391
Make make clean work again (#6848) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-15 10:40:35 +02:00
RoamerX
20a96f2592 对战寻呼所有普通NPC文本重新润色/汉化 
主要参考deepseek英文翻译及原版英文
 2025-05-14 22:52:28 +08:00
GriffinR
0aae36984f
Merge pull request #2136 from mrgriffin/pret-remove-files 
Remove files that should not have been committed in #2126
 2025-05-13 12:15:58 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
444e77b7f6
BattleScript_BerryStatRaiseRet Ripen checks berry and cleanup (#6835) 2025-05-13 15:53:36 +02:00
ghoulslash
5ad8d852fd Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix 2025-05-13 08:01:41 -04:00
RoamerX
68ec0481a9 更新训练师类型中的译名为目前官译 
并修正了文本中提及的部分
 2025-05-13 17:06:12 +08:00
Eduardo Quezada
e64d260f52
Added Ability TODO tests B (#6836) 2025-05-13 10:34:06 +02:00
Bassoonian
60587682e3
Remove redundant script declaration in battle_scripts.h (#6837) 2025-05-13 10:32:03 +02: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