Eduardo Quezada
7774c9727d
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125
...
# Conflicts:
# tools/mapjson/mapjson.cpp
2023-01-25 20:28:55 -03:00
GriffinR
f4cb6d229f
Add some missing sizeof usage for SpriteSheets
2023-01-24 17:04:48 -05: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
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04: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
GriffinR
16ab534ddb
Add some missing pocket constant usage
2022-07-14 10:27:51 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix
2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting
2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c
...
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2022-06-17 18:16:14 -03:00
Colton G. Rushton
e42498ab40
Add bugfix from bugs_and_glitches.md to BUGFIX
...
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
2022-06-17 18:06:37 -03:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -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
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
ultima-soul
356cf96654
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
2021-12-15 19:33:35 -08:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
c74e19c062
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-11-09 20:58:19 -08:00
BuffelSaft
adcf563ba1
Add missing berry data
...
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
2021-10-26 14:42:06 +13:00
GriffinR
e270ee1a74
Merge pull request #1506 from GriffinRichards/single-doc
...
Document some single-remaining symbols
2021-09-29 00:10:09 -04:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
GriffinR
8f5e2bbeba
Label swap line margin flag
2021-08-21 11:04:28 -04:00
ultima-soul
840e2bc3f9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-16 16:33:34 -07:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos
2021-07-12 01:39:28 -04:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -07:00
ultima-soul
75a9fdbafa
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 20:50:59 -07:00
GriffinR
265b49c47b
Label missing sprite anims
2021-04-26 14:41:15 -04:00
GriffinR
c786a9b20c
Document pokeblock menu
2021-04-11 18:10:05 -04:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
GriffinR
b04f0aaa2b
Use SPRITE_NONE constant
2021-02-24 11:03:32 -05:00
DizzyEggg
271219f962
Merge with master
2020-09-08 12:00:51 +02:00
GriffinR
0ff767a9b5
Start documenting berry blender
2020-08-22 19:39:39 -04:00
DizzyEggg
e03fea84d0
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-07-11 12:46:41 +02:00
Sierraffinity
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
DizzyEggg
871e093b65
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-12-09 08:20:29 +01:00
GriffinR
2756771958
More usage of ST_OAM constants and SPRITE macros
2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36
Use ST_OAM constants for OamData definitions
2019-12-06 19:05:44 -06:00
DizzyEggg
0eaddd251c
Merge branch 'master' into item_expansion
2019-06-03 11:06:09 +02:00
Papa Cancer
e53ba4773d
Documenting bags, berries and graphics
...
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
DizzyEggg
f97125fc63
Fill most of what new berries data
2019-04-15 11:50:31 +02:00
Phlosioneer
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
DizzyEggg
ecee02816d
Merge with master
2018-12-20 22:53:08 +01:00
DizzyEggg
9ffd0c7382
3.5 asm left
2018-12-17 23:00:08 +01:00
Slawter666
2fa0555ed5
Document some of item_menu.c
2018-12-15 18:08:13 +00:00
