Hedara 5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge ...

Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp

2025-11-01 15:13:16 +01:00

..

ability_pop_up.pal

…

ability_pop_up.png

battle_interface: overhaul ability pop up (#7227)

2025-07-10 19:09:52 +02:00

alpha_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

ball_caught_indicator.png

…

ball_display.png

…

ball_status_bar.png

…

bug_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

burst_trigger.png

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00

dark_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

dragon_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

dynamax_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

dynamax_trigger.png

…

electric_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

enemy_mon_shadow.png

…

enemy_mon_shadows_sized.png

Add in-battle shadows underneath all enemy battlers (#5178)

2024-09-10 21:27:49 +02:00

expbar.png

…

fairy_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

fighting_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

fire_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

flying_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

ghost_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

grass_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

ground_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

healthbox_doubles_frameend_bar.png

…

healthbox_doubles_frameend.png

…

healthbox_doubles_opponent.png

Add spritesheet rules for healthbox graphics (#2180)

2025-10-19 18:32:19 +01:00

healthbox_doubles_player.png

Add spritesheet rules for healthbox graphics (#2180)

2025-10-19 18:32:19 +01:00

healthbox_safari.png

Add spritesheet rules for healthbox graphics (#2180)

2025-10-19 18:32:19 +01:00

healthbox_singles_opponent.png

Add spritesheet rules for healthbox graphics (#2180)

2025-10-19 18:32:19 +01:00

healthbox_singles_player.png

Add spritesheet rules for healthbox graphics (#2180)

2025-10-19 18:32:19 +01:00

hpbar_anim_unused.png

…

hpbar_anim.png

…

hpbar_unused.png

…

hpbar.png

…

ice_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

last_used_ball_l_cycle.png

…

last_used_ball_l.png

…

last_used_ball_r_cycle.png

…

last_used_ball_r.png

…

level_up_banner.png

…

mega_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

mega_trigger.pal

…

mega_trigger.png

…

misc_frameend.png

…

misc_indicator.pal

…

misc.png

…

move_info_window_l.png

Added missing in-battle "Move Info" button prompt (#6155)

2025-02-01 18:47:36 +01:00

move_info_window_r.png

Added missing in-battle "Move Info" button prompt (#6155)

2025-02-01 18:47:36 +01:00

normal_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

numbers1.png

…

numbers2.png

…

omega_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

poison_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

psychic_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

rock_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

status2.png

Change Frostbite abbreviation from FSB to FRB (#4355)

2024-04-10 09:16:32 +02:00

status3.png

Change Frostbite abbreviation from FSB to FRB (#4355)

2024-04-10 09:16:32 +02:00

status4.png

Change Frostbite abbreviation from FSB to FRB (#4355)

2024-04-10 09:16:32 +02:00

status.png

Change Frostbite abbreviation from FSB to FRB (#4355)

2024-04-10 09:16:32 +02:00

steel_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

stellar_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

tera_indicator.pal

Terastallization (#4110)

2024-04-24 11:17:46 +02:00

tera_trigger.png

Terastallization (#4110)

2024-04-24 11:17:46 +02:00

text_pp.pal

…

text.pal

…

textbox_0.pal

…

textbox_1.pal

…

textbox_map.bin

…

textbox.png

…

unused_status_summary.png

…

unused_window2.png

…

unused_window2bar.png

…

unused_window3.png

…

unused_window4.png

…

unused_window.png

…

water_indicator.png

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

z_move_trigger.png

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00