63 Commits

Author SHA1 Message Date
RavePossum
27db57f854
fallback on default BW popup theme to reduce potential for error (#5392) 2024-09-18 16:57:13 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder (#4805) 2024-06-19 13:42:01 +02:00
Eduardo Quezada
911af213c1 Merge remote-tracking branch 'ravepossum/bsbob_map_popups' into _RHH/pr/upcoming/bwPopupMergeFix
# Conflicts:
#	include/field_weather.h
#	include/rtc.h
#	include/strings.h
#	src/field_weather.c
#	src/map_name_popup.c
#	src/menu.c
#	src/rtc.c
#	src/strings.c
2024-06-09 16:34:11 -04:00
RavePossum
afb66b4d2b preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens 2024-05-07 23:58:29 -04:00
RavePossum
a7701dd61b fix BW theme table names 2024-04-15 17:02:08 -04:00
RavePossum
46f11caa27 cleanup for bw theme 2024-04-15 16:56:14 -04:00
RavePossum
8499f6878d remove unnecessary ubfix check 2024-04-15 16:56:14 -04:00
RavePossum
7e4daea0ed rip out preprocs in favor of inlines, fix typo/wording 2024-04-15 16:56:14 -04:00
RavePossum
406f87c534 first stab at making configable BW map pop-ups in expansion 2024-04-15 16:56:14 -04:00
RavePossum
b4537e20ca add configuration to remove the clock entirely 2024-04-15 09:41:42 -04:00
RavePossum
5530eb7501 merge with pret 2024-04-06 11:17:00 -04:00
Eduardo Quezada
ec83b11354 Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210
# Conflicts:
#	gflib/malloc.c
2024-02-10 18:05:20 -03:00
DizzyEggg
e87a69a5e7 Fix HideMapNamePopUpWindow possible overflow 2024-02-02 22:31:20 +01:00
ravepossum
f67c012532 fix dumb rtc mistake, disable blending when the weather conflicts with the effect 2024-01-24 16:40:33 -05:00
ravepossum
6d2a869d7f add better support for theming, rename a few things to match vanilla 2024-01-15 10:42:07 -05:00
ravepossum
499354ddc5 fix performance issues, add config for alpha blend and 24 hour time, fix time display bugs, reverse readme changes 2024-01-15 01:51:44 -05:00
ravepossum
bef2fca9d6 inital port of BSBob's map pop-ups 2024-01-10 00:39:32 -05:00
Eduardo Quezada
7ae37ab79c Merge branch 'pret_master' into RHH/upcoming
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/event_scripts.s
2023-10-27 11:03:37 -03:00
GriffinR
f01a6afc98
Merge branch 'master' into misc-tasks 2023-10-07 17:25:20 -04:00
Eduardo Quezada
a6940c9e03 Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
# Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
2023-10-02 17:17:41 -03:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
GriffinR
5beec06d9d Document Task_MapNamePopUpWindow 2023-08-19 17:20:53 -04:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
2022-08-22 20:30:45 -04:00
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01: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
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
GriffinR
694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR
50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
LOuroboros
ac599589ec gRegionMapSectionId_To_PopUpThemeIdMapping -> sRegionMapSectionId_To_PopUpThemeIdMapping 2021-09-23 23:36:37 -03:00
GriffinR
0dc7ff8994 Minor misc field doc 2021-04-06 17:17:41 -04:00
GriffinR
2be0c52c17 Remaining labels in map_name_popup 2021-03-22 15:30:19 -05:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
GriffinR
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
Phlosioneer
8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
Phlosioneer
44e92ce259 Give window drawing functions better names 2019-02-22 01:40:11 -05:00
Phlosioneer
d979ac3bf3 Document main_menu state machine, name window constants
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
2019-02-11 00:34:50 -05:00
Marcus Huderle
3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
Diegoisawesome
f3af20d3cf
Merge pull request #370 from DizzyEggg/battle_tower
Decompile Battle Tower
2018-10-30 11:18:24 -05:00