Eduardo Quezada
|
749225ace1
|
Matching merge from upstream pret
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2023-01-20 12:31:54 -03:00 |
|
GriffinR
|
0cc10a1ada
|
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
|
2023-01-18 11:07:12 -05:00 |
|
Eduardo Quezada
|
e858b4e709
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
|
2022-11-24 15:36:00 -03:00 |
|
GriffinR
|
e434b0047f
|
More missing constant usage
|
2022-11-09 15:53:47 -05:00 |
|
GriffinR
|
1d1c2d41bb
|
Add list menu cursor constants
|
2022-11-09 15:16:46 -05:00 |
|
ghoulslash
|
15a368163d
|
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
LoadSpecialPokePic adjustments
|
2022-08-25 15:35:21 -04:00 |
|
Eduardo Quezada
|
af137c9b9d
|
Multiple changes
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
|
2022-08-25 03:42:41 -04:00 |
|
Eduardo Quezada
|
eea718cfc6
|
Placeholder moves can't be used in battle.
|
2022-08-24 00:30:49 -04:00 |
|
Martin Griffin
|
d57442a511
|
Decimal paletteNums
|
2022-08-19 17:05:22 +01:00 |
|
Martin Griffin
|
6fed961ed6
|
Write palette IDs in hex
|
2022-08-19 15:29:35 +01:00 |
|
Eduardo Quezada
|
2e1bf0d965
|
OamData mosaic FALSE
|
2022-07-29 21:27:39 -04:00 |
|
Eduardo Quezada
|
a37d8b1346
|
Documented boolean uses
|
2022-07-25 14:59:14 -04:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
004d1cab3f
|
Clean up pokenav conditions doc
|
2021-11-12 11:13:49 -05:00 |
|
GriffinR
|
f5152094a9
|
Finish pokenav conditions doc
|
2021-11-12 11:01:22 -05:00 |
|
GriffinR
|
7efdc0902b
|
Finish condition graph doc
|
2021-11-11 15:29:15 -05:00 |
|
GriffinR
|
343ac99049
|
Start pokenav conditions doc
|
2021-11-10 17:00:54 -05:00 |
|
GriffinR
|
50d3003a0d
|
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
|
2021-11-03 19:54:20 -04:00 |
|
GriffinR
|
9a0618afc3
|
Add COPYWIN constants
|
2021-11-03 15:29:18 -04:00 |
|
GriffinR
|
e14210ce1f
|
Merge pull request #1536 from GriffinRichards/clean-braille
Add font id constants, better braille support
|
2021-11-03 13:17:29 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
41ecae91f8
|
Label remaining symbols in graphics.c
|
2021-10-27 13:47:18 -04:00 |
|
GriffinR
|
8a79ca3818
|
Document walda_phrase
|
2021-09-26 17:01:39 -04:00 |
|
GriffinR
|
bd5cf07059
|
Merge branch 'master' into doc-playerpc
|
2021-08-02 14:08:10 -04:00 |
|
GriffinR
|
06b909bcd8
|
Document player pc
|
2021-08-02 13:58:40 -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 |
|
Kurausukun
|
10c80230c4
|
change printItemFunc to use u32 instead of s32
also change a use of -2 to LIST_CANCEL
|
2021-06-18 00:15:45 -04:00 |
|
Kurausukun
|
3e725272fc
|
standardize "grey" to "gray"
|
2021-04-09 22:39:34 -04:00 |
|
GriffinR
|
62968895ca
|
Add MON_PIC_SIZE constant
|
2021-03-29 09:38:19 -04:00 |
|
GriffinR
|
1cac608dbe
|
Document mail
|
2021-02-24 11:03:39 -05:00 |
|
GriffinR
|
a5852d57d1
|
Use TASK_NONE constant
|
2021-02-24 11:03:25 -05:00 |
|
GriffinR
|
81a7f491b7
|
Use WINDOW_NONE constant
|
2021-02-24 11:03:08 -05:00 |
|
GriffinR
|
0851c34bac
|
Add berry tree id constants
|
2021-02-05 15:25:12 -05:00 |
|
Kurausukun
|
266a23b327
|
fix indentation
|
2020-12-14 21:44:25 -05:00 |
|
Kurausukun
|
58976ebaa8
|
Merge remote-tracking branch 'upstream/master' into berry_crush
|
2020-12-10 23:30:52 -05:00 |
|
aaaaaa123456789
|
1c3d75f673
|
Merge branch 'master' into reverts
|
2020-10-26 12:16:36 -03:00 |
|
Evan
|
2b2be90a52
|
start pokenav documentation
|
2020-10-10 16:17:34 -06:00 |
|
GriffinR
|
5259898325
|
Replace POKEMON_SLOTS_NUMBER
|
2020-10-01 17:07:12 -05:00 |
|
Kaz
|
94711208a2
|
menu_specialized.c: Fix fakematches.
|
2020-09-19 17:38:54 -04:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
PokeCodec
|
e84da39d8a
|
Match BattleIntroOpponent1SendsOutMonAnimation
|
2020-09-08 18:54:51 -04:00 |
|
PokeCodec
|
a04b0ff487
|
More formatting fixes
|
2020-08-28 14:35:37 -04:00 |
|
GriffinR
|
ade49de329
|
Merge branch 'master' into doc-pblock
|
2020-08-12 19:49:55 -04:00 |
|
GriffinR
|
f6efbe38bf
|
Clean up use_pokeblock doc, some menu_specialized
|
2020-08-12 18:39:15 -04:00 |
|
GriffinR
|
4f615b65e6
|
Continue documenting use_pokeblock
|
2020-08-11 13:56:17 -04:00 |
|
GriffinR
|
cc4255d4c0
|
Add some charmap constant usage
|
2020-08-11 00:23:28 -04:00 |
|
GriffinR
|
e947729d65
|
Start documenting use_pokeblock
|
2020-08-10 13:48:16 -04:00 |
|
Sierraffinity
|
74edaed426
|
Begin item_menu.c cleanup
|
2020-06-10 13:07:42 -07:00 |
|
GriffinR
|
be5d417236
|
Document some pokenav menu handlers
|
2020-02-04 08:02:28 -06:00 |
|