Eduardo Quezada
3172273c73
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures
...
# Conflicts:
# src/pokemon.c
2022-10-30 12:16:09 -03:00
Eduardo Quezada
3d214f8204
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada
2d78ac0192
Implemented Lures using the same vars as repels
2022-09-12 10:21:49 -03:00
Eduardo Quezada
21df8c279b
Added SPECIES_FLAG_CANNOT_BE_TRADED
...
- Also corrected Cylarex's forms not having the legendary flag
2022-09-09 08:59:53 -04:00
Eduardo Quezada
8d94c58cac
Shows exp when leveling up with Exp Candies
2022-08-31 21:54:27 -04:00
Eduardo Quezada
3264c3c87a
Shows amount of Exp gained.
2022-08-31 09:05:51 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
...
Gen 8 EXP Candies
2022-08-25 23:03:24 -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
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04:00
AgustinGDLV
b197da077f
Update src/strings.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-05-16 16:08:26 -07:00
AgustinGDLV
bd008e4c80
fixed softlocks / messages
2022-05-16 15:25:13 -07: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
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
f5152094a9
Finish pokenav conditions doc
2021-11-12 11:01:22 -05:00
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
LOuroboros
5536bce88d
SIZE -> FONT
2021-10-29 18:39:31 -03:00
ultima-soul
78d2215196
Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.
2021-10-03 10:16:09 -07: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
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
Kurausukun
3e725272fc
standardize "grey" to "gray"
2021-04-09 22:39:34 -04:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
cc4255d4c0
Add some charmap constant usage
2020-08-11 00:23:28 -04:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants
...
Use charmap constants for PLAY_SE
2020-07-15 02:53:53 -04:00
GriffinR
431c60c92c
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
2020-07-08 15:45:31 -04:00
GriffinR
7d5ad8f7b4
Use charmap constants for PLAY_SE
2020-06-26 02:44:07 -04:00
GriffinR
24569583e4
Document contest results
2020-06-18 17:50:13 -04:00
GriffinR
3f97763181
Document cable_club.c
2020-06-06 16:10:03 -04:00
GriffinR
7632404ba5
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall
2019-12-10 20:43:27 -05:00
GriffinR
b7ab9cbf4c
Update JP translation and fix typo
2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77
Document misc strings and text colors
2019-12-10 19:29:23 -06:00
GriffinR
548af3c0f1
Document a bit of Match Call
2019-12-05 15:33:36 -05:00
GriffinR
f7e17ca985
Document Ranking Hall scripts
2019-11-17 08:16:28 -06:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
GriffinR
37373c1b21
Review changes for #817
2019-09-25 18:46:25 -05:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a
Document multichoice ids
2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2
Initial script_menu documentation
2019-09-18 18:57:25 -04:00
GriffinR
5d96a0cc97
minor fixes
2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d
initial documentation commit
2019-08-21 17:06:55 -05:00
Slawter666
2fdc489bc0
Further documentation of party_menu.c
2019-05-15 16:55:39 -05:00
Sewef
c8ce1a0a1f
Two labels from pokeruby.
2019-04-08 17:30:10 -05:00
Phlosioneer
d352999cd8
Change "navgear" to "pokenav"
2019-04-07 18:10:53 -04:00
Phlosioneer
d84d94e29a
Merge branch 'master' into pokenav-decomp-again
2019-04-07 01:56:36 -04:00
