Eduardo Quezada
|
4c5acca0ce
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
|
2022-08-22 20:31:44 -04:00 |
|
Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
GriffinR
|
8a8ba92f21
|
Revert COMMON wildcards
|
2022-08-22 19:04:47 -04:00 |
|
Martin Griffin
|
c5b30b7f21
|
Wildcards in ld_script.txt
Allows hacks to introduce new files and variables without needing to
change ld_script.txt similar to ld_script_modern.txt.
|
2022-08-15 12:25:16 +01:00 |
|
DizzyEggg
|
c991131b75
|
Change language stuff based on the french decomp
|
2022-08-04 11:53:16 +02:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
LOuroboros
|
2263caef7a
|
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
|
2022-05-13 03:17:31 -03:00 |
|
sbird
|
59cff2190d
|
fix building without NDEBUG on agbcc
|
2022-04-16 19:03:20 +02:00 |
|
LOuroboros
|
f82c946ff3
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
|
2022-04-03 13:26:27 -03: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 |
|
ExpoSeed
|
f50a406b18
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2022-03-22 12:56:23 -05:00 |
|
ultima-soul
|
84a7f960c8
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2022-02-28 23:37:41 -08:00 |
|
ultima-soul
|
86089ce935
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2022-02-28 22:13:14 -08:00 |
|
GriffinR
|
fd7457b05a
|
Remove berry fix
|
2022-01-13 15:26:20 -05:00 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08:00 |
|
ExpoSeed
|
d6747527da
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2021-12-16 21:44:01 -06:00 |
|
TheXaman
|
f6d9b74a1a
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
|
2021-12-10 16:48:46 +01:00 |
|
TheXaman
|
6c520659aa
|
implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo
|
2021-11-29 22:52:08 +01:00 |
|
ultima-soul
|
01a90ca6c2
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-11-27 22:17:05 -08:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
ultima-soul
|
57bf1c7824
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-11-21 10:41:12 -08:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
GriffinR
|
ecb13cdbf7
|
Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
|
2021-11-17 14:47:34 -05:00 |
|
GriffinR
|
4275cf4b90
|
Rename pokenav match call files
|
2021-11-15 01:30:21 -05:00 |
|
GriffinR
|
c779d03b3e
|
Rename pokenav_match_call_ui
|
2021-11-15 00:21:40 -05:00 |
|
GriffinR
|
ffe2970e30
|
Rename pokenav menu handler files
|
2021-11-12 17:13:50 -05:00 |
|
GriffinR
|
35aeff1b6d
|
Rename pokenav conditions files
|
2021-11-12 11:07:52 -05:00 |
|
GriffinR
|
ef935f6f4a
|
Merge pull request #1544 from GriffinRichards/romheadergf
Split headers from crt0.s
|
2021-11-09 23:54:57 -05:00 |
|
GriffinR
|
43e942c3af
|
Clean up pokenav ribbons
|
2021-11-09 12:50:35 -05:00 |
|
GriffinR
|
e0e2212db3
|
Avoid changed section warning
|
2021-11-01 01:47:38 -04:00 |
|
GriffinR
|
dac4192fd3
|
Split headers from crt0
|
2021-10-31 16:39:54 -04:00 |
|
GriffinR
|
36039e1b86
|
Convert fonts.s to C
|
2021-10-31 01:44:18 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
b0c27a8521
|
Document ereader screen
|
2021-10-26 15:44:42 -04:00 |
|
GriffinR
|
ece7ef3410
|
Correct usage of MysteryEvent to MysteryGift
|
2021-10-17 03:00:48 -04:00 |
|
GriffinR
|
95406384f4
|
Start wonder card/news documenting
|
2021-10-14 13:24:20 -04:00 |
|
GriffinR
|
4efa6c882a
|
Continue misc link documentation, rename reset_save_heap
|
2021-10-05 23:37:54 -04:00 |
|
ultima-soul
|
0a87adad1a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-06-07 18:05:52 -07:00 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06:00 |
|
ghoulslash
|
c3e28e9b1a
|
merge with be
|
2021-05-23 12:22:52 -06:00 |
|
ultima-soul
|
be7acc919a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 21:53:29 -07:00 |
|
ultima-soul
|
56a1cab314
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-03-23 15:21:19 -07:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
8eafe1fd4e
|
Move pointillism points array to src
|
2021-03-18 17:36:18 -05:00 |
|
ultima-soul
|
daf5e0167e
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-02-03 16:06:48 -08:00 |
|
Evan
|
7988a1f41d
|
Ai_TryOnAlly and reorganize files
|
2020-12-20 14:47:20 -07:00 |
|
Evan
|
28698a982d
|
try to faint script -> c
|
2020-12-11 08:05:00 -07:00 |
|
Evan
|
aad3a800c3
|
c functions for ai roamers/safari/first battle
|
2020-12-10 22:10:21 -07:00 |
|
Evan
|
25abdeacc5
|
tidy up z move code
|
2020-12-01 16:36:44 -05:00 |
|