ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 16:12:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/graphics
History
Eduardo Quezada e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
..
bag
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03: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
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
battle_frontier
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
battle_interface
tweak z indicator position relative to healthbox
2022-07-18 09:44:04 -04:00
battle_terrain
…
battle_transitions
Ignore num_tiles if it would truncate non-transparent tiles (#1729)
2022-08-18 23:07:25 -04:00
berries
Add missing berry data
2021-10-26 14:42:06 +13:00
berry_blender
…
berry_crush
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
berry_fix
…
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
…
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
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03: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
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
door_anims
Some field door comments
2022-05-18 13:03:02 -04: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
field_effects
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
fonts
Misc text clean-up
2021-11-14 22:21:17 -05:00
frontier_pass
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
interface
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
2022-11-24 15:36:00 -03:00
intro
Standardize intro gfx names
2021-03-29 20:48:48 -04:00
items
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:21:40 -03: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 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
naming_screen
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
object_events
Add missing berry data
2021-10-26 14:42:06 +13:00
party_menu
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
picture_frame
Ignore num_tiles if it would truncate non-transparent tiles (#1729)
2022-08-18 23:07:25 -04:00
pokeblock
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
pokedex
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
pokemon
Merge pull request #1589 from cynderquil/pokemon_expansion
2022-11-20 20:47:07 -03:00
pokemon_jump
Document pokemon jump
2021-02-26 17:26:39 -05:00
pokemon_storage
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
pokenav
Move remaining region map graphics to region map folder
2022-02-22 18:43:23 -05:00
rayquaza_scene
…
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
…
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
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
spinda_spots
…
starter_choose
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
summary_screen
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03: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
Remaining labels in trainer_card
2021-03-22 15:30:19 -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
…
unused
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
wallclock
…
weather
Document more battle anim effects
2021-02-28 09:54:55 -06: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