Commit Graph

365 Commits

Author SHA1 Message Date
Eduardo Quezada 6546971313 Merge branch '_pret/master' into pret_europe 2025-07-27 11:15:48 -04:00
GriffinR 6f8a1bbdb8 Add pack/unpack for data masks (#2163) 2025-07-23 09:28:34 +01:00
Eduardo Quezada acef8d208e Merge branch '_pret/master' into pret_europe 2025-06-11 09:45:39 -04:00
GriffinR 0c32d840fa Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
Kurausukun e1e7d1cf35 Fixes for C23 Support (#2138)
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
2025-05-19 09:11:59 +01:00
Bassoonian 16357c7e29 Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
GriffinR 929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Alex baf5be2035 Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
GriffinR 04eb22f4ea Fix offset for towerInterview in BattleFrontier 2025-03-15 17:45:42 -04:00
Eduardo Quezada 9b1935d78a Merge branch '_pret/master' into pret_multilanguage 2025-02-15 12:20:16 -03:00
Eduardo Quezada e27071dcd6 Almost all non-graphics data done 2025-01-19 13:57:35 -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 d8b92f98cd Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage 2025-01-12 17:40:40 -03:00
GriffinR 9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
Bassoonian c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02: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 23e0fec9ad Initial Spanish (can't compile yet) 2024-07-01 23:07:26 -04:00
Eduardo Quezada 72b8c2f60b Decorations + general language string macro 2024-06-24 09:48:12 -04:00
DizzyEggg 132ca1be14 Change Safe Div to explicitly check b != 0 2024-02-02 22:57:02 +01:00
Bassoonian e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
GriffinR bdc0ea1037 Add MOD to match mod with powers of 2 2023-08-16 16:44:45 -04:00
Martin Griffin 31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin b53cca1a06 Declarations for 2- and 3-argument GetMonData (#1756)
* Type-safe GetMonData/GetBoxMonData

* Comments
2023-07-24 09:57:37 -04:00
gruxor 5fd881a1b6 Remove unused macro to fix syntax highlights 2023-07-12 14:44:23 -04:00
GriffinR 6be9a79b8c Merge pull request #1871 from GriffinRichards/doc-trendy-sayings
Document the trendy sayings word group
2023-03-24 08:05:51 -04:00
Eduardo Quezada 2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
GriffinR 36c89d345c Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
Eduardo Quezada 66d1c9bc65 Documenting padding in structs used by Saveblocks 2022-12-17 22:55:43 -03:00
GriffinR 483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
Eduardo Quezada 65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada 13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada 7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
GriffinR 7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
Martin Griffin 1cc59acca9 Static assertion for size of save structs 2022-05-25 19:48:42 +01:00
GriffinR 62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR 3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR 4024b3f1b3 Merge pull request #1590 from GriffinRichards/dex-enum
Convert pokedex defines to enums
2022-01-10 14:56:26 -05:00
GriffinR 5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
GriffinR aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -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
GriffinR 1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
GriffinR d6571f2355 Merge pull request #1525 from GriffinRichards/doc-recmix
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
GriffinR 6dc3c9864c Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR ab80264921 Merge pull request #1519 from GriffinRichards/doc-mgift
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR 7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
Jademalo 62436d9f67 IDE support formatting and consistency 2021-10-23 10:10:00 +01:00
Jademalo eb860a368e Improve IDE support 2021-10-22 04:30:33 +01:00