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
ef03daf6d4
Fix Pokeblock script missing a releaseall
2024-05-19 12:52:04 +02:00
4649d1eddd
(234/665)
2022-08-15 14:27:41 -04:00
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
ac399ade4a
Document safari zone scripts
2019-10-20 09:53:21 -05:00
cea5696f23
Finish moving pokeruby vars
2019-02-22 04:18:43 -05:00
6e7bdb3ca4
Document misc field_specials things
2018-12-29 11:36:54 -06:00
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -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
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
0403f6eea9
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
2017-12-21 16:19:50 -06:00
173761a5a1
Port generic event script macros from pokeruby
2017-12-21 13:47:52 -06:00
4351676749
decompile more of pokeblock.s
2017-12-16 00:08:23 +01:00
f497c1508b
Split files from event_scripts.s
...
Also move maps/scripts to scripts/maps
2017-11-11 16:10:17 -06:00
Eduardo Quezada