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
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
dennisw100
e9c3998d38
Seperated Text from script MauvilleCity_PokemonCenter_2F-MtChimney
...
Seperated Text from script MauvilleCity_PokemonCenter_2F, MeteorFalls, MirageTower, MossdeepCity, MtChimney
2024-06-25 17:52:56 +02:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number ( #1732 )
2023-08-09 10:51:01 -04:00
GriffinR
b656565af0
Standardize RS mossdeep gym metatile labels
2023-02-14 11:42:13 -05: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
06351bf63c
Remove address comments
2021-07-20 15:18:31 -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
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
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
5f1fcdd023
Document aqua/magma area scripts
2019-11-01 17:22:45 -05:00
GriffinR
0f15264595
Document rotating_tile_puzzle
2019-10-16 04:09:30 -04:00
GriffinR
90a05cf824
Finish Mossdeep Gym doc, beging documenting rotating tile puzzle
2019-10-15 05:06:13 -04:00
GriffinR
1b41b8b7ca
Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms
2019-10-15 05:05:57 -04: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
Phlosioneer
648fc3d4f3
Name more unknown vars
2019-02-27 15:18:56 -05:00
Phlosioneer
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
Phlosioneer
4582fd1545
Name a ton of commonly used event scripts
2019-02-24 10:10:18 -06:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Melody
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
Melody
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
Melody
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
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
