Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
Eduardo Quezada
|
e4a439aa46
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
|
2022-10-30 12:30:38 -03:00 |
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
ultima-soul
|
26f29a04fd
|
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
|
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 |
|
ultima-soul
|
d408b56549
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-12-01 20:18:57 -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 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
GriffinR
|
61aa9c3ba9
|
More updating event macro comments
|
2021-11-16 17:46:34 -05:00 |
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
GriffinR
|
f85de6eca5
|
Start event macro comment updates
|
2021-11-15 10:54:57 -05:00 |
|
cbt6
|
32aaf6912f
|
Rename movement scripts to use Faster over Fastest
|
2021-11-05 02:22:28 +08: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
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
ultima-soul
|
53e900a643
|
Rearranged rest of item ids except for Key Items.
|
2021-07-02 22:43:50 -07:00 |
|
ExpoSeed
|
6a977bdbfc
|
Document second parameter of playbgm
|
2021-05-21 15:08:00 -05:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
503dafd210
|
Fix wallys parents misnamed as uncle/aunt
|
2020-08-18 17:51:41 -04:00 |
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
GriffinR
|
e5757a3def
|
Use trainer type constants
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
b1d26e10a8
|
Sync map header property names with pokefirered
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
e92cc7752b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
|
2020-01-13 20:41:57 -05:00 |
|
huderlem
|
6d6c57f383
|
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
|
2020-01-13 19:33:47 -06:00 |
|
GriffinR
|
655910a16f
|
Merge branch 'master' into fix-eventobj
|
2020-01-12 22:42:43 -05:00 |
|
GriffinR
|
c27a4778ee
|
Standardize prebattle -> intro
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
6a470ddfda
|
Some script clean up, document secret base secrets show
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
e497fc64e3
|
if_undefeated macro to if_not_defeated
|
2020-01-12 20:20:02 -05:00 |
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
GriffinR
|
82cb741d8b
|
Standardize EVENT_OBJECT to OBJECT_EVENT
|
2019-11-20 23:12:51 -05:00 |
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
GriffinR
|
033c6cea3b
|
Use YES/NO constants for MSGBOX_YESNO
|
2019-11-02 16:36:43 -05:00 |
|
GriffinR
|
b4a9298205
|
Merge branch 'master' into document-gyms2
|
2019-10-16 04:22:34 -04:00 |
|
GriffinR
|
1b41b8b7ca
|
Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms
|
2019-10-15 05:05:57 -04:00 |
|
GriffinR
|
d8f5e73bb7
|
Merge branch 'master' into doc-inc
|
2019-10-07 17:37:04 -04:00 |
|
GriffinR
|
7ba11b7a1b
|
Use VAR_FACING constants
|
2019-10-07 16:36:02 -05:00 |
|
GriffinR
|
d914c1d659
|
Document common movements
|
2019-10-06 13:55:30 -04:00 |
|
GriffinR
|
58b8d7c297
|
Merge branch 'master' into document-eventscripts
|
2019-09-17 18:01:20 -04:00 |
|
GriffinR
|
6ab49da811
|
Clean up field_specials documentation
|
2019-09-17 16:50:17 -05:00 |
|
GriffinR
|
945d3d3a27
|
Merge branch 'master' into document-eventscripts
|
2019-09-17 00:10:23 -04:00 |
|
GriffinR
|
06af24bce5
|
Use misc ScrCmd constants
|
2019-09-16 19:44:47 -05:00 |
|
GriffinR
|
ecf2097abb
|
initial event_scripts documentation
|
2019-08-14 23:38:42 -04:00 |
|
GriffinR
|
c2bf668fdd
|
rename town/city vars
|
2019-08-05 11:23:45 -04:00 |
|
garak
|
713f61de7c
|
continue labeling metatiles for scripts
|
2019-06-16 10:08:07 -05:00 |
|
Flametix
|
dbdb827e54
|
Fix typos (#713)
* fix typos
|
2019-05-18 21:56:19 -05:00 |
|
Fontbane
|
901a83d249
|
Fix some labels and include decorations.h
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
|
2019-04-22 17:23:59 -05:00 |
|
Fontbane
|
2c076f1f3e
|
Doc most OnTransitions
|
2019-04-22 17:23:59 -05:00 |
|
Phlosioneer
|
373d73eb3b
|
Fix last special var
|
2019-02-28 00:06:27 -05:00 |
|
Phlosioneer
|
4137dd7b0b
|
Identify unused, never read, and never written vars
|
2019-02-27 14:42:32 -05:00 |
|