ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/graphics
History
Eduardo Quezada 0caf79f702 Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 
# Conflicts:
#	graphics/pokemon/cherrim/anim_front.png
#	graphics/pokemon/scyther/anim_front.png
#	graphics/pokemon/scyther/front.png
#	graphics/pokemon/shinx/anim_front.png
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
2022-09-13 20:44:49 -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
Tyding graphics - Acupressure
2022-09-09 00:25:43 +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
Fix file permissions.
2018-01-19 15:06:49 -05:00
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
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
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
Fix file permissions.
2018-01-19 15:06:49 -05: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
Document cable car
2020-08-28 03:54:04 -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
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 branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -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
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
mail
Fix file permissions.
2018-01-19 15:06:49 -05:00
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 remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
2022-09-13 20:44:49 -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
Finish match call menu doc
2021-11-15 01:20:03 -05:00
rayquaza_scene
Clean up rayquaza scene documentation
2020-08-27 16:04:11 -04:00
reset_rtc_screen
Document reset_rtc_screen
2021-02-24 14:29:33 -05:00
rotating_gates
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03: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
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
spinda_spots
move some pokemon data to c
2018-02-05 17:39:26 +01:00
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
Extract data from text window
2018-01-20 00:49:21 -06:00
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
Rename graphics files for COOLTRAINER to match define
2020-11-26 11:05:02 -08:00
types
Update fairy.png
2022-08-27 22:42:05 -04:00
union_room_chat
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
unused
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
wallclock
Document wallclock data
2020-08-29 15:55:28 -04:00
weather
Document more battle anim effects
2021-02-28 09:54:55 -06: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