FosterProgramming
|
bc6bbb1bc5
|
Make sure grass effect palette ignore fog when time blended (#9235)
|
2026-02-17 13:54:36 +01:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04: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 |
|
Hedara
|
b075163c57
|
Cleanup and config options
|
2025-04-10 21:17:20 +02:00 |
|
Eduardo Quezada
|
ebbcb7d025
|
Whitespace, documentation and style
|
2024-01-22 19:12:52 -03:00 |
|
Eduardo Quezada
|
341ce6fd95
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
|
2023-06-16 21:25:16 -04:00 |
|
Ariel A
|
1c011a9c1c
|
Merge branch 'master' into followers
|
2022-10-07 20:52:15 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Ariel Antonitis
|
221569a710
|
Merge branch 'master' into romhack
|
2021-04-18 22:17:53 -04:00 |
|
GriffinR
|
8bad478b49
|
Document disguise field effects
|
2021-04-06 14:51:39 -04:00 |
|
GriffinR
|
553fe6239a
|
Document more field effects
|
2021-04-05 18:21:17 -04:00 |
|
Ariel Antonitis
|
12e3b4efad
|
Added alpha-blending shadows.
|
2021-03-03 02:01:39 -05:00 |
|
GriffinR
|
4ea6992172
|
Continue documenting overworld/field effects
|
2020-06-29 01:26:29 -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 |
|
Slawter666
|
3d8874d919
|
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
|
2018-10-21 00:20:09 +01:00 |
|
Diegoisawesome
|
dd3689fdbf
|
Finish porting/decompiling field_player_avatar
|
2018-10-19 00:05:54 -05:00 |
|
Slawter666
|
3aff112127
|
Begin synchronising with pokeruby
|
2018-10-16 14:55:16 +01:00 |
|
Slawter666
|
137f6549ff
|
label field_effect_helpers
|
2018-10-14 23:43:40 +01: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 |
|
Marcus Huderle
|
73327f0d44
|
Decompile field_ground_effect into event_object_movement.c
|
2018-06-11 10:23:14 -05:00 |
|
DizzyEggg
|
d1798d0ed9
|
decompile field tasks
|
2018-05-19 18:02:43 +02:00 |
|
Diegoisawesome
|
416d67c832
|
Finish porting/decompiling field_effect.c
|
2018-05-10 18:36:57 -05:00 |
|
DizzyEggg
|
78f35494a3
|
fix trainer see pr
|
2017-12-21 17:51:48 +01:00 |
|
scnorton
|
4b04e92e8b
|
Ten more functions (remaining function count is 99)
|
2017-09-17 13:26:17 -04:00 |
|
PikalaxALT
|
18e06b480b
|
Fix header guards
|
2017-09-16 15:13:06 -04:00 |
|
PikalaxALT
|
de8ef5e125
|
sub_808E1B8
|
2017-09-07 19:28:46 -04:00 |
|