DizzyEggg
b394c79996
Add Spanish text to data maps
2025-01-13 12:10:39 -03: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
c7295fa8e2
315/665
2022-12-30 09:50:31 -03:00
GriffinR
cc182bf05e
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -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
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
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
Marcus Huderle
4fd848e689
Document early route scripts
2019-10-22 16:47:19 -05:00
Marcus Huderle
cefc31dd1e
Document Petalburg City scripts
2019-10-19 15:05:15 -05:00
GriffinR
9aed405851
Document a few field specials
2019-09-30 01:42:52 -04:00
Fontbane
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
Marcus Huderle
19b76bffda
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
2019-02-16 16:56:41 -06:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
Marcus Huderle
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -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
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -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
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
garak
624a7552b6
use event flags in event scripts
2018-10-17 09:05:22 -04:00
Deokishisu
bf2063cc1a
Update All EVENT_OBJ_GFX References
...
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
Diegoisawesome
e92e2cb0aa
Merge branch 'master' of github.com:pret/pokeemerald
2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1
Clean up files and add entries to charmap
2018-07-24 21:18:23 -07:00
Marcus Huderle
94650495c6
Use map battle scene constants in map headers
2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72
Use map type constants in map headers
2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd
Use weather constants in map headers
2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a
Use region map section constants in map headers
2018-07-12 21:47:04 -05:00
Marcus Huderle
7d375972ba
Sync bg_event macros with pokeruby
2018-07-11 11:12:26 -05:00
Marcus Huderle
8ffd7a70fc
Use movement type constants in object_event macros
2018-07-10 18:04:51 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
89d35e82a2
Move 'map attributes' into 'layouts'
2018-06-20 19:54:21 -05:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
sceptillion
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
Diegoisawesome
f61810a8f9
Dump maps
2017-11-09 19:21:31 -06:00
