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
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
GriffinR
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04: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
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
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
b40cee540e
Continue documenting roulette
2020-08-02 14:52:05 -04:00
GriffinR
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
...
Document starter_choose.c
2020-07-17 16:02:10 -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
43c48d95c2
Document starter_choose.c
2020-07-06 17:26:25 -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
3456578c0f
Move berry crush data to src
2020-02-17 13:10:23 -06:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
8a96aa9e97
Name pokenav files
2020-02-04 08:02:28 -06:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
jiangzhengwenjz
5bec27aa34
nonmatch sub_8024604
2019-12-18 03:36:51 +08:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall
...
Document some pokenav match call
2019-12-15 09:42:13 -06:00
GriffinR
75b0c9d7a9
Document Battle Pyramid scripts
2019-12-14 08:38:26 -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
51179df017
Clean up match call doc
2019-12-08 15:49:36 -05:00
GriffinR
548af3c0f1
Document a bit of Match Call
2019-12-05 15:33:36 -05:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
a486c8affd
Begin documenting Apprentice, merge with master
2019-11-18 12:47:10 -05:00
GriffinR
f7e17ca985
Document Ranking Hall scripts
2019-11-17 08:16:28 -06:00
GriffinR
248b85c3cb
Document Frontier Exchange Corner scripts
2019-11-16 12:00:35 -06:00
GriffinR
57a66bb22d
Document Battle Frontier lounges
2019-11-16 11:37:34 -06:00
