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
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) ( #5456 )
2024-10-02 21:20:23 +02:00
ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
Bassoonian
580b9e3b84
Update src/metatile_behavior.c
2024-09-28 15:02:51 +02:00
psf
009b42394e
Merge branch 'upcoming' into stairWarps
2024-09-22 09:40:34 -07:00
ghoulslash
bfa020da08
fix tile attributes
2024-09-22 09:19:58 -04:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04:00
pkmnsnfrn
04faf370e6
Cleaned up and reordered functions
2024-08-27 20:56:09 -07:00
pkmnsnfrn
1ac4d195c2
Changed mb to MetatileBehavior per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1694003941
2024-07-27 15:17:32 -07:00
pkmnsnfrn
fccecf038f
Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003876
2024-07-27 15:03:45 -07:00
pkmnsnfrn
3c4aaf53f8
Removed unneeded preproc per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003941
2024-07-27 15:03:03 -07:00
pkmnsnfrn
1ad3ba1f32
Fixed compilations errors with abgcc
2024-07-27 10:58:51 -07:00
pkmnsnfrn
31fc49734a
Removed preproc from src/metatile_behavior.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1693914236
2024-07-27 07:34:33 -07:00
pkmnsnfrn
587ffeeb97
Fixed tabs
2024-07-26 21:31:04 -07:00
pkmnsnfrn
f362f6e754
Cleaned up metatile behavior
2024-07-25 21:22:08 -07:00
pkmnsnfrn
7717812154
Clean up files
2024-07-25 20:34:14 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
pkmnsnfrn
fd69ef339c
Got pokemart and pokecenter changes working
2024-07-25 19:33:07 -07:00
pkmnsnfrn
b43e0e07f7
Add config to disable OW_AUTO_SIGNPOST
2024-07-15 21:45:34 -07:00
ghoulslash
0cffe4a96a
syntax fixes, turn slow movement on rock stairs default off, remove petalburg layout change
2024-07-08 14:08:15 -04:00
ghoulslash
0585123da9
merge w pret
2023-05-11 10:44:57 -04:00
ghoulslash
5657f8369e
merge w pret
2023-05-11 10:44:18 -04:00
ghoulslash
6c8cf2c026
merge w master
2023-04-15 22:04:35 -04:00
GriffinR
d68e81c2be
Clarify MB_SEMI_DEEP_WATER name
2023-01-17 21:32:55 -05:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
ghoulslash
7322166f8b
merge w pret
2022-07-29 11:05:08 -04:00
ghoulslash
70026f2558
fix tile attributes for sideways stairs behaviors
2022-04-07 12:24:07 -04:00
ghoulslash
959f3cca77
merge w pret
2022-04-07 12:11:45 -04:00
GriffinR
c4f33f2b2b
TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE
2022-01-19 12:54:55 -05:00
GriffinR
e682c12519
sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE
2022-01-19 12:39:11 -05:00
GriffinR
8200fda14e
Fix decorations metatile attribute names
2022-01-19 10:56:54 -05:00
ghoulslash
384bdaee18
merge w pret
2021-11-28 19:09:43 -05:00
GriffinR
eb95ac0b9c
Document field_tasks
2021-11-17 14:44:42 -05:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
ghoulslash
782c16209d
Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs
2021-10-26 13:24:33 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
Evan
a23f716209
add slow stair movement back
2021-04-01 20:14:47 -06:00
Evan
d3d29d7cb5
cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d
2021-04-01 20:12:43 -06:00
Evan
228b76e136
finish conditional slow stairs movement, clean up code a bit
2021-04-01 20:10:41 -06:00
Evan
e4674ccd03
fully working walk/run/mach bike/acro bike regular movement
2021-04-01 20:10:30 -06:00
Evan
31e9f97d52
cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab
2021-04-01 20:10:21 -06:00
ghoulslash
dfce7f1548
add auto read signposts
2021-04-01 09:45:17 -06:00
Evan
c568c3d5f7
Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps
2021-01-13 13:58:09 -07:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
Evan
b17e6c9cf0
Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps
2020-09-23 13:41:29 -06:00
kiliwily
f1366dfc69
Fix typos
2020-09-19 20:46:26 +02:00
kiliwily
5c3669e0cd
Bug documenting
2020-09-12 18:43:20 +02:00
Eduardo Quezada
b7fe94108c
Fixed Pacifidlog typo.
2020-09-05 01:11:07 -04:00
