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
079b1762ac
Update special save sector size checks
2022-08-05 12:11:33 -04:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
Martin Griffin
1cc59acca9
Static assertion for size of save structs
2022-05-25 19:48:42 +01:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04: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
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05: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
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
adf773f1ed
Document remainder of save.c
2021-11-08 19:45:14 -05:00
GriffinR
b0c27a8521
Document ereader screen
2021-10-26 15:44:42 -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
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
86475c5ded
Document trainer hill ereader
2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02
Sync ereader_helpers with pokefirered
2021-04-24 18:03:06 -04: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
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
GriffinR
58e64b9524
Clean up some of save.c
2020-01-12 18:42:41 -06:00
GriffinR
3bbdee61b8
Clean up Trainer Hill doc
2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b
Document Trainer Hill
2019-11-16 13:02:35 -06:00
PikalaxALT
306ce048ad
Move gflib srcs and headers to gflib subdir
2019-09-08 21:07:54 -04:00
PikalaxALT
e87f4f4cc7
Unify TrHillTag struct definitions (variable floors)
2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16
NULL_BATTLE_TOWER_POKEMON define
2019-09-05 20:48:48 -05:00
PikalaxALT
e2fbce996e
Use designated initializers (C99 feat)
2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89
Partial refactor of TryWriteTrainerHill_r
2019-09-05 20:48:48 -05:00
PikalaxALT
cb0fa2fdc3
Minor edit to save trainer hill routine
2019-09-05 20:48:48 -05:00
PikalaxALT
b510100503
Port trainer hill sets to C objects
2019-09-05 20:48:48 -05:00
PikalaxALT
8d910465f8
Minor refactor of ereader_helpers.c
2019-09-05 20:48:48 -05:00
PikalaxALT
fb06e4a3c9
Modernize code
...
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
PikalaxALT
8db03ba6fa
Documentation of ereader helpers, 2
2019-04-04 19:26:45 -05:00
PikalaxALT
c46f271f67
Documentation of ereader_helpers, 1
2019-04-04 19:26:45 -05:00
PikalaxALT
aafe9df454
through sub_8018798
2019-03-31 15:43:51 -05:00
Marcus Huderle
a7d5f032b1
Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c
2019-03-22 14:16:26 -05:00
