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
|
2e52e3331f
|
merge w upcoming
|
2024-10-04 12:56:21 -04:00 |
|
pkmnsnfrn
|
4387b6ef70
|
Removed SetWalkingIntoSignVars per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963824
|
2024-08-11 18:10:18 -07:00 |
|
pkmnsnfrn
|
b54cf221d8
|
Renamed and refactored FieldInput_HandleCancelSignpost into CancelSignPostMessageBox
|
2024-07-15 22:13:33 -07:00 |
|
ghoulslash
|
5657f8369e
|
merge w pret
|
2023-05-11 10:44:18 -04:00 |
|
ghoulslash
|
7d010529d6
|
merge w master
|
2023-04-15 22:06:08 -04:00 |
|
GriffinR
|
dbf757be88
|
Treat map data as const
|
2023-03-08 12:00:30 -05:00 |
|
ghoulslash
|
6f6ed0a25c
|
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
|
2021-11-28 15:01:19 -05:00 |
|
GriffinR
|
c1970a4bc8
|
Remove dead sub references
|
2021-11-17 15:47:47 -05:00 |
|
ghoulslash
|
7405c11934
|
add r to search
|
2021-06-16 09:47:53 -06:00 |
|
ghoulslash
|
dfce7f1548
|
add auto read signposts
|
2021-04-01 09:45:17 -06:00 |
|
GriffinR
|
18d57a3802
|
Document some overworld and field effects
|
2020-06-23 15:48:53 -04:00 |
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
Phlosioneer
|
3ceb1667c9
|
Reduce externs
|
2019-03-01 22:32:50 -05:00 |
|
Marcus Huderle
|
abebd2b864
|
Cleanup externs in overworld.c
|
2019-02-08 11:48:51 -06:00 |
|
Marcus Huderle
|
6e7bdb3ca4
|
Document misc field_specials things
|
2018-12-29 11:36:54 -06:00 |
|
Slawter666
|
3d8874d919
|
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
|
2018-10-21 00:20:09 +01:00 |
|
Diegoisawesome
|
e75f0b4f80
|
Port/decompile field_control_avatar
|
2018-10-16 21:47:08 -05:00 |
|
Slawter666
|
1435c96b41
|
Further synchronisation
|
2018-10-17 01:11:44 +01:00 |
|
DizzyEggg
|
1e9143e0b2
|
merge union room with master
|
2018-07-22 13:14:58 +02:00 |
|
Marcus Huderle
|
aa9a45c16f
|
Rebrand 'map object' and 'field object' to 'event object'
|
2018-06-11 19:11:48 -05:00 |
|
DizzyEggg
|
e50f4b4999
|
still going
|
2018-06-03 22:39:10 +02:00 |
|
DizzyEggg
|
94b47c0686
|
decompile overworld
|
2018-02-14 00:58:22 +01:00 |
|