49 Commits

Author SHA1 Message Date
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
cornixsenex
80a3a3b7ef
Remove shadow and hide follower on stair warp (#7368) 2025-08-08 11:22:42 +02: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
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Hedara
2b92ba315a Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
	include/battle_anim.h
	include/battle_controllers.h
	include/battle_gfx_sfx_util.h
	include/battle_interface.h
	include/battle_main.h
	include/battle_script_commands.h
	include/battle_util.h
	include/easy_chat.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/field_player_avatar.h
	include/intro.h
	include/item_use.h
	include/metatile_behavior.h
	include/move_relearner.h
	include/pokedex.h
	include/pokemon.h
	include/pokemon_icon.h
	include/roamer.h
	include/script_pokemon_util.h
	include/sprite.h
	include/text.h
	include/wild_encounter.h
	src/battle_controllers.c
2025-05-24 20:38:21 +02:00
Bassoonian
59d315734d
Update header files to match source files (#2143) 2025-05-19 09:18:04 +01:00
Bassoonian
2394195123
Remove non-existent functions from header files (#6825) 2025-05-13 10:52:45 +02:00
ghoulslash
229525d122 some cleanup 2024-10-18 22:13:49 -04:00
ghoulslash
cb1696384c merge in original dexnav code with some rhh specific tweaks 2024-06-16 10:39:28 -04:00
Eduardo Quezada
c391c66249 Cleanup pt4
- Removed TIME_OF_DAY_FADE and UpdateTimeOfDayPaletteFade
- Renamed FieldCallback_Fly back to FieldCallback_UseFly
2023-06-18 01:45:04 -04:00
ghoulslash
4775e0372a merge w pret 2022-10-17 09:06:27 -04:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
ghoulslash
deddda451b merge w pret 2022-07-30 18:35:41 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Ariel A
c78736c94f Fixed bug where decor icons cleared dynamic palettes in the Frontier Exchange Corner shop. 2022-03-15 19:13:22 -04:00
ghoulslash
5e948e746b add dexnav 2021-04-02 12:28:00 -06:00
Ariel Antonitis
8a3dfbf252 Added pokemon followers & script commands. 2021-03-03 01:04:22 -05:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
Phlosioneer
ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
Marcus Huderle
abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
DizzyEggg
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Diegoisawesome
80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
KDSKardabox
895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
KDSKardabox
c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
DizzyEggg
05aba58d5d fix battle transition conflicts 2018-01-14 22:19:26 +01:00
DizzyEggg
eb00e8ba4a more work on battle transition 2018-01-02 20:38:33 +01:00
Diegoisawesome
e3585d7d66 Review fixes 2018-01-01 19:21:30 -06:00
DizzyEggg
5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
PikalaxALT
e3005e88c7 Decompile remaining functions in region_map 2017-11-01 00:34:57 -04:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
PikalaxALT
18e06b480b Fix header guards 2017-09-16 15:13:06 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00