 Eduardo Quezada
|
6546971313
|
Merge branch '_pret/master' into pret_europe
|
2025-07-27 11:15:48 -04:00 |
|
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04:00 |
|
|
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
|
9b1935d78a
|
Merge branch '_pret/master' into pret_multilanguage
|
2025-02-15 12:20:16 -03:00 |
|
|
Eduardo Quezada
|
cbf5d137aa
|
ALMOST THERE
|
2025-02-14 23:25:52 -03:00 |
|
|
GriffinR
|
2f67b17571
|
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
|
2025-01-17 17:54:38 +00:00 |
|
|
Eduardo Quezada
|
720b2daecc
|
Improve Pyramid location documentaion
|
2024-12-05 18:25:27 -03:00 |
|
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
|
GriffinR
|
bf17d54b52
|
Finish adding local IDs to map.json files
|
2024-10-12 23:32:28 -04:00 |
|
|
GriffinR
|
9f31b0fe90
|
Generate local IDs from map.json files
|
2024-10-12 03:04:24 -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 |
|
|
Jaizu
|
ef03daf6d4
|
Fix Pokeblock script missing a releaseall
|
2024-05-19 12:52:04 +02:00 |
|
|
GriffinR
|
a5c2ac5e49
|
Use BUGFIX in assembly files
|
2023-10-20 09:10:49 -04:00 |
|
|
GriffinR
|
b248791f47
|
Merge pull request #1904 from GriffinRichards/temp-alias
Add temp flag and var aliases
|
2023-08-11 15:45:00 -04:00 |
|
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
|
GriffinR
|
6d4dadd7b5
|
Add temp flag aliases
|
2023-08-03 15:55:06 -04:00 |
|
|
GriffinR
|
0c380862d6
|
Document the trendy saying word group
|
2023-03-13 15:58:40 -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
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
|
Eduardo Quezada
|
f87d86945f
|
(256/665)
|
2022-08-17 08:48:38 -04:00 |
|
|
Eduardo Quezada
|
d45fda5666
|
(241/665)
|
2022-08-16 14:30:29 -04:00 |
|
|
Eduardo Quezada
|
63e4a8adcd
|
Fixed instances of .string being used with spaces instead of tabs
|
2022-08-15 14:32:01 -04:00 |
|
|
Eduardo Quezada
|
4649d1eddd
|
(234/665)
|
2022-08-15 14:27:41 -04:00 |
|
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
|
cbt6
|
f826a5a82d
|
Use constants for PC locations
|
2022-02-23 15:07:22 +08:00 |
|
|
GriffinR
|
a7e6045d71
|
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
|
2022-01-19 22:17:37 -05:00 |
|
|
GriffinR
|
110fbc559c
|
Make item optional for givemon and setwildbattle
|
2022-01-11 02:08:14 -05:00 |
|
|
GriffinR
|
8b920691e6
|
Fix FLAG_DECORATION_0 name
|
2022-01-09 01:31:42 -05:00 |
|
|
GriffinR
|
23f5c9fd5c
|
Clean up pokedex_area_screen
|
2021-12-31 00:16:56 -05:00 |
|
|
GriffinR
|
42a83ee50e
|
Use STR_VAR names for apprentice_buff and frontier_gettrainername
|
2021-11-18 23:20:05 -05:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
6c6487dd7a
|
Missing spaces to tabs in scripts files
|
2021-11-18 21:02:22 -05:00 |
|
|
GriffinR
|
c89dfd9f56
|
Finish updating macro comments
|
2021-11-18 01:47:58 -05:00 |
|
|
GriffinR
|
c4f8f4d11a
|
Add STR_VAR_# ids to string buffer macros
|
2021-11-17 22:00:44 -05:00 |
|
|
GriffinR
|
c940b67716
|
Continue macro comment updating
|
2021-11-17 17:45:59 -05:00 |
|
|
GriffinR
|
61aa9c3ba9
|
More updating event macro comments
|
2021-11-16 17:46:34 -05:00 |
|
|
GriffinR
|
d414787932
|
Some TV clean-up
|
2021-11-16 16:22:17 -05:00 |
|
|
GriffinR
|
5d9c31a610
|
Label slot machine ids, fix GetPriceReduction
|
2021-11-16 15:43:52 -05:00 |
|
|
GriffinR
|
63c5905914
|
Continue updating event macro comments
|
2021-11-16 13:10:23 -05:00 |
|
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
|
GriffinR
|
65d3b58374
|
Add PARTY_NOTHING_CHOSEN
|
2021-11-15 10:57:06 -05:00 |
|
|
GriffinR
|
f85de6eca5
|
Start event macro comment updates
|
2021-11-15 10:54:57 -05:00 |
|
|
GriffinR
|
b14fe9dce3
|
Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
|
2021-11-13 15:54:40 -05:00 |
|
|
GriffinR
|
54b254a829
|
Add CRY_MODE constants
|
2021-11-07 13:33:05 -05:00 |
|
|
cbt6
|
32aaf6912f
|
Rename movement scripts to use Faster over Fastest
|
2021-11-05 02:22:28 +08:00 |
|