acef8d208e
Merge branch '_pret/master' into pret_europe
2025-06-11 09:45:39 -04:00
f61c0099b9
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
cb66ea6653
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
70bad62f9b
Merge remote-tracking branch '_pret_origin/master' into multilanguage/sync
...
# Conflicts:
# Makefile
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/maps/OldaleTown/scripts.inc
# data/maps/Route110_TrickHousePuzzle7/scripts.inc
# data/maps/Route110_TrickHousePuzzle8/scripts.inc
# data/scripts/roulette.inc
# data/tilesets/graphics.inc
# data/tilesets/metatiles.inc
# graphics/trainer_card/0star_fr.pal
# graphics/trainer_card/four_stars_fr.pal
# graphics/trainer_card/frlg/0star.pal
# graphics/trainer_card/frlg/blue.pal
# graphics/trainer_card/frlg/bronze.pal
# graphics/trainer_card/frlg/card.png
# graphics/trainer_card/frlg/four_stars.pal
# graphics/trainer_card/frlg/gold.pal
# graphics/trainer_card/frlg/green.pal
# graphics/trainer_card/frlg/one_star.pal
# graphics/trainer_card/frlg/silver.pal
# graphics/trainer_card/frlg/three_stars.pal
# graphics/trainer_card/frlg/two_stars.pal
# graphics/trainer_card/one_star_fr.pal
# graphics/trainer_card/three_stars_fr.pal
# graphics/trainer_card/two_stars_fr.pal
# src/battle_message.c
# src/battle_tent.c
# src/berry_blender.c
# src/berry_tag_screen.c
# src/data/bard_music/length_table.h
# src/data/credits.h
# src/data/items.h
# src/data/pokemon/pokedex_orders.h
# src/data/region_map/region_map_entries.h
# src/easy_chat.c
# src/field_region_map.c
# src/graphics.c
# src/item.c
# src/item_menu.c
# src/menu_specialized.c
# src/pokedex.c
# src/pokedex_cry_screen.c
# src/pokemon_jump.c
# src/pokenav_conditions_search_results.c
# src/pokenav_match_call_gfx.c
# src/pokenav_ribbons_list.c
# src/shop.c
# src/trade.c
# src/trainer_card.c
# src/wireless_communication_status_screen.c
2024-07-05 18:38:49 -04:00
e26a0629ae
English as proper default
2024-07-05 07:31:42 -04:00
68fca4ae37
Duplicated english script text files to use as a base for spanish integration
2024-06-28 08:45:03 -04:00
912a80e27a
Reference TMs and HMs by move instead of number ( #1732 )
2023-08-09 10:51:01 -04:00
c264fdf45e
382/665
2023-01-09 00:49:12 -03:00
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
6a977bdbfc
Document second parameter of playbgm
2021-05-21 15:08:00 -05:00
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
f2e7b1507e
Port some macro/script fixes from pokefirered
2020-01-11 14:12:31 -05:00
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
00f22b6400
Document remaining routes (104, 119-123)
2019-11-14 17:51:02 -06:00
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
2368f57669
Merge branch 'master' into doc-inc
2019-10-07 17:37:35 -04:00
bcf74df27f
Use B_OUTCOME constants for GetBattleOutcome
2019-10-07 16:36:47 -05:00
d914c1d659
Document common movements
2019-10-06 13:55:30 -04:00
1d703e786b
move some data out of event_scripts, use game stat constants
2019-09-05 14:56:34 -04:00
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
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -05:00
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
...
Event vars
2019-02-25 08:02:28 -06:00
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
4e5fae0086
Merge branch 'master' into event-vars
2019-02-25 02:24:20 -05:00
04db99bb0a
More misc event names
2019-02-24 10:10:18 -06:00
0de831fd29
Name some common single-entry movements
2019-02-24 10:10:18 -06:00
4582fd1545
Name a ton of commonly used event scripts
2019-02-24 10:10:18 -06:00
e12a7790cf
Start porting pokeruby vars to pokeemerald
2019-02-22 04:01:38 -05:00
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
10725def8e
trainerbattle_normal → trainerbattle_single
...
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -05:00
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
90896e38c9
Begin porting/decompiling field_specials
2018-08-08 01:37:12 -07:00
156fb472e1
Clean up files and add entries to charmap
2018-07-24 21:18:23 -07:00
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Eduardo Quezada