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

66 Commits

Author SHA1 Message Date
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-15 14:07:12 +01:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -03:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02: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
b8dea3c7ec sideways stairs, try to integrate with follower code 2024-06-19 10:50:59 -04:00
Bassoonian
80e6ca1df0
Converts a bunch of #if to regular conditions (#4071) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-26 18:15:45 +01:00
ghoulslash
6c8cf2c026 merge w master 2023-04-15 22:04:35 -04:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
LOuroboros
4be4ec3081 metatitleBehavior -> metatileBehavior 2023-02-17 16:43:22 -03:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
ghoulslash
959f3cca77 merge w pret 2022-04-07 12:11:45 -04:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap 
Fix some incorrect fieldmap names
 2022-01-26 17:51:56 -05:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
ghoulslash
384bdaee18 merge w pret 2021-11-28 19:09:43 -05:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
3556024a06 Distinguish clearly the two enums related to speed 2021-11-03 02:51:30 +08:00
cbt6
3f5f057ebe Rename GoSpeedX functions to WalkNormal, WalkFast, etc. 2021-11-03 01:50:53 +08:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
ghoulslash
782c16209d Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-10-26 13:24:33 -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
ghoulslash
5b47bfacf2 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-08-18 20:22:26 -06:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ghoulslash
cedd2967d8 merge w pret 2021-05-20 11:28:26 -06:00
Kurausukun
dbc1b9aacf fix goto in bike.c 2021-05-13 11:29:11 -05: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
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
brain_face
9abda59bd1 Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope 2020-04-12 16:22:03 +02:00
brain_face
007a038031 Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving 2020-04-12 15:43:45 +02:00
brain_face
ce2fe10bec Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving 2020-04-12 15:35:38 +02:00
brain_face
1be48a61c1 Renamed sub_808B9BC -> PlayerWheelieMove 2020-04-12 15:31:11 +02:00
brain_face
1472a3a7d4 Renamed sub_808B980 -> PlayerWheelieInPlace 2020-04-12 14:38:18 +02:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00