ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/graphics
History
Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
2022-07-15 12:58:46 -04:00
..
bag
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
balls
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
battle_anims
add potlergeist animation
2022-05-23 08:53:08 -04:00
battle_frontier
Fix some battle dome graphics names
2022-01-11 10:04:47 -05:00
battle_interface
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
battle_terrain
Fix file permissions.
2018-01-19 15:06:49 -05:00
battle_transitions
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
berries
reorganize berry graphics files
2018-02-06 11:51:43 -06:00
berry_blender
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
berry_crush
Fix berry crusher graphics name
2022-01-11 10:42:00 -05:00
berry_fix
Fix file permissions.
2018-01-19 15:06:49 -05:00
birch_speech
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
cable_car
Document cable car
2020-08-28 03:54:04 -04:00
cave_transition
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
contest
Rename generic jp contest tilemaps
2021-12-28 13:16:40 -05:00
credits
Document some credits
2021-03-29 08:52:40 -04:00
decorations
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
diploma
Move more graphics out of misc
2022-01-14 12:29:30 -05: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
Name unknown_16.png
2022-03-14 15:54:47 -04:00
fonts
Misc text clean-up
2021-11-14 22:21:17 -05:00
frontier_pass
Rename unused frontier pass tilemap
2021-12-28 14:54:09 -05:00
interface
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
intro
Standardize intro gfx names
2021-03-29 20:48:48 -04:00
items
Remove new items data from battle engine
2019-04-13 14:02:04 +02:00
link
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
mail
Fix file permissions.
2018-01-19 15:06:49 -05:00
map_popup
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
misc
Improve egg hatch documentation
2022-03-03 01:33:49 -05:00
naming_screen
Finish documenting naming screen
2020-08-07 20:18:09 -04:00
object_events
Name object event pals/tags
2020-11-23 14:24:48 -05:00
party_menu
Generalize name of party slot without HP
2022-02-15 16:24:19 -05:00
picture_frame
Clean up contest_painting
2021-04-21 20:04:12 -04:00
pokeblock
Move pokeblock graphics out of interface
2022-01-11 11:46:58 -05:00
pokedex
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
pokemon
Improve egg hatch documentation
2022-03-03 01:33:49 -05:00
pokemon_jump
Document pokemon jump
2021-02-26 17:26:39 -05:00
pokemon_storage
Clean up pokemon_storage_system graphics
2022-01-07 17:36:38 -05: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
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
roulette
Continue documenting roulette
2020-08-02 14:52:05 -04:00
shop
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
slot_machine
RGB macro use in slot_machine
2021-12-28 17:46:05 -05:00
spinda_spots
move some pokemon data to c
2018-02-05 17:39:26 +01:00
starter_choose
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
summary_screen
Move summary screen graphics out of interface, fix some names
2022-01-11 11:22:45 -05:00
text_window
Extract data from text window
2018-01-20 00:49:21 -06:00
title_screen
Rename generic title screen tilemaps
2021-12-28 03:57:44 -05:00
trade
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
trainer_card
Remaining labels in trainer_card
2021-03-22 15:30:19 -05:00
trainer_hill
Move trainer hill map data to bin files
2022-03-31 14:08:31 -04:00
trainers
Rename graphics files for COOLTRAINER to match define
2020-11-26 11:05:02 -08:00
types
Add Fairy Type icon
2018-09-16 10:45:22 +02:00
union_room_chat
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
unused
Move more graphics out of misc
2022-01-14 12:29:30 -05: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