 Eduardo Quezada
|
cbf5d137aa
|
ALMOST THERE
|
2025-02-14 23:25:52 -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
|
96865f66af
|
Updated term to modernFatefulEncounter
|
2023-02-11 22:36:42 -03:00 |
|
|
Eduardo Quezada
|
6da5e0a280
|
Rename eventLegal to fatefulEncounter
|
2023-02-11 17:13:53 -03:00 |
|
|
Eduardo Quezada
|
f87d86945f
|
(256/665)
|
2022-08-17 08:48:38 -04:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
ece7ef3410
|
Correct usage of MysteryEvent to MysteryGift
|
2021-10-17 03:00:48 -04:00 |
|