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

1399 Commits

Author SHA1 Message Date
RoamerX
e94050f53c Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-01-27 12:26:20 +08:00
Hedara
594a4c7ec3 Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge 
Conflicts:
	.github/workflows/build.yml
	asm/macros/battle_script.inc
	include/constants/battle_script_commands.h
	src/battle_controllers.c
	src/battle_script_commands.c
	src/data/graphics/battle_environment.h
	src/party_menu.c
 2026-01-19 21:40:27 +01:00
Frank
80db2c6aec Renamed building and stadium palettes to be more accurate 2026-01-18 18:19:03 -05:00
RoamerX
270f498300 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-01-18 19:41:13 +08:00
amiosi
9798b6c7d7
Changes to Item icons and palettes (#8614) 2026-01-13 15:16:26 +01:00
RoamerX
dc41d1cab9 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-29 23:03:47 +08:00
artsquirrelb
1e0e1ffca6
Expansion OW sprites fix (#8633) 2025-12-24 15:56:17 +01:00
artsquirrelb
58d0143115
Redraw Gurdurr's overworld sprite (#8625) 2025-12-23 09:22:57 +01:00
RoamerX
0f4d49aeb3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-17 21:21:49 +08:00
DaniRainbow
c5b8c9d471
Re-colored Gliscor's anim_front.png (#8341) 2025-12-15 18:51:39 +01:00
Estellar
087f2fba74
Fix Flabébé and Floette overworld sprites (#8511) 2025-12-13 17:06:04 +01:00
amiosi
7b036b3b56
GBA Asset Fixes (#8382) 2025-12-07 13:50:06 +01:00
RoamerX
607e09b2cc Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-11-21 21:38:17 +08:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
FosterProgramming
4a69268bd5
Make rainbow effect anim change based on side (#8269) 2025-11-18 23:31:47 +01:00
Montblanc
7c046eb3b8
Fixed bKGD for last_used_ball_r_cycle.png (#8261) 2025-11-16 12:52:07 +01:00
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-11-14 20:28:55 +01:00
Estellar
2e8545ba45
Fix some followers sprites (#8208) 2025-11-11 14:00:12 +01:00
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
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming 
Conflicts:
	include/constants/expansion.h
 2025-11-03 11:11:07 +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
a2ef3284dd Merge branch 'master' into master-to-upcoming 
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
 2025-10-29 18:42:59 +01:00
Bivurnum
6ddabde582
New Feature: ORAS Dowsing (#7211) 2025-10-27 17:41:07 +01:00
Raymond Dodge
95d98305dd
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881) 2025-10-26 11:45:40 +01:00
AlexOn1ine
6acabd4ba2 Master to upcoming merge 2025-10-25 16:19:32 +02:00
Josh
fa5ca10b17
Add spritesheet rules for healthbox graphics (#2180) 2025-10-19 18:32:19 +01:00
hedara90
358f3211ca
Fix nicknames containing many / overflowing the party screen textbox (#7970) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-10-17 20:17:35 +02:00
AlexOn1ine
e365add4cf 15/10/25 Master to upcoming merge 2025-10-15 21:31:00 +02:00
RoamerX
f9570a4404 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-10-12 22:53:13 +08:00
FosterProgramming
d84d5cb0d4
Fix pikachu starter icon (#7879) 2025-10-08 10:36:30 +02:00
Eva
4822d94667
Nickit & Thievul visual revamp (#7689) 2025-09-16 13:04:17 +02:00
mudskipper13
59a214828e
Implement field_name_box (#7697) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-09-14 20:45:18 +02:00
RoamerX
d9c2fb3cd2 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-09-02 22:32:57 +08:00
pokesidv
4d31693005
Rock climb by ghoulslash (#7432) 
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-08-03 14:52:07 +02:00
RoamerX
f7e45ca2b3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-24 17:15:11 +08:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
RoamerX
3615447727 增加“・”字符，调整部分标点字符的样式，更新卡璞家族名称 2025-07-12 16:27:02 +08:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Phantonomy
809379797e
Better Hydrapple Backsprite (Adapted from DegelAlex on deviantart (#7246) 2025-07-10 23:43:43 -04:00
mudskipper13
0d09e5cce8
battle_interface: overhaul ability pop up (#7227) 2025-07-10 19:09:52 +02:00
12014
7598de60a6 Use 'Stringappend' in some functions & Few Changes of Pics 2025-07-07 00:56:39 +09:00
RoamerX
a929a69962 标题logo更新 
感谢贴吧的大神丶橡皮聚聚制作的logo文字图，我与SKT做了一些简单处理以优化游戏内显示效果
 2025-06-28 21:43:22 +08:00
RoamerX
97bec4a695 修正标题logo宝可梦文字图片背景色为黑色 2025-06-21 23:21:56 +08:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites (#6976) 2025-06-07 09:57:43 +02:00
RoamerX
6319057820 标题logo更新 2025-06-04 18:16:22 +08:00
RoamerX
b8d9b715c3 标题logo更新 2025-06-03 23:03:25 +08:00
RoamerX
9c15cbbd21 更新翻译“栖息地不明”并更新对应图片 2025-06-02 16:01:52 +08:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
RoamerX
dda99a8e88 标题logo更新 2025-06-01 18:08:25 +08:00
RoamerX
57bb0cb175 标题界面logo更新 
PS废柴一天速成，凑合用先
 2025-05-31 18:53:53 +08:00