 Eduardo Quezada
|
acef8d208e
|
Merge branch '_pret/master' into pret_europe
|
2025-06-11 09:45:39 -04:00 |
|
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
|
Eduardo Quezada
|
d8b92f98cd
|
Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage
|
2025-01-12 17:40:40 -03:00 |
|
|
Eduardo Quezada
|
3f98c78297
|
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
|
2024-12-04 17:38:23 -05: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 |
|
|
dennisw100
|
310039bf8a
|
Seperated Text from script SlateportCity-SootopolisCity_House6
Seperated Text from script SlateportCity, SootopolisCity_Gym_1F - SootopolisCity_House6
|
2024-06-27 19:18:41 +02:00 |
|
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
c4f8f4d11a
|
Add STR_VAR_# ids to string buffer macros
|
2021-11-17 22:00:44 -05:00 |
|
|
GriffinR
|
d414787932
|
Some TV clean-up
|
2021-11-16 16:22:17 -05:00 |
|
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
|
cbt6
|
32aaf6912f
|
Rename movement scripts to use Faster over Fastest
|
2021-11-05 02:22:28 +08:00 |
|
|
GriffinR
|
44cd9eed6b
|
Add align directives to all marts
|
2021-08-04 11:50:33 -04:00 |
|
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
|
ExpoSeed
|
6a977bdbfc
|
Document second parameter of playbgm
|
2021-05-21 15:08:00 -05: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
|
6a470ddfda
|
Some script clean up, document secret base secrets show
|
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
|
ef8370566f
|
Document Contest scripts
|
2019-11-13 18:20:55 -06:00 |
|
|
GriffinR
|
a38bff8c17
|
Document Slateport scripts
|
2019-11-09 08:37:06 -06:00 |
|
|
GriffinR
|
033c6cea3b
|
Use YES/NO constants for MSGBOX_YESNO
|
2019-11-02 16:36:43 -05:00 |
|
|
GriffinR
|
d914c1d659
|
Document common movements
|
2019-10-06 13:55:30 -04:00 |
|
|
GriffinR
|
a180d2af49
|
Merge branch 'master' into document-eventscripts
|
2019-09-22 12:18:48 -04:00 |
|
|
GriffinR
|
275695c189
|
Document more script_menu, lilycove harbor
|
2019-09-19 17:27:34 -04:00 |
|
|
GriffinR
|
58b8d7c297
|
Merge branch 'master' into document-eventscripts
|
2019-09-17 18:01:20 -04:00 |
|
|
GriffinR
|
aac9658a8e
|
Document some field_specials data
|
2019-09-17 16:50:17 -05: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
|
c2bf668fdd
|
rename town/city vars
|
2019-08-05 11:23:45 -04:00 |
|
|
garak
|
daecd5ec40
|
name some trainer card related functions
|
2019-05-16 17:10:13 -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
|
6cf06d5f95
|
Doc some event scripts
Doc decoration shops
Revert "Doc decoration shops"
This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.
Document through comments
Un-revert decor documentation
|
2019-04-22 17:23:59 -05:00 |
|
|
Fontbane
|
2c076f1f3e
|
Doc most OnTransitions
|
2019-04-22 17:23:59 -05:00 |
|
|
Marcus Huderle
|
cf917a8733
|
Decompile berry_powder.c
|
2019-03-24 14:50:16 -05:00 |
|
|
Phlosioneer
|
8e1537fb57
|
Document map name popup flag
|
2019-03-10 09:23:58 -05:00 |
|
|
Phlosioneer
|
e77e7844ea
|
Name several vars, document some related events
|
2019-02-27 20:25:09 -05:00 |
|
|
huderlem
|
84573f1774
|
Merge pull request #574 from Phlosioneer/event-vars
Event vars
|
2019-02-25 08:02:28 -06:00 |
|
|
Phlosioneer
|
8816aa527d
|
Update map script files
|
2019-02-25 08:01:22 -06:00 |
|
|
Phlosioneer
|
4e5fae0086
|
Merge branch 'master' into event-vars
|
2019-02-25 02:24:20 -05:00 |
|
|
Phlosioneer
|
0de831fd29
|
Name some common single-entry movements
|
2019-02-24 10:10:18 -06:00 |
|