 Eduardo Quezada
|
d8b92f98cd
|
Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage
|
2025-01-12 17:40:40 -03: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 |
|
|
Bassoonian
|
e5ac2fe0b1
|
Clean up pokemon/ball/dex mentions in comments
|
2023-12-12 19:02:36 +01:00 |
|
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
|
GriffinR
|
1107ff954d
|
Clean up shop.c
|
2022-09-22 15:08:17 -04:00 |
|
|
Eduardo Quezada
|
27f2b85efe
|
Incorporated Italian changes, enough to compile (still needs to sync a couple of them)
|
2022-08-12 00:28:16 -04:00 |
|
|
Eduardo Quezada D'Ottone
|
f3013d8ee9
|
Standarized Solarbeam into Solar Beam
|
2021-11-01 18:36:35 -03:00 |
|
|
GriffinR
|
28a8fe191a
|
Document item menu
|
2021-08-10 22:13:02 -04:00 |
|
|
GriffinR
|
1cac608dbe
|
Document mail
|
2021-02-24 11:03:39 -05:00 |
|
|
GriffinR
|
752982552e
|
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
|
2021-01-19 13:39:18 -05:00 |
|
|
GriffinR
|
cf9f8d01c5
|
Add misc item data constants
|
2021-01-19 05:49:20 -05:00 |
|
|
GriffinR
|
66bd1e6d3f
|
Use constants for item digits
|
2020-09-25 11:18:52 -04:00 |
|
|
GriffinR
|
e129d04b93
|
Merge branch 'master' into doc-overworld
|
2020-07-15 00:40:47 -04:00 |
|
|
Eduardo Quezada
|
b31efcd6e3
|
Renamed constant,
|
2020-07-12 01:49:32 -04:00 |
|
|
GriffinR
|
abdf7cbf02
|
Label fishing effect functions
|
2020-06-29 16:53:38 -04:00 |
|
|
Eduardo Quezada
|
7244b80fc6
|
Created constant for easier Ball Expansion.
|
2020-06-21 02:36:46 -04:00 |
|
|
GriffinR
|
eaf508ba5e
|
Resolve missing parens errors
|
2020-02-12 00:44:09 -05:00 |
|
|
GriffinR
|
9a6c2c25d0
|
Add some capacity constants
|
2020-01-26 09:42:55 -06:00 |
|
|
GriffinR
|
525ec2025d
|
Document Routes 111-118
|
2019-11-14 17:41:01 -06:00 |
|
|
GriffinR
|
a3ee92a4e7
|
Document some frontier util funcs
|
2019-11-10 16:37:14 -06:00 |
|
|
GriffinR
|
fbc3eee1f2
|
Document Fossil Maniac and Berry Master route houses
|
2019-11-06 17:01:23 -06:00 |
|
|
DizzyEggg
|
b4e1375bb6
|
Document pokemon item effects
|
2019-04-16 11:23:09 -05:00 |
|
|
DizzyEggg
|
1c48e58574
|
small fixes
|
2018-07-07 14:24:19 +02:00 |
|
|
DizzyEggg
|
25c669e36b
|
decompile item
|
2018-04-29 13:36:26 +02:00 |
|
|
DizzyEggg
|
1a1bad3129
|
decompile pokemon_item_effect
|
2018-02-09 18:46:00 +01:00 |
|
|
DizzyEggg
|
4b7d778a5c
|
move mon data fix conflicts
|
2018-02-07 20:17:55 +01:00 |
|
|
DizzyEggg
|
a61dc815b0
|
bag arrow to item count plus 1
|
2018-02-07 19:51:41 +01:00 |
|
|
DizzyEggg
|
ae8e89a10d
|
move some pokemon data to c
|
2018-02-05 17:39:26 +01:00 |
|
|
DizzyEggg
|
e13eacda39
|
decompile item icon
|
2018-02-02 16:06:20 +01:00 |
|
|
camthesaxman
|
caa13f8777
|
convert some constants to C headers
|
2017-12-05 11:55:48 -06:00 |
|