Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/graphics
History
Eduardo Quezada 124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-02-17 23:40:08 -03:00
..
bag
Colorize bag select button
2023-05-10 00:33:43 -04:00
balls
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
battle_anims
Adds combined pledge move effects (#3336)
2023-11-21 16:23:22 +01:00
battle_frontier
Fix some frontier gfx, adjacent cleanup
2023-08-03 11:15:15 -04:00
battle_interface
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
2023-10-09 16:51:41 -03:00
battle_terrain
…
battle_transitions
Refactor mugshots (#4000)
2024-01-16 00:45:13 +01:00
berries
Purged the bKGD warning once and for all
2023-02-24 02:01:55 -03:00
berry_blender
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
berry_crush
Fix some colors in crusher.png
2023-01-12 19:04:49 -05:00
berry_fix
Correct berry fix graphics colors, more PLTT constant use (#1892)
2023-08-09 12:49:21 -04:00
birch_speech
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
cable_car
Use tilemap file for cable car pylons
2023-03-31 00:44:22 -04:00
cave_transition
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
contest
Fix results_screen/tiles.png colors
2023-01-15 12:04:29 -05:00
credits
Document some credits
2021-03-29 08:52:40 -04:00
decorations
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
diploma
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
dodrio_berry_picking
Fix swapped Dodrio Berry Picking palettes
2023-06-05 19:53:59 -04:00
door_anims
Colorize door animations that use multiple palettes
2023-01-11 13:31:17 -05:00
easy_chat
Delete unreferenced palette
2021-04-01 14:32:23 -04:00
evolution_scene
Document evolution scene
2021-02-03 17:55:37 -05:00
expansion_intro
Purged the bKGD warning once and for all
2023-02-24 02:01:55 -03:00
field_effects
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-01-17 18:11:35 -03:00
fonts
Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210
2023-12-10 13:27:09 -03:00
frontier_pass
Correct colors for frontier_pass
2023-01-13 02:25:23 -05:00
interface
Renamed Battle Move "Split" to the proper "Category" (#3774)
2023-12-20 10:08:26 +01:00
intro
Fix intro/scene_1 tiles
2023-01-14 00:48:58 -05:00
items
PLA aux item sprites (#4160)
2024-02-10 18:08:09 +01:00
link
Sync wireless improvements
2022-11-09 15:14:18 -05:00
mail
…
map_popup
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
misc
Merge branch 'master' into followers
2023-01-29 18:44:06 -05:00
naming_screen
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
object_events
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
2024-02-17 23:40:08 -03:00
party_menu
Fix party_menu/bg colors
2023-01-14 12:32:54 -05:00
picture_frame
Colorize picture_frame tiles
2023-01-13 15:30:57 -05:00
pokeblock
Fix some compressed tilemaps
2023-06-01 15:31:12 -04:00
pokedex
Fix HGSS Dex List Decapped Tileset (#4126)
2024-02-03 20:07:47 +01:00
pokemon
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
2024-02-17 23:40:08 -03:00
pokemon_jump
Document pokemon jump
2021-02-26 17:26:39 -05:00
pokemon_storage
Added Japan-only Walda PC icons (#3550)
2023-11-18 00:54:13 +01:00
pokenav
Move remaining region map graphics to region map folder
2022-02-22 18:43:23 -05:00
rayquaza_scene
Colorize rayquaza_scene/scene_1/clouds.png
2023-01-12 14:56:44 -05:00
reset_rtc_screen
Document reset_rtc_screen
2021-02-24 14:29:33 -05:00
rotating_gates
Color rotating gate pngs
2022-10-12 19:19:42 -04:00
roulette
Continue documenting roulette
2020-08-02 14:52:05 -04:00
shop
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
slot_machine
Fix slot_machine/menu colors
2023-01-14 16:34:14 -05:00
starter_choose
Colorize and combine birch_bag/birch_grass
2023-01-12 15:22:23 -05:00
summary_screen
Correct colors in summary_screen/tiles.png
2023-01-12 21:41:06 -05:00
text_window
…
title_screen
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
trade
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
trainer_card
Move FRLG trainer card gfx to own folder, fix tiles
2023-01-13 13:40:13 -05:00
trainer_hill
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
trainers
Generate trainer pic palettes from image
2022-09-05 16:09:45 -04:00
types
Update fairy.png
2022-08-27 22:42:05 -04:00
union_room_chat
Correct some union room chat documentation
2023-02-02 11:41:02 -05:00
unused
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
2023-11-12 14:28:11 +13:00
wallclock
Document wallclock data
2020-08-29 15:55:28 -04:00
weather
Fixed shadow palette tag. Fully removed permanent shadows.
2022-02-21 15:54:49 -05:00
wireless_status_screen
Sync wireless improvements
2022-11-09 15:14:18 -05:00
wonder_card
Fix leftover icon_shadow names
2021-10-17 03:22:55 -04:00
wonder_news
Start wonder card/news documenting
2021-10-14 13:24:20 -04:00