pokeemerald/graphics at 09fd393f97f4af4c00453aba39f6068fd5825918 - pokeemerald - Gitea

ninjdai/pokeemerald

mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 08:32:10 +01:00

History

Eduardo Quezada afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate

# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c

2022-08-22 20:30:45 -04:00

..

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

2022-07-22 22:57:02 -04:00

battle_frontier

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

battle_interface

tweak z indicator position relative to healthbox

2022-07-18 09:44:04 -04:00

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

Add missing berry data

2021-10-26 14:42:06 +13:00

Finish documenting berry blender

2020-08-24 17:06:55 -04:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Fix file permissions.

2018-01-19 15:06:49 -05:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

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

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Document some credits

2021-03-29 08:52:40 -04:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

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

Some field door comments

2022-05-18 13:03:02 -04:00

Delete unreferenced palette

2021-04-01 14:32:23 -04:00

evolution_scene

Document evolution scene

2021-02-03 17:55:37 -05:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Misc text clean-up

2021-11-14 22:21:17 -05:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Standardize intro gfx names

2021-03-29 20:48:48 -04:00

Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge

2022-04-03 13:21:40 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Fix file permissions.

2018-01-19 15:06:49 -05:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Split naming screen palettes/graphics, use correct image palettes, clean up

2022-08-09 09:27:28 -04:00

Add missing berry data

2021-10-26 14:42:06 +13:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Ignore num_tiles if it would truncate non-transparent tiles (#1729 )

2022-08-18 23:07:25 -04:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim

2022-05-19 00:54:16 +03:00

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

Finish match call menu doc

2021-11-15 01:20:03 -05:00

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

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Continue documenting roulette

2020-08-02 14:52:05 -04:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

move some pokemon data to c

2018-02-05 17:39:26 +01:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Extract data from text window

2018-01-20 00:49:21 -06:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Remaining labels in trainer_card

2021-03-22 15:30:19 -05:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Rename graphics files for COOLTRAINER to match define

2020-11-26 11:05:02 -08:00

Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon.

2021-01-02 14:03:46 -08:00

union_room_chat

Document union_room_chat.c

2020-06-02 18:35:00 -04:00

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

Document wallclock data

2020-08-29 15:55:28 -04:00

Document more battle anim effects

2021-02-28 09:54:55 -06:00

Fix leftover icon_shadow names

2021-10-17 03:22:55 -04:00

Start wonder card/news documenting

2021-10-14 13:24:20 -04:00