 Eduardo Quezada
|
acef8d208e
|
Merge branch '_pret/master' into pret_europe
|
2025-06-11 09:45:39 -04:00 |
|
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
|
GriffinR
|
cb66ea6653
|
Continue adding local IDs to map.json files
|
2024-10-12 12:24:57 -04:00 |
|
|
Eduardo Quezada
|
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 |
|
|
Eduardo Quezada
|
e26a0629ae
|
English as proper default
|
2024-07-05 07:31:42 -04:00 |
|
|
Eduardo Quezada
|
68fca4ae37
|
Duplicated english script text files to use as a base for spanish integration
|
2024-06-28 08:45:03 -04:00 |
|
|
Eduardo Quezada
|
a6bd35ceab
|
Review changes
|
2023-03-05 17:17:39 -03:00 |
|
|
Eduardo Quezada
|
d330ca051a
|
Document music usage to make it easier to search for a specific track
|
2023-02-23 11:44:23 -03:00 |
|
|
Eduardo Quezada
|
56496b15e5
|
333/665
|
2022-12-30 11:46:16 -03:00 |
|
|
GriffinR
|
5515e328b2
|
Clean up lock/unlock anim movement
|
2022-08-12 21:18:10 -04: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
|
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 |
|
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
|
GriffinR
|
0f538102d9
|
Add local id constants for C
|
2021-07-05 13:54:43 -04:00 |
|
|
GriffinR
|
10886a586b
|
Clean up mirage tower
|
2021-07-01 23:46:15 -04:00 |
|
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
|
GriffinR
|
e92cc7752b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
|
2020-01-13 20:41:57 -05: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
|
525ec2025d
|
Document Routes 111-118
|
2019-11-14 17:41:01 -06:00 |
|
|
GriffinR
|
fbc3eee1f2
|
Document Fossil Maniac and Berry Master route houses
|
2019-11-06 17:01:23 -06:00 |
|
|
GriffinR
|
033c6cea3b
|
Use YES/NO constants for MSGBOX_YESNO
|
2019-11-02 16:36:43 -05:00 |
|
|
GriffinR
|
dd01942c4f
|
Document aqua/magma hideout scripts
|
2019-11-01 17:22:45 -05:00 |
|
|
GriffinR
|
f35a3f73b2
|
Document gabby_and_ty.inc
|
2019-10-26 09:32:04 -05:00 |
|
|
GriffinR
|
d914c1d659
|
Document common movements
|
2019-10-06 13:55:30 -04: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
|
191f74525d
|
name unused route state vars
|
2019-08-05 11:50:29 -04:00 |
|
|
garak
|
a43dcd26bd
|
finish labeling metatiles
|
2019-06-16 10:08:07 -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
|
782979f1fc
|
Finish documenting trainer hill
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
|
2019-02-27 22:16:01 -05:00 |
|
|
Phlosioneer
|
e77e7844ea
|
Name several vars, document some related events
|
2019-02-27 20:25:09 -05:00 |
|
|
Phlosioneer
|
8816aa527d
|
Update map script files
|
2019-02-25 08:01:22 -06:00 |
|
|
Phlosioneer
|
0de831fd29
|
Name some common single-entry movements
|
2019-02-24 10:10:18 -06:00 |
|
|
Phlosioneer
|
4582fd1545
|
Name a ton of commonly used event scripts
|
2019-02-24 10:10:18 -06:00 |
|
|
Diegoisawesome
|
449fb25f23
|
Clear up misnamed time-based flags and functions
|
2019-02-12 00:40:34 -06:00 |
|
|
Marcus Huderle
|
29d6221935
|
Convert map data to JSON
|
2019-01-31 15:51:20 -06:00 |
|
|
Tetrable
|
50aa222aff
|
Corrected typos
|
2019-01-03 01:54:55 +00:00 |
|
|
Tetrable
|
a3ebca4d81
|
Fix merge conflicts
|
2019-01-02 21:25:14 +00:00 |
|
|
Tetrable
|
1e3da62d24
|
Finish off labelling flags
|
2019-01-02 21:12:43 +00:00 |
|
|
Melody
|
6d556f8cf7
|
improve checkplayergender calls
clean up constant definitions
make tweaks from review
|
2018-12-28 08:22:21 -06:00 |
|
|
Marcus Huderle
|
dcbc8db6a3
|
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
|
2018-12-25 11:46:35 -06:00 |
|
|
Melody
|
c7971ecb20
|
improve event script object calls
|
2018-12-25 11:20:33 -06:00 |
|
|
Diegoisawesome
|
c2ca57e8ac
|
Merge pull request #477 from melthelesbian/object_script_commands
use player constant in obj script commands
|
2018-12-24 16:09:42 -06:00 |
|